render hell

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
Qxisylolo · Jul 26, 2024 · fef6156 · fef6156
1 parent 0964ec9
commit fef6156
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 46 deletions.
diff --git a/src/plugins/data/public/query/dataset_manager/dataset_manager.ts b/src/plugins/data/public/query/dataset_manager/dataset_manager.ts
@@ -5,6 +5,7 @@
 
 import { BehaviorSubject } from 'rxjs';
 import { CoreStart } from 'opensearch-dashboards/public';
+import { skip } from 'rxjs/operators';
 import {
   SIMPLE_DATA_SET_TYPES,
   SimpleDataSet,
@@ -29,7 +30,7 @@ export class DataSetManager {
   };
 
   public getUpdates$ = () => {
-    return this.dataSet$.asObservable();
+    return this.dataSet$.asObservable().pipe(skip(1));
   };
 
   public getDataSet = () => {

diff --git a/src/plugins/data/public/ui/dataset_navigator/dataset_navigator.tsx b/src/plugins/data/public/ui/dataset_navigator/dataset_navigator.tsx
@@ -187,8 +187,6 @@ export const DataSetNavigator = (props: DataSetNavigatorProps) => {
         type: selectedDataSet.type,
       });
 
-      setSelectedDataSetState(selectedDataSet);
-
       closePopover();
     },
     [
@@ -246,13 +244,12 @@ export const DataSetNavigator = (props: DataSetNavigatorProps) => {
       setNavigatorState((prevState) => ({ ...prevState, isMounted: false }));
     };
   }, [
-    savedObjectsClient,
-    http,
-    navigatorState.isMounted,
     dataSet,
     dataSetManager,
+    http,
     indexPatternsService,
-    handleSelectedDataSet,
+    navigatorState.isMounted,
+    savedObjectsClient,
   ]);
 
   useEffect(() => {
@@ -689,9 +686,7 @@ export const DataSetNavigator = (props: DataSetNavigatorProps) => {
             id: 7,
             title: navigatorState.currentDataSet?.title,
             content:
-              navigatorState.isLoading ||
-              !navigatorState.currentDataSet ||
-              !navigatorState.currentDataSet?.title ? (
+              !navigatorState.currentDataSet || !navigatorState.currentDataSet?.title ? (
                 <div>{createLoadingSpinner()}</div>
               ) : (
                 <EuiForm className="dataSetNavigatorFormWrapper">

diff --git a/src/plugins/discover/public/application/view_components/utils/use_index_pattern.ts b/src/plugins/discover/public/application/view_components/utils/use_index_pattern.ts
@@ -5,7 +5,7 @@
 
 import { useCallback, useEffect, useState } from 'react';
 import { i18n } from '@osd/i18n';
-import { SIMPLE_DATA_SET_TYPES, SimpleDataSet } from '../../../../../data/common';
+import { SIMPLE_DATA_SET_TYPES } from '../../../../../data/common';
 import { IndexPattern } from '../../../../../data/public';
 import { useSelector, updateIndexPattern } from '../../utils/state_management';
 import { DiscoverViewServices } from '../../../build_services';
@@ -35,35 +35,6 @@ export const useIndexPattern = (services: DiscoverViewServices) => {
   const indexPatternIdFromState = useSelector((state) => state.metadata.indexPattern);
   const [indexPattern, setIndexPattern] = useState<IndexPattern | undefined>(undefined);
   const isQueryEnhancementEnabled = uiSettings.get(QUERY_ENHANCEMENT_ENABLED_SETTING);
-  const [isLoaded, setIsLoaded] = useState(false);
-
-  const fetchFromState = useCallback(
-    async (dataset: SimpleDataSet) => {
-      const temporaryIndexPatternID = dataset.id ?? `${dataset.dataSourceRef?.id}.${dataset.title}`;
-      const temporaryIndexPattern = await data.indexPatterns.create(
-        {
-          id: temporaryIndexPatternID,
-          title: dataset.title,
-          timeFieldName: dataset.timeFieldName,
-          type: dataset.type,
-          ...(dataset.dataSourceRef
-            ? {
-                dataSourceRef: {
-                  id: dataset.dataSourceRef.id ?? dataset.dataSourceRef.name,
-                  name: dataset.dataSourceRef.name,
-                  type: dataset.type!,
-                },
-              }
-            : {}),
-        },
-        true
-      );
-      data.indexPatterns.saveToCache(temporaryIndexPatternID, temporaryIndexPattern);
-
-      return temporaryIndexPattern;
-    },
-    [data.indexPatterns]
-  );
 
   const fetchIndexPatternDetails = useCallback(
     async (id: string) => {
@@ -79,15 +50,10 @@ export const useIndexPattern = (services: DiscoverViewServices) => {
           fetchIndexPatternDetails(dataSet.id).then((ip) => {
             setIndexPattern(ip);
           });
-        } else if (!isLoaded) {
-          fetchFromState(dataSet).then((ip) => {
-            setIsLoaded(true);
-            setIndexPattern(ip);
-          });
         }
       }
     }
-  }, [dataSet, fetchFromState, fetchIndexPatternDetails, isLoaded, isQueryEnhancementEnabled]);
+  }, [dataSet, fetchIndexPatternDetails, isQueryEnhancementEnabled]);
 
   useEffect(() => {
     let isMounted = true;