SigNoz is an open-source, OpenTelemetry-native observability platform for your team and their AI agents. Get logs, metrics, and traces in one tool with features like APM, distributed tracing, log management, infra monitoring, etc. Combined with SigNoz MCP and a native AI teammate (in SigNoz Cloud) it helps you build more resilient apps.
TypeScript apmapplication-monitoringdistributed-tracinggogood-first-issuejaegerloglogsmetricsmonitoringnextjsobservabilityopen-sourceopentelemetryprometheusreactreactjsself-hostedtracingtypescript
refactor(traces): delete the old trace explorer code (#12919)
Aditya Singh3ecc21377da1
diff --git a/frontend/public/locales/en-GB/titles.json b/frontend/public/locales/en-GB/titles.jsonindex 285698c3c7..dbc801ef98 100644--- a/frontend/public/locales/en-GB/titles.json+++ b/frontend/public/locales/en-GB/titles.json@@ -4,7 +4,6 @@"GET_STARTED": "SigNoz | Get Started","SERVICE_METRICS": "SigNoz | Service Metrics","SERVICE_MAP": "SigNoz | Service Map",- "TRACE": "SigNoz | Trace","HOME": "SigNoz | Home","TRACE_DETAIL": "SigNoz | Trace Detail","TRACES_EXPLORER": "SigNoz | Traces Explorer",@@ -56,7 +55,6 @@"SERVICE_ACCOUNTS_SETTINGS": "SigNoz | Service Accounts","MCP_SERVER": "SigNoz | MCP Server","AI_ASSISTANT": "SigNoz | AI Assistant",- "TRACE_DETAIL_OLD": "SigNoz | Trace Detail","SERVICE_TOP_LEVEL_OPERATIONS": "SigNoz | Service Operations","ROLE_DETAILS": "SigNoz | Role Details","TRACES_FUNNELS_DETAIL": "SigNoz | Funnel",diff --git a/frontend/public/locales/en/titles.json b/frontend/public/locales/en/titles.jsonindex 9824e54467..a701d67769 100644--- a/frontend/public/locales/en/titles.json+++ b/frontend/public/locales/en/titles.json@@ -14,7 +14,6 @@"GET_STARTED_AZURE_MONITORING": "SigNoz | Get Started | AZURE","GET_STARTED": "SigNoz | Get Started with SigNoz Cloud","GET_STARTED_WITH_CLOUD": "SigNoz | Get Started with SigNoz Cloud",- "TRACE": "SigNoz | Trace","TRACE_DETAIL": "SigNoz | Trace Detail","TRACES_EXPLORER": "SigNoz | Traces Explorer","SETTINGS": "SigNoz | Settings",@@ -79,7 +78,6 @@"SERVICE_ACCOUNTS_SETTINGS": "SigNoz | Service Accounts","MCP_SERVER": "SigNoz | MCP Server","AI_ASSISTANT": "SigNoz | AI Assistant",- "TRACE_DETAIL_OLD": "SigNoz | Trace Detail","SERVICE_TOP_LEVEL_OPERATIONS": "SigNoz | Service Operations","ROLE_DETAILS": "SigNoz | Role Details","ROLE_CREATE": "SigNoz | Create Role",diff --git a/frontend/src/AppRoutes/__tests__/Private.test.tsx b/frontend/src/AppRoutes/__tests__/Private.test.tsxindex 1dd7c1cfcb..8c2eaaf8fa 100644--- a/frontend/src/AppRoutes/__tests__/Private.test.tsx+++ b/frontend/src/AppRoutes/__tests__/Private.test.tsx@@ -1588,15 +1588,10 @@ describe('PrivateRoute', () => {deniedRoles: DENIED_ROLES,},TRACES_EXPLORER: { path: ROUTES.TRACES_EXPLORER, deniedRoles: DENIED_ROLES },- TRACE: { path: ROUTES.TRACE, deniedRoles: DENIED_ROLES },TRACE_DETAIL: {path: ROUTES.TRACE_DETAIL.replace(':id', 'trace-id-1'),deniedRoles: DENIED_ROLES,},- TRACE_DETAIL_OLD: {- path: ROUTES.TRACE_DETAIL_OLD.replace(':id', 'trace-id-1'),- deniedRoles: DENIED_ROLES,- },// LOGS and LOGS_EXPLORER share a path - matchPath resolves it to whichever// route definition comes last, and both keys are authz-aware either way.LOGS: { path: ROUTES.LOGS, deniedRoles: DENIED_ROLES },diff --git a/frontend/src/AppRoutes/pageComponents.ts b/frontend/src/AppRoutes/pageComponents.tsindex 76108a6d60..a9d25e79c4 100644--- a/frontend/src/AppRoutes/pageComponents.ts+++ b/frontend/src/AppRoutes/pageComponents.ts@@ -53,17 +53,6 @@ export const TracesFunnelDetails = Loadable(),);-export const TraceFilter = Loadable(- () => import(/* webpackChunkName: "Trace Filter Page" */ 'pages/Trace'),-);--export const TraceDetailOldRedirect = Loadable(- () =>- import(- /* webpackChunkName: "TraceDetailOldRedirect" */ 'pages/TraceDetailOldRedirect/index'- ),-);-export const TraceDetailV3 = Loadable(() =>import(diff --git a/frontend/src/AppRoutes/routes.ts b/frontend/src/AppRoutes/routes.tsindex dde868e89c..c7e171151b 100644--- a/frontend/src/AppRoutes/routes.ts+++ b/frontend/src/AppRoutes/routes.ts@@ -47,9 +47,7 @@ import {SomethingWentWrong,StatusPage,SupportPage,- TraceDetailOldRedirect,TraceDetailV3,- TraceFilter,TracesExplorer,TracesFunnelDetails,TracesFunnels,@@ -132,14 +130,6 @@ const routes: AppRoutes[] = [exact: true,key: 'LOGS_SAVE_VIEWS',},- // Legacy /trace-old/:id redirects to the current /trace/:id view.- {- path: ROUTES.TRACE_DETAIL_OLD,- exact: true,- component: TraceDetailOldRedirect,- isPrivate: true,- key: 'TRACE_DETAIL_OLD',- },{path: ROUTES.TRACE_DETAIL,exact: true,@@ -224,13 +214,6 @@ const routes: AppRoutes[] = [isPrivate: true,key: 'ALERT_OVERVIEW',},- {- path: ROUTES.TRACE,- exact: true,- component: TraceFilter,- isPrivate: true,- key: 'TRACE',- },{path: ROUTES.TRACES_EXPLORER,exact: true,diff --git a/frontend/src/api/trace/getFilters.ts b/frontend/src/api/trace/getFilters.tsdeleted file mode 100644index 7eeb9404ba..0000000000--- a/frontend/src/api/trace/getFilters.ts+++ /dev/null@@ -1,49 +0,0 @@-import axios from 'api';-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';-import { AxiosError } from 'axios';-import omitBy from 'lodash-es/omitBy';-import { ErrorResponse, SuccessResponse } from 'types/api';-import { PayloadProps, Props } from 'types/api/trace/getFilters';--const getFilters = async (- props: Props,-): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {- try {- const duration =- omitBy(props.other, (_, key) => !key.startsWith('duration')) || [];-- const nonDuration = omitBy(props.other, (_, key) =>- key.startsWith('duration'),- );-- const exclude: string[] = [];-- props.isFilterExclude.forEach((value, key) => {- if (value) {- exclude.push(key);- }- });-- const response = await axios.post<PayloadProps>(`/getSpanFilters`, {- start: props.start,- end: props.end,- getFilters: props.getFilters,- ...nonDuration,- maxDuration: String((duration.duration || [])[0] || ''),- minDuration: String((duration.duration || [])[1] || ''),- exclude,- spanKind: props.spanKind,- });-- return {- statusCode: 200,- error: null,- message: 'Success',- payload: response.data,- };- } catch (error) {- return ErrorResponseHandler(error as AxiosError);- }-};--export default getFilters;diff --git a/frontend/src/api/trace/getSpans.ts b/frontend/src/api/trace/getSpans.tsdeleted file mode 100644index 261b2652c6..0000000000--- a/frontend/src/api/trace/getSpans.ts+++ /dev/null@@ -1,62 +0,0 @@-import axios from 'api';-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';-import { AxiosError } from 'axios';-import omitBy from 'lodash-es/omitBy';-import { ErrorResponse, SuccessResponse } from 'types/api';-import { PayloadProps, Props } from 'types/api/trace/getSpans';--const getSpans = async (- props: Props,-): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {- try {- const updatedSelectedTags = props.selectedTags.map((e) => ({- Key: `${e.Key}.(string)`,- Operator: e.Operator,- StringValues: e.StringValues,- NumberValues: e.NumberValues,- BoolValues: e.BoolValues,- }));-- const exclude: string[] = [];-- props.isFilterExclude.forEach((value, key) => {- if (value) {- exclude.push(key);- }- });-- const other = Object.fromEntries(props.selectedFilter);-- const duration = omitBy(other, (_, key) => !key.startsWith('duration')) || [];-- const nonDuration = omitBy(other, (_, key) => key.startsWith('duration'));-- const response = await axios.post<PayloadProps>(- `/getFilteredSpans/aggregates`,- {- start: String(props.start),- end: String(props.end),- function: props.function,- groupBy: props.groupBy === 'none' ? '' : props.groupBy,- step: props.step,- tags: updatedSelectedTags,- ...nonDuration,- maxDuration: String((duration.duration || [])[0] || ''),- minDuration: String((duration.duration || [])[1] || ''),- exclude,- spanKind: props.spanKind,- },- );-- return {- statusCode: 200,- error: null,- message: 'Success',- payload: response.data,- };- } catch (error) {- return ErrorResponseHandler(error as AxiosError);- }-};--export default getSpans;diff --git a/frontend/src/api/trace/getSpansAggregate.ts b/frontend/src/api/trace/getSpansAggregate.tsdeleted file mode 100644index 7f245605fc..0000000000--- a/frontend/src/api/trace/getSpansAggregate.ts+++ /dev/null@@ -1,65 +0,0 @@-import axios from 'api';-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';-import { AxiosError } from 'axios';-import omitBy from 'lodash-es/omitBy';-import { ErrorResponse, SuccessResponse } from 'types/api';-import { PayloadProps, Props } from 'types/api/trace/getSpanAggregate';-import { TraceFilterEnum } from 'types/reducer/trace';--const getSpanAggregate = async (- props: Props,-): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {- try {- const preProps = {- start: String(props.start),- end: String(props.end),- limit: props.limit,- offset: props.offset,- order: props.order,- orderParam: props.orderParam,- };-- const exclude: TraceFilterEnum[] = [];-- props.isFilterExclude.forEach((value, key) => {- if (value) {- exclude.push(key);- }- });-- const updatedSelectedTags = props.selectedTags.map((e) => ({- Key: `${e.Key}.(string)`,- Operator: e.Operator,- StringValues: e.StringValues,- NumberValues: e.NumberValues,- BoolValues: e.BoolValues,- }));-- const other = Object.fromEntries(props.selectedFilter);-- const duration = omitBy(other, (_, key) => !key.startsWith('duration')) || [];-- const nonDuration = omitBy(other, (_, key) => key.startsWith('duration'));-- const response = await axios.post<PayloadProps>(`/getFilteredSpans`, {- ...preProps,- tags: updatedSelectedTags,- ...nonDuration,- maxDuration: String((duration.duration || [])[0] || ''),- minDuration: String((duration.duration || [])[1] || ''),- exclude,- spanKind: props.spanKind,- });-- return {- statusCode: 200,- error: null,- message: 'Success',- payload: response.data,- };- } catch (error) {- return ErrorResponseHandler(error as AxiosError);- }-};--export default getSpanAggregate;diff --git a/frontend/src/api/trace/getTagFilter.ts b/frontend/src/api/trace/getTagFilter.tsdeleted file mode 100644index 2f53ab5a6d..0000000000--- a/frontend/src/api/trace/getTagFilter.ts+++ /dev/null@@ -1,49 +0,0 @@-import axios from 'api';-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';-import { AxiosError } from 'axios';-import { omitBy } from 'lodash-es';-import { ErrorResponse, SuccessResponse } from 'types/api';-import { PayloadProps, Props } from 'types/api/trace/getTagFilters';-import { TraceFilterEnum } from 'types/reducer/trace';--const getTagFilters = async (- props: Props,-): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {- try {- const duration =- omitBy(props.other, (_, key) => !key.startsWith('duration')) || [];-- const exclude: TraceFilterEnum[] = [];-- props.isFilterExclude.forEach((value, key) => {- if (value) {- exclude.push(key);- }- });-- const nonDuration = omitBy(props.other, (_, key) =>- key.startsWith('duration'),- );-- const response = await axios.post<PayloadProps>(`/getTagFilters`, {- start: String(props.start),- end: String(props.end),- ...nonDuration,- maxDuration: String((duration.duration || [])[0] || ''),- minDuration: String((duration.duration || [])[1] || ''),- exclude,- spanKind: props.spanKind,- });-- return {- statusCode: 200,- error: null,- message: 'Success',- payload: response.data,- };- } catch (error) {- return ErrorResponseHandler(error as AxiosError);- }-};--export default getTagFilters;diff --git a/frontend/src/api/trace/getTagValue.ts b/frontend/src/api/trace/getTagValue.tsdeleted file mode 100644index 2519c7a758..0000000000--- a/frontend/src/api/trace/getTagValue.ts+++ /dev/null@@ -1,31 +0,0 @@-import axios from 'api';-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';-import { AxiosError } from 'axios';-import { ErrorResponse, SuccessResponse } from 'types/api';-import { PayloadProps, Props } from 'types/api/trace/getTagValue';--const getTagValue = async (- props: Props,-): Promise<SuccessResponse<PayloadProps> | ErrorResponse> => {- try {- const response = await axios.post<PayloadProps>(`/getTagValues`, {- start: props.start.toString(),- end: props.end.toString(),- tagKey: {- Key: props.tagKey.Key,- Type: props.tagKey.Type,- },- spanKind: props.spanKind,- });- return {- statusCode: 200,- error: null,- message: 'Success',- payload: response.data,- };- } catch (error) {- return ErrorResponseHandler(error as AxiosError);- }-};--export default getTagValue;diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Duration/Duration.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Duration/Duration.tsxindex 4d0bc727b3..3bdc5af6b7 100644--- a/frontend/src/components/QuickFilters/FilterRenderers/Duration/Duration.tsx+++ b/frontend/src/components/QuickFilters/FilterRenderers/Duration/Duration.tsx@@ -6,31 +6,27 @@ import {IQuickFiltersConfig,QuickFiltersSource,} from 'components/QuickFilters/types';-import { getMs } from 'container/Trace/Filters/Panel/PanelBody/Duration/util';+import { getMs } from 'utils/timeUtils';import { useGetCompositeQueryParam } from 'hooks/queryBuilder/useGetCompositeQueryParam';import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';import { cloneDeep, isArray, isEqual, isFunction } from 'lodash-es';-import { DurationSection } from 'pages/TracesExplorer/Filter/DurationSection';import {AllTraceFilterKeys,AllTraceFilterKeyValue,- HandleRunProps,traceFilterKeys,- unionTagFilterItems,-} from 'pages/TracesExplorer/Filter/filterUtils';+} from 'constants/traceFilterKeys';import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';import { Query, TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';import { v4 as uuid } from 'uuid';import { clearFilterFromQuery } from '../shared/filterQuery';import { SectionActionButton } from '../shared/SectionActionButton/SectionActionButton';+import { DurationSection } from './DurationSection';+import { FilterType, HandleRunProps, unionTagFilterItems } from './utils';import './Duration.styles.scss';-export type FilterType = Record<- AllTraceFilterKeys,- { values: string[] | string; keys: BaseAutocompleteData }->;+export type { FilterType };function Duration({filter,diff --git a/frontend/src/pages/TracesExplorer/Filter/DurationSection.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Duration/DurationSection.tsxsimilarity index 95%rename from frontend/src/pages/TracesExplorer/Filter/DurationSection.tsxrename to frontend/src/components/QuickFilters/FilterRenderers/Duration/DurationSection.tsxindex b861c5a3ef..b10f4c1a79 100644--- a/frontend/src/pages/TracesExplorer/Filter/DurationSection.tsx+++ b/frontend/src/components/QuickFilters/FilterRenderers/Duration/DurationSection.tsx@@ -9,10 +9,12 @@ import {} from 'react';import { Input } from 'antd';import { Slider } from '@signozhq/ui/slider';-import { getMs } from 'container/Trace/Filters/Panel/PanelBody/Duration/util';+import { getMs } from 'utils/timeUtils';import useDebouncedFn from 'hooks/useDebouncedFunction';-import { addFilter, FilterType, traceFilterKeys } from './filterUtils';+import { traceFilterKeys } from 'constants/traceFilterKeys';++import { addFilter, FilterType } from './utils';interface DurationProps {selectedFilters: FilterType | undefined;diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Duration/utils.ts b/frontend/src/components/QuickFilters/FilterRenderers/Duration/utils.tsnew file mode 100644index 0000000000..87a5eee843--- /dev/null+++ b/frontend/src/components/QuickFilters/FilterRenderers/Duration/utils.ts@@ -0,0 +1,101 @@+import { Dispatch, SetStateAction } from 'react';+import { AllTraceFilterKeys } from 'constants/traceFilterKeys';+import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';+import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';++export type FilterType = Record<+ AllTraceFilterKeys,+ { values: string[] | string; keys: BaseAutocompleteData }+>;++export interface HandleRunProps {+ resetAll?: boolean;+ clearByType?: AllTraceFilterKeys;+}++function convertToStringArr(value: string | string[] | undefined): string[] {+ if (value) {+ if (typeof value === 'string') {+ return [value];+ }+ return value;+ }+ return [];+}++export const addFilter = (+ filterType: AllTraceFilterKeys,+ value: string,+ setSelectedFilters: Dispatch<+ SetStateAction<+ | Record<+ AllTraceFilterKeys,+ { values: string[] | string; keys: BaseAutocompleteData }+ >+ | undefined+ >+ >,+ keys: BaseAutocompleteData,+): void => {+ setSelectedFilters((prevFilters) => {+ const isDuration = [+ 'durationNanoMax',+ 'durationNanoMin',+ 'durationNano',+ ].includes(filterType);++ // Convert value to string array+ const valueArray = convertToStringArr(value);++ // If previous filters are undefined, initialize them+ if (!prevFilters) {+ return {+ [filterType]: { values: isDuration ? value : valueArray, keys },+ } as unknown as FilterType;+ }++ // If the filter type doesn't exist, initialize it+ if (!prevFilters[filterType]?.values.length) {+ return {+ ...prevFilters,+ [filterType]: { values: isDuration ? value : valueArray, keys },+ };+ }++ // If the value already exists, don't add it again+ if (convertToStringArr(prevFilters[filterType].values).includes(value)) {+ return prevFilters;+ }++ // Otherwise, add the value to the existing array+ return {+ ...prevFilters,+ [filterType]: {+ values: isDuration+ ? value+ : [...convertToStringArr(prevFilters[filterType].values), value],+ keys,+ },+ };+ });+};++/** Merges two filter lists; later items win on the same key + operator. */+export function unionTagFilterItems(+ items1: TagFilterItem[],+ items2: TagFilterItem[],+): TagFilterItem[] {+ const unionMap = new Map<string, TagFilterItem>();++ items1?.forEach((item) => {+ const keyOp = `${item?.key?.key}_${item?.op}`;+ unionMap.set(keyOp, item);+ });++ items2?.forEach((item) => {+ const keyOp = `${item?.key?.key}_${item?.op}`;+ unionMap.set(keyOp, item);+ });++ return Array.from(unionMap?.values());+}diff --git a/frontend/src/constants/localStorage.ts b/frontend/src/constants/localStorage.tsindex f6fc41eac9..ac555a7b9a 100644--- a/frontend/src/constants/localStorage.ts+++ b/frontend/src/constants/localStorage.ts@@ -41,7 +41,6 @@ export enum LOCALSTORAGE {DISMISSED_API_KEYS_DEPRECATION_BANNER = 'DISMISSED_API_KEYS_DEPRECATION_BANNER',TRACE_DETAILS_SPAN_DETAILS_POSITION = 'TRACE_DETAILS_SPAN_DETAILS_POSITION',LICENSE_KEY_CALLOUT_DISMISSED = 'LICENSE_KEY_CALLOUT_DISMISSED',- TRACE_DETAILS_PREFER_OLD_VIEW = 'TRACE_DETAILS_PREFER_OLD_VIEW',DASHBOARD_PREFERENCES = 'DASHBOARD_PREFERENCES',ACTIVE_SIGNOZ_INSTANCE_URL = 'ACTIVE_SIGNOZ_INSTANCE_URL',DASHBOARDS_LIST_VISIBLE_COLUMNS = 'DASHBOARDS_LIST_VISIBLE_COLUMNS',diff --git a/frontend/src/constants/resourceAttributes.ts b/frontend/src/constants/resourceAttributes.tsindex f89826859d..02c32748e4 100644--- a/frontend/src/constants/resourceAttributes.ts+++ b/frontend/src/constants/resourceAttributes.ts@@ -1,4 +1,4 @@-import { OperatorValues } from 'types/reducer/trace';+import { OperatorValues } from 'hooks/useResourceAttribute/types';export const OperatorConversions: Array<{label: string;diff --git a/frontend/src/constants/routes.ts b/frontend/src/constants/routes.tsindex f342f48457..619d194b52 100644--- a/frontend/src/constants/routes.ts+++ b/frontend/src/constants/routes.ts@@ -6,9 +6,8 @@ const ROUTES = {SERVICE_METRICS: '/services/:servicename',SERVICE_TOP_LEVEL_OPERATIONS: '/services/:servicename/top-level-operations',SERVICE_MAP: '/service-map',- TRACE: '/trace',+ TRACE_BASE: '/trace',TRACE_DETAIL: '/trace/:id',- TRACE_DETAIL_OLD: '/trace-old/:id',TRACES_EXPLORER: '/traces-explorer',ONBOARDING: '/onboarding',GET_STARTED_WITH_CLOUD: '/get-started-with-signoz-cloud',diff --git a/frontend/src/constants/traceFilterKeys.ts b/frontend/src/constants/traceFilterKeys.tsnew file mode 100644index 0000000000..0c4a3afe23--- /dev/null+++ b/frontend/src/constants/traceFilterKeys.ts@@ -0,0 +1,124 @@+import { SPAN_ATTRIBUTES } from 'container/ApiMonitoring/Explorer/Domains/DomainDetails/constants';+import {+ BaseAutocompleteData,+ DataTypes,+} from 'types/api/queryBuilder/queryAutocompleteResponse';++/** Trace attribute key -> label shown in quick filters, the options menu and APM "view traces" links. */+export const AllTraceFilterKeyValue: Record<string, string> = {+ durationNanoMin: 'Duration',+ durationNano: 'Duration',+ duration_nano: 'Duration',+ durationNanoMax: 'Duration',+ 'deployment.environment': 'Environment',+ hasError: 'Status',+ has_error: 'Status',+ serviceName: 'Service Name',+ 'service.name': 'service.name',+ name: 'Operation / Name',+ rpcMethod: 'RPC Method',+ 'rpc.method': 'RPC Method',+ responseStatusCode: 'Status Code',+ response_status_code: 'Status Code',+ httpHost: 'HTTP Host',+ http_host: 'HTTP Host',+ httpMethod: 'HTTP Method',+ http_method: 'HTTP Method',+ httpRoute: 'HTTP Route',+ 'http.route': 'HTTP Route',+ httpUrl: 'HTTP URL',+ [SPAN_ATTRIBUTES.HTTP_URL]: 'HTTP URL',+ traceID: 'Trace ID',+ trace_id: 'Trace ID',+} as const;++export type AllTraceFilterKeys = keyof typeof AllTraceFilterKeyValue;++export const traceFilterKeys: Record<AllTraceFilterKeys, BaseAutocompleteData> =+ {+ durationNano: {+ key: 'durationNano',+ dataType: DataTypes.Float64,+ type: 'tag',+ id: 'durationNano--float64--tag--true',+ },+ hasError: {+ key: 'hasError',+ dataType: DataTypes.bool,+ type: 'tag',+ id: 'hasError--bool--tag--true',+ },+ serviceName: {+ key: 'serviceName',+ dataType: DataTypes.String,+ type: 'tag',+ id: 'serviceName--string--tag--true',+ },++ 'deployment.environment': {+ key: 'deployment.environment',+ dataType: DataTypes.String,+ type: 'resource',+ id: 'deployment.environment--string--resource--false',+ },+ name: {+ key: 'name',+ dataType: DataTypes.String,+ type: 'tag',+ id: 'name--string--tag--true',+ },+ rpcMethod: {+ key: 'rpcMethod',+ dataType: DataTypes.String,+ type: 'tag',+ id: 'rpcMethod--string--tag--true',+ },+ responseStatusCode: {+ key: 'responseStatusCode',+ dataType: DataTypes.String,+ type: 'tag',+ id: 'responseStatusCode--string--tag--true',+ },+ httpHost: {+ key: 'httpHost',+ dataType: DataTypes.String,+ type: 'tag',+ id: 'httpHost--string--tag--true',+ },+ httpMethod: {+ key: 'httpMethod',+ dataType: DataTypes.String,+ type: 'tag',+ id: 'httpMethod--string--tag--true',+ },+ httpRoute: {+ key: 'httpRoute',+ dataType: DataTypes.String,+ type: 'tag',+ id: 'httpRoute--string--tag--true',+ },+ httpUrl: {+ key: 'httpUrl',+ dataType: DataTypes.String,+ type: 'tag',+ id: 'httpUrl--string--tag--true',+ },+ traceID: {+ key: 'traceID',+ dataType: DataTypes.String,+ type: 'tag',+ id: 'traceID--string--tag--true',+ },+ durationNanoMin: {+ key: 'durationNanoMin',+ dataType: DataTypes.Float64,+ type: 'tag',+ id: 'durationNanoMin--float64--tag--true',+ },+ durationNanoMax: {+ key: 'durationNanoMax',+ dataType: DataTypes.Float64,+ type: 'tag',+ id: 'durationNanoMax--float64--tag--true',+ },+ } as const;diff --git a/frontend/src/container/GantChart/GantChart.styles.scss b/frontend/src/container/GantChart/GantChart.styles.scssdeleted file mode 100644index cc1e828842..0000000000--- a/frontend/src/container/GantChart/GantChart.styles.scss+++ /dev/null@@ -1,16 +0,0 @@-.span-container {- .spanDetails {- position: absolute;- height: 50px;- padding: 8px;- min-width: 150px;- background: lightcyan;- color: black;- bottom: 24px;- left: 0;-- display: flex;- justify-content: center;- align-items: center;- }-}diff --git a/frontend/src/container/GantChart/Span/index.tsx b/frontend/src/container/GantChart/Span/index.tsxdeleted file mode 100644index e4b003d5d1..0000000000--- a/frontend/src/container/GantChart/Span/index.tsx+++ /dev/null@@ -1,96 +0,0 @@-import { useEffect } from 'react';-import { Popover } from 'antd';-import { Typography } from '@signozhq/ui/typography';-import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';-import { convertTimeToRelevantUnit } from 'container/TraceDetail/utils';-import dayjs from 'dayjs';-import { useIsDarkMode } from 'hooks/useDarkMode';-import { useTimezone } from 'providers/Timezone';-import { toFixed } from 'utils/toFixed';--import { SpanBorder, SpanLine, SpanText, SpanWrapper } from './styles';--import '../GantChart.styles.scss';--interface SpanLengthProps {- globalStart: number;- startTime: number;- name: string;- width: string;- leftOffset: string;- bgColor: string;- inMsCount: number;-}--function Span(props: SpanLengthProps): JSX.Element {- const { width, leftOffset, bgColor, inMsCount, startTime, name, globalStart } =- props;- const isDarkMode = useIsDarkMode();- const { time, timeUnitName } = convertTimeToRelevantUnit(inMsCount);-- const { timezone } = useTimezone();-- useEffect(() => {- document.documentElement.scrollTop = document.documentElement.clientHeight;- document.documentElement.scrollLeft = document.documentElement.clientWidth;- }, []);-- const getContent = (): JSX.Element => {- const timeStamp = dayjs(startTime)- .tz(timezone.value)- .format(DATE_TIME_FORMATS.TIME_UTC_MS);- const startTimeInMs = startTime - globalStart;- return (- <div>- <Typography.Text style={{ marginBottom: '8px' }}>- {' '}- Duration : {inMsCount}- </Typography.Text>- <br />- <Typography.Text style={{ marginBottom: '8px' }}>- Start Time: {startTimeInMs}ms [{timeStamp}]{' '}- </Typography.Text>- </div>- );- };-- return (- <SpanWrapper className="span-container">- <SpanLine- className="spanLine"- isDarkMode={isDarkMode}- bgColor={bgColor}- leftOffset={leftOffset}- width={width}- />-- <div>- <Popover- style={{- left: `${leftOffset}%`,- }}- title={name}- content={getContent()}- trigger="hover"- placement="left"- autoAdjustOverflow- >- <SpanBorder- className="spanTrack"- isDarkMode={isDarkMode}- bgColor={bgColor}- leftOffset={leftOffset}- width={width}- />- </Popover>- </div>-- <SpanText isDarkMode={isDarkMode} leftOffset={leftOffset}>{`${toFixed(- time,- 2,- )} ${timeUnitName}`}</SpanText>- </SpanWrapper>- );-}--export default Span;diff --git a/frontend/src/container/GantChart/Span/styles.ts b/frontend/src/container/GantChart/Span/styles.tsdeleted file mode 100644index da4266ed43..0000000000--- a/frontend/src/container/GantChart/Span/styles.ts+++ /dev/null@@ -1,52 +0,0 @@-import { Typography } from '@signozhq/ui/typography';-import styled from 'styled-components';--interface Props {- width: string;- leftOffset: string;- bgColor: string;- isDarkMode: boolean;-}--export const SpanLine = styled.div<Props>`- width: ${({ leftOffset }): string => `${leftOffset}%`};- height: 0px;- border-bottom: 0.1px solid- ${({ isDarkMode }): string => (isDarkMode ? '#303030' : '#c0c0c0')};- top: 50%;- position: absolute;-`;--export const SpanBorder = styled.div<Props>`- background: ${({ bgColor }): string => bgColor};- border-radius: 5px;- height: 0.625rem;- width: ${({ width }): string => `${width}%`};- left: ${({ leftOffset }): string => `${leftOffset}%`};- top: 35%;- position: absolute;-`;--export const SpanWrapper = styled.div`- display: flex;- width: 100%;- flex-direction: row;- align-items: center;- position: relative;- z-index: 2;- min-height: 2rem;-`;-interface SpanTextProps extends Pick<Props, 'leftOffset'> {- isDarkMode: boolean;-}--export const SpanText = styled(Typography.Text)<SpanTextProps>`- &&& {- left: ${({ leftOffset }): string => `${leftOffset}%`};- top: 65%;- position: absolute;- width: max-content;- color: ${({ isDarkMode }): string => (isDarkMode ? '#ACACAC' : '#666')};- font-size: 0.75rem;- }-`;diff --git a/frontend/src/container/GantChart/SpanName/index.tsx b/frontend/src/container/GantChart/SpanName/index.tsxdeleted file mode 100644index e47609422d..0000000000--- a/frontend/src/container/GantChart/SpanName/index.tsx+++ /dev/null@@ -1,22 +0,0 @@-import { Container, Service, Span, SpanWrapper } from './styles';--function SpanNameComponent({- name,- serviceName,-}: SpanNameComponentProps): JSX.Element {- return (- <Container title={`${name} ${serviceName}`}>- <SpanWrapper>- <Span truncate={1}>{name}</Span>- <Service truncate={1}>{serviceName}</Service>- </SpanWrapper>- </Container>- );-}--interface SpanNameComponentProps {- name: string;- serviceName: string;-}--export default SpanNameComponent;diff --git a/frontend/src/container/GantChart/SpanName/styles.ts b/frontend/src/container/GantChart/SpanName/styles.tsdeleted file mode 100644index e1cae17394..0000000000--- a/frontend/src/container/GantChart/SpanName/styles.ts+++ /dev/null@@ -1,41 +0,0 @@-import { Typography } from '@signozhq/ui/typography';-import styled from 'styled-components';--export const Span = styled(Typography.Text)`- &&& {- font-size: 0.75rem;- margin: 0;- /* border-bottom: 1px solid grey; */- }-`;--export const Service = styled(Typography.Text)`- &&& {- color: #acacac;- font-size: 0.75rem;- }-`;--export const SpanWrapper = styled.div`- display: flex;- flex-direction: column;- margin-left: 0.625rem;- width: 10rem;-`;--export const SpanConnector = styled.div`- width: 37px;- border: 1px solid #303030;- height: 0;-`;--export const Container = styled.div`- display: flex;- align-items: center;- justify-content: flex-start;-`;--export const SpanName = styled.div`- width: fit-content;- border-bottom: 1px solid black;-`;diff --git a/frontend/src/container/GantChart/Trace/index.tsx b/frontend/src/container/GantChart/Trace/index.tsxdeleted file mode 100644index a8188fc691..0000000000--- a/frontend/src/container/GantChart/Trace/index.tsx+++ /dev/null@@ -1,233 +0,0 @@-import {- Dispatch,- MouseEventHandler,- SetStateAction,- useEffect,- useMemo,- useRef,- useState,-} from 'react';-import { ChevronDown, ChevronRight } from '@signozhq/icons';-import { Col } from 'antd';-import { Typography } from '@signozhq/ui/typography';-import { StyledCol, StyledRow } from 'components/Styled';-import {- IIntervalUnit,- SPAN_DETAILS_LEFT_COL_WIDTH,-} from 'container/TraceDetail/utils';-import { useIsDarkMode } from 'hooks/useDarkMode';-import { ITraceTree } from 'types/api/trace/getTraceItem';--import { ITraceMetaData } from '..';-import Span from '../Span';-import SpanName from '../SpanName';-import { getMetaDataFromSpanTree, getTopLeftFromBody } from '../utils';-import {- CardComponent,- CardContainer,- CaretContainer,- HoverCard,- styles,- Wrapper,-} from './styles';-import { getIconStyles } from './utils';--function Trace(props: TraceProps): JSX.Element {- const {- name,- activeHoverId,- setActiveHoverId,- globalSpread,- globalStart,- serviceName,- startTime,- value,- serviceColour,- id,- setActiveSelectedId,- activeSelectedId,- level,- activeSpanPath,- isExpandAll,- intervalUnit,- children,- isMissing,- } = props;-- const isDarkMode = useIsDarkMode();-- const [isOpen, setOpen] = useState<boolean>(activeSpanPath[level] === id);-- const localTreeExpandInteraction = useRef<boolean | 0>(0); // Boolean is for the state of the expansion whereas the number i.e. 0 is for skipping the user interaction.-- useEffect(() => {- if (localTreeExpandInteraction.current !== 0) {- setOpen(localTreeExpandInteraction.current);- localTreeExpandInteraction.current = 0;- } else if (!isOpen) {- setOpen(activeSpanPath[level] === id);- }- }, [activeSpanPath, isOpen, id, level]);-- useEffect(() => {- if (isExpandAll) {- setOpen(isExpandAll);- } else {- setOpen(activeSpanPath[level] === id);- }- }, [isExpandAll, activeSpanPath, id, level]);-- const isOnlyChild = children.length === 1;- const [top, setTop] = useState<number>(0);-- const ref = useRef<HTMLUListElement>(null);-- useEffect(() => {- if (activeSelectedId === id) {- ref.current?.scrollIntoView({- block: 'nearest',- behavior: 'auto',- inline: 'nearest',- });- }- }, [activeSelectedId, id]);-- const onMouseEnterHandler = (): void => {- setActiveHoverId(id);- if (ref.current) {- const { top } = getTopLeftFromBody(ref.current);- setTop(top);- }- };-- const onMouseLeaveHandler = (): void => {- setActiveHoverId('');- };-- const onClick = (): void => {- setActiveSelectedId(id);- };-- const onClickTreeExpansion: MouseEventHandler<HTMLDivElement> = (- event,- ): void => {- event.stopPropagation();- setOpen((state) => {- localTreeExpandInteraction.current = !isOpen;- return !state;- });- };- const { totalSpans } = getMetaDataFromSpanTree(props);-- const inMsCount = value;- const nodeLeftOffset = ((startTime - globalStart) * 1e2) / globalSpread;- const width = (value * 1e2) / (globalSpread * 1e6);- const panelWidth = SPAN_DETAILS_LEFT_COL_WIDTH - level * (16 + 1) - 48;-- const iconStyles = useMemo(() => getIconStyles(), []);-- const icon = useMemo(- () =>- isOpen ? (- <ChevronDown size="md" style={iconStyles} />- ) : (- <ChevronRight size="md" style={iconStyles} />- ),- [isOpen, iconStyles],- );-- return (- <Wrapper- onMouseEnter={onMouseEnterHandler}- onMouseLeave={onMouseLeaveHandler}- isOnlyChild={isOnlyChild}- ref={ref}- isDarkMode={isDarkMode}- >- <HoverCard- top={top}- isHovered={activeHoverId === id}- isSelected={activeSelectedId === id}- isDarkMode={isDarkMode}- />-- <CardContainer isMissing={isMissing} onClick={onClick}>- <StyledCol flex={`${panelWidth}px`} styledclass={[styles.overFlowHidden]}>- <StyledRow styledclass={[styles.flexNoWrap]}>- <Col>- {totalSpans !== 1 && (- <CardComponent- isOnlyChild={isOnlyChild}- isDarkMode={isDarkMode}- onClick={onClickTreeExpansion}- >- <Typography style={{ wordBreak: 'normal' }}>{totalSpans}</Typography>- <CaretContainer>{icon}</CaretContainer>- </CardComponent>- )}- </Col>- <Col>- <SpanName name={name} serviceName={serviceName} />- </Col>- </StyledRow>- </StyledCol>- <Col flex="1">- <Span- globalStart={globalStart}- startTime={startTime}- name={name}- leftOffset={nodeLeftOffset.toString()}- width={width.toString()}- bgColor={serviceColour}- inMsCount={inMsCount / 1e6}- />- </Col>- </CardContainer>-- {isOpen && (- <>- {children.map((child) => (- <Trace- key={child.id}- activeHoverId={activeHoverId}- setActiveHoverId={setActiveHoverId}- {...child}- globalSpread={globalSpread}- globalStart={globalStart}- setActiveSelectedId={setActiveSelectedId}- activeSelectedId={activeSelectedId}- level={level + 1}- activeSpanPath={activeSpanPath}- isExpandAll={isExpandAll}- intervalUnit={intervalUnit}- isMissing={child.isMissing}- />- ))}- </>- )}- </Wrapper>- );-}--Trace.defaultProps = {- isMissing: false,-};--interface ITraceGlobal {- globalSpread: ITraceMetaData['spread'];- globalStart: ITraceMetaData['globalStart'];-}--interface TraceProps extends ITraceTree, ITraceGlobal {- activeHoverId: string;- setActiveHoverId: Dispatch<SetStateAction<string>>;- setActiveSelectedId: Dispatch<SetStateAction<string>>;- activeSelectedId: string;- level: number;- activeSpanPath: string[];- isExpandAll: boolean;- intervalUnit: IIntervalUnit;- isMissing?: boolean;-}--export default Trace;diff --git a/frontend/src/container/GantChart/Trace/styles.ts b/frontend/src/container/GantChart/Trace/styles.tsdeleted file mode 100644index a85eec454c..0000000000--- a/frontend/src/container/GantChart/Trace/styles.ts+++ /dev/null@@ -1,113 +0,0 @@-import { volcano } from '@ant-design/colors';-import styled, {- css,- DefaultTheme,- ThemedCssFunction,-} from 'styled-components';--interface Props {- isOnlyChild: boolean;-}--export const Wrapper = styled.ul<Props>`- display: flex;- flex-direction: column;- padding-bottom: 0.5rem;- padding-top: 0.5rem;- position: relative;- z-index: 1;- ul {- border-left: ${({ isOnlyChild }): StyledCSS =>- isOnlyChild && 'none'} !important;-- ${({ isOnlyChild }): StyledCSS =>- isOnlyChild &&- css`- &:before {- border-left: 1px solid #434343;- display: inline-block;- content: '';- height: 54px;- position: absolute;- left: 0;- top: -35px;- }- `}- }-`;--export const CardContainer = styled.li<{ isMissing?: boolean }>`- display: flex;- width: 100%;- cursor: pointer;- border-radius: 0.25rem;- z-index: 2;- ${({ isMissing }): string =>- isMissing ? `border: 1px dashed ${volcano[6]} !important;` : ''}-`;--interface Props {- isDarkMode: boolean;-}--export type StyledCSS =- | ReturnType<ThemedCssFunction<DefaultTheme>>- | string- | false- | undefined;--export const CardComponent = styled.div<Props>`- border: 1px solid- ${({ isDarkMode }): StyledCSS => (isDarkMode ? '#434343' : '#333')};- box-sizing: border-box;- border-radius: 2px;- display: flex;- justify-content: center;- align-items: center;- padding: 1px 8px;- background: ${({ isDarkMode }): StyledCSS =>- isDarkMode ? '#1d1d1d' : '#ddd'};- height: 22px;-`;--export const CaretContainer = styled.span`- margin-left: 0.304rem;-`;--interface HoverCardProps {- isHovered: boolean;- isSelected: boolean;- top: number;- isDarkMode: boolean;-}--export const HoverCard = styled.div<HoverCardProps>`- display: ${({ isSelected, isHovered }): string =>- isSelected || isHovered ? 'block' : 'none'};- width: 200%;- background-color: ${({ isHovered, isDarkMode }): string => {- if (isHovered) {- return isDarkMode ? '#262626' : '#ddd';- }- return isDarkMode ? '#4f4f4f' : '#bbb';- }};- position: absolute;- top: 0;- left: -100%;- right: 0;- height: 3rem;- opacity: 0.5;-`;--const flexNoWrap = css`- flex-wrap: nowrap;-`;--const overFlowHidden = css`- overflow: hidden;-`;--export const styles = {- flexNoWrap,- overFlowHidden,-};diff --git a/frontend/src/container/GantChart/Trace/utils.ts b/frontend/src/container/GantChart/Trace/utils.tsdeleted file mode 100644index dc9332b1e1..0000000000--- a/frontend/src/container/GantChart/Trace/utils.ts+++ /dev/null@@ -1,3 +0,0 @@-export const getIconStyles = (): Record<string, string> => ({- color: 'var(--l1-foreground)',-});diff --git a/frontend/src/container/GantChart/index.tsx b/frontend/src/container/GantChart/index.tsxdeleted file mode 100644index ad23241deb..0000000000--- a/frontend/src/container/GantChart/index.tsx+++ /dev/null@@ -1,91 +0,0 @@-import { Dispatch, SetStateAction, useEffect, useState } from 'react';-import { SquareMinus, SquarePlus } from '@signozhq/icons';-import { IIntervalUnit } from 'container/TraceDetail/utils';-import { ITraceTree } from 'types/api/trace/getTraceItem';--import { CardContainer, CardWrapper, CollapseButton } from './styles';-import Trace from './Trace';-import { getSpanPath } from './utils';--function GanttChart(props: GanttChartProps): JSX.Element {- const {- data,- traceMetaData,- activeHoverId,- setActiveHoverId,- activeSelectedId,- setActiveSelectedId,- spanId,- intervalUnit,- } = props;-- const { globalStart, spread: globalSpread } = traceMetaData;-- const [isExpandAll, setIsExpandAll] = useState<boolean>(false);- const [activeSpanPath, setActiveSpanPath] = useState<string[]>([]);-- useEffect(() => {- setActiveSpanPath(getSpanPath(data, spanId));- }, [spanId, data]);-- useEffect(() => {- setActiveSpanPath(getSpanPath(data, activeSelectedId));- }, [activeSelectedId, data]);-- const handleCollapse = (): void => {- setIsExpandAll((prev) => !prev);- };- return (- <CardContainer>- <CollapseButton- onClick={handleCollapse}- title={isExpandAll ? 'Collapse All' : 'Expand All'}- >- {isExpandAll ? (- <SquareMinus size={16} style={{ color: 'var(--accent-primary)' }} />- ) : (- <SquarePlus size={16} style={{ color: 'var(--accent-primary)' }} />- )}- </CollapseButton>- <CardWrapper>- <Trace- activeHoverId={activeHoverId}- activeSpanPath={activeSpanPath}- setActiveHoverId={setActiveHoverId}- key={data.id}- {...{- ...data,- globalSpread,- globalStart,- setActiveSelectedId,- activeSelectedId,- }}- level={0}- isExpandAll={isExpandAll}- intervalUnit={intervalUnit}- />- </CardWrapper>- </CardContainer>- );-}--export interface ITraceMetaData {- globalEnd: number;- globalStart: number;- levels: number;- spread: number;- totalSpans: number;-}--export interface GanttChartProps {- data: ITraceTree;- traceMetaData: ITraceMetaData;- activeSelectedId: string;- activeHoverId: string;- setActiveHoverId: Dispatch<SetStateAction<string>>;- setActiveSelectedId: Dispatch<SetStateAction<string>>;- spanId: string;- intervalUnit: IIntervalUnit;-}--export default GanttChart;diff --git a/frontend/src/container/GantChart/styles.ts b/frontend/src/container/GantChart/styles.tsdeleted file mode 100644index e5355d6641..0000000000--- a/frontend/src/container/GantChart/styles.ts+++ /dev/null@@ -1,48 +0,0 @@-import styled from 'styled-components';--export const Wrapper = styled.ul`- padding-left: 0;- position: absolute;- width: 100%;- height: 100%;-- ul {- list-style: none;- border-left: 1px solid #434343;- padding-left: 1rem;- width: 100%;- margin: 0px;- }-- ul li {- position: relative;-- &:before {- position: absolute;- left: -1rem;- top: 10px;- content: '';- height: 1px;- width: 1rem;- background-color: #434343;- }- }-`;--export const CardWrapper = styled.div`- display: flex;- width: 100%;- margin-left: 1rem;- margin-top: 1.5rem;-`;--export const CardContainer = styled.li`- display: flex;- width: 100%;- position: relative;-`;--export const CollapseButton = styled.div`- position: absolute;- top: 0;-`;diff --git a/frontend/src/container/GantChart/utils.ts b/frontend/src/container/GantChart/utils.tsdeleted file mode 100644index 55dae0519b..0000000000--- a/frontend/src/container/GantChart/utils.ts+++ /dev/null@@ -1,203 +0,0 @@-import { set } from 'lodash-es';-import { ITraceForest, ITraceTree } from 'types/api/trace/getTraceItem';--interface GetTraceMetaData {- globalStart: number;- globalEnd: number;- spread: number;- totalSpans: number;- levels: number;-}-export const getMetaDataFromSpanTree = (- treeData: ITraceTree,-): GetTraceMetaData => {- let globalStart = Number.POSITIVE_INFINITY;- let globalEnd = Number.NEGATIVE_INFINITY;- let totalSpans = 0;- let levels = 1;- const traverse = (treeNode: ITraceTree, level = 0): void => {- if (!treeNode) {- return;- }- totalSpans += 1;- levels = Math.max(levels, level);- const { startTime } = treeNode;- const endTime = startTime + treeNode.value;- globalStart = Math.min(globalStart, startTime);- globalEnd = Math.max(globalEnd, endTime);-- treeNode.children.forEach((childNode) => {- traverse(childNode, level + 1);- });- };- traverse(treeData, 1);-- globalStart *= 1e6;- globalEnd *= 1e6;-- return {- globalStart,- globalEnd,- spread: globalEnd - globalStart,- totalSpans,- levels,- };-};--export function getTopLeftFromBody(elem: HTMLElement): {- top: number;- left: number;-} {- const box = elem.getBoundingClientRect();-- const { body } = document;- const docEl = document.documentElement;-- const scrollTop = window.pageYOffset || docEl.scrollTop || body.scrollTop;- const scrollLeft = window.pageXOffset || docEl.scrollLeft || body.scrollLeft;-- const clientTop = docEl.clientTop || body.clientTop || 0;- const clientLeft = docEl.clientLeft || body.clientLeft || 0;-- const top = box.top + scrollTop - clientTop;- const left = box.left + scrollLeft - clientLeft;-- return { top: Math.round(top), left: Math.round(left) };-}--export const getNodeById = (- searchingId: string,- treesData: ITraceForest | undefined,-): ITraceForest => {- const newtreeData: ITraceForest = {} as ITraceForest;-- const traverse = (- treeNode: ITraceTree,- setCallBack: (arg0: ITraceTree) => void,- level = 0,- ): void => {- if (!treeNode) {- return;- }-- if (searchingId === treeNode.id) {- setCallBack(treeNode);- }-- treeNode.children.forEach((childNode) => {- traverse(childNode, setCallBack, level + 1);- });- };-- const spanTreeSetCallback = (- path: (keyof ITraceForest)[],- value: ITraceTree,- ): ITraceForest => set(newtreeData, path, [value]);-- if (treesData?.spanTree) {- treesData.spanTree.forEach((tree) => {- traverse(tree, (value) => spanTreeSetCallback(['spanTree'], value), 1);- });- }-- if (treesData?.missingSpanTree) {- treesData.missingSpanTree.forEach((tree) => {- traverse(- tree,- (value) => spanTreeSetCallback(['missingSpanTree'], value),- 1,- );- });- }-- return newtreeData;-};--const getSpanWithoutChildren = (- span: ITraceTree,-): Omit<ITraceTree, 'children'> => ({- id: span.id,- name: span.name,- parent: span.parent,- serviceColour: span.serviceColour,- serviceName: span.serviceName,- startTime: span.startTime,- tags: span.tags,- time: span.time,- value: span.value,- event: span.event,- hasError: span.hasError,- spanKind: span.spanKind,- statusCodeString: span.statusCodeString,- statusMessage: span.statusMessage,-});--export const isSpanPresentInSearchString = (- searchedString: string,- tree: ITraceTree,-): boolean => {- const parsedTree = getSpanWithoutChildren(tree);-- const stringifyTree = JSON.stringify(parsedTree);-- return stringifyTree.includes(searchedString);-};--export const isSpanPresent = (- tree: ITraceTree,- searchedKey: string,-): ITraceTree[] => {- const foundNode: ITraceTree[] = [];-- const traverse = (- treeNode: ITraceTree,- level = 0,- foundNode: ITraceTree[],- ): void => {- if (!treeNode) {- return;- }-- const isPresent = isSpanPresentInSearchString(searchedKey, treeNode);-- if (isPresent) {- foundNode.push(treeNode);- }-- treeNode.children.forEach((childNode) => {- traverse(childNode, level + 1, foundNode);- });- };- traverse(tree, 1, foundNode);-- return foundNode;-};--export const getSpanPath = (tree: ITraceTree, spanId: string): string[] => {- const spanPath: string[] = [];-- const traverse = (treeNode: ITraceTree): boolean => {- if (!treeNode) {- return false;- }-- spanPath.push(treeNode.id);-- if (spanId === treeNode.id) {- return true;- }-- let foundInChild = false;- treeNode.children.forEach((childNode) => {- if (traverse(childNode)) {- foundInChild = true;- }- });- if (!foundInChild) {- spanPath.pop();- }- return foundInChild;- };- traverse(tree);- return spanPath;-};diff --git a/frontend/src/container/Home/Services/ServiceMetrics.tsx b/frontend/src/container/Home/Services/ServiceMetrics.tsxindex a60284c9f5..5d29143130 100644--- a/frontend/src/container/Home/Services/ServiceMetrics.tsx+++ b/frontend/src/container/Home/Services/ServiceMetrics.tsx@@ -28,7 +28,7 @@ import {} from 'types/api/licensesV3/getActive';import { ServicesList } from 'types/api/metrics/getService';import { GlobalReducer } from 'types/reducer/globalTime';-import { Tags } from 'types/reducer/trace';+import { Tags } from 'hooks/useResourceAttribute/types';import { USER_ROLES } from 'types/roles';import { isModifierKeyPressed } from 'utils/app';import { openInNewTab } from 'utils/navigation';diff --git a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/traceListColumns.tsx b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/traceListColumns.tsxindex 0e835287fc..4bcc8ca870 100644--- a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/traceListColumns.tsx+++ b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/traceListColumns.tsx@@ -3,7 +3,7 @@ import { Badge } from '@signozhq/ui/badge';import { Typography } from '@signozhq/ui/typography';import HttpStatusBadge from 'components/HttpStatusBadge/HttpStatusBadge';import { TextNoData } from '../../components/TextNoData';-import { getMs } from 'container/Trace/Filters/Panel/PanelBody/Duration/util';+import { getMs } from 'utils/timeUtils';import {BlockLink,getTraceLink,diff --git a/frontend/src/container/LLMObservability/Explorer/ListView/utils.tsx b/frontend/src/container/LLMObservability/Explorer/ListView/utils.tsxindex 1295f14a12..9c5fff0d77 100644--- a/frontend/src/container/LLMObservability/Explorer/ListView/utils.tsx+++ b/frontend/src/container/LLMObservability/Explorer/ListView/utils.tsx@@ -1,6 +1,7 @@import type { TracesTableRow } from '../TracesTable/getFieldColumn';+import { generatePath } from 'react-router-dom';import ROUTES from 'constants/routes';-import { formUrlParams } from 'container/TraceDetail/utils';+import { formUrlParams } from 'utils/traceUtils';import { QueryDataV3 } from 'types/api/widgets/getQuery';export const getTraceLink = (record: Record<string, unknown>): string => {@@ -14,7 +15,11 @@ export const getTraceLink = (record: Record<string, unknown>): string => {const traceId = readId(record.traceID) || readId(record.trace_id);const spanId = readId(record.spanID) || readId(record.span_id);- return `${ROUTES.TRACE}/${traceId}${formUrlParams({+ if (!traceId) {+ return '';+ }++ return `${generatePath(ROUTES.TRACE_DETAIL, { id: traceId })}${formUrlParams({spanId,levelUp: 0,levelDown: 0,diff --git a/frontend/src/container/LLMObservability/Explorer/TracesTable/FieldCell.tsx b/frontend/src/container/LLMObservability/Explorer/TracesTable/FieldCell.tsxindex f7393f294e..240e474e9d 100644--- a/frontend/src/container/LLMObservability/Explorer/TracesTable/FieldCell.tsx+++ b/frontend/src/container/LLMObservability/Explorer/TracesTable/FieldCell.tsx@@ -3,7 +3,7 @@ import { Badge } from '@signozhq/ui/badge';import TanStackTable from 'components/TanStackTableView';import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';import ROUTES from 'constants/routes';-import { getMs } from 'container/Trace/Filters/Panel/PanelBody/Duration/util';+import { getMs } from 'utils/timeUtils';import { useTimezone } from 'providers/Timezone';import {diff --git a/frontend/src/container/MetricsApplication/Tabs/Overview.tsx b/frontend/src/container/MetricsApplication/Tabs/Overview.tsxindex 0982c917cf..3ef7e6af1b 100644--- a/frontend/src/container/MetricsApplication/Tabs/Overview.tsx+++ b/frontend/src/container/MetricsApplication/Tabs/Overview.tsx@@ -242,7 +242,7 @@ function Application(): JSX.Element {urlParams.set(QueryParams.startTime, startTime.toString());urlParams.set(QueryParams.endTime, endTime.toString());urlParams.delete(QueryParams.relativeTime);- const avialableParams = routeConfig[ROUTES.TRACE];+ const avialableParams = routeConfig[ROUTES.TRACES_EXPLORER];const queryString = getQueryString(avialableParams, urlParams);const JSONCompositeQuery = encodeURIComponent(diff --git a/frontend/src/container/MetricsApplication/Tabs/Overview/TopOperation.tsx b/frontend/src/container/MetricsApplication/Tabs/Overview/TopOperation.tsxindex 2ebcbe4589..614afa3fba 100644--- a/frontend/src/container/MetricsApplication/Tabs/Overview/TopOperation.tsx+++ b/frontend/src/container/MetricsApplication/Tabs/Overview/TopOperation.tsx@@ -10,7 +10,7 @@ import { convertRawQueriesToTraceSelectedTags } from 'hooks/useResourceAttributeimport { AppState } from 'store/reducers';import { PayloadProps } from 'types/api/metrics/getTopOperations';import { GlobalReducer } from 'types/reducer/globalTime';-import { Tags } from 'types/reducer/trace';+import { Tags } from 'hooks/useResourceAttribute/types';function TopOperation(): JSX.Element {const { maxTime, minTime } = useSelector<AppState, GlobalReducer>(diff --git a/frontend/src/container/MetricsApplication/Tabs/util.ts b/frontend/src/container/MetricsApplication/Tabs/util.tsindex 609b4e0e83..b5ab42d400 100644--- a/frontend/src/container/MetricsApplication/Tabs/util.ts+++ b/frontend/src/container/MetricsApplication/Tabs/util.ts@@ -10,7 +10,7 @@ import useResourceAttribute from 'hooks/useResourceAttribute';import { resourceAttributesToTracesFilterItems } from 'hooks/useResourceAttribute/utils';import createQueryParams from 'lib/createQueryParams';import { prepareQueryWithDefaultTimestamp } from 'pages/LogsExplorer/utils';-import { traceFilterKeys } from 'pages/TracesExplorer/Filter/filterUtils';+import { traceFilterKeys } from 'constants/traceFilterKeys';import {BaseAutocompleteData,DataTypes,@@ -21,7 +21,7 @@ import {TagFilterItem,} from 'types/api/queryBuilder/queryBuilderData';import { DataSource } from 'types/common/queryBuilder';-import { Tags } from 'types/reducer/trace';+import { Tags } from 'hooks/useResourceAttribute/types';import { isModifierKeyPressed } from 'utils/app';import { secondsToMilliseconds } from 'utils/timeUtils';import { v4 as uuid } from 'uuid';@@ -102,7 +102,7 @@ export function onViewTracePopupClick({urlParams.set(QueryParams.startTime, startTime.toString());urlParams.set(QueryParams.endTime, endTime.toString());urlParams.delete(QueryParams.relativeTime);- const avialableParams = routeConfig[ROUTES.TRACE];+ const avialableParams = routeConfig[ROUTES.TRACES_EXPLORER];const queryString = getQueryString(avialableParams, urlParams);const JSONCompositeQuery = encodeURIComponent(diff --git a/frontend/src/container/MetricsApplication/__tests__/TopOperationsTable.test.tsx b/frontend/src/container/MetricsApplication/__tests__/TopOperationsTable.test.tsxindex 74a0d90755..d9997117ad 100644--- a/frontend/src/container/MetricsApplication/__tests__/TopOperationsTable.test.tsx+++ b/frontend/src/container/MetricsApplication/__tests__/TopOperationsTable.test.tsx@@ -56,10 +56,6 @@ jest.mock('../Tabs/util', () => ({}));// Mock the resourceAttributesToTracesFilterItems function-jest.mock('container/TraceDetail/utils', () => ({- resourceAttributesToTracesFilterItems: (): any[] => [],-}));-const mockedUseResourceAttribute = useResourceAttribute as jest.MockedFunction<typeof useResourceAttribute>;diff --git a/frontend/src/container/NewExplorerCTA/NewExplorerCTA.styles.scss b/frontend/src/container/NewExplorerCTA/NewExplorerCTA.styles.scssdeleted file mode 100644index 3a36eed052..0000000000--- a/frontend/src/container/NewExplorerCTA/NewExplorerCTA.styles.scss+++ /dev/null@@ -1,5 +0,0 @@-.new-explorer-cta-with-badge {- display: inline-flex;- align-items: center;- gap: 6px;-}diff --git a/frontend/src/container/NewExplorerCTA/config.ts b/frontend/src/container/NewExplorerCTA/config.tsdeleted file mode 100644index dde8845758..0000000000--- a/frontend/src/container/NewExplorerCTA/config.ts+++ /dev/null@@ -1,8 +0,0 @@-import ROUTES from 'constants/routes';--export const buttonText: Record<string, string> = {- [ROUTES.LOGS_EXPLORER]: 'Old Explorer',- [ROUTES.TRACE]: 'New Explorer',- [ROUTES.OLD_LOGS_EXPLORER]: 'New Explorer',- [ROUTES.TRACES_EXPLORER]: 'Old Explorer',-};diff --git a/frontend/src/container/NewExplorerCTA/index.tsx b/frontend/src/container/NewExplorerCTA/index.tsxdeleted file mode 100644index 695de96434..0000000000--- a/frontend/src/container/NewExplorerCTA/index.tsx+++ /dev/null@@ -1,83 +0,0 @@-import React, { useCallback, useMemo } from 'react';-import { useLocation } from 'react-router-dom';-import { Button } from 'antd';-import { Badge } from '@signozhq/ui/badge';-import ROUTES from 'constants/routes';-import { useSafeNavigate } from 'hooks/useSafeNavigate';-import { Undo } from '@signozhq/icons';-import { isModifierKeyPressed } from 'utils/app';--import { buttonText } from './config';--import './NewExplorerCTA.styles.scss';--function NewExplorerCTA(): JSX.Element | null {- const location = useLocation();- const { safeNavigate } = useSafeNavigate();-- const isTraceOrLogsExplorerPage = useMemo(- () =>- location.pathname === ROUTES.LOGS_EXPLORER ||- location.pathname === ROUTES.TRACE ||- location.pathname === ROUTES.OLD_LOGS_EXPLORER ||- location.pathname === ROUTES.TRACES_EXPLORER,- [location.pathname],- );-- const onClickHandler = useCallback(- (e?: React.MouseEvent): void => {- let targetPath: string;- if (location.pathname === ROUTES.LOGS_EXPLORER) {- targetPath = ROUTES.OLD_LOGS_EXPLORER;- } else if (location.pathname === ROUTES.TRACE) {- targetPath = ROUTES.TRACES_EXPLORER;- } else if (location.pathname === ROUTES.OLD_LOGS_EXPLORER) {- targetPath = ROUTES.LOGS_EXPLORER;- } else if (location.pathname === ROUTES.TRACES_EXPLORER) {- targetPath = ROUTES.TRACE;- } else {- return;- }- safeNavigate(targetPath, { newTab: !!e && isModifierKeyPressed(e) });- },- [location.pathname],- );-- const button = useMemo(- () => (- <Button- icon={<Undo size={16} />}- onClick={(e): void => onClickHandler(e)}- data-testid="newExplorerCTA"- type="text"- className="periscope-btn link"- >- {buttonText[location.pathname]}- </Button>- ),- [location.pathname, onClickHandler],- );-- if (!isTraceOrLogsExplorerPage) {- return null;- }-- if (location.pathname === ROUTES.TRACES_EXPLORER) {- return button;- }-- if (location.pathname === ROUTES.LOGS_EXPLORER) {- return button;- }-- return (- <span className="new-explorer-cta-with-badge">- {button}- <Badge color="robin" variant="default">- New- </Badge>- </span>- );-}--export default NewExplorerCTA;diff --git a/frontend/src/container/OptionsMenu/useOptionsMenu.ts b/frontend/src/container/OptionsMenu/useOptionsMenu.tsindex 43ad21c085..4ec602ebf7 100644--- a/frontend/src/container/OptionsMenu/useOptionsMenu.ts+++ b/frontend/src/container/OptionsMenu/useOptionsMenu.ts@@ -10,7 +10,7 @@ import useDebounce from 'hooks/useDebounce';import { useNotifications } from 'hooks/useNotifications';import useUrlQueryData from 'hooks/useUrlQueryData';import { has } from 'lodash-es';-import { AllTraceFilterKeyValue } from 'pages/TracesExplorer/Filter/filterUtils';+import { AllTraceFilterKeyValue } from 'constants/traceFilterKeys';import { usePreferenceContext } from 'providers/preferences/context/PreferenceContextProvider';import {QueryKeyRequestProps,diff --git a/frontend/src/container/PipelinePage/PipelineListsView/styles.tsx b/frontend/src/container/PipelinePage/PipelineListsView/styles.tsxindex 58c0d2f902..e6f98cc2d3 100644--- a/frontend/src/container/PipelinePage/PipelineListsView/styles.tsx+++ b/frontend/src/container/PipelinePage/PipelineListsView/styles.tsx@@ -3,7 +3,7 @@ import { Badge } from '@signozhq/ui/badge';import { Button, Table, TableProps } from 'antd';import { Typography } from '@signozhq/ui/typography';import { themeColors } from 'constants/theme';-import { StyledCSS } from 'container/GantChart/Trace/styles';+import { StyledCSS } from 'types/styledComponents';import styled from 'styled-components';export const FooterButton = styled(Button)`diff --git a/frontend/src/container/ServiceApplication/ServiceMetrics/index.tsx b/frontend/src/container/ServiceApplication/ServiceMetrics/index.tsxindex 6090a184c0..531db2fde0 100644--- a/frontend/src/container/ServiceApplication/ServiceMetrics/index.tsx+++ b/frontend/src/container/ServiceApplication/ServiceMetrics/index.tsx@@ -11,7 +11,7 @@ import useResourceAttribute from 'hooks/useResourceAttribute';import { convertRawQueriesToTraceSelectedTags } from 'hooks/useResourceAttribute/utils';import { AppState } from 'store/reducers';import { GlobalReducer } from 'types/reducer/globalTime';-import { Tags } from 'types/reducer/trace';+import { Tags } from 'hooks/useResourceAttribute/types';import SkipOnBoardingModal from '../SkipOnBoardModal';import ServiceMetricsApplication from './ServiceMetricsApplication';diff --git a/frontend/src/container/ServiceApplication/ServiceTraces/index.tsx b/frontend/src/container/ServiceApplication/ServiceTraces/index.tsxindex 0ecbdf92ac..4a772b472c 100644--- a/frontend/src/container/ServiceApplication/ServiceTraces/index.tsx+++ b/frontend/src/container/ServiceApplication/ServiceTraces/index.tsx@@ -15,7 +15,7 @@ import {import { isUndefined } from 'lodash-es';import { AppState } from 'store/reducers';import { GlobalReducer } from 'types/reducer/globalTime';-import { Tags } from 'types/reducer/trace';+import { Tags } from 'hooks/useResourceAttribute/types';import SkipOnBoardingModal from '../SkipOnBoardModal';import ServiceTraceTable from './ServiceTracesTable';diff --git a/frontend/src/container/SideNav/config.ts b/frontend/src/container/SideNav/config.tsindex 2851bf9953..3aa9ab5c21 100644--- a/frontend/src/container/SideNav/config.ts+++ b/frontend/src/container/SideNav/config.ts@@ -42,9 +42,7 @@ export const routeConfig: Record<string, QueryParams[]> = {[ROUTES.SIGN_UP]: [QueryParams.resourceAttributes],[ROUTES.SOMETHING_WENT_WRONG]: [QueryParams.resourceAttributes],[ROUTES.TRACES_EXPLORER]: [QueryParams.resourceAttributes],- [ROUTES.TRACE]: [QueryParams.resourceAttributes],[ROUTES.TRACE_DETAIL]: [QueryParams.resourceAttributes],- [ROUTES.TRACE_DETAIL_OLD]: [QueryParams.resourceAttributes],[ROUTES.UN_AUTHORIZED]: [QueryParams.resourceAttributes],[ROUTES.USAGE_EXPLORER]: [QueryParams.resourceAttributes],[ROUTES.VERSION]: [QueryParams.resourceAttributes],diff --git a/frontend/src/container/SideNav/menuItems.tsx b/frontend/src/container/SideNav/menuItems.tsxindex e11c52874f..469a09c86d 100644--- a/frontend/src/container/SideNav/menuItems.tsx+++ b/frontend/src/container/SideNav/menuItems.tsx@@ -568,7 +568,7 @@ export const getUserSettingsDropdownMenuItems = ({This is used to highlight the correct menu item when the user navigates to a new route**/export const NEW_ROUTES_MENU_ITEM_KEY_MAP: Record<string, string> = {- [ROUTES.TRACE]: ROUTES.TRACES_EXPLORER,+ [ROUTES.TRACE_BASE]: ROUTES.TRACES_EXPLORER,[ROUTES.TRACE_EXPLORER]: ROUTES.TRACES_EXPLORER,[ROUTES.LOGS_BASE]: ROUTES.LOGS_EXPLORER,[ROUTES.METRICS_EXPLORER_BASE]: ROUTES.METRICS_EXPLORER,@@ -580,7 +580,7 @@ export const NEW_ROUTES_MENU_ITEM_KEY_MAP: Record<string, string> = {// `getActiveMenuKeyFromPath` strips the URL down to its first segment;// `/ai-assistant/<id>` reduces to `/ai-assistant`, which we point back// to the AI Assistant menu item's concrete key.- '/ai-assistant': AI_ASSISTANT_NAV_KEY,+ [ROUTES.AI_ASSISTANT_BASE]: AI_ASSISTANT_NAV_KEY,};export default menuItems;diff --git a/frontend/src/container/Toolbar/Toolbar.tsx b/frontend/src/container/Toolbar/Toolbar.tsxindex ecae9e8b14..2a81d73fd3 100644--- a/frontend/src/container/Toolbar/Toolbar.tsx+++ b/frontend/src/container/Toolbar/Toolbar.tsx@@ -2,7 +2,6 @@ import { useMemo } from 'react';import { useLocation } from 'react-router-dom';import ROUTES from 'constants/routes';import LiveLogsPauseResume from 'container/LiveLogs/LiveLogsPauseResume/LiveLogsPauseResume';-import NewExplorerCTA from 'container/NewExplorerCTA';import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';import { noop } from 'lodash-es';@@ -12,7 +11,6 @@ interface ToolbarProps {showAutoRefresh: boolean;leftActions?: JSX.Element;rightActions?: JSX.Element;- showOldCTA?: boolean;warningElement?: JSX.Element;onGoLive?: () => void;onExitLiveLogs?: () => void;@@ -23,7 +21,6 @@ export default function Toolbar({showAutoRefresh,leftActions,rightActions,- showOldCTA,warningElement,showLiveLogs,onGoLive,@@ -48,7 +45,6 @@ export default function Toolbar({<div className="rightActions"><div className="timeRange">{warningElement}- {showOldCTA && <NewExplorerCTA />}{showLiveLogs && <LiveLogsPauseResume />}<DateTimeSelectionV2showLiveLogs={showLiveLogs}@@ -69,7 +65,6 @@ export default function Toolbar({Toolbar.defaultProps = {leftActions: <div />,rightActions: <div />,- showOldCTA: false,warningElement: <div />,showLiveLogs: false,onGoLive: (): void => noop(),diff --git a/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.edge-cases.test.tsx b/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.edge-cases.test.tsxindex 28097ddf05..6c6b6b434b 100644--- a/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.edge-cases.test.tsx+++ b/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.edge-cases.test.tsx@@ -20,11 +20,6 @@ jest.mock('hooks/useSafeNavigate', () => ({}),}));-jest.mock('container/NewExplorerCTA', () => ({- __esModule: true,- default: (): null => null,-}));-jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({__esModule: true,default: ({diff --git a/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.modal-mode.test.tsx b/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.modal-mode.test.tsxindex 933f2308eb..d32abf489c 100644--- a/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.modal-mode.test.tsx+++ b/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.modal-mode.test.tsx@@ -20,11 +20,6 @@ jest.mock('hooks/useSafeNavigate', () => ({}),}));-jest.mock('container/NewExplorerCTA', () => ({- __esModule: true,- default: (): null => null,-}));-let mockOnCustomDateHandler: ((range: [unknown, unknown]) => void) | null =null;let mockOnValidCustomDateChange: ((data: { timeStr: string }) => void) | null =diff --git a/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.regression.test.tsx b/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.regression.test.tsxindex 7f009801a9..e349bda704 100644--- a/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.regression.test.tsx+++ b/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.regression.test.tsx@@ -61,11 +61,6 @@ jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({),}));-jest.mock('container/NewExplorerCTA', () => ({- __esModule: true,- default: (): null => null,-}));-function NuqsParamSetter({ paramValue }: { paramValue: string }): JSX.Element {const [, setYAxisUnit] = useQueryState('yAxisUnit',diff --git a/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.routes.test.tsx b/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.routes.test.tsxindex d5087faa2b..2347b9975a 100644--- a/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.routes.test.tsx+++ b/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.routes.test.tsx@@ -15,11 +15,6 @@ jest.mock('hooks/useSafeNavigate', () => ({}),}));-jest.mock('container/NewExplorerCTA', () => ({- __esModule: true,- default: (): null => null,-}));-jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({__esModule: true,default: (): JSX.Element => <div data-testid="custom-time-picker" />,diff --git a/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.time-selection.test.tsx b/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.time-selection.test.tsxindex 83b603df45..a2e68955be 100644--- a/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.time-selection.test.tsx+++ b/frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.time-selection.test.tsx@@ -20,11 +20,6 @@ jest.mock('hooks/useSafeNavigate', () => ({}),}));-jest.mock('container/NewExplorerCTA', () => ({- __esModule: true,- default: (): null => null,-}));-let mockOnCustomDateHandler: ((range: [unknown, unknown]) => void) | null =null;let mockOnValidCustomDateChange: ((data: { timeStr: string }) => void) | null =diff --git a/frontend/src/container/TopNav/DateTimeSelectionV2/constants.ts b/frontend/src/container/TopNav/DateTimeSelectionV2/constants.tsindex 47ee87e4ed..48a9ad34ee 100644--- a/frontend/src/container/TopNav/DateTimeSelectionV2/constants.ts+++ b/frontend/src/container/TopNav/DateTimeSelectionV2/constants.ts@@ -143,7 +143,6 @@ export const routesToSkip = [ROUTES.SETTINGS,ROUTES.LIST_ALL_ALERT,ROUTES.TRACE_DETAIL,- ROUTES.TRACE_DETAIL_OLD,ROUTES.ALL_CHANNELS,ROUTES.USAGE_EXPLORER,ROUTES.GET_STARTED_WITH_CLOUD,diff --git a/frontend/src/container/TopNav/DateTimeSelectionV2/index.tsx b/frontend/src/container/TopNav/DateTimeSelectionV2/index.tsxindex 6a752c7215..1636bc8047 100644--- a/frontend/src/container/TopNav/DateTimeSelectionV2/index.tsx+++ b/frontend/src/container/TopNav/DateTimeSelectionV2/index.tsx@@ -12,7 +12,6 @@ import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';import { LOCALSTORAGE } from 'constants/localStorage';import { QueryParams } from 'constants/query';import ROUTES from 'constants/routes';-import NewExplorerCTA from 'container/NewExplorerCTA';import dayjs, { Dayjs } from 'dayjs';import {useGlobalTimeQueryInvalidate,@@ -65,7 +64,6 @@ function DateTimeSelection({updateTimeInterval,globalTimeLoading,showResetButton = false,- showOldExplorerCTA = false,defaultRelativeTime = RelativeTimeMap['6hr'] as Time,isModalTimeSelection = false,onTimeChange,@@ -688,12 +686,6 @@ function DateTimeSelection({</FormItem>)}- {showOldExplorerCTA && (- <div style={{ marginRight: 12 }}>- <NewExplorerCTA />- </div>- )}-{!hasSelectedTimeError && !refreshButtonHidden && showRefreshText && (<div className="refresh-text-container"><RefreshText@@ -770,7 +762,6 @@ interface DateTimeSelectionV2Props {showAutoRefresh: boolean;showRefreshText?: boolean;hideShareModal?: boolean;- showOldExplorerCTA?: boolean;showResetButton?: boolean;defaultRelativeTime?: Time;isModalTimeSelection?: boolean;@@ -792,7 +783,6 @@ interface DateTimeSelectionV2Props {DateTimeSelection.defaultProps = {hideShareModal: false,- showOldExplorerCTA: false,showRefreshText: true,showResetButton: false,defaultRelativeTime: RelativeTimeMap['6hr'] as Time,diff --git a/frontend/src/container/TopNav/index.tsx b/frontend/src/container/TopNav/index.tsxindex 8eb161e89a..e58daf388b 100644--- a/frontend/src/container/TopNav/index.tsx+++ b/frontend/src/container/TopNav/index.tsx@@ -3,7 +3,6 @@ import { matchPath, useHistory } from 'react-router-dom';import HeaderRightSection from 'components/HeaderRightSection/HeaderRightSection';import ROUTES from 'constants/routes';-import NewExplorerCTA from '../NewExplorerCTA';import DateTimeSelector from './DateTimeSelectionV2';import { routesToDisable, routesToSkip } from './DateTimeSelectionV2/constants';@@ -44,7 +43,6 @@ function TopNav(): JSX.Element | null {return !isRouteToSkip ? (<div className="top-nav-container">- <NewExplorerCTA /><DateTimeSelector showAutoRefresh /><HeaderRightSection enableShare enableFeedback enableAnnouncements={false} /></div>diff --git a/frontend/src/container/Trace/Filters/Panel/PanelBody/Common/Checkbox.tsx b/frontend/src/container/Trace/Filters/Panel/PanelBody/Common/Checkbox.tsxdeleted file mode 100644index 7a5e0aad86..0000000000--- a/frontend/src/container/Trace/Filters/Panel/PanelBody/Common/Checkbox.tsx+++ /dev/null@@ -1,200 +0,0 @@-import { useMemo, useState } from 'react';-// eslint-disable-next-line no-restricted-imports-import { useDispatch, useSelector } from 'react-redux';-import { Tooltip } from 'antd';-import { Checkbox } from '@signozhq/ui/checkbox';-import { Typography } from '@signozhq/ui/typography';-import getFilters from 'api/trace/getFilters';-import { AxiosError } from 'axios';-import { useNotifications } from 'hooks/useNotifications';-// eslint-disable-next-line no-restricted-imports-import { Dispatch } from 'redux';-import { getFilter, updateURL } from 'store/actions/trace/util';-import { AppState } from 'store/reducers';-import AppActions from 'types/actions';-import { UPDATE_ALL_FILTERS } from 'types/actions/trace';-import { GlobalReducer } from 'types/reducer/globalTime';-import { TraceFilterEnum, TraceReducer } from 'types/reducer/trace';--import { CheckBoxContainer, ParaGraph } from './styles';--function CheckBoxComponent(props: CheckBoxProps): JSX.Element {- const {- selectedFilter,- filterLoading,- filterToFetchData,- spansAggregate,- selectedTags,- filter,- userSelectedFilter,- isFilterExclude,- spanKind,- } = useSelector<AppState, TraceReducer>((state) => state.traces);-- const globalTime = useSelector<AppState, GlobalReducer>(- (state) => state.globalTime,- );- const { keyValue, name, value } = props;-- const dispatch = useDispatch<Dispatch<AppActions>>();-- const [isLoading, setIsLoading] = useState<boolean>(false);-- const isUserSelected =- (userSelectedFilter.get(name) || []).find((e) => e === keyValue) !==- undefined;-- const { notifications } = useNotifications();-- // eslint-disable-next-line sonarjs/cognitive-complexity- const onCheckHandler = async (): Promise<void> => {- try {- setIsLoading(true);-- const newSelectedMap = new Map(selectedFilter);- const preUserSelectedMap = new Map(userSelectedFilter);- const preIsFilterExclude = new Map(isFilterExclude);-- const isTopicPresent = preUserSelectedMap.get(name);-- // append the value- if (!isTopicPresent) {- preUserSelectedMap.set(name, [keyValue]);- } else {- const isValuePresent =- isTopicPresent.find((e) => e === keyValue) !== undefined;-- // check the value if present then remove the value or isChecked- if (isValuePresent) {- preUserSelectedMap.set(- name,- isTopicPresent.filter((e) => e !== keyValue),- );- } else {- // if not present add into the array of string- preUserSelectedMap.set(name, [...isTopicPresent, keyValue]);- }- }-- if (newSelectedMap.get(name)?.find((e) => e === keyValue)) {- newSelectedMap.set(name, [- ...(newSelectedMap.get(name) || []).filter((e) => e !== keyValue),- ]);- } else {- newSelectedMap.set(name, [- ...new Set([...(newSelectedMap.get(name) || []), keyValue]),- ]);- }-- if (preIsFilterExclude.get(name) !== false) {- preIsFilterExclude.set(name, true);- }-- const response = await getFilters({- other: Object.fromEntries(newSelectedMap),- end: String(globalTime.maxTime),- start: String(globalTime.minTime),- getFilters: filterToFetchData.filter((e) => e !== name),- isFilterExclude: preIsFilterExclude,- spanKind,- });-- if (response.statusCode === 200) {- const updatedFilter = getFilter(response.payload);-- // updatedFilter.forEach((value, key) => {- // if (key !== 'duration' && name !== key) {- // preUserSelectedMap.set(key, Object.keys(value));- // }-- // if (key === 'duration') {- // newSelectedMap.set('duration', [value.maxDuration, value.minDuration]);- // }- // });-- updatedFilter.set(name, {- [`${keyValue}`]: '-1',- ...(filter.get(name) || {}),- ...(updatedFilter.get(name) || {}),- });-- dispatch({- type: UPDATE_ALL_FILTERS,- payload: {- selectedTags,- current: spansAggregate.currentPage,- filter: updatedFilter,- filterToFetchData,- selectedFilter: newSelectedMap,- userSelected: preUserSelectedMap,- isFilterExclude: preIsFilterExclude,- order: spansAggregate.order,- orderParam: spansAggregate.orderParam,- pageSize: spansAggregate.pageSize,- spanKind,- },- });-- setIsLoading(false);-- updateURL(- newSelectedMap,- filterToFetchData,- spansAggregate.currentPage,- selectedTags,- preIsFilterExclude,- preUserSelectedMap,- spansAggregate.order,- spansAggregate.pageSize,- spansAggregate.orderParam,- );- } else {- setIsLoading(false);-- notifications.error({- message: response.error || 'Something went wrong',- });- }- } catch (error) {- notifications.error({- message: (error as AxiosError).toString() || 'Something went wrong',- });- setIsLoading(false);- }- };-- const isCheckBoxSelected = isUserSelected;-- const TooTipOverLay = useMemo(- (): JSX.Element => <div>{keyValue}</div>,- [keyValue],- );-- return (- <CheckBoxContainer>- <Checkbox- disabled={isLoading || filterLoading}- onClick={onCheckHandler}- value={isCheckBoxSelected}- key={keyValue}- >- <Tooltip overlay={TooTipOverLay}>- <ParaGraph truncate={1}>{keyValue}</ParaGraph>- </Tooltip>- </Checkbox>- {isCheckBoxSelected ? (- <Typography>{value}</Typography>- ) : (- <Typography>-</Typography>- )}- </CheckBoxContainer>- );-}--interface CheckBoxProps {- keyValue: string;- name: TraceFilterEnum;- value: string;-}--export default CheckBoxComponent;diff --git a/frontend/src/container/Trace/Filters/Panel/PanelBody/Common/styles.ts b/frontend/src/container/Trace/Filters/Panel/PanelBody/Common/styles.tsdeleted file mode 100644index 79b7da4d30..0000000000--- a/frontend/src/container/Trace/Filters/Panel/PanelBody/Common/styles.ts+++ /dev/null@@ -1,19 +0,0 @@-import { Typography } from '@signozhq/ui/typography';-import styled from 'styled-components';--export const CheckBoxContainer = styled.div`- display: flex;- justify-content: space-between;- margin-left: 1rem;- margin-right: 1rem;-- margin-top: 0.5rem;- margin-bottom: 0.5rem;-`;--export const ParaGraph = styled(Typography.Text)`- &&& {- margin: 0;- max-width: 8rem;- }-`;diff --git a/frontend/src/container/Trace/Filters/Panel/PanelBody/CommonCheckBox/index.tsx b/frontend/src/container/Trace/Filters/Panel/PanelBody/CommonCheckBox/index.tsxdeleted file mode 100644index a005d3821a..0000000000--- a/frontend/src/container/Trace/Filters/Panel/PanelBody/CommonCheckBox/index.tsx+++ /dev/null@@ -1,104 +0,0 @@-import { useState } from 'react';-// eslint-disable-next-line no-restricted-imports-import { useDispatch, useSelector } from 'react-redux';-import { Button, Input } from 'antd';-// eslint-disable-next-line no-restricted-imports-import { Dispatch } from 'redux';-import { AppState } from 'store/reducers';-import { INITIAL_FILTER_VALUE } from 'store/reducers/trace';-import AppActions from 'types/actions';-import { UPDATE_SPAN_UPDATE_FILTER_DISPLAY_VALUE } from 'types/actions/trace';-import { TraceFilterEnum, TraceReducer } from 'types/reducer/trace';--import CheckBoxComponent from '../Common/Checkbox';--const { Search } = Input;--function CommonCheckBox(props: CommonCheckBoxProps): JSX.Element {- const { filter, filterDisplayValue } = useSelector<AppState, TraceReducer>(- (state) => state.traces,- );-- const { name } = props;-- const status = filter.get(name) || {};-- const statusObj = Object.keys(status);- const numberOfFilters = filterDisplayValue.get(name) || 0;- const dispatch = useDispatch<Dispatch<AppActions>>();- const [searchFilter, setSearchFilter] = useState<string>('');-- const onClickMoreHandler = (): void => {- const newFilterDisplayValue = new Map(filterDisplayValue);- const preValue =- (newFilterDisplayValue.get(name) || 0) + INITIAL_FILTER_VALUE;-- newFilterDisplayValue.set(name, preValue);-- dispatch({- type: UPDATE_SPAN_UPDATE_FILTER_DISPLAY_VALUE,- payload: newFilterDisplayValue,- });- };-- const isMoreButtonAvilable = Boolean(- numberOfFilters && statusObj.length > numberOfFilters,- );-- return (- <>- {statusObj.length > 0 && (- <Search- value={searchFilter}- onChange={(e): void => setSearchFilter(e.target.value)}- style={{- padding: '0 3%',- }}- placeholder="Filter Values"- />- )}-- {statusObj- .sort((a, b) => {- const countA = +status[a];- const countB = +status[b];-- if (countA === countB) {- return a.length - b.length;- }- return countA - countB;- })- .filter((filter) => {- if (searchFilter.length === 0) {- return true;- }- return filter- .toLocaleLowerCase()- .includes(searchFilter.toLocaleLowerCase());- })- .filter((_, index) => index < numberOfFilters)- .map((e) => (- <CheckBoxComponent- key={e}- {...{- name,- keyValue: e,- value: status[e],- }}- />- ))}-- {isMoreButtonAvilable && (- <Button onClick={onClickMoreHandler} type="link">- More- </Button>- )}- </>- );-}--interface CommonCheckBoxProps {- name: TraceFilterEnum;-}--export default CommonCheckBox;diff --git a/frontend/src/container/Trace/Filters/Panel/PanelBody/Duration/index.tsx b/frontend/src/container/Trace/Filters/Panel/PanelBody/Duration/index.tsxdeleted file mode 100644index dc513153ae..0000000000--- a/frontend/src/container/Trace/Filters/Panel/PanelBody/Duration/index.tsx+++ /dev/null@@ -1,223 +0,0 @@-import {- ChangeEventHandler,- useCallback,- useEffect,- useMemo,- useRef,- useState,-} from 'react';-// eslint-disable-next-line no-restricted-imports-import { useDispatch, useSelector } from 'react-redux';-import { Slider } from '@signozhq/ui/slider';-import getFilters from 'api/trace/getFilters';-import useDebouncedFn from 'hooks/useDebouncedFunction';-// eslint-disable-next-line no-restricted-imports-import { Dispatch } from 'redux';-import { getFilter, updateURL } from 'store/actions/trace/util';-import { AppState } from 'store/reducers';-import AppActions from 'types/actions';-import { UPDATE_ALL_FILTERS } from 'types/actions/trace';-import { GlobalReducer } from 'types/reducer/globalTime';-import { TraceReducer } from 'types/reducer/trace';--import { Container, InputComponent, InputContainer, Text } from './styles';-import { getMs } from './util';--function Duration(): JSX.Element {- const {- filter,- selectedFilter,- filterToFetchData,- spansAggregate,- selectedTags,- userSelectedFilter,- isFilterExclude,- spanKind,- } = useSelector<AppState, TraceReducer>((state) => state.traces);-- const dispatch = useDispatch<Dispatch<AppActions>>();- const globalTime = useSelector<AppState, GlobalReducer>(- (state) => state.globalTime,- );-- const preLocalMaxDuration = useRef<number>();- const preLocalMinDuration = useRef<number>();-- const getDuration = useMemo(() => {- const selectedDuration = selectedFilter.get('duration');-- if (selectedDuration) {- return {- maxDuration: selectedDuration[0],- minDuration: selectedDuration[1],- };- }-- return filter.get('duration') || {};- }, [selectedFilter, filter]);-- const [preMax, setPreMax] = useState<string>('');- const [preMin, setPreMin] = useState<string>('');-- useEffect(() => {- const duration = getDuration || {};-- const maxDuration = duration.maxDuration || '0';- const minDuration = duration.minDuration || '0';-- if (preLocalMaxDuration.current === undefined) {- preLocalMaxDuration.current = parseFloat(maxDuration);- }- if (preLocalMinDuration.current === undefined) {- preLocalMinDuration.current = parseFloat(minDuration);- }-- setPreMax(getMs(maxDuration));- setPreMin(getMs(minDuration));- }, [getDuration]);-- const updatedUrl = async (min: number, max: number): Promise<void> => {- const preSelectedFilter = new Map(selectedFilter);- const preUserSelected = new Map(userSelectedFilter);-- preSelectedFilter.set('duration', [- String(max * 1000000),- String(min * 1000000),- ]);-- const response = await getFilters({- end: String(globalTime.maxTime),- getFilters: filterToFetchData,- other: Object.fromEntries(preSelectedFilter),- start: String(globalTime.minTime),- isFilterExclude,- spanKind,- });-- if (response.statusCode === 200) {- const preFilter = getFilter(response.payload);-- preFilter.forEach((value, key) => {- const values = Object.keys(value);- if (key !== 'duration' && values.length) {- preUserSelected.set(key, values);- }- });-- dispatch({- type: UPDATE_ALL_FILTERS,- payload: {- current: spansAggregate.currentPage,- filter: preFilter,- filterToFetchData,- selectedFilter: preSelectedFilter,- selectedTags,- userSelected: preUserSelected,- isFilterExclude,- order: spansAggregate.order,- pageSize: spansAggregate.pageSize,- orderParam: spansAggregate.orderParam,- spanKind,- },- });-- updateURL(- preSelectedFilter,- filterToFetchData,- spansAggregate.currentPage,- selectedTags,- isFilterExclude,- userSelectedFilter,- spansAggregate.order,- spansAggregate.pageSize,- spansAggregate.orderParam,- );- }- };-- const onRangeSliderHandler = (number: [string, string]): void => {- const [min, max] = number;-- setPreMin(min);- setPreMax(max);- };-- const debouncedFunction = useDebouncedFn(- (min, max) => {- updatedUrl(min as number, max as number);- },- 1500,- undefined,- );-- const onChangeMaxHandler: ChangeEventHandler<HTMLInputElement> = (event) => {- const { value } = event.target;- const min = preMin;- const max = value;-- onRangeSliderHandler([min, max]);- debouncedFunction(min, max);- };-- const onChangeMinHandler: ChangeEventHandler<HTMLInputElement> = (event) => {- const { value } = event.target;- const min = value;- const max = preMax;-- onRangeSliderHandler([min, max]);- debouncedFunction(min, max);- };-- const onRangeHandler = (value: number | number[]): void => {- const [min, max] = value as number[];- updatedUrl(min, max);- };-- const TipComponent = useCallback(- (value: number) => <div>{`${value.toString()}ms`}</div>,- [],- );-- return (- <div>- <Container>- <InputContainer>- <Text>Min</Text>- </InputContainer>- <InputComponent- addonAfter="ms"- type="number"- onChange={onChangeMinHandler}- value={preMin}- />-- <InputContainer>- <Text>Max</Text>- </InputContainer>- <InputComponent- addonAfter="ms"- type="number"- onChange={onChangeMaxHandler}- value={preMax}- />- </Container>-- <Container>- <Slider- min={Number(getMs(String(preLocalMinDuration.current || 0)))}- max={Number(getMs(String(preLocalMaxDuration.current || 0)))}- range- tooltip={{ formatter: TipComponent }}- onChange={(value): void => {- const [min, max] = value as number[];- onRangeSliderHandler([String(min), String(max)]);- }}- onAfterChange={onRangeHandler}- value={[Number(preMin), Number(preMax)]}- />- </Container>- </div>- );-}--export default Duration;diff --git a/frontend/src/container/Trace/Filters/Panel/PanelBody/Duration/styles.ts b/frontend/src/container/Trace/Filters/Panel/PanelBody/Duration/styles.tsdeleted file mode 100644index 38ae0943c8..0000000000--- a/frontend/src/container/Trace/Filters/Panel/PanelBody/Duration/styles.ts+++ /dev/null@@ -1,43 +0,0 @@-// TODO(@signozhq/ui-input): migrate this styled(Input) once @signozhq/ui-// Input supports `addonAfter` (the consumer renders `<InputComponent addonAfter="ms">`).-import { Typography } from '@signozhq/ui/typography';-import { Input } from 'antd';-import styled from 'styled-components';--export const DurationText = styled.div`- display: flex;- align-items: center;- justify-content: space-around;- min-height: 8vh;- flex-direction: column;-`;--export const InputComponent = styled(Input)`- input::-webkit-outer-spin-button,- input::-webkit-inner-spin-button {- -webkit-appearance: none;- margin: 0;- }-- /* Firefox */- input[type='number'] {- -moz-appearance: textfield;- }-`;--export const InputContainer = styled.div`- width: 100%;- margin-top: 0.5rem;- margin-bottom: 0.2rem;-`;--export const Text = styled(Typography)`- &&& {- text-align: left;- }-`;--export const Container = styled.div`- padding-left: 1rem;- padding-right: 1rem;-`;diff --git a/frontend/src/container/Trace/Filters/Panel/PanelBody/Duration/util.ts b/frontend/src/container/Trace/Filters/Panel/PanelBody/Duration/util.tsdeleted file mode 100644index 2a6bcf9586..0000000000--- a/frontend/src/container/Trace/Filters/Panel/PanelBody/Duration/util.ts+++ /dev/null@@ -1,13 +0,0 @@-import dayjs from 'dayjs';-import durationPlugin from 'dayjs/plugin/duration';--dayjs.extend(durationPlugin);--export const getMs = (value: string): string =>- parseFloat(- dayjs- .duration({- milliseconds: parseInt(value, 10) / 1000000,- })- .format('SSS'),- ).toFixed(2);diff --git a/frontend/src/container/Trace/Filters/Panel/PanelBody/SearchTraceID/index.tsx b/frontend/src/container/Trace/Filters/Panel/PanelBody/SearchTraceID/index.tsxdeleted file mode 100644index f7ab4ac759..0000000000--- a/frontend/src/container/Trace/Filters/Panel/PanelBody/SearchTraceID/index.tsx+++ /dev/null@@ -1,134 +0,0 @@-import { ChangeEvent, useEffect, useState } from 'react';-// eslint-disable-next-line no-restricted-imports-import { useDispatch, useSelector } from 'react-redux';-import { Input } from 'antd';-import getFilters from 'api/trace/getFilters';-import { AxiosError } from 'axios';-import { useNotifications } from 'hooks/useNotifications';-// eslint-disable-next-line no-restricted-imports-import { Dispatch } from 'redux';-import { getFilter, updateURL } from 'store/actions/trace/util';-import { AppState } from 'store/reducers';-import AppActions from 'types/actions';-import { UPDATE_ALL_FILTERS } from 'types/actions/trace';-import { GlobalReducer } from 'types/reducer/globalTime';-import { TraceReducer } from 'types/reducer/trace';--const { Search } = Input;--function TraceID(): JSX.Element {- const {- selectedFilter,- filterToFetchData,- spansAggregate,- selectedTags,- userSelectedFilter,- isFilterExclude,- spanKind,- } = useSelector<AppState, TraceReducer>((state) => state.traces);- const dispatch = useDispatch<Dispatch<AppActions>>();- const globalTime = useSelector<AppState, GlobalReducer>(- (state) => state.globalTime,- );- const [isLoading, setIsLoading] = useState(false);- const [userEnteredValue, setUserEnteredValue] = useState<string>('');- const { notifications } = useNotifications();- useEffect(() => {- setUserEnteredValue(selectedFilter.get('traceID')?.[0] || '');- }, [selectedFilter]);- const onSearch = async (value: string): Promise<void> => {- try {- setIsLoading(true);- const preSelectedFilter = new Map(selectedFilter);- const preUserSelected = new Map(userSelectedFilter);-- if (value !== '') {- preUserSelected.set('traceID', [value]);- preSelectedFilter.set('traceID', [value]);- } else {- preUserSelected.delete('traceID');- preSelectedFilter.delete('traceID');- }- const response = await getFilters({- other: Object.fromEntries(preSelectedFilter),- end: String(globalTime.maxTime),- start: String(globalTime.minTime),- getFilters: filterToFetchData,- isFilterExclude,- spanKind,- });-- if (response.statusCode === 200) {- const preFilter = getFilter(response.payload);- preFilter.set('traceID', { traceID: value });- preFilter.forEach((value, key) => {- const values = Object.keys(value);- if (key !== 'duration' && values.length) {- preUserSelected.set(key, values);- }- });-- dispatch({- type: UPDATE_ALL_FILTERS,- payload: {- current: spansAggregate.currentPage,- filter: preFilter,- filterToFetchData,- selectedFilter: preSelectedFilter,- selectedTags,- userSelected: preUserSelected,- isFilterExclude,- order: spansAggregate.order,- pageSize: spansAggregate.pageSize,- orderParam: spansAggregate.orderParam,- spanKind,- },- });-- updateURL(- preSelectedFilter,- filterToFetchData,- spansAggregate.currentPage,- selectedTags,- isFilterExclude,- userSelectedFilter,- spansAggregate.order,- spansAggregate.pageSize,- spansAggregate.orderParam,- );- }- } catch (error) {- notifications.error({- message: (error as AxiosError).toString() || 'Something went wrong',- });- } finally {- setIsLoading(false);- }- };- const onChange = (e: ChangeEvent<HTMLInputElement>): void => {- setUserEnteredValue(e.target.value);- };- const onBlur = (): void => {- if (userEnteredValue !== selectedFilter.get('traceID')?.[0]) {- onSearch(userEnteredValue);- }- };- return (- <div>- <Search- placeholder="Filter by Trace ID"- onSearch={onSearch}- style={{- marginBottom: '5rem',- padding: '0 3%',- }}- loading={isLoading}- value={userEnteredValue}- onChange={onChange}- onBlur={onBlur}- />- </div>- );-}--export default TraceID;diff --git a/frontend/src/container/Trace/Filters/Panel/PanelBody/index.tsx b/frontend/src/container/Trace/Filters/Panel/PanelBody/index.tsxdeleted file mode 100644index f42dda469f..0000000000--- a/frontend/src/container/Trace/Filters/Panel/PanelBody/index.tsx+++ /dev/null@@ -1,43 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import { useSelector } from 'react-redux';-import { Card } from 'antd';-import Spinner from 'components/Spinner';-import { AppState } from 'store/reducers';-import { TraceFilterEnum, TraceReducer } from 'types/reducer/trace';--import CommonCheckBox from './CommonCheckBox';-import Duration from './Duration';-import TraceID from './SearchTraceID';--function PanelBody(props: PanelBodyProps): JSX.Element {- const { type } = props;-- const { filterLoading } = useSelector<AppState, TraceReducer>(- (state) => state.traces,- );-- if (filterLoading) {- return (- <Card bordered={false}>- <Spinner height="10vh" tip="Loading.." />- </Card>- );- }- const renderBody = (type: TraceFilterEnum): JSX.Element => {- switch (type) {- case 'traceID':- return <TraceID />;- case 'duration':- return <Duration />;- default:- return <CommonCheckBox name={type} />;- }- };- return <Card bordered={false}>{renderBody(type)}</Card>;-}--interface PanelBodyProps {- type: TraceFilterEnum;-}--export default PanelBody;diff --git a/frontend/src/container/Trace/Filters/Panel/PanelHeading/index.tsx b/frontend/src/container/Trace/Filters/Panel/PanelHeading/index.tsxdeleted file mode 100644index e55c66c4b1..0000000000--- a/frontend/src/container/Trace/Filters/Panel/PanelHeading/index.tsx+++ /dev/null@@ -1,360 +0,0 @@-import { MouseEventHandler, useState } from 'react';-// eslint-disable-next-line no-restricted-imports-import { useDispatch, useSelector } from 'react-redux';-import { ChevronDown, ChevronRight } from '@signozhq/icons';-import { Card } from 'antd';-import { Divider } from '@signozhq/ui/divider';-import { Typography } from '@signozhq/ui/typography';-import getFilters from 'api/trace/getFilters';-import { AxiosError } from 'axios';-import { useNotifications } from 'hooks/useNotifications';-// eslint-disable-next-line no-restricted-imports-import { Dispatch } from 'redux';-import { getFilter, updateURL } from 'store/actions/trace/util';-import { AppState } from 'store/reducers';-import AppActions from 'types/actions';-import { UPDATE_ALL_FILTERS } from 'types/actions/trace';-import { GlobalReducer } from 'types/reducer/globalTime';-import {- AllPanelHeading,- TraceFilterEnum,- TraceReducer,-} from 'types/reducer/trace';--import {- ButtonComponent,- ButtonContainer,- Container,- IconContainer,- TextContainer,-} from './styles';--const { Text } = Typography;--function PanelHeading(props: PanelHeadingProps): JSX.Element {- const {- filterLoading,- filterToFetchData,- selectedFilter,- spansAggregate,- selectedTags,- filter,- isFilterExclude,- userSelectedFilter,- spanKind,- } = useSelector<AppState, TraceReducer>((state) => state.traces);-- const { name: PanelName, isOpen: IsPanelOpen } = props;-- const isDefaultOpen =- filterToFetchData.find((e) => e === PanelName) !== undefined;-- const [isLoading, setIsLoading] = useState<boolean>(false);-- const global = useSelector<AppState, GlobalReducer>(- (state) => state.globalTime,- );-- const dispatch = useDispatch<Dispatch<AppActions>>();-- const defaultErrorMessage = 'Something went wrong';-- const { notifications } = useNotifications();-- const onExpandHandler: MouseEventHandler<HTMLDivElement> = async (e) => {- try {- e.preventDefault();- e.stopPropagation();-- setIsLoading(true);- let updatedFilterData: TraceReducer['filterToFetchData'] = [];- const getprepdatedSelectedFilter = new Map(selectedFilter);- const getPreUserSelected = new Map(userSelectedFilter);-- updatedFilterData = [PanelName];-- const response = await getFilters({- end: String(global.maxTime),- start: String(global.minTime),- getFilters: updatedFilterData,- other: Object.fromEntries(getprepdatedSelectedFilter),- isFilterExclude,- spanKind,- });-- if (response.statusCode === 200) {- const updatedFilter = getFilter(response.payload);-- if (!getPreUserSelected.has(PanelName)) {- getPreUserSelected.set(- PanelName,- Object.keys(updatedFilter.get(PanelName) || []),- );- }-- updatedFilterData = [...filterToFetchData, PanelName];- filter.forEach((value, key) => {- if (key !== PanelName) {- updatedFilter.set(key, value);- }- });-- dispatch({- type: UPDATE_ALL_FILTERS,- payload: {- current: spansAggregate.currentPage,- filter: updatedFilter,- filterToFetchData: updatedFilterData,- selectedFilter: getprepdatedSelectedFilter,- selectedTags,- userSelected: getPreUserSelected,- isFilterExclude,- order: spansAggregate.order,- pageSize: spansAggregate.pageSize,- orderParam: spansAggregate.orderParam,- spanKind,- },- });-- updateURL(- getprepdatedSelectedFilter,- updatedFilterData,- spansAggregate.currentPage,- selectedTags,- isFilterExclude,- getPreUserSelected,- spansAggregate.order,- spansAggregate.pageSize,- spansAggregate.orderParam,- );- } else {- notifications.error({- message: response.error || defaultErrorMessage,- });- }-- setIsLoading(false);- } catch (error) {- notifications.error({- message: (error as AxiosError).toString() || defaultErrorMessage,- });- }- };-- /**- * @description this function removes the selected filter- */- const onCloseHandler = (): void => {- const preSelectedFilter = new Map(selectedFilter);- // removing the filter from filter to fetch the data- const preFilterToFetchTheData = [- ...filterToFetchData.filter((name) => name !== PanelName),- ];-- // preSelectedFilter.delete(PanelName);-- dispatch({- type: UPDATE_ALL_FILTERS,- payload: {- current: spansAggregate.currentPage,- filter,- filterToFetchData: preFilterToFetchTheData,- selectedFilter: preSelectedFilter,- selectedTags,- userSelected: userSelectedFilter,- isFilterExclude,- order: spansAggregate.order,- pageSize: spansAggregate.pageSize,- orderParam: spansAggregate.orderParam,- spanKind,- },- });-- updateURL(- preSelectedFilter,- preFilterToFetchTheData,- spansAggregate.currentPage,- selectedTags,- isFilterExclude,- userSelectedFilter,- spansAggregate.order,- spansAggregate.pageSize,- spansAggregate.orderParam,- );- };-- const onClearAllHandler = async (): Promise<void> => {- try {- setIsLoading(true);- const updatedFilter = new Map(selectedFilter);- const preUserSelected = new Map(userSelectedFilter);-- updatedFilter.delete(PanelName);- preUserSelected.delete(PanelName);-- const postIsFilterExclude = new Map(isFilterExclude);-- postIsFilterExclude.set(PanelName, false);-- const response = await getFilters({- end: String(global.maxTime),- start: String(global.minTime),- getFilters: filterToFetchData,- other: Object.fromEntries(updatedFilter),- isFilterExclude: postIsFilterExclude,- spanKind,- });-- if (response.statusCode === 200 && response.payload) {- const getUpdatedFilter = getFilter(response.payload);-- dispatch({- type: UPDATE_ALL_FILTERS,- payload: {- current: spansAggregate.currentPage,- filter: getUpdatedFilter,- filterToFetchData,- selectedFilter: updatedFilter,- selectedTags,- userSelected: preUserSelected,- isFilterExclude: postIsFilterExclude,- order: spansAggregate.order,- pageSize: spansAggregate.pageSize,- orderParam: spansAggregate.orderParam,- spanKind,- },- });-- updateURL(- updatedFilter,- filterToFetchData,- spansAggregate.currentPage,- selectedTags,- postIsFilterExclude,- preUserSelected,- spansAggregate.order,- spansAggregate.pageSize,- spansAggregate.orderParam,- );- } else {- notifications.error({- message: response.error || 'Something went wrong',- });- }- setIsLoading(false);- } catch (error) {- notifications.error({- message: (error as AxiosError).toString(),- });- setIsLoading(false);- }- };-- // const onSelectAllHandler = async () => {- // try {- // setIsLoading(true);- // const preFilter = new Map(filter);- // const preSelectedFilter = new Map(selectedFilter);-- // preSelectedFilter.set(- // props.name,- // Object.keys(preFilter.get(props.name) || {}),- // );-- // const response = await getFilters({- // end: String(global.maxTime),- // start: String(global.minTime),- // getFilters: filterToFetchData,- // other: Object.fromEntries(preSelectedFilter),- // });-- // if (response.statusCode === 200 && response.payload) {- // const getUpatedFilter = getFilter(response.payload);-- // preSelectedFilter.set(- // props.name,- // Object.keys(getUpatedFilter.get(props.name) || {}),- // );-- // dispatch({- // type: UPDATE_ALL_FILTERS,- // payload: {- // current: spansAggregate.currentPage,- // filter: preFilter,- // filterToFetchData,- // selectedFilter: preSelectedFilter,- // selectedTags,- // },- // });-- // updateURL(- // preSelectedFilter,- // filterToFetchData,- // spansAggregate.currentPage,- // selectedTags,- // preFilter,- // );- // }- // setIsLoading(false);- // } catch (error) {- // setIsLoading(false);-- // notification.error({- // message: (error as AxiosError).toString(),- // });- // }- // };-- return (- <>- {PanelName !== 'duration' && <Divider plain style={{ margin: 0 }} />}-- <Card bordered={false}>- <Container- disabled={filterLoading || isLoading}- aria-disabled={filterLoading || isLoading}- aria-expanded={IsPanelOpen}- >- <TextContainer onClick={isDefaultOpen ? onCloseHandler : onExpandHandler}>- <IconContainer>- {!IsPanelOpen ? <ChevronRight size="lg" /> : <ChevronDown size="lg" />}- </IconContainer>-- <Text style={{ textTransform: 'capitalize' }} truncate={1}>- {AllPanelHeading.find((e) => e.key === PanelName)?.displayValue || ''}- </Text>- </TextContainer>-- {PanelName !== 'duration' && (- <ButtonContainer>- {/* <ButtonComponent- aria-disabled={isLoading || filterLoading}- disabled={isLoading || filterLoading}- onClick={onSelectAllHandler}- type="link"- >- Select All- </ButtonComponent> */}-- <ButtonComponent- aria-disabled={isLoading || filterLoading}- disabled={isLoading || filterLoading}- onClick={onClearAllHandler}- type="link"- >- Clear All- </ButtonComponent>- </ButtonContainer>- )}- </Container>- </Card>- </>- );-}--interface PanelHeadingProps {- name: TraceFilterEnum;- isOpen: boolean;-}--export default PanelHeading;diff --git a/frontend/src/container/Trace/Filters/Panel/PanelHeading/styles.ts b/frontend/src/container/Trace/Filters/Panel/PanelHeading/styles.tsdeleted file mode 100644index 812be65ac7..0000000000--- a/frontend/src/container/Trace/Filters/Panel/PanelHeading/styles.ts+++ /dev/null@@ -1,50 +0,0 @@-import { Button } from 'antd';-import { StyledCSS } from 'container/GantChart/Trace/styles';-import styled, { css } from 'styled-components';--interface Props {- disabled: boolean;-}--export const Container = styled.div<Props>`- &&& {- display: flex;- justify-content: space-between;- align-items: center;- padding-left: 0.5rem;- min-height: 5vh;-- cursor: ${({ disabled }): string => (disabled ? 'not-allowed' : '')};-- ${({ disabled }): StyledCSS =>- disabled &&- css`- opacity: 0.5;- `}- }-`;--export const IconContainer = styled.div`- &&& {- margin-right: 0.5rem;- }-`;--export const TextContainer = styled.div`- &&& {- display: flex;- cursor: pointer;- }-`;--export const ButtonComponent = styled(Button)`- &&& {- font-size: 0.75rem;- }-`;--export const ButtonContainer = styled.div`- &&& {- display: flex;- }-`;diff --git a/frontend/src/container/Trace/Filters/Panel/index.tsx b/frontend/src/container/Trace/Filters/Panel/index.tsxdeleted file mode 100644index a910219d61..0000000000--- a/frontend/src/container/Trace/Filters/Panel/index.tsx+++ /dev/null@@ -1,30 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import { useSelector } from 'react-redux';-import { AppState } from 'store/reducers';-import { TraceFilterEnum, TraceReducer } from 'types/reducer/trace';--import PanelBody from './PanelBody';-import PanelHeading from './PanelHeading';--function Panel(props: PanelProps): JSX.Element {- const traces = useSelector<AppState, TraceReducer>((state) => state.traces);-- const { name } = props;-- const isDefaultOpen =- traces.filterToFetchData.find((e) => e === name) !== undefined;-- return (- <>- <PanelHeading name={name} isOpen={isDefaultOpen} />-- {isDefaultOpen && <PanelBody type={name} />}- </>- );-}--interface PanelProps {- name: TraceFilterEnum;-}--export default Panel;diff --git a/frontend/src/container/Trace/Filters/index.tsx b/frontend/src/container/Trace/Filters/index.tsxdeleted file mode 100644index b47d3becab..0000000000--- a/frontend/src/container/Trace/Filters/index.tsx+++ /dev/null@@ -1,29 +0,0 @@-import { TraceFilterEnum } from 'types/reducer/trace';--import Panel from './Panel';--export const AllTraceFilterEnum: TraceFilterEnum[] = [- 'duration',- 'status',- 'serviceName',- 'operation',- 'rpcMethod',- 'responseStatusCode',- 'httpHost',- 'httpMethod',- 'httpRoute',- 'httpUrl',- 'traceID',-];--function Filters(): JSX.Element {- return (- <>- {AllTraceFilterEnum.map((panelName) => (- <Panel key={panelName} name={panelName} />- ))}- </>- );-}--export default Filters;diff --git a/frontend/src/container/Trace/Graph/config.ts b/frontend/src/container/Trace/Graph/config.tsdeleted file mode 100644index c3e47476ea..0000000000--- a/frontend/src/container/Trace/Graph/config.ts+++ /dev/null@@ -1,126 +0,0 @@-import { ChartData, ChartDatasetProperties } from 'chart.js';-import dayjs from 'dayjs';-import { colors } from 'lib/getRandomColor';-import { keys } from 'lodash-es';-import { TraceReducer } from 'types/reducer/trace';--function transposeArray(array: number[][], arrayLength: number): number[][] {- const newArray: number[][] = [];- for (let i = 0; i < array.length; i += 1) {- newArray.push([]);- }-- for (let i = 0; i < array.length; i += 1) {- for (let j = 0; j < arrayLength; j += 1) {- newArray[j]?.push(array[i][j]);- }- }-- return newArray;-}--export const getChartData = (- data: TraceReducer['spansGraph']['payload'],-): ChartData<'line'> => {- const allDataPoints = data.items;-- const chartDataset: ChartDatasetProperties<'line', number[]> = {- data: [],- type: 'line',- };- const chartLabels: ChartData<'line'>['labels'] = [];-- if (allDataPoints && typeof allDataPoints === 'object') {- Object.keys(allDataPoints).forEach((timestamp) => {- const key = allDataPoints[timestamp];- if (key.value) {- chartDataset.data.push(key.value);- const date = dayjs(key.timestamp / 1000000);- chartLabels.push(date.toDate().getTime());- }- });- }-- return {- datasets: [- {- ...chartDataset,- borderWidth: 1.5,- spanGaps: true,- borderColor: colors[0] || 'red',- showLine: true,- pointRadius: 0,- },- ],- labels: chartLabels,- };-};--export const getChartDataforGroupBy = (- props: TraceReducer['spansGraph']['payload'],-): ChartData => {- const { items } = props;-- const chartData: ChartData = {- datasets: [],- labels: [],- };-- let max = 0;-- const allGroupBy = Object.keys(items).map((e) => items[e].groupBy);-- keys(allGroupBy).forEach((e: string): void => {- // @ts-expect-error- const { length } = keys(allGroupBy[e]);-- if (length >= max) {- max = length;- }- });-- const numberOfGraphs = max;-- const spansGraph: number[][] = [];-- const names: string[] = [];-- // number of data points- Object.keys(items).forEach((item) => {- const spanData = items[item];- const date = dayjs(Number(item) / 1000000)- .toDate()- .getTime();-- chartData.labels?.push(date);-- const { groupBy } = spanData;- const preData: number[] = [];-- if (groupBy) {- Object.keys(groupBy).forEach((key) => {- const value = groupBy[key];- preData.push(value);- names.push(key);- });-- spansGraph.push(preData);- }- });-- const updatedName = [...new Set(names)];-- transposeArray(spansGraph, numberOfGraphs).forEach((values, index) => {- chartData.datasets.push({- data: values.map((e) => e || 0),- borderWidth: 1.5,- spanGaps: true,- borderColor: colors[index] || 'red',- showLine: true,- pointRadius: 0,- label: updatedName[index],- });- });-- return chartData;-};diff --git a/frontend/src/container/Trace/Graph/index.tsx b/frontend/src/container/Trace/Graph/index.tsxdeleted file mode 100644index de7aa538eb..0000000000--- a/frontend/src/container/Trace/Graph/index.tsx+++ /dev/null@@ -1,62 +0,0 @@-import { useMemo } from 'react';-// eslint-disable-next-line no-restricted-imports-import { useSelector } from 'react-redux';-import { useMeasure } from 'react-use';-import { Typography } from '@signozhq/ui/typography';-import Graph from 'components/Graph';-import Spinner from 'components/Spinner';-import { AppState } from 'store/reducers';-import { TraceReducer } from 'types/reducer/trace';--import { getChartData, getChartDataforGroupBy } from './config';-import { Container } from './styles';--function TraceGraph(): JSX.Element {- const [ref, { width }] = useMeasure();-- const { spansGraph, selectedGroupBy, yAxisUnit } = useSelector<- AppState,- TraceReducer- >((state) => state.traces);-- const { loading, error, errorMessage, payload } = spansGraph;-- const ChartData = useMemo(- () =>- selectedGroupBy.length === 0 || selectedGroupBy === 'none'- ? getChartData(payload)- : getChartDataforGroupBy(payload),- [payload, selectedGroupBy],- );-- if (error) {- return (- <Container center>- <Typography>{errorMessage || 'Something went wrong'}</Typography>- </Container>- );- }-- if (loading) {- return (- <Container>- <Spinner height="20vh" size="small" tip="Loading..." />- </Container>- );- }-- return (- <Container ref={ref as never}>- <Graph- animate={false}- data={ChartData}- name="traceGraph"- type="line"- yAxisUnit={yAxisUnit}- forceReRender={width}- />- </Container>- );-}--export default TraceGraph;diff --git a/frontend/src/container/Trace/Graph/styles.ts b/frontend/src/container/Trace/Graph/styles.tsdeleted file mode 100644index 2a378d7d66..0000000000--- a/frontend/src/container/Trace/Graph/styles.ts+++ /dev/null@@ -1,23 +0,0 @@-import { RefObject } from 'react';-import { StyledCSS } from 'container/GantChart/Trace/styles';-import styled, { css } from 'styled-components';--interface Props {- center?: boolean;- ref?: RefObject<HTMLDivElement> | null; // The ref type provided by react-use is incorrect -> https://github.com/streamich/react-use/issues/1264 Open Issue-}--export const Container = styled.div<Props>`- height: 25vh !important;- margin-top: 1rem;- margin-bottom: 1rem;- width: 100% !important;-- ${({ center }): StyledCSS =>- center &&- css`- display: flex;- justify-content: center;- align-items: center;- `}-`;diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/TagKey.tsx b/frontend/src/container/Trace/Search/AllTags/Tag/TagKey.tsxdeleted file mode 100644index 10ea01fe2a..0000000000--- a/frontend/src/container/Trace/Search/AllTags/Tag/TagKey.tsx+++ /dev/null@@ -1,97 +0,0 @@-import {- Dispatch,- SetStateAction,- useCallback,- useMemo,- useState,-} from 'react';-import { useQuery } from 'react-query';-// eslint-disable-next-line no-restricted-imports-import { useSelector } from 'react-redux';-import { Input } from '@signozhq/ui/input';-import { AutoComplete } from 'antd';-import getTagFilters from 'api/trace/getTagFilter';-import { AppState } from 'store/reducers';-import { GlobalReducer } from 'types/reducer/globalTime';-import { TraceReducer } from 'types/reducer/trace';--import { getTagKeyOptions, onTagKeySelect } from './utils';--function TagsKey(props: TagsKeysProps): JSX.Element {- const globalTime = useSelector<AppState, GlobalReducer>(- (state) => state.globalTime,- );-- const { index, setLocalSelectedTags, tag } = props;-- const [selectedKey, setSelectedKey] = useState<string>(tag.Key || '');-- const traces = useSelector<AppState, TraceReducer>((state) => state.traces);-- const { isLoading, data } = useQuery(- [- 'getTagKeys',- globalTime.minTime,- globalTime.maxTime,- traces.selectedFilter,- traces.isFilterExclude,- traces.spanKind,- ],- {- queryFn: () =>- getTagFilters({- start: globalTime.minTime,- end: globalTime.maxTime,- other: Object.fromEntries(traces.selectedFilter),- isFilterExclude: traces.isFilterExclude,- spanKind: traces.spanKind,- }),- cacheTime: 120000,- },- );-- const options = useMemo(() => getTagKeyOptions(data?.payload), [data]);-- const onSelectHandler = useCallback(- (value: unknown) =>- onTagKeySelect(- value,- options,- setSelectedKey,- setLocalSelectedTags,- index,- tag,- ),- [index, options, setLocalSelectedTags, tag],- );-- return (- <AutoComplete- style={{ width: '100%' }}- value={selectedKey}- allowClear- disabled={isLoading}- notFoundContent="No tags available"- showSearch- options={options?.map((e) => ({- label: e.label?.toString(),- value: e.value,- }))}- filterOption={(inputValue, option): boolean =>- option?.label?.toUpperCase().indexOf(inputValue.toUpperCase()) !== -1- }- onChange={(e): void => setSelectedKey(e)}- onSelect={onSelectHandler}- >- <Input placeholder="Please select" />- </AutoComplete>- );-}--interface TagsKeysProps {- index: number;- tag: FlatArray<TraceReducer['selectedTags'], 1>;- setLocalSelectedTags: Dispatch<SetStateAction<TraceReducer['selectedTags']>>;-}--export default TagsKey;diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/TagValue.tsx b/frontend/src/container/Trace/Search/AllTags/Tag/TagValue.tsxdeleted file mode 100644index e29ffeaf6d..0000000000--- a/frontend/src/container/Trace/Search/AllTags/Tag/TagValue.tsx+++ /dev/null@@ -1,154 +0,0 @@-import {- Dispatch,- memo,- SetStateAction,- useCallback,- useMemo,- useState,-} from 'react';-import { useQuery } from 'react-query';-// eslint-disable-next-line no-restricted-imports-import { useSelector } from 'react-redux';-import { Select } from 'antd';-import type { BaseOptionType } from 'antd/es/select';-import getTagValue from 'api/trace/getTagValue';-import { AppState } from 'store/reducers';-import { GlobalReducer } from 'types/reducer/globalTime';-import { TraceReducer } from 'types/reducer/trace';--import { SelectComponent } from './styles';-import {- disableTagValue,- extractTagKey,- extractTagType,- getInitialLocalValue,- getTagValueOptions,- onTagValueChange,- selectOptions,- separateTagValues,- TagValueTypes,-} from './utils';--function TagValue(props: TagValueProps): JSX.Element {- const { tag, setLocalSelectedTags, index, tagKey } = props;- const {- Key: selectedKey,- Operator: selectedOperator,- StringValues: selectedStringValues,- NumberValues: selectedNumberValues,- BoolValues: selectedBoolValues,- } = tag;-- const traces = useSelector<AppState, TraceReducer>((state) => state.traces);-- const [localTagValue, setLocalTagValue] = useState<TagValueTypes[]>(- getInitialLocalValue(- selectedNumberValues,- selectedBoolValues,- selectedStringValues,- ),- );-- const globalReducer = useSelector<AppState, GlobalReducer>(- (state) => state.globalTime,- );-- const tagType = useMemo(() => extractTagType(tagKey), [tagKey]);-- const { isLoading, data } = useQuery(- [- 'tagKey',- globalReducer.minTime,- globalReducer.maxTime,- tagKey,- tagType,- traces.spanKind,- ],- {- queryFn: () =>- getTagValue({- end: globalReducer.maxTime,- start: globalReducer.minTime,- tagKey: {- Key: extractTagKey(tagKey),- Type: tagType,- },- spanKind: traces.spanKind,- }),- },- );-- const tagValueDisabled = useMemo(- () =>- disableTagValue(- selectedOperator,- setLocalTagValue,- selectedKey,- setLocalSelectedTags,- index,- ),- [index, selectedKey, selectedOperator, setLocalSelectedTags],- );-- const onChangeHandler = useCallback(- (value: unknown) => {- const updatedValues = onTagValueChange(value);- setLocalTagValue(updatedValues);- const { boolValues, numberValues, stringValues } = separateTagValues(- updatedValues,- selectedKey,- );-- setLocalSelectedTags((tags) => [- ...tags.slice(0, index),- {- ...tags[index],- BoolValues: boolValues,- NumberValues: numberValues,- StringValues: stringValues,- },- ...tags.slice(index + 1),- ]);- },- [index, setLocalSelectedTags, selectedKey],- );-- const getFilterOptions = useCallback(- (inputValue: string, option?: BaseOptionType): boolean => {- if (typeof option?.label === 'string') {- return option?.label.toUpperCase().indexOf(inputValue.toUpperCase()) !== -1;- }- return false;- },- [],- );-- return (- <SelectComponent- loading={isLoading}- options={getTagValueOptions(data?.payload, tagType)}- mode="tags"- allowClear- showSearch- filterOption={getFilterOptions}- disabled={isLoading || tagValueDisabled}- value={localTagValue}- onChange={onChangeHandler}- >- {selectOptions(data?.payload, tagType)?.map((suggestion) => (- <Select.Option key={suggestion.toString()} value={suggestion}>- {suggestion}- </Select.Option>- ))}- </SelectComponent>- );-}--interface TagValueProps {- index: number;- tag: FlatArray<TraceReducer['selectedTags'], 1>;- setLocalSelectedTags: Dispatch<SetStateAction<TraceReducer['selectedTags']>>;- tagKey: string;-}--export default memo(TagValue);diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx b/frontend/src/container/Trace/Search/AllTags/Tag/index.tsxdeleted file mode 100644index 6ed39ca257..0000000000--- a/frontend/src/container/Trace/Search/AllTags/Tag/index.tsx+++ /dev/null@@ -1,180 +0,0 @@-import { Dispatch, SetStateAction } from 'react';-import { X } from '@signozhq/icons';-import { Select } from 'antd';-import { TraceReducer } from 'types/reducer/trace';--import { Container, IconContainer, SelectComponent } from './styles';-import TagsKey from './TagKey';-import TagValue from './TagValue';-import { mapOperators } from './utils';--const { Option } = Select;--type Tags = FlatArray<TraceReducer['selectedTags'], 1>['Operator'];-const StringBoolNumber = ['string', 'number', 'bool'];-const Number = ['number'];-const String = ['string'];-export interface AllMenuProps {- key: Tags | '';- value: string;- supportedTypes: string[];-}--export const AllMenu: AllMenuProps[] = [- {- key: 'Equals',- value: 'EQUALS',- supportedTypes: StringBoolNumber,- },- {- key: 'NotEquals',- value: 'NOT EQUALS',- supportedTypes: StringBoolNumber,- },- {- key: 'In',- value: 'IN',- supportedTypes: String,- },- {- key: 'NotIn',- value: 'NOT IN',- supportedTypes: String,- },- {- key: 'Exists',- value: 'EXISTS',- supportedTypes: StringBoolNumber,- },- {- key: 'NotExists',- value: 'NOT EXISTS',- supportedTypes: StringBoolNumber,- },- {- key: 'GreaterThan',- value: 'GREATER THAN',- supportedTypes: Number,- },- {- key: 'LessThan',- value: 'LESS THAN',- supportedTypes: Number,- },- {- key: 'GreaterThanEquals',- value: 'GREATER THAN OR EQUALS',- supportedTypes: Number,- },- {- key: 'LessThanEquals',- value: 'LESS THAN OR EQUALS',- supportedTypes: Number,- },- {- key: 'StartsWith',- value: 'STARTS WITH',- supportedTypes: String,- },- {- key: 'NotStartsWith',- value: 'NOT STARTS WITH',- supportedTypes: String,- },- {- key: 'Contains',- value: 'CONTAINS',- supportedTypes: String,- },- {- key: 'NotContains',- value: 'NOT CONTAINS',- supportedTypes: String,- },-];--function SingleTags(props: AllTagsProps): JSX.Element {- const { tag, onCloseHandler, setLocalSelectedTags, index, localSelectedTags } =- props;- const {- Key: selectedKey,- Operator: selectedOperator,- StringValues: selectedStringValues,- NumberValues: selectedNumberValues,- BoolValues: selectedBoolValues,- } = tag;-- const onDeleteTagHandler = (index: number): void => {- onCloseHandler(index);- };-- const onChangeOperatorHandler = (key: unknown): void => {- if (typeof key === 'string') {- setLocalSelectedTags([- ...localSelectedTags.slice(0, index),- {- Key: selectedKey,- StringValues: selectedStringValues,- NumberValues: selectedNumberValues,- BoolValues: selectedBoolValues,- Operator: key as Tags,- },- ...localSelectedTags.slice(index + 1, localSelectedTags.length),- ]);- }- };-- return (- <Container>- <TagsKey- index={index}- tag={tag}- setLocalSelectedTags={setLocalSelectedTags}- />- <SelectComponent- onChange={onChangeOperatorHandler}- value={AllMenu.find((e) => e.key === selectedOperator)?.value || ''}- >- {- // filter out the operator that does not include supported type of the selected key- mapOperators(selectedKey).map((e) => (- <Option key={e.value} value={e.key}>- {e.value}- </Option>- ))- }- </SelectComponent>-- {selectedKey ? (- <TagValue- index={index}- tag={tag}- setLocalSelectedTags={setLocalSelectedTags}- tagKey={selectedKey}- />- ) : (- <SelectComponent />- )}-- <IconContainer role="button" onClick={(): void => onDeleteTagHandler(index)}>- <X size="md" />- </IconContainer>- </Container>- );-}--interface AllTagsProps {- onCloseHandler: (index: number) => void;- index: number;- tag: FlatArray<TraceReducer['selectedTags'], 1>;- setLocalSelectedTags: Dispatch<SetStateAction<TraceReducer['selectedTags']>>;- localSelectedTags: TraceReducer['selectedTags'];-}--export interface Value {- key: string;- label: string;- value: string;-}--export default SingleTags;diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/styles.ts b/frontend/src/container/Trace/Search/AllTags/Tag/styles.tsdeleted file mode 100644index fcc08ba38b..0000000000--- a/frontend/src/container/Trace/Search/AllTags/Tag/styles.ts+++ /dev/null@@ -1,38 +0,0 @@-import { Select, Space } from 'antd';-import styled from 'styled-components';--export const SpaceComponent = styled(Space)`- &&& {- width: 100%;- }-`;--export const Container = styled(Space)`- &&& {- display: flex;- margin-top: 1rem;- margin-bottom: 1rem;- }-- .ant-space-item:not(:last-child, :nth-child(2)) {- width: 100%;- }- .ant-space-item:nth-child(2) {- width: 50%;- }-`;--export const IconContainer = styled.div`- display: flex;- justify-content: center;- align-items: center;- cursor: pointer;-- margin-left: 1.125rem;-`;--export const SelectComponent = styled(Select)`- &&& {- width: 100%;- }-`;diff --git a/frontend/src/container/Trace/Search/AllTags/Tag/utils.ts b/frontend/src/container/Trace/Search/AllTags/Tag/utils.tsdeleted file mode 100644index 40cc943d2c..0000000000--- a/frontend/src/container/Trace/Search/AllTags/Tag/utils.ts+++ /dev/null@@ -1,232 +0,0 @@-import { Dispatch, SetStateAction } from 'react';-import { AutoCompleteProps } from 'antd';-import type { DefaultOptionType } from 'antd/es/select';-import { PayloadProps as TagKeyPayload } from 'types/api/trace/getTagFilters';-import { PayloadProps as TagValuePayload } from 'types/api/trace/getTagValue';-import { OperatorValues, Tags } from 'types/reducer/trace';--import { AllMenu, AllMenuProps } from '.';--export type TagValueTypes = string | number | boolean;-/**- * @description extract tag filters from payload- */-export const extractTagFilters = (- payload: TagKeyPayload,-): DefaultOptionType[] => {- const tagFilters: string[] = [];- payload.stringTagKeys.forEach((element) => {- tagFilters.push(`${element}.(string)`);- });- payload.numberTagKeys.forEach((element) => {- tagFilters.push(`${element}.(number)`);- });- payload.boolTagKeys.forEach((element) => {- tagFilters.push(`${element}.(bool)`);- });- return tagFilters.map((e) => ({- value: e,- label: e,- }));-};--export const extractTagType = (tagKey: string): string => {- if (tagKey?.includes('.(string)')) {- return 'string';- }- if (tagKey?.includes('.(number)')) {- return 'number';- }- if (tagKey?.includes('.(bool)')) {- return 'bool';- }- return 'string';-};--export const extractTagKey = (tagKey: string): string => {- const tag = tagKey.split('.(');- if (tag && tag.length > 0) {- return tag[0];- }- return '';-};--export function onTagValueChange(values: unknown): TagValueTypes[] {- const stringValues = values as string[];-- if (!Array.isArray(stringValues) || stringValues.length === 0) {- return [];- }-- return values as TagValueTypes[];-}--export function separateTagValues(- values: TagValueTypes[],- selectedKey: string,-): { boolValues: boolean[]; numberValues: number[]; stringValues: string[] } {- if (selectedKey.includes('.(bool)')) {- const boolValues = values.filter(- (value) => typeof value === 'boolean',- ) as boolean[];-- return {- boolValues,- numberValues: [],- stringValues: [],- };- }-- if (selectedKey.includes('.(number)')) {- const numberValues = values- .filter((value) => typeof value === 'number' || !Number.isNaN(Number(value)))- .map((value) => Number(value)) as number[];- return {- boolValues: [],- numberValues,- stringValues: [],- };- }-- const stringValues = values.filter(- (value) =>- typeof value === 'string' &&- value !== 'true' &&- value !== 'false' &&- Number.isNaN(Number(value)),- ) as string[];-- return {- boolValues: [],- numberValues: [],- stringValues,- };-}--export function disableTagValue(- selectedOperator: OperatorValues,- setLocalValue: Dispatch<SetStateAction<TagValueTypes[]>>,- selectedKeys: string,- setLocalSelectedTags: Dispatch<SetStateAction<Tags[]>>,- index: number,-): boolean {- if (selectedOperator === 'Exists' || selectedOperator === 'NotExists') {- setLocalValue([]);- setLocalSelectedTags((tags) => [- ...tags.slice(0, index),- {- Key: selectedKeys,- Operator: selectedOperator,- StringValues: [],- NumberValues: [],- BoolValues: [],- },- ...tags.slice(index + 1, tags.length),- ]);- return true;- }- return false;-}-export function getInitialLocalValue(- selectedNumberValues: number[],- selectedBoolValues: boolean[],- selectedStringValues: string[],-): TagValueTypes[] {- return [- ...selectedBoolValues,- ...selectedNumberValues,- ...selectedStringValues,- ];-}--export function getTagValueOptions(- payload: TagValuePayload | null | undefined,- tagType: string,-): Array<{ label: string; value: TagValueTypes }> | undefined {- if (tagType === 'string') {- return payload?.stringTagValues?.map((e) => ({- label: e,- value: e,- }));- }- if (tagType === 'number') {- return payload?.numberTagValues?.map((e) => ({- label: e.toString(),- value: e,- }));- }- if (tagType === 'bool') {- return payload?.boolTagValues?.map((e) => ({- label: e.toString(),- value: e,- }));- }- return [];-}--export function getTagKeyOptions(- payload: TagKeyPayload | null | undefined,-): DefaultOptionType[] {- if (payload === null) {- return [- {- value: '',- label: 'No tags available',- },- ];- }- if (payload != null) {- return extractTagFilters(payload);- }- return [];-}--export function selectOptions(- payload: TagValuePayload | null | undefined,- tagType: string,-): string[] | boolean[] | number[] | undefined {- if (tagType === 'string') {- return payload?.stringTagValues;- }- if (tagType === 'number') {- return payload?.numberTagValues;- }- if (tagType === 'bool') {- return payload?.boolTagValues;- }- return [];-}--export function mapOperators(selectedKey: string): AllMenuProps[] {- return AllMenu.filter((e) =>- e?.supportedTypes?.includes(extractTagType(selectedKey)),- );-}--export function onTagKeySelect(- value: unknown,- options: AutoCompleteProps['options'],- setSelectedKey: Dispatch<SetStateAction<string>>,- setLocalSelectedTags: Dispatch<SetStateAction<Tags[]>>,- index: number,- tag: Tags,-): void {- if (- typeof value === 'string' &&- options &&- options.find((option) => option.value === value)- ) {- setSelectedKey(value);- setLocalSelectedTags((tags) => [- ...tags.slice(0, index),- {- Key: value,- Operator: tag.Operator,- StringValues: tag.StringValues,- NumberValues: tag.NumberValues,- BoolValues: tag.BoolValues,- },- ...tags.slice(index + 1, tags.length),- ]);- }-}diff --git a/frontend/src/container/Trace/Search/AllTags/index.tsx b/frontend/src/container/Trace/Search/AllTags/index.tsxdeleted file mode 100644index 4ceb4920b4..0000000000--- a/frontend/src/container/Trace/Search/AllTags/index.tsx+++ /dev/null@@ -1,153 +0,0 @@-import { useState } from 'react';-// eslint-disable-next-line no-restricted-imports-import { connect, useSelector } from 'react-redux';-import { ChevronRight, Plus } from '@signozhq/icons';-import { Button, Space, Flex } from 'antd';-import { Typography } from '@signozhq/ui/typography';-// eslint-disable-next-line no-restricted-imports-import { bindActionCreators } from 'redux';-import { ThunkDispatch } from 'redux-thunk';-import { UpdateTagIsError } from 'store/actions/trace/updateIsTagsError';-import { UpdateTagVisibility } from 'store/actions/trace/updateTagPanelVisiblity';-import { AppState } from 'store/reducers';-import AppActions from 'types/actions';-import { TraceReducer } from 'types/reducer/trace';--import { parseTagsToQuery } from '../util';-import {- ButtonContainer,- Container,- CurrentTagsContainer,- ErrorContainer,-} from './styles';-import Tags from './Tag';--const { Text } = Typography;--function AllTags({- updateTagIsError,- onChangeHandler,- updateTagVisibility,- updateFilters,-}: AllTagsProps): JSX.Element {- const traces = useSelector<AppState, TraceReducer>((state) => state.traces);-- const [localSelectedTags, setLocalSelectedTags] = useState<- TraceReducer['selectedTags']- >(traces.selectedTags);-- const onTagAddHandler = (): void => {- setLocalSelectedTags((tags) => [- ...tags,- {- Key: '',- Operator: 'Equals',- StringValues: [],- NumberValues: [],- BoolValues: [],- },- ]);- };-- const onCloseHandler = (index: number): void => {- setLocalSelectedTags([- ...localSelectedTags.slice(0, index),- ...localSelectedTags.slice(index + 1, localSelectedTags.length),- ]);- };-- const onRunQueryHandler = (): void => {- const parsedQuery = parseTagsToQuery(localSelectedTags);-- if (parsedQuery.isError) {- updateTagIsError(true);- } else {- onChangeHandler(parsedQuery.payload);- updateFilters(localSelectedTags);- updateTagIsError(false);- updateTagVisibility(false);- }- };-- const onResetHandler = (): void => {- setLocalSelectedTags([]);- };-- if (traces.isTagModalError) {- return (- <ErrorContainer>- <Text style={{ color: 'var(--warning-background)' }}>- Unrecognized query format. Please reset your query by clicking `X` in the- search bar above.- </Text>-- <Text style={{ color: 'var(--warning-background)' }}>- Please click on the search bar to get a drop down to select relevant tags- </Text>- </ErrorContainer>- );- }-- return (- <Container>- <Typography>Tags</Typography>-- <CurrentTagsContainer>- {localSelectedTags.map((tags, index) => (- <Tags- key={tags.Key}- tag={tags}- index={index}- onCloseHandler={(): void => onCloseHandler(index)}- setLocalSelectedTags={setLocalSelectedTags}- localSelectedTags={localSelectedTags}- />- ))}- </CurrentTagsContainer>-- <Space wrap direction="horizontal">- <Button type="primary" onClick={onTagAddHandler}>- <Flex gap={4} align="center">- <Plus size="md" />- Add Tags Filter- </Flex>- </Button>-- <Text truncate={1}>- Results will include spans with ALL the specified tags ( Rows are `ANDed` )- </Text>- </Space>-- <ButtonContainer>- <Space align="start">- <Button onClick={onResetHandler}>Reset</Button>- <Button type="primary" onClick={onRunQueryHandler}>- <Flex gap={4} align="center">- <ChevronRight size="md" />- Run Query- </Flex>- </Button>- </Space>- </ButtonContainer>- </Container>- );-}--interface DispatchProps {- updateTagIsError: (value: boolean) => void;- updateTagVisibility: (value: boolean) => void;-}--const mapDispatchToProps = (- dispatch: ThunkDispatch<unknown, unknown, AppActions>,-): DispatchProps => ({- updateTagIsError: bindActionCreators(UpdateTagIsError, dispatch),- updateTagVisibility: bindActionCreators(UpdateTagVisibility, dispatch),-});--interface AllTagsProps extends DispatchProps {- updateFilters: (tags: TraceReducer['selectedTags']) => void;- onChangeHandler: (search: string) => void;-}--export default connect(null, mapDispatchToProps)(AllTags);diff --git a/frontend/src/container/Trace/Search/AllTags/styles.ts b/frontend/src/container/Trace/Search/AllTags/styles.tsdeleted file mode 100644index a56eb33dd3..0000000000--- a/frontend/src/container/Trace/Search/AllTags/styles.ts+++ /dev/null@@ -1,39 +0,0 @@-import { Card } from 'antd';-import styled from 'styled-components';--export const Container = styled(Card)`- min-height: 20vh;- width: 100%;- min-width: 81.5vw;-`;--export const ErrorContainer = styled(Card)`- min-height: 20vh;- width: 100%;- z-index: 2;-- display: flex;- justify-content: center;- align-items: center;- flex-direction: column;-`;--export const ButtonContainer = styled(Card)`- display: flex;- justify-content: flex-end;- align-items: center;-- padding-top: 11px !important;- padding-bottom: 11px !important;- padding-right: 38.01px !important;-- margin-top: 1rem !important;-- .ant-card-body {- padding: 0;- }-`;--export const CurrentTagsContainer = styled.div`- margin-bottom: 1rem;-`;diff --git a/frontend/src/container/Trace/Search/config.ts b/frontend/src/container/Trace/Search/config.tsdeleted file mode 100644index 52d8acf3d8..0000000000--- a/frontend/src/container/Trace/Search/config.ts+++ /dev/null@@ -1 +0,0 @@-export const contentStyle = { padding: 0 };diff --git a/frontend/src/container/Trace/Search/index.tsx b/frontend/src/container/Trace/Search/index.tsxdeleted file mode 100644index 1121bd4453..0000000000--- a/frontend/src/container/Trace/Search/index.tsx+++ /dev/null@@ -1,152 +0,0 @@-import { useEffect, useRef, useState } from 'react';-// eslint-disable-next-line no-restricted-imports-import { connect, useDispatch, useSelector } from 'react-redux';-import { ChevronRight } from '@signozhq/icons';-import { Flex, Popover } from 'antd';-// eslint-disable-next-line no-restricted-imports-import { bindActionCreators, Dispatch } from 'redux';-import { ThunkDispatch } from 'redux-thunk';-import { UpdateTagIsError } from 'store/actions/trace/updateIsTagsError';-import { UpdateTagVisibility } from 'store/actions/trace/updateTagPanelVisiblity';-import { updateURL } from 'store/actions/trace/util';-import { AppState } from 'store/reducers';-import AppActions from 'types/actions';-import { UPDATE_ALL_FILTERS } from 'types/actions/trace';-import { TraceReducer } from 'types/reducer/trace';--import Tags from './AllTags';-import { contentStyle } from './config';-import { Container, SearchComponent } from './styles';-import { parseQueryToTags, parseTagsToQuery } from './util';--function Search({- updateTagVisibility,- updateTagIsError,-}: SearchProps): JSX.Element {- const traces = useSelector<AppState, TraceReducer>((state) => state.traces);-- const [value, setValue] = useState<string>('');- const dispatch = useDispatch<Dispatch<AppActions>>();-- useEffect(() => {- if (!traces.filterLoading) {- const initialTags = parseTagsToQuery(traces.selectedTags);- if (!initialTags.isError) {- setValue(initialTags.payload);- }- }- }, [traces.selectedTags, traces.filterLoading]);-- useEffect(() => {- if (value.length === 0 && traces.isTagModalError) {- updateTagIsError(false);- }- }, [traces.isTagModalError, value, updateTagIsError]);-- const tagRef = useRef<HTMLDivElement>(null);-- const onChangeHandler = (search: string): void => {- setValue(search);- };-- const setIsTagsModalHandler = (value: boolean): void => {- updateTagVisibility(value);- };-- const updateFilters = async (- selectedTags: TraceReducer['selectedTags'],- ): Promise<void> => {- dispatch({- type: UPDATE_ALL_FILTERS,- payload: {- selectedTags,- current: traces.spansAggregate.currentPage,- filter: traces.filter,- filterToFetchData: traces.filterToFetchData,- selectedFilter: traces.selectedFilter,- userSelected: traces.userSelectedFilter,- isFilterExclude: traces.isFilterExclude,- order: traces.spansAggregate.order,- pageSize: traces.spansAggregate.pageSize,- orderParam: traces.spansAggregate.orderParam,- spanKind: traces.spanKind,- },- });-- updateURL(- traces.selectedFilter,- traces.filterToFetchData,- traces.spansAggregate.currentPage,- selectedTags,- traces.isFilterExclude,- traces.userSelectedFilter,- traces.spansAggregate.order,- traces.spansAggregate.pageSize,- traces.spansAggregate.orderParam,- );- };-- return (- <Container ref={tagRef}>- <Popover- placement="bottomLeft"- destroyTooltipOnHide- open={traces.isTagModalOpen}- trigger="click"- onOpenChange={setIsTagsModalHandler}- showArrow={false}- overlayInnerStyle={contentStyle}- content={- <Tags updateFilters={updateFilters} onChangeHandler={onChangeHandler} />- }- >- <SearchComponent- onChange={(event): void => onChangeHandler(event.target.value)}- value={value}- allowClear- disabled={traces.filterLoading}- placeholder="Click to filter by tags"- type="search"- enterButton={- <Flex align="center">- <ChevronRight size="md" />- </Flex>- }- onSearch={(string): void => {- if (string.length === 0) {- updateTagVisibility(false);- updateFilters([]);- return;- }-- const { isError, payload } = parseQueryToTags(string);-- if (isError) {- updateTagIsError(true);- } else {- updateTagIsError(false);- updateTagVisibility(false);- updateFilters(payload);- }- }}- />- </Popover>- </Container>- );-}--interface DispatchProps {- updateTagVisibility: (value: boolean) => void;- updateTagIsError: (value: boolean) => void;-}--const mapDispatchToProps = (- dispatch: ThunkDispatch<unknown, unknown, AppActions>,-): DispatchProps => ({- updateTagVisibility: bindActionCreators(UpdateTagVisibility, dispatch),- updateTagIsError: bindActionCreators(UpdateTagIsError, dispatch),-});--type SearchProps = DispatchProps;--export default connect(null, mapDispatchToProps)(Search);diff --git a/frontend/src/container/Trace/Search/styles.ts b/frontend/src/container/Trace/Search/styles.tsdeleted file mode 100644index cfae21ceb2..0000000000--- a/frontend/src/container/Trace/Search/styles.ts+++ /dev/null@@ -1,19 +0,0 @@-import { Input } from 'antd';-import styled from 'styled-components';--const { Search } = Input;--export const Container = styled.div`- display: flex;- position: relative;- width: 100%;- margin-top: 1rem;-`;--export const SearchComponent = styled(Search)`- .ant-btn-primary {- svg {- transform: scale(1.5);- }- }-`;diff --git a/frontend/src/container/Trace/Search/util.ts b/frontend/src/container/Trace/Search/util.tsdeleted file mode 100644index 347d1df54f..0000000000--- a/frontend/src/container/Trace/Search/util.ts+++ /dev/null@@ -1,158 +0,0 @@-import { AllMenu } from 'container/Trace/Search/AllTags/Tag';-import { TraceReducer } from 'types/reducer/trace';--import { extractTagType, TagValueTypes } from './AllTags/Tag/utils';--type Tags = TraceReducer['selectedTags'];--interface PayloadProps<T> {- isError: boolean;- payload: T;-}--function extractValues(- tagType: string,- filters: string[],- isError: boolean,-): [number[], boolean[], string[], boolean] {- const StringValues: string[] = [];- const NumberValues: number[] = [];- const BoolValues: boolean[] = [];- let isErr = isError;- if (tagType === 'string') {- StringValues.push(...filters);- } else if (tagType === 'number') {- filters.forEach((element) => {- const num = Number(element);- isErr = Number.isNaN(num) ? true : isError;- NumberValues.push(num);- });- } else if (tagType === 'bool') {- filters.forEach((element) => {- if (element === 'true') {- BoolValues.push(true);- } else if (element === 'false') {- BoolValues.push(false);- } else {- isErr = true;- }- });- }- return [NumberValues, BoolValues, StringValues, isErr];-}--export const parseQueryToTags = (query: string): PayloadProps<Tags> => {- let isError = false;-- // Split the query string by ' AND '- const noOfTags = query.split(' AND ');-- // Map over each tag- const tags: Tags = noOfTags.map((filter) => {- // Find the operator used in the filter- const operator =- AllMenu.find((e) => `${filter} `.includes(` ${e.key} `))?.key || '';-- // Split the filter by the operator- const [tagName, tagValues] = filter.split(operator).map((e) => e.trim());-- // If the operator is Exists or NotExists, then return the tag object without values- if (operator === 'Exists' || operator === 'NotExists') {- return {- Key: tagName,- StringValues: [],- NumberValues: [],- BoolValues: [],- Operator: operator as FlatArray<Tags, 1>['Operator'],- };- }- // Check for errors in the filter- isError = operator.length === 0 || !tagName || !tagValues ? true : isError;-- // Remove the first and last brackets from the tagValues- const formattedTagValues = tagValues.slice(1, -1);-- // Split the tagValues by ',' and remove any quotes- const filters = formattedTagValues- .split(',')- .map((e) => e.replaceAll(/"/g, ''));-- // Check for errors in the filters- filters.forEach((e) => {- const firstChar = e.charAt(0);- const lastChar = e.charAt(e.length - 1);- isError = firstChar === '"' && lastChar === '"' ? true : isError;- });-- // Extract the tag type- const tagType = extractTagType(tagName);-- // Extract the values for the tag- const [NumberValues, BoolValues, StringValues, isErr] = extractValues(- tagType,- filters,- isError,- );- isError = isErr;-- // Return the tag object- return {- Key: tagName,- StringValues,- NumberValues,- BoolValues,- Operator: operator as FlatArray<Tags, 1>['Operator'],- };- });- return {- isError,- payload: tags,- };-};--const formatValues = (values: TagValueTypes[]): string =>- values.map((e) => `"${e.toString().replaceAll(/"/g, '')}"`).join(',');--export const parseTagsToQuery = (tags: Tags): PayloadProps<string> => {- let isError = false;-- // Map over each tag- const payload = tags- .map(({ StringValues, NumberValues, BoolValues, Key, Operator }) => {- // Check if the key of the tag is undefined- if (!Key) {- isError = true;- }- if (Operator === 'Exists' || Operator === 'NotExists') {- return `${Key} ${Operator}`;- }- // Check if the tag has string values- if (StringValues.length > 0) {- // Format the string values and join them with a ','- const formattedStringValues = formatValues(StringValues);- return `${Key} ${Operator} (${formattedStringValues})`;- }-- // Check if the tag has number values- if (NumberValues.length > 0) {- // Format the number values and join them with a ','- const formattedNumberValues = formatValues(NumberValues);- return `${Key} ${Operator} (${formattedNumberValues})`;- }-- // Check if the tag has boolean values- if (BoolValues.length > 0) {- // Format the boolean values and join them with a ','- const formattedBoolValues = formatValues(BoolValues);- return `${Key} ${Operator} (${formattedBoolValues})`;- }-- return '';- })- .join(' AND ');-- return {- isError,- payload,- };-};diff --git a/frontend/src/container/Trace/TraceGraphFilter/config.ts b/frontend/src/container/Trace/TraceGraphFilter/config.tsdeleted file mode 100644index 3c8ac3f109..0000000000--- a/frontend/src/container/Trace/TraceGraphFilter/config.ts+++ /dev/null@@ -1,107 +0,0 @@-import type { DefaultOptionType } from 'antd/es/select';--interface Dropdown {- key: string;- displayValue: string;- yAxisUnit?: string;-}--export const groupBy: DefaultOptionType[] = [- {- label: 'None',- value: 'none',- },- {- label: 'Service Name',- value: 'serviceName',- },- {- label: 'Operation',- value: 'name',- },- {- label: 'HTTP URL',- value: 'httpUrl',- },- {- label: 'HTTP Method',- value: 'httpMethod',- },- {- label: 'HTTP Host',- value: 'httpHost',- },- {- label: 'HTTP Route',- value: 'httpRoute',- },- {- label: 'RPC Method',- value: 'rpcMethod',- },- {- label: 'Status Code',- value: 'responseStatusCode',- },- {- label: 'Database Name',- value: 'dbName',- },- {- label: 'Database System',- value: 'dbSystem',- },- {- label: 'Database Operation',- value: 'dbOperation',- },- {- label: 'Messaging System',- value: 'msgSystem',- },- {- label: 'Messaging Operation',- value: 'msgOperation',- },-];--export const functions: Dropdown[] = [- { displayValue: 'Count', key: 'count', yAxisUnit: 'short' },- {- displayValue: 'Rate per sec',- key: 'ratePerSec',- yAxisUnit: 'reqps',- },- { displayValue: 'Sum (duration)', key: 'sum', yAxisUnit: 'ns' },- { displayValue: 'Avg (duration)', key: 'avg', yAxisUnit: 'ns' },- {- displayValue: 'Max (duration)',- key: 'max',- yAxisUnit: 'ns',- },- {- displayValue: 'Min (duration)',- key: 'min',- yAxisUnit: 'ns',- },- {- displayValue: '50th percentile (duration)',- key: 'p50',- yAxisUnit: 'ns',- },- {- displayValue: '90th percentile (duration)',- key: 'p90',- yAxisUnit: 'ns',- },- {- displayValue: '95th percentile (duration)',- key: 'p95',- yAxisUnit: 'ns',- },- {- displayValue: '99th percentile (duration)',- key: 'p99',- yAxisUnit: 'ns',- },-];diff --git a/frontend/src/container/Trace/TraceGraphFilter/index.tsx b/frontend/src/container/Trace/TraceGraphFilter/index.tsxdeleted file mode 100644index 63c012f78f..0000000000--- a/frontend/src/container/Trace/TraceGraphFilter/index.tsx+++ /dev/null@@ -1,102 +0,0 @@-import { useMemo, useState } from 'react';-import { useQuery } from 'react-query';-// eslint-disable-next-line no-restricted-imports-import { useSelector } from 'react-redux';-import { Input } from '@signozhq/ui/input';-import { AutoComplete, Space } from 'antd';-import getTagFilters from 'api/trace/getTagFilter';-import { AppState } from 'store/reducers';-import { GlobalReducer } from 'types/reducer/globalTime';-import { TraceReducer } from 'types/reducer/trace';-import { popupContainer } from 'utils/selectPopupContainer';--import { functions } from './config';-import { SelectComponent } from './styles';-import {- filterGroupBy,- getSelectedValue,- initOptions,- onClickSelectedFunctionHandler,- onClickSelectedGroupByHandler,- selectedGroupByValue,-} from './utils';--const { Option } = SelectComponent;--function TraceGraphFilter(): JSX.Element {- const { selectedFunction, selectedGroupBy } = useSelector<- AppState,- TraceReducer- >((state) => state.traces);- const [selectedGroupByLocal, setSelectedGroupByLocal] =- useState<string>(selectedGroupBy);- const globalTime = useSelector<AppState, GlobalReducer>(- (state) => state.globalTime,- );- const traces = useSelector<AppState, TraceReducer>((state) => state.traces);-- const { isLoading, data } = useQuery(- [- 'getTagKeys',- globalTime.minTime,- globalTime.maxTime,- traces.selectedFilter,- traces.isFilterExclude,- traces.spanKind,- ],- {- queryFn: () =>- getTagFilters({- start: globalTime.minTime,- end: globalTime.maxTime,- other: Object.fromEntries(traces.selectedFilter),- isFilterExclude: traces.isFilterExclude,- spanKind: traces.spanKind,- }),- cacheTime: 120000,- enabled: traces.filter.size > 0,- },- );-- const options = useMemo(() => initOptions(data?.payload), [data?.payload]);-- return (- <Space>- <label htmlFor="selectedFunction">Function</label>-- <SelectComponent- getPopupContainer={popupContainer}- dropdownMatchSelectWidth- data-testid="selectedFunction"- id="selectedFunction"- value={getSelectedValue(selectedFunction)}- onChange={onClickSelectedFunctionHandler}- >- {functions.map((value) => (- <Option value={value.key} key={value.key}>- {value.displayValue}- </Option>- ))}- </SelectComponent>-- <label htmlFor="selectedGroupBy">Group By</label>- <AutoComplete- getPopupContainer={popupContainer}- dropdownMatchSelectWidth- id="selectedGroupBy"- data-testid="selectedGroupBy"- options={options}- value={selectedGroupByValue(selectedGroupByLocal, options)}- onChange={(e): void => setSelectedGroupByLocal(e.toString())}- onSelect={onClickSelectedGroupByHandler(options)}- filterOption={(inputValue, option): boolean =>- filterGroupBy(inputValue, option)- }- >- <Input disabled={isLoading} placeholder="Please select" />- </AutoComplete>- </Space>- );-}--export default TraceGraphFilter;diff --git a/frontend/src/container/Trace/TraceGraphFilter/styles.ts b/frontend/src/container/Trace/TraceGraphFilter/styles.tsdeleted file mode 100644index 5fb2a7cfad..0000000000--- a/frontend/src/container/Trace/TraceGraphFilter/styles.ts+++ /dev/null@@ -1,8 +0,0 @@-import { Select } from 'antd';-import styled from 'styled-components';--export const SelectComponent = styled(Select)`- &&& {- min-width: 12rem;- }-`;diff --git a/frontend/src/container/Trace/TraceGraphFilter/utils.test.ts b/frontend/src/container/Trace/TraceGraphFilter/utils.test.tsdeleted file mode 100644index fcfbf6bd04..0000000000--- a/frontend/src/container/Trace/TraceGraphFilter/utils.test.ts+++ /dev/null@@ -1,27 +0,0 @@-import { selectedGroupByValue } from './utils';--const options = [- {- value: '1',- label: '1',- },- {- value: '2',- label: '2',- },-];--describe('TraceGraphFilter/utils', () => {- it('should return the correct value', () => {- const selectedGroupBy = '1';- const result = selectedGroupByValue(selectedGroupBy, options);- expect(result).toStrictEqual(selectedGroupBy);- });-- it('should return the correct value when selectedOption not found', () => {- const selectedGroupBy = '3';-- const result = selectedGroupByValue(selectedGroupBy, options);- expect(result).toStrictEqual(selectedGroupBy);- });-});diff --git a/frontend/src/container/Trace/TraceGraphFilter/utils.ts b/frontend/src/container/Trace/TraceGraphFilter/utils.tsdeleted file mode 100644index 06698cbc8a..0000000000--- a/frontend/src/container/Trace/TraceGraphFilter/utils.ts+++ /dev/null@@ -1,88 +0,0 @@-import { ReactNode } from 'react';-import type { DefaultOptionType } from 'antd/es/select';-import store from 'store';-import {- UPDATE_SELECTED_FUNCTION,- UPDATE_SELECTED_GROUP_BY,-} from 'types/actions/trace';-import { PayloadProps } from 'types/api/trace/getTagFilters';--import { extractTagFilters } from '../Search/AllTags/Tag/utils';-import { functions, groupBy } from './config';--export function groupByValues(- tagFilters: DefaultOptionType[],-): DefaultOptionType[] {- const result: DefaultOptionType[] = [...groupBy];- tagFilters.forEach((e) => {- result.push(e);- });- return result;-}--export function initOptions(- payload: PayloadProps | null | undefined,-): DefaultOptionType[] {- if (payload) {- return groupByValues(extractTagFilters(payload));- }- return groupBy;-}--export function onClickSelectedGroupByHandler(options: DefaultOptionType[]) {- return (ev: unknown): void => {- const { dispatch } = store;- if (typeof ev === 'string' && options) {- const selected = options.find((e) => e.value === ev);- if (selected) {- dispatch({- type: UPDATE_SELECTED_GROUP_BY,- payload: {- selectedGroupBy: selected.value ? selected.value.toString() : '',- },- });- }- }- };-}--export function onClickSelectedFunctionHandler(value: unknown): void {- const { dispatch } = store;- if (typeof value === 'string') {- const selected = functions.find((e) => e.key === value);- if (selected) {- dispatch({- type: UPDATE_SELECTED_FUNCTION,- payload: {- selectedFunction: selected.key,- yAxisUnit: selected.yAxisUnit,- },- });- }- }-}--export function selectedGroupByValue(- selectedGroupBy: string,- options: DefaultOptionType[],-): ReactNode {- const optionValue = options.find((e) => selectedGroupBy === e.value)?.label;- if (optionValue) {- return optionValue;- }- return selectedGroupBy;-}--export function getSelectedValue(selectedFunction: string): unknown {- return functions.find((e) => selectedFunction === e.key)?.displayValue;-}--export function filterGroupBy(- inputValue: string,- option: DefaultOptionType | undefined,-): boolean {- return (- option?.label?.toString().toUpperCase().indexOf(inputValue.toUpperCase()) !==- -1- );-}diff --git a/frontend/src/container/Trace/TraceTable/index.tsx b/frontend/src/container/Trace/TraceTable/index.tsxdeleted file mode 100644index 2db758dc49..0000000000--- a/frontend/src/container/Trace/TraceTable/index.tsx+++ /dev/null@@ -1,232 +0,0 @@-import { HTMLAttributes } from 'react';-// eslint-disable-next-line no-restricted-imports-import { useDispatch, useSelector } from 'react-redux';-import { TableColumnsType as ColumnsType, TableProps } from 'antd';-import { Badge } from '@signozhq/ui/badge';-import { Typography } from '@signozhq/ui/typography';-import { ResizeTable } from 'components/ResizeTable';-import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';-import ROUTES from 'constants/routes';-import {- getSpanOrder,- getSpanOrderParam,-} from 'container/Trace/TraceTable/util';-import { formUrlParams } from 'container/TraceDetail/utils';-import dayjs from 'dayjs';-import duration from 'dayjs/plugin/duration';-import history from 'lib/history';-import omit from 'lodash-es/omit';-// eslint-disable-next-line no-restricted-imports-import { Dispatch } from 'redux';-import { updateURL } from 'store/actions/trace/util';-import { AppState } from 'store/reducers';-import AppActions from 'types/actions';-import {- UPDATE_SPAN_ORDER,- UPDATE_SPAN_ORDER_PARAMS,- UPDATE_SPANS_AGGREGATE_PAGE_NUMBER,- UPDATE_SPANS_AGGREGATE_PAGE_SIZE,-} from 'types/actions/trace';-import { TraceReducer } from 'types/reducer/trace';-import { openInNewTab } from 'utils/navigation';-import { v4 } from 'uuid';--dayjs.extend(duration);--function TraceTable(): JSX.Element {- const {- spansAggregate,- selectedFilter,- selectedTags,- filterLoading,- userSelectedFilter,- isFilterExclude,- filterToFetchData,- filter,- } = useSelector<AppState, TraceReducer>((state) => state.traces);-- const statusFilter = filter.get('status');- const selectedStatusFilter = selectedFilter.get('status');-- const dispatch = useDispatch<Dispatch<AppActions>>();-- const { loading, order: spansAggregateOrder } = spansAggregate;-- type TableType = FlatArray<TraceReducer['spansAggregate']['data'], 1>;-- const getLink = (record: TableType): string =>- `${ROUTES.TRACE}/${record.traceID}${formUrlParams({- spanId: record.spanID,- levelUp: 0,- levelDown: 0,- })}`;-- const getValue = (value: string): JSX.Element => (- <Typography>{value}</Typography>- );-- const getHttpMethodOrStatus = (- value: TableType['statusCode'],- ): JSX.Element => {- if (value.length === 0) {- return <Typography>-</Typography>;- }- return <Badge color="sakura">{value}</Badge>;- };-- const columns: ColumnsType<TableType> = [- {- title: 'Date',- dataIndex: 'timestamp',- key: 'timestamp',- width: 120,- sorter: true,- render: (value: TableType['timestamp']): JSX.Element => {- const day = dayjs(value);- return (- <Typography>- {day.format(DATE_TIME_FORMATS.SLASH_DATETIME_SECONDS)}- </Typography>- );- },- },- {- title: 'Service',- dataIndex: 'serviceName',- key: 'serviceName',- width: 50,- render: getValue,- },- {- title: 'Operation',- dataIndex: 'operation',- key: 'operation',- width: 110,- render: getValue,- },- {- title: 'Duration',- dataIndex: 'durationNano',- key: 'durationNano',- width: 50,- sorter: true,- render: (value: TableType['durationNano']): JSX.Element => (- <Typography>- {`${dayjs- .duration({ milliseconds: value / 1000000 })- .asMilliseconds()- .toFixed(2)} ms`}- </Typography>- ),- },- {- title: 'Method',- dataIndex: 'method',- key: 'method',- width: 50,- render: getHttpMethodOrStatus,- },- {- title: 'Status Code',- dataIndex: 'statusCode',- key: 'statusCode',- width: 50,- render: getHttpMethodOrStatus,- },- ];-- const onChangeHandler: TableProps<TableType>['onChange'] = (- props,- _,- sort,- ) => {- if (!Array.isArray(sort)) {- const { order = spansAggregateOrder } = sort;- if (props.current && props.pageSize) {- const spanOrder = getSpanOrder(order || '');- const orderParam = getSpanOrderParam(sort.field as string);-- dispatch({- type: UPDATE_SPAN_ORDER,- payload: {- order: spanOrder,- },- });-- dispatch({- type: UPDATE_SPAN_ORDER_PARAMS,- payload: {- orderParam,- },- });-- dispatch({- type: UPDATE_SPANS_AGGREGATE_PAGE_SIZE,- payload: {- pageSize: props.pageSize,- },- });-- dispatch({- type: UPDATE_SPANS_AGGREGATE_PAGE_NUMBER,- payload: {- currentPage: props.current,- },- });-- updateURL(- selectedFilter,- filterToFetchData,- props.current,- selectedTags,- isFilterExclude,- userSelectedFilter,- spanOrder,- props.pageSize,- orderParam,- );- }- }- };-- const totalObject = omit(statusFilter, [...(selectedStatusFilter || [])]);- const totalCount = Object.values(totalObject).reduce(- (a, b) => parseInt(String(a), 10) + parseInt(String(b), 10),- 0,- ) as number;-- return (- <ResizeTable- columns={columns}- onChange={onChangeHandler}- dataSource={spansAggregate.data}- loading={loading || filterLoading}- rowKey={(record: { traceID: string; spanID: string }): string =>- `${record.traceID}-${record.spanID}-${v4()}`- }- style={{- cursor: 'pointer',- }}- onRow={(record: TableType): HTMLAttributes<TableType> => ({- onClick: (event): void => {- event.preventDefault();- event.stopPropagation();- if (event.metaKey || event.ctrlKey) {- openInNewTab(getLink(record));- } else {- history.push(getLink(record));- }- },- })}- pagination={{- current: spansAggregate.currentPage,- pageSize: spansAggregate.pageSize,- responsive: true,- position: ['bottomLeft'],- total: totalCount,- }}- />- );-}--export default TraceTable;diff --git a/frontend/src/container/Trace/TraceTable/util.ts b/frontend/src/container/Trace/TraceTable/util.tsdeleted file mode 100644index 4b2e8c7c13..0000000000--- a/frontend/src/container/Trace/TraceTable/util.ts+++ /dev/null@@ -1,19 +0,0 @@-export const getSpanOrderParam = (key: string): string => {- if (key === 'durationNano' || key === 'duration_nano') {- return 'duration';- }- if (key === 'timestamp') {- return 'timestamp';- }- return '';-};--export const getSpanOrder = (order: string): string => {- if (order === 'ascend') {- return 'ascending';- }- if (order === 'descend') {- return 'descending';- }- return '';-};diff --git a/frontend/src/container/TraceDetail/SelectedSpanDetails/Tags/Tags.styles.scss b/frontend/src/container/TraceDetail/SelectedSpanDetails/Tags/Tags.styles.scssdeleted file mode 100644index d8264e6777..0000000000--- a/frontend/src/container/TraceDetail/SelectedSpanDetails/Tags/Tags.styles.scss+++ /dev/null@@ -1,15 +0,0 @@-.tagTooltip {- .ant-tooltip-content {- max-height: 300px;- overflow-x: hidden;- overflow-y: auto;- padding: 8px;-- background-color: var(--l1-border);- margin-bottom: 8px;- }-- .ant-tooltip-inner {- box-shadow: none;- }-}diff --git a/frontend/src/container/TraceDetail/utils.test.ts b/frontend/src/container/TraceDetail/utils.test.tsdeleted file mode 100644index 5b4e5d8026..0000000000--- a/frontend/src/container/TraceDetail/utils.test.ts+++ /dev/null@@ -1,59 +0,0 @@-import { ITraceTree } from 'types/api/trace/getTraceItem';--import { getTreeLevelsCount } from './utils';--describe('traces/getTreeLevelsCount', () => {- const createNode = (id: string, children: ITraceTree[] = []): ITraceTree => ({- id,- name: '',- value: 0,- time: 0,- startTime: 0,- tags: [],- children,- serviceName: '',- serviceColour: '',- spanKind: '',- statusCodeString: '',- statusMessage: '',- });-- it('should return 0 for empty tree', () => {- const emptyTree = null;- expect(getTreeLevelsCount(emptyTree as unknown as ITraceTree)).toBe(0);- });-- it('should return 1 for a tree with a single node', () => {- const singleNodeTree = createNode('1');- expect(getTreeLevelsCount(singleNodeTree)).toBe(1);- });-- it('should return correct depth for a balanced tree', () => {- const tree = createNode('1', [- createNode('2', [createNode('4'), createNode('5')]),- createNode('3', [createNode('6'), createNode('7')]),- ]);-- expect(getTreeLevelsCount(tree)).toBe(3);- });-- it('should return correct depth for an unbalanced tree', () => {- const tree = createNode('1', [- createNode('2', [- createNode('4', [createNode('8', [createNode('11')])]),- createNode('5'),- ]),- createNode('3', [createNode('6'), createNode('7', [createNode('10')])]),- ]);-- expect(getTreeLevelsCount(tree)).toBe(5);- });-- it('should return correct depth for a tree with single child nodes', () => {- const tree = createNode('1', [- createNode('2', [createNode('3', [createNode('4', [createNode('5')])])]),- ]);-- expect(getTreeLevelsCount(tree)).toBe(5);- });-});diff --git a/frontend/src/container/TraceFlameGraph/__tests__/TraceFlameGraph.test.tsx b/frontend/src/container/TraceFlameGraph/__tests__/TraceFlameGraph.test.tsxdeleted file mode 100644index d681d47761..0000000000--- a/frontend/src/container/TraceFlameGraph/__tests__/TraceFlameGraph.test.tsx+++ /dev/null@@ -1,50 +0,0 @@-import { useState } from 'react';-// eslint-disable-next-line no-restricted-imports-import { Provider } from 'react-redux';-import { render, renderHook } from '@testing-library/react';-import TraceFlameGraph from 'container/TraceFlameGraph';-import store from 'store';--it('loads and displays greeting', () => {- const { rerender } = renderHook(() => useState(''));-- const { asFragment } = render(- <Provider store={store}>- <TraceFlameGraph- {...{- hoveredSpanId: '',- intervalUnit: { multiplier: 0, name: 'm' },- onSpanHover: rerender,- onSpanSelect: (): void => {},- selectedSpanId: '',- traceMetaData: {- globalEnd: 0,- globalStart: 0,- levels: 0,- spread: 0,- totalSpans: 0,- },- missingSpanTree: false,- treeData: {- children: [],- id: '',- name: '',- serviceColour: '#a0e',- serviceName: '',- startTime: 0,- tags: [],- time: 100,- value: 100,- event: [],- hasError: false,- parent: undefined,- spanKind: '',- statusCodeString: '',- statusMessage: '',- },- }}- />- </Provider>,- );- expect(asFragment()).toMatchSnapshot();-});diff --git a/frontend/src/container/TraceFlameGraph/__tests__/__snapshots__/TraceFlameGraph.test.tsx.snap b/frontend/src/container/TraceFlameGraph/__tests__/__snapshots__/TraceFlameGraph.test.tsx.snapdeleted file mode 100644index 51cd1a9ead..0000000000--- a/frontend/src/container/TraceFlameGraph/__tests__/__snapshots__/TraceFlameGraph.test.tsx.snap+++ /dev/null@@ -1,34 +0,0 @@-// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing--exports[`loads and displays greeting 1`] = `-<DocumentFragment>- .c1 {- position: absolute;- top: 0px;- left: NaN%;- width: Infinity%;- height: 10px;- margin: 1px 0;- background-color: hsl(282.9,100%,60.7%);- border-radius: 5px;- z-index: 1;-}--.c0 {- position: relative;- width: 100%;- height: 120px;-}--<div- class="c0"- height="0"- >- <div- class="c1"- title=""- width="Infinity"- />- </div>-</DocumentFragment>-`;diff --git a/frontend/src/container/TraceFlameGraph/index.tsx b/frontend/src/container/TraceFlameGraph/index.tsxdeleted file mode 100644index b62798451e..0000000000--- a/frontend/src/container/TraceFlameGraph/index.tsx+++ /dev/null@@ -1,184 +0,0 @@-import {- Dispatch,- SetStateAction,- useLayoutEffect,- useMemo,- useState,-} from 'react';-import Color from 'color';-import { ITraceMetaData } from 'container/GantChart';-import { useIsDarkMode } from 'hooks/useDarkMode';-import { ITraceTree } from 'types/api/trace/getTraceItem';--import {- SpanItemContainer,- TOTAL_SPAN_HEIGHT,- TraceFlameGraphContainer,-} from './styles';--interface SpanItemProps {- topOffset: number;- leftOffset: number;- width: number;- spanData: ITraceTree;- tooltipText: string;- onSpanSelect: (id: string) => void;- onSpanHover: Dispatch<SetStateAction<string>>;- hoveredSpanId: string;- selectedSpanId: string;-}--function SpanItem({- topOffset = 0, // top offset in px- leftOffset = 0, // left offset in %- width = 10, // width in %- spanData,- tooltipText,- onSpanSelect, // function which gets invoked on clicking span- onSpanHover,- hoveredSpanId,- selectedSpanId,-}: SpanItemProps): JSX.Element {- const { serviceColour } = spanData;- const [isSelected, setIsSelected] = useState<boolean>(false);- // const [isLocalHover, setIsLocalHover] = useState<boolean>(false);- const isDarkMode = useIsDarkMode();-- useLayoutEffect(() => {- if (- !isSelected &&- (spanData.id === hoveredSpanId || spanData.id === selectedSpanId)- ) {- setIsSelected(true);- }- }, [hoveredSpanId, selectedSpanId, isSelected, spanData]);-- const handleHover = (hoverState: boolean): void => {- // setIsLocalHover(hoverState);-- if (hoverState) {- onSpanHover(spanData.id);- } else {- onSpanHover('');- }- };-- const handleClick = (): void => {- onSpanSelect(spanData.id);- };-- const spanColor = useMemo((): string => {- const selectedSpanColor = isDarkMode- ? Color(serviceColour).lighten(0.3)- : Color(serviceColour).darken(0.3);- return `${isSelected ? selectedSpanColor : serviceColour}`;- }, [isSelected, serviceColour, isDarkMode]);-- return (- <SpanItemContainer- title={tooltipText}- onClick={handleClick}- onMouseEnter={(): void => {- handleHover(true);- }}- onMouseLeave={(): void => {- handleHover(false);- }}- topOffset={topOffset}- leftOffset={leftOffset}- width={width}- spanColor={spanColor}- selected={isSelected}- zIdx={isSelected ? 1 : 0}- />- );-}--function TraceFlameGraph(props: {- treeData: ITraceTree;- traceMetaData: ITraceMetaData;- onSpanHover: SpanItemProps['onSpanHover'];- onSpanSelect: SpanItemProps['onSpanSelect'];- hoveredSpanId: string;- selectedSpanId: string;- missingSpanTree: boolean;-}): JSX.Element {- const { treeData, traceMetaData, onSpanHover, missingSpanTree } = props;-- if (!treeData || treeData.id === 'empty' || !traceMetaData) {- return <div />;- }- const { onSpanSelect, hoveredSpanId, selectedSpanId } = props;-- const { globalStart, spread, levels } = traceMetaData;- function RenderSpanRecursive({- level = 0,- spanData,- parentLeftOffset = 0,- onSpanHover,- onSpanSelect,- hoveredSpanId,- selectedSpanId,- }: {- spanData: ITraceTree;- level: number;- parentLeftOffset: number;- onSpanHover: SpanItemProps['onSpanHover'];- onSpanSelect: SpanItemProps['onSpanSelect'];- hoveredSpanId: string;- selectedSpanId: string;- }): JSX.Element {- if (!spanData) {- return <div />;- }-- const leftOffset = ((spanData.startTime - globalStart) * 100) / spread;- const width = ((spanData.value / 1e6) * 100) / spread;- const toolTipText = `${spanData.name}`;-- return (- <>- <SpanItem- topOffset={level * TOTAL_SPAN_HEIGHT}- leftOffset={leftOffset}- width={width}- spanData={spanData}- tooltipText={toolTipText}- onSpanHover={onSpanHover}- onSpanSelect={onSpanSelect}- hoveredSpanId={hoveredSpanId}- selectedSpanId={selectedSpanId}- />-- {spanData.children.map((childData) => (- <RenderSpanRecursive- level={level + 1}- spanData={childData}- key={childData.id}- parentLeftOffset={leftOffset + parentLeftOffset}- onSpanHover={onSpanHover}- onSpanSelect={onSpanSelect}- hoveredSpanId={hoveredSpanId}- selectedSpanId={selectedSpanId}- />- ))}- </>- );- }-- return (- <TraceFlameGraphContainer height={TOTAL_SPAN_HEIGHT * levels}>- <RenderSpanRecursive- spanData={treeData}- onSpanHover={onSpanHover}- onSpanSelect={onSpanSelect}- hoveredSpanId={hoveredSpanId}- selectedSpanId={selectedSpanId}- level={missingSpanTree ? -1 : 0}- parentLeftOffset={0}- />- </TraceFlameGraphContainer>- );-}--export default TraceFlameGraph;diff --git a/frontend/src/container/TraceFlameGraph/styles.ts b/frontend/src/container/TraceFlameGraph/styles.tsdeleted file mode 100644index 285c67102e..0000000000--- a/frontend/src/container/TraceFlameGraph/styles.ts+++ /dev/null@@ -1,38 +0,0 @@-import styled from 'styled-components';--const SPAN_HEIGHT = 10;-const SPAN_V_PADDING = 1;-export const TOTAL_SPAN_HEIGHT = SPAN_HEIGHT + 2 * SPAN_V_PADDING;--/**- * An individual span for traces flame graph- */-export const SpanItemContainer = styled.div<{- topOffset: number;- leftOffset: number;- width: number;- spanColor: string;- selected: boolean;- zIdx: number;-}>`- position: absolute;- top: ${(props): string | number => props.topOffset}px;- left: ${(props): string | number => props.leftOffset}%;- width: ${(props): string | number => props.width}%;- height: ${SPAN_HEIGHT}px;- margin: ${SPAN_V_PADDING}px 0;- background-color: ${({ spanColor }): string | number => spanColor};- border-radius: ${SPAN_HEIGHT / 2}px;- z-index: ${(props): string | number => props.zIdx};-`;--/**- * Container for spans, for traces flame graph.- */-export const TraceFlameGraphContainer = styled.div<{- height: number;-}>`- position: relative;- width: 100%;- height: ${({ height }): string | number => height || 120}px;-`;diff --git a/frontend/src/container/TracesExplorer/ListView/utils.tsx b/frontend/src/container/TracesExplorer/ListView/utils.tsxindex 9a20f4ef12..31c5239b38 100644--- a/frontend/src/container/TracesExplorer/ListView/utils.tsx+++ b/frontend/src/container/TracesExplorer/ListView/utils.tsx@@ -1,4 +1,4 @@-import { Link } from 'react-router-dom';+import { generatePath, Link } from 'react-router-dom';import type { TableColumnsType as ColumnsType } from 'antd';import { Badge } from '@signozhq/ui/badge';import { Typography } from '@signozhq/ui/typography';@@ -7,8 +7,8 @@ import type { TracesTableRow } from 'container/TracesExplorer/TracesTable/getFieimport { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';import ROUTES from 'constants/routes';import { buildCompositeKey } from 'container/OptionsMenu/utils';-import { getMs } from 'container/Trace/Filters/Panel/PanelBody/Duration/util';-import { formUrlParams } from 'container/TraceDetail/utils';+import { getMs } from 'utils/timeUtils';+import { formUrlParams } from 'utils/traceUtils';import { TimestampInput } from 'hooks/useTimezoneFormatter/useTimezoneFormatter';import { RowData } from 'lib/query/createTableColumnsFromQuery';import LineClampedText from 'periscope/components/LineClampedText/LineClampedText';@@ -53,7 +53,11 @@ export const getTraceLink = (record: Record<string, unknown>): string => {const traceId = readId(record.traceID) || readId(record.trace_id);const spanId = readId(record.spanID) || readId(record.span_id);- return `${ROUTES.TRACE}/${traceId}${formUrlParams({+ if (!traceId) {+ return '';+ }++ return `${generatePath(ROUTES.TRACE_DETAIL, { id: traceId })}${formUrlParams({spanId,levelUp: 0,levelDown: 0,diff --git a/frontend/src/container/TracesExplorer/TracesTable/FieldCell.tsx b/frontend/src/container/TracesExplorer/TracesTable/FieldCell.tsxindex f7393f294e..240e474e9d 100644--- a/frontend/src/container/TracesExplorer/TracesTable/FieldCell.tsx+++ b/frontend/src/container/TracesExplorer/TracesTable/FieldCell.tsx@@ -3,7 +3,7 @@ import { Badge } from '@signozhq/ui/badge';import TanStackTable from 'components/TanStackTableView';import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';import ROUTES from 'constants/routes';-import { getMs } from 'container/Trace/Filters/Panel/PanelBody/Duration/util';+import { getMs } from 'utils/timeUtils';import { useTimezone } from 'providers/Timezone';import {diff --git a/frontend/src/container/WidgetCard/styles.ts b/frontend/src/container/WidgetCard/styles.tsindex 6719fdad63..a0bbea3fcb 100644--- a/frontend/src/container/WidgetCard/styles.ts+++ b/frontend/src/container/WidgetCard/styles.ts@@ -1,7 +1,7 @@import RGL, { WidthProvider } from 'react-grid-layout';import { Button as ButtonComponent, Card as CardComponent, Space } from 'antd';import { PANEL_TYPES } from 'constants/queryBuilder';-import { StyledCSS } from 'container/GantChart/Trace/styles';+import { StyledCSS } from 'types/styledComponents';import styled, { css } from 'styled-components';const ReactGridLayoutComponent = WidthProvider(RGL);diff --git a/frontend/src/hooks/useQueryService.ts b/frontend/src/hooks/useQueryService.tsindex 815b63e9b7..1ffc05cf0c 100644--- a/frontend/src/hooks/useQueryService.ts+++ b/frontend/src/hooks/useQueryService.ts@@ -11,7 +11,7 @@ import {Time,} from 'container/TopNav/DateTimeSelectionV2/types';import { PayloadProps } from 'types/api/metrics/getService';-import { Tags } from 'types/reducer/trace';+import { Tags } from 'hooks/useResourceAttribute/types';export const useQueryService = ({minTime,diff --git a/frontend/src/hooks/useResourceAttribute/types.ts b/frontend/src/hooks/useResourceAttribute/types.tsindex cce06c5cd1..b496830b8d 100644--- a/frontend/src/hooks/useResourceAttribute/types.ts+++ b/frontend/src/hooks/useResourceAttribute/types.ts@@ -30,3 +30,27 @@ export interface IResourceAttributeProps {optionsData: OptionsData;handleEnvironmentChange: (environments: string[]) => void;}++export type OperatorValues =+ | 'NotIn'+ | 'In'+ | 'Equals'+ | 'NotEquals'+ | 'Contains'+ | 'NotContains'+ | 'GreaterThan'+ | 'Exists'+ | 'NotExists'+ | 'LessThan'+ | 'GreaterThanEquals'+ | 'LessThanEquals'+ | 'StartsWith'+ | 'NotStartsWith';++export interface Tags {+ Key: string;+ Operator: OperatorValues;+ StringValues: string[];+ NumberValues: number[];+ BoolValues: boolean[];+}diff --git a/frontend/src/hooks/useResourceAttribute/utils.ts b/frontend/src/hooks/useResourceAttribute/utils.tsindex 3ee0ac0c13..43aec688f1 100644--- a/frontend/src/hooks/useResourceAttribute/utils.ts+++ b/frontend/src/hooks/useResourceAttribute/utils.ts@@ -17,7 +17,7 @@ import { decode } from 'js-base64';import history from 'lib/history';import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';-import { OperatorValues, Tags } from 'types/reducer/trace';+import { OperatorValues, Tags } from 'hooks/useResourceAttribute/types';import { v4 as uuid } from 'uuid';import { whilelistedKeys } from './config';diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/columns.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/columns.tsxindex 5607551fde..744f7b4b6d 100644--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/columns.tsx+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/columns.tsx@@ -4,7 +4,7 @@ import { Badge } from '@signozhq/ui/badge';import { Typography } from '@signozhq/ui/typography';import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';-import { getMs } from 'container/Trace/Filters/Panel/PanelBody/Duration/util';+import { getMs } from 'utils/timeUtils';import type {FormatTimezoneAdjustedTimestamp,TimestampInput,diff --git a/frontend/src/pages/MessagingQueues/MQDetails/DropRateView/DropRateView.tsx b/frontend/src/pages/MessagingQueues/MQDetails/DropRateView/DropRateView.tsxindex d6249d64f5..e67d6fb0e9 100644--- a/frontend/src/pages/MessagingQueues/MQDetails/DropRateView/DropRateView.tsx+++ b/frontend/src/pages/MessagingQueues/MQDetails/DropRateView/DropRateView.tsx@@ -1,5 +1,6 @@import { useEffect, useMemo, useRef, useState } from 'react';import { useMutation } from 'react-query';+import { generatePath } from 'react-router-dom';// eslint-disable-next-line no-restricted-importsimport { useSelector } from 'react-redux';import { Table } from 'antd';@@ -95,7 +96,7 @@ export function getColumns(key={item}className="traceid-text"onClick={(): void => {- openInNewTab(`${ROUTES.TRACE}/${item}`);+ openInNewTab(generatePath(ROUTES.TRACE_DETAIL, { id: item }));logEvent(`MQ Kafka: Drop Rate - traceid navigation`, {item,});diff --git a/frontend/src/pages/ServiceTopLevelOperations/index.tsx b/frontend/src/pages/ServiceTopLevelOperations/index.tsxindex 33a7b33637..468c2d5ccd 100644--- a/frontend/src/pages/ServiceTopLevelOperations/index.tsx+++ b/frontend/src/pages/ServiceTopLevelOperations/index.tsx@@ -13,7 +13,7 @@ import useResourceAttribute from 'hooks/useResourceAttribute';import { convertRawQueriesToTraceSelectedTags } from 'hooks/useResourceAttribute/utils';import { AppState } from 'store/reducers';import { GlobalReducer } from 'types/reducer/globalTime';-import { Tags } from 'types/reducer/trace';+import { Tags } from 'hooks/useResourceAttribute/types';import './ServiceTopLevelOperations.styles.scss';diff --git a/frontend/src/pages/Trace/index.tsx b/frontend/src/pages/Trace/index.tsxdeleted file mode 100644index bb00a63342..0000000000--- a/frontend/src/pages/Trace/index.tsx+++ /dev/null@@ -1,201 +0,0 @@-import { MouseEventHandler, useCallback, useEffect, useState } from 'react';-// eslint-disable-next-line no-restricted-imports-import { connect, useDispatch, useSelector } from 'react-redux';-import * as Sentry from '@sentry/react';-import { Card } from 'antd';-import type { NotificationInstance } from 'antd/es/notification/interface';-import ROUTES from 'constants/routes';-import Filters from 'container/Trace/Filters';-import TraceGraph from 'container/Trace/Graph';-import Search from 'container/Trace/Search';-import TraceGraphFilter from 'container/Trace/TraceGraphFilter';-import TraceTable from 'container/Trace/TraceTable';-import { useNotifications } from 'hooks/useNotifications';-import getStep from 'lib/getStep';-import history from 'lib/history';-import ErrorBoundaryFallback from 'pages/ErrorBoundaryFallback/ErrorBoundaryFallback';-// eslint-disable-next-line no-restricted-imports-import { bindActionCreators, Dispatch } from 'redux';-import { ThunkDispatch } from 'redux-thunk';-import { GetInitialTraceFilter } from 'store/actions/trace/getInitialFilter';-import {- GetSpansAggregate,- GetSpansAggregateProps,-} from 'store/actions/trace/getInitialSpansAggregate';-import { GetSpans, GetSpansProps } from 'store/actions/trace/getSpans';-import { AppState } from 'store/reducers';-import AppActions from 'types/actions';-import { RESET_TRACE_FILTER } from 'types/actions/trace';-import { GlobalReducer } from 'types/reducer/globalTime';-import { TraceReducer } from 'types/reducer/trace';--import {- ClearAllFilter,- Container,- LeftContainer,- RightContainer,-} from './styles';--function Trace({- getSpansAggregate,- getSpans,- getInitialFilter,-}: Props): JSX.Element {- const { maxTime, minTime } = useSelector<AppState, GlobalReducer>(- (state) => state.globalTime,- );-- const dispatch = useDispatch<Dispatch<AppActions>>();-- const [isChanged, setIsChanged] = useState<boolean>(true);-- const {- selectedFilter,- spansAggregate,- selectedTags,- selectedFunction,- selectedGroupBy,- isFilterExclude,- spanKind,- } = useSelector<AppState, TraceReducer>((state) => state.traces);-- const { notifications } = useNotifications();-- useEffect(() => {- getInitialFilter(minTime, maxTime, notifications);- }, [maxTime, minTime, getInitialFilter, isChanged, notifications]);-- useEffect(() => {- getSpansAggregate(- {- maxTime,- minTime,- selectedFilter,- current: spansAggregate.currentPage,- pageSize: spansAggregate.pageSize,- selectedTags,- order: spansAggregate.order,- orderParam: spansAggregate.orderParam,- spanKind,- },- notifications,- );- }, [- selectedTags,- selectedFilter,- maxTime,- minTime,- getSpansAggregate,- spansAggregate.currentPage,- spansAggregate.pageSize,- spansAggregate.order,- spansAggregate.orderParam,- notifications,- spanKind,- ]);-- useEffect(() => {- getSpans(- {- end: maxTime,- function: selectedFunction,- groupBy: selectedGroupBy,- selectedFilter,- selectedTags,- start: minTime,- step: getStep({ start: minTime, end: maxTime, inputFormat: 'ns' }),- isFilterExclude,- spanKind,- },- notifications,- );- }, [- selectedFunction,- selectedGroupBy,- selectedFilter,- selectedTags,- maxTime,- minTime,- getSpans,- isFilterExclude,- notifications,- spanKind,- ]);-- useEffect(- () => (): void => {- dispatch({- type: RESET_TRACE_FILTER,- });- },- [dispatch],- );-- const onClickHandler: MouseEventHandler<HTMLElement> = useCallback(- (e) => {- e.preventDefault();- e.stopPropagation();-- history.replace(ROUTES.TRACE);-- dispatch({- type: RESET_TRACE_FILTER,- });-- setIsChanged((state) => !state);- },- [dispatch],- );-- return (- <Sentry.ErrorBoundary fallback={<ErrorBoundaryFallback />}>- <Search />- <Container>- <div>- <ClearAllFilter onClick={onClickHandler} type="primary">- Clear all filters- </ClearAllFilter>- <LeftContainer>- <Filters />- </LeftContainer>- </div>-- <RightContainer>- <Card>- <TraceGraphFilter />- <TraceGraph />- </Card>-- <Card style={{ marginTop: '2rem' }}>- <TraceTable />- </Card>- </RightContainer>- </Container>- </Sentry.ErrorBoundary>- );-}--interface DispatchProps {- getSpansAggregate: (- props: GetSpansAggregateProps,- notify: NotificationInstance,- ) => void;- getSpans: (props: GetSpansProps, notify: NotificationInstance) => void;- getInitialFilter: (- minTime: GlobalReducer['minTime'],- maxTime: GlobalReducer['maxTime'],- notify: NotificationInstance,- ) => void;-}--const mapDispatchToProps = (- dispatch: ThunkDispatch<unknown, unknown, AppActions>,-): DispatchProps => ({- getInitialFilter: bindActionCreators(GetInitialTraceFilter, dispatch),- getSpansAggregate: bindActionCreators(GetSpansAggregate, dispatch),- getSpans: bindActionCreators(GetSpans, dispatch),-});--type Props = DispatchProps;--export default connect(null, mapDispatchToProps)(Trace);diff --git a/frontend/src/pages/Trace/styles.ts b/frontend/src/pages/Trace/styles.tsdeleted file mode 100644index c545b7bf1c..0000000000--- a/frontend/src/pages/Trace/styles.ts+++ /dev/null@@ -1,36 +0,0 @@-import { Button, Card } from 'antd';-import styled from 'styled-components';--export const Container = styled.div`- display: flex;- flex: 1;- min-height: 80vh;- margin-top: 1rem;-`;--export const LeftContainer = styled(Card)`- flex: 0.5;- margin-right: 0.5rem;- width: 15rem;-- .ant-card-body {- padding: 0;- }-`;--export const RightContainer = styled(Card)`- &&& {- flex: 2;- }-- .ant-card-body {- padding: 0.5rem;- }-`;--export const ClearAllFilter = styled(Button)`- &&& {- width: 95%;- margin-bottom: 0.5rem;- }-`;diff --git a/frontend/src/pages/TraceDetailOldRedirect/index.tsx b/frontend/src/pages/TraceDetailOldRedirect/index.tsxdeleted file mode 100644index 1e4229fb58..0000000000--- a/frontend/src/pages/TraceDetailOldRedirect/index.tsx+++ /dev/null@@ -1,18 +0,0 @@-import { Redirect, useParams } from 'react-router-dom';-import { TraceDetailV3URLProps } from 'types/api/trace/getTraceV3';--// Legacy /trace-old/:id now redirects to the current /trace/:id view,-// preserving the query string and hash.-export default function TraceDetailOldRedirect(): JSX.Element {- const { id } = useParams<TraceDetailV3URLProps>();-- return (- <Redirect- to={{- pathname: `/trace/${id}`,- search: window.location.search,- hash: window.location.hash,- }}- />- );-}diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/LinkedSpans/LinkedSpans.tsx b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/LinkedSpans/LinkedSpans.tsxindex e1f42ee060..e5afa35365 100644--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/LinkedSpans/LinkedSpans.tsx+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/LinkedSpans/LinkedSpans.tsx@@ -1,5 +1,5 @@import { useCallback, useMemo, useState } from 'react';-import { Link } from 'react-router-dom';+import { generatePath, Link } from 'react-router-dom';import { ChevronDown, ChevronRight } from '@signozhq/icons';import { Badge } from '@signozhq/ui/badge';import ROUTES from 'constants/routes';@@ -78,7 +78,7 @@ export function LinkedSpansPanel({}): JSX.Element | null {const getLink = useCallback((item: SpanReference): string =>- `${ROUTES.TRACE}/${item.traceId}?spanId=${item.spanId}`,+ `${generatePath(ROUTES.TRACE_DETAIL, { id: item.traceId })}?spanId=${item.spanId}`,[],);diff --git a/frontend/src/pages/TraceDetailsV3/SpanHoverCard/EventTooltipContent.tsx b/frontend/src/pages/TraceDetailsV3/SpanHoverCard/EventTooltipContent.tsxindex eadd5f24a9..ff1103c81b 100644--- a/frontend/src/pages/TraceDetailsV3/SpanHoverCard/EventTooltipContent.tsx+++ b/frontend/src/pages/TraceDetailsV3/SpanHoverCard/EventTooltipContent.tsx@@ -1,4 +1,4 @@-import { convertTimeToRelevantUnit } from 'container/TraceDetail/utils';+import { convertTimeToRelevantUnit } from 'utils/traceUtils';import { Diamond } from '@signozhq/icons';import cx from 'classnames';import { toFixed } from 'utils/toFixed';diff --git a/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.tsx b/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.tsxindex 1bfae87e0f..2ecdf99293 100644--- a/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.tsx+++ b/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.tsx@@ -4,7 +4,7 @@ import {TooltipProvider,TooltipTrigger,} from '@signozhq/ui/tooltip';-import { convertTimeToRelevantUnit } from 'container/TraceDetail/utils';+import { convertTimeToRelevantUnit } from 'utils/traceUtils';import { useIsDarkMode } from 'hooks/useDarkMode';import { useTraceStore } from 'pages/TraceDetailsV3/stores/traceStore';import { getSpanAttribute, resolveSpanColor } from 'pages/TraceDetailsV3/utils';diff --git a/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/__tests__/drawUtils.test.ts b/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/__tests__/drawUtils.test.tsindex d31925806e..0ce9026c25 100644--- a/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/__tests__/drawUtils.test.ts+++ b/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/__tests__/drawUtils.test.ts@@ -4,7 +4,7 @@ import { getFlamegraphRowMetrics } from '../utils';import { drawEventDot, drawSpanBar, getEventDotColor } from '../utils';import { MOCK_SPAN } from './testUtils';-jest.mock('container/TraceDetail/utils', () => ({+jest.mock('utils/traceUtils', () => ({convertTimeToRelevantUnit: (): { time: number; timeUnitName: string } => ({time: 50,timeUnitName: 'ms',diff --git a/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/__tests__/utils.math.test.ts b/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/__tests__/utils.math.test.tsindex 816ddca490..dc6f667882 100644--- a/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/__tests__/utils.math.test.ts+++ b/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/__tests__/utils.math.test.ts@@ -6,7 +6,7 @@ import {} from '../utils';import { MOCK_SPANS } from './testUtils';-jest.mock('container/TraceDetail/utils', () => ({+jest.mock('utils/traceUtils', () => ({convertTimeToRelevantUnit: (valueMs: number,): { time: number; timeUnitName: string } => {diff --git a/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/utils.ts b/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/utils.tsindex b749e6d226..14e4766b55 100644--- a/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/utils.ts+++ b/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/utils.ts@@ -1,5 +1,5 @@/* eslint-disable sonarjs/cognitive-complexity */-import { convertTimeToRelevantUnit } from 'container/TraceDetail/utils';+import { convertTimeToRelevantUnit } from 'utils/traceUtils';import { getSpanAttribute } from 'pages/TraceDetailsV3/utils';import {ColorPair,diff --git a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.tsx b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.tsxindex e07818c2f7..68677bb414 100644--- a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.tsx+++ b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.tsx@@ -27,7 +27,7 @@ import { useVirtualizer, Virtualizer } from '@tanstack/react-virtual';import cx from 'classnames';import HttpStatusBadge from 'components/HttpStatusBadge/HttpStatusBadge';import TimelineV3 from 'components/TimelineV3/TimelineV3';-import { convertTimeToRelevantUnit } from 'container/TraceDetail/utils';+import { convertTimeToRelevantUnit } from 'utils/traceUtils';import { useCopySpanLink } from 'hooks/trace/useCopySpanLink';import { useIsDarkMode } from 'hooks/useDarkMode';import { useSafeNavigate } from 'hooks/useSafeNavigate';diff --git a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/__tests__/UnifiedSpanClick.test.tsx b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/__tests__/UnifiedSpanClick.test.tsxindex 75b13341bb..303d678f0f 100644--- a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/__tests__/UnifiedSpanClick.test.tsx+++ b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/__tests__/UnifiedSpanClick.test.tsx@@ -93,7 +93,7 @@ jest.mock('lib/uPlotLib/utils/generateColor', () => ({hashFn: (): number => 0,}));-jest.mock('container/TraceDetail/utils', () => ({+jest.mock('utils/traceUtils', () => ({convertTimeToRelevantUnit: (value: number,): { time: number; timeUnitName: string } => ({diff --git a/frontend/src/pages/TracesExplorer/Filter/Filter.styles.scss b/frontend/src/pages/TracesExplorer/Filter/Filter.styles.scssdeleted file mode 100644index 4f7f88ca32..0000000000--- a/frontend/src/pages/TracesExplorer/Filter/Filter.styles.scss+++ /dev/null@@ -1,148 +0,0 @@-.collapseContainer {- background-color: var(--l1-background);- .ant-collapse-header {- padding: 12px !important;- align-items: center !important;- }-- .ant-collapse-header-text {- color: var(--l2-foreground);- font-family: Inter;- font-size: 12px;- font-style: normal;- font-weight: 400;- line-height: 16px;- letter-spacing: -0.065px;- text-transform: capitalize;- }-- .duration-inputs {- display: grid;- gap: 12px;-- .min-max-input {- .ant-input-group-addon {- color: var(--l2-foreground);- font-family: 'Space Mono', monospace;- font-size: 11px;- font-style: normal;- font-weight: 400;- line-height: 16px;- letter-spacing: 0.44px;- padding: 0 6px;- }-- .ant-input {- padding: 4px 6px;-- color: var(--l2-foreground);- font-family: 'Space Mono', monospace;- font-size: 11px;- font-style: normal;- font-weight: 400;- line-height: 16px;- letter-spacing: 0.44px;- }- }- }-}--.section-body__divider {- --divider-color: var(--l1-border);- --divider-margin: 0;-}--.filter-header {- padding: 4px 8px;-- .filter-title {- display: flex;- gap: 6px;-- .ant-typography {- color: var(--l2-foreground);- font-family: Inter;- font-size: 14px;- font-style: normal;- font-weight: 400;- line-height: 18px;- letter-spacing: -0.07px;- }- }-- .sync-icon {- background-color: var(--l1-background);- border: 0;- box-shadow: none;- padding: 8px;- }-- .arrow-icon {- background-color: var(--l1-background);- border: 0;- box-shadow: none;- padding-top: 8px;-- .anticon-vertical-align-top {- svg {- width: 16px;- height: 16px;- }- }- }-}--.section-body-header {- display: flex;-- > button {- position: absolute;- right: 4px;- padding-top: 13px;- }- .ant-collapse {- width: 100%;- }-}--.section-card {- background-color: var(--l1-background);- .ant-card-body {- padding: 0;- display: flex;- flex-direction: column;-- max-height: 500px;- overflow-x: hidden;- overflow-y: auto;- }- width: 240px;-- .submenu-checkbox {- padding-bottom: 8px;- }-- .search-input {- margin-bottom: 12px;- }-- .checkbox-label {- display: flex;- align-items: center;- gap: 4px;-- .hasError-Error {- width: 2px;- height: 11px;- border-radius: 2px;- background: var(--danger-background);- }-- .hasError-Ok {- width: 2px;- height: 11px;- border-radius: 2px;- background: var(--bg-forest-500);- }- }-}diff --git a/frontend/src/pages/TracesExplorer/Filter/Filter.tsx b/frontend/src/pages/TracesExplorer/Filter/Filter.tsxdeleted file mode 100644index 08d6472142..0000000000--- a/frontend/src/pages/TracesExplorer/Filter/Filter.tsx+++ /dev/null@@ -1,288 +0,0 @@-import {- Dispatch,- SetStateAction,- useCallback,- useEffect,- useMemo,- useState,-} from 'react';-import {- ArrowUpToLine,- Filter as FilterIcon,- RefreshCw,-} from '@signozhq/icons';-import { Button, Flex, Tooltip } from 'antd';-import { Typography } from '@signozhq/ui/typography';-import logEvent from 'api/common/logEvent';-import { getMs } from 'container/Trace/Filters/Panel/PanelBody/Duration/util';-import { useGetCompositeQueryParam } from 'hooks/queryBuilder/useGetCompositeQueryParam';-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';-import { cloneDeep, isArray, isEmpty, isEqual } from 'lodash-es';-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';-import { Query, TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';-import { v4 as uuid } from 'uuid';--import {- AllTraceFilterKeys,- AllTraceFilterKeyValue,- AllTraceFilterOptions,- FilterType,- HandleRunProps,- unionTagFilterItems,-} from './filterUtils';-import { Section } from './Section';--import './Filter.styles.scss';--interface FilterProps {- setOpen: Dispatch<SetStateAction<boolean>>;-}--export function Filter(props: FilterProps): JSX.Element {- const { setOpen } = props;- const [selectedFilters, setSelectedFilters] =- useState<- Record<- AllTraceFilterKeys,- { values: string[] | string; keys: BaseAutocompleteData }- >- >();-- const { currentQuery, redirectWithQueryBuilderData } = useQueryBuilder();- const compositeQuery = useGetCompositeQueryParam();-- // eslint-disable-next-line sonarjs/cognitive-complexity- const syncSelectedFilters = useMemo((): FilterType => {- const filters = compositeQuery?.builder.queryData?.[0].filters;- if (!filters) {- return {} as FilterType;- }-- return (filters.items || [])- .filter((item) =>- Object.keys(AllTraceFilterKeyValue).includes(item.key?.key as string),- )- .filter(- (item) =>- (item.op === 'in' && item.key?.key !== 'durationNano') ||- (item.key?.key === 'durationNano' && ['>=', '<='].includes(item.op)),- )- .reduce((acc, item) => {- const keys = item.key as BaseAutocompleteData;- const attributeName = item.key?.key || '';- const values = item.value as string[];-- if ((attributeName as AllTraceFilterKeys) === 'durationNano') {- if (item.op === '>=') {- acc.durationNanoMin = {- values: getMs(String(values)),- keys,- };- } else {- acc.durationNanoMax = {- values: getMs(String(values)),- keys,- };- }- return acc;- }-- if (attributeName) {- if (acc[attributeName as AllTraceFilterKeys]) {- const existingValue = acc[attributeName as AllTraceFilterKeys];- acc[attributeName as AllTraceFilterKeys] = {- values: [...existingValue.values, ...values],- keys,- };- } else {- acc[attributeName as AllTraceFilterKeys] = { values, keys };- }- }-- return acc;- }, {} as FilterType);- }, [compositeQuery]);-- useEffect(() => {- if (!isEqual(syncSelectedFilters, selectedFilters)) {- setSelectedFilters(syncSelectedFilters);- }- }, [syncSelectedFilters]);-- // eslint-disable-next-line sonarjs/cognitive-complexity- const preparePostData = (): TagFilterItem[] => {- if (!selectedFilters) {- return [];- }-- const items = Object.keys(selectedFilters)?.flatMap((attribute) => {- const { keys, values } = selectedFilters[attribute as AllTraceFilterKeys];- if (- ['durationNanoMax', 'durationNanoMin', 'durationNano'].includes(- attribute as AllTraceFilterKeys,- )- ) {- if (!values || !values.length) {- return [];- }- let minValue = '';- let maxValue = '';-- const durationItems: TagFilterItem[] = [];-- if (isArray(values)) {- minValue = values?.[0];- maxValue = values?.[1];-- const minItems: TagFilterItem = {- id: uuid().slice(0, 8),- op: '>=',- key: keys,- value: Number(minValue) * 1000000,- };-- const maxItems: TagFilterItem = {- id: uuid().slice(0, 8),- op: '<=',- key: keys,- value: Number(maxValue) * 1000000,- };- return maxValue ? [minItems, maxItems] : [minItems];- }- if (attribute === 'durationNanoMin') {- durationItems.push({- id: uuid().slice(0, 8),- op: '>=',- key: keys,- value: Number(values) * 1000000,- });- } else {- durationItems.push({- id: uuid().slice(0, 8),- op: '<=',- key: keys,- value: Number(values) * 1000000,- });- }-- return durationItems;- }- return {- id: uuid().slice(0, 8),- key: keys,- op: 'in',- value: values,- };- });-- return items as TagFilterItem[];- };-- const removeFilterItemIds = (query: Query): Query => {- const clonedQuery = cloneDeep(query);- clonedQuery.builder.queryData = clonedQuery.builder.queryData.map((data) => ({- ...data,- filters: {- ...data.filters,- items:- data.filters?.items?.map((item) => ({- ...item,- id: '',- })) || [],- op: data.filters?.op || 'AND',- },- }));- return clonedQuery;- };-- const handleRun = useCallback(- (props?: HandleRunProps): void => {- const preparedQuery: Query = {- ...currentQuery,- builder: {- ...currentQuery.builder,- queryData: currentQuery.builder.queryData.map((item) => ({- ...item,- filters: {- ...item.filters,- items: props?.resetAll- ? []- : (unionTagFilterItems(item.filters?.items || [], preparePostData())- .map((item) =>- item.key?.key === props?.clearByType ? undefined : item,- )- .filter((i) => i) as TagFilterItem[]),- op: item.filters?.op || 'AND',- },- })),- },- };- if (!isEmpty(selectedFilters)) {- logEvent('Traces Explorer: Sidebar filter used', {- selectedFilters,- });- }-- const currentQueryWithoutIds = removeFilterItemIds(currentQuery);- const preparedQueryWithoutIds = removeFilterItemIds(preparedQuery);-- if (- isEqual(currentQueryWithoutIds, preparedQueryWithoutIds) &&- !props?.resetAll- ) {- return;- }-- redirectWithQueryBuilderData(preparedQuery);- },- [currentQuery, redirectWithQueryBuilderData, selectedFilters],- );-- useEffect(() => {- handleRun();- }, [selectedFilters]);-- return (- <>- <Flex justify="space-between" align="center" className="filter-header">- <Flex gap={8} align="center">- <div className="filter-title">- <FilterIcon size="md" />- <Typography.Text>Filters</Typography.Text>- </div>- <Tooltip title="Reset" placement="right">- <Button- onClick={(): void => handleRun({ resetAll: true })}- className="sync-icon"- data-testid="reset-filters"- >- <RefreshCw size="md" />- </Button>- </Tooltip>- </Flex>- <Tooltip title="Collapse" placement="right">- <Button- onClick={(): void => setOpen(false)}- className="arrow-icon"- data-testid="toggle-filter-panel"- >- <ArrowUpToLine style={{ rotate: '270deg' }} size="md" />- </Button>- </Tooltip>- </Flex>- <>- {AllTraceFilterOptions.filter(- (i) => i !== 'durationNanoMax' && i !== 'durationNanoMin',- ).map((panelName) => (- <Section- key={panelName}- panelName={panelName}- selectedFilters={selectedFilters}- setSelectedFilters={setSelectedFilters}- handleRun={handleRun}- />- ))}- </>- </>- );-}diff --git a/frontend/src/pages/TracesExplorer/Filter/Section.tsx b/frontend/src/pages/TracesExplorer/Filter/Section.tsxdeleted file mode 100644index e7afb778f7..0000000000--- a/frontend/src/pages/TracesExplorer/Filter/Section.tsx+++ /dev/null@@ -1,111 +0,0 @@-import {- Dispatch,- MouseEvent,- SetStateAction,- useEffect,- useMemo,- useState,-} from 'react';-import { Button, Collapse } from 'antd';-import { Divider } from '@signozhq/ui/divider';--import { DurationSection } from './DurationSection';-import {- AllTraceFilterKeys,- AllTraceFilterKeyValue,- FilterType,- HandleRunProps,-} from './filterUtils';-import { SectionBody } from './SectionContent';--import './Filter.styles.scss';--interface SectionProps {- panelName: AllTraceFilterKeys;- selectedFilters: FilterType | undefined;- setSelectedFilters: Dispatch<SetStateAction<FilterType | undefined>>;- handleRun: (props?: HandleRunProps) => void;-}--export function Section(props: SectionProps): JSX.Element {- const { panelName, setSelectedFilters, selectedFilters, handleRun } = props;-- const defaultOpenPanes = useMemo(- () =>- Array.from(- new Set([- ...Object.keys(selectedFilters || {}),- 'hasError',- 'durationNano',- 'serviceName',- 'deployment.environment',- ]),- ),- [selectedFilters],- );-- const [activeKeys, setActiveKeys] = useState<string[]>(defaultOpenPanes);-- useEffect(() => {- setActiveKeys(defaultOpenPanes);- }, [defaultOpenPanes]);-- const onClearHandler = (e: MouseEvent): void => {- e.stopPropagation();- e.preventDefault();-- if (- selectedFilters?.[panelName] ||- selectedFilters?.durationNanoMin ||- selectedFilters?.durationNanoMax- ) {- handleRun({ clearByType: panelName });- }- };-- return (- <div>- <Divider plain className="section-body__divider" />- <div className="section-body-header" data-testid={`collapse-${panelName}`}>- <Collapse- bordered={false}- className="collapseContainer"- activeKey={activeKeys}- onChange={(keys): void => setActiveKeys(keys as string[])}- items={[- panelName === 'durationNano'- ? {- key: panelName,- children: (- <DurationSection- setSelectedFilters={setSelectedFilters}- selectedFilters={selectedFilters}- />- ),- label: AllTraceFilterKeyValue[panelName],- }- : {- key: panelName,- children: (- <SectionBody- type={panelName}- selectedFilters={selectedFilters}- setSelectedFilters={setSelectedFilters}- handleRun={handleRun}- />- ),- label: AllTraceFilterKeyValue[panelName],- },- ]}- />- <Button- type="link"- onClick={onClearHandler}- data-testid={`collapse-${panelName}-clearBtn`}- >- Clear All- </Button>- </div>- </div>- );-}diff --git a/frontend/src/pages/TracesExplorer/Filter/SectionContent.tsx b/frontend/src/pages/TracesExplorer/Filter/SectionContent.tsxdeleted file mode 100644index a36154fbf4..0000000000--- a/frontend/src/pages/TracesExplorer/Filter/SectionContent.tsx+++ /dev/null@@ -1,177 +0,0 @@-import {- ChangeEvent,- Dispatch,- SetStateAction,- useEffect,- useMemo,- useState,-} from 'react';-import { Button, Card, Input, Tooltip } from 'antd';-import { Checkbox } from '@signozhq/ui/checkbox';-import { ParaGraph } from 'container/Trace/Filters/Panel/PanelBody/Common/styles';-import useDebouncedFn from 'hooks/useDebouncedFunction';-import { isArray, isEmpty } from 'lodash-es';--import {- addFilter,- AllTraceFilterKeys,- convertToStringArr,- FilterType,- HandleRunProps,- removeFilter,- statusFilterOption,- useGetAggregateValues,-} from './filterUtils';--import './Filter.styles.scss';--interface SectionBodyProps {- type: AllTraceFilterKeys;- selectedFilters: FilterType | undefined;- setSelectedFilters: Dispatch<SetStateAction<FilterType | undefined>>;- handleRun: (props?: HandleRunProps) => void;-}--export function SectionBody(props: SectionBodyProps): JSX.Element {- const { type, setSelectedFilters, selectedFilters, handleRun } = props;- const [visibleItemsCount, setVisibleItemsCount] = useState(10);- const [searchFilter, setSearchFilter] = useState<string>('');- const [searchText, setSearchText] = useState<string>('');- const [checkedItems, setCheckedItems] = useState<string[]>(- convertToStringArr(selectedFilters?.[type]?.values),- );-- const [results, setResults] = useState<string[]>([]);- const [isFetching, setFetching] = useState<boolean>(false);-- useEffect(- () => setCheckedItems(convertToStringArr(selectedFilters?.[type]?.values)),- [selectedFilters, type],- );-- const handleDebouncedSearch = useDebouncedFn((searchText): void => {- setSearchText(searchText as string);- }, 500);-- const {- isFetching: fetching,- keys,- results: res,- } = useGetAggregateValues({- value: type,- searchText,- });-- useEffect(() => {- setResults(res);- setFetching(fetching);- }, [fetching, res]);-- const handleShowMore = (): void => {- setVisibleItemsCount((prevCount) => prevCount + 10);- };-- const listData = useMemo(- () =>- (type === 'hasError' ? statusFilterOption : results)- .filter((i) => i.length)- .filter((filter) => {- if (searchFilter.length === 0) {- return true;- }- return filter- .toLocaleLowerCase()- .includes(searchFilter.toLocaleLowerCase());- })- .slice(0, visibleItemsCount),- [results, searchFilter, type, visibleItemsCount],- );-- const onCheckHandler = (- checkedState: boolean | 'indeterminate',- value: string,- ): void => {- const checked = checkedState === true;- let newValue = value;- if (type === 'hasError') {- newValue = String(value === 'Error');- }- if (checked) {- addFilter(type, newValue, setSelectedFilters, keys);- setCheckedItems((prev) => {- const arr = prev || [];- if (isArray(arr) && !arr.includes(newValue)) {- arr.push(newValue);- }- return convertToStringArr(arr);- });- } else if (checkedItems.length === 1) {- handleRun({ clearByType: type });- setCheckedItems([]);- } else {- removeFilter(type, newValue, setSelectedFilters, keys);- setCheckedItems((prev) => {- const prevValue = convertToStringArr(prev);- return prevValue.filter((item) => item !== newValue);- });- }- };-- const checkboxMatcher = (item: string): boolean =>- checkedItems?.includes(type === 'hasError' ? String(item === 'Error') : item);-- const labelClassname = (item: string): string => `${type}-${item}`;-- const handleSearch = (e: ChangeEvent<HTMLInputElement>): void => {- const inputValue = e.target.value;- setSearchFilter(inputValue);- handleDebouncedSearch(inputValue || '');- };-- return (- <Card- bordered={false}- className="section-card"- loading={type === 'hasError' ? false : isFetching}- key={type}- >- <>- <Input.Search- value={searchFilter}- onChange={handleSearch}- placeholder="Filter Values"- className="search-input"- />- {listData.length === 0 && isEmpty(searchFilter) ? (- <div style={{ padding: '8px 18px' }}>No data found</div>- ) : (- <>- {listData.map((item) => (- <Checkbox- className="submenu-checkbox"- key={`${type}-${item}`}- onChange={(checked): void => onCheckHandler(checked, item)}- value={checkboxMatcher(item)}- testId={`${type}-${item}`}- >- <div className="checkbox-label">- <div className={labelClassname(item)} />- <Tooltip overlay={<div>{item}</div>} placement="rightTop">- <ParaGraph truncate={1} style={{ maxWidth: 200 }}>- {item}- </ParaGraph>- </Tooltip>- </div>- </Checkbox>- ))}- {visibleItemsCount < results.length && (- <Button onClick={handleShowMore} type="link">- Show More- </Button>- )}- </>- )}- </>- </Card>- );-}diff --git a/frontend/src/pages/TracesExplorer/Filter/filterUtils.ts b/frontend/src/pages/TracesExplorer/Filter/filterUtils.tsdeleted file mode 100644index f94cfdd57a..0000000000--- a/frontend/src/pages/TracesExplorer/Filter/filterUtils.ts+++ /dev/null@@ -1,357 +0,0 @@-import { Dispatch, SetStateAction, useEffect, useState } from 'react';-import { getAttributesValues } from 'api/queryBuilder/getAttributesValues';-import { DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY } from 'constants/queryBuilder';-import { SPAN_ATTRIBUTES } from 'container/ApiMonitoring/Explorer/Domains/DomainDetails/constants';-import {- BaseAutocompleteData,- DataTypes,-} from 'types/api/queryBuilder/queryAutocompleteResponse';-import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';-import { DataSource } from 'types/common/queryBuilder';--export const AllTraceFilterKeyValue: Record<string, string> = {- durationNanoMin: 'Duration',- durationNano: 'Duration',- duration_nano: 'Duration',- durationNanoMax: 'Duration',- 'deployment.environment': 'Environment',- hasError: 'Status',- has_error: 'Status',- serviceName: 'Service Name',- 'service.name': 'service.name',- name: 'Operation / Name',- rpcMethod: 'RPC Method',- 'rpc.method': 'RPC Method',- responseStatusCode: 'Status Code',- response_status_code: 'Status Code',- httpHost: 'HTTP Host',- http_host: 'HTTP Host',- httpMethod: 'HTTP Method',- http_method: 'HTTP Method',- httpRoute: 'HTTP Route',- 'http.route': 'HTTP Route',- httpUrl: 'HTTP URL',- [SPAN_ATTRIBUTES.HTTP_URL]: 'HTTP URL',- traceID: 'Trace ID',- trace_id: 'Trace ID',-} as const;--export type AllTraceFilterKeys = keyof typeof AllTraceFilterKeyValue;--// Type for the values of AllTraceFilterKeyValue-export type AllTraceFilterValues =- (typeof AllTraceFilterKeyValue)[AllTraceFilterKeys];--export const AllTraceFilterOptions = Object.keys(- AllTraceFilterKeyValue,-) as (keyof typeof AllTraceFilterKeyValue)[];--export const statusFilterOption = ['Error', 'Ok'];--export type FilterType = Record<- AllTraceFilterKeys,- { values: string[] | string; keys: BaseAutocompleteData }->;--export function convertToStringArr(- value: string | string[] | undefined,-): string[] {- if (value) {- if (typeof value === 'string') {- return [value];- }- return value;- }- return [];-}--export const addFilter = (- filterType: AllTraceFilterKeys,- value: string,- setSelectedFilters: Dispatch<- SetStateAction<- | Record<- AllTraceFilterKeys,- { values: string[] | string; keys: BaseAutocompleteData }- >- | undefined- >- >,- keys: BaseAutocompleteData,-): void => {- setSelectedFilters((prevFilters) => {- const isDuration = [- 'durationNanoMax',- 'durationNanoMin',- 'durationNano',- ].includes(filterType);-- // Convert value to string array- const valueArray = convertToStringArr(value);-- // If previous filters are undefined, initialize them- if (!prevFilters) {- return {- [filterType]: { values: isDuration ? value : valueArray, keys },- } as unknown as FilterType;- }-- // If the filter type doesn't exist, initialize it- if (!prevFilters[filterType]?.values.length) {- return {- ...prevFilters,- [filterType]: { values: isDuration ? value : valueArray, keys },- };- }-- // If the value already exists, don't add it again- if (convertToStringArr(prevFilters[filterType].values).includes(value)) {- return prevFilters;- }-- // Otherwise, add the value to the existing array- return {- ...prevFilters,- [filterType]: {- values: isDuration- ? value- : [...convertToStringArr(prevFilters[filterType].values), value],- keys,- },- };- });-};--// Function to remove a filter-export const removeFilter = (- filterType: AllTraceFilterKeys,- value: string,- setSelectedFilters: Dispatch<- SetStateAction<- | Record<- AllTraceFilterKeys,- { values: string[] | string; keys: BaseAutocompleteData }- >- | undefined- >- >,- keys: BaseAutocompleteData,-): void => {- setSelectedFilters((prevFilters) => {- if (!prevFilters || !prevFilters[filterType]?.values.length) {- return prevFilters;- }-- const prevValue = convertToStringArr(prevFilters[filterType]?.values);- const updatedValues = prevValue.filter((item: any) => item !== value);-- if (updatedValues.length === 0) {- const { [filterType]: _item, ...remainingFilters } = prevFilters;- return Object.keys(remainingFilters).length > 0- ? (remainingFilters as FilterType)- : undefined;- }-- return {- ...prevFilters,- [filterType]: { values: updatedValues, keys },- };- });-};--export const removeAllFilters = (- filterType: AllTraceFilterKeys,- setSelectedFilters: Dispatch<- SetStateAction<- | Record<- AllTraceFilterKeys,- { values: string[]; keys: BaseAutocompleteData }- >- | undefined- >- >,-): void => {- setSelectedFilters((prevFilters) => {- if (!prevFilters || !prevFilters[filterType]) {- return prevFilters;- }-- const { [filterType]: _item, ...remainingFilters } = prevFilters;-- return Object.keys(remainingFilters).length > 0- ? (remainingFilters as Record<- AllTraceFilterKeys,- { values: string[]; keys: BaseAutocompleteData }- >)- : undefined;- });-};--export const traceFilterKeys: Record<AllTraceFilterKeys, BaseAutocompleteData> =- {- durationNano: {- key: 'durationNano',- dataType: DataTypes.Float64,- type: 'tag',- id: 'durationNano--float64--tag--true',- },- hasError: {- key: 'hasError',- dataType: DataTypes.bool,- type: 'tag',- id: 'hasError--bool--tag--true',- },- serviceName: {- key: 'serviceName',- dataType: DataTypes.String,- type: 'tag',- id: 'serviceName--string--tag--true',- },-- 'deployment.environment': {- key: 'deployment.environment',- dataType: DataTypes.String,- type: 'resource',- id: 'deployment.environment--string--resource--false',- },- name: {- key: 'name',- dataType: DataTypes.String,- type: 'tag',- id: 'name--string--tag--true',- },- rpcMethod: {- key: 'rpcMethod',- dataType: DataTypes.String,- type: 'tag',- id: 'rpcMethod--string--tag--true',- },- responseStatusCode: {- key: 'responseStatusCode',- dataType: DataTypes.String,- type: 'tag',- id: 'responseStatusCode--string--tag--true',- },- httpHost: {- key: 'httpHost',- dataType: DataTypes.String,- type: 'tag',- id: 'httpHost--string--tag--true',- },- httpMethod: {- key: 'httpMethod',- dataType: DataTypes.String,- type: 'tag',- id: 'httpMethod--string--tag--true',- },- httpRoute: {- key: 'httpRoute',- dataType: DataTypes.String,- type: 'tag',- id: 'httpRoute--string--tag--true',- },- httpUrl: {- key: 'httpUrl',- dataType: DataTypes.String,- type: 'tag',- id: 'httpUrl--string--tag--true',- },- traceID: {- key: 'traceID',- dataType: DataTypes.String,- type: 'tag',- id: 'traceID--string--tag--true',- },- durationNanoMin: {- key: 'durationNanoMin',- dataType: DataTypes.Float64,- type: 'tag',- id: 'durationNanoMin--float64--tag--true',- },- durationNanoMax: {- key: 'durationNanoMax',- dataType: DataTypes.Float64,- type: 'tag',- id: 'durationNanoMax--float64--tag--true',- },- } as const;--interface AggregateValuesProps {- value: AllTraceFilterKeys;- searchText?: string;-}--type IuseGetAggregateValue = {- keys: BaseAutocompleteData;- results: string[];- isFetching: boolean;-};--export function useGetAggregateValues(- props: AggregateValuesProps,-): IuseGetAggregateValue {- const { value, searchText } = props;- const keyData = traceFilterKeys[value];- const [isFetching, setFetching] = useState<boolean>(true);- const [results, setResults] = useState<string[]>([]);-- const getValues = async (): Promise<void> => {- try {- setResults([]);- const { payload } = await getAttributesValues({- aggregateOperator: 'noop',- dataSource: DataSource.TRACES,- aggregateAttribute: '',- attributeKey: value,- filterAttributeKeyDataType: keyData ? keyData.dataType : DataTypes.EMPTY,- tagType: keyData.type ?? '',- searchText: searchText ?? '',- });-- if (payload) {- const key =- DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY[keyData.dataType as Partial<DataTypes>];- setResults(key ? payload[key] || [] : []);- }- } catch (e) {- console.error(e);- } finally {- setFetching(false);- }- };-- useEffect(() => {- getValues();- }, [searchText]);-- if (!value) {- setFetching(false);- return { keys: keyData, results, isFetching };- }-- return { keys: keyData, results, isFetching };-}--export function unionTagFilterItems(- items1: TagFilterItem[],- items2: TagFilterItem[],-): TagFilterItem[] {- const unionMap = new Map<string, TagFilterItem>();-- items1?.forEach((item) => {- const keyOp = `${item?.key?.key}_${item?.op}`;- unionMap.set(keyOp, item);- });-- items2?.forEach((item) => {- const keyOp = `${item?.key?.key}_${item?.op}`;- unionMap.set(keyOp, item);- });-- return Array.from(unionMap?.values());-}--export interface HandleRunProps {- resetAll?: boolean;- clearByType?: AllTraceFilterKeys;-}diff --git a/frontend/src/pages/TracesExplorer/__test__/TracesExplorer.test.tsx b/frontend/src/pages/TracesExplorer/__test__/TracesExplorer.test.tsxindex e78979601b..cb46eb13e3 100644--- a/frontend/src/pages/TracesExplorer/__test__/TracesExplorer.test.tsx+++ b/frontend/src/pages/TracesExplorer/__test__/TracesExplorer.test.tsx@@ -1,12 +1,5 @@-import { MemoryRouter } from 'react-router-dom-v5-compat';-import userEvent from '@testing-library/user-event';import { ENVIRONMENT } from 'constants/env';-import {- initialQueriesMap,- initialQueryBuilderFormValues,-} from 'constants/queryBuilder';import ROUTES from 'constants/routes';-import * as compositeQueryHook from 'hooks/queryBuilder/useGetCompositeQueryParam';import { quickFiltersListResponse } from 'mocks-server/__mockdata__/customQuickFilters';import {queryRangeForListView,@@ -28,19 +21,7 @@ import {import { QueryRangePayloadV5 } from 'types/api/v5/queryRange';import TracesExplorer from '..';-import { Filter } from '../Filter/Filter';-import { AllTraceFilterKeyValue } from '../Filter/filterUtils';-import {- checkForSectionContent,- checkIfSectionIsNotOpen,- checkIfSectionIsOpen,- compositeQuery,- defaultClosedSections,- defaultOpenSections,- optionMenuReturn,- qbProviderValue,- redirectWithQueryBuilderData,-} from './testUtils';+import { optionMenuReturn, qbProviderValue } from './testUtils';const currentTestUrl ='/traces-explorer/?panelType=list&selectedExplorerView=list';@@ -148,20 +129,6 @@ jest.mock('hooks/useSafeNavigate', () => ({}),}));-const checkFilterValues = (- getByText: (text: string) => HTMLElement,- getAllByText: (text: string) => HTMLElement[],-): void => {- Object.values(AllTraceFilterKeyValue).forEach((filter) => {- try {- expect(getByText(filter)).toBeInTheDocument();- } catch (error) {- // If getByText fails, try getAllByText- expect(getAllByText(filter)[0]).toBeInTheDocument();- }- });-};-const renderWithTracesExplorerRouter = (component: React.ReactElement,initialEntries: string[] = [@@ -177,323 +144,6 @@ const renderWithTracesExplorerRouter = (},);-describe('TracesExplorer - Filters', () => {- // Initial filter panel rendering- // Test the initial state like which filters section are opened, default state of duration slider, etc.- it('should render the Trace filter', async () => {- const { getByText, getAllByText, getByTestId } =- renderWithTracesExplorerRouter(<Filter setOpen={jest.fn()} />, [- `${process.env.FRONTEND_API_ENDPOINT}${ROUTES.TRACES_EXPLORER}/?panelType=list&selectedExplorerView=list`,- ]);-- checkFilterValues(getByText, getAllByText);-- // Check default state of duration slider- const minDuration = getByTestId('min-input') as HTMLInputElement;- const maxDuration = getByTestId('max-input') as HTMLInputElement;- expect(minDuration).toHaveValue(null);- expect(minDuration).toHaveProperty('placeholder', '0');- expect(maxDuration).toHaveValue(null);- expect(maxDuration).toHaveProperty('placeholder', '100000000');-- // Check which all filter section are opened by default- defaultOpenSections.forEach((section) =>- checkIfSectionIsOpen(getByTestId, section),- );-- // Check which all filter section are closed by default- defaultClosedSections.forEach((section) =>- checkIfSectionIsNotOpen(getByTestId, section),- );-- // check for the status section content- await checkForSectionContent(['Ok', 'Error']);-- // check for the service name section content from API response- await checkForSectionContent([- 'customer',- 'demo-app',- 'driver',- 'frontend',- 'mysql',- 'redis',- 'route',- 'go-grpc-otel-server',- 'test',- ]);- });-- // test the filter panel actions like opening and closing the sections, etc.- it('filter panel actions', async () => {- const { getByTestId } = render(- <MemoryRouter>- <Filter setOpen={jest.fn()} />,- </MemoryRouter>,- {},- {- initialRoute: '/traces-explorer/?panelType=list&selectedExplorerView=list',- },- );-- // Check if the section is closed- checkIfSectionIsNotOpen(getByTestId, 'name');- // Open the section- const name = getByTestId('collapse-name');- expect(name).toBeInTheDocument();-- userEvent.click(within(name).getByText(AllTraceFilterKeyValue.name));- await waitFor(() => checkIfSectionIsOpen(getByTestId, 'name'));-- await checkForSectionContent([- 'HTTP GET',- 'HTTP GET /customer',- 'HTTP GET /dispatch',- 'HTTP GET /route',- ]);-- // Close the section- userEvent.click(within(name).getByText(AllTraceFilterKeyValue.name));- await waitFor(() => checkIfSectionIsNotOpen(getByTestId, 'name'));- });-- it('checking filters should update the query', async () => {- const { getByText } = render(- <Filter setOpen={jest.fn()} />,- {},- {- queryBuilderOverrides: {- ...qbProviderValue,- currentQuery: {- ...initialQueriesMap.traces,- builder: {- ...initialQueriesMap.traces.builder,- queryData: [initialQueryBuilderFormValues],- },- },- },- },- );-- const okCheckbox = getByText('Ok');- fireEvent.click(okCheckbox);- expect(- redirectWithQueryBuilderData.mock.calls[- redirectWithQueryBuilderData.mock.calls.length - 1- ][0].builder.queryData[0].filters.items,- ).toStrictEqual(- expect.arrayContaining([- expect.objectContaining({- key: {- id: expect.any(String),- key: 'hasError',- type: 'tag',- dataType: 'bool',- },- op: 'in',- value: ['false'],- }),- ]),- );-- // Check if the query is updated when the error checkbox is clicked- const errorCheckbox = getByText('Error');- fireEvent.click(errorCheckbox);- expect(- redirectWithQueryBuilderData.mock.calls[- redirectWithQueryBuilderData.mock.calls.length - 1- ][0].builder.queryData[0].filters.items,- ).toStrictEqual(- expect.arrayContaining([- expect.objectContaining({- key: {- id: expect.any(String),- key: 'hasError',- type: 'tag',- dataType: 'bool',- },- op: 'in',- value: ['false', 'true'],- }),- ]),- );- });-- it('should render the trace filter with the given query', async () => {- jest- .spyOn(compositeQueryHook, 'useGetCompositeQueryParam')- .mockReturnValue(compositeQuery);-- const { findByText, getByTestId } = render(<Filter setOpen={jest.fn()} />);-- // check if the default query is applied - composite query has filters - serviceName : demo-app and name : HTTP GET /customer- await expect(findByText('demo-app')).resolves.toBeInTheDocument();- expect(- getByTestId('serviceName-demo-app').querySelector('[role="checkbox"]'),- ).toHaveAttribute('data-state', 'checked');- await expect(findByText('HTTP GET /customer')).resolves.toBeInTheDocument();- expect(- getByTestId('name-HTTP GET /customer').querySelector('[role="checkbox"]'),- ).toHaveAttribute('data-state', 'checked');- });-- it('test edge cases of undefined filters', async () => {- jest.spyOn(compositeQueryHook, 'useGetCompositeQueryParam').mockReturnValue({- ...compositeQuery,- builder: {- ...compositeQuery.builder,- queryData: compositeQuery.builder.queryData.map(- (item) =>- ({- ...item,- filters: undefined,- }) as any,- ),- },- });-- const { getByText, getAllByText } = render(- <Filter setOpen={jest.fn()} />,- {},- {- initialRoute: '/traces-explorer/?panelType=list&selectedExplorerView=list',- },- );-- checkFilterValues(getByText, getAllByText);- });-- it('test edge cases of undefined filters - items', async () => {- jest.spyOn(compositeQueryHook, 'useGetCompositeQueryParam').mockReturnValue({- ...compositeQuery,- builder: {- ...compositeQuery.builder,- queryData: compositeQuery.builder.queryData.map(- (item) =>- ({- ...item,- filters: {- ...item.filters,- items: undefined,- },- }) as any,- ),- },- });-- const { getByText, getAllByText } = render(<Filter setOpen={jest.fn()} />);-- checkFilterValues(getByText, getAllByText);- });-- it('should clear filter on clear & reset button click', async () => {- const { getByText, getByTestId } = render(- <Filter setOpen={jest.fn()} />,- {},- {- initialRoute: '/traces-explorer/?panelType=list&selectedExplorerView=list',- queryBuilderOverrides: {- currentQuery: {- ...initialQueriesMap.traces,- builder: {- ...initialQueriesMap.traces.builder,- queryData: [initialQueryBuilderFormValues],- },- },- redirectWithQueryBuilderData,- },- },- );-- // check for the status section content- await checkForSectionContent(['Ok', 'Error']);-- // check for the service name section content from API response- await checkForSectionContent([- 'customer',- 'demo-app',- 'driver',- 'frontend',- 'mysql',- 'redis',- 'route',- 'go-grpc-otel-server',- 'test',- ]);-- const okCheckbox = getByText('Ok');- fireEvent.click(okCheckbox);-- const frontendCheckbox = getByText('frontend');- fireEvent.click(frontendCheckbox);-- // check if checked and present in query- expect(- redirectWithQueryBuilderData.mock.calls[- redirectWithQueryBuilderData.mock.calls.length - 1- ][0].builder.queryData[0].filters.items,- ).toStrictEqual(- expect.arrayContaining([- expect.objectContaining({- key: {- id: expect.any(String),- key: 'hasError',- type: 'tag',- dataType: 'bool',- },- op: 'in',- value: ['false'],- }),- expect.objectContaining({- key: {- key: 'serviceName',- dataType: 'string',- type: 'tag',- id: expect.any(String),- },- op: 'in',- value: ['frontend'],- }),- ]),- );-- const clearButton = getByTestId('collapse-serviceName-clearBtn');- expect(clearButton).toBeInTheDocument();- fireEvent.click(clearButton);-- // check if cleared and not present in query- expect(- redirectWithQueryBuilderData.mock.calls[- redirectWithQueryBuilderData.mock.calls.length - 1- ][0].builder.queryData[0].filters.items,- ).not.toStrictEqual(- expect.arrayContaining([- expect.objectContaining({- key: {- key: 'serviceName',- dataType: 'string',- type: 'tag',- id: expect.any(String),- },- op: 'in',- value: ['frontend'],- }),- ]),- );-- // check if reset button is present- const resetButton = getByTestId('reset-filters');- expect(resetButton).toBeInTheDocument();- fireEvent.click(resetButton);-- // check if reset id done- expect(- redirectWithQueryBuilderData.mock.calls[- redirectWithQueryBuilderData.mock.calls.length - 1- ][0].builder.queryData[0].filters.items,- ).toStrictEqual([]);- });-});-const handleExplorerTabChangeTest = jest.fn();jest.mock('hooks/useHandleExplorerTabChange', () => ({useHandleExplorerTabChange: jest.fn(() => ({diff --git a/frontend/src/pages/TracesExplorer/__test__/testUtils.ts b/frontend/src/pages/TracesExplorer/__test__/testUtils.tsindex 1dade6c553..2033a44a9c 100644--- a/frontend/src/pages/TracesExplorer/__test__/testUtils.ts+++ b/frontend/src/pages/TracesExplorer/__test__/testUtils.ts@@ -4,12 +4,9 @@ import {PANEL_TYPES,} from 'constants/queryBuilder';import { noop } from 'lodash-es';-import { screen, waitFor } from 'tests/test-utils';import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';import { Query } from 'types/api/queryBuilder/queryBuilderData';-import { AllTraceFilterKeyValue } from '../Filter/filterUtils';-export const optionMenuReturn = {options: {selectColumns: [@@ -193,40 +190,3 @@ export const qbProviderValue = {handleOnUnitsChange: noop,isStagedQueryUpdated: (): boolean => false,} as any;--export function checkIfSectionIsOpen(- getByTestId: (testId: string) => HTMLElement,- panelName: string,-): void {- const section = getByTestId(`collapse-${panelName}`);- expect(section.querySelector('.ant-collapse-item-active')).not.toBeNull();-}--export function checkIfSectionIsNotOpen(- getByTestId: (testId: string) => HTMLElement,- panelName: string,-): void {- const section = getByTestId(`collapse-${panelName}`);- expect(section.querySelector('.ant-collapse-item-active')).toBeNull();-}--export const defaultOpenSections = [- 'hasError',- 'durationNano',- 'serviceName',- 'deployment.environment',-];--export const defaultClosedSections = Object.keys(AllTraceFilterKeyValue).filter(- (section) =>- ![...defaultOpenSections, 'durationNanoMin', 'durationNanoMax'].includes(- section,- ),-);--export async function checkForSectionContent(values: string[]): Promise<void> {- for (const val of values) {- const sectionContent = await screen.findByText(val);- await waitFor(() => expect(sectionContent).toBeInTheDocument());- }-}diff --git a/frontend/src/store/actions/metrics/getService.ts b/frontend/src/store/actions/metrics/getService.tsindex 6653bd0d34..f752fa1dc7 100644--- a/frontend/src/store/actions/metrics/getService.ts+++ b/frontend/src/store/actions/metrics/getService.ts@@ -7,7 +7,7 @@ import { Dispatch } from 'redux';import { AppState } from 'store/reducers';import AppActions from 'types/actions';import { GlobalReducer } from 'types/reducer/globalTime';-import { Tags } from 'types/reducer/trace';+import { Tags } from 'hooks/useResourceAttribute/types';export const GetService =(diff --git a/frontend/src/store/actions/trace/getInitialFilter.ts b/frontend/src/store/actions/trace/getInitialFilter.tsdeleted file mode 100644index 32c5635a2c..0000000000--- a/frontend/src/store/actions/trace/getInitialFilter.ts+++ /dev/null@@ -1,221 +0,0 @@-import type { NotificationInstance } from 'antd/es/notification/interface';-import getFiltersApi from 'api/trace/getFilters';-import xor from 'lodash-es/xor';-// eslint-disable-next-line no-restricted-imports-import { Dispatch, Store } from 'redux';-import { AppState } from 'store/reducers';-import AppActions from 'types/actions';-import {- UPDATE_ALL_FILTERS,- UPDATE_TRACE_FILTER_LOADING,- UPDATE_TRACE_GRAPH_LOADING,-} from 'types/actions/trace';-import { GlobalReducer } from 'types/reducer/globalTime';-import { TraceFilterEnum, TraceReducer } from 'types/reducer/trace';--import { parseQueryIntoSpanKind } from './parseFilter/parseSpanKind';-import {- isTraceFilterEnum,- parseAggregateOrderParams,- parseFilterExclude,- parseFilterToFetchData,- parseIsSkippedSelection,- parseQueryIntoCurrent,- parseQueryIntoFilter,- parseQueryIntoOrder,- parseQueryIntoPageSize,- parseQueryIntoSelectedTags,- parseSelectedFilter,- stripTimestampsFromQuery,-} from './util';--export const GetInitialTraceFilter =- (- minTime: GlobalReducer['minTime'],- maxTime: GlobalReducer['maxTime'],- notify: NotificationInstance,- ): ((- dispatch: Dispatch<AppActions>,- getState: Store<AppState>['getState'],- // eslint-disable-next-line sonarjs/cognitive-complexity- ) => void) =>- async (dispatch, getState): Promise<void> => {- try {- const query = window.location.search;-- const { traces, globalTime } = getState();-- if (globalTime.maxTime !== maxTime && globalTime.minTime !== minTime) {- return;- }-- const getSelectedFilter = parseSelectedFilter(- query,- traces.selectedFilter,- true,- );-- const getFilterToFetchData = parseFilterToFetchData(- query,- traces.filterToFetchData,- );-- const parsedSpanKind = parseQueryIntoSpanKind(query, traces.spanKind);-- const getUserSelected = parseSelectedFilter(- query,- traces.userSelectedFilter,- );-- const getIsFilterExcluded = parseFilterExclude(- query,- traces.isFilterExclude,- );-- const parsedQueryCurrent = parseQueryIntoCurrent(- query,- traces.spansAggregate.currentPage,- );-- const parsedQueryOrder = parseQueryIntoOrder(- query,- traces.spansAggregate.order,- );-- const parsedPageSize = parseQueryIntoPageSize(- query,- traces.spansAggregate.pageSize,- );-- const isSelectionSkipped = parseIsSkippedSelection(query);-- const parsedSelectedTags = parseQueryIntoSelectedTags(- query,- traces.selectedTags,- );-- const parsedOrderParams = parseAggregateOrderParams(- query,- traces.spansAggregate.orderParam,- );-- const parsedFilter = parseQueryIntoFilter(query, traces.filter);-- // now filter are not matching we need to fetch the data and make in sync- dispatch({- type: UPDATE_TRACE_FILTER_LOADING,- payload: {- filterLoading: true,- },- });-- const response = await getFiltersApi({- end: String(maxTime),- getFilters: getFilterToFetchData.currentValue,- start: String(minTime),- other: Object.fromEntries(getSelectedFilter.currentValue),- isFilterExclude: getIsFilterExcluded.currentValue,- spanKind: parsedSpanKind.currentValue,- });-- const preSelectedFilter: Map<TraceFilterEnum, string[]> = new Map(- getSelectedFilter.currentValue,- );-- if (response.payload && !isSelectionSkipped.currentValue) {- /** this is required as now we have timestamps updated in date time selection component- * so for initial filters we need to strip timestamps and check for initial load- */- const diff =- stripTimestampsFromQuery(query).length === 0- ? traces.filterToFetchData- : xor(traces.filterToFetchData, getFilterToFetchData.currentValue);-- Object.keys(response.payload).forEach((key) => {- const value = response.payload[key];- Object.keys(value)- // remove maxDuration and minDuration filter from initial selection logic- .filter((e) => !['maxDuration', 'minDuration'].includes(e))- .forEach((preKey) => {- if (isTraceFilterEnum(key) && diff.find((v) => v === key)) {- // const preValue = preSelectedFilter?.get(key) || [];- const preValue = getUserSelected.currentValue?.get(key) || [];- // preSelectedFilter?.set(key, [...new Set([...preValue, preKey])]);- getUserSelected.currentValue.set(key, [- ...new Set([...preValue, preKey]),- ]);- }- });- });- }-- if (response.statusCode === 200) {- const preResponseSelected: TraceReducer['filterResponseSelected'] =- new Set();-- const initialFilter = new Map<TraceFilterEnum, Record<string, string>>(- parsedFilter.currentValue,- );-- Object.keys(response.payload).forEach((key) => {- const value = response.payload[key];- if (isTraceFilterEnum(key)) {- Object.keys(value).forEach((e) => preResponseSelected.add(e));-- initialFilter.set(key, {- ...initialFilter.get(key),- ...value,- });- }- });-- dispatch({- type: UPDATE_ALL_FILTERS,- payload: {- filter: initialFilter,- selectedFilter: preSelectedFilter,- filterToFetchData: getFilterToFetchData.currentValue,- current: parsedQueryCurrent.currentValue,- selectedTags: parsedSelectedTags.currentValue,- userSelected: getUserSelected.currentValue,- isFilterExclude: getIsFilterExcluded.currentValue,- order: parsedQueryOrder.currentValue,- pageSize: parsedPageSize.currentValue,- orderParam: parsedOrderParams.currentValue,- spanKind: parsedSpanKind.currentValue,- },- });- } else {- notify.error({- message: response.error || 'Something went wrong',- });- }-- dispatch({- type: UPDATE_TRACE_FILTER_LOADING,- payload: {- filterLoading: false,- },- });- dispatch({- type: UPDATE_TRACE_GRAPH_LOADING,- payload: {- loading: false,- },- });- } catch (error) {- console.error(error);- dispatch({- type: UPDATE_TRACE_FILTER_LOADING,- payload: {- filterLoading: false,- },- });- dispatch({- type: UPDATE_TRACE_GRAPH_LOADING,- payload: {- loading: false,- },- });- }- };diff --git a/frontend/src/store/actions/trace/getInitialSpansAggregate.ts b/frontend/src/store/actions/trace/getInitialSpansAggregate.tsdeleted file mode 100644index ec23dc48a5..0000000000--- a/frontend/src/store/actions/trace/getInitialSpansAggregate.ts+++ /dev/null@@ -1,148 +0,0 @@-import type { NotificationInstance } from 'antd/es/notification/interface';-import getSpansAggregate from 'api/trace/getSpansAggregate';-// eslint-disable-next-line no-restricted-imports-import { Dispatch, Store } from 'redux';-import { AppState } from 'store/reducers';-import AppActions from 'types/actions';-import { UPDATE_SPANS_AGGREGATE } from 'types/actions/trace';-import { Props as GetSpanAggregateProps } from 'types/api/trace/getSpanAggregate';-import { GlobalReducer } from 'types/reducer/globalTime';-import { TraceReducer } from 'types/reducer/trace';--import { updateURL } from './util';--export const GetSpansAggregate =- (- props: GetSpansAggregateProps,- notify: NotificationInstance,- ): ((- dispatch: Dispatch<AppActions>,- getState: Store<AppState>['getState'],- ) => void) =>- async (dispatch, getState): Promise<void> => {- const { traces, globalTime } = getState();- const { spansAggregate } = traces;-- if (- globalTime.maxTime !== props.maxTime &&- globalTime.minTime !== props.minTime- ) {- return;- }-- if (traces.filterLoading) {- return;- }-- const { order = '' } = props;-- try {- // triggering loading- dispatch({- type: UPDATE_SPANS_AGGREGATE,- payload: {- spansAggregate: {- currentPage: props.current,- loading: true,- data: spansAggregate.data,- error: false,- total: spansAggregate.total,- pageSize: props.pageSize,- order,- orderParam: spansAggregate.orderParam,- },- },- });-- const response = await getSpansAggregate({- end: props.maxTime,- start: props.minTime,- selectedFilter: props.selectedFilter,- limit: props.pageSize,- offset: props.current * props.pageSize - props.pageSize,- selectedTags: props.selectedTags,- isFilterExclude: traces.isFilterExclude,- order,- orderParam: props.orderParam,- spanKind: props.spanKind,- });-- if (response.statusCode === 200) {- dispatch({- type: UPDATE_SPANS_AGGREGATE,- payload: {- spansAggregate: {- currentPage: props.current,- loading: false,- data: response.payload.spans,- error: false,- total: response.payload.totalSpans,- pageSize: props.pageSize,- order,- orderParam: spansAggregate.orderParam,- },- },- });-- updateURL(- traces.selectedFilter,- traces.filterToFetchData,- props.current,- traces.selectedTags,- traces.isFilterExclude,- traces.userSelectedFilter,- order,- traces.spansAggregate.pageSize,- spansAggregate.orderParam,- );- } else {- notify.error({- message: response.error || 'Something went wrong',- });-- dispatch({- type: UPDATE_SPANS_AGGREGATE,- payload: {- spansAggregate: {- currentPage: props.current,- loading: false,- data: spansAggregate.data,- error: true,- total: spansAggregate.total,- pageSize: props.pageSize,- order,- orderParam: spansAggregate.orderParam,- },- },- });- }- } catch (error) {- dispatch({- type: UPDATE_SPANS_AGGREGATE,- payload: {- spansAggregate: {- currentPage: props.current,- loading: false,- data: spansAggregate.data,- error: true,- total: spansAggregate.total,- pageSize: props.pageSize,- order,- orderParam: spansAggregate.orderParam,- },- },- });- }- };--export interface GetSpansAggregateProps {- maxTime: GlobalReducer['maxTime'];- minTime: GlobalReducer['minTime'];- selectedFilter: TraceReducer['selectedFilter'];- current: TraceReducer['spansAggregate']['currentPage'];- pageSize: TraceReducer['spansAggregate']['pageSize'];- selectedTags: TraceReducer['selectedTags'];- order: GetSpanAggregateProps['order'];- orderParam: GetSpanAggregateProps['orderParam'];- spanKind: TraceReducer['spanKind'];-}diff --git a/frontend/src/store/actions/trace/getSpans.ts b/frontend/src/store/actions/trace/getSpans.tsdeleted file mode 100644index 00aa822cea..0000000000--- a/frontend/src/store/actions/trace/getSpans.ts+++ /dev/null@@ -1,88 +0,0 @@-import type { NotificationInstance } from 'antd/es/notification/interface';-import getSpans from 'api/trace/getSpans';-// eslint-disable-next-line no-restricted-imports-import { Dispatch, Store } from 'redux';-import { AppState } from 'store/reducers';-import AppActions from 'types/actions';-import {- UPDATE_TRACE_GRAPH_ERROR,- UPDATE_TRACE_GRAPH_LOADING,- UPDATE_TRACE_GRAPH_SUCCESS,-} from 'types/actions/trace';-import { Props } from 'types/api/trace/getSpans';--export const GetSpans = (- props: GetSpansProps,- notify: NotificationInstance,-): ((- dispatch: Dispatch<AppActions>,- getState: Store<AppState>['getState'],-) => void) => {- const defaultMessage = 'Something went wrong';-- return async (dispatch, getState): Promise<void> => {- try {- const { traces, globalTime } = getState();- const { spansGraph } = traces;-- if (globalTime.maxTime !== props.end && globalTime.minTime !== props.start) {- return;- }-- if (traces.filterLoading) {- return;- }-- if (!spansGraph.loading) {- dispatch({- type: UPDATE_TRACE_GRAPH_LOADING,- payload: {- loading: true,- },- });- }-- const response = await getSpans({- end: props.end,- function: props.function,- groupBy: props.groupBy,- selectedFilter: props.selectedFilter,- selectedTags: props.selectedTags,- start: props.start,- step: props.step,- isFilterExclude: props.isFilterExclude,- spanKind: props.spanKind,- });-- if (response.statusCode === 200) {- dispatch({- type: UPDATE_TRACE_GRAPH_SUCCESS,- payload: {- data: response.payload,- },- });- } else {- notify.error({- message: response.error || defaultMessage,- });- dispatch({- type: UPDATE_TRACE_GRAPH_ERROR,- payload: {- error: true,- errorMessage: response.error || defaultMessage,- },- });- }- } catch (error) {- dispatch({- type: UPDATE_TRACE_GRAPH_ERROR,- payload: {- error: true,- errorMessage: (error as Error)?.toString() || defaultMessage,- },- });- }- };-};--export type GetSpansProps = Props;diff --git a/frontend/src/store/actions/trace/parseFilter/filter.ts b/frontend/src/store/actions/trace/parseFilter/filter.tsdeleted file mode 100644index 3f7a594843..0000000000--- a/frontend/src/store/actions/trace/parseFilter/filter.ts+++ /dev/null@@ -1,44 +0,0 @@-import { TraceFilterEnum, TraceReducer } from 'types/reducer/trace';--import { isTraceFilterEnum, ParsedUrl } from '../util';--export const parseQueryIntoFilter = (- query: string,- stateFilter: TraceReducer['filter'],-): ParsedUrl<TraceReducer['filter']> => {- const urlFilter = new Map<TraceFilterEnum, Record<string, string>>();- const url = new URLSearchParams(query);-- const selected = url.get('filter');-- if (selected) {- try {- const parsedValue = JSON.parse(selected);-- if (typeof parsedValue === 'object') {- Object.keys(parsedValue).forEach((key) => {- if (isTraceFilterEnum(key)) {- const value = parsedValue[key];- if (typeof value === 'object') {- urlFilter.set(key, value);- }- }- });- }- } catch (error) {- console.error(error);- }- }-- if (selected) {- return {- currentValue: urlFilter,- urlValue: urlFilter,- };- }-- return {- currentValue: stateFilter,- urlValue: urlFilter,- };-};diff --git a/frontend/src/store/actions/trace/parseFilter/filterToFetchData.ts b/frontend/src/store/actions/trace/parseFilter/filterToFetchData.tsdeleted file mode 100644index 64b5eb820e..0000000000--- a/frontend/src/store/actions/trace/parseFilter/filterToFetchData.ts+++ /dev/null@@ -1,38 +0,0 @@-import { TraceFilterEnum, TraceReducer } from 'types/reducer/trace';--import { ParsedUrl } from '../util';--export const parseFilterToFetchData = (- query: string,- stateTraceFilterData: TraceReducer['filterToFetchData'],-): ParsedUrl<TraceFilterEnum[]> => {- const url = new URLSearchParams(query);-- const filterToFetchData: TraceFilterEnum[] = [];-- const selected = url.get('filterToFetchData');-- if (selected) {- try {- const parsedValue = JSON.parse(decodeURIComponent(selected));-- if (Array.isArray(parsedValue)) {- filterToFetchData.push(...parsedValue);- }- } catch (error) {- // error while parsing json- }- }-- if (selected) {- return {- currentValue: filterToFetchData,- urlValue: filterToFetchData,- };- }-- return {- currentValue: stateTraceFilterData,- urlValue: filterToFetchData,- };-};diff --git a/frontend/src/store/actions/trace/parseFilter/index.ts b/frontend/src/store/actions/trace/parseFilter/index.tsdeleted file mode 100644index f4db0bef3c..0000000000--- a/frontend/src/store/actions/trace/parseFilter/index.ts+++ /dev/null@@ -1,11 +0,0 @@-export * from './filter';-export * from './filterToFetchData';-export * from './isFilterExclude';-export * from './minMaxTime';-export * from './selectedFilter';-export * from './selectedTags';-export * from './skippedSelected';-export * from './spanAggregateCurrentPage';-export * from './spanAggregateCurrentPageSize';-export * from './spanAggregateOrder';-export * from './spanAggregateOrderParam';diff --git a/frontend/src/store/actions/trace/parseFilter/isFilterExclude.ts b/frontend/src/store/actions/trace/parseFilter/isFilterExclude.tsdeleted file mode 100644index 84a0aa37aa..0000000000--- a/frontend/src/store/actions/trace/parseFilter/isFilterExclude.ts+++ /dev/null@@ -1,45 +0,0 @@-import { TraceFilterEnum, TraceReducer } from 'types/reducer/trace';--import { isTraceFilterEnum, ParsedUrl } from '../util';--export const parseFilterExclude = (- query: string,- stateFilterExclude: TraceReducer['isFilterExclude'],-): ParsedUrl<TraceReducer['isFilterExclude']> => {- const currentFilter = new Map<TraceFilterEnum, boolean>();-- const url = new URLSearchParams(query);-- const isPresent = url.get('isFilterExclude');-- if (isPresent) {- try {- const parsedValue = JSON.parse(isPresent);-- if (typeof parsedValue === 'object') {- Object.keys(parsedValue).forEach((key) => {- if (isTraceFilterEnum(key)) {- const keyValue = parsedValue[key];- if (typeof keyValue === 'boolean') {- currentFilter.set(key, keyValue);- }- }- });- }- } catch (error) {- // parsing the value- }- }-- if (isPresent) {- return {- currentValue: currentFilter,- urlValue: currentFilter,- };- }-- return {- currentValue: stateFilterExclude,- urlValue: currentFilter,- };-};diff --git a/frontend/src/store/actions/trace/parseFilter/minMaxTime.ts b/frontend/src/store/actions/trace/parseFilter/minMaxTime.tsdeleted file mode 100644index aa763089e6..0000000000--- a/frontend/src/store/actions/trace/parseFilter/minMaxTime.ts+++ /dev/null@@ -1,20 +0,0 @@-import { GlobalTime } from 'types/actions/globalTime';--export const parseMinMaxTime = (query: string): GlobalTime => {- const url = new URLSearchParams(query);- let maxTime = 0;- let minTime = 0;-- const urlMaxTime = url.get('minTime');- const urlMinTime = url.get('maxTime');-- if (urlMaxTime && urlMinTime) {- maxTime = parseInt(urlMaxTime, 10);- minTime = parseInt(urlMinTime, 10);- }-- return {- maxTime,- minTime,- };-};diff --git a/frontend/src/store/actions/trace/parseFilter/parseSpanKind.ts b/frontend/src/store/actions/trace/parseFilter/parseSpanKind.tsdeleted file mode 100644index 0ad046696d..0000000000--- a/frontend/src/store/actions/trace/parseFilter/parseSpanKind.ts+++ /dev/null@@ -1,38 +0,0 @@-import { TraceReducer } from 'types/reducer/trace';--import { ParsedUrl } from '../util';--export const parseQueryIntoSpanKind = (- query: string,- stateCurrent: TraceReducer['spanKind'],-): ParsedUrl<TraceReducer['spanKind']> => {- const url = new URLSearchParams(query);-- let current = '';-- const selected = url.get('spanKind');-- if (selected) {- try {- const parsedValue = selected;-- if (parsedValue && typeof parsedValue === 'string') {- current = parsedValue;- }- } catch (error) {- console.error('error while parsing json: ', error);- }- }-- if (selected) {- return {- currentValue: current,- urlValue: current,- };- }-- return {- currentValue: stateCurrent,- urlValue: current,- };-};diff --git a/frontend/src/store/actions/trace/parseFilter/selectedFilter.ts b/frontend/src/store/actions/trace/parseFilter/selectedFilter.tsdeleted file mode 100644index f6e15c4952..0000000000--- a/frontend/src/store/actions/trace/parseFilter/selectedFilter.ts+++ /dev/null@@ -1,44 +0,0 @@-import { TraceFilterEnum, TraceReducer } from 'types/reducer/trace';--import { isTraceFilterEnum, ParsedUrl } from '../util';--export const parseSelectedFilter = (- query: string,- selectedFilter: TraceReducer['selectedFilter'],- isUserSelected = false,-): ParsedUrl<Map<TraceFilterEnum, string[]>> => {- const url = new URLSearchParams(query);-- const filters = new Map<TraceFilterEnum, string[]>();-- const title = isUserSelected ? 'selected' : 'userSelectedFilter';-- const selected = url.get(title);-- if (selected) {- try {- const parsedValue = JSON.parse(decodeURIComponent(selected));- if (typeof parsedValue === 'object') {- Object.keys(parsedValue).forEach((e) => {- if (isTraceFilterEnum(e)) {- filters.set(e, parsedValue[e]);- }- });- }- } catch (error) {- // if the parsing error happens- }- }-- if (selected) {- return {- urlValue: filters,- currentValue: filters,- };- }-- return {- urlValue: filters,- currentValue: selectedFilter,- };-};diff --git a/frontend/src/store/actions/trace/parseFilter/selectedTags.ts b/frontend/src/store/actions/trace/parseFilter/selectedTags.tsdeleted file mode 100644index e335747832..0000000000--- a/frontend/src/store/actions/trace/parseFilter/selectedTags.ts+++ /dev/null@@ -1,38 +0,0 @@-import { TraceReducer } from 'types/reducer/trace';--import { ParsedUrl } from '../util';--export const parseQueryIntoSelectedTags = (- query: string,- stateSelectedTags: TraceReducer['selectedTags'],-): ParsedUrl<TraceReducer['selectedTags']> => {- const url = new URLSearchParams(query);-- let selectedTags: TraceReducer['selectedTags'] = [];-- const querySelectedTags = url.get('selectedTags');-- if (querySelectedTags) {- try {- const parsedQuerySelectedTags = JSON.parse(querySelectedTags);-- if (Array.isArray(parsedQuerySelectedTags)) {- selectedTags = parsedQuerySelectedTags;- }- } catch (error) {- // error while parsing- }- }-- if (querySelectedTags) {- return {- currentValue: selectedTags,- urlValue: selectedTags,- };- }-- return {- currentValue: stateSelectedTags,- urlValue: selectedTags,- };-};diff --git a/frontend/src/store/actions/trace/parseFilter/skippedSelected.ts b/frontend/src/store/actions/trace/parseFilter/skippedSelected.tsdeleted file mode 100644index fd4b110ba9..0000000000--- a/frontend/src/store/actions/trace/parseFilter/skippedSelected.ts+++ /dev/null@@ -1,33 +0,0 @@-import { ParsedUrl } from '../util';--export const parseIsSkippedSelection = (query: string): ParsedUrl<boolean> => {- const url = new URLSearchParams(query);-- let current = false;-- const isSkippedSelected = url.get('isSelectedFilterSkipped');-- if (isSkippedSelected) {- try {- const parsedValue = JSON.parse(isSkippedSelected);-- if (typeof parsedValue === 'boolean') {- current = parsedValue;- }- } catch (error) {- current = false;- }- }-- if (isSkippedSelected) {- return {- currentValue: current,- urlValue: current,- };- }-- return {- currentValue: current,- urlValue: current,- };-};diff --git a/frontend/src/store/actions/trace/parseFilter/spanAggregateCurrentPage.ts b/frontend/src/store/actions/trace/parseFilter/spanAggregateCurrentPage.tsdeleted file mode 100644index f55561852e..0000000000--- a/frontend/src/store/actions/trace/parseFilter/spanAggregateCurrentPage.ts+++ /dev/null@@ -1,37 +0,0 @@-import { TraceReducer } from 'types/reducer/trace';--import { ParsedUrl } from '../util';--export const parseQueryIntoCurrent = (- query: string,- stateCurrent: TraceReducer['spansAggregate']['currentPage'],-): ParsedUrl<TraceReducer['spansAggregate']['currentPage']> => {- const url = new URLSearchParams(query);-- let current = 1;-- const selected = url.get('spanAggregateCurrentPage');-- if (selected) {- try {- const parsedValue = JSON.parse(decodeURIComponent(selected));- if (Number.isInteger(parsedValue)) {- current = parseInt(parsedValue, 10);- }- } catch (error) {- console.error('error while parsing json: ', error);- }- }-- if (selected) {- return {- currentValue: parseInt(selected, 10),- urlValue: current,- };- }-- return {- currentValue: stateCurrent,- urlValue: current,- };-};diff --git a/frontend/src/store/actions/trace/parseFilter/spanAggregateCurrentPageSize.ts b/frontend/src/store/actions/trace/parseFilter/spanAggregateCurrentPageSize.tsdeleted file mode 100644index 76b39d05af..0000000000--- a/frontend/src/store/actions/trace/parseFilter/spanAggregateCurrentPageSize.ts+++ /dev/null@@ -1,37 +0,0 @@-import { TraceReducer } from 'types/reducer/trace';--import { ParsedUrl } from '../util';--export const parseQueryIntoPageSize = (- query: string,- stateCurrent: TraceReducer['spansAggregate']['pageSize'],-): ParsedUrl<TraceReducer['spansAggregate']['pageSize']> => {- const url = new URLSearchParams(query);-- let current = 1;-- const selected = url.get('spanAggregateCurrentPageSize');-- if (selected) {- try {- const parsedValue = JSON.parse(decodeURIComponent(selected));- if (Number.isInteger(parsedValue)) {- current = parseInt(parsedValue, 10);- }- } catch (error) {- console.error('error while parsing json');- }- }-- if (selected) {- return {- currentValue: parseInt(selected, 10),- urlValue: current,- };- }-- return {- currentValue: stateCurrent,- urlValue: current,- };-};diff --git a/frontend/src/store/actions/trace/parseFilter/spanAggregateOrder.ts b/frontend/src/store/actions/trace/parseFilter/spanAggregateOrder.tsdeleted file mode 100644index b78f95a736..0000000000--- a/frontend/src/store/actions/trace/parseFilter/spanAggregateOrder.ts+++ /dev/null@@ -1,38 +0,0 @@-import { TraceReducer } from 'types/reducer/trace';--import { ParsedUrl } from '../util';--export const parseQueryIntoOrder = (- query: string,- stateCurrent: TraceReducer['spansAggregate']['order'],-): ParsedUrl<TraceReducer['spansAggregate']['order']> => {- const url = new URLSearchParams(query);-- let current = '';-- const selected = url.get('spanAggregateOrder');-- if (selected) {- try {- const parsedValue = selected;-- if (parsedValue && typeof parsedValue === 'string') {- current = parsedValue;- }- } catch (error) {- console.error('error while parsing json: ', error);- }- }-- if (selected) {- return {- currentValue: current,- urlValue: current,- };- }-- return {- currentValue: stateCurrent,- urlValue: current,- };-};diff --git a/frontend/src/store/actions/trace/parseFilter/spanAggregateOrderParam.ts b/frontend/src/store/actions/trace/parseFilter/spanAggregateOrderParam.tsdeleted file mode 100644index 3254adb7d9..0000000000--- a/frontend/src/store/actions/trace/parseFilter/spanAggregateOrderParam.ts+++ /dev/null@@ -1,38 +0,0 @@-import { TraceReducer } from 'types/reducer/trace';--import { ParsedUrl } from '../util';--export const parseAggregateOrderParams = (- query: string,- stateCurrent: TraceReducer['spansAggregate']['orderParam'],-): ParsedUrl<TraceReducer['spansAggregate']['orderParam']> => {- const url = new URLSearchParams(query);-- let current = '';-- const selected = url.get('spanAggregateOrderParam');-- if (selected) {- try {- const parsedValue = selected;-- if (parsedValue && typeof parsedValue === 'string') {- current = parsedValue;- }- } catch (error) {- console.error('error while parsing json: ', error);- }- }-- if (selected) {- return {- currentValue: current,- urlValue: current,- };- }-- return {- currentValue: stateCurrent,- urlValue: current,- };-};diff --git a/frontend/src/store/actions/trace/updateIsTagsError.ts b/frontend/src/store/actions/trace/updateIsTagsError.tsdeleted file mode 100644index 724fedcb97..0000000000--- a/frontend/src/store/actions/trace/updateIsTagsError.ts+++ /dev/null@@ -1,18 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import { Dispatch } from 'redux';-import AppActions from 'types/actions';-import { UPDATE_IS_TAG_ERROR } from 'types/actions/trace';-import { TraceReducer } from 'types/reducer/trace';--export const UpdateTagIsError =- (- isTagModalError: TraceReducer['isTagModalError'],- ): ((dispatch: Dispatch<AppActions>) => void) =>- (dispatch): void => {- dispatch({- type: UPDATE_IS_TAG_ERROR,- payload: {- isTagModalError,- },- });- };diff --git a/frontend/src/store/actions/trace/updateTagPanelVisiblity.ts b/frontend/src/store/actions/trace/updateTagPanelVisiblity.tsdeleted file mode 100644index 7196245bc9..0000000000--- a/frontend/src/store/actions/trace/updateTagPanelVisiblity.ts+++ /dev/null@@ -1,18 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import { Dispatch } from 'redux';-import AppActions from 'types/actions';-import { UPDATE_TAG_MODAL_VISIBILITY } from 'types/actions/trace';-import { TraceReducer } from 'types/reducer/trace';--export const UpdateTagVisibility =- (- isTagModalOpen: TraceReducer['isTagModalOpen'],- ): ((dispatch: Dispatch<AppActions>) => void) =>- (dispatch): void => {- dispatch({- type: UPDATE_TAG_MODAL_VISIBILITY,- payload: {- isTagModalOpen,- },- });- };diff --git a/frontend/src/store/actions/trace/util.ts b/frontend/src/store/actions/trace/util.tsdeleted file mode 100644index b52cf43821..0000000000--- a/frontend/src/store/actions/trace/util.ts+++ /dev/null@@ -1,97 +0,0 @@-import { AllTraceFilterEnum } from 'container/Trace/Filters';-import createQueryParams from 'lib/createQueryParams';-import history from 'lib/history';-import { PayloadProps as GetFilterPayload } from 'types/api/trace/getFilters';-import { TraceFilterEnum, TraceReducer } from 'types/reducer/trace';--export * from './parseFilter';-export interface ParsedUrl<T> {- currentValue: T;- urlValue: T;-}--export function isTraceFilterEnum(- value: TraceFilterEnum | string,-): value is TraceFilterEnum {- return !!AllTraceFilterEnum.find((enums) => enums === value);-}--export const updateURL = (- selectedFilter: TraceReducer['selectedFilter'],- filterToFetchData: TraceReducer['filterToFetchData'],- spanAggregateCurrentPage: TraceReducer['spansAggregate']['currentPage'],- selectedTags: TraceReducer['selectedTags'],- isFilterExclude: TraceReducer['isFilterExclude'],- userSelectedFilter: TraceReducer['userSelectedFilter'],- spanAggregateOrder: TraceReducer['spansAggregate']['order'],- spanAggregateCurrentPageSize: TraceReducer['spansAggregate']['pageSize'],- spanAggregateOrderParam: TraceReducer['spansAggregate']['orderParam'],-): void => {- const search = new URLSearchParams(window.location.search);- const preResult: { key: string; value: string }[] = [];-- const keyToSkip = [- 'selected',- 'filterToFetchData',- 'selectedTags',- 'filter',- 'isFilterExclude',- 'userSelectedFilter',- 'spanAggregateCurrentPage',- 'spanAggregateOrder',- 'spanAggregateCurrentPageSize',- 'spanAggregateOrderParam',- ];-- search.forEach((value, key) => {- if (!keyToSkip.includes(key)) {- preResult.push({- key,- value,- });- }- });-- const preResultParams = preResult.reduce(- (acc, item) => {- acc[item.key] = item.value;- return acc;- },- {} as Record<string, string>,- );-- const queryParams = {- selected: JSON.stringify(Object.fromEntries(selectedFilter)),- filterToFetchData: JSON.stringify(filterToFetchData),- spanAggregateCurrentPage,- spanAggregateOrder,- spanAggregateCurrentPageSize,- spanAggregateOrderParam,- selectedTags: JSON.stringify(selectedTags),- ...preResultParams,- isFilterExclude: JSON.stringify(Object.fromEntries(isFilterExclude)),- userSelectedFilter: JSON.stringify(Object.fromEntries(userSelectedFilter)),- };- history.replace(- `${history.location.pathname}?${createQueryParams(queryParams)}`,- );-};--export const getFilter = (data: GetFilterPayload): TraceReducer['filter'] => {- const filter = new Map<TraceFilterEnum, Record<string, string>>();-- Object.keys(data).forEach((key) => {- const value = data[key];- if (isTraceFilterEnum(key)) {- filter.set(key, value);- }- });-- return filter;-};--export const stripTimestampsFromQuery = (query: string): string =>- query- .replace(/(\?|&)startTime=\d+/, '')- .replace(/&endTime=\d+/, '')- .replace(/[?&]relativeTime=[^&]+/g, '');diff --git a/frontend/src/store/reducers/index.ts b/frontend/src/store/reducers/index.tsindex 31419afec9..125dd89b1e 100644--- a/frontend/src/store/reducers/index.ts+++ b/frontend/src/store/reducers/index.ts@@ -6,11 +6,9 @@ import globalTimeReducer from './global';import { LogsReducer } from './logs';import metricsReducers from './metric';import { ServiceMapReducer } from './serviceMap';-import traceReducer from './trace';import { usageDataReducer } from './usage';const reducers = combineReducers({- traces: traceReducer,usageDate: usageDataReducer,globalTime: globalTimeReducer,serviceMap: ServiceMapReducer,diff --git a/frontend/src/store/reducers/trace.ts b/frontend/src/store/reducers/trace.tsdeleted file mode 100644index 9c94b2d810..0000000000--- a/frontend/src/store/reducers/trace.ts+++ /dev/null@@ -1,284 +0,0 @@-import {- RESET_TRACE_FILTER,- SELECT_TRACE_FILTER,- TraceActions,- UPDATE_ALL_FILTERS,- UPDATE_FILTER_EXCLUDE,- UPDATE_FILTER_RESPONSE_SELECTED,- UPDATE_IS_TAG_ERROR,- UPDATE_SELECTED_FUNCTION,- UPDATE_SELECTED_GROUP_BY,- UPDATE_SELECTED_TAGS,- UPDATE_SPAN_ORDER,- UPDATE_SPAN_ORDER_PARAMS,- UPDATE_SPAN_UPDATE_FILTER_DISPLAY_VALUE,- UPDATE_SPANS_AGGREGATE,- UPDATE_SPANS_AGGREGATE_PAGE_NUMBER,- UPDATE_SPANS_AGGREGATE_PAGE_SIZE,- UPDATE_TAG_MODAL_VISIBILITY,- UPDATE_TRACE_FILTER,- UPDATE_TRACE_FILTER_LOADING,- UPDATE_TRACE_GRAPH_ERROR,- UPDATE_TRACE_GRAPH_LOADING,- UPDATE_TRACE_GRAPH_SUCCESS,-} from 'types/actions/trace';-import { TraceFilterEnum, TraceReducer } from 'types/reducer/trace';--export const INITIAL_FILTER_VALUE = 8;--const initialValue: TraceReducer = {- filter: new Map(),- filterToFetchData: ['duration', 'status', 'serviceName'],- filterLoading: true,- filterResponseSelected: new Set(),- selectedFilter: new Map(),- selectedTags: [],- isTagModalOpen: false,- isTagModalError: false,- isFilterExclude: new Map<TraceFilterEnum, boolean>([]),- userSelectedFilter: new Map(),- spansAggregate: {- currentPage: 1,- loading: false,- data: [],- error: false,- total: 0,- pageSize: 10,- order: '',- orderParam: '',- },- selectedGroupBy: '',- selectedFunction: 'count',- yAxisUnit: '',- spansGraph: {- error: false,- errorMessage: '',- loading: true,- payload: { items: {} },- },- filterDisplayValue: new Map<TraceFilterEnum, number>([- ['duration', INITIAL_FILTER_VALUE],- ['httpHost', INITIAL_FILTER_VALUE],- ['httpMethod', INITIAL_FILTER_VALUE],- ['httpUrl', INITIAL_FILTER_VALUE],- ['operation', INITIAL_FILTER_VALUE],- ['rpcMethod', INITIAL_FILTER_VALUE],- ['responseStatusCode', INITIAL_FILTER_VALUE],- ['serviceName', INITIAL_FILTER_VALUE],- ['status', INITIAL_FILTER_VALUE],- ['traceID', INITIAL_FILTER_VALUE],- ]),- spanKind: undefined,-};--const traceReducer = (- state = initialValue,- action: TraceActions,-): TraceReducer => {- switch (action.type) {- case UPDATE_TRACE_FILTER: {- return {- ...state,- filter: action.payload.filter,- };- }-- case UPDATE_ALL_FILTERS: {- const { payload } = action;- const {- filter,- filterToFetchData,- selectedFilter,- current,- selectedTags,- userSelected,- isFilterExclude,- order,- pageSize,- orderParam,- spanKind,- } = payload;-- return {- ...state,- filter,- filterToFetchData,- selectedFilter,- selectedTags,- userSelectedFilter: userSelected,- isFilterExclude,- spansAggregate: {- ...state.spansAggregate,- currentPage: current,- pageSize,- order,- orderParam,- },- spanKind,- };- }-- case UPDATE_TRACE_FILTER_LOADING: {- return {- ...state,- filterLoading: action.payload.filterLoading,- };- }-- case SELECT_TRACE_FILTER: {- return {- ...state,- selectedFilter: action.payload.selectedFilter,- };- }-- case RESET_TRACE_FILTER: {- return {- ...initialValue,- };- }-- case UPDATE_SELECTED_TAGS: {- return {- ...state,- selectedTags: action.payload.selectedTags,- };- }-- case UPDATE_SPANS_AGGREGATE: {- return {- ...state,- spansAggregate: action.payload.spansAggregate,- };- }-- case UPDATE_TAG_MODAL_VISIBILITY: {- return {- ...state,- isTagModalOpen: action.payload.isTagModalOpen,- };- }-- case UPDATE_IS_TAG_ERROR: {- return {- ...state,- isTagModalError: action.payload.isTagModalError,- };- }-- case UPDATE_SELECTED_FUNCTION: {- return {- ...state,- selectedFunction: action.payload.selectedFunction,- yAxisUnit: action.payload.yAxisUnit,- };- }-- case UPDATE_SELECTED_GROUP_BY: {- return {- ...state,- selectedGroupBy: action.payload.selectedGroupBy,- };- }-- case UPDATE_TRACE_GRAPH_LOADING: {- return {- ...state,- spansGraph: {- ...state.spansGraph,- loading: action.payload.loading,- },- };- }-- case UPDATE_TRACE_GRAPH_ERROR: {- return {- ...state,- spansGraph: {- ...state.spansGraph,- error: action.payload.error,- errorMessage: action.payload.errorMessage,- loading: false,- },- };- }-- case UPDATE_TRACE_GRAPH_SUCCESS: {- return {- ...state,- spansGraph: {- ...state.spansGraph,- payload: action.payload.data,- loading: false,- error: false,- },- };- }-- case UPDATE_FILTER_RESPONSE_SELECTED: {- return {- ...state,- filterResponseSelected: action.payload.filterResponseSelected,- };- }-- case UPDATE_FILTER_EXCLUDE: {- return {- ...state,- isFilterExclude: action.payload.isFilterExclude,- };- }-- case UPDATE_SPAN_ORDER: {- return {- ...state,- spansAggregate: {- ...state.spansAggregate,- order: action.payload.order,- },- };- }-- case UPDATE_SPANS_AGGREGATE_PAGE_NUMBER: {- return {- ...state,- spansAggregate: {- ...state.spansAggregate,- currentPage: action.payload.currentPage,- },- };- }-- case UPDATE_SPANS_AGGREGATE_PAGE_SIZE: {- return {- ...state,- spansAggregate: {- ...state.spansAggregate,- pageSize: action.payload.pageSize,- },- };- }-- case UPDATE_SPAN_ORDER_PARAMS: {- return {- ...state,- spansAggregate: {- ...state.spansAggregate,- orderParam: action.payload.orderParam,- },- };- }-- case UPDATE_SPAN_UPDATE_FILTER_DISPLAY_VALUE: {- return {- ...state,- filterDisplayValue: action.payload,- };- }-- default:- return state;- }-};--export default traceReducer;diff --git a/frontend/src/types/actions/index.ts b/frontend/src/types/actions/index.tsindex 723c6956bb..6bec6d2116 100644--- a/frontend/src/types/actions/index.ts+++ b/frontend/src/types/actions/index.ts@@ -2,13 +2,7 @@ import { AppAction } from './app';import { GlobalTimeAction } from './globalTime';import { LogsActions } from './logs';import { MetricsActions } from './metrics';-import { TraceActions } from './trace';-type AppActions =- | AppAction- | GlobalTimeAction- | MetricsActions- | TraceActions- | LogsActions;+type AppActions = AppAction | GlobalTimeAction | MetricsActions | LogsActions;export default AppActions;diff --git a/frontend/src/types/actions/trace.ts b/frontend/src/types/actions/trace.tsdeleted file mode 100644index f4336427f4..0000000000--- a/frontend/src/types/actions/trace.ts+++ /dev/null@@ -1,220 +0,0 @@-import { TraceReducer } from 'types/reducer/trace';--export const UPDATE_TRACE_FILTER = 'UPDATE_TRACE_FILTER';-export const GET_TRACE_FILTER = 'GET_TRACE_FILTER';-export const UPDATE_TRACE_FILTER_LOADING = 'UPDATE_TRACE_FILTER_LOADING';--export const SELECT_TRACE_FILTER = 'SELECT_TRACE_FILTER';-export const UPDATE_ALL_FILTERS = 'UPDATE_ALL_FILTERS';-export const UPDATE_SELECTED_TAGS = 'UPDATE_SELECTED_TAGS';-export const UPDATE_TAG_MODAL_VISIBILITY = 'UPDATE_TAG_MODAL_VISIBILITY';--export const UPDATE_SPANS_AGGREGATE = 'UPDATE_SPANS_AGGREGATE';--export const UPDATE_IS_TAG_ERROR = 'UPDATE_IS_TAG_ERROR';--export const UPDATE_SELECTED_FUNCTION = 'UPDATE_SELECTED_FUNCTION';-export const UPDATE_SELECTED_GROUP_BY = 'UPDATE_SELECTED_GROUP_BY';--export const UPDATE_TRACE_GRAPH_LOADING = 'UPDATE_TRACE_GRAPH_LOADING';-export const UPDATE_TRACE_GRAPH_ERROR = 'UPDATE_TRACE_GRAPH_ERROR';-export const UPDATE_TRACE_GRAPH_SUCCESS = 'UPDATE_TRACE_GRAPH_SUCCESS';--export const RESET_TRACE_FILTER = 'RESET_TRACE_FILTER';-export const UPDATE_FILTER_RESPONSE_SELECTED =- 'UPDATE_FILTER_RESPONSE_SELECTED';-export const UPDATE_FILTER_EXCLUDE = 'UPDATE_FILTER_EXCLUDE';--export const UPDATE_SPAN_ORDER = 'UPDATE_SPAN_ORDER';-export const UPDATE_SPANS_AGGREGATE_PAGE_NUMBER =- 'UPDATE_SPANS_AGGREGATE_PAGE_NUMBER';-export const UPDATE_SPANS_AGGREGATE_PAGE_SIZE =- 'UPDATE_SPANS_AGGREGATE_PAGE_SIZE';-export const UPDATE_SPAN_ORDER_PARAMS = 'UPDATE_SPAN_ORDER_PARAMS';-export const UPDATE_SPAN_UPDATE_FILTER_DISPLAY_VALUE =- 'UPDATE_SPAN_UPDATE_FILTER_DISPLAY_VALUE';--export interface UpdateFilter {- type: typeof UPDATE_TRACE_FILTER;- payload: {- filter: TraceReducer['filter'];- };-}--export interface UpdateSpansAggregate {- type: typeof UPDATE_SPANS_AGGREGATE;- payload: {- spansAggregate: TraceReducer['spansAggregate'];- };-}--export interface UpdateTagVisibility {- type: typeof UPDATE_TAG_MODAL_VISIBILITY;- payload: {- isTagModalOpen: TraceReducer['isTagModalOpen'];- };-}--export interface UpdateSelectedTags {- type: typeof UPDATE_SELECTED_TAGS;- payload: {- selectedTags: TraceReducer['selectedTags'];- };-}--export interface UpdateSelected {- type: typeof UPDATE_FILTER_RESPONSE_SELECTED;- payload: {- filterResponseSelected: TraceReducer['filterResponseSelected'];- };-}--export interface UpdateAllFilters {- type: typeof UPDATE_ALL_FILTERS;- payload: {- filter: TraceReducer['filter'];- selectedFilter: TraceReducer['selectedFilter'];- filterToFetchData: TraceReducer['filterToFetchData'];- current: TraceReducer['spansAggregate']['currentPage'];- selectedTags: TraceReducer['selectedTags'];- userSelected: TraceReducer['userSelectedFilter'];- isFilterExclude: TraceReducer['isFilterExclude'];- order: TraceReducer['spansAggregate']['order'];- pageSize: TraceReducer['spansAggregate']['pageSize'];- orderParam: TraceReducer['spansAggregate']['orderParam'];- spanKind?: TraceReducer['spanKind'];- };-}--export interface UpdateFilterLoading {- type: typeof UPDATE_TRACE_FILTER_LOADING;- payload: {- filterLoading: TraceReducer['filterLoading'];- };-}--export interface SelectTraceFilter {- type: typeof SELECT_TRACE_FILTER;- payload: {- selectedFilter: TraceReducer['selectedFilter'];- };-}--export interface ResetTraceFilter {- type: typeof RESET_TRACE_FILTER;-}--export interface GetTraceFilter {- type: typeof GET_TRACE_FILTER;- payload: {- filter: TraceReducer['filter'];- };-}--export interface UpdateIsTagError {- type: typeof UPDATE_IS_TAG_ERROR;- payload: {- isTagModalError: TraceReducer['isTagModalError'];- };-}--export interface UpdateSelectedGroupBy {- type: typeof UPDATE_SELECTED_GROUP_BY;- payload: {- selectedGroupBy: TraceReducer['selectedGroupBy'];- };-}--export interface UpdateSelectedFunction {- type: typeof UPDATE_SELECTED_FUNCTION;- payload: {- selectedFunction: TraceReducer['selectedFunction'];- yAxisUnit: string | undefined;- };-}--export interface UpdateSpanLoading {- type: typeof UPDATE_TRACE_GRAPH_LOADING;- payload: {- loading: TraceReducer['spansGraph']['loading'];- };-}--export interface UpdateSpansError {- type: typeof UPDATE_TRACE_GRAPH_ERROR;- payload: {- error: TraceReducer['spansGraph']['error'];- errorMessage: TraceReducer['spansGraph']['errorMessage'];- };-}--export interface UpdateFilterExclude {- type: typeof UPDATE_FILTER_EXCLUDE;- payload: {- isFilterExclude: TraceReducer['isFilterExclude'];- };-}--export interface UpdateSpans {- type: typeof UPDATE_TRACE_GRAPH_SUCCESS;- payload: {- data: TraceReducer['spansGraph']['payload'];- };-}--export interface UpdateSpansAggregatePageNumber {- type: typeof UPDATE_SPANS_AGGREGATE_PAGE_NUMBER;- payload: {- currentPage: TraceReducer['spansAggregate']['currentPage'];- };-}--export interface UpdateSpanOrder {- type: typeof UPDATE_SPAN_ORDER;- payload: {- order: TraceReducer['spansAggregate']['order'];- };-}--export interface UpdateSpanSize {- type: typeof UPDATE_SPANS_AGGREGATE_PAGE_SIZE;- payload: {- pageSize: TraceReducer['spansAggregate']['pageSize'];- };-}--export interface UpdateSpanParams {- type: typeof UPDATE_SPAN_ORDER_PARAMS;- payload: {- orderParam: TraceReducer['spansAggregate']['orderParam'];- };-}--export interface UpdateTraceFilterDisplayValue {- type: typeof UPDATE_SPAN_UPDATE_FILTER_DISPLAY_VALUE;- payload: TraceReducer['filterDisplayValue'];-}--export type TraceActions =- | UpdateFilter- | GetTraceFilter- | UpdateFilterLoading- | SelectTraceFilter- | UpdateAllFilters- | UpdateSelectedTags- | UpdateTagVisibility- | UpdateSpansAggregate- | UpdateIsTagError- | UpdateSelectedGroupBy- | UpdateSelectedFunction- | UpdateSpanLoading- | UpdateSpansError- | UpdateSpans- | ResetTraceFilter- | UpdateSelected- | UpdateFilterExclude- | UpdateSpanOrder- | UpdateSpansAggregatePageNumber- | UpdateSpanSize- | UpdateSpanParams- | UpdateTraceFilterDisplayValue;diff --git a/frontend/src/types/api/errors/getAll.ts b/frontend/src/types/api/errors/getAll.tsindex 26ad5e943b..dad6775180 100644--- a/frontend/src/types/api/errors/getAll.ts+++ b/frontend/src/types/api/errors/getAll.ts@@ -1,5 +1,5 @@import { GlobalTime } from 'types/actions/globalTime';-import { Tags } from 'types/reducer/trace';+import { Tags } from 'hooks/useResourceAttribute/types';export type Order = 'ascending' | 'descending';export type OrderBy =diff --git a/frontend/src/types/api/errors/getErrorCounts.ts b/frontend/src/types/api/errors/getErrorCounts.tsindex 733b3f4f35..31189fc9c9 100644--- a/frontend/src/types/api/errors/getErrorCounts.ts+++ b/frontend/src/types/api/errors/getErrorCounts.ts@@ -1,5 +1,5 @@import { GlobalTime } from 'types/actions/globalTime';-import { Tags } from 'types/reducer/trace';+import { Tags } from 'hooks/useResourceAttribute/types';export type Props = {start: GlobalTime['minTime'];diff --git a/frontend/src/types/api/metrics/getDBOverview.ts b/frontend/src/types/api/metrics/getDBOverview.tsindex c677884245..e6e85e0d79 100644--- a/frontend/src/types/api/metrics/getDBOverview.ts+++ b/frontend/src/types/api/metrics/getDBOverview.ts@@ -1,4 +1,4 @@-import { Tags } from 'types/reducer/trace';+import { Tags } from 'hooks/useResourceAttribute/types';export interface Props {service: string;diff --git a/frontend/src/types/api/metrics/getService.ts b/frontend/src/types/api/metrics/getService.tsindex d931197433..fa96b6d84c 100644--- a/frontend/src/types/api/metrics/getService.ts+++ b/frontend/src/types/api/metrics/getService.ts@@ -1,5 +1,5 @@import { AxiosError } from 'axios';-import { Tags } from 'types/reducer/trace';+import { Tags } from 'hooks/useResourceAttribute/types';export interface Props {start: number;diff --git a/frontend/src/types/api/metrics/getTopOperations.ts b/frontend/src/types/api/metrics/getTopOperations.tsindex c5dbf5ad0b..49973da339 100644--- a/frontend/src/types/api/metrics/getTopOperations.ts+++ b/frontend/src/types/api/metrics/getTopOperations.ts@@ -1,5 +1,5 @@import { TopOperationList } from 'container/MetricsApplication/TopOperationsTable';-import { Tags } from 'types/reducer/trace';+import { Tags } from 'hooks/useResourceAttribute/types';export interface Props {service: string;diff --git a/frontend/src/types/api/trace/getFilters.ts b/frontend/src/types/api/trace/getFilters.tsdeleted file mode 100644index 3edb9166c0..0000000000--- a/frontend/src/types/api/trace/getFilters.ts+++ /dev/null@@ -1,16 +0,0 @@-import { TraceReducer } from 'types/reducer/trace';--export interface Props {- start: string;- end: string;- getFilters: string[];- other: {- [k: string]: string[];- };- isFilterExclude: TraceReducer['isFilterExclude'];- spanKind?: TraceReducer['spanKind'];-}--export interface PayloadProps {- [key: string]: Record<string, string>;-}diff --git a/frontend/src/types/api/trace/getSpanAggregate.ts b/frontend/src/types/api/trace/getSpanAggregate.tsdeleted file mode 100644index 97d813aeeb..0000000000--- a/frontend/src/types/api/trace/getSpanAggregate.ts+++ /dev/null@@ -1,19 +0,0 @@-import { TraceReducer } from 'types/reducer/trace';--export interface Props {- start: number;- end: number;- selectedFilter: TraceReducer['selectedFilter'];- limit: number;- offset: number;- selectedTags: TraceReducer['selectedTags'];- order?: TraceReducer['spansAggregate']['order'];- isFilterExclude: TraceReducer['isFilterExclude'];- orderParam: TraceReducer['spansAggregate']['orderParam'];- spanKind?: TraceReducer['spanKind'];-}--export type PayloadProps = {- spans: TraceReducer['spansAggregate']['data'];- totalSpans: number;-};diff --git a/frontend/src/types/api/trace/getSpans.ts b/frontend/src/types/api/trace/getSpans.tsdeleted file mode 100644index 7928908da9..0000000000--- a/frontend/src/types/api/trace/getSpans.ts+++ /dev/null@@ -1,23 +0,0 @@-import { TraceReducer } from 'types/reducer/trace';--export interface Props {- start: number;- end: number;- function: TraceReducer['selectedFunction'];- step: number;- groupBy: TraceReducer['selectedGroupBy'];- selectedFilter: TraceReducer['selectedFilter'];- selectedTags: TraceReducer['selectedTags'];- isFilterExclude: TraceReducer['isFilterExclude'];- spanKind?: TraceReducer['spanKind'];-}--export interface PayloadProps {- items: Record<string, SpanData>;-}--interface SpanData {- timestamp: number;- value?: number;- groupBy?: Record<string, number>;-}diff --git a/frontend/src/types/api/trace/getTagFilters.ts b/frontend/src/types/api/trace/getTagFilters.tsdeleted file mode 100644index d1029f308f..0000000000--- a/frontend/src/types/api/trace/getTagFilters.ts+++ /dev/null@@ -1,17 +0,0 @@-import { TraceReducer } from 'types/reducer/trace';--export interface Props {- start: number;- end: number;- other: {- [k: string]: string[];- };- isFilterExclude: TraceReducer['isFilterExclude'];- spanKind?: TraceReducer['spanKind'];-}--export interface PayloadProps {- stringTagKeys: string[];- numberTagKeys: string[];- boolTagKeys: string[];-}diff --git a/frontend/src/types/api/trace/getTagValue.ts b/frontend/src/types/api/trace/getTagValue.tsdeleted file mode 100644index 5a6af76fac..0000000000--- a/frontend/src/types/api/trace/getTagValue.ts+++ /dev/null@@ -1,18 +0,0 @@-import { GlobalReducer } from 'types/reducer/globalTime';-import { TraceReducer } from 'types/reducer/trace';--export interface Props {- start: GlobalReducer['minTime'];- end: GlobalReducer['maxTime'];- tagKey: {- Key: string;- Type: string;- };- spanKind?: TraceReducer['spanKind'];-}--export interface PayloadProps {- stringTagValues: string[];- numberTagValues: number[];- boolTagValues: boolean[];-}diff --git a/frontend/src/types/reducer/trace.ts b/frontend/src/types/reducer/trace.tsdeleted file mode 100644index ef10c8e4fb..0000000000--- a/frontend/src/types/reducer/trace.ts+++ /dev/null@@ -1,135 +0,0 @@-import { PayloadProps } from 'types/api/trace/getSpans';--export interface TraceReducer {- filter: Map<TraceFilterEnum, Record<string, string>>;- filterToFetchData: TraceFilterEnum[];- filterLoading: boolean;-- selectedFilter: Map<TraceFilterEnum, string[]>;- userSelectedFilter: Map<TraceFilterEnum, string[]>;-- isFilterExclude: Map<TraceFilterEnum, boolean>;- selectedTags: Tags[];- isTagModalOpen: boolean;- filterResponseSelected: Set<string>;- isTagModalError: boolean;- spansAggregate: {- loading: boolean;- currentPage: number;- data: SpansAggregateData[];- error: boolean;- total: number;- pageSize: number;- order: string;- orderParam: string;- };- selectedGroupBy: string;- selectedFunction: string;- spansGraph: {- loading: boolean;- error: boolean;- errorMessage: string;- payload: PayloadProps;- };- yAxisUnit: string | undefined;- filterDisplayValue: Map<TraceFilterEnum, number>;- spanKind?: string;-}--interface SpansAggregateData {- timestamp: string;- spanID: string;- traceID: string;- serviceName: string;- operation: string;- durationNano: number;- statusCode: string;- method: string;-}--export interface Tags {- Key: string;- Operator: OperatorValues;- StringValues: string[];- NumberValues: number[];- BoolValues: boolean[];-}--export type OperatorValues =- | 'NotIn'- | 'In'- | 'Equals'- | 'NotEquals'- | 'Contains'- | 'NotContains'- | 'GreaterThan'- | 'Exists'- | 'NotExists'- | 'LessThan'- | 'GreaterThanEquals'- | 'LessThanEquals'- | 'StartsWith'- | 'NotStartsWith';--export type TraceFilterEnum =- | 'duration'- | 'httpHost'- | 'httpMethod'- | 'httpRoute'- | 'httpUrl'- | 'operation'- | 'serviceName'- | 'status'- | 'responseStatusCode'- | 'rpcMethod'- | 'traceID';--export const AllPanelHeading: {- key: TraceFilterEnum;- displayValue: string;-}[] = [- {- key: 'duration',- displayValue: 'Duration',- },- {- key: 'httpHost',- displayValue: 'HTTP Host',- },- {- key: 'httpMethod',- displayValue: 'HTTP Method',- },- {- displayValue: 'HTTP Route',- key: 'httpRoute',- },- {- key: 'httpUrl',- displayValue: 'HTTP URL',- },- {- key: 'operation',- displayValue: 'Operation',- },- {- key: 'responseStatusCode',- displayValue: 'Status Code',- },- {- key: 'rpcMethod',- displayValue: 'RPC Method',- },- {- key: 'serviceName',- displayValue: 'Service Name',- },- {- key: 'status',- displayValue: 'Status',- },- {- key: 'traceID',- displayValue: 'Trace ID',- },-];diff --git a/frontend/src/types/styledComponents.ts b/frontend/src/types/styledComponents.tsnew file mode 100644index 0000000000..658ee6d088--- /dev/null+++ b/frontend/src/types/styledComponents.ts@@ -0,0 +1,8 @@+import type { DefaultTheme, ThemedCssFunction } from 'styled-components';++/** Return type accepted by styled-components interpolations: a `css` block, a plain string, or nothing. */+export type StyledCSS =+ | ReturnType<ThemedCssFunction<DefaultTheme>>+ | string+ | false+ | undefined;diff --git a/frontend/src/utils/permission/index.ts b/frontend/src/utils/permission/index.tsindex 814e9b09b1..2c3af90c70 100644--- a/frontend/src/utils/permission/index.ts+++ b/frontend/src/utils/permission/index.ts@@ -87,9 +87,7 @@ export const routePermission: Record<keyof typeof ROUTES, ROLES[]> = {SETTINGS: ['ADMIN', 'EDITOR', 'VIEWER'],SIGN_UP: ['ADMIN', 'EDITOR', 'VIEWER'],TRACES_EXPLORER: ['ADMIN', 'EDITOR', 'VIEWER'],- TRACE: ['ADMIN', 'EDITOR', 'VIEWER'],TRACE_DETAIL: ['ADMIN', 'EDITOR', 'VIEWER'],- TRACE_DETAIL_OLD: ['ADMIN', 'EDITOR', 'VIEWER'],// Every role must be able to land here - a role missing from this list is// redirected to /un-authorized and then redirected off it again, looping.UN_AUTHORIZED: ['ADMIN', 'EDITOR', 'VIEWER', 'ANONYMOUS', 'AUTHOR'],@@ -120,6 +118,7 @@ export const routePermission: Record<keyof typeof ROUTES, ROLES[]> = {TRACES_FUNNELS: ['ADMIN', 'EDITOR', 'VIEWER'],TRACES_FUNNELS_DETAIL: ['ADMIN', 'EDITOR', 'VIEWER'],LOGS_BASE: ['ADMIN', 'EDITOR', 'VIEWER'],+ TRACE_BASE: ['ADMIN', 'EDITOR', 'VIEWER'],OLD_LOGS_EXPLORER: ['ADMIN', 'EDITOR', 'VIEWER'],SHORTCUTS: ['ADMIN', 'EDITOR', 'VIEWER'],INTEGRATIONS: ['ADMIN', 'EDITOR', 'VIEWER'],@@ -168,9 +167,7 @@ export const routeWithInitialAuthZSupport = {MY_SETTINGS: true,SETTINGS: true,TRACES_EXPLORER: true,- TRACE: true,TRACE_DETAIL: true,- TRACE_DETAIL_OLD: true,LOGS: true,LOGS_EXPLORER: true,LIVE_LOGS: true,diff --git a/frontend/src/utils/timeUtils.ts b/frontend/src/utils/timeUtils.tsindex fe5906550d..14bbcdecbe 100644--- a/frontend/src/utils/timeUtils.ts+++ b/frontend/src/utils/timeUtils.ts@@ -329,3 +329,16 @@ export function formatAge(ms: number): string {}return `${seconds}s`;}++/**+ * Formats a nanosecond duration (as a string) as milliseconds with two+ * decimals, e.g. `'12345678' -> '12.35'`.+ */+export const getMs = (value: string): string =>+ parseFloat(+ dayjs+ .duration({+ milliseconds: parseInt(value, 10) / 1000000,+ })+ .format('SSS'),+ ).toFixed(2);diff --git a/frontend/src/container/TraceDetail/utils.ts b/frontend/src/utils/traceUtils.tssimilarity index 55%rename from frontend/src/container/TraceDetail/utils.tsrename to frontend/src/utils/traceUtils.tsindex 740f1859f4..afdbbb8c7e 100644--- a/frontend/src/container/TraceDetail/utils.ts+++ b/frontend/src/utils/traceUtils.ts@@ -1,26 +1,10 @@-/**- * string is present on the span or not- */-import { sortBy } from 'lodash-es';-import { ITraceTree, Span } from 'types/api/trace/getTraceItem';--export const filterSpansByString = (- searchString: string,- spans: Span[],-): Span[] =>- spans.filter((span) => {- const spanWithoutChildren = [...span].slice(0, 11);- return JSON.stringify(spanWithoutChildren).includes(searchString);- });--export const SPAN_DETAILS_LEFT_COL_WIDTH = 350;-type TTimeUnitName = 'ms' | 's' | 'm' | 'hr' | 'day' | 'week';export interface IIntervalUnit {name: TTimeUnitName;multiplier: number;}+export const INTERVAL_UNITS: IIntervalUnit[] = [{name: 'ms',@@ -48,11 +32,7 @@ export const INTERVAL_UNITS: IIntervalUnit[] = [},];-export const resolveTimeFromInterval = (- intervalTime: number,- intervalUnit: IIntervalUnit,-): number => intervalTime * intervalUnit.multiplier;-+/** Picks the largest unit in which a millisecond duration is >= 1. */export const convertTimeToRelevantUnit = (intervalTime: number,): { time: number; timeUnitName: TTimeUnitName } => {@@ -75,47 +55,7 @@ export const convertTimeToRelevantUnit = (return relevantTime;};-export const getSortedData = (treeData: ITraceTree): ITraceTree => {- const traverse = (treeNode: ITraceTree, level = 0): void => {- if (!treeNode) {- return;- }-- // need this rule to disable- treeNode.children = sortBy(treeNode.children, (e) => e.startTime);-- treeNode.children.forEach((childNode) => {- traverse(childNode, level + 1);- });- };- traverse(treeData, 1);-- return treeData;-};--export const getTreeLevelsCount = (tree: ITraceTree): number => {- if (!tree) {- return 0;- }-- let levels = 1;-- const traverse = (treeNode: ITraceTree, level: number): void => {- if (!treeNode) {- return;- }-- levels = Math.max(level, levels);-- treeNode.children.forEach((childNode) => {- traverse(childNode, level + 1);- });- };- traverse(tree, levels);-- return levels;-};-+/** Builds a `?a=1&b=2` query string, URI-encoding each value once. */export const formUrlParams = (params: Record<string, any>): string => {let urlParams = '';Object.entries(params).forEach(([key, value], index) => {