Scope recent searches to project31902-namespace-recent-searches-to-project

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31902

3 files changed, 36 insertions, 29 deletions

diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js
index 9fea563370f..50a862a7b9c 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js
@@ -13,41 +13,44 @@ class FilteredSearchManager {
     this.tokensContainer = this.container.querySelector('.tokens-container');
     this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeys;
 
-    this.recentSearchesStore = new RecentSearchesStore({
-      isLocalStorageAvailable: RecentSearchesService.isAvailable(),
-    });
-    let recentSearchesKey = 'issue-recent-searches';
-    if (page === 'merge_requests') {
-      recentSearchesKey = 'merge-request-recent-searches';
-    }
-    this.recentSearchesService = new RecentSearchesService(recentSearchesKey);
-
-    // Fetch recent searches from localStorage
-    this.fetchingRecentSearchesPromise = this.recentSearchesService.fetch()
-      .catch((error) => {
-        if (error.name === 'RecentSearchesServiceError') return undefined;
-        // eslint-disable-next-line no-new
-        new window.Flash('An error occured while parsing recent searches');
-        // Gracefully fail to empty array
-        return [];
-      })
-      .then((searches) => {
-        // Put any searches that may have come in before
-        // we fetched the saved searches ahead of the already saved ones
-        const resultantSearches = this.recentSearchesStore.setRecentSearches(
-          this.recentSearchesStore.state.recentSearches.concat(searches),
-        );
-        this.recentSearchesService.save(resultantSearches);
-      });
-
     if (this.filteredSearchInput) {
       this.tokenizer = gl.FilteredSearchTokenizer;
       this.dropdownManager = new gl.FilteredSearchDropdownManager(this.filteredSearchInput.getAttribute('data-base-endpoint') || '', page);
 
+      this.recentSearchesStore = new RecentSearchesStore({
+        isLocalStorageAvailable: RecentSearchesService.isAvailable(),
+      });
+      const searchHistoryDropdownElement = document.querySelector('.js-filtered-search-history-dropdown');
+      const projectPath = searchHistoryDropdownElement.dataset.projectFullPath;
+      let recentSearchesPagePrefix = 'issue-recent-searches';
+      if (page === 'merge_requests') {
+        recentSearchesPagePrefix = 'merge-request-recent-searches';
+      }
+      const recentSearchesKey = `${projectPath}-${recentSearchesPagePrefix}`;
+      this.recentSearchesService = new RecentSearchesService(recentSearchesKey);
+
+      // Fetch recent searches from localStorage
+      this.fetchingRecentSearchesPromise = this.recentSearchesService.fetch()
+        .catch((error) => {
+          if (error.name === 'RecentSearchesServiceError') return undefined;
+          // eslint-disable-next-line no-new
+          new window.Flash('An error occured while parsing recent searches');
+          // Gracefully fail to empty array
+          return [];
+        })
+        .then((searches) => {
+          // Put any searches that may have come in before
+          // we fetched the saved searches ahead of the already saved ones
+          const resultantSearches = this.recentSearchesStore.setRecentSearches(
+            this.recentSearchesStore.state.recentSearches.concat(searches),
+          );
+          this.recentSearchesService.save(resultantSearches);
+        });
+
       this.recentSearchesRoot = new RecentSearchesRoot(
         this.recentSearchesStore,
         this.recentSearchesService,
-        document.querySelector('.js-filtered-search-history-dropdown'),
+        searchHistoryDropdownElement,
       );
       this.recentSearchesRoot.init();
 
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml
index f7b87171573..411d08bd8f8 100644
--- a/app/views/shared/issuable/_search_bar.html.haml
+++ b/app/views/shared/issuable/_search_bar.html.haml
@@ -19,7 +19,7 @@
               dropdown_class: "filtered-search-history-dropdown",
               content_class: "filtered-search-history-dropdown-content",
               title: "Recent searches" }) do
-              .js-filtered-search-history-dropdown
+              .js-filtered-search-history-dropdown{ data: { project_full_path: @project.full_path } }
           .filtered-search-box-input-container
             .scroll-container
               %ul.tokens-container.list-unstyled
diff --git a/changelogs/unreleased/31902-namespace-recent-searches-to-project.yml b/changelogs/unreleased/31902-namespace-recent-searches-to-project.yml
new file mode 100644
index 00000000000..47a725f55e9
--- /dev/null
+++ b/changelogs/unreleased/31902-namespace-recent-searches-to-project.yml
@@ -0,0 +1,4 @@
+---
+title: Scope issuable recent searches to project
+merge_request:
+author: