From bf6fe5762063848eba47cee7e0ce8c65c1c5a7dd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 4 Mar 2023 03:09:48 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../javascripts/search/sidebar/components/app.vue | 2 +- app/controllers/search_controller.rb | 3 --- .../search_blobs_language_aggregation.yml | 8 ------- doc/user/search/index.md | 11 ++++++++- .../frontend/search/sidebar/components/app_spec.js | 28 ++++------------------ .../search_language_filter_shared_examples.rb | 25 ------------------- 6 files changed, 16 insertions(+), 61 deletions(-) delete mode 100644 config/feature_flags/development/search_blobs_language_aggregation.yml diff --git a/app/assets/javascripts/search/sidebar/components/app.vue b/app/assets/javascripts/search/sidebar/components/app.vue index 928cd46c9eb..60de63c7d7a 100644 --- a/app/assets/javascripts/search/sidebar/components/app.vue +++ b/app/assets/javascripts/search/sidebar/components/app.vue @@ -21,7 +21,7 @@ export default { return this.currentScope === SCOPE_ISSUES || this.currentScope === SCOPE_MERGE_REQUESTS; }, showBlobFilter() { - return this.currentScope === SCOPE_BLOB && this.glFeatures.searchBlobsLanguageAggregation; + return this.currentScope === SCOPE_BLOB; }, }, }; diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index d1f846ae55c..549b6286d96 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -31,9 +31,6 @@ class SearchController < ApplicationController end before_action :check_search_rate_limit!, only: search_rate_limited_endpoints - before_action only: :show do - push_frontend_feature_flag(:search_blobs_language_aggregation, current_user) - end before_action only: :show do update_scope_for_code_search end diff --git a/config/feature_flags/development/search_blobs_language_aggregation.yml b/config/feature_flags/development/search_blobs_language_aggregation.yml deleted file mode 100644 index da1b81dc52c..00000000000 --- a/config/feature_flags/development/search_blobs_language_aggregation.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: search_blobs_language_aggregation -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71937 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342621 -milestone: '14.4' -type: development -group: group::global search -default_enabled: false diff --git a/doc/user/search/index.md b/doc/user/search/index.md index 60d428850ac..310d733800a 100644 --- a/doc/user/search/index.md +++ b/doc/user/search/index.md @@ -82,7 +82,16 @@ where the results were found. 1. From the code search result, hover over the line number. 1. On the left, select **View blame**. - ![code search results](img/code_search_git_blame_v15_1.png) +![code search results](img/code_search_git_blame_v15_1.png) + +### Filter code search results by language + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/342651) in GitLab 15.10. + +To filter code search results by one or more languages: + +1. On the code search page, on the left sidebar, select one or more languages. +1. On the left sidebar, select **Apply**. ## Search for projects by full path diff --git a/spec/frontend/search/sidebar/components/app_spec.js b/spec/frontend/search/sidebar/components/app_spec.js index bbe04ba67f1..8a35ae96d5e 100644 --- a/spec/frontend/search/sidebar/components/app_spec.js +++ b/spec/frontend/search/sidebar/components/app_spec.js @@ -57,23 +57,23 @@ describe('GlobalSearchSidebar', () => { }); describe.each` - scope | showFilters | ShowsLanguage + scope | showFilters | showsLanguage ${'issues'} | ${true} | ${false} ${'merge_requests'} | ${true} | ${false} ${'projects'} | ${false} | ${false} ${'blobs'} | ${false} | ${true} - `('sidebar scope: $scope', ({ scope, showFilters, ShowsLanguage }) => { + `('sidebar scope: $scope', ({ scope, showFilters, showsLanguage }) => { beforeEach(() => { getterSpies.currentScope = jest.fn(() => scope); - createComponent({ urlQuery: { scope } }, { searchBlobsLanguageAggregation: true }); + createComponent({ urlQuery: { scope } }); }); it(`${!showFilters ? "doesn't" : ''} shows filters`, () => { expect(findFilters().exists()).toBe(showFilters); }); - it(`${!ShowsLanguage ? "doesn't" : ''} shows language filters`, () => { - expect(findLanguageAggregation().exists()).toBe(ShowsLanguage); + it(`${!showsLanguage ? "doesn't" : ''} shows language filters`, () => { + expect(findLanguageAggregation().exists()).toBe(showsLanguage); }); }); @@ -86,22 +86,4 @@ describe('GlobalSearchSidebar', () => { }); }); }); - - describe('when search_blobs_language_aggregation is enabled', () => { - beforeEach(() => { - createComponent({ urlQuery: { scope: 'blobs' } }, { searchBlobsLanguageAggregation: true }); - }); - it('shows the language filter', () => { - expect(findLanguageAggregation().exists()).toBe(true); - }); - }); - - describe('when search_blobs_language_aggregation is disabled', () => { - beforeEach(() => { - createComponent({ urlQuery: { scope: 'blobs' } }, { searchBlobsLanguageAggregation: false }); - }); - it('hides the language filter', () => { - expect(findLanguageAggregation().exists()).toBe(false); - }); - }); }); diff --git a/spec/support/shared_examples/lib/gitlab/search_language_filter_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/search_language_filter_shared_examples.rb index a3e4379f4d3..18545698c27 100644 --- a/spec/support/shared_examples/lib/gitlab/search_language_filter_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/search_language_filter_shared_examples.rb @@ -26,29 +26,4 @@ RSpec.shared_examples 'search results filtered by language' do expect(blob_results.size).to eq(5) expect(paths).to match_array(expected_paths) end - - context 'when the search_blobs_language_aggregation feature flag is disabled' do - before do - stub_feature_flags(search_blobs_language_aggregation: false) - end - - it 'does not filter by language', :sidekiq_inline, :aggregate_failures do - expected_paths = %w[ - CHANGELOG - CONTRIBUTING.md - bar/branch-test.txt - custom-highlighting/test.gitlab-custom - files/ruby/popen.rb - files/ruby/regex.rb - files/ruby/version_info.rb - files/whitespace - encoding/test.txt - files/markdown/ruby-style-guide.md - ] - - paths = blob_results.map { |blob| blob.binary_path } - expect(blob_results.size).to eq(10) - expect(paths).to match_array(expected_paths) - end - end end -- cgit v1.2.1