From c329499bc66ab290dd7fcb8b526afabb108057c5 Mon Sep 17 00:00:00 2001
From: maddievn <mvanniekerk@gitlab.com>
Date: Wed, 7 Aug 2024 10:16:42 +0200
Subject: [PATCH] Add priority_searchable concern to select search type

Changelog: changed
EE: true
---
 app/assets/javascripts/search/index.js        | 19 ++++-
 app/assets/javascripts/search/store/state.js  |  4 ++
 .../components/search_type_indicator.vue      | 61 ++++++++++------
 app/presenters/search_service_presenter.rb    |  4 ++
 app/views/search/show.html.haml               | 12 +++-
 .../presenters/ee/search_service_presenter.rb |  5 ++
 .../search/advanced_and_zoekt_searchable.rb   | 27 ++++++++
 ee/app/services/ee/search/global_service.rb   |  9 +--
 ee/app/services/ee/search/group_service.rb    |  8 +--
 ee/app/services/ee/search/project_service.rb  | 12 ++--
 ee/app/services/ee/search_service.rb          |  6 +-
 .../controllers/ee/search_controller_spec.rb  | 10 +--
 .../search/elastic/project_search_spec.rb     |  3 +-
 .../ee/search_service_presenter_spec.rb       | 18 +++++
 .../services/search/global_service_spec.rb    | 36 ++++++++++
 ee/spec/services/search/group_service_spec.rb | 36 ++++++++++
 .../services/search/project_service_spec.rb   | 46 +++++++++++++
 ee/spec/services/search_service_spec.rb       | 52 ++++++++------
 .../components/search_type_indicator_spec.js  | 69 ++++++++++---------
 .../search_service_presenter_spec.rb          |  6 ++
 spec/views/search/show.html.haml_spec.rb      | 18 ++++-
 21 files changed, 351 insertions(+), 110 deletions(-)
 create mode 100644 ee/app/services/concerns/search/advanced_and_zoekt_searchable.rb

diff --git a/app/assets/javascripts/search/index.js b/app/assets/javascripts/search/index.js
index 5c546056e6010e..e68b21ef2ba3fb 100644
--- a/app/assets/javascripts/search/index.js
+++ b/app/assets/javascripts/search/index.js
@@ -1,5 +1,6 @@
 import setHighlightClass from 'ee_else_ce/search/highlight_blob_search_result';
 import { queryToObject } from '~/lib/utils/url_utility';
+import { parseBoolean } from '~/lib/utils/common_utils';
 import syntaxHighlight from '~/syntax_highlight';
 import { initSidebar } from './sidebar';
 import { initSearchSort } from './sort';
@@ -13,8 +14,16 @@ const sidebarInitState = () => {
   const el = document.getElementById('js-search-sidebar');
   if (!el) return {};
 
-  const { navigationJson, searchType, searchLevel, groupInitialJson, projectInitialJson, ref } =
-    el.dataset;
+  const {
+    navigationJson,
+    searchType,
+    searchLevel,
+    advancedSearchAvailable,
+    zoektAvailable,
+    groupInitialJson,
+    projectInitialJson,
+    ref,
+  } = el.dataset;
 
   const navigationJsonParsed = JSON.parse(navigationJson);
   const groupInitialJsonParsed = JSON.parse(groupInitialJson);
@@ -24,6 +33,8 @@ const sidebarInitState = () => {
     navigationJsonParsed,
     searchType,
     searchLevel,
+    advancedSearchAvailable: parseBoolean(advancedSearchAvailable),
+    zoektAvailable: parseBoolean(zoektAvailable),
     groupInitialJsonParsed,
     projectInitialJsonParsed,
     ref,
@@ -48,6 +59,8 @@ export const initSearchApp = () => {
     navigationJsonParsed: navigation,
     searchType,
     searchLevel,
+    advancedSearchAvailable,
+    zoektAvailable,
     groupInitialJsonParsed: groupInitialJson,
     projectInitialJsonParsed: projectInitialJson,
     ref,
@@ -60,6 +73,8 @@ export const initSearchApp = () => {
     navigation,
     searchType,
     searchLevel,
+    advancedSearchAvailable,
+    zoektAvailable,
     groupInitialJson,
     projectInitialJson,
     defaultBranchName,
diff --git a/app/assets/javascripts/search/store/state.js b/app/assets/javascripts/search/store/state.js
index 7dc4bc8a8bcb92..085f1715c4fb5a 100644
--- a/app/assets/javascripts/search/store/state.js
+++ b/app/assets/javascripts/search/store/state.js
@@ -6,6 +6,8 @@ const createState = ({
   navigation,
   searchType,
   searchLevel,
+  advancedSearchAvailable,
+  zoektAvailable,
   groupInitialJson,
   projectInitialJson,
   defaultBranchName,
@@ -31,6 +33,8 @@ const createState = ({
   searchLabelString: '',
   searchType,
   searchLevel,
+  advancedSearchAvailable,
+  zoektAvailable,
   groupInitialJson,
   projectInitialJson,
   defaultBranchName,
diff --git a/app/assets/javascripts/search/topbar/components/search_type_indicator.vue b/app/assets/javascripts/search/topbar/components/search_type_indicator.vue
index baa093796104e8..511fde603b279f 100644
--- a/app/assets/javascripts/search/topbar/components/search_type_indicator.vue
+++ b/app/assets/javascripts/search/topbar/components/search_type_indicator.vue
@@ -46,7 +46,15 @@ export default {
     GlLink,
   },
   computed: {
-    ...mapState(['searchType', 'defaultBranchName', 'query', 'searchLevel', 'query']),
+    ...mapState([
+      'searchType',
+      'advancedSearchAvailable',
+      'zoektAvailable',
+      'defaultBranchName',
+      'query',
+      'searchLevel',
+      'query',
+    ]),
     ...mapGetters(['currentScope']),
     isZoekt() {
       return this.searchType === ZOEKT_SEARCH_TYPE && this.currentScope === SCOPE_BLOB;
@@ -67,7 +75,14 @@ export default {
 
       return BASIC_SEARCH_TYPE;
     },
-    isEnabled() {
+    searchTypeAvailableTestId() {
+      if (this.zoektAvailable) {
+        return ZOEKT_SEARCH_TYPE;
+      }
+
+      return ADVANCED_SEARCH_TYPE;
+    },
+    useAdvancedOrZoekt() {
       const repoRef = this.query.repository_ref;
       switch (this.searchLevel) {
         case SEARCH_LEVEL_GLOBAL:
@@ -83,11 +98,14 @@ export default {
           return false;
       }
     },
+    isFallBacktoBasicSearch() {
+      return !this.useAdvancedOrZoekt && (this.advancedSearchAvailable || this.zoektAvailable);
+    },
     isBasicSearch() {
       return this.searchType === BASIC_SEARCH_TYPE;
     },
     disabledMessage() {
-      return this.isZoekt
+      return this.zoektAvailable
         ? this.$options.i18n.zoekt_disabled
         : this.$options.i18n.advanced_disabled;
     },
@@ -98,7 +116,7 @@ export default {
       return this.isZoekt ? this.$options.i18n.zoekt_enabled : this.$options.i18n.advanced_enabled;
     },
     syntaxHelpUrl() {
-      return this.isZoekt
+      return this.zoektAvailable
         ? this.$options.zoektSyntaxHelpUrl
         : this.$options.advancedSearchSyntaxHelpUrl;
     },
@@ -108,27 +126,28 @@ export default {
 
 <template>
   <div class="gl-inline gl-text-gray-600">
-    <div v-if="isBasicSearch" data-testid="basic"></div>
-    <div v-else-if="isEnabled" :data-testid="`${searchTypeTestId}-enabled`" class="gl-inline">
-      <gl-sprintf :message="enabledMessage">
-        <template #link="{ content }">
-          <gl-link :href="helpUrl" target="_blank" data-testid="docs-link">{{ content }}</gl-link>
-        </template>
-      </gl-sprintf>
+    <div v-if="isBasicSearch" data-testid="basic">
+      <div v-if="isFallBacktoBasicSearch" :data-testid="`${searchTypeAvailableTestId}-disabled`">
+        <gl-sprintf :message="disabledMessage">
+          <template #link="{ content }">
+            <gl-link :href="helpUrl" target="_blank" data-testid="docs-link">{{ content }}</gl-link>
+          </template>
+          <template #ref_elem>
+            <code v-gl-tooltip :title="query.repository_ref">{{ query.repository_ref }}</code>
+          </template>
+          <template #docs_link>
+            <gl-link :href="syntaxHelpUrl" target="_blank" data-testid="syntax-docs-link"
+              >{{ $options.i18n.more }}
+            </gl-link>
+          </template>
+        </gl-sprintf>
+      </div>
     </div>
-    <div v-else :data-testid="`${searchTypeTestId}-disabled`" class="gl-inline">
-      <gl-sprintf :message="disabledMessage">
+    <div v-else :data-testid="`${searchTypeTestId}-enabled`" class="gl-inline">
+      <gl-sprintf :message="enabledMessage">
         <template #link="{ content }">
           <gl-link :href="helpUrl" target="_blank" data-testid="docs-link">{{ content }}</gl-link>
         </template>
-        <template #ref_elem>
-          <code v-gl-tooltip :title="query.repository_ref">{{ query.repository_ref }}</code>
-        </template>
-        <template #docs_link>
-          <gl-link :href="syntaxHelpUrl" target="_blank" data-testid="syntax-docs-link"
-            >{{ $options.i18n.more }}
-          </gl-link>
-        </template>
       </gl-sprintf>
     </div>
   </div>
diff --git a/app/presenters/search_service_presenter.rb b/app/presenters/search_service_presenter.rb
index d79736a6e52370..f6ff91020ca1c1 100644
--- a/app/presenters/search_service_presenter.rb
+++ b/app/presenters/search_service_presenter.rb
@@ -52,6 +52,10 @@ def without_count?
   def advanced_search_enabled?
     false
   end
+
+  def zoekt_enabled?
+    false
+  end
 end
 
 SearchServicePresenter.prepend_mod_with('SearchServicePresenter')
diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml
index e0b67e73c22310..469f793efe59c1 100644
--- a/app/views/search/show.html.haml
+++ b/app/views/search/show.html.haml
@@ -18,6 +18,16 @@
 
 #js-search-topbar{ data: { "default-branch-name": @project&.default_branch } }
 .results.lg:gl-flex.gl-mt-0
-  #js-search-sidebar{ data: { navigation_json: search_navigation_json, search_type: search_service.search_type, search_level: search_service.level, group_initial_json: group_attributes.to_json, project_initial_json: project_attributes.to_json, ref: @project.present? ? repository_ref(@project) : nil } }
+  #js-search-sidebar{
+    data: {
+      navigation_json: search_navigation_json,
+      search_type: search_service.search_type,
+      advanced_search_available: @search_service_presenter.advanced_search_enabled?.to_s,
+      zoekt_available: @search_service_presenter.zoekt_enabled?.to_s,
+      search_level: search_service.level,
+      group_initial_json: group_attributes.to_json,
+      project_initial_json: project_attributes.to_json,
+      ref: @project.present? ? repository_ref(@project) : nil
+    } }
   - if @search_term
     = render 'search/results'
diff --git a/ee/app/presenters/ee/search_service_presenter.rb b/ee/app/presenters/ee/search_service_presenter.rb
index 13dc73f80f8726..55895ddd2baab2 100644
--- a/ee/app/presenters/ee/search_service_presenter.rb
+++ b/ee/app/presenters/ee/search_service_presenter.rb
@@ -8,5 +8,10 @@ module SearchServicePresenter
     def advanced_search_enabled?
       search_service.use_elasticsearch?
     end
+
+    override :zoekt_enabled?
+    def zoekt_enabled?
+      search_service.use_zoekt?
+    end
   end
 end
diff --git a/ee/app/services/concerns/search/advanced_and_zoekt_searchable.rb b/ee/app/services/concerns/search/advanced_and_zoekt_searchable.rb
new file mode 100644
index 00000000000000..8aa13d113ed6d7
--- /dev/null
+++ b/ee/app/services/concerns/search/advanced_and_zoekt_searchable.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Search
+  module AdvancedAndZoektSearchable
+    include ::Search::Elasticsearchable
+    include ::Search::ZoektSearchable
+
+    def execute
+      case search_type
+      when 'zoekt'
+        zoekt_search_results
+      when 'advanced'
+        elasticsearch_results
+      else
+        super
+      end
+    end
+
+    def search_type
+      return params[:search_type] if params[:search_type]
+      return 'zoekt' if scope == 'blobs' && use_zoekt?
+      return 'advanced' if use_elasticsearch?
+
+      'basic'
+    end
+  end
+end
diff --git a/ee/app/services/ee/search/global_service.rb b/ee/app/services/ee/search/global_service.rb
index d1252b45bf3c97..acf3df4734d8ec 100644
--- a/ee/app/services/ee/search/global_service.rb
+++ b/ee/app/services/ee/search/global_service.rb
@@ -5,14 +5,9 @@ module Search
     module GlobalService
       extend ::Gitlab::Utils::Override
       include ::Gitlab::Utils::StrongMemoize
-      include ::Search::Elasticsearchable
-      include ::Search::ZoektSearchable
-
-      override :execute
-      def execute
-        return zoekt_search_results if use_zoekt?
-        return super unless use_elasticsearch?
+      include ::Search::AdvancedAndZoektSearchable
 
+      def elasticsearch_results
         ::Gitlab::Elastic::SearchResults.new(
           current_user,
           params[:search],
diff --git a/ee/app/services/ee/search/group_service.rb b/ee/app/services/ee/search/group_service.rb
index aff084e876a186..ade7615576145c 100644
--- a/ee/app/services/ee/search/group_service.rb
+++ b/ee/app/services/ee/search/group_service.rb
@@ -4,7 +4,7 @@ module EE
   module Search
     module GroupService
       extend ::Gitlab::Utils::Override
-      include ::Search::ZoektSearchable
+      include ::Search::AdvancedAndZoektSearchable
 
       override :elasticsearchable_scope
       def elasticsearchable_scope
@@ -36,11 +36,7 @@ def elastic_projects
         @elastic_projects ||= projects.pluck_primary_key
       end
 
-      override :execute
-      def execute
-        return zoekt_search_results if use_zoekt?
-        return super unless use_elasticsearch?
-
+      def elasticsearch_results
         ::Gitlab::Elastic::GroupSearchResults.new(
           current_user,
           params[:search],
diff --git a/ee/app/services/ee/search/project_service.rb b/ee/app/services/ee/search/project_service.rb
index fc6194dbd5072a..f6643273b9e6a6 100644
--- a/ee/app/services/ee/search/project_service.rb
+++ b/ee/app/services/ee/search/project_service.rb
@@ -4,8 +4,7 @@ module EE
   module Search
     module ProjectService
       extend ::Gitlab::Utils::Override
-      include ::Search::Elasticsearchable
-      include ::Search::ZoektSearchable
+      include ::Search::AdvancedAndZoektSearchable
 
       SCOPES_THAT_SUPPORT_BRANCHES = %w[wiki_blobs commits blobs].freeze
 
@@ -14,11 +13,12 @@ def zoekt_filters
         super.merge(include_archived: true, include_forked: true)
       end
 
-      override :execute
-      def execute
-        return zoekt_search_results if use_zoekt? && use_default_branch?
-        return super unless use_elasticsearch? && use_default_branch?
+      override :search_type
+      def search_type
+        use_default_branch? ? super : 'basic'
+      end
 
+      def elasticsearch_results
         search = params[:search]
         order_by = params[:order_by]
         sort = params[:sort]
diff --git a/ee/app/services/ee/search_service.rb b/ee/app/services/ee/search_service.rb
index f94b1677e7d94d..6da7579c6b9713 100644
--- a/ee/app/services/ee/search_service.rb
+++ b/ee/app/services/ee/search_service.rb
@@ -21,11 +21,7 @@ def show_elasticsearch_tabs?
 
     override :search_type
     def search_type
-      return params[:search_type] if params[:search_type]
-      return 'zoekt' if scope == 'blobs' && use_zoekt?
-      return 'advanced' if use_elasticsearch?
-
-      super
+      search_service.search_type
     end
 
     # rubocop: disable CodeReuse/ActiveRecord
diff --git a/ee/spec/controllers/ee/search_controller_spec.rb b/ee/spec/controllers/ee/search_controller_spec.rb
index 0eb9344915a64a..ef67393c3132d8 100644
--- a/ee/spec/controllers/ee/search_controller_spec.rb
+++ b/ee/spec/controllers/ee/search_controller_spec.rb
@@ -318,11 +318,11 @@ def request
   end
 
   describe '#append_info_to_payload' do
-    let(:use_elasticsearch) { true }
+    let(:search_type) { 'advanced' }
 
     before do
       allow_next_instance_of(SearchService) do |service|
-        allow(service).to receive(:use_elasticsearch?).and_return use_elasticsearch
+        allow(service).to receive(:search_type).and_return search_type
       end
     end
 
@@ -357,7 +357,7 @@ def request
         expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
           method.call(payload)
 
-          expect(payload[:metadata]['meta.search.type']).to eq('advanced')
+          expect(payload[:metadata]['meta.search.type']).to eq(search_type)
         end
 
         get :show, params: { search: 'hello world' }
@@ -365,13 +365,13 @@ def request
     end
 
     context 'when using basic search' do
-      let(:use_elasticsearch) { false }
+      let(:search_type) { 'basic' }
 
       it 'appends the type of search used as basic' do
         expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
           method.call(payload)
 
-          expect(payload[:metadata]['meta.search.type']).to eq('basic')
+          expect(payload[:metadata]['meta.search.type']).to eq(search_type)
         end
 
         get :show, params: { search: 'hello world', basic_search: true }
diff --git a/ee/spec/features/search/elastic/project_search_spec.rb b/ee/spec/features/search/elastic/project_search_spec.rb
index e3104ac628226d..9d152178c7cd34 100644
--- a/ee/spec/features/search/elastic/project_search_spec.rb
+++ b/ee/spec/features/search/elastic/project_search_spec.rb
@@ -155,7 +155,8 @@
         scope: 'blobs',
         use_elasticsearch?: true,
         use_zoekt?: true,
-        elasticsearchable_scope: project
+        elasticsearchable_scope: project,
+        search_type: 'zoekt'
       )
     end
 
diff --git a/ee/spec/presenters/ee/search_service_presenter_spec.rb b/ee/spec/presenters/ee/search_service_presenter_spec.rb
index 653a181621196c..bc3c5d9a656d63 100644
--- a/ee/spec/presenters/ee/search_service_presenter_spec.rb
+++ b/ee/spec/presenters/ee/search_service_presenter_spec.rb
@@ -20,4 +20,22 @@
       it { is_expected.not_to be_advanced_search_enabled }
     end
   end
+
+  describe '#zoekt_enabled?' do
+    let(:user) { build(:user) }
+
+    subject(:presenter) { described_class.new(search_service, current_user: user) }
+
+    context 'when Zoekt is enabled' do
+      let(:search_service) { instance_double(SearchService, use_zoekt?: true) }
+
+      it { is_expected.to be_zoekt_enabled }
+    end
+
+    context 'when Zoekt is not enabled' do
+      let(:search_service) { instance_double(SearchService, use_zoekt?: false) }
+
+      it { is_expected.not_to be_zoekt_enabled }
+    end
+  end
 end
diff --git a/ee/spec/services/search/global_service_spec.rb b/ee/spec/services/search/global_service_spec.rb
index d6f5956de51f4f..f0ab188802343d 100644
--- a/ee/spec/services/search/global_service_spec.rb
+++ b/ee/spec/services/search/global_service_spec.rb
@@ -19,6 +19,42 @@
     let(:service) { described_class.new(user, params) }
   end
 
+  describe '#search_type' do
+    let(:search_service) { described_class.new(user, scope: scope) }
+
+    subject(:search_type) { search_service.search_type }
+
+    using RSpec::Parameterized::TableSyntax
+
+    where(:use_zoekt, :use_elasticsearch, :scope, :expected_type) do
+      true   | true  | 'blobs'  | 'zoekt'
+      false  | true  | 'blobs'  | 'advanced'
+      false  | false | 'blobs'  | 'basic'
+      true   | true  | 'issues' | 'advanced'
+      true   | false | 'issues' | 'basic'
+    end
+
+    with_them do
+      before do
+        allow(search_service).to receive(:scope).and_return(scope)
+        allow(search_service).to receive(:use_zoekt?).and_return(use_zoekt)
+        allow(search_service).to receive(:use_elasticsearch?).and_return(use_elasticsearch)
+      end
+
+      it { is_expected.to eq(expected_type) }
+
+      %w[basic advanced zoekt].each do |search_type|
+        context "with search_type param #{search_type}" do
+          let(:search_service) do
+            described_class.new(user, { scope: scope, search_type: search_type })
+          end
+
+          it { is_expected.to eq(search_type) }
+        end
+      end
+    end
+  end
+
   context 'has_parent usage', :elastic do
     shared_examples 'search does not use has_parent' do |scope|
       let(:results) { described_class.new(nil, search: '*').execute.objects(scope) }
diff --git a/ee/spec/services/search/group_service_spec.rb b/ee/spec/services/search/group_service_spec.rb
index 2055b057dae966..c5354ac01356f3 100644
--- a/ee/spec/services/search/group_service_spec.rb
+++ b/ee/spec/services/search/group_service_spec.rb
@@ -21,6 +21,42 @@
     let(:service) { described_class.new(user, scope, params) }
   end
 
+  describe '#search_type' do
+    let(:search_service) { described_class.new(user, group, scope: scope) }
+
+    subject(:search_type) { search_service.search_type }
+
+    using RSpec::Parameterized::TableSyntax
+
+    where(:use_zoekt, :use_elasticsearch, :scope, :expected_type) do
+      true   | true  | 'blobs'  | 'zoekt'
+      false  | true  | 'blobs'  | 'advanced'
+      false  | false | 'blobs'  | 'basic'
+      true   | true  | 'issues' | 'advanced'
+      true   | false | 'issues' | 'basic'
+    end
+
+    with_them do
+      before do
+        allow(search_service).to receive(:scope).and_return(scope)
+        allow(search_service).to receive(:use_zoekt?).and_return(use_zoekt)
+        allow(search_service).to receive(:use_elasticsearch?).and_return(use_elasticsearch)
+      end
+
+      it { is_expected.to eq(expected_type) }
+
+      %w[basic advanced zoekt].each do |search_type|
+        context "with search_type param #{search_type}" do
+          let(:search_service) do
+            described_class.new(user, group, { scope: scope, search_type: search_type })
+          end
+
+          it { is_expected.to eq(search_type) }
+        end
+      end
+    end
+  end
+
   describe 'group search', :elastic do
     let(:term) { "RandomName" }
     let(:nested_group) { create(:group, :nested) }
diff --git a/ee/spec/services/search/project_service_spec.rb b/ee/spec/services/search/project_service_spec.rb
index f56fe289fb5525..a013eda4065082 100644
--- a/ee/spec/services/search/project_service_spec.rb
+++ b/ee/spec/services/search/project_service_spec.rb
@@ -22,6 +22,52 @@
     end
   end
 
+  describe '#search_type' do
+    let_it_be(:user) { create(:user) }
+    let_it_be(:project) { create(:project, :public) }
+    let(:search_service) { described_class.new(user, project, scope: scope) }
+
+    subject(:search_type) { search_service.search_type }
+
+    using RSpec::Parameterized::TableSyntax
+
+    where(:use_zoekt, :use_elasticsearch, :scope, :expected_type) do
+      true   | true  | 'blobs'  | 'zoekt'
+      false  | true  | 'blobs'  | 'advanced'
+      false  | false | 'blobs'  | 'basic'
+      true   | true  | 'issues' | 'advanced'
+      true   | false | 'issues' | 'basic'
+    end
+
+    with_them do
+      before do
+        allow(search_service).to receive(:scope).and_return(scope)
+        allow(search_service).to receive(:use_zoekt?).and_return(use_zoekt)
+        allow(search_service).to receive(:use_elasticsearch?).and_return(use_elasticsearch)
+      end
+
+      it { is_expected.to eq(expected_type) }
+
+      context 'when use_default_branch? is false' do
+        before do
+          allow(search_service).to receive(:use_default_branch?).and_return(false)
+        end
+
+        it { is_expected.to eq('basic') }
+      end
+
+      %w[basic advanced zoekt].each do |search_type|
+        context "with search_type param #{search_type}" do
+          let(:search_service) do
+            described_class.new(user, project, { scope: scope, search_type: search_type })
+          end
+
+          it { is_expected.to eq(search_type) }
+        end
+      end
+    end
+  end
+
   describe '#elasticsearchable_scope' do
     let(:service) { described_class.new(user, project, scope: scope) }
     let(:scope) { 'blobs' }
diff --git a/ee/spec/services/search_service_spec.rb b/ee/spec/services/search_service_spec.rb
index 67fa23b7e6be42..1361886cdcfe6e 100644
--- a/ee/spec/services/search_service_spec.rb
+++ b/ee/spec/services/search_service_spec.rb
@@ -138,37 +138,45 @@
   describe '#search_type' do
     let_it_be(:user) { create(:user) }
     let_it_be(:project) { create(:project, :public) }
-    let(:search_service) { described_class.new(user, { scope: scope, project_id: project.id }) }
+    let_it_be(:group) { create(:group, :public) }
+    let(:scope) { 'notes' }
+    let(:expected_search_type) { 'advanced' }
 
-    subject(:search_type) { search_service.search_type }
+    subject(:search_type) { service.search_type }
 
-    using RSpec::Parameterized::TableSyntax
+    context 'for project search' do
+      let(:service) { described_class.new(user, { scope: scope, project_id: project.id }) }
 
-    where(:use_zoekt, :use_elasticsearch, :scope, :expected_type) do
-      true   | true  | 'blobs'  | 'zoekt'
-      false  | true  | 'blobs'  | 'advanced'
-      false  | false | 'blobs'  | 'basic'
-      true   | true  | 'issues' | 'advanced'
-      true   | false | 'issues' | 'basic'
-    end
+      it 'delegates to ProjectService.search_type' do
+        expect_next_instance_of(::Search::ProjectService) do |project_service|
+          expect(project_service).to receive(:search_type).and_return(expected_search_type)
+        end
 
-    with_them do
-      before do
-        allow(search_service).to receive(:scope).and_return(scope)
-        allow(search_service).to receive(:use_zoekt?).and_return(use_zoekt)
-        allow(search_service).to receive(:use_elasticsearch?).and_return(use_elasticsearch)
+        expect(search_type).to eq(expected_search_type)
       end
+    end
 
-      it { is_expected.to eq(expected_type) }
+    context 'for group search' do
+      let(:service) { described_class.new(user, { scope: scope, group_id: group.id }) }
 
-      %w[basic advanced zoekt].each do |search_type|
-        context "with search_type param #{search_type}" do
-          let(:search_service) do
-            described_class.new(user, { scope: scope, project_id: project.id, search_type: search_type })
-          end
+      it 'delegates to GroupService.search_type' do
+        expect_next_instance_of(::Search::GroupService) do |group_service|
+          expect(group_service).to receive(:search_type).and_return(expected_search_type)
+        end
+
+        expect(search_type).to eq(expected_search_type)
+      end
+    end
 
-          it { is_expected.to eq(search_type) }
+    context 'for global search' do
+      let(:service) { described_class.new(user, { scope: scope }) }
+
+      it 'delegates to GlobalService.search_type' do
+        expect_next_instance_of(::Search::GlobalService) do |global_service|
+          expect(global_service).to receive(:search_type).and_return(expected_search_type)
         end
+
+        expect(search_type).to eq(expected_search_type)
       end
     end
   end
diff --git a/spec/frontend/search/topbar/components/search_type_indicator_spec.js b/spec/frontend/search/topbar/components/search_type_indicator_spec.js
index 4d99b678c6d06b..21a120cd9805bf 100644
--- a/spec/frontend/search/topbar/components/search_type_indicator_spec.js
+++ b/spec/frontend/search/topbar/components/search_type_indicator_spec.js
@@ -47,30 +47,32 @@ describe('SearchTypeIndicator', () => {
   // all possible combinations
 
   describe.each`
-    searchType    | searchLevel  | repository  | scope       | showSearchTypeIndicator
-    ${'advanced'} | ${'project'} | ${'master'} | ${'blobs'}  | ${'advanced-enabled'}
-    ${'advanced'} | ${'project'} | ${'v0.1'}   | ${'blobs'}  | ${'advanced-disabled'}
-    ${'advanced'} | ${'group'}   | ${'master'} | ${'blobs'}  | ${'advanced-enabled'}
-    ${'advanced'} | ${'global'}  | ${'master'} | ${'blobs'}  | ${'advanced-enabled'}
-    ${'zoekt'}    | ${'project'} | ${'master'} | ${'blobs'}  | ${'zoekt-enabled'}
-    ${'zoekt'}    | ${'project'} | ${'v0.1'}   | ${'blobs'}  | ${'zoekt-disabled'}
-    ${'zoekt'}    | ${'group'}   | ${'master'} | ${'blobs'}  | ${'zoekt-enabled'}
-    ${'advanced'} | ${'project'} | ${'master'} | ${'issues'} | ${'advanced-enabled'}
-    ${'advanced'} | ${'project'} | ${'v0.1'}   | ${'issues'} | ${'advanced-enabled'}
-    ${'advanced'} | ${'group'}   | ${'master'} | ${'issues'} | ${'advanced-enabled'}
-    ${'advanced'} | ${'global'}  | ${'master'} | ${'issues'} | ${'advanced-enabled'}
-    ${'zoekt'}    | ${'project'} | ${'master'} | ${'issues'} | ${'advanced-enabled'}
-    ${'zoekt'}    | ${'project'} | ${'v0.1'}   | ${'issues'} | ${'advanced-enabled'}
-    ${'zoekt'}    | ${'group'}   | ${'master'} | ${'issues'} | ${'advanced-enabled'}
+    searchType    | searchLevel  | repository  | scope       | zoektAvailable | showSearchTypeIndicator
+    ${'advanced'} | ${'project'} | ${'master'} | ${'blobs'}  | ${false}       | ${'advanced-enabled'}
+    ${'basic'}    | ${'project'} | ${'v0.1'}   | ${'blobs'}  | ${false}       | ${'advanced-disabled'}
+    ${'advanced'} | ${'group'}   | ${'master'} | ${'blobs'}  | ${false}       | ${'advanced-enabled'}
+    ${'advanced'} | ${'global'}  | ${'master'} | ${'blobs'}  | ${false}       | ${'advanced-enabled'}
+    ${'zoekt'}    | ${'project'} | ${'master'} | ${'blobs'}  | ${true}        | ${'zoekt-enabled'}
+    ${'basic'}    | ${'project'} | ${'v0.1'}   | ${'blobs'}  | ${true}        | ${'zoekt-disabled'}
+    ${'zoekt'}    | ${'group'}   | ${'master'} | ${'blobs'}  | ${true}        | ${'zoekt-enabled'}
+    ${'advanced'} | ${'project'} | ${'master'} | ${'issues'} | ${false}       | ${'advanced-enabled'}
+    ${'advanced'} | ${'project'} | ${'v0.1'}   | ${'issues'} | ${false}       | ${'advanced-enabled'}
+    ${'advanced'} | ${'group'}   | ${'master'} | ${'issues'} | ${false}       | ${'advanced-enabled'}
+    ${'advanced'} | ${'global'}  | ${'master'} | ${'issues'} | ${false}       | ${'advanced-enabled'}
+    ${'zoekt'}    | ${'project'} | ${'master'} | ${'issues'} | ${true}        | ${'advanced-enabled'}
+    ${'zoekt'}    | ${'project'} | ${'v0.1'}   | ${'issues'} | ${true}        | ${'advanced-enabled'}
+    ${'zoekt'}    | ${'group'}   | ${'master'} | ${'issues'} | ${true}        | ${'advanced-enabled'}
   `(
     'search type indicator for $searchType $searchLevel $scope',
-    ({ searchType, repository, showSearchTypeIndicator, scope, searchLevel }) => {
+    ({ searchType, repository, showSearchTypeIndicator, scope, searchLevel, zoektAvailable }) => {
       beforeEach(() => {
         getterSpies.currentScope = jest.fn(() => scope);
         createComponent({
           query: { repository_ref: repository, scope },
           searchType,
           searchLevel,
+          advancedSearchAvailable: true,
+          zoektAvailable,
           defaultBranchName: 'master',
         });
       });
@@ -124,22 +126,27 @@ describe('SearchTypeIndicator', () => {
   });
 
   describe.each`
-    searchType    | syntaxdocsLink
-    ${'advanced'} | ${'/help/user/search/advanced_search#syntax'}
-    ${'zoekt'}    | ${'/help/user/search/exact_code_search#syntax'}
-  `('Syntax documentation $searchType', ({ searchType, syntaxdocsLink }) => {
-    beforeEach(() => {
-      createComponent({
-        query: { repository_ref: '000', scope: 'blobs' },
-        searchType,
-        searchLevel: 'project',
-        defaultBranchName: 'master',
+    searchType | advancedSearchAvailable | zoektAvailable | syntaxdocsLink
+    ${'basic'} | ${true}                 | ${false}       | ${'/help/user/search/advanced_search#syntax'}
+    ${'basic'} | ${true}                 | ${true}        | ${'/help/user/search/exact_code_search#syntax'}
+  `(
+    'Syntax documentation $searchType',
+    ({ searchType, advancedSearchAvailable, zoektAvailable, syntaxdocsLink }) => {
+      beforeEach(() => {
+        createComponent({
+          query: { repository_ref: '000', scope: 'blobs' },
+          searchType,
+          advancedSearchAvailable,
+          zoektAvailable,
+          searchLevel: 'project',
+          defaultBranchName: 'master',
+        });
       });
-    });
-    it('has correct link', () => {
-      expect(findSyntaxDocsLink().attributes('href')).toBe(syntaxdocsLink);
-    });
-  });
+      it('has correct link', () => {
+        expect(findSyntaxDocsLink().attributes('href')).toBe(syntaxdocsLink);
+      });
+    },
+  );
 
   describe('Indicator is not using url query as source of truth', () => {
     beforeEach(() => {
diff --git a/spec/presenters/search_service_presenter_spec.rb b/spec/presenters/search_service_presenter_spec.rb
index a235f954366fbb..06b8c58cf24303 100644
--- a/spec/presenters/search_service_presenter_spec.rb
+++ b/spec/presenters/search_service_presenter_spec.rb
@@ -57,4 +57,10 @@
 
     it { expect(presenter.advanced_search_enabled?).to eq(false) }
   end
+
+  describe '#zoekt_enabled?' do
+    let(:scope) { nil }
+
+    it { expect(presenter.zoekt_enabled?).to eq(false) }
+  end
 end
diff --git a/spec/views/search/show.html.haml_spec.rb b/spec/views/search/show.html.haml_spec.rb
index e6d2ef02c9afe5..063fe594da8873 100644
--- a/spec/views/search/show.html.haml_spec.rb
+++ b/spec/views/search/show.html.haml_spec.rb
@@ -6,7 +6,11 @@
   let(:search_term) { nil }
   let(:user) { build(:user) }
   let(:search_service_presenter) do
-    instance_double(SearchServicePresenter, without_count?: false, advanced_search_enabled?: false)
+    instance_double(SearchServicePresenter,
+      without_count?: false,
+      advanced_search_enabled?: false,
+      zoekt_enabled?: false
+    )
   end
 
   before do
@@ -58,7 +62,11 @@
 
     context 'search with full count' do
       let(:search_service_presenter) do
-        instance_double(SearchServicePresenter, without_count?: false, advanced_search_enabled?: false)
+        instance_double(SearchServicePresenter,
+          without_count?: false,
+          advanced_search_enabled?: false,
+          zoekt_enabled?: false
+        )
       end
 
       it 'renders meta tags for a group' do
@@ -81,7 +89,11 @@
 
     context 'search without full count' do
       let(:search_service_presenter) do
-        instance_double(SearchServicePresenter, without_count?: true, advanced_search_enabled?: false)
+        instance_double(SearchServicePresenter,
+          without_count?: true,
+          advanced_search_enabled?: false,
+          zoekt_enabled?: false
+        )
       end
 
       it 'renders meta tags for a group' do
-- 
GitLab