Add latest changes from gitlab-org/gitlab@master

4 files changed, 33 insertions, 0 deletions

diff --git a/app/assets/javascripts/search/sidebar/components/app.vue b/app/assets/javascripts/search/sidebar/components/app.vue
index da743f5c496..a2e857dc5e4 100644
--- a/app/assets/javascripts/search/sidebar/components/app.vue
+++ b/app/assets/javascripts/search/sidebar/components/app.vue
@@ -13,12 +13,14 @@ import {
   SCOPE_MERGE_REQUESTS,
   SCOPE_BLOB,
   SCOPE_PROJECTS,
+  SCOPE_NOTES,
   SEARCH_TYPE_ADVANCED,
 } from '../constants';
 import IssuesFilters from './issues_filters.vue';
 import MergeRequestsFilters from './merge_requests_filters.vue';
 import BlobsFilters from './blobs_filters.vue';
 import ProjectsFilters from './projects_filters.vue';
+import NotesFilters from './notes_filters.vue';
 
 export default {
   name: 'GlobalSearchSidebar',
@@ -27,6 +29,7 @@ export default {
     MergeRequestsFilters,
     BlobsFilters,
     ProjectsFilters,
+    NotesFilters,
     ScopeLegacyNavigation,
     ScopeSidebarNavigation,
     SidebarPortal,
@@ -51,6 +54,13 @@ export default {
       // for now the feature flag is here. Since we have only one filter in projects scope
       return this.currentScope === SCOPE_PROJECTS;
     },
+    showNotesFilters() {
+      return (
+        this.currentScope === SCOPE_NOTES &&
+        this.searchType === SEARCH_TYPE_ADVANCED &&
+        this.glFeatures.searchNotesHideArchivedProjects
+      );
+    },
     showScopeNavigation() {
       // showScopeNavigation refers to whether the scope navigation should be shown
       // while the legacy navigation is being used and there are no search results
@@ -75,6 +85,7 @@ export default {
       <merge-requests-filters v-if="showMergeRequestFilters" />
       <blobs-filters v-if="showBlobFilters" />
       <projects-filters v-if="showProjectsFilters" />
+      <notes-filters v-if="showNotesFilters" />
     </sidebar-portal>
   </section>
 
@@ -88,6 +99,7 @@ export default {
       <merge-requests-filters v-if="showMergeRequestFilters" />
       <blobs-filters v-if="showBlobFilters" />
       <projects-filters v-if="showProjectsFilters" />
+      <notes-filters v-if="showNotesFilters" />
     </div>
     <small-screen-drawer-navigation class="gl-lg-display-none">
       <scope-legacy-navigation />
@@ -95,6 +107,7 @@ export default {
       <merge-requests-filters v-if="showMergeRequestFilters" />
       <blobs-filters v-if="showBlobFilters" />
       <projects-filters v-if="showProjectsFilters" />
+      <notes-filters v-if="showNotesFilters" />
     </small-screen-drawer-navigation>
   </section>
 </template>
diff --git a/app/assets/javascripts/search/sidebar/components/archived_filter/data.js b/app/assets/javascripts/search/sidebar/components/archived_filter/data.js
index 831e253a0b6..7a3dc8ad96b 100644
--- a/app/assets/javascripts/search/sidebar/components/archived_filter/data.js
+++ b/app/assets/javascripts/search/sidebar/components/archived_filter/data.js
@@ -9,6 +9,7 @@ const scopes = {
   PROJECTS: 'projects',
   ISSUES: 'issues',
   MERGE_REQUESTS: 'merge_requests',
+  NOTES: 'notes',
 };
 
 const filterParam = 'include_archived';
diff --git a/app/assets/javascripts/search/sidebar/components/notes_filters.vue b/app/assets/javascripts/search/sidebar/components/notes_filters.vue
new file mode 100644
index 00000000000..3a9f582d554
--- /dev/null
+++ b/app/assets/javascripts/search/sidebar/components/notes_filters.vue
@@ -0,0 +1,18 @@
+<script>
+import ArchivedFilter from './archived_filter/index.vue';
+import FiltersTemplate from './filters_template.vue';
+
+export default {
+  name: 'NotesFilters',
+  components: {
+    ArchivedFilter,
+    FiltersTemplate,
+  },
+};
+</script>
+
+<template>
+  <filters-template>
+    <archived-filter class="gl-mb-5" />
+  </filters-template>
+</template>
diff --git a/app/assets/javascripts/search/sidebar/constants/index.js b/app/assets/javascripts/search/sidebar/constants/index.js
index e5b803b92cb..e6808082185 100644
--- a/app/assets/javascripts/search/sidebar/constants/index.js
+++ b/app/assets/javascripts/search/sidebar/constants/index.js
@@ -2,6 +2,7 @@ export const SCOPE_ISSUES = 'issues';
 export const SCOPE_MERGE_REQUESTS = 'merge_requests';
 export const SCOPE_BLOB = 'blobs';
 export const SCOPE_PROJECTS = 'projects';
+export const SCOPE_NOTES = 'notes';
 export const LABEL_DEFAULT_CLASSES = [
   'gl-display-flex',
   'gl-flex-direction-row',