Skip to content

A platform for community discussion. Free, open, simple.

DEV: Fix permission reset when changing access groups in category general tab (#38452)

Isaac Janzen02c084c761e2
diff --git a/frontend/discourse/admin/components/upsert-category/general.gjs b/frontend/discourse/admin/components/upsert-category/general.gjs
index b2df01bf2ff..7103d309369 100644
--- a/frontend/discourse/admin/components/upsert-category/general.gjs
+++ b/frontend/discourse/admin/components/upsert-category/general.gjs
@@ -91,6 +91,10 @@ export default class UpsertCategoryGeneral extends Component {
const parentId = this.args.transientData.parent_category_id;
const parentCategory = Category.findById(parentId);
+ if (!parentCategory?.permissions) {
+ return groups;
+ }
+
const parentGroupIds = new Set(
parentCategory.permissions.map((p) => p.group_id)
);
@@ -100,7 +104,17 @@ export default class UpsertCategoryGeneral extends Component {
@action
onChangeAccessGroups(groupIds) {
+ const existingPermissions = this.permissions || [];
+
const newPermissions = groupIds.map((groupId) => {
+ const existingPermission = existingPermissions.find(
+ (p) => p.group_id === groupId
+ );
+
+ if (existingPermission) {
+ return existingPermission;
+ }
+
return {
group_id: groupId,
group_name: this.site.groupsById[groupId]?.name,
diff --git a/spec/system/simplified_category_creation_spec.rb b/spec/system/simplified_category_creation_spec.rb
index 8540bbbe9b2..cc0a52aeb5a 100644
--- a/spec/system/simplified_category_creation_spec.rb
+++ b/spec/system/simplified_category_creation_spec.rb
@@ -107,6 +107,36 @@ describe "Simplified Category Creation" do
expect(page).to have_css(".edit-category-settings")
end
+ it "preserves permission types when adding a new access group on general tab" do
+ group2 = Fabricate(:group)
+
+ category_page.visit_new_category
+ category_type_card.find_type_card("discussion").click
+
+ form.field("name").fill_in("Permission Test")
+ form.choose_conditional("group_restricted")
+
+ group_chooser = PageObjects::Components::SelectKit.new(".group-chooser")
+ group_chooser.expand
+ group_chooser.select_row_by_value(group.id)
+ group_chooser.collapse
+
+ category_page.toggle_advanced_settings
+ find(".edit-category-security a").click
+ category_permission_row.toggle_group_permission(group.name, "reply")
+
+ find(".edit-category-general a").click
+ group_chooser.expand
+ group_chooser.select_row_by_value(group2.id)
+ group_chooser.collapse
+
+ find(".edit-category-security a").click
+
+ expect(page).to have_no_css(
+ "#{category_permission_row.group_permission_row_selector(group.name)} .reply-granted",
+ )
+ end
+
it "automatically switches to private when selecting a restricted parent" do
restricted_parent =
Fabricate(:category, name: "Restricted Parent", permissions: { group.name => :full })
@@ -120,6 +150,21 @@ describe "Simplified Category Creation" do
expect(page).to have_css(".group-chooser")
end
+
+ it "shows inherited groups when selecting a restricted parent" do
+ restricted_parent =
+ Fabricate(:category, name: "Restricted Parent", permissions: { group.name => :full })
+
+ category_page.visit_new_category
+ category_type_card.find_type_card("discussion").click
+
+ parent_chooser = PageObjects::Components::SelectKit.new(".category-chooser")
+ parent_chooser.expand
+ parent_chooser.select_row_by_value(restricted_parent.id)
+
+ group_chooser = PageObjects::Components::SelectKit.new(".group-chooser")
+ expect(group_chooser).to have_selected_name(group.name)
+ end
end
describe "Security Tab" do