Fix Filter Manager Bugs in Saved Search

Signed-off-by: Suchit Sahoo <[email protected]>

src/plugins/discover/public/application/components/top_nav/get_top_nav_links.tsx

@@ -54,6 +54,7 @@ const getLegacyTopNavLinks = (
       defaultMessage: 'New Search',
     }),
     run() {
+      query.filterManager.setFilters([]); // resetting the filters while we are loading a new search
       core.application.navigateToApp('discover', {
         path: '#/',
       });
@@ -305,6 +306,7 @@ export const getTopNavLinks = (
       defaultMessage: 'New',
     }),
     run() {
+      query.filterManager.setFilters([]); // resetting the filters while we are loading a new search
       core.application.navigateToApp('discover', {
         path: '#/',
       });

src/plugins/discover/public/application/components/top_nav/open_search_panel.tsx

@@ -92,6 +92,7 @@ export function OpenSearchPanel({ onClose, makeUrl }: Props) {
             },
           ]}
           onChoose={(id) => {
+            data.query.filterManager.setFilters([]); // resetting the filters
             application.navigateToApp('discover', { path: `#/view/${id}` });
             onClose();
           }}

src/plugins/discover/public/application/utils/state_management/discover_slice.tsx

@@ -94,20 +94,13 @@ export const getPreloadedState = async ({
       const indexPatternId = savedSearchInstance.searchSource.getField('index')?.id;
 
       // If the query enhancement is enabled don't add the indexpattern id to the root since they will be migrated into the _q state
-      if (config.get(QUERY_ENHANCEMENT_ENABLED_SETTING)) {
-        preloadedState.root = {
-          metadata: {
-            view: PLUGIN_ID,
-          },
-        };
-      } else {
-        preloadedState.root = {
-          metadata: {
-            indexPattern: indexPatternId,
-            view: PLUGIN_ID,
-          },
-        };
-      }
+      preloadedState.root = {
+        metadata: {
+          ...(indexPatternId &&
+            !config.get(QUERY_ENHANCEMENT_ENABLED_SETTING) && { indexPattern: indexPatternId }),
+          view: PLUGIN_ID,
+        },
+      };
 
       savedSearchInstance.destroy(); // this instance is no longer needed, will create another one later
     }

src/plugins/discover/public/application/view_components/utils/use_search.ts

@@ -12,7 +12,7 @@ import { cloneDeep, isEqual } from 'lodash';
 import { useLocation } from 'react-router-dom';
 import { RequestAdapter } from '../../../../../inspector/public';
 import { DiscoverViewServices } from '../../../build_services';
-import { search } from '../../../../../data/public';
+import { QueryState, search } from '../../../../../data/public';
 import { validateTimeRange } from '../../helpers/validate_time_range';
 import { updateSearchSource } from './update_search_source';
 import { useIndexPattern } from './use_index_pattern';
@@ -331,19 +331,23 @@ export const useSearch = (services: DiscoverViewServices) => {
   useEffect(() => {
     (async () => {
       const savedSearchInstance = await getSavedSearchById(savedSearchId);
+      setSavedSearch(savedSearchInstance);
 
-      // if saved search does not exist, do not atempt to sync filters and query from savedObject
-      if (!savedSearchInstance) {
+      // if saved search does not exist, or the URL has filter tyhen don't sync the saved search state with that
+      if (!savedSearchInstance || !savedSearchId) {
         return;
       }
 
-      setSavedSearch(savedSearchInstance);
-
-      // sync initial app filters from savedObject to filterManager
-      const filters = cloneDeep(savedSearchInstance.searchSource.getOwnField('filter'));
+      // Sync Query from the saved search
       const query =
         savedSearchInstance.searchSource.getField('query') ||
         data.query.queryString.getDefaultQuery();
+
+      data.query.queryString.setQuery(query);
+
+      // Sync Filters from the saved search
+      const filters = cloneDeep(savedSearchInstance.searchSource.getOwnField('filter'));
+
       const actualFilters = [];
 
       if (filters !== undefined) {
@@ -353,8 +357,11 @@ export const useSearch = (services: DiscoverViewServices) => {
         }
       }
 
-      filterManager.setAppFilters(actualFilters);
-      data.query.queryString.setQuery(query);
+      // Filters in URL are higher priority than the filters in saved search
+      const urlFilters = (osdUrlStateStorage.get('_q') as QueryState)?.filters ?? [];
+      if (!urlFilters || urlFilters.length === 0) {
+        filterManager.setAppFilters(actualFilters);
+      }
 
       if (savedSearchInstance?.id) {
         chrome.recentlyAccessed.add(