Skip to content

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

FIX: Preserve groups on simple invite creation (#43800)

Sam405719ea93cf
diff --git a/frontend/discourse/app/components/modal/create-invite.gjs b/frontend/discourse/app/components/modal/create-invite.gjs
index a71afa219c6..47cee6350d4 100644
--- a/frontend/discourse/app/components/modal/create-invite.gjs
+++ b/frontend/discourse/app/components/modal/create-invite.gjs
@@ -293,12 +293,15 @@ export default class CreateInvite extends Component {
invite: this.invite,
});
+ const groupIds = this.data.inviteToGroups;
+
await this.save({
max_redemptions_allowed: this.defaultRedemptionsAllowed,
expires_at: moment()
.add(this.siteSettings.invite_expiry_days, "days")
.format(DATE_INPUT_FORMAT),
...(topicId != null && { topic_id: topicId }),
+ ...(groupIds.length > 0 && { group_ids: groupIds }),
});
}
diff --git a/spec/system/create_invite_spec.rb b/spec/system/create_invite_spec.rb
index 0e9babbddb7..38fd1bffb16 100644
--- a/spec/system/create_invite_spec.rb
+++ b/spec/system/create_invite_spec.rb
@@ -6,6 +6,7 @@ describe "Creating Invites" do
fab!(:topic) { Fabricate(:post).topic }
fab!(:invite) { Fabricate(:invite, invited_by: user, email: "[email protected]") } # avoid empty state
let(:user_invited_pending_page) { PageObjects::Pages::UserInvitedPending.new }
+ let(:group_page) { PageObjects::Pages::Group.new }
let(:create_invite_modal) { PageObjects::Modals::CreateInvite.new }
let(:cdp) { PageObjects::CDP.new }
@@ -13,6 +14,11 @@ describe "Creating Invites" do
find(".user-invite-buttons .btn", match: :first).click
end
+ def visit_invites_page_and_open_modal
+ user_invited_pending_page.visit(user)
+ open_invite_modal
+ end
+
def display_advanced_options
create_invite_modal.edit_options_link.click
end
@@ -26,12 +32,8 @@ describe "Creating Invites" do
sign_in(user)
end
- before do
- user_invited_pending_page.visit(user)
- open_invite_modal
- end
-
it "is possible to create an invite link without toggling the advanced options" do
+ visit_invites_page_and_open_modal
cdp.allow_clipboard
create_invite_modal.save_button.click
@@ -61,10 +63,14 @@ describe "Creating Invites" do
end
it "has the correct modal title when creating a new invite" do
+ visit_invites_page_and_open_modal
+
expect(create_invite_modal.header).to have_text(I18n.t("js.user.invited.invite.new_title"))
end
it "hides the modal footer after creating an invite via simple mode" do
+ visit_invites_page_and_open_modal
+
expect(create_invite_modal).to have_footer
create_invite_modal.save_button.click
expect(create_invite_modal).to have_no_footer
@@ -72,6 +78,7 @@ describe "Creating Invites" do
context "when editing an invite" do
before do
+ visit_invites_page_and_open_modal
create_invite_modal.save_button.click
create_invite_modal.close
@@ -91,7 +98,10 @@ describe "Creating Invites" do
end
context "with the advanced options" do
- before { display_advanced_options }
+ before do
+ visit_invites_page_and_open_modal
+ display_advanced_options
+ end
it "is possible to populate all the fields" do
user.update!(admin: true)
@@ -232,6 +242,31 @@ describe "Creating Invites" do
end
end
+ context "when inviting from a group page" do
+ before { group.add_owner(user) }
+
+ it "attaches the group to the invite whether or not the advanced options are opened" do
+ group_page.visit(group)
+ group_page.invite_members
+ create_invite_modal.save_button.click
+ create_invite_modal.close
+
+ user_invited_pending_page.visit(user)
+
+ expect(user_invited_pending_page.latest_invite).to have_group(group)
+
+ group_page.visit(group)
+ group_page.invite_members
+ display_advanced_options
+ create_invite_modal.save_button.click
+ create_invite_modal.close
+
+ user_invited_pending_page.visit(user)
+
+ expect(user_invited_pending_page.latest_invite).to have_group(group)
+ end
+ end
+
context "in empty state" do
fab!(:user_without_invites) { Fabricate(:user, groups: [group]) }
let(:user_invited_pending_page_empty) { PageObjects::Pages::UserInvitedPending.new }
diff --git a/spec/system/page_objects/pages/group.rb b/spec/system/page_objects/pages/group.rb
index 7542ffb1563..961c388aba6 100644
--- a/spec/system/page_objects/pages/group.rb
+++ b/spec/system/page_objects/pages/group.rb
@@ -17,6 +17,11 @@ module PageObjects
self
end
+ def invite_members
+ find(".group-members-manage button.group-members-invite").click
+ self
+ end
+
def delete_group
page.find("[data-test-selector='delete-group-button']").click
page.find(".dialog-footer .btn-danger").click