trace group opt, remove duplicate filter calls

Signed-off-by: Adam Tackett <[email protected]>
opensearch-project · Feb 28, 2025 · cab8e18 · cab8e18
1 parent 9989b22
commit cab8e18
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 775 deletions.
diff --git a/...ents/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap b/...ents/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap
@@ -222,21 +222,7 @@ exports[`Dashboard component renders dashboard 1`] = `
   }
   query=""
   setEndTime={[MockFunction]}
-  setFilters={
-    [MockFunction] {
-      "calls": Array [
-        Array [
-          Array [],
-        ],
-      ],
-      "results": Array [
-        Object {
-          "type": "return",
-          "value": undefined,
-        },
-      ],
-    }
-  }
+  setFilters={[MockFunction]}
   setQuery={[MockFunction]}
   setStartTime={[MockFunction]}
   startTime="now-5m"
@@ -617,21 +603,7 @@ exports[`Dashboard component renders dashboard 1`] = `
     }
     query=""
     setEndTime={[MockFunction]}
-    setFilters={
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [],
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": undefined,
-          },
-        ],
-      }
-    }
+    setFilters={[MockFunction]}
     setQuery={[MockFunction]}
     setStartTime={[MockFunction]}
     startTime="now-5m"
@@ -2870,21 +2842,7 @@ exports[`Dashboard component renders empty dashboard 1`] = `
   }
   query=""
   setEndTime={[MockFunction]}
-  setFilters={
-    [MockFunction] {
-      "calls": Array [
-        Array [
-          Array [],
-        ],
-      ],
-      "results": Array [
-        Object {
-          "type": "return",
-          "value": undefined,
-        },
-      ],
-    }
-  }
+  setFilters={[MockFunction]}
   setQuery={[MockFunction]}
   setStartTime={[MockFunction]}
   startTime="now-5m"
@@ -3264,21 +3222,7 @@ exports[`Dashboard component renders empty dashboard 1`] = `
     }
     query=""
     setEndTime={[MockFunction]}
-    setFilters={
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [],
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": undefined,
-          },
-        ],
-      }
-    }
+    setFilters={[MockFunction]}
     setQuery={[MockFunction]}
     setStartTime={[MockFunction]}
     startTime="now-5m"
@@ -5517,21 +5461,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
   }
   query=""
   setEndTime={[MockFunction]}
-  setFilters={
-    [MockFunction] {
-      "calls": Array [
-        Array [
-          Array [],
-        ],
-      ],
-      "results": Array [
-        Object {
-          "type": "return",
-          "value": undefined,
-        },
-      ],
-    }
-  }
+  setFilters={[MockFunction]}
   setQuery={[MockFunction]}
   setStartTime={[MockFunction]}
   startTime="now-5m"
@@ -5913,21 +5843,7 @@ exports[`Dashboard component renders empty jaeger dashboard 1`] = `
     }
     query=""
     setEndTime={[MockFunction]}
-    setFilters={
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [],
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": undefined,
-          },
-        ],
-      }
-    }
+    setFilters={[MockFunction]}
     setQuery={[MockFunction]}
     setStartTime={[MockFunction]}
     startTime="now-5m"

diff --git a/public/components/trace_analytics/components/dashboard/dashboard_content.tsx b/public/components/trace_analytics/components/dashboard/dashboard_content.tsx
@@ -17,7 +17,6 @@ import {
   handleJaegerDashboardRequest,
   handleJaegerErrorDashboardRequest,
 } from '../../requests/dashboard_request_handler';
-import { getValidFilterFields } from '../common/filters/filter_helpers';
 import { FilterType } from '../common/filters/filters';
 import {
   MissingConfigurationMessage,
@@ -53,7 +52,6 @@ export function DashboardContent(props: DashboardProps) {
     jaegerIndicesExist,
     toasts,
     dataSourceMDSId,
-    attributesFilterFields,
   } = props;
   const [tableItems, setTableItems] = useState([]);
   const [jaegerTableItems, setJaegerTableItems] = useState([]);
@@ -87,13 +85,6 @@ export function DashboardContent(props: DashboardProps) {
       chrome.setBreadcrumbs([parentBreadcrumb, ...childBreadcrumbs]);
     }
 
-    const validFilters = getValidFilterFields(mode, page, attributesFilterFields);
-    setFilters([
-      ...filters.map((filter) => ({
-        ...filter,
-        locked: validFilters.indexOf(filter.field) === -1,
-      })),
-    ]);
     setRedirect(false);
   }, []);