A platform for community discussion. Free, open, simple.
DEV: Remove enable_category_type_setup hidden setting (#38396)
Martin Brennanf4cf97ab5efa
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rbindex f9b85f12bd5..5abbc53a440 100644--- a/app/controllers/categories_controller.rb+++ b/app/controllers/categories_controller.rb@@ -173,8 +173,7 @@ class CategoriesController < ApplicationController@category.move_to(position.to_i) if positionif category_type.present? &&- UpcomingChanges.enabled_for_user?(:enable_simplified_category_creation, current_user) &&- SiteSetting.enable_category_type_setup+ UpcomingChanges.enabled_for_user?(:enable_simplified_category_creation, current_user)Categories::Configure.call(guardian:,params: {@@ -233,8 +232,7 @@ class CategoriesController < ApplicationControllerendcategory_params.delete(:custom_fields)- if SiteSetting.enable_category_type_setup &&- UpcomingChanges.enabled_for_user?(:enable_simplified_category_creation, current_user) &&+ if UpcomingChanges.enabled_for_user?(:enable_simplified_category_creation, current_user) &¶ms[:category_type_site_settings].present?# NOTE: The code in this block is pretty similar to what we are doing in# configure_site_settings in Categories::Types::Base, however here wediff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rbindex 94693c4cfda..285723b7aef 100644--- a/app/serializers/category_serializer.rb+++ b/app/serializers/category_serializer.rb@@ -151,9 +151,7 @@ class CategorySerializer < SiteCategorySerializerenddef category_types- if !SiteSetting.enable_simplified_category_creation || !SiteSetting.enable_category_type_setup- return {}- end+ return {} if !SiteSetting.enable_simplified_category_creationobject.category_typesendenddiff --git a/config/site_settings.yml b/config/site_settings.ymlindex 40e0305938f..c164234c7fb 100644--- a/config/site_settings.yml+++ b/config/site_settings.yml@@ -4312,10 +4312,6 @@ experimental:experimental_topic_category_change_notification:default: falsehidden: true- enable_category_type_setup:- default: false- hidden: true- client: trueenable_upcoming_changes:default: falsehidden: truediff --git a/db/migrate/20260310001245_remove_enable_category_type_setup_site_setting.rb b/db/migrate/20260310001245_remove_enable_category_type_setup_site_setting.rbnew file mode 100644index 00000000000..9a994084cfe--- /dev/null+++ b/db/migrate/20260310001245_remove_enable_category_type_setup_site_setting.rb@@ -0,0 +1,11 @@+# frozen_string_literal: true++class RemoveEnableCategoryTypeSetupSiteSetting < ActiveRecord::Migration[8.0]+ def up+ execute "DELETE FROM site_settings WHERE name = 'enable_category_type_setup'"+ end++ def down+ raise ActiveRecord::IrreversibleMigration+ end+enddiff --git a/frontend/discourse/admin/controllers/edit-category/tabs.js b/frontend/discourse/admin/controllers/edit-category/tabs.jsindex b737d12bd5c..ee8d076b73f 100644--- a/frontend/discourse/admin/controllers/edit-category/tabs.js+++ b/frontend/discourse/admin/controllers/edit-category/tabs.js@@ -111,25 +111,21 @@ export default class EditCategoryTabsController extends Controller {data.category_setting = { ...(this.model.category_setting ?? {}) };data.custom_fields = { ...(this.model.custom_fields ?? {}) };- if (this.siteSettings.enable_category_type_setup) {- data.category_type_site_settings = {};-- Object.values(this.model.category_types).forEach((categoryType) => {- categoryType.configuration_schema.category_custom_fields?.forEach(- (field) => {- data.custom_fields[field.key] ??= field.default;- }- );-- categoryType.configuration_schema.site_settings?.forEach(- (setting) => {- data.category_type_site_settings[setting.key] = this.model.id- ? setting.current- : setting.default;- }- );+ data.category_type_site_settings = {};++ Object.values(this.model.category_types).forEach((categoryType) => {+ categoryType.configuration_schema.category_custom_fields?.forEach(+ (field) => {+ data.custom_fields[field.key] ??= field.default;+ }+ );++ categoryType.configuration_schema.site_settings?.forEach((setting) => {+ data.category_type_site_settings[setting.key] = this.model.id+ ? setting.current+ : setting.default;});- }+ });}return data;diff --git a/frontend/discourse/app/models/category.js b/frontend/discourse/app/models/category.jsindex bee83188e3d..790f8709c3f 100644--- a/frontend/discourse/app/models/category.js+++ b/frontend/discourse/app/models/category.js@@ -844,10 +844,6 @@ export default class Category extends RestModel {}_categoryTypeSaveProperties(id) {- if (!this.siteSettings.enable_category_type_setup) {- return {};- }-const props = {category_type_site_settings: this.category_type_site_settings,};diff --git a/frontend/discourse/app/services/category-type-chooser.js b/frontend/discourse/app/services/category-type-chooser.jsindex 4e4e31d2516..f898fec7783 100644--- a/frontend/discourse/app/services/category-type-chooser.js+++ b/frontend/discourse/app/services/category-type-chooser.js@@ -8,10 +8,7 @@ export default class CategoryTypeChooser extends Service {_setupComplete = false;get isEnabled() {- return (- this.siteSettings.enable_simplified_category_creation &&- this.siteSettings.enable_category_type_setup- );+ return this.siteSettings.enable_simplified_category_creation;}get hasCompletedSetup() {diff --git a/frontend/discourse/tests/acceptance/category-new-test.js b/frontend/discourse/tests/acceptance/category-new-test.jsindex d72ff404166..ae2f3dddfb9 100644--- a/frontend/discourse/tests/acceptance/category-new-test.js+++ b/frontend/discourse/tests/acceptance/category-new-test.js@@ -125,7 +125,6 @@ acceptance("Category type setup page", function (needs) {needs.user({ admin: true, can_create_category: true });needs.settings({enable_simplified_category_creation: true,- enable_category_type_setup: true,});needs.pretender((server, helper) => {server.get("/categories/types", () => {@@ -172,25 +171,6 @@ acceptance("Category type setup page", function (needs) {});});-acceptance("Category type setup disabled", function (needs) {- needs.user({ admin: true, can_create_category: true });- needs.settings({- enable_simplified_category_creation: true,- enable_category_type_setup: false,- });-- test("Visiting /new-category goes directly to form", async function (assert) {- await visit("/new-category");- assert.strictEqual(currentURL(), "/new-category/general");- assert.dom(".edit-category").exists();- });-- test("Visiting /new-category/setup redirects to new-category", async function (assert) {- await visit("/new-category/setup");- assert.strictEqual(currentURL(), "/new-category/general");- });-});-acceptance("Category text color", function (needs) {needs.user({ can_create_category: true });needs.pretender((server, helper) => {diff --git a/frontend/discourse/tests/fixtures/category-fixtures.js b/frontend/discourse/tests/fixtures/category-fixtures.jsindex 07eb53fefe5..4f96a6761b1 100644--- a/frontend/discourse/tests/fixtures/category-fixtures.js+++ b/frontend/discourse/tests/fixtures/category-fixtures.js@@ -40,6 +40,13 @@ export default {"Can't delete this category because it has 2030 topics. Oldest topic is <a href=\"https://localhost:3000/t/when-a-new-post-appears-in-a-topic-the-bookmark-isn-t-updated/39\">When a new post appears in a topic, the bookmark isn't updated</a>.",allow_badges: true,custom_fields: {},+ category_types: {+ discussion: {+ id: "discussion",+ name: "Discussion",+ configuration_schema: {}+ },+ }},},"/c/11/show.json": {@@ -113,6 +120,13 @@ export default {uploaded_background_dark: null,required_tag_groups: [{ min_count: 1, name: "TagGroup1" }],category_localizations: [],+ category_types: {+ discussion: {+ id: "discussion",+ name: "Discussion",+ configuration_schema: {}+ },+ }},},"/c/2481/show.json": {@@ -128,6 +142,13 @@ export default {group_permissions: [{ permission_type: 1, group_name: "moderators", group_id: 2 },],+ category_types: {+ discussion: {+ id: "discussion",+ name: "Discussion",+ configuration_schema: {}+ },+ }},},};diff --git a/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings-upsert.gjs b/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings-upsert.gjsindex ba9773b9e8d..bdc1a68d04a 100644--- a/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings-upsert.gjs+++ b/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings-upsert.gjs@@ -11,10 +11,7 @@ export default class SolvedSettingsUpsert extends Component {// in Categories::Types::Support.return (context.siteSettings.enable_simplified_category_creation &&- !(- context.siteSettings.enable_category_type_setup &&- args.category?.isType("support")- )+ !args.category?.isType("support"));}diff --git a/plugins/discourse-solved/spec/system/simplified_category_settings_spec.rb b/plugins/discourse-solved/spec/system/simplified_category_settings_spec.rbdeleted file mode 100644index e1328374930..00000000000--- a/plugins/discourse-solved/spec/system/simplified_category_settings_spec.rb+++ /dev/null@@ -1,35 +0,0 @@-# frozen_string_literal: true--describe "Solved - Simplified Category Settings", type: :system do- fab!(:admin)- fab!(:category)-- let(:category_page) { PageObjects::Pages::Category.new }- let(:form) { PageObjects::Components::FormKit.new(".form-kit") }-- before do- SiteSetting.enable_simplified_category_creation = true- SiteSetting.solved_enabled = true- sign_in(admin)- end-- describe "enable_accepted_answers" do- it "saves 'true' when enabling accepted answers" do- category_page.visit_settings(category)- form.field("custom_fields.enable_accepted_answers").toggle- category_page.save_settings-- expect(category.reload.custom_fields["enable_accepted_answers"]).to eq("true")- end-- it "saves 'false' when disabling accepted answers" do- category.upsert_custom_fields("enable_accepted_answers" => "true")-- category_page.visit_settings(category)- form.field("custom_fields.enable_accepted_answers").toggle- category_page.save_settings-- expect(category.reload.custom_fields["enable_accepted_answers"]).to eq("false")- end- end-enddiff --git a/plugins/discourse-solved/spec/system/support_category_type_setup_spec.rb b/plugins/discourse-solved/spec/system/support_category_type_setup_spec.rbindex d9897639b5c..467e49fc542 100644--- a/plugins/discourse-solved/spec/system/support_category_type_setup_spec.rb+++ b/plugins/discourse-solved/spec/system/support_category_type_setup_spec.rb@@ -10,7 +10,6 @@ RSpec.describe "Support Category Type Setup", type: :system dobefore doSiteSetting.enable_simplified_category_creation = true- SiteSetting.enable_category_type_setup = truesign_in(admin)enddiff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rbindex 7de81207658..273f7dcaf7b 100644--- a/spec/requests/categories_controller_spec.rb+++ b/spec/requests/categories_controller_spec.rb@@ -592,10 +592,7 @@ RSpec.describe CategoriesController doenddescribe "when category_type is provided" do- before do- SiteSetting.enable_category_type_setup = true- SiteSetting.enable_simplified_category_creation = true- end+ before { SiteSetting.enable_simplified_category_creation = true }it "creates a category with the category type" dopost "/categories.json", params: { name: "Test Category", category_type: "discussion" }@@ -1208,10 +1205,7 @@ RSpec.describe CategoriesController doendcontext "when category_type_site_settings are provided" do- before do- SiteSetting.enable_category_type_setup = true- SiteSetting.enable_simplified_category_creation = true- end+ before { SiteSetting.enable_simplified_category_creation = true }it "can set site_settings for the category type when they match the schema" doCategories::Types::Discussion.stubs(:configuration_schema).returns(diff --git a/spec/system/page_objects/pages/category.rb b/spec/system/page_objects/pages/category.rbindex 2c6e362cd90..01ceace3ba1 100644--- a/spec/system/page_objects/pages/category.rb+++ b/spec/system/page_objects/pages/category.rb@@ -39,7 +39,7 @@ module PageObjectsenddef visit_new_category- page.visit("/new-category")+ page.visit("/new-category/setup")selfenddiff --git a/spec/system/simplified_category_creation_spec.rb b/spec/system/simplified_category_creation_spec.rbindex 534ee805ee4..8540bbbe9b2 100644--- a/spec/system/simplified_category_creation_spec.rb+++ b/spec/system/simplified_category_creation_spec.rb@@ -7,6 +7,7 @@ describe "Simplified Category Creation" dolet(:category_page) { PageObjects::Pages::Category.new }let(:form) { PageObjects::Components::FormKit.new(".form-kit") }+ let(:category_type_card) { PageObjects::Components::CategoryTypeCard.new }let(:category_permission_row) { PageObjects::Components::CategoryPermissionRow.new }before do@@ -17,6 +18,7 @@ describe "Simplified Category Creation" dodescribe "General Tab" doit "creates a basic category with name and color" docategory_page.visit_new_category+ category_type_card.find_type_card("discussion").clickform.field("name").fill_in("Test Category")form.field("color").fill_in("FF5733")@@ -82,6 +84,7 @@ describe "Simplified Category Creation" doit "shows error when icon is missing" docategory_page.visit_new_category+ category_type_card.find_type_card("discussion").clickform.field("name").fill_in("Test Category")@@ -109,6 +112,7 @@ describe "Simplified Category Creation" doFabricate(:category, name: "Restricted Parent", permissions: { group.name => :full })category_page.visit_new_category+ category_type_card.find_type_card("discussion").clickparent_chooser = PageObjects::Components::SelectKit.new(".category-chooser")parent_chooser.expand@@ -139,6 +143,7 @@ describe "Simplified Category Creation" doexpect(page).to have_css(".group-chooser")category_page.visit_new_category+ category_type_card.find_type_card("discussion").clickexpect(page).to have_no_css(".group-chooser")end