From 924dc2f8cc53e7fe85feeeb833457d4bce726056 Mon Sep 17 00:00:00 2001 From: Siddharth Dungarwal Date: Wed, 8 Jan 2025 19:17:48 +0530 Subject: [PATCH 1/8] Add search column to application settings --- app/helpers/application_settings_helper.rb | 4 ++- app/models/application_setting.rb | 6 ++++ .../application_setting_search.json | 16 ++++++++++ config/application_setting_columns/search.yml | 12 +++++++ ...search_settings_to_application_settings.rb | 9 ++++++ db/schema_migrations/20250108114357 | 1 + db/structure.sql | 1 + .../helpers/ee/application_settings_helper.rb | 7 +++- ee/app/models/ee/application_setting.rb | 7 ++++ .../application_setting_search.json | 32 +++++++++++++++++++ .../ee/application_settings_helper_spec.rb | 5 +++ ee/spec/models/application_setting_spec.rb | 10 ++++++ .../application_settings_helper_spec.rb | 5 +++ spec/models/application_setting_spec.rb | 3 ++ 14 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 app/validators/json_schemas/application_setting_search.json create mode 100644 config/application_setting_columns/search.yml create mode 100644 db/migrate/20250108114357_add_global_search_settings_to_application_settings.rb create mode 100644 db/schema_migrations/20250108114357 create mode 100644 ee/app/validators/json_schemas/application_setting_search.json diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 3b9a6c732e1aa9..2695e1eb2bb0f4 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -544,7 +544,9 @@ def visible_attributes :require_personal_access_token_expiry, :observability_backend_ssl_verification_enabled, :show_migrate_from_jenkins_banner, - :ropc_without_client_credentials + :ropc_without_client_credentials, + :global_search_merge_requests_enabled, + :global_search_users_enabled ].tap do |settings| unless Gitlab.com? settings << :resource_usage_limits diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 35111be2b1b51f..4b20463f358b05 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -707,6 +707,12 @@ def self.kroki_formats_attributes validates :sign_in_restrictions, json_schema: { filename: 'application_setting_sign_in_restrictions' } + jsonb_accessor :search, + global_search_merge_requests_enabled: [:boolean, { default: true }], + global_search_users_enabled: [:boolean, { default: true }] + + validates :search, json_schema: { filename: 'application_setting_search' } + jsonb_accessor :transactional_emails, resource_access_token_notify_inherited: [:boolean, { default: false }], lock_resource_access_token_notify_inherited: [:boolean, { default: false }] diff --git a/app/validators/json_schemas/application_setting_search.json b/app/validators/json_schemas/application_setting_search.json new file mode 100644 index 00000000000000..759b280a6b45ca --- /dev/null +++ b/app/validators/json_schemas/application_setting_search.json @@ -0,0 +1,16 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "description": "Application Settings for search", + "type": "object", + "additionalProperties": true, + "properties": { + "global_search_merge_requests_enabled": { + "type": "boolean", + "description": "If global search for merge requests search is enabled" + }, + "global_search_users_enabled": { + "type": "boolean", + "description": "If global search for user search is enabled" + } + } +} diff --git a/config/application_setting_columns/search.yml b/config/application_setting_columns/search.yml new file mode 100644 index 00000000000000..136c26bdfe9646 --- /dev/null +++ b/config/application_setting_columns/search.yml @@ -0,0 +1,12 @@ +--- +api_type: +attr: search +clusterwide: false +column: search +db_type: jsonb +default: "'{}'::jsonb" +description: +encrypted: false +gitlab_com_different_than_default: true +jihu: false +not_null: true diff --git a/db/migrate/20250108114357_add_global_search_settings_to_application_settings.rb b/db/migrate/20250108114357_add_global_search_settings_to_application_settings.rb new file mode 100644 index 00000000000000..7dc52cd77f1bdf --- /dev/null +++ b/db/migrate/20250108114357_add_global_search_settings_to_application_settings.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddGlobalSearchSettingsToApplicationSettings < Gitlab::Database::Migration[2.2] + milestone '17.9' + + def change + add_column :application_settings, :search, :jsonb, default: {}, null: false + end +end diff --git a/db/schema_migrations/20250108114357 b/db/schema_migrations/20250108114357 new file mode 100644 index 00000000000000..dd9d049d7a0d59 --- /dev/null +++ b/db/schema_migrations/20250108114357 @@ -0,0 +1 @@ +73b7e842e1d64c04554d34fa3e90e1cab9942f758e62321f77beb68da53909a3 \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 4642dc53cd7cbe..74ec9db95e8856 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -7912,6 +7912,7 @@ CREATE TABLE application_settings ( elasticsearch_indexed_file_size_limit_kb integer DEFAULT 1024 NOT NULL, elasticsearch_max_code_indexing_concurrency integer DEFAULT 30 NOT NULL, observability_settings jsonb DEFAULT '{}'::jsonb NOT NULL, + search jsonb DEFAULT '{}'::jsonb NOT NULL, CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)), CONSTRAINT app_settings_dep_proxy_ttl_policies_worker_capacity_positive CHECK ((dependency_proxy_ttl_group_policy_worker_capacity >= 0)), CONSTRAINT app_settings_ext_pipeline_validation_service_url_text_limit CHECK ((char_length(external_pipeline_validation_service_url) <= 255)), diff --git a/ee/app/helpers/ee/application_settings_helper.rb b/ee/app/helpers/ee/application_settings_helper.rb index f15e415e7342dc..18d2d70e7bd331 100644 --- a/ee/app/helpers/ee/application_settings_helper.rb +++ b/ee/app/helpers/ee/application_settings_helper.rb @@ -89,7 +89,12 @@ def visible_attributes :scan_execution_policies_action_limit, :secret_detection_service_auth_token, :secret_detection_service_url, - :fetch_observability_alerts_from_cloud + :fetch_observability_alerts_from_cloud, + :global_search_code_enabled, + :global_search_commits_enabled, + :global_search_wiki_enabled, + :global_search_users_enabled, + :global_search_snippet_titles_enabled ].tap do |settings| settings.concat(identity_verification_attributes) settings.concat(enable_promotion_management_attributes) diff --git a/ee/app/models/ee/application_setting.rb b/ee/app/models/ee/application_setting.rb index a74deac5039ecd..d9a332f2b855b3 100644 --- a/ee/app/models/ee/application_setting.rb +++ b/ee/app/models/ee/application_setting.rb @@ -23,6 +23,12 @@ module ApplicationSetting jsonb_accessor :clickhouse, use_clickhouse_for_analytics: [:boolean, { default: false }] + jsonb_accessor :search, + global_search_code_enabled: [:boolean, { default: true }], + global_search_commits_enabled: [:boolean, { default: true }], + global_search_wiki_enabled: [:boolean, { default: true }], + global_search_snippet_titles_enabled: [:boolean, { default: true }] + jsonb_accessor :zoekt_settings, zoekt_auto_delete_lost_nodes: [:boolean, { default: true }], zoekt_indexing_enabled: [:boolean, { default: false }], @@ -276,6 +282,7 @@ module ApplicationSetting allow_nil: false, inclusion: { in: [true, false], message: N_('must be a boolean value') } + validates :search, json_schema: { filename: 'application_setting_search' } validates :zoekt_settings, json_schema: { filename: 'application_setting_zoekt_settings' } validates :zoekt_cpu_to_tasks_ratio, numericality: { greater_than: 0.0 } diff --git a/ee/app/validators/json_schemas/application_setting_search.json b/ee/app/validators/json_schemas/application_setting_search.json new file mode 100644 index 00000000000000..c02b1bd9c6a418 --- /dev/null +++ b/ee/app/validators/json_schemas/application_setting_search.json @@ -0,0 +1,32 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "description": "Application Settings for search", + "type": "object", + "additionalProperties": false, + "properties": { + "global_search_code_enabled": { + "type": "boolean", + "description": "If global search for code search is enabled" + }, + "global_search_commits_enabled": { + "type": "boolean", + "description": "If global search for commits search is enabled" + }, + "global_search_merge_requests_enabled": { + "type": "boolean", + "description": "If global search for merge requests search is enabled" + }, + "global_search_wiki_enabled": { + "type": "boolean", + "description": "If global search for wiki search is enabled" + }, + "global_search_users_enabled": { + "type": "boolean", + "description": "If global search for user search is enabled" + }, + "global_search_snippet_titles_enabled": { + "type": "boolean", + "description": "If global search for snippet search is enabled" + } + } +} diff --git a/ee/spec/helpers/ee/application_settings_helper_spec.rb b/ee/spec/helpers/ee/application_settings_helper_spec.rb index ac82be01ecfd1f..cd88e2730f408e 100644 --- a/ee/spec/helpers/ee/application_settings_helper_spec.rb +++ b/ee/spec/helpers/ee/application_settings_helper_spec.rb @@ -13,6 +13,11 @@ expect(visible_attributes).to include(*%i[duo_features_enabled lock_duo_features_enabled duo_availability]) end + it 'contains search parameters' do + expected_fields = %i[global_search_snippet_titles_enabled global_search_users_enabled global_search_wiki_enabled global_search_merge_requests_enabled global_search_commits_enabled global_search_code_enabled] + expect(visible_attributes).to include(*expected_fields) + end + it 'contains zoekt parameters' do expected_fields = %i[ zoekt_auto_delete_lost_nodes zoekt_auto_index_root_namespace zoekt_indexing_enabled diff --git a/ee/spec/models/application_setting_spec.rb b/ee/spec/models/application_setting_spec.rb index 512c0560a44026..0b52dff0d5d96e 100644 --- a/ee/spec/models/application_setting_spec.rb +++ b/ee/spec/models/application_setting_spec.rb @@ -46,6 +46,12 @@ it { expect(setting.hard_phone_verification_transactions_daily_limit).to eq(20000) } it { expect(setting.telesign_intelligence_enabled).to eq(true) } it { expect(setting.fetch_observability_alerts_from_cloud).to eq(true) } + it { expect(setting.global_search_code_enabled).to eq(true) } + it { expect(setting.global_search_commits_enabled).to eq(true) } + it { expect(setting.global_search_merge_requests_enabled).to eq(true) } + it { expect(setting.global_search_wiki_enabled).to eq(true) } + it { expect(setting.global_search_users_enabled).to eq(true) } + it { expect(setting.global_search_snippet_titles_enabled).to eq(true) } end describe 'validations' do @@ -688,6 +694,10 @@ it { is_expected.not_to allow_value(nil).for(:instance_level_ai_beta_features_enabled) } end + describe 'search settings', feature_category: :global_search do + it { expect(described_class).to validate_jsonb_schema(['application_setting_search']) } + end + describe 'zoekt settings', feature_category: :global_search do it { expect(described_class).to validate_jsonb_schema(['application_setting_zoekt_settings']) } end diff --git a/spec/helpers/application_settings_helper_spec.rb b/spec/helpers/application_settings_helper_spec.rb index 6c915b288d333d..e984491b36b1f5 100644 --- a/spec/helpers/application_settings_helper_spec.rb +++ b/spec/helpers/application_settings_helper_spec.rb @@ -83,6 +83,11 @@ ]) end + it 'contains search parameters' do + expected_fields = %i[global_search_users_enabled global_search_merge_requests_enabled] + expect(helper.visible_attributes).to include(*expected_fields) + end + it 'contains GitLab for Slack app parameters' do params = %i[slack_app_enabled slack_app_id slack_app_secret slack_app_signing_secret slack_app_verification_token] diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb index d498c4bb3b82ad..a8356cdf9b4350 100644 --- a/spec/models/application_setting_spec.rb +++ b/spec/models/application_setting_spec.rb @@ -53,6 +53,8 @@ it { expect(setting.resource_access_token_notify_inherited).to be(false) } it { expect(setting.lock_resource_access_token_notify_inherited).to be(false) } it { expect(setting.ropc_without_client_credentials).to be(true) } + it { expect(setting.global_search_merge_requests_enabled).to be(true) } + it { expect(setting.global_search_users_enabled).to be(true) } end describe 'USERS_UNCONFIRMED_SECONDARY_EMAILS_DELETE_AFTER_DAYS' do @@ -95,6 +97,7 @@ } end + it { expect(described_class).to validate_jsonb_schema(['application_setting_search']) } it { expect(described_class).to validate_jsonb_schema(['resource_usage_limits']) } it { expect(described_class).to validate_jsonb_schema(['application_setting_rate_limits']) } it { expect(described_class).to validate_jsonb_schema(['application_setting_package_registry']) } -- GitLab From 9c1fa2c14db2caf9e7549095eaf9163aae4ea37a Mon Sep 17 00:00:00 2001 From: Siddharth Dungarwal Date: Tue, 14 Jan 2025 12:16:44 +0000 Subject: [PATCH 2/8] Apply 1 suggestion(s) to 1 file(s) --- ee/app/helpers/ee/application_settings_helper.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/ee/app/helpers/ee/application_settings_helper.rb b/ee/app/helpers/ee/application_settings_helper.rb index 18d2d70e7bd331..f694594adbf301 100644 --- a/ee/app/helpers/ee/application_settings_helper.rb +++ b/ee/app/helpers/ee/application_settings_helper.rb @@ -93,7 +93,6 @@ def visible_attributes :global_search_code_enabled, :global_search_commits_enabled, :global_search_wiki_enabled, - :global_search_users_enabled, :global_search_snippet_titles_enabled ].tap do |settings| settings.concat(identity_verification_attributes) -- GitLab From 17f6d6fc1acec7d6456fbcdc7f0e52cad957f223 Mon Sep 17 00:00:00 2001 From: Siddharth Dungarwal Date: Tue, 14 Jan 2025 13:53:18 +0000 Subject: [PATCH 3/8] Apply 1 suggestion(s) to 1 file(s) --- ee/spec/models/application_setting_spec.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ee/spec/models/application_setting_spec.rb b/ee/spec/models/application_setting_spec.rb index 0b52dff0d5d96e..6de62f24ca5e69 100644 --- a/ee/spec/models/application_setting_spec.rb +++ b/ee/spec/models/application_setting_spec.rb @@ -46,12 +46,12 @@ it { expect(setting.hard_phone_verification_transactions_daily_limit).to eq(20000) } it { expect(setting.telesign_intelligence_enabled).to eq(true) } it { expect(setting.fetch_observability_alerts_from_cloud).to eq(true) } - it { expect(setting.global_search_code_enabled).to eq(true) } - it { expect(setting.global_search_commits_enabled).to eq(true) } - it { expect(setting.global_search_merge_requests_enabled).to eq(true) } - it { expect(setting.global_search_wiki_enabled).to eq(true) } - it { expect(setting.global_search_users_enabled).to eq(true) } - it { expect(setting.global_search_snippet_titles_enabled).to eq(true) } + it { expect(setting.global_search_code_enabled).to be(true) } + it { expect(setting.global_search_commits_enabled).to be(true) } + it { expect(setting.global_search_merge_requests_enabled).to be(true) } + it { expect(setting.global_search_wiki_enabled).to be(true) } + it { expect(setting.global_search_users_enabled).to be(true) } + it { expect(setting.global_search_snippet_titles_enabled).to be(true) } end describe 'validations' do -- GitLab From 4560546d6c8b0cb2e20a83233001de4a290fa24b Mon Sep 17 00:00:00 2001 From: Siddharth Dungarwal Date: Tue, 14 Jan 2025 19:59:45 +0530 Subject: [PATCH 4/8] Do the review fixes --- .../json_schemas/application_setting_search.json | 4 ++-- .../json_schemas/application_setting_search.json | 12 ++++++------ .../helpers/ee/application_settings_helper_spec.rb | 6 +++++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/validators/json_schemas/application_setting_search.json b/app/validators/json_schemas/application_setting_search.json index 759b280a6b45ca..6227f1463d05dc 100644 --- a/app/validators/json_schemas/application_setting_search.json +++ b/app/validators/json_schemas/application_setting_search.json @@ -6,11 +6,11 @@ "properties": { "global_search_merge_requests_enabled": { "type": "boolean", - "description": "If global search for merge requests search is enabled" + "description": "Enable global search for merge requests search" }, "global_search_users_enabled": { "type": "boolean", - "description": "If global search for user search is enabled" + "description": "Enable global search for user search" } } } diff --git a/ee/app/validators/json_schemas/application_setting_search.json b/ee/app/validators/json_schemas/application_setting_search.json index c02b1bd9c6a418..74e0231683856c 100644 --- a/ee/app/validators/json_schemas/application_setting_search.json +++ b/ee/app/validators/json_schemas/application_setting_search.json @@ -6,27 +6,27 @@ "properties": { "global_search_code_enabled": { "type": "boolean", - "description": "If global search for code search is enabled" + "description": "Enable global search for code search" }, "global_search_commits_enabled": { "type": "boolean", - "description": "If global search for commits search is enabled" + "description": "Enable global search for commits search" }, "global_search_merge_requests_enabled": { "type": "boolean", - "description": "If global search for merge requests search is enabled" + "description": "Enable global search for merge requests search" }, "global_search_wiki_enabled": { "type": "boolean", - "description": "If global search for wiki search is enabled" + "description": "Enable global search for wiki search" }, "global_search_users_enabled": { "type": "boolean", - "description": "If global search for user search is enabled" + "description": "Enable global search for user search" }, "global_search_snippet_titles_enabled": { "type": "boolean", - "description": "If global search for snippet search is enabled" + "description": "Enable global search for snippet search" } } } diff --git a/ee/spec/helpers/ee/application_settings_helper_spec.rb b/ee/spec/helpers/ee/application_settings_helper_spec.rb index cd88e2730f408e..0bbaf0c2c98bcd 100644 --- a/ee/spec/helpers/ee/application_settings_helper_spec.rb +++ b/ee/spec/helpers/ee/application_settings_helper_spec.rb @@ -14,7 +14,11 @@ end it 'contains search parameters' do - expected_fields = %i[global_search_snippet_titles_enabled global_search_users_enabled global_search_wiki_enabled global_search_merge_requests_enabled global_search_commits_enabled global_search_code_enabled] + expected_fields = %i[ + global_search_snippet_titles_enabled global_search_users_enabled + global_search_wiki_enabled global_search_merge_requests_enabled + global_search_commits_enabled global_search_code_enabled + ] expect(visible_attributes).to include(*expected_fields) end -- GitLab From 2218281e2bde0797445efbc19634406053f50391 Mon Sep 17 00:00:00 2001 From: Siddharth Dungarwal Date: Wed, 15 Jan 2025 12:50:51 +0530 Subject: [PATCH 5/8] Add global_search_work_items_enabled to settings --- app/helpers/application_settings_helper.rb | 1 + app/models/application_setting.rb | 1 + app/validators/json_schemas/application_setting_search.json | 4 ++++ .../validators/json_schemas/application_setting_search.json | 4 ++++ ee/spec/helpers/ee/application_settings_helper_spec.rb | 2 +- ee/spec/models/application_setting_spec.rb | 1 + spec/helpers/application_settings_helper_spec.rb | 6 +++++- spec/models/application_setting_spec.rb | 1 + 8 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 2695e1eb2bb0f4..f0713ccca03e5f 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -546,6 +546,7 @@ def visible_attributes :show_migrate_from_jenkins_banner, :ropc_without_client_credentials, :global_search_merge_requests_enabled, + :global_search_work_items_enabled, :global_search_users_enabled ].tap do |settings| unless Gitlab.com? diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 4b20463f358b05..3f47c6ee833544 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -709,6 +709,7 @@ def self.kroki_formats_attributes jsonb_accessor :search, global_search_merge_requests_enabled: [:boolean, { default: true }], + global_search_work_items_enabled: [:boolean, { default: true }], global_search_users_enabled: [:boolean, { default: true }] validates :search, json_schema: { filename: 'application_setting_search' } diff --git a/app/validators/json_schemas/application_setting_search.json b/app/validators/json_schemas/application_setting_search.json index 6227f1463d05dc..c3efaea7c5efe5 100644 --- a/app/validators/json_schemas/application_setting_search.json +++ b/app/validators/json_schemas/application_setting_search.json @@ -4,6 +4,10 @@ "type": "object", "additionalProperties": true, "properties": { + "global_search_work_items_enabled": { + "type": "boolean", + "description": "Enable global search for work items search" + }, "global_search_merge_requests_enabled": { "type": "boolean", "description": "Enable global search for merge requests search" diff --git a/ee/app/validators/json_schemas/application_setting_search.json b/ee/app/validators/json_schemas/application_setting_search.json index 74e0231683856c..1a6d03107d1c0f 100644 --- a/ee/app/validators/json_schemas/application_setting_search.json +++ b/ee/app/validators/json_schemas/application_setting_search.json @@ -16,6 +16,10 @@ "type": "boolean", "description": "Enable global search for merge requests search" }, + "global_search_work_items_enabled": { + "type": "boolean", + "description": "Enable global search for work items search" + }, "global_search_wiki_enabled": { "type": "boolean", "description": "Enable global search for wiki search" diff --git a/ee/spec/helpers/ee/application_settings_helper_spec.rb b/ee/spec/helpers/ee/application_settings_helper_spec.rb index 0bbaf0c2c98bcd..a7f271ef1eb2a7 100644 --- a/ee/spec/helpers/ee/application_settings_helper_spec.rb +++ b/ee/spec/helpers/ee/application_settings_helper_spec.rb @@ -16,7 +16,7 @@ it 'contains search parameters' do expected_fields = %i[ global_search_snippet_titles_enabled global_search_users_enabled - global_search_wiki_enabled global_search_merge_requests_enabled + global_search_wiki_enabled global_search_merge_requests_enabled global_search_work_items_enabled global_search_commits_enabled global_search_code_enabled ] expect(visible_attributes).to include(*expected_fields) diff --git a/ee/spec/models/application_setting_spec.rb b/ee/spec/models/application_setting_spec.rb index 6de62f24ca5e69..39aa912bc33794 100644 --- a/ee/spec/models/application_setting_spec.rb +++ b/ee/spec/models/application_setting_spec.rb @@ -49,6 +49,7 @@ it { expect(setting.global_search_code_enabled).to be(true) } it { expect(setting.global_search_commits_enabled).to be(true) } it { expect(setting.global_search_merge_requests_enabled).to be(true) } + it { expect(setting.global_search_work_items_enabled).to be(true) } it { expect(setting.global_search_wiki_enabled).to be(true) } it { expect(setting.global_search_users_enabled).to be(true) } it { expect(setting.global_search_snippet_titles_enabled).to be(true) } diff --git a/spec/helpers/application_settings_helper_spec.rb b/spec/helpers/application_settings_helper_spec.rb index e984491b36b1f5..0ba2d4f5dd08fd 100644 --- a/spec/helpers/application_settings_helper_spec.rb +++ b/spec/helpers/application_settings_helper_spec.rb @@ -84,7 +84,11 @@ end it 'contains search parameters' do - expected_fields = %i[global_search_users_enabled global_search_merge_requests_enabled] + expected_fields = %i[ + global_search_users_enabled + global_search_merge_requests_enabled + global_search_work_items_enabled + ] expect(helper.visible_attributes).to include(*expected_fields) end diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb index a8356cdf9b4350..cde19ba6a9f79f 100644 --- a/spec/models/application_setting_spec.rb +++ b/spec/models/application_setting_spec.rb @@ -54,6 +54,7 @@ it { expect(setting.lock_resource_access_token_notify_inherited).to be(false) } it { expect(setting.ropc_without_client_credentials).to be(true) } it { expect(setting.global_search_merge_requests_enabled).to be(true) } + it { expect(setting.global_search_work_items_enabled).to be(true) } it { expect(setting.global_search_users_enabled).to be(true) } end -- GitLab From acdcaa4a2c4c93c43c6bb090a6e0c93710161e1b Mon Sep 17 00:00:00 2001 From: Siddharth Dungarwal Date: Wed, 15 Jan 2025 07:44:15 +0000 Subject: [PATCH 6/8] Apply 9 suggestion(s) to 2 file(s) Co-authored-by: Arturo Herrero --- .../json_schemas/application_setting_search.json | 6 +++--- .../json_schemas/application_setting_search.json | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/validators/json_schemas/application_setting_search.json b/app/validators/json_schemas/application_setting_search.json index c3efaea7c5efe5..6f8ee71ab86927 100644 --- a/app/validators/json_schemas/application_setting_search.json +++ b/app/validators/json_schemas/application_setting_search.json @@ -6,15 +6,15 @@ "properties": { "global_search_work_items_enabled": { "type": "boolean", - "description": "Enable global search for work items search" + "description": "Enable global search for work items" }, "global_search_merge_requests_enabled": { "type": "boolean", - "description": "Enable global search for merge requests search" + "description": "Enable global search for merge requests" }, "global_search_users_enabled": { "type": "boolean", - "description": "Enable global search for user search" + "description": "Enable global search for users" } } } diff --git a/ee/app/validators/json_schemas/application_setting_search.json b/ee/app/validators/json_schemas/application_setting_search.json index 1a6d03107d1c0f..88c3df91b36792 100644 --- a/ee/app/validators/json_schemas/application_setting_search.json +++ b/ee/app/validators/json_schemas/application_setting_search.json @@ -6,11 +6,11 @@ "properties": { "global_search_code_enabled": { "type": "boolean", - "description": "Enable global search for code search" + "description": "Enable global search for code" }, "global_search_commits_enabled": { "type": "boolean", - "description": "Enable global search for commits search" + "description": "Enable global search for commits" }, "global_search_merge_requests_enabled": { "type": "boolean", @@ -18,19 +18,19 @@ }, "global_search_work_items_enabled": { "type": "boolean", - "description": "Enable global search for work items search" + "description": "Enable global search for work items" }, "global_search_wiki_enabled": { "type": "boolean", - "description": "Enable global search for wiki search" + "description": "Enable global search for wikis" }, "global_search_users_enabled": { "type": "boolean", - "description": "Enable global search for user search" + "description": "Enable global search for users" }, "global_search_snippet_titles_enabled": { "type": "boolean", - "description": "Enable global search for snippet search" + "description": "Enable global search for snippets" } } } -- GitLab From 89f39e6b3bc0a5c10f9dfbe3b130042af536fc7e Mon Sep 17 00:00:00 2001 From: Siddharth Dungarwal Date: Wed, 15 Jan 2025 07:45:39 +0000 Subject: [PATCH 7/8] Apply 1 suggestion(s) to 1 file(s) --- ee/app/validators/json_schemas/application_setting_search.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/app/validators/json_schemas/application_setting_search.json b/ee/app/validators/json_schemas/application_setting_search.json index 88c3df91b36792..dee8fc265ff5ac 100644 --- a/ee/app/validators/json_schemas/application_setting_search.json +++ b/ee/app/validators/json_schemas/application_setting_search.json @@ -14,7 +14,7 @@ }, "global_search_merge_requests_enabled": { "type": "boolean", - "description": "Enable global search for merge requests search" + "description": "Enable global search for merge requests" }, "global_search_work_items_enabled": { "type": "boolean", -- GitLab From 36ac7cf749e30bf1f6b22f17d9e27cfc66de9249 Mon Sep 17 00:00:00 2001 From: Siddharth Dungarwal Date: Wed, 15 Jan 2025 10:34:48 +0000 Subject: [PATCH 8/8] Apply 4 suggestion(s) to 4 file(s) Co-authored-by: Arturo Herrero --- app/helpers/application_settings_helper.rb | 5 +---- ee/app/helpers/ee/application_settings_helper.rb | 6 +----- ee/spec/helpers/ee/application_settings_helper_spec.rb | 9 --------- spec/helpers/application_settings_helper_spec.rb | 9 --------- 4 files changed, 2 insertions(+), 27 deletions(-) diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index f0713ccca03e5f..3b9a6c732e1aa9 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -544,10 +544,7 @@ def visible_attributes :require_personal_access_token_expiry, :observability_backend_ssl_verification_enabled, :show_migrate_from_jenkins_banner, - :ropc_without_client_credentials, - :global_search_merge_requests_enabled, - :global_search_work_items_enabled, - :global_search_users_enabled + :ropc_without_client_credentials ].tap do |settings| unless Gitlab.com? settings << :resource_usage_limits diff --git a/ee/app/helpers/ee/application_settings_helper.rb b/ee/app/helpers/ee/application_settings_helper.rb index f694594adbf301..f15e415e7342dc 100644 --- a/ee/app/helpers/ee/application_settings_helper.rb +++ b/ee/app/helpers/ee/application_settings_helper.rb @@ -89,11 +89,7 @@ def visible_attributes :scan_execution_policies_action_limit, :secret_detection_service_auth_token, :secret_detection_service_url, - :fetch_observability_alerts_from_cloud, - :global_search_code_enabled, - :global_search_commits_enabled, - :global_search_wiki_enabled, - :global_search_snippet_titles_enabled + :fetch_observability_alerts_from_cloud ].tap do |settings| settings.concat(identity_verification_attributes) settings.concat(enable_promotion_management_attributes) diff --git a/ee/spec/helpers/ee/application_settings_helper_spec.rb b/ee/spec/helpers/ee/application_settings_helper_spec.rb index a7f271ef1eb2a7..ac82be01ecfd1f 100644 --- a/ee/spec/helpers/ee/application_settings_helper_spec.rb +++ b/ee/spec/helpers/ee/application_settings_helper_spec.rb @@ -13,15 +13,6 @@ expect(visible_attributes).to include(*%i[duo_features_enabled lock_duo_features_enabled duo_availability]) end - it 'contains search parameters' do - expected_fields = %i[ - global_search_snippet_titles_enabled global_search_users_enabled - global_search_wiki_enabled global_search_merge_requests_enabled global_search_work_items_enabled - global_search_commits_enabled global_search_code_enabled - ] - expect(visible_attributes).to include(*expected_fields) - end - it 'contains zoekt parameters' do expected_fields = %i[ zoekt_auto_delete_lost_nodes zoekt_auto_index_root_namespace zoekt_indexing_enabled diff --git a/spec/helpers/application_settings_helper_spec.rb b/spec/helpers/application_settings_helper_spec.rb index 0ba2d4f5dd08fd..6c915b288d333d 100644 --- a/spec/helpers/application_settings_helper_spec.rb +++ b/spec/helpers/application_settings_helper_spec.rb @@ -83,15 +83,6 @@ ]) end - it 'contains search parameters' do - expected_fields = %i[ - global_search_users_enabled - global_search_merge_requests_enabled - global_search_work_items_enabled - ] - expect(helper.visible_attributes).to include(*expected_fields) - end - it 'contains GitLab for Slack app parameters' do params = %i[slack_app_enabled slack_app_id slack_app_secret slack_app_signing_secret slack_app_verification_token] -- GitLab