A platform for community discussion. Free, open, simple.
DEV: Move enable_simplified_category_creation to stable (#39212)
Martin Brennan1a2edc1201c7
diff --git a/config/site_settings.yml b/config/site_settings.ymlindex c87e8eadff8..ddaa1d24ff4 100644--- a/config/site_settings.yml+++ b/config/site_settings.yml@@ -4323,7 +4323,7 @@ experimental:hidden: trueclient: trueupcoming_change:- status: "beta"+ status: "stable"impact: "feature,staff"learn_more_url: "https://meta.discourse.org/t/-/394971"experimental_topic_category_change_notification:diff --git a/frontend/discourse/admin/components/upsert-category/general.gjs b/frontend/discourse/admin/components/upsert-category/general.gjsindex e451f27cdf5..e9f099d3e97 100644--- a/frontend/discourse/admin/components/upsert-category/general.gjs+++ b/frontend/discourse/admin/components/upsert-category/general.gjs@@ -483,6 +483,41 @@ export default class UpsertCategoryGeneral extends Component {return rDiff + gDiff + bDiff;}+ @action+ validateColor(name, color, { addError }) {+ color = color.trim();++ let title;+ if (name === "color") {+ title = i18n("category.background_color");+ } else {+ throw new Error(`unknown title for category attribute ${name}`);+ }++ if (!color) {+ addError(name, {+ title,+ message: i18n("category.color_validations.cant_be_empty"),+ });+ return;+ }++ if (color.length !== 3 && color.length !== 6) {+ addError(name, {+ title,+ message: i18n("category.color_validations.incorrect_length"),+ });+ return;+ }++ if (!/^[0-9A-Fa-f]+$/.test(color)) {+ addError(name, {+ title,+ message: i18n("category.color_validations.non_hexdecimal"),+ });+ }+ }+#setFormPermissions(permissions) {this.args.form.set("permissions", permissions);}@@ -530,6 +565,7 @@ export default class UpsertCategoryGeneral extends Component {@title={{i18n "category.background_color"}}@format="max"@validation="required"+ @validate={{this.validateColor}}@onSet={{this.onBackgroundColorSet}}@type="color"as |field|diff --git a/plugins/discourse-topic-voting/spec/system/voting_spec.rb b/plugins/discourse-topic-voting/spec/system/voting_spec.rbindex 6d025ceeacb..d8ae8146746 100644--- a/plugins/discourse-topic-voting/spec/system/voting_spec.rb+++ b/plugins/discourse-topic-voting/spec/system/voting_spec.rb@@ -20,6 +20,7 @@ RSpec.describe "Topic voting" dolet(:topic_page) { PageObjects::Pages::Topic.new }let(:user_page) { PageObjects::Pages::User.new }let(:admin_page) { PageObjects::Pages::AdminSiteSettings.new }+ let(:form) { PageObjects::Components::FormKit.new(".form-kit") }before doSiteSetting.topic_voting_enabled = true@@ -31,10 +32,9 @@ RSpec.describe "Topic voting" doexpect(category_page).to have_no_css(category_page.votes)# enable voting in category- category_page- .visit_settings(category1)- .toggle_setting("enable-topic-voting", "Allow users to vote on topics in this category")- .save_settings+ category_page.visit_settings(category1)+ form.field("custom_fields.enable_topic_voting").toggle+ category_page.save_settingsexpect(Category.can_vote?(category1.id)).to eq(true)diff --git a/spec/system/category_localizations_spec.rb b/spec/system/category_localizations_spec.rbindex 970905c9b9f..48333363a7f 100644--- a/spec/system/category_localizations_spec.rb+++ b/spec/system/category_localizations_spec.rb@@ -277,7 +277,6 @@ describe "Category Localizations" docategory_page.visit(category)category_page.click_edit_category- category_page.click_setting_tab("general")expect(find(".edit-category-tab-general input.category-name").value).to eq(category.name,diff --git a/spec/system/edit_category_general_spec.rb b/spec/system/edit_category_general_spec.rbindex 1fed5803442..48bacb03c3c 100644--- a/spec/system/edit_category_general_spec.rb+++ b/spec/system/edit_category_general_spec.rb@@ -17,12 +17,6 @@ describe "Edit Category General" doI18n.t("js.category.color_validations.non_hexdecimal"),)- form.field("color").fill_in("")- category_page.save_settings- expect(form.field("color")).to have_errors(- I18n.t("js.category.color_validations.cant_be_empty"),- )-form.field("color").fill_in("A")category_page.save_settingsexpect(form.field("color")).to have_errors(@@ -38,36 +32,4 @@ describe "Edit Category General" doexpect(form.field("color")).to have_no_errorsendend-- context "when changing text color" do- it "displays an error when the hex code is invalid" do- category_page.visit_general(category)-- form.field("text_color").fill_in("ABZ")- category_page.save_settings- expect(form.field("text_color")).to have_errors(- I18n.t("js.category.color_validations.non_hexdecimal"),- )-- form.field("text_color").fill_in("")- category_page.save_settings- expect(form.field("text_color")).to have_errors(- I18n.t("js.category.color_validations.cant_be_empty"),- )-- form.field("text_color").fill_in("A")- category_page.save_settings- expect(form.field("text_color")).to have_errors(- I18n.t("js.category.color_validations.incorrect_length"),- )- end-- it "saves successfully when the hex code is valid" do- category_page.visit_general(category)-- form.field("text_color").fill_in("AB1")- category_page.save_settings- expect(form.field("text_color")).to have_no_errors- end- endenddiff --git a/spec/system/edit_category_settings_spec.rb b/spec/system/edit_category_settings_spec.rbindex 743bd1245f7..e194bab32c4 100644--- a/spec/system/edit_category_settings_spec.rb+++ b/spec/system/edit_category_settings_spec.rb@@ -5,6 +5,7 @@ describe "Edit Category Settings" dofab!(:category)let(:category_page) { PageObjects::Pages::Category.new }+ let(:form) { PageObjects::Components::FormKit.new(".form-kit") }let(:category_default_view_select_kit) doPageObjects::Components::SelectKit.new("#category-default-view")end@@ -13,7 +14,7 @@ describe "Edit Category Settings" dodescribe "default view" doit "allows selecting hot as the default view" do- category_page.visit_settings(category)+ category_page.visit_appearance(category)category_default_view_select_kit.expandexpect(category_default_view_select_kit).to have_option_value("hot")@@ -51,15 +52,16 @@ describe "Edit Category Settings" docategory_page.topic_posting_review_mode_chooser.expandcategory_page.topic_posting_review_mode_chooser.select_row_by_value("everyone_except")+ category_page.topic_posting_review_mode_chooser.collapsecategory_page.save_settings- expect(dialog).to have_content(- I18n.t("category.errors.groups_required_for_mode", setting: "topic_posting_review_mode"),+ expect(form.field("topic_posting_review_group_ids")).to have_errors(+ I18n.t("js.category.validations.groups_required"),)- dialog.click_okcategory_page.topic_posting_review_group_chooser.expandcategory_page.topic_posting_review_group_chooser.select_row_by_value(group.id)+ category_page.topic_posting_review_group_chooser.collapsecategory_page.save_settingsdiff --git a/spec/system/edit_category_tags_spec.rb b/spec/system/edit_category_tags_spec.rbindex 3ce4bc82a03..9c0303cbed6 100644--- a/spec/system/edit_category_tags_spec.rb+++ b/spec/system/edit_category_tags_spec.rb@@ -8,9 +8,11 @@ describe "Edit Category Tags" dofab!(:tag3) { Fabricate(:tag, name: "tag3") }fab!(:tag_group) { Fabricate(:tag_group, name: "My Group", tags: [tag2]) }let(:category_page) { PageObjects::Pages::Category.new }- let(:allowed_tags_chooser) { PageObjects::Components::SelectKit.new("#category-allowed-tags") }+ let(:allowed_tags_chooser) do+ PageObjects::Components::SelectKit.new("#control-allowed_tags .tag-chooser")+ endlet(:allowed_tag_groups_chooser) do- PageObjects::Components::SelectKit.new("#category-allowed-tag-groups")+ PageObjects::Components::SelectKit.new("#category-allowed-tag-groups.tag-group-chooser")endlet(:composer) { PageObjects::Components::Composer.new }diff --git a/spec/system/edit_category_topic_template_spec.rb b/spec/system/edit_category_topic_template_spec.rbindex 3836d7ea715..814f4127a52 100644--- a/spec/system/edit_category_topic_template_spec.rb+++ b/spec/system/edit_category_topic_template_spec.rb@@ -8,29 +8,12 @@ describe "Edit category topic template" dolet(:changes_banner) { PageObjects::Components::AdminChangesBanner.new }- context "with simplified category creation" do- before { SiteSetting.enable_simplified_category_creation = true }+ it "saves and displays a custom topic title placeholder" do+ visit "/c/#{category.slug}/edit/topic-template"+ find("#category-topic-title-placeholder").fill_in(with: "Describe your issue briefly")+ expect(changes_banner).to be_visible+ changes_banner.click_save- it "saves and displays a custom topic title placeholder" do- visit "/c/#{category.slug}/edit/topic-template"- find("#category-topic-title-placeholder").fill_in(with: "Describe your issue briefly")- expect(changes_banner).to be_visible- changes_banner.click_save-- expect(category.reload.topic_title_placeholder).to eq("Describe your issue briefly")- end- end-- context "with legacy category editing" do- it "saves and displays a custom topic title placeholder" do- visit "/c/#{category.slug}/edit/topic-template"- find("#category-topic-title-placeholder").fill_in(with: "Describe your issue briefly")-- # sleep to account for debounce- sleep 0.6- find("#save-category").click-- expect(category.reload.topic_title_placeholder).to eq("Describe your issue briefly")- end+ expect(category.reload.topic_title_placeholder).to eq("Describe your issue briefly")endenddiff --git a/spec/system/page_objects/pages/category.rb b/spec/system/page_objects/pages/category.rbindex 79284c86a4f..8092520383a 100644--- a/spec/system/page_objects/pages/category.rb+++ b/spec/system/page_objects/pages/category.rb@@ -3,8 +3,6 @@module PageObjectsmodule Pagesclass Category < PageObjects::Pages::Base- # keeping the various category related features combined for now-def visit(category)page.visit("/c/#{category.id}")self@@ -53,13 +51,18 @@ module PageObjectsselfend+ def visit_appearance(category)+ visit_images(category)+ self+ end+def visit_images(category)page.visit("/c/#{category.slug}/edit/images")selfenddef back_to_category- find(".edit-category-title-bar span", text: "Back to category").click+ find(".edit-category .back-button").clickselfend@@ -96,7 +99,7 @@ module PageObjectsenddef toggle_form_templates- find(".d-toggle-switch .d-toggle-switch__checkbox-slider").click+ PageObjects::Components::DToggleSwitch.new(".toggle-template-type").toggleselfend@@ -185,7 +188,7 @@ module PageObjectspage.has_css?(".category-header h1", text: title)end- def topic_posting_review_mode_chooser(simplified: false)+ def topic_posting_review_mode_chooser(simplified: true)if simplifiedPageObjects::Components::SelectKit.new(".form-kit__field[data-name='category_setting.topic_posting_review_mode'] .combo-box",@@ -195,7 +198,7 @@ module PageObjectsendend- def topic_posting_review_group_chooser(simplified: false)+ def topic_posting_review_group_chooser(simplified: true)if simplifiedPageObjects::Components::SelectKit.new(".form-kit .group-chooser")else@@ -211,11 +214,11 @@ module PageObjectspage.has_no_content?(I18n.t("js.category.validations.groups_required"))end- def has_topic_posting_review_mode?(mode, simplified: false)+ def has_topic_posting_review_mode?(mode, simplified: true)topic_posting_review_mode_chooser(simplified: simplified).has_selected_value?(mode)end- def has_topic_posting_review_groups?(group, simplified: false)+ def has_topic_posting_review_groups?(group, simplified: true)topic_posting_review_group_chooser(simplified: simplified).has_selected_value?(group.id)endenddiff --git a/spec/system/simplified_category_creation_spec.rb b/spec/system/simplified_category_creation_spec.rbindex c1f5f11c092..a5a8d49fb47 100644--- a/spec/system/simplified_category_creation_spec.rb+++ b/spec/system/simplified_category_creation_spec.rb@@ -118,7 +118,9 @@ describe "Simplified Category Creation" doform.field("color").fill_in("GGGGGG")category_page.save_settings- expect(page).to have_content("Color is invalid")+ expect(form.field("color")).to have_errors(+ I18n.t("js.category.color_validations.non_hexdecimal"),+ )endit "shows error when icon is missing" do