fix PR comments

Signed-off-by: ananzh <[email protected]>
ananzh · Oct 3, 2023 · 9a6b86c · 9a6b86c
1 parent 88c658e
commit 9a6b86c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/src/plugins/discover/public/application/view_components/canvas/discover_table.tsx b/src/plugins/discover/public/application/view_components/canvas/discover_table.tsx
@@ -34,9 +34,8 @@ export const DiscoverTable = ({ history }: Props) => {
     data: {
       query: { filterManager },
     },
-    store,
   } = services;
-  const { data$, refetch$, indexPattern } = useDiscoverContext();
+  const { data$, refetch$, indexPattern, savedSearch } = useDiscoverContext();
   const [fetchState, setFetchState] = useState<SearchData>({
     status: data$.getValue().status,
     rows: [],
@@ -72,7 +71,6 @@ export const DiscoverTable = ({ history }: Props) => {
   );
 
   const { rows } = fetchState || {};
-  const { savedSearch } = useSearch(services, store);
 
   useEffect(() => {
     const subscription = data$.subscribe((next) => {

diff --git a/src/plugins/discover/public/application/view_components/context/index.tsx b/src/plugins/discover/public/application/view_components/context/index.tsx
@@ -5,7 +5,6 @@
 
 import React, { useEffect } from 'react';
 import { DataExplorerServices, ViewProps } from '../../../../../data_explorer/public';
-import { DiscoverViewServices } from '../../../build_services';
 import {
   OpenSearchDashboardsContextProvider,
   useOpenSearchDashboards,
@@ -20,13 +19,10 @@ const SearchContext = React.createContext<SearchContextValue>({} as SearchContex
 export default function DiscoverContext({ children }: React.PropsWithChildren<ViewProps>) {
   const { services: deServices } = useOpenSearchDashboards<DataExplorerServices>();
   const services = getServices();
-  const searchParams = useSearch(
-    {
-      ...deServices,
-      ...services,
-    },
-    store
-  );
+  const searchParams = useSearch({
+    ...deServices,
+    ...services,
+  });
 
   const { osdUrlStateStorage } = deServices;
 

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
@@ -33,16 +33,6 @@ export const useIndexPattern = (services: DiscoverServices, store: StoreType) =>
     let isMounted = true;
 
     const fetchIndexPatternDetails = (id: string) => {
-      const indexPatternMissingWarning = i18n.translate(
-        'discover.valueIsNotConfiguredIndexPatternIDWarningTitle',
-        {
-          defaultMessage: '{id} is not a configured index pattern ID',
-          values: {
-            id: `"${id}"`,
-          },
-        }
-      );
-
       data.indexPatterns
         .get(id)
         .then((result) => {
@@ -52,6 +42,15 @@ export const useIndexPattern = (services: DiscoverServices, store: StoreType) =>
         })
         .catch(() => {
           if (isMounted) {
+            const indexPatternMissingWarning = i18n.translate(
+              'discover.valueIsNotConfiguredIndexPatternIDWarningTitle',
+              {
+                defaultMessage: '{id} is not a configured index pattern ID',
+                values: {
+                  id: `"${id}"`,
+                },
+              }
+            );
             toastNotifications.addDanger({
               title: indexPatternMissingWarning,
             });

diff --git a/src/plugins/discover/public/application/view_components/utils/use_search.ts b/src/plugins/discover/public/application/view_components/utils/use_search.ts
@@ -66,12 +66,12 @@ export type RefetchSubject = Subject<SearchRefetch>;
  * return () => subscription.unsubscribe();
  * }, [data$]);
  */
-export const useSearch = (services: DiscoverViewServices, store: StoreType) => {
+export const useSearch = (services: DiscoverViewServices) => {
   const initalSearchComplete = useRef(false);
   const [savedSearch, setSavedSearch] = useState<SavedSearch | undefined>(undefined);
   const { savedSearch: savedSearchId, sort, interval } = useSelector((state) => state.discover);
+  const { data, filterManager, getSavedSearchById, core, toastNotifications, store } = services;
   const indexPattern = useIndexPattern(services, store);
-  const { data, filterManager, getSavedSearchById, core, toastNotifications } = services;
   const timefilter = data.query.timefilter.timefilter;
   const fetchStateRef = useRef<{
     abortController: AbortController | undefined;