fix a few bugs with respect to refreshes and mode set via session sto… (

#197) (#238) * fix a few bugs with respect to refreshes and mode set via session storage Signed-off-by: Derek Ho <dxho@amazon.com> * fix tests related to the change Signed-off-by: Derek Ho <dxho@amazon.com> * pr fixes Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com> (cherry picked from commit 37421ba) Co-authored-by: Derek Ho <dxho@amazon.com>
opensearch-project · Feb 6, 2023 · 5532041 · 5532041
1 parent d2ca1b6
commit 5532041
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 18 deletions.
diff --git a/...onents/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap b/...onents/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap
@@ -1130,7 +1130,7 @@ exports[`Services component renders empty services page 1`] = `
       addFilter={[Function]}
       dataPrepperIndicesExist={true}
       items={Array []}
-      loading={false}
+      loading={true}
       mode="data_prepper"
       nameColumnAction={[Function]}
       setRedirect={[Function]}
@@ -2964,7 +2964,7 @@ exports[`Services component renders jaeger services page 1`] = `
       dataPrepperIndicesExist={false}
       items={Array []}
       jaegerIndicesExist={true}
-      loading={false}
+      loading={true}
       mode="jaeger"
       nameColumnAction={[Function]}
       setRedirect={[Function]}
@@ -4273,7 +4273,7 @@ exports[`Services component renders services page 1`] = `
       addFilter={[Function]}
       dataPrepperIndicesExist={true}
       items={Array []}
-      loading={false}
+      loading={true}
       mode="data_prepper"
       nameColumnAction={[Function]}
       setRedirect={[Function]}

diff --git a/public/components/trace_analytics/components/services/service_view.tsx b/public/components/trace_analytics/components/services/service_view.tsx
@@ -49,7 +49,9 @@ export function ServiceView(props: ServiceViewProps) {
   const refresh = () => {
     const DSL = filtersToDsl(mode, props.filters, props.query, processTimeStamp(props.startTime, mode), processTimeStamp(props.endTime, mode));
     handleServiceViewRequest(props.serviceName, props.http, DSL, setFields, mode);
-    handleServiceMapRequest(props.http, DSL, mode, setServiceMap, props.serviceName);
+    if (mode === 'data_prepper') {
+      handleServiceMapRequest(props.http, DSL, mode, setServiceMap, props.serviceName);
+    }
   };
 
   useEffect(() => {
@@ -233,11 +235,19 @@ export function ServiceView(props: ServiceViewProps) {
 
   useEffect(() => {
     const spanDSL = filtersToDsl(mode, props.filters, props.query, processTimeStamp(props.startTime, mode), processTimeStamp(props.endTime, mode));
-    spanDSL.query.bool.must.push({
-      term: {
-        "process.serviceName": props.serviceName,
-      },
-    });
+    if (mode === 'data_prepper') {
+      spanDSL.query.bool.must.push({
+        term: {
+          "serviceName": props.serviceName,
+        },
+      });
+    } else if (mode === 'jaeger') {
+      spanDSL.query.bool.must.push({
+        term: {
+          "process.serviceName": props.serviceName,
+        },
+      });
+    }
     spanFilters.map(({ field, value }) => {
       if (value != null) {
         spanDSL.query.bool.must.push({

diff --git a/public/components/trace_analytics/components/services/services_content.tsx b/public/components/trace_analytics/components/services/services_content.tsx
@@ -72,7 +72,7 @@ export function ServicesContent(props: ServicesProps) {
     }
     setFilteredService(newFilteredService);
     if (!redirect && ((mode === 'data_prepper' && dataPrepperIndicesExist) || (mode === 'jaeger' && jaegerIndicesExist))) refresh(newFilteredService);
-  }, [filters, appConfigs]);
+  }, [filters, appConfigs, redirect, mode, jaegerIndicesExist, dataPrepperIndicesExist]);
 
   const refresh = async (currService?: string) => {
     setLoading(true);

diff --git a/...components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap b/...components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap
@@ -1127,7 +1127,7 @@ exports[`Traces component renders empty traces page 1`] = `
     <TracesTable
       dataPrepperIndicesExist={true}
       items={Array []}
-      loading={false}
+      loading={true}
       mode="data_prepper"
       refresh={[Function]}
       traceIdColumnAction={[Function]}
@@ -2427,7 +2427,7 @@ exports[`Traces component renders jaeger traces page 1`] = `
       dataPrepperIndicesExist={false}
       items={Array []}
       jaegerIndicesExist={true}
-      loading={false}
+      loading={true}
       mode="jaeger"
       refresh={[Function]}
       traceIdColumnAction={[Function]}
@@ -3724,7 +3724,7 @@ exports[`Traces component renders traces page 1`] = `
     <TracesTable
       dataPrepperIndicesExist={true}
       items={Array []}
-      loading={false}
+      loading={true}
       mode="data_prepper"
       refresh={[Function]}
       traceIdColumnAction={[Function]}

diff --git a/public/components/trace_analytics/components/traces/traces_content.tsx b/public/components/trace_analytics/components/traces/traces_content.tsx
@@ -52,7 +52,7 @@ export function TracesContent(props: TracesProps) {
 
   useEffect(() => {
     if (!redirect && ((mode === 'data_prepper' && dataPrepperIndicesExist) || (mode === 'jaeger' && jaegerIndicesExist))) refresh();
-  }, [filters, appConfigs]);
+  }, [filters, appConfigs, redirect, mode, dataPrepperIndicesExist, jaegerIndicesExist]);
 
   const refresh = async (sort?: PropertySort) => {
     setLoading(true);

diff --git a/public/components/trace_analytics/home.tsx b/public/components/trace_analytics/home.tsx
@@ -92,10 +92,12 @@ export const Home = (props: HomeProps) => {
   ];
 
   useEffect(() => {
-    if (dataPrepperIndicesExist) {
-      setMode('data_prepper');
-    } else if (jaegerIndicesExist) {
-      setMode('jaeger');
+    if (!sessionStorage.getItem('TraceAnalyticsMode')){
+      if (dataPrepperIndicesExist) {
+        setMode('data_prepper');
+      } else if (jaegerIndicesExist) {
+        setMode('jaeger');
+      }
     }
   }, [jaegerIndicesExist, dataPrepperIndicesExist]);