diff --git a/app/graphql/mutations/user_preferences/update.rb b/app/graphql/mutations/user_preferences/update.rb index d051ab82171f6ac29ebea1e4a7dcd2f6c384067e..70037c8093a06e5a5c86706e89bd06fe41972322 100644 --- a/app/graphql/mutations/user_preferences/update.rb +++ b/app/graphql/mutations/user_preferences/update.rb @@ -8,7 +8,6 @@ class Update < BaseMutation NON_NULLABLE_ARGS = [ :extensions_marketplace_opt_in_status, :organization_groups_projects_display, - :use_web_ide_extension_marketplace, :visibility_pipeline_id_type, :use_work_items_view ].freeze @@ -19,9 +18,6 @@ class Update < BaseMutation argument :issues_sort, Types::IssueSortEnum, required: false, description: 'Sort order for issue lists.' - argument :use_web_ide_extension_marketplace, GraphQL::Types::Boolean, - required: false, - description: 'Whether Web IDE Extension Marketplace is enabled for the user.' argument :use_work_items_view, GraphQL::Types::Boolean, required: false, description: 'Use work item view instead of legacy issue view.' diff --git a/app/graphql/types/user_preferences_type.rb b/app/graphql/types/user_preferences_type.rb index 586e9e302cbd0948648372b9bb3c4e6da6764e06..9a2efdbece4bed07f08a1e765486735eae02d9df 100644 --- a/app/graphql/types/user_preferences_type.rb +++ b/app/graphql/types/user_preferences_type.rb @@ -21,11 +21,6 @@ class UserPreferencesType < BaseObject null: true # rubocop:disable GraphQL/ExtractType -- These are stored as user preferences - field :use_web_ide_extension_marketplace, GraphQL::Types::Boolean, - description: 'Whether Web IDE Extension Marketplace is enabled for the user.', - null: false, - deprecated: { reason: 'Use `extensions_marketplace_opt_in_status` instead', milestone: '16.11' } - field :use_work_items_view, GraphQL::Types::Boolean, description: 'Use work item view instead of legacy issue view.', null: true diff --git a/app/models/user.rb b/app/models/user.rb index 0ab60b0e00fe2062e3c7fe774cd02b8de4ec712c..08a555f901013a28df2647360aa7a545c9b88e96 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -415,7 +415,6 @@ def update_tracked_fields!(request) :tab_width, :tab_width=, :sourcegraph_enabled, :sourcegraph_enabled=, :gitpod_enabled, :gitpod_enabled=, - :use_web_ide_extension_marketplace, :use_web_ide_extension_marketplace=, :extensions_marketplace_opt_in_status, :extensions_marketplace_opt_in_status=, :organization_groups_projects_sort, :organization_groups_projects_sort=, :organization_groups_projects_display, :organization_groups_projects_display=, diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index 39452e0193369cd874ed3d966c8dff5c6233d31b..3de3d6f3ecf6c0891f90fde74ce6361803cd49b1 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true class UserPreference < ApplicationRecord - include IgnorableColumns - - ignore_column :use_web_ide_extension_marketplace, remove_with: '17.4', remove_after: '2024-08-15' - # We could use enums, but Rails 4 doesn't support multiple # enum options with same name for multiple fields, also it creates # extra methods that aren't really needed here. @@ -43,7 +39,6 @@ class UserPreference < ApplicationRecord attribute :render_whitespace_in_code, default: false attribute :project_shortcut_buttons, default: true attribute :keyboard_shortcuts_enabled, default: true - attribute :use_web_ide_extension_marketplace, default: false attribute :dpop_enabled, default: false enum :visibility_pipeline_id_type, { id: 0, iid: 1 }, scopes: false diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 248d8e8e5f7bc3c92e0ce894208e8a3a8d5db444..6739f98b22ab843b844f978a3d9e24800bcb591a 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -10179,7 +10179,6 @@ Input type: `UserPreferencesUpdateInput` | `issuesSort` | [`IssueSort`](#issuesort) | Sort order for issue lists. | | `organizationGroupsProjectsDisplay` **{warning-solid}** | [`OrganizationGroupProjectDisplay`](#organizationgroupprojectdisplay) | **Deprecated:** **Status**: Experiment. Introduced in GitLab 17.2. | | `organizationGroupsProjectsSort` **{warning-solid}** | [`OrganizationGroupProjectSort`](#organizationgroupprojectsort) | **Deprecated:** **Status**: Experiment. Introduced in GitLab 17.2. | -| `useWebIdeExtensionMarketplace` | [`Boolean`](#boolean) | Whether Web IDE Extension Marketplace is enabled for the user. | | `useWorkItemsView` | [`Boolean`](#boolean) | Use work item view instead of legacy issue view. | | `visibilityPipelineIdType` | [`VisibilityPipelineIdType`](#visibilitypipelineidtype) | Determines whether the pipeline list shows ID or IID. | @@ -34102,7 +34101,6 @@ fields relate to interactions between the two entities. | `issuesSort` | [`IssueSort`](#issuesort) | Sort order for issue lists. | | `organizationGroupsProjectsDisplay` **{warning-solid}** | [`OrganizationGroupProjectDisplay!`](#organizationgroupprojectdisplay) | **Introduced** in GitLab 17.2. **Status**: Experiment. Default list view for organization groups and projects. | | `organizationGroupsProjectsSort` **{warning-solid}** | [`OrganizationGroupProjectSort`](#organizationgroupprojectsort) | **Introduced** in GitLab 17.2. **Status**: Experiment. Sort order for organization groups and projects. | -| `useWebIdeExtensionMarketplace` **{warning-solid}** | [`Boolean!`](#boolean) | **Deprecated** in GitLab 16.11. Use `extensions_marketplace_opt_in_status` instead. | | `useWorkItemsView` | [`Boolean`](#boolean) | Use work item view instead of legacy issue view. | | `visibilityPipelineIdType` | [`VisibilityPipelineIdType`](#visibilitypipelineidtype) | Determines whether the pipeline list shows ID or IID. | diff --git a/spec/graphql/types/user_preferences_type_spec.rb b/spec/graphql/types/user_preferences_type_spec.rb index 919a8e08e340f6fe1203c39a65619c9ac1546bd8..9c30b8b02d4fd44cab5a19b8782f4b4490435508 100644 --- a/spec/graphql/types/user_preferences_type_spec.rb +++ b/spec/graphql/types/user_preferences_type_spec.rb @@ -10,7 +10,6 @@ issues_sort use_work_items_view visibility_pipeline_id_type - use_web_ide_extension_marketplace extensions_marketplace_opt_in_status organization_groups_projects_sort organization_groups_projects_display diff --git a/spec/requests/api/graphql/mutations/user_preferences/update_spec.rb b/spec/requests/api/graphql/mutations/user_preferences/update_spec.rb index d74b788ec78b6ddc7fd97f697b7b17f586979b1a..3d570ccbbe9569474524df00f942a65850bf4089 100644 --- a/spec/requests/api/graphql/mutations/user_preferences/update_spec.rb +++ b/spec/requests/api/graphql/mutations/user_preferences/update_spec.rb @@ -16,7 +16,6 @@ 'organizationGroupsProjectsDisplay' => 'GROUPS', 'organizationGroupsProjectsSort' => 'NAME_DESC', 'visibilityPipelineIdType' => 'IID', - 'useWebIdeExtensionMarketplace' => true, 'useWorkItemsView' => true } end @@ -34,14 +33,12 @@ expect(mutation_response['userPreferences']['organizationGroupsProjectsDisplay']).to eq('GROUPS') expect(mutation_response['userPreferences']['organizationGroupsProjectsSort']).to eq('NAME_DESC') expect(mutation_response['userPreferences']['visibilityPipelineIdType']).to eq('IID') - expect(mutation_response['userPreferences']['useWebIdeExtensionMarketplace']).to eq(true) expect(mutation_response['userPreferences']['useWorkItemsView']).to eq(true) expect(current_user.user_preference.persisted?).to eq(true) expect(current_user.user_preference.extensions_marketplace_opt_in_status).to eq('enabled') expect(current_user.user_preference.issues_sort).to eq(Types::IssueSortEnum.values[sort_value].value.to_s) expect(current_user.user_preference.visibility_pipeline_id_type).to eq('iid') - expect(current_user.user_preference.use_web_ide_extension_marketplace).to eq(false) expect(current_user.user_preference.use_work_items_view).to eq(true) end end @@ -54,7 +51,6 @@ organization_groups_projects_display: Types::Organizations::GroupsProjectsDisplayEnum.values['GROUPS'].value, organization_groups_projects_sort: 'NAME_DESC', visibility_pipeline_id_type: 'id', - use_web_ide_extension_marketplace: false, use_work_items_view: false } end @@ -87,7 +83,6 @@ 'organizationGroupsProjectsDisplay' => nil, 'organizationGroupsProjectsSort' => nil, 'visibilityPipelineIdType' => nil, - 'useWebIdeExtensionMarketplace' => nil, 'useWorkItemsView' => nil } end @@ -107,7 +102,6 @@ organization_groups_projects_display: init_user_preference[:organization_groups_projects_display], extensions_marketplace_opt_in_status: init_user_preference[:extensions_marketplace_opt_in_status], visibility_pipeline_id_type: init_user_preference[:visibility_pipeline_id_type], - use_web_ide_extension_marketplace: init_user_preference[:use_web_ide_extension_marketplace], use_work_items_view: init_user_preference[:use_work_items_view] }) end