Skip to content

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

UX: Move invite domain restriction behind advanced mode (#42891)

Keegan George947b01be7210
diff --git a/frontend/discourse/app/components/modal/create-invite-with-roles.gjs b/frontend/discourse/app/components/modal/create-invite-with-roles.gjs
index 1d73e92a254..ee22af985a5 100644
--- a/frontend/discourse/app/components/modal/create-invite-with-roles.gjs
+++ b/frontend/discourse/app/components/modal/create-invite-with-roles.gjs
@@ -641,29 +641,31 @@ export default class CreateInviteWithRoles extends Component {
<conditional.Contents as |Content|>
<Content @name="link">
- <form.Field
- @name="domain"
- @type="input"
- @title={{i18n
- "user.invited.invite_roles.restrict_domain"
- }}
- @description={{i18n
- "user.invited.invite_roles.restrict_domain_help"
- }}
- @validate={{if
- (eq this.delivery "link")
- this.validateDomain
- }}
- @format="full"
- as |field|
- >
- <field.Control
- autofocus="autofocus"
- placeholder={{i18n
- "user.invited.invite_roles.domain_placeholder"
+ {{#if this.showAdvanced}}
+ <form.Field
+ @name="domain"
+ @type="input"
+ @title={{i18n
+ "user.invited.invite_roles.restrict_domain"
}}
- />
- </form.Field>
+ @description={{i18n
+ "user.invited.invite_roles.restrict_domain_help"
+ }}
+ @validate={{if
+ (eq this.delivery "link")
+ this.validateDomain
+ }}
+ @format="full"
+ as |field|
+ >
+ <field.Control
+ autofocus="autofocus"
+ placeholder={{i18n
+ "user.invited.invite_roles.domain_placeholder"
+ }}
+ />
+ </form.Field>
+ {{/if}}
</Content>
<Content @name="email">
@@ -767,29 +769,31 @@ export default class CreateInviteWithRoles extends Component {
<conditional.Contents as |Content|>
<Content @name="link">
- <form.Field
- @name="domain"
- @type="input"
- @title={{i18n
- "user.invited.invite_roles.restrict_domain"
- }}
- @description={{i18n
- "user.invited.invite_roles.restrict_domain_help"
- }}
- @validate={{if
- (eq this.delivery "link")
- this.validateDomain
- }}
- @format="full"
- as |field|
- >
- <field.Control
- autofocus="autofocus"
- placeholder={{i18n
- "user.invited.invite_roles.domain_placeholder"
+ {{#if this.showAdvanced}}
+ <form.Field
+ @name="domain"
+ @type="input"
+ @title={{i18n
+ "user.invited.invite_roles.restrict_domain"
}}
- />
- </form.Field>
+ @description={{i18n
+ "user.invited.invite_roles.restrict_domain_help"
+ }}
+ @validate={{if
+ (eq this.delivery "link")
+ this.validateDomain
+ }}
+ @format="full"
+ as |field|
+ >
+ <field.Control
+ autofocus="autofocus"
+ placeholder={{i18n
+ "user.invited.invite_roles.domain_placeholder"
+ }}
+ />
+ </form.Field>
+ {{/if}}
</Content>
<Content @name="email">
diff --git a/frontend/discourse/tests/integration/components/create-invite-with-roles-test.gjs b/frontend/discourse/tests/integration/components/create-invite-with-roles-test.gjs
index e645832a402..2ab6de10b44 100644
--- a/frontend/discourse/tests/integration/components/create-invite-with-roles-test.gjs
+++ b/frontend/discourse/tests/integration/components/create-invite-with-roles-test.gjs
@@ -25,6 +25,7 @@ module("Integration | Component | CreateInviteWithRoles", function (hooks) {
assert
.dom("input[name='invite-role']")
.doesNotExist("role toggle is not shown");
+ await click(".advanced-mode-btn");
assert.true(formKit().hasField("domain"), "defaults to member link mode");
});
@@ -60,6 +61,12 @@ module("Integration | Component | CreateInviteWithRoles", function (hooks) {
assert
.dom(".form-kit__inline-radio input[value='link']")
.isChecked("defaults to link delivery");
+ assert
+ .dom("[data-name='domain']")
+ .doesNotExist("hides the domain field until advanced mode is on");
+
+ await click(".advanced-mode-btn");
+
assert
.dom("[data-name='domain']")
.isVisible("shows the domain field in link mode");
@@ -89,6 +96,7 @@ module("Integration | Component | CreateInviteWithRoles", function (hooks) {
</template>
);
+ await click(".advanced-mode-btn");
assert.true(formKit().hasField("domain"), "stays in member mode");
});
@@ -231,6 +239,7 @@ module("Integration | Component | CreateInviteWithRoles", function (hooks) {
</template>
);
+ await click(".advanced-mode-btn");
await formKit().field("domain").fillIn("example.com");
await click(".save-invite");
@@ -431,6 +440,7 @@ module("Integration | Component | CreateInviteWithRoles", function (hooks) {
</template>
);
+ await click(".advanced-mode-btn");
await formKit().field("domain").fillIn("");
await click(".save-invite");
@@ -479,6 +489,8 @@ module("Integration | Component | CreateInviteWithRoles", function (hooks) {
</template>
);
+ await click(".advanced-mode-btn");
+
assert
.form()
.field("domain")
diff --git a/spec/system/create_invite_with_roles_spec.rb b/spec/system/create_invite_with_roles_spec.rb
index ed167cb43bd..51365a82d5e 100644
--- a/spec/system/create_invite_with_roles_spec.rb
+++ b/spec/system/create_invite_with_roles_spec.rb
@@ -101,6 +101,7 @@ describe "Creating invites with roles" do
open_invite_modal_for(admin)
modal.select_role("admin")
+ modal.toggle_advanced_options
modal.form.field("domain").fill_in("example.com")
modal.save_button.click
@@ -124,7 +125,6 @@ describe "Creating invites with roles" do
modal.toggle_advanced_options
screenshot_marker(label: "invite-members-advanced", only: :desktop)
- modal.toggle_advanced_options
modal.form.field("domain").fill_in("example.com")
modal.save_button.click