A platform for community discussion. Free, open, simple.
UX: Add dedicated moderation tab to simplified category editor (#39280)
Alan Guo Xiang Tanf3914e4018d2
diff --git a/app/assets/stylesheets/common/base/edit-category.scss b/app/assets/stylesheets/common/base/edit-category.scssindex e4f041ff9da..b6551f93f48 100644--- a/app/assets/stylesheets/common/base/edit-category.scss+++ b/app/assets/stylesheets/common/base/edit-category.scss@@ -229,6 +229,7 @@ div.edit-category {}.edit-category-tab-settings,+ .edit-category-tab-moderation,.edit-category-tab-tags,.edit-category-tab-topic-template {> section {diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex 72edd9f00d2..ecc903e3d39 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -4758,6 +4758,7 @@ en:back: "Back to category"general: "General"settings: "Settings"+ moderation: "Moderation"advanced: "Advanced"show_advanced: "Advanced settings"topic_template: "Template"@@ -4904,11 +4905,15 @@ en:require_reply_approval: "Require moderator approval of all new replies"require_topic_approval_for: "Require moderator approval of new topics for..."require_reply_approval_for: "Require moderator approval of new replies for..."+ new_topic_approval: "New topic approval"+ new_reply_approval: "New reply approval"posting_review_modes:no_one: "No one"everyone: "Everyone"everyone_except: "Everyone except selected groups"no_one_except: "No one except selected groups"+ posting_review_groups_require_approval: "Groups that require approval"+ posting_review_groups_no_approval: "Groups that do not require approval"posting_review_groups_placeholder: "Select groups..."this_year: "this year"position: "Position on the categories page:"diff --git a/frontend/discourse/admin/components/upsert-category/moderation.gjs b/frontend/discourse/admin/components/upsert-category/moderation.gjsnew file mode 100644index 00000000000..6249ff915fa--- /dev/null+++ b/frontend/discourse/admin/components/upsert-category/moderation.gjs@@ -0,0 +1,302 @@+import Component from "@glimmer/component";+import { hash } from "@ember/helper";+import { on } from "@ember/modifier";+import { action } from "@ember/object";+import { service } from "@ember/service";+import RelativeTimePicker from "discourse/components/relative-time-picker";+import concatClass from "discourse/helpers/concat-class";+import withEventValue from "discourse/helpers/with-event-value";+import { POSTING_REVIEW_GROUP_BASED_MODES } from "discourse/lib/constants";+import ComboBox from "discourse/select-kit/components/combo-box";+import GroupChooser from "discourse/select-kit/components/group-chooser";+import { eq } from "discourse/truth-helpers";+import { i18n } from "discourse-i18n";++export default class UpsertCategoryModeration extends Component {+ @service site;+ @service siteSettings;++ get hiddenRelativeIntervals() {+ return ["mins"];+ }++ get moderatingGroupIds() {+ return this.args.transientData?.moderating_group_ids;+ }++ get autoCloseHours() {+ return this.args.transientData?.auto_close_hours;+ }++ get defaultSlowModeMinutes() {+ const seconds = this.args.transientData?.default_slow_mode_seconds;+ return seconds ? seconds / 60 : null;+ }++ get categorySetting() {+ return this.args.transientData?.category_setting;+ }++ get numAutoBumpDaily() {+ return this.categorySetting?.num_auto_bump_daily;+ }++ get autoBumpCooldownDays() {+ return this.categorySetting?.auto_bump_cooldown_days;+ }++ get postingReviewModeOptions() {+ return [+ { name: i18n("category.posting_review_modes.no_one"), value: "no_one" },+ {+ name: i18n("category.posting_review_modes.everyone"),+ value: "everyone",+ },+ {+ name: i18n("category.posting_review_modes.everyone_except"),+ value: "everyone_except",+ },+ {+ name: i18n("category.posting_review_modes.no_one_except"),+ value: "no_one_except",+ },+ ];+ }++ get topicModeRequiresGroups() {+ return POSTING_REVIEW_GROUP_BASED_MODES.includes(+ this.categorySetting?.topic_posting_review_mode+ );+ }++ get replyModeRequiresGroups() {+ return POSTING_REVIEW_GROUP_BASED_MODES.includes(+ this.categorySetting?.reply_posting_review_mode+ );+ }++ get topicGroupChooserTitle() {+ return this.categorySetting?.topic_posting_review_mode === "no_one_except"+ ? i18n("category.posting_review_groups_require_approval")+ : i18n("category.posting_review_groups_no_approval");+ }++ get replyGroupChooserTitle() {+ return this.categorySetting?.reply_posting_review_mode === "no_one_except"+ ? i18n("category.posting_review_groups_require_approval")+ : i18n("category.posting_review_groups_no_approval");+ }++ @action+ onAutoCloseDurationChange(minutes) {+ let hours = minutes ? minutes / 60 : null;+ this.args.form.set("auto_close_hours", hours);+ }++ @action+ onDefaultSlowModeDurationChange(minutes) {+ let seconds = minutes ? minutes * 60 : null;+ this.args.form.set("default_slow_mode_seconds", seconds);+ }++ #updateCategorySetting(key, value) {+ this.args.form.set("category_setting", {+ ...(this.categorySetting || {}),+ [key]: value,+ });+ }++ @action+ onCategoryModeratingGroupsChange(groupIds) {+ this.args.form.set("moderating_group_ids", groupIds);+ }++ @action+ onNumAutoBumpDailyChange(value) {+ this.#updateCategorySetting("num_auto_bump_daily", value);+ }++ @action+ onAutoBumpCooldownDaysChange(value) {+ this.#updateCategorySetting("auto_bump_cooldown_days", value);+ }++ @action+ onTopicPostingReviewModeChange(value) {+ this.#updateCategorySetting("topic_posting_review_mode", value);+ if (!POSTING_REVIEW_GROUP_BASED_MODES.includes(value)) {+ this.args.form.set("topic_posting_review_group_ids", []);+ }+ }++ @action+ onReplyPostingReviewModeChange(value) {+ this.#updateCategorySetting("reply_posting_review_mode", value);+ if (!POSTING_REVIEW_GROUP_BASED_MODES.includes(value)) {+ this.args.form.set("reply_posting_review_group_ids", []);+ }+ }++ @action+ validatePostingReviewGroups(name, value, { addError }) {+ if (!value?.length) {+ const type = name.startsWith("topic") ? "topic" : "reply";+ addError(name, {+ title: i18n(`category.require_${type}_approval_for`),+ message: i18n("category.validations.groups_required"),+ });+ }+ }++ <template>+ <@form.Section+ class={{concatClass+ "edit-category-tab"+ "edit-category-tab-moderation"+ (if (eq @selectedTab "moderation") "active")+ }}+ >+ {{#if this.siteSettings.enable_category_group_moderation}}+ <@form.Container @title={{i18n "category.reviewable_by_group"}}>+ <GroupChooser+ @content={{this.site.groups}}+ @value={{this.moderatingGroupIds}}+ @onChange={{this.onCategoryModeratingGroupsChange}}+ />+ </@form.Container>+ {{/if}}++ <@form.Container @title={{i18n "category.default_slow_mode"}}>+ <RelativeTimePicker+ @id="category-default-slow-mode"+ @durationMinutes={{this.defaultSlowModeMinutes}}+ @onChange={{this.onDefaultSlowModeDurationChange}}+ />+ </@form.Container>++ <@form.Container @title={{i18n "topic.auto_close.label"}}>+ <RelativeTimePicker+ @id="topic-auto-close"+ @durationHours={{this.autoCloseHours}}+ @hiddenIntervals={{this.hiddenRelativeIntervals}}+ @onChange={{this.onAutoCloseDurationChange}}+ />+ </@form.Container>++ <@form.Field+ @name="auto_close_based_on_last_post"+ @title={{i18n "topic.auto_close.based_on_last_post"}}+ @type="checkbox"+ as |field|+ >+ <field.Control />+ </@form.Field>++ <@form.Container @title={{i18n "category.num_auto_bump_daily"}}>+ <input+ {{on "input" (withEventValue this.onNumAutoBumpDailyChange)}}+ value={{this.numAutoBumpDaily}}+ type="number"+ min="0"+ id="category-number-daily-bump"+ />+ </@form.Container>++ <@form.Container @title={{i18n "category.auto_bump_cooldown_days"}}>+ <input+ {{on "input" (withEventValue this.onAutoBumpCooldownDaysChange)}}+ value={{this.autoBumpCooldownDays}}+ type="number"+ min="0"+ id="category-auto-bump-cooldown-days"+ />+ </@form.Container>++ <@form.Section @title={{i18n "category.new_topic_approval"}}>+ <@form.Object @name="category_setting" as |object|>+ <object.Field+ @name="topic_posting_review_mode"+ @title={{i18n "category.require_topic_approval_for"}}+ @type="custom"+ as |field|+ >+ <field.Control>+ <ComboBox+ @valueProperty="value"+ @content={{this.postingReviewModeOptions}}+ @value={{field.value}}+ @onChange={{this.onTopicPostingReviewModeChange}}+ @options={{hash placementStrategy="absolute"}}+ />+ </field.Control>+ </object.Field>++ {{#if this.topicModeRequiresGroups}}+ <@form.Field+ @name="topic_posting_review_group_ids"+ @title={{this.topicGroupChooserTitle}}+ @type="custom"+ @validate={{this.validatePostingReviewGroups}}+ as |field|+ >+ <field.Control>+ <GroupChooser+ class="posting-review-group-chooser"+ @content={{this.site.groups}}+ @value={{field.value}}+ @onChange={{field.set}}+ @options={{hash+ none="category.posting_review_groups_placeholder"+ }}+ />+ </field.Control>+ </@form.Field>+ {{/if}}+ </@form.Object>+ </@form.Section>++ <@form.Section @title={{i18n "category.new_reply_approval"}}>+ <@form.Object @name="category_setting" as |object|>+ <object.Field+ @name="reply_posting_review_mode"+ @title={{i18n "category.require_reply_approval_for"}}+ @type="custom"+ as |field|+ >+ <field.Control>+ <ComboBox+ @valueProperty="value"+ @content={{this.postingReviewModeOptions}}+ @value={{field.value}}+ @onChange={{this.onReplyPostingReviewModeChange}}+ @options={{hash placementStrategy="absolute"}}+ />+ </field.Control>+ </object.Field>++ {{#if this.replyModeRequiresGroups}}+ <@form.Field+ @name="reply_posting_review_group_ids"+ @title={{this.replyGroupChooserTitle}}+ @type="custom"+ @validate={{this.validatePostingReviewGroups}}+ as |field|+ >+ <field.Control>+ <GroupChooser+ class="posting-review-group-chooser"+ @content={{this.site.groups}}+ @value={{field.value}}+ @onChange={{field.set}}+ @options={{hash+ none="category.posting_review_groups_placeholder"+ }}+ />+ </field.Control>+ </@form.Field>+ {{/if}}+ </@form.Object>+ </@form.Section>+ </@form.Section>+ </template>+}diff --git a/frontend/discourse/admin/components/upsert-category/settings.gjs b/frontend/discourse/admin/components/upsert-category/settings.gjsindex 610e92ac0da..f36c85d2b71 100644--- a/frontend/discourse/admin/components/upsert-category/settings.gjs+++ b/frontend/discourse/admin/components/upsert-category/settings.gjs@@ -1,26 +1,17 @@import Component from "@glimmer/component";import { hash } from "@ember/helper";-import { on } from "@ember/modifier";-import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import PluginOutlet from "discourse/components/plugin-outlet";-import RelativeTimePicker from "discourse/components/relative-time-picker";import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";-import withEventValue from "discourse/helpers/with-event-value";-import {- POSTING_REVIEW_GROUP_BASED_MODES,- SEARCH_PRIORITIES,-} from "discourse/lib/constants";+import { SEARCH_PRIORITIES } from "discourse/lib/constants";import getUrl from "discourse/lib/get-url";import ComboBox from "discourse/select-kit/components/combo-box";-import GroupChooser from "discourse/select-kit/components/group-chooser";import { eq } from "discourse/truth-helpers";import { i18n } from "discourse-i18n";export default class UpsertCategorySettings extends Component {- @service site;@service siteSettings;get emailInEnabled() {@@ -46,134 +37,6 @@ export default class UpsertCategorySettings extends Component {return options;}- get hiddenRelativeIntervals() {- return ["mins"];- }-- get moderatingGroupIds() {- return this.args.transientData?.moderating_group_ids;- }-- get autoCloseHours() {- return this.args.transientData?.auto_close_hours;- }-- get defaultSlowModeMinutes() {- const seconds = this.args.transientData?.default_slow_mode_seconds;- return seconds ? seconds / 60 : null;- }-- get categorySetting() {- return this.args.transientData?.category_setting;- }-- get numAutoBumpDaily() {- return this.categorySetting?.num_auto_bump_daily;- }-- get autoBumpCooldownDays() {- return this.categorySetting?.auto_bump_cooldown_days;- }-- get postingReviewModeOptions() {- return [- { name: i18n("category.posting_review_modes.no_one"), value: "no_one" },- {- name: i18n("category.posting_review_modes.everyone"),- value: "everyone",- },- {- name: i18n("category.posting_review_modes.everyone_except"),- value: "everyone_except",- },- {- name: i18n("category.posting_review_modes.no_one_except"),- value: "no_one_except",- },- ];- }-- get topicModeRequiresGroups() {- return POSTING_REVIEW_GROUP_BASED_MODES.includes(- this.categorySetting?.topic_posting_review_mode- );- }-- get replyModeRequiresGroups() {- return POSTING_REVIEW_GROUP_BASED_MODES.includes(- this.categorySetting?.reply_posting_review_mode- );- }-- get topicPostingReviewGroupIds() {- return this.args.transientData?.topic_posting_review_group_ids;- }-- get replyPostingReviewGroupIds() {- return this.args.transientData?.reply_posting_review_group_ids;- }-- @action- onAutoCloseDurationChange(minutes) {- let hours = minutes ? minutes / 60 : null;- this.args.form.set("auto_close_hours", hours);- }-- @action- onDefaultSlowModeDurationChange(minutes) {- let seconds = minutes ? minutes * 60 : null;- this.args.form.set("default_slow_mode_seconds", seconds);- }-- #updateCategorySetting(key, value) {- this.args.form.set("category_setting", {- ...(this.categorySetting || {}),- [key]: value,- });- }-- @action- onCategoryModeratingGroupsChange(groupIds) {- this.args.form.set("moderating_group_ids", groupIds);- }-- @action- onNumAutoBumpDailyChange(value) {- this.#updateCategorySetting("num_auto_bump_daily", value);- }-- @action- onAutoBumpCooldownDaysChange(value) {- this.#updateCategorySetting("auto_bump_cooldown_days", value);- }-- @action- onTopicPostingReviewModeChange(value) {- this.#updateCategorySetting("topic_posting_review_mode", value);- if (!POSTING_REVIEW_GROUP_BASED_MODES.includes(value)) {- this.args.form.set("topic_posting_review_group_ids", []);- }- }-- @action- onReplyPostingReviewModeChange(value) {- this.#updateCategorySetting("reply_posting_review_mode", value);- if (!POSTING_REVIEW_GROUP_BASED_MODES.includes(value)) {- this.args.form.set("reply_posting_review_group_ids", []);- }- }-- @action- validatePostingReviewGroups(name, value, { addError }) {- if (!value?.length) {- const type = name.startsWith("topic") ? "topic" : "reply";- addError(name, {- title: i18n(`category.require_${type}_approval_for`),- message: i18n("category.validations.groups_required"),- });- }- }-<template><@form.Sectionclass={{concatClass@@ -294,148 +157,6 @@ export default class UpsertCategorySettings extends Component {<field.Control /></@form.Field>- <@form.Section @title={{i18n "category.settings_sections.moderation"}}>- {{#if this.siteSettings.enable_category_group_moderation}}- <@form.Container @title={{i18n "category.reviewable_by_group"}}>- <GroupChooser- @content={{this.site.groups}}- @value={{this.moderatingGroupIds}}- @onChange={{this.onCategoryModeratingGroupsChange}}- />- </@form.Container>- {{/if}}-- <@form.Object @name="category_setting" as |object|>- <object.Field- @name="topic_posting_review_mode"- @title={{i18n "category.require_topic_approval_for"}}- @type="custom"- as |field|- >- <field.Control>- <ComboBox- @valueProperty="value"- @content={{this.postingReviewModeOptions}}- @value={{field.value}}- @onChange={{this.onTopicPostingReviewModeChange}}- @options={{hash placementStrategy="absolute"}}- />- </field.Control>- </object.Field>-- {{#if this.topicModeRequiresGroups}}- <@form.Field- @name="topic_posting_review_group_ids"- @title={{i18n "category.require_topic_approval_for"}}- @showTitle={{false}}- @type="custom"- @validate={{this.validatePostingReviewGroups}}- as |field|- >- <field.Control>- <GroupChooser- class="posting-review-group-chooser"- @content={{this.site.groups}}- @value={{field.value}}- @onChange={{field.set}}- @options={{hash- none="category.posting_review_groups_placeholder"- }}- />- </field.Control>- </@form.Field>- {{/if}}- </@form.Object>-- <@form.Object @name="category_setting" as |object|>- <object.Field- @name="reply_posting_review_mode"- @title={{i18n "category.require_reply_approval_for"}}- @type="custom"- as |field|- >- <field.Control>- <ComboBox- @valueProperty="value"- @content={{this.postingReviewModeOptions}}- @value={{field.value}}- @onChange={{this.onReplyPostingReviewModeChange}}- @options={{hash placementStrategy="absolute"}}- />- </field.Control>- </object.Field>-- {{#if this.replyModeRequiresGroups}}- <@form.Field- @name="reply_posting_review_group_ids"- @title={{i18n "category.require_reply_approval_for"}}- @showTitle={{false}}- @type="custom"- @validate={{this.validatePostingReviewGroups}}- as |field|- >- <field.Control>- <GroupChooser- class="posting-review-group-chooser"- @content={{this.site.groups}}- @value={{field.value}}- @onChange={{field.set}}- @options={{hash- none="category.posting_review_groups_placeholder"- }}- />- </field.Control>- </@form.Field>- {{/if}}- </@form.Object>-- <@form.Container @title={{i18n "category.default_slow_mode"}}>- <RelativeTimePicker- @id="category-default-slow-mode"- @durationMinutes={{this.defaultSlowModeMinutes}}- @onChange={{this.onDefaultSlowModeDurationChange}}- />- </@form.Container>-- <@form.Container @title={{i18n "topic.auto_close.label"}}>- <RelativeTimePicker- @id="topic-auto-close"- @durationHours={{this.autoCloseHours}}- @hiddenIntervals={{this.hiddenRelativeIntervals}}- @onChange={{this.onAutoCloseDurationChange}}- />- </@form.Container>-- <@form.Field- @name="auto_close_based_on_last_post"- @title={{i18n "topic.auto_close.based_on_last_post"}}- @type="checkbox"- as |field|- >- <field.Control />- </@form.Field>-- <@form.Container @title={{i18n "category.num_auto_bump_daily"}}>- <input- {{on "input" (withEventValue this.onNumAutoBumpDailyChange)}}- value={{this.numAutoBumpDaily}}- type="number"- min="0"- id="category-number-daily-bump"- />- </@form.Container>-- <@form.Container @title={{i18n "category.auto_bump_cooldown_days"}}>- <input- {{on "input" (withEventValue this.onAutoBumpCooldownDaysChange)}}- value={{this.autoBumpCooldownDays}}- type="number"- min="0"- id="category-auto-bump-cooldown-days"- />- </@form.Container>- </@form.Section>-<@form.Section @title={{i18n "category.settings_sections.email"}}>{{#if this.emailInEnabled}}<@form.Fielddiff --git a/frontend/discourse/admin/templates/edit-category/tabs-horizontal.gjs b/frontend/discourse/admin/templates/edit-category/tabs-horizontal.gjsindex f006cba02e5..bbbb3ce7494 100644--- a/frontend/discourse/admin/templates/edit-category/tabs-horizontal.gjs+++ b/frontend/discourse/admin/templates/edit-category/tabs-horizontal.gjs@@ -87,6 +87,12 @@ export default class EditCategoryTabsHorizontalTemplate extends Component {@params={{@controller.parentParams}}@tab="settings"/>+ <EditCategoryTab+ @panels={{@controller.panels}}+ @selectedTab={{@controller.selectedTab}}+ @params={{@controller.parentParams}}+ @tab="moderation"+ /><EditCategoryTab@panels={{@controller.panels}}@selectedTab={{@controller.selectedTab}}diff --git a/frontend/discourse/admin/templates/edit-category/tabs.gjs b/frontend/discourse/admin/templates/edit-category/tabs.gjsindex 4ab7d827008..42e9d4ddfe3 100644--- a/frontend/discourse/admin/templates/edit-category/tabs.gjs+++ b/frontend/discourse/admin/templates/edit-category/tabs.gjs@@ -10,6 +10,7 @@ import EditCategoryTags from "discourse/admin/components/edit-category-tags";import EditCategoryTopicTemplate from "discourse/admin/components/edit-category-topic-template";import UpsertCategoryAppearance from "discourse/admin/components/upsert-category/appearance";import UpsertCategoryGeneral from "discourse/admin/components/upsert-category/general";+import UpsertCategoryModeration from "discourse/admin/components/upsert-category/moderation";import UpsertCategorySecurity from "discourse/admin/components/upsert-category/security";import UpsertCategorySettings from "discourse/admin/components/upsert-category/settings";import UpsertCategoryTags from "discourse/admin/components/upsert-category/tags";@@ -35,6 +36,7 @@ const TAB_COMPONENTS_V2 = {general: UpsertCategoryGeneral,security: UpsertCategorySecurity,settings: UpsertCategorySettings,+ moderation: UpsertCategoryModeration,images: UpsertCategoryAppearance,"topic-template": EditCategoryTopicTemplate,tags: UpsertCategoryTags,diff --git a/spec/system/edit_category_settings_spec.rb b/spec/system/edit_category_settings_spec.rbindex e194bab32c4..9ec38546316 100644--- a/spec/system/edit_category_settings_spec.rb+++ b/spec/system/edit_category_settings_spec.rb@@ -37,18 +37,18 @@ describe "Edit Category Settings" dolet(:dialog) { PageObjects::Components::Dialog.new }it "allows selecting 'everyone' mode" do- category_page.visit_settings(category)+ category_page.visit_moderation(category)category_page.topic_posting_review_mode_chooser.expandcategory_page.topic_posting_review_mode_chooser.select_row_by_value("everyone")category_page.save_settings- category_page.visit_settings(category)+ category_page.visit_moderation(category)expect(category_page).to have_topic_posting_review_mode("everyone")endit "allows selecting 'everyone_except' mode with groups" do- category_page.visit_settings(category)+ category_page.visit_moderation(category)category_page.topic_posting_review_mode_chooser.expandcategory_page.topic_posting_review_mode_chooser.select_row_by_value("everyone_except")@@ -65,7 +65,7 @@ describe "Edit Category Settings" docategory_page.save_settings- category_page.visit_settings(category)+ category_page.visit_moderation(category)expect(category_page).to have_topic_posting_review_mode("everyone_except")expect(category_page).to have_topic_posting_review_groups(group)enddiff --git a/spec/system/page_objects/pages/category.rb b/spec/system/page_objects/pages/category.rbindex 8092520383a..c5d4108868e 100644--- a/spec/system/page_objects/pages/category.rb+++ b/spec/system/page_objects/pages/category.rb@@ -13,6 +13,11 @@ module PageObjectsselfend+ def visit_moderation(category)+ page.visit("/c/#{category.slug}/edit/moderation")+ self+ end+def visit_general(category, subcategory = nil)if subcategorypage.visit("/c/#{category.slug}/#{subcategory.slug}/edit/general")diff --git a/spec/system/simplified_category_creation_spec.rb b/spec/system/simplified_category_creation_spec.rbindex a5a8d49fb47..5ae4fbc6b00 100644--- a/spec/system/simplified_category_creation_spec.rb+++ b/spec/system/simplified_category_creation_spec.rb@@ -297,13 +297,13 @@ describe "Simplified Category Creation" doendend- describe "Settings Tab" do+ describe "Moderation Tab" doit "creates a category with a group-based posting review mode" docategory_page.visit_new_categoryform.field("name").fill_in("Review Test")category_page.toggle_advanced_settings- find(".edit-category-settings a").click+ find(".edit-category-moderation a").clickcategory_page.topic_posting_review_mode_chooser(simplified: true).expandcategory_page.topic_posting_review_mode_chooser(simplified: true).select_row_by_value(@@ -322,13 +322,13 @@ describe "Simplified Category Creation" doexpect(category_page).to have_no_posting_review_groups_errorcreated_category = Category.find_by(name: "Review Test")- category_page.visit_settings(created_category)+ category_page.visit_moderation(created_category)expect(category_page).to have_topic_posting_review_mode("everyone_except", simplified: true)expect(category_page).to have_topic_posting_review_groups(group, simplified: true)endit "allows selecting 'everyone' mode" do- category_page.visit_settings(category)+ category_page.visit_moderation(category)category_page.topic_posting_review_mode_chooser(simplified: true).expandcategory_page.topic_posting_review_mode_chooser(simplified: true).select_row_by_value(@@ -336,12 +336,12 @@ describe "Simplified Category Creation" do)category_page.save_settings- category_page.visit_settings(category)+ category_page.visit_moderation(category)expect(category_page).to have_topic_posting_review_mode("everyone", simplified: true)endit "allows selecting 'everyone_except' mode with groups" do- category_page.visit_settings(category)+ category_page.visit_moderation(category)category_page.topic_posting_review_mode_chooser(simplified: true).expandcategory_page.topic_posting_review_mode_chooser(simplified: true).select_row_by_value(@@ -358,7 +358,7 @@ describe "Simplified Category Creation" docategory_page.save_settings- category_page.visit_settings(category)+ category_page.visit_moderation(category)expect(category_page).to have_no_posting_review_groups_errorexpect(category_page).to have_topic_posting_review_mode("everyone_except", simplified: true)expect(category_page).to have_topic_posting_review_groups(group, simplified: true)