Merge pull request #965 from palash-signoz/trace-filter-fix-incoming-from-metrics-page

Bug: Trace filter fix incoming from metrics page

frontend/src/container/MetricsApplication/Tabs/Application.tsx

@@ -36,7 +36,7 @@ function Application({ getWidget }: DashboardProps): JSX.Element {
 		history.replace(
 			`${
 				ROUTES.TRACE
-			}?${urlParams.toString()}&selected={"serviceName":["${servicename}"],"status":["ok","error"]}&filterToFetchData=["duration","status","serviceName"]&userSelectedFilter={"status":["error","ok"],"serviceName":["${servicename}"]}&isSelectedFilterSkipped=true`,
+			}?${urlParams.toString()}&selected={"serviceName":["${servicename}"]}&filterToFetchData=["duration","status","serviceName"]&spanAggregateCurrentPage=1&selectedTags=[]&&isFilterExclude={"serviceName":false}&userSelectedFilter={"status":["error","ok"],"serviceName":["${servicename}"]}&spanAggregateCurrentPage=1&spanAggregateOrder=ascend`,
 		);
 	};
 
@@ -88,7 +88,7 @@ function Application({ getWidget }: DashboardProps): JSX.Element {
 		history.replace(
 			`${
 				ROUTES.TRACE
-			}?${urlParams.toString()}&selected={"serviceName":["${servicename}"],"status":["error"]}&filterToFetchData=["duration","status","serviceName"]&userSelectedFilter={"status":["error"],"serviceName":["${servicename}"]}&isSelectedFilterSkipped=true`,
+			}?${urlParams.toString()}?selected={"serviceName":["${servicename}"],"status":["error"]}&filterToFetchData=["duration","status","serviceName"]&spanAggregateCurrentPage=1&selectedTags=[]&isFilterExclude={"serviceName":false,"status":false}&userSelectedFilter={"serviceName":["${servicename}"],"status":["error"]}&spanAggregateCurrentPage=1&spanAggregateOrder=ascend`,
 		);
 	};
 

frontend/src/container/MetricsApplication/TopEndpointsTable.tsx

@@ -33,7 +33,7 @@ function TopEndpointsTable(props: TopEndpointsTableProps): JSX.Element {
 		history.push(
 			`${
 				ROUTES.TRACE
-			}?${urlParams.toString()}&selected={"status":["error","ok"],"serviceName":["${servicename}"],"operation":["${operation}"]}&filterToFetchData=["duration","status","serviceName","operation"]&isSelectedFilterSkipped=true&userSelectedFilter={"status":["error","ok"],"serviceName":["${servicename}"],"operation":["${operation}"]}&isSelectedFilterSkipped=true`,
+			}?${urlParams.toString()}&selected={"serviceName":["${servicename}"],"operation":["${operation}"]}&filterToFetchData=["duration","status","serviceName","operation"]&spanAggregateCurrentPage=1&selectedTags=[]&&isFilterExclude={"serviceName":false,"operation":false}&userSelectedFilter={"status":["error","ok"],"serviceName":["${servicename}"],"operation":["${operation}"]}&spanAggregateCurrentPage=1&spanAggregateOrder=ascend`,
 		);
 	};
 

frontend/src/container/Trace/Filters/Panel/PanelBody/Common/Checkbox.tsx

@@ -130,7 +130,6 @@ function CheckBoxComponent(props: CheckBoxProps): JSX.Element {
 					filterToFetchData,
 					spansAggregate.currentPage,
 					selectedTags,
-					updatedFilter,
 					preIsFilterExclude,
 					preUserSelectedMap,
 					spansAggregate.order,

frontend/src/container/Trace/Filters/Panel/PanelBody/Duration/index.tsx

@@ -126,7 +126,6 @@ function Duration(): JSX.Element {
 				filterToFetchData,
 				spansAggregate.currentPage,
 				selectedTags,
-				preFilter,
 				isFilterExclude,
 				userSelectedFilter,
 				spansAggregate.order,

frontend/src/container/Trace/Filters/Panel/PanelHeading/index.tsx

@@ -110,7 +110,6 @@ function PanelHeading(props: PanelHeadingProps): JSX.Element {
 					updatedFilterData,
 					spansAggregate.currentPage,
 					selectedTags,
-					updatedFilter,
 					isFilterExclude,
 					getPreUserSelected,
 					spansAggregate.order,
@@ -139,7 +138,7 @@ function PanelHeading(props: PanelHeadingProps): JSX.Element {
 			...filterToFetchData.filter((name) => name !== PanelName),
 		];
 
-		preSelectedFilter.delete(PanelName);
+		// preSelectedFilter.delete(PanelName);
 
 		dispatch({
 			type: UPDATE_ALL_FILTERS,
@@ -160,7 +159,6 @@ function PanelHeading(props: PanelHeadingProps): JSX.Element {
 			preFilterToFetchTheData,
 			spansAggregate.currentPage,
 			selectedTags,
-			filter,
 			isFilterExclude,
 			userSelectedFilter,
 			spansAggregate.order,
@@ -210,7 +208,6 @@ function PanelHeading(props: PanelHeadingProps): JSX.Element {
 					filterToFetchData,
 					spansAggregate.currentPage,
 					selectedTags,
-					getUpdatedFilter,
 					postIsFilterExclude,
 					preUserSelected,
 					spansAggregate.order,

frontend/src/container/Trace/Search/index.tsx

@@ -104,7 +104,6 @@ function Search({
 			traces.filterToFetchData,
 			traces.spansAggregate.currentPage,
 			selectedTags,
-			traces.filter,
 			traces.isFilterExclude,
 			traces.userSelectedFilter,
 			traces.spansAggregate.order,

frontend/src/container/Trace/TraceTable/index.tsx

@@ -151,7 +151,6 @@ function TraceTable(): JSX.Element {
 					filterToFetchData,
 					props.current,
 					selectedTags,
-					filter,
 					isFilterExclude,
 					userSelectedFilter,
 					spanOrder,

frontend/src/store/actions/trace/getInitialSpansAggregate.ts

@@ -82,7 +82,6 @@ export const GetSpansAggregate = (
 					traces.filterToFetchData,
 					props.current,
 					traces.selectedTags,
-					traces.filter,
 					traces.isFilterExclude,
 					traces.userSelectedFilter,
 					order,

frontend/src/store/actions/trace/selectTraceFilter.ts

@@ -44,7 +44,6 @@ export const SelectedTraceFilter = (props: {
 			traces.filterToFetchData,
 			traces.spansAggregate.currentPage,
 			traces.selectedTags,
-			traces.filter,
 			traces.isFilterExclude,
 			traces.userSelectedFilter,
 			traces.spansAggregate.order,

frontend/src/store/actions/trace/util.ts

@@ -20,7 +20,6 @@ export const updateURL = (
 	filterToFetchData: TraceReducer['filterToFetchData'],
 	spanAggregateCurrentPage: TraceReducer['spansAggregate']['currentPage'],
 	selectedTags: TraceReducer['selectedTags'],
-	filter: TraceReducer['filter'],
 	isFilterExclude: TraceReducer['isFilterExclude'],
 	userSelectedFilter: TraceReducer['userSelectedFilter'],
 	spanAggregateOrder: TraceReducer['spansAggregate']['order'],
@@ -55,7 +54,7 @@ export const updateURL = (
 			filterToFetchData,
 		)}&spanAggregateCurrentPage=${spanAggregateCurrentPage}&selectedTags=${JSON.stringify(
 			selectedTags,
-		)}&filter=${JSON.stringify(Object.fromEntries(filter))}&${preResult
+		)}&${preResult
 			.map((e) => `${e.key}=${e.value}`)
 			.join('&')}&isFilterExclude=${JSON.stringify(
 			Object.fromEntries(isFilterExclude),