Fix for app analytics crash (#1255)

* fix for app analytics crash Signed-off-by: Eric Wei <[email protected]> * updated snapshots Signed-off-by: Eric Wei <[email protected]> * fix saved object issue and remove config options not in release Signed-off-by: Eric Wei <[email protected]> * update snapshots Signed-off-by: Eric Wei <[email protected]> Signed-off-by: Eric Wei <[email protected]>
opensearch-project · Nov 4, 2022 · 0bee8e7 · 0bee8e7
1 parent 915fcc9
commit 0bee8e7
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 1,005 deletions.
diff --git a/dashboards-observability/common/types/explorer.ts b/dashboards-observability/common/types/explorer.ts
@@ -139,7 +139,7 @@ export interface IExplorerProps {
   appBaseQuery?: string;
   callback?: any;
   callbackInApp?: any;
-  queryManager: QueryManager;
+  queryManager?: QueryManager;
 }
 
 export interface SavedQuery {

diff --git a/...ility/public/components/custom_panels/helpers/__tests__/__snapshots__/utils.test.tsx.snap b/...ility/public/components/custom_panels/helpers/__tests__/__snapshots__/utils.test.tsx.snap
@@ -402,13 +402,6 @@ exports[`Utils helper functions renders displayVisualization function 1`] = `
                       },
                     ],
                   },
-                  Object {
-                    "editor": [Function],
-                    "id": "color-theme",
-                    "mapTo": "colorTheme",
-                    "name": "Color theme",
-                    "schemas": Array [],
-                  },
                 ],
               },
               Object {
@@ -864,13 +857,6 @@ exports[`Utils helper functions renders displayVisualization function 1`] = `
                         },
                       ],
                     },
-                    Object {
-                      "editor": [Function],
-                      "id": "color-theme",
-                      "mapTo": "colorTheme",
-                      "name": "Color theme",
-                      "schemas": Array [],
-                    },
                   ],
                 },
                 Object {
@@ -1333,13 +1319,6 @@ exports[`Utils helper functions renders displayVisualization function 1`] = `
                           },
                         ],
                       },
-                      Object {
-                        "editor": [Function],
-                        "id": "color-theme",
-                        "mapTo": "colorTheme",
-                        "name": "Color theme",
-                        "schemas": Array [],
-                      },
                     ],
                   },
                   Object {
@@ -2027,13 +2006,6 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
                       },
                     ],
                   },
-                  Object {
-                    "editor": [Function],
-                    "id": "color-theme",
-                    "mapTo": "colorTheme",
-                    "name": "Color theme",
-                    "schemas": Array [],
-                  },
                   Object {
                     "defaultState": Array [],
                     "editor": [Function],
@@ -2557,13 +2529,6 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
                         },
                       ],
                     },
-                    Object {
-                      "editor": [Function],
-                      "id": "color-theme",
-                      "mapTo": "colorTheme",
-                      "name": "Color theme",
-                      "schemas": Array [],
-                    },
                     Object {
                       "defaultState": Array [],
                       "editor": [Function],
@@ -3101,13 +3066,6 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
                           },
                         ],
                       },
-                      Object {
-                        "editor": [Function],
-                        "id": "color-theme",
-                        "mapTo": "colorTheme",
-                        "name": "Color theme",
-                        "schemas": Array [],
-                      },
                       Object {
                         "defaultState": Array [],
                         "editor": [Function],
@@ -3796,13 +3754,6 @@ exports[`Utils helper functions renders displayVisualization function 3`] = `
                       },
                     ],
                   },
-                  Object {
-                    "editor": [Function],
-                    "id": "color-theme",
-                    "mapTo": "colorTheme",
-                    "name": "Color theme",
-                    "schemas": Array [],
-                  },
                 ],
               },
               Object {
@@ -4258,13 +4209,6 @@ exports[`Utils helper functions renders displayVisualization function 3`] = `
                         },
                       ],
                     },
-                    Object {
-                      "editor": [Function],
-                      "id": "color-theme",
-                      "mapTo": "colorTheme",
-                      "name": "Color theme",
-                      "schemas": Array [],
-                    },
                   ],
                 },
                 Object {
@@ -4727,13 +4671,6 @@ exports[`Utils helper functions renders displayVisualization function 3`] = `
                           },
                         ],
                       },
-                      Object {
-                        "editor": [Function],
-                        "id": "color-theme",
-                        "mapTo": "colorTheme",
-                        "name": "Color theme",
-                        "schemas": Array [],
-                      },
                     ],
                   },
                   Object {

diff --git a/dashboards-observability/public/components/event_analytics/explorer/explorer.tsx b/dashboards-observability/public/components/event_analytics/explorer/explorer.tsx
@@ -104,6 +104,7 @@ import { Sidebar } from './sidebar';
 import { TimechartHeader } from './timechart_header';
 import { ExplorerVisualizations } from './visualizations';
 import { CountDistribution } from './visualizations/count_distribution';
+import { QueryManager } from '../../../../common/query_manager';
 
 const TYPE_TAB_MAPPING = {
   [SAVED_QUERY]: TAB_EVENT_ID,
@@ -132,7 +133,7 @@ export const Explorer = ({
   setEndTime,
   callback,
   callbackInApp,
-  queryManager,
+  queryManager = new QueryManager(),
 }: IExplorerProps) => {
   const dispatch = useDispatch();
   const requestParams = { tabId };
@@ -182,8 +183,6 @@ export const Explorer = ({
   const [liveTimestamp, setLiveTimestamp] = useState(DATE_PICKER_FORMAT);
   const [triggerAvailability, setTriggerAvailability] = useState(false);
   const [viewLogPatterns, setViewLogPatterns] = useState(false);
-  const [isValidDataConfigOptionSelected, setIsValidDataConfigOptionSelected] =
-    useState<boolean>(false);
   const [spanValue, setSpanValue] = useState(false);
   const [subType, setSubType] = useState('visualization');
   const [metricMeasure, setMetricMeasure] = useState('');
@@ -309,8 +308,9 @@ export const Explorer = ({
           // fill saved user configs
           if (objectData?.type) {
             let visConfig = {};
-            if (!isEmpty(objectData.user_configs) && !isEmpty(objectData.user_configs.series)) {
-              visConfig = JSON.parse(objectData.user_configs);
+            const customConfig = objectData.user_configs ? JSON.parse(objectData.user_configs) : {};
+            if (!isEmpty(customConfig.dataConfig) && !isEmpty(customConfig.dataConfig?.series)) {
+              visConfig = { ...customConfig };
             } else {
               const statsTokens = queryManager.queryParser().parse(objectData.query).getStats();
               visConfig = { dataConfig: { ...getDefaultVisConfig(statsTokens) } };
@@ -1350,7 +1350,7 @@ export const Explorer = ({
     delayTime: number
   ) => {
     setLiveTailName(name);
-    setLiveTailTabId(curSelectedTabId.current as unknown as string);
+    setLiveTailTabId((curSelectedTabId.current as unknown) as string);
     setIsLiveTailOn(true);
     setToast('Live tail On', 'success');
     setIsLiveTailPopoverOpen(false);