Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/search/sidebar/components/app.vue')
-rw-r--r--app/assets/javascripts/search/sidebar/components/app.vue42
1 files changed, 29 insertions, 13 deletions
diff --git a/app/assets/javascripts/search/sidebar/components/app.vue b/app/assets/javascripts/search/sidebar/components/app.vue
index cd289be4c05..9962f711892 100644
--- a/app/assets/javascripts/search/sidebar/components/app.vue
+++ b/app/assets/javascripts/search/sidebar/components/app.vue
@@ -1,11 +1,15 @@
<script>
+// eslint-disable-next-line no-restricted-imports
import { mapState, mapGetters } from 'vuex';
import ScopeLegacyNavigation from '~/search/sidebar/components/scope_legacy_navigation.vue';
import ScopeSidebarNavigation from '~/search/sidebar/components/scope_sidebar_navigation.vue';
import SidebarPortal from '~/super_sidebar/components/sidebar_portal.vue';
-import { SCOPE_ISSUES, SCOPE_MERGE_REQUESTS, SCOPE_BLOB } from '../constants';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+import { SCOPE_ISSUES, SCOPE_MERGE_REQUESTS, SCOPE_BLOB, SCOPE_PROJECTS } from '../constants';
import IssuesFilters from './issues_filters.vue';
-import LanguageFilter from './language_filter/index.vue';
+import MergeRequestsFilters from './merge_requests_filters.vue';
+import BlobsFilters from './blobs_filters.vue';
+import ProjectsFilters from './projects_filters.vue';
export default {
name: 'GlobalSearchSidebar',
@@ -13,25 +17,33 @@ export default {
IssuesFilters,
ScopeLegacyNavigation,
ScopeSidebarNavigation,
- LanguageFilter,
SidebarPortal,
+ MergeRequestsFilters,
+ BlobsFilters,
+ ProjectsFilters,
},
+ mixins: [glFeatureFlagsMixin()],
computed: {
// useSidebarNavigation refers to whether the new left sidebar navigation is enabled
...mapState(['useSidebarNavigation']),
...mapGetters(['currentScope']),
- showIssueAndMergeFilters() {
- return this.currentScope === SCOPE_ISSUES || this.currentScope === SCOPE_MERGE_REQUESTS;
+ showIssuesFilters() {
+ return this.currentScope === SCOPE_ISSUES;
+ },
+ showMergeRequestFilters() {
+ return this.currentScope === SCOPE_MERGE_REQUESTS;
},
- showBlobFilter() {
+ showBlobFilters() {
return this.currentScope === SCOPE_BLOB;
},
- showLabelFilter() {
- return this.currentScope === SCOPE_ISSUES;
+ showProjectsFilters() {
+ // for now the feature flag is here. Since we have only one filter in projects scope
+ return this.currentScope === SCOPE_PROJECTS && this.glFeatures.searchProjectsHideArchived;
},
showScopeNavigation() {
// showScopeNavigation refers to whether the scope navigation should be shown
- // while the legacy navigation is being used and there are no search results the scope navigation has to be hidden
+ // while the legacy navigation is being used and there are no search results
+ // the scope navigation has to be hidden
return Boolean(this.currentScope);
},
},
@@ -42,8 +54,10 @@ export default {
<section v-if="useSidebarNavigation">
<sidebar-portal>
<scope-sidebar-navigation />
- <issues-filters v-if="showIssueAndMergeFilters" />
- <language-filter v-if="showBlobFilter" />
+ <issues-filters v-if="showIssuesFilters" />
+ <merge-requests-filters v-if="showMergeRequestFilters" />
+ <blobs-filters v-if="showBlobFilters" />
+ <projects-filters v-if="showProjectsFilters" />
</sidebar-portal>
</section>
<section
@@ -51,7 +65,9 @@ export default {
class="search-sidebar gl-display-flex gl-flex-direction-column gl-md-mr-5 gl-mb-6 gl-mt-5"
>
<scope-legacy-navigation />
- <issues-filters v-if="showIssueAndMergeFilters" />
- <language-filter v-if="showBlobFilter" />
+ <issues-filters v-if="showIssuesFilters" />
+ <merge-requests-filters v-if="showMergeRequestFilters" />
+ <blobs-filters v-if="showBlobFilters" />
+ <projects-filters v-if="showProjectsFilters" />
</section>
</template>