A platform for community discussion. Free, open, simple.
FIX: Respect "Notify users" checkbox for group email invitations (#39042)
Régis Hanol2527b2b2a6d6
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rbindex e9f51870828..f58a4eb073b 100644--- a/app/controllers/groups_controller.rb+++ b/app/controllers/groups_controller.rb@@ -413,17 +413,18 @@ class GroupsController < ApplicationController)elsenotify = params[:notify_users]&.to_s == "true"+uniq_users = users.uniquniq_users.each { |user| add_user_to_group(group, user, notify) }+ group_ids = [group.id]++ skip_email = params[:skip_email].to_s == "true"+ skip_email ||= params.key?(:notify_users) && !notify+emails.each do |email|begin- Invite.generate(- current_user,- email: email,- group_ids: [group.id],- skip_email: params[:skip_email].to_s == "true",- )+ Invite.generate(current_user, email:, group_ids:, skip_email:)rescue RateLimiter::LimitExceeded => ereturn(render_json_error(diff --git a/frontend/discourse/app/components/modal/group-add-members.gjs b/frontend/discourse/app/components/modal/group-add-members.gjsindex 316b7d459c2..0511196a57d 100644--- a/frontend/discourse/app/components/modal/group-add-members.gjs+++ b/frontend/discourse/app/components/modal/group-add-members.gjs@@ -11,7 +11,7 @@ import { extractError } from "discourse/lib/ajax-error";import { emailValid } from "discourse/lib/utilities";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";import UserChooser from "discourse/select-kit/components/user-chooser";-import { and, not, or } from "discourse/truth-helpers";+import { not, or } from "discourse/truth-helpers";import { i18n } from "discourse-i18n";export default class GroupAddMembers extends Component {@@ -20,7 +20,7 @@ export default class GroupAddMembers extends Component {@tracked loading = false;@tracked setOwner = false;- @tracked notifyUsers = false;+ @tracked notifyUsers = true;@tracked usernamesAndEmails = [];@tracked flash;@@ -44,9 +44,6 @@ export default class GroupAddMembers extends Component {setUsernamesAndEmails(usernamesAndEmails) {this.usernamesAndEmails = usernamesAndEmails;if (this.emails) {- if (!this.usernames) {- this.notifyUsers = false;- }this.setOwner = false;}}@@ -135,11 +132,7 @@ export default class GroupAddMembers extends Component {<div class="input-group"><label>- <Input- @type="checkbox"- @checked={{this.notifyUsers}}- disabled={{and (not this.usernames) this.emails}}- />+ <Input @type="checkbox" @checked={{this.notifyUsers}} />{{i18n "groups.add_members.notify_users"}}</label></div>diff --git a/frontend/discourse/tests/acceptance/group-test.js b/frontend/discourse/tests/acceptance/group-test.jsindex fd3c9ebf1d0..2166db2bce5 100644--- a/frontend/discourse/tests/acceptance/group-test.js+++ b/frontend/discourse/tests/acceptance/group-test.js@@ -1,7 +1,7 @@import { click, fillIn, visit } from "@ember/test-helpers";import { test } from "qunit";import GroupFixtures from "discourse/tests/fixtures/group-fixtures";-import { acceptance } from "discourse/tests/helpers/qunit-helpers";+import { acceptance, paste } from "discourse/tests/helpers/qunit-helpers";import selectKit from "discourse/tests/helpers/select-kit-helper";import { i18n } from "discourse-i18n";@@ -354,4 +354,51 @@ acceptance("Group - Authenticated", function (needs) {i18n("groups.members.make_owner"));});++ test("Add members modal - notify users checkbox defaults to checked", async function (assert) {+ await visit("/g/alternative-group");+ await click(".group-members-add.btn");++ assert+ .dom(+ ".group-add-members-modal .group-add-members input[type='checkbox']:not(#set-owner)"+ )+ .isChecked("notify users checkbox is checked by default");+ });++ test("Add members modal - notify users checkbox is not disabled when adding emails", async function (assert) {+ await visit("/g/alternative-group");+ await click(".group-members-add.btn");++ const chooser = selectKit(".email-group-user-chooser");+ await chooser.expand();+ await paste(".filter-input", "[email protected]");++ assert+ .dom(+ ".group-add-members-modal .group-add-members input[type='checkbox']:not(#set-owner)"+ )+ .isNotDisabled(+ "notify users checkbox is not disabled when emails are entered"+ );+ });++ test("Add members modal - set owner is disabled when emails are entered", async function (assert) {+ await visit("/g/alternative-group");+ await click(".group-members-add.btn");++ await click("#set-owner");+ assert.dom("#set-owner").isChecked("set owner is checked");++ const chooser = selectKit(".email-group-user-chooser");+ await chooser.expand();+ await paste(".filter-input", "[email protected]");++ assert+ .dom("#set-owner")+ .isDisabled("set owner is disabled when emails are entered");+ assert+ .dom("#set-owner")+ .isNotChecked("set owner is unchecked when emails are entered");+ });});diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rbindex 6bbd380e2b2..7f653be2022 100644--- a/spec/requests/groups_controller_spec.rb+++ b/spec/requests/groups_controller_spec.rb@@ -1744,18 +1744,41 @@ RSpec.describe GroupsController doendend- it "sends emails with invitations when `skip_emails` param isn't present" do+ it "sends invite emails when notify_users is true" do+ expect_enqueued_with(job: :invite_email) do+ put "/groups/#{group.id}/members.json",+ params: {+ emails: "[email protected]",+ notify_users: true,+ }+ expect(response.status).to eq(200)+ end+ end++ it "does not send invite emails when notify_users is false" do+ expect_not_enqueued_with(job: :invite_email) do+ put "/groups/#{group.id}/members.json",+ params: {+ emails: "[email protected]",+ notify_users: false,+ }+ expect(response.status).to eq(200)+ end+ end++ it "sends invite emails when neither notify_users nor skip_email is provided" doexpect_enqueued_with(job: :invite_email) doput "/groups/#{group.id}/members.json", params: { emails: "[email protected]" }expect(response.status).to eq(200)endend- it "sends emails with invitations when `skip_emails` is present" do+ it "does not send invite emails when skip_email is true" doexpect_not_enqueued_with(job: :invite_email) do- put "/groups/#{group.id}/members.json?skip_email=true",+ put "/groups/#{group.id}/members.json",params: {emails: "[email protected]",+ skip_email: true,}expect(response.status).to eq(200)end