From 84bfe112857b5602166fef3404a2ec30ff034b0d Mon Sep 17 00:00:00 2001 From: Palash gupta Date: Fri, 25 Mar 2022 12:33:52 +0530 Subject: [PATCH] chore: tsc error are fixed --- .../__tests__/TraceFlameGraph.test.tsx | 39 +++++++++++++++++-- frontend/src/modules/Usage/UsageExplorer.tsx | 11 ++++-- .../store/actions/trace/selectTraceFilter.ts | 1 + 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/frontend/src/container/TraceFlameGraph/__tests__/TraceFlameGraph.test.tsx b/frontend/src/container/TraceFlameGraph/__tests__/TraceFlameGraph.test.tsx index 7a8e1381d0..f97e41764c 100644 --- a/frontend/src/container/TraceFlameGraph/__tests__/TraceFlameGraph.test.tsx +++ b/frontend/src/container/TraceFlameGraph/__tests__/TraceFlameGraph.test.tsx @@ -1,9 +1,42 @@ import { expect } from '@jest/globals'; import { render } from '@testing-library/react'; import TraceFlameGraph from 'container/TraceFlameGraph'; -import React from 'react'; +import React, { useState } from 'react'; -test('loads and displays greeting', async () => { - const { asFragment } = render(); +test('loads and displays greeting', () => { + const onSpanHover = useState(''); + + const { asFragment } = render( + {}, + selectedSpanId: '', + traceMetaData: { + globalEnd: 0, + globalStart: 0, + levels: 0, + spread: 0, + totalSpans: 0, + }, + treeData: { + children: [], + id: '', + name: '', + serviceColour: '', + serviceName: '', + startTime: 0, + tags: [], + time: 0, + value: 0, + event: [], + hasError: false, + parent: undefined, + }, + }} + />, + ); expect(asFragment()).toMatchSnapshot(); }); diff --git a/frontend/src/modules/Usage/UsageExplorer.tsx b/frontend/src/modules/Usage/UsageExplorer.tsx index 1790343210..502ae0294b 100644 --- a/frontend/src/modules/Usage/UsageExplorer.tsx +++ b/frontend/src/modules/Usage/UsageExplorer.tsx @@ -5,6 +5,7 @@ import { Select, Space } from 'antd'; import Graph from 'components/Graph'; import React, { useEffect, useState } from 'react'; import { connect, useSelector } from 'react-redux'; +import { withRouter } from 'react-router-dom'; import { GetService, getUsageData, UsageDataItem } from 'store/actions'; import { AppState } from 'store/reducers'; import { GlobalTime } from 'types/actions/globalTime'; @@ -213,7 +214,9 @@ const mapStateToProps = ( }; }; -export const UsageExplorer = connect(mapStateToProps, { - getUsageData, - getServicesList: GetService, -})(_UsageExplorer); +export const UsageExplorer = withRouter( + connect(mapStateToProps, { + getUsageData, + getServicesList: GetService, + })(_UsageExplorer), +); diff --git a/frontend/src/store/actions/trace/selectTraceFilter.ts b/frontend/src/store/actions/trace/selectTraceFilter.ts index 7b1cd16729..f23a361f0a 100644 --- a/frontend/src/store/actions/trace/selectTraceFilter.ts +++ b/frontend/src/store/actions/trace/selectTraceFilter.ts @@ -46,6 +46,7 @@ export const SelectedTraceFilter = (props: { traces.selectedTags, traces.filter, traces.isFilterExclude, + traces.userSelectedFilter, ); }; };