Merge branch 'main' into main

Signed-off-by: Anan Zhuang <ananzh@amazon.com>
opensearch-project · Oct 4, 2023 · 037faa0 · 037faa0
2 parents 6511b95 + c70125f
commit 037faa0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -63,6 +63,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [Data Explorer][Discover] Automatically load solo added default index pattern ([#5171](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5171))
 - [Data Explorer][Discover] Allow data grid to auto adjust size based on fetched data count ([#5191](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5191))
 - [BUG] Fix wrong test due to time conversion ([#5174](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5174))
+- [BUG][Data Explorer][Discover] Allow filter and query persist when refresh page or paste url to a new tab ([#5206](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5206))
 
 ### 🚞 Infrastructure
 

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
@@ -16,15 +16,14 @@ import {
   useDispatch,
   useSelector,
 } from '../../utils/state_management';
-import { useSearch } from '../utils/use_search';
 import { IndexPatternField, opensearchFilters } from '../../../../../data/public';
 import { DocViewFilterFn } from '../../doc_views/doc_views_types';
 import { SortOrder } from '../../../saved_searches/types';
 import { DOC_HIDE_TIME_COLUMN_SETTING } from '../../../../common';
 import { OpenSearchSearchHit } from '../../doc_views/doc_views_types';
 
 interface Props {
-  rows: OpenSearchSearchHit[];
+  rows?: OpenSearchSearchHit[];
 }
 
 export const DiscoverTable = ({ rows }: Props) => {

diff --git a/src/plugins/discover/public/application/view_components/canvas/index.tsx b/src/plugins/discover/public/application/view_components/canvas/index.tsx
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useEffect, useState, useRef, useCallback, useMemo } from 'react';
+import React, { useEffect, useState, useRef, useCallback } from 'react';
 import { EuiPanel } from '@elastic/eui';
 import { TopNav } from './top_nav';
 import { ViewProps } from '../../../../../data_explorer/public';
@@ -89,9 +89,6 @@ export default function DiscoverCanvas({ setHeaderActionMenu, history }: ViewPro
 
   const timeField = indexPattern?.timeFieldName ? indexPattern.timeFieldName : undefined;
 
-  const MemoizedDiscoverTable = React.memo(DiscoverTable);
-  const MemoizedDiscoverChartContainer = React.memo(DiscoverChartContainer);
-
   return (
     <EuiPanel
       hasBorder={false}
@@ -126,3 +123,6 @@ export default function DiscoverCanvas({ setHeaderActionMenu, history }: ViewPro
     </EuiPanel>
   );
 }
+
+const MemoizedDiscoverTable = React.memo(DiscoverTable);
+const MemoizedDiscoverChartContainer = React.memo(DiscoverChartContainer);
diff --git a/src/plugins/discover/public/application/view_components/canvas/top_nav.tsx b/src/plugins/discover/public/application/view_components/canvas/top_nav.tsx
@@ -13,6 +13,7 @@ import { IndexPattern } from '../../../opensearch_dashboards_services';
 import { getTopNavLinks } from '../../components/top_nav/get_top_nav_links';
 import { useDiscoverContext } from '../context';
 import { getRootBreadcrumbs } from '../../helpers/breadcrumbs';
+import { opensearchFilters, connectStorageToQueryState } from '../../../../../data/public';
 
 export interface TopNavProps {
   opts: {
@@ -35,10 +36,16 @@ export const TopNav = ({ opts }: TopNavProps) => {
     },
     data,
     chrome,
+    osdUrlStateStorage,
   } = services;
 
   const topNavLinks = savedSearch ? getTopNavLinks(services, inspectorAdapters, savedSearch) : [];
 
+  connectStorageToQueryState(services.data.query, osdUrlStateStorage, {
+    filters: opensearchFilters.FilterStateStore.APP_STATE,
+    query: true,
+  });
+
   useEffect(() => {
     let isMounted = true;
     const getDefaultIndexPattern = async () => {

diff --git a/src/plugins/discover/public/application/view_components/context/index.tsx b/src/plugins/discover/public/application/view_components/context/index.tsx
@@ -3,15 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useEffect } from 'react';
+import React from 'react';
 import { DataExplorerServices, ViewProps } from '../../../../../data_explorer/public';
 import {
   OpenSearchDashboardsContextProvider,
   useOpenSearchDashboards,
 } from '../../../../../opensearch_dashboards_react/public';
 import { getServices } from '../../../opensearch_dashboards_services';
 import { useSearch, SearchContextValue } from '../utils/use_search';
-import { connectStorageToQueryState, opensearchFilters } from '../../../../../data/public';
 
 const SearchContext = React.createContext<SearchContextValue>({} as SearchContextValue);
 
@@ -24,16 +23,6 @@ export default function DiscoverContext({ children }: React.PropsWithChildren<Vi
     ...services,
   });
 
-  const { osdUrlStateStorage } = deServices;
-
-  // Connect the query service to the url state
-  useEffect(() => {
-    connectStorageToQueryState(services.data.query, osdUrlStateStorage, {
-      filters: opensearchFilters.FilterStateStore.APP_STATE,
-      query: true,
-    });
-  }, [osdUrlStateStorage, services.data.query, services.uiSettings]);
-
   return (
     <OpenSearchDashboardsContextProvider services={services}>
       <SearchContext.Provider value={searchParams}>{children}</SearchContext.Provider>