A platform for community discussion. Free, open, simple.
FEATURE: Allow selecting multiple category types when creating a category (#40912)
Régis Hanol2d8ecf474bf1
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rbindex eb09b8d9572..036ff1d8171 100644--- a/app/controllers/categories_controller.rb+++ b/app/controllers/categories_controller.rb@@ -209,6 +209,27 @@ class CategoriesController < ApplicationControllerendendend++ additional_category_types =+ Array(params[:category_types]).compact_blank.map(&:to_sym) -+ [category_type&.to_sym, :discussion].compact++ additional_category_types.each do |additional_category_type|+ Categories::Configure.call(+ guardian:,+ params: {+ category_id: @category.id,+ category_type: additional_category_type,+ },+ ) do+ on_failed_policy(:type_is_available) do+ configure_error = category_type_unavailable_error(additional_category_type)+ raise ActiveRecord::Rollback+ end+ end+ end++ @category.reload if category_type.present? || additional_category_types.any?endenddiff --git a/frontend/discourse/admin/components/upsert-category/general.gjs b/frontend/discourse/admin/components/upsert-category/general.gjsindex 4aafb7d8383..16cc30318a0 100644--- a/frontend/discourse/admin/components/upsert-category/general.gjs+++ b/frontend/discourse/admin/components/upsert-category/general.gjs@@ -70,6 +70,7 @@ export default class UpsertCategoryGeneral extends Component {constructor() {super(...arguments);+this.categoryTypes = [...this.categoryTypeChooser.allTypes].map((type) => ({...type,preventRemoval: type.id === DISCUSSION_TYPE_ID,@@ -620,12 +621,13 @@ export default class UpsertCategoryGeneral extends Component {}<template>- {{#if this.isEditingExistingCategory}}+ {{#if (or this.isEditingExistingCategory @showAdvancedTabs)}}<@form.Field@name="category_types"@title={{i18n "category.category_types"}}@format="max"@type="custom"+ @showOptional={{false}}as |field|><field.Control>diff --git a/frontend/discourse/admin/controllers/edit-category/tabs.js b/frontend/discourse/admin/controllers/edit-category/tabs.jsindex 46e098afeaa..05604fe08f8 100644--- a/frontend/discourse/admin/controllers/edit-category/tabs.js+++ b/frontend/discourse/admin/controllers/edit-category/tabs.js@@ -67,6 +67,7 @@ const SIMPLIFIED_FIELD_LIST = [];const SHOW_ADVANCED_TABS_KEY = "category_edit_show_advanced_tabs";+const DISCUSSION_TYPE_ID = "discussion";export default class EditCategoryTabsController extends Controller {@service currentUser;@@ -138,6 +139,10 @@ export default class EditCategoryTabsController extends Controller {data.site_texts = {};data.category_types = Object.keys(this.model.categoryTypes ?? {});+ if (!data.category_types.includes(DISCUSSION_TYPE_ID)) {+ data.category_types.unshift(DISCUSSION_TYPE_ID);+ }+Object.values(this.model.categoryTypes ?? {}).forEach((categoryType) => {categoryType.configuration_schema.category_custom_fields?.forEach((field) => {diff --git a/frontend/discourse/admin/templates/edit-category/tabs.gjs b/frontend/discourse/admin/templates/edit-category/tabs.gjsindex 45fcc1bc09f..16b98bf8fec 100644--- a/frontend/discourse/admin/templates/edit-category/tabs.gjs+++ b/frontend/discourse/admin/templates/edit-category/tabs.gjs@@ -91,6 +91,7 @@ export default class Tabs extends Component {@selectedTab={{@controller.selectedTab}}@categoryType={{@controller.selectedTab}}@category={{@controller.model}}+ @showAdvancedTabs={{@controller.showAdvancedTabs}}@registerValidator={{@controller.registerValidator}}@registerAfterReset={{@controller.registerAfterReset}}@transientData={{transientData}}diff --git a/frontend/discourse/app/models/category.js b/frontend/discourse/app/models/category.jsindex dbd7f6f5492..7deccf58e31 100644--- a/frontend/discourse/app/models/category.js+++ b/frontend/discourse/app/models/category.js@@ -862,7 +862,10 @@ export default class Category extends RestModel {};if (!id && this.categoryTypes) {- props.category_type = Object.keys(this.categoryTypes)[0];+ const primaryType = Object.keys(this.categoryTypes)[0];+ if (this.category_types?.includes(primaryType)) {+ props.category_type = primaryType;+ }}return props;diff --git a/plugins/discourse-solved/spec/requests/categories_controller_spec.rb b/plugins/discourse-solved/spec/requests/categories_controller_spec.rbindex 9e8ec038263..952bb146983 100644--- a/plugins/discourse-solved/spec/requests/categories_controller_spec.rb+++ b/plugins/discourse-solved/spec/requests/categories_controller_spec.rb@@ -6,6 +6,25 @@ RSpec.describe CategoriesController dobefore { sign_in(admin) }+ describe "#create" do+ it "can enable the support type alongside another type while creating a category" do+ post "/categories.json",+ params: {+ name: "Multi Type",+ category_type: "discussion",+ category_types: %w[discussion support],+ }++ expect(response.status).to eq(200)+ cat_json = response.parsed_body["category"]+ expect(cat_json["category_types"].keys).to include("support", "discussion")++ category = Category.find(cat_json["id"])+ expect(category.category_types.keys).to include(:support, :discussion)+ expect(category.enable_accepted_answers?).to eq(true)+ end+ end+describe "#update" doit "can add the support type to the category" doexpect(category.enable_accepted_answers?).to eq(false)diff --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 f487ccf023f..335c5c796ec 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@@ -46,6 +46,47 @@ RSpec.describe "Support Category Type Setup" doexpect(category.custom_fields["empty_box_on_unsolved"]).to eq("true")end+ it "can add the support type via the selector while creating a category of another type" do+ visit("/new-category/setup")+ category_type_card.find_type_card("discussion").click+ expect(page).to have_content(I18n.t("js.category.create_with_type", typeName: "discussion"))++ form.field("name").fill_in("Discussion + Support")++ # The type selector is only available under advanced settings while creating.+ expect(page).to have_no_css(".category-type-selector")+ category_page.toggle_advanced_settings++ category_type_selector = PageObjects::Components::DMenu.new(".category-type-selector")+ category_type_selector.expand+ category_type_selector.option(".category-type-selector__result.--category-type-support").click+ banner.click_save++ expect(page).to have_css(".d-nav-submenu__tabs .edit-category-support")+ category = Category.find_by(name: "Discussion + Support")+ expect(category.category_types.keys).to include(:discussion, :support)+ expect(category.enable_accepted_answers?).to eq(true)+ end++ it "can remove the type picked on the setup screen while creating a category" do+ visit("/new-category/setup")+ category_type_card.find_type_card("support").click+ expect(page).to have_content(I18n.t("js.category.create_with_type", typeName: "support"))++ form.field("name").fill_in("No longer support")++ category_page.toggle_advanced_settings++ category_type_selector = PageObjects::Components::DMenu.new(".category-type-selector")+ category_type_selector.remove_selected_option("Support")+ banner.click_save++ expect(page).to have_no_css(".d-nav-submenu__tabs .edit-category-support")+ category = Category.find_by(name: "No longer support")+ expect(category.category_types.keys).to eq(%i[discussion])+ expect(category.enable_accepted_answers?).to eq(false)+ end+it "is able to click the support tab when creating a new category when solved is disabled" doSiteSetting.solved_enabled = falsevisit("/new-category/setup")diff --git a/plugins/discourse-topic-voting/spec/system/ideas_category_type_setup_spec.rb b/plugins/discourse-topic-voting/spec/system/ideas_category_type_setup_spec.rbindex 87ba45a9810..e31a487d201 100644--- a/plugins/discourse-topic-voting/spec/system/ideas_category_type_setup_spec.rb+++ b/plugins/discourse-topic-voting/spec/system/ideas_category_type_setup_spec.rb@@ -38,6 +38,25 @@ RSpec.describe "Ideas Category Type Setup" doexpect(Category.can_vote?(category.id)).to eq(true)end+ it "can remove the ideas type picked on the setup screen while creating a category" do+ visit("/new-category/setup")+ category_type_card.find_type_card("ideas").click+ expect(page).to have_content(I18n.t("js.category.create_with_type", typeName: "ideas"))++ form.field("name").fill_in("No longer ideas")++ category_page.toggle_advanced_settings++ category_type_selector = PageObjects::Components::DMenu.new(".category-type-selector")+ category_type_selector.remove_selected_option("Ideas")+ banner.click_save++ expect(page).to have_no_css(".d-nav-submenu__tabs .edit-category-ideas")+ category = Category.find_by(name: "No longer ideas")+ expect(category.category_types.keys).to eq(%i[discussion])+ expect(Category.can_vote?(category.id)).to eq(false)+ end+context "when the ideas category type setup is disabled" dobefore { SiteSetting.enable_ideas_category_type_setup = false }