Skip to content

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

UX: Disable ACL grantee row when all permissions banned (#41865)

Martin Brennanb540fc68543f
diff --git a/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss b/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss
index b527f747cc0..ba49494d6c4 100644
--- a/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/email-group-user-chooser.scss
@@ -22,8 +22,20 @@
@include ellipsis;
}
- .email-group-user-chooser--user,
- .email-group-user-chooser--group {
+ .email-group-user-chooser__badge {
+ font-size: var(--font-down-3);
+ background: var(--primary-low);
+ padding: var(--space-half) var(--space-1);
+ border-radius: var(--d-border-radius);
+ color: var(--primary-very-high);
+
+ .d-icon {
+ margin-right: 0;
+ }
+ }
+
+ .email-group-user-chooser__user,
+ .email-group-user-chooser__group {
&.--username-first,
&.--group-name-first {
.identifier {
@@ -66,7 +78,7 @@
margin-right: 0.5em;
}
- .email-group-user-chooser--group {
+ .email-group-user-chooser__group {
&.--full-name-only {
.name {
color: var(--primary);
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 7e385ea4f35..adfc44879a1 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -59,6 +59,7 @@ en:
add_group: "Add user or group"
mandatory_acl_tooltip: "This permission is mandatory for %{name} and cannot be removed"
mandatory: "Mandatory"
+ disallowed: "Disallowed"
carousel:
go_to_slide: "Go to slide %{index}"
previous: "Previous slide"
diff --git a/frontend/discourse/app/ui-kit/d-access-control-grantee-chooser.gjs b/frontend/discourse/app/ui-kit/d-access-control-grantee-chooser.gjs
index be8b6f02af9..dc8c01624c1 100644
--- a/frontend/discourse/app/ui-kit/d-access-control-grantee-chooser.gjs
+++ b/frontend/discourse/app/ui-kit/d-access-control-grantee-chooser.gjs
@@ -1,6 +1,7 @@
import { ajax } from "discourse/lib/ajax";
import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";
import { selectKitOptions } from "discourse/select-kit/components/select-kit";
+import { i18n } from "discourse-i18n";
const ACCESS_CONTROL_GRANTEE_SEARCH_URL = "/access-control/grantees/search";
@@ -8,7 +9,7 @@ export function granteeValue(type, id) {
return `${type}:${id}`;
}
-export function groupGranteeResult(group) {
+export function groupGranteeResult(group, isDisabled = false) {
return {
value: granteeValue("group", group.id),
id: group.name,
@@ -19,10 +20,13 @@ export function groupGranteeResult(group) {
display_name: group.display_name,
automatic: group.automatic,
isGroup: true,
+ disabled: isDisabled,
+ badgeText: isDisabled ? i18n("access_control.manage.disallowed") : null,
+ badgeIcon: isDisabled ? "ban" : null,
};
}
-function userGranteeResult(user) {
+function userGranteeResult(user, isDisabled = false) {
const sortName = user.name || user.display_name || user.username;
return {
@@ -36,6 +40,9 @@ function userGranteeResult(user) {
showUserStatus: false,
avatar_template: user.avatar_template,
isUser: true,
+ disabled: isDisabled,
+ badgeText: isDisabled ? i18n("access_control.manage.disallowed") : null,
+ badgeIcon: isDisabled ? "ban" : null,
};
}
@@ -86,8 +93,12 @@ export default class DAccessControlGranteeChooser extends EmailGroupUserChooser
}
return [
- ...(results.groups || []).map(groupGranteeResult),
- ...(results.users || []).map(userGranteeResult),
+ ...(results.groups || []).map((group) =>
+ groupGranteeResult(group, this.isGranteeDisabled(group))
+ ),
+ ...(results.users || []).map((user) =>
+ userGranteeResult(user, this.isGranteeDisabled(user))
+ ),
];
}
@@ -100,4 +111,10 @@ export default class DAccessControlGranteeChooser extends EmailGroupUserChooser
return results.filter((result) => !excludedGrantees.includes(result.value));
}
+
+ isGranteeDisabled(grantee) {
+ const disabledGrantees = this.selectKit.options.disabledGrantees || [];
+
+ return disabledGrantees.includes(granteeValue(grantee.type, grantee.id));
+ }
}
diff --git a/frontend/discourse/app/ui-kit/d-access-control.gjs b/frontend/discourse/app/ui-kit/d-access-control.gjs
index 19bfb8e729f..c2f5bd0d378 100644
--- a/frontend/discourse/app/ui-kit/d-access-control.gjs
+++ b/frontend/discourse/app/ui-kit/d-access-control.gjs
@@ -221,7 +221,12 @@ export default class DAccessControl extends Component {
* gated behind an async search request.
*/
get defaultAvailableGrantees() {
- return this.availableGroups.map(groupGranteeResult);
+ return this.availableGroups.map((group) =>
+ groupGranteeResult(
+ group,
+ this.disabledGrantees.includes(granteeValue("group", group.id))
+ )
+ );
}
get availableGroups() {
@@ -251,6 +256,25 @@ export default class DAccessControl extends Component {
return this.acl.map((entry) => granteeValue(entry.type, entry.id));
}
+ /**
+ * Grantees where it's impossible for them to be added because of a combination
+ * of banned ACL rules, e.g. if the anonymous_users group cannot view, edit, or
+ * manage. We disable so we can show a message/tooltip so it's not confusing
+ * where the grantee went.
+ */
+ get disabledGrantees() {
+ return this.availableGroups
+ .filter((group) => {
+ const availablePermissions = this.excludeBannedPermissions(
+ this.permissionOptions.filter((opt) => opt.id !== REMOVE_ACTION.id),
+ { type: "group", id: group.id }
+ );
+
+ return availablePermissions.length === 0;
+ })
+ .map((group) => granteeValue("group", group.id));
+ }
+
/**
* Fired when a grantee is chosen from the DAccessControlGranteeChooser
* search results.
@@ -367,6 +391,7 @@ export default class DAccessControl extends Component {
defaultSearchResults=this.defaultAvailableGrantees
)
excludedGrantees=this.excludedGrantees
+ disabledGrantees=this.disabledGrantees
filterable=true
includeGroups=true
maximum=1
diff --git a/frontend/discourse/select-kit/components/email-group-user-chooser-row.gjs b/frontend/discourse/select-kit/components/email-group-user-chooser-row.gjs
index a7c717fd67e..d7ac9c2df2c 100644
--- a/frontend/discourse/select-kit/components/email-group-user-chooser-row.gjs
+++ b/frontend/discourse/select-kit/components/email-group-user-chooser-row.gjs
@@ -42,7 +42,7 @@ export default class EmailGroupUserChooserRow extends SelectKitRowComponent {
{{dAvatar this.item imageSize="tiny"}}
<div
class={{dConcatClass
- "email-group-user-chooser--user"
+ "email-group-user-chooser__user"
(if
(eq this.userNameOrdering "usernameFirst")
"--username-first"
@@ -73,7 +73,7 @@ export default class EmailGroupUserChooserRow extends SelectKitRowComponent {
{{dIcon "users"}}
<div
class={{dConcatClass
- "email-group-user-chooser--group"
+ "email-group-user-chooser__group"
(if
(eq this.groupNameOrdering "groupNameFirst")
"--group-name-first"
@@ -97,5 +97,14 @@ export default class EmailGroupUserChooserRow extends SelectKitRowComponent {
{{dIcon "envelope"}}
<span class="identifier">{{this.item.id}}</span>
{{/if}}
+
+ {{#if this.item.badgeText}}
+ <span class="email-group-user-chooser__badge">
+ {{#if this.item.badgeIcon}}
+ {{dIcon this.item.badgeIcon}}
+ {{/if}}
+ {{this.item.badgeText}}
+ </span>
+ {{/if}}
</template>
}
diff --git a/frontend/discourse/tests/integration/components/select-kit/email-group-user-chooser-test.gjs b/frontend/discourse/tests/integration/components/select-kit/email-group-user-chooser-test.gjs
index 3be079de2d7..ca719fbacdc 100644
--- a/frontend/discourse/tests/integration/components/select-kit/email-group-user-chooser-test.gjs
+++ b/frontend/discourse/tests/integration/components/select-kit/email-group-user-chooser-test.gjs
@@ -40,13 +40,13 @@ module(
await this.subject.expand();
assert
- .dom(".email-group-user-chooser--group")
+ .dom(".email-group-user-chooser__group")
.hasClass("--group-name-first", "applies the group-name-first style");
assert
- .dom(".email-group-user-chooser--group .identifier")
+ .dom(".email-group-user-chooser__group .identifier")
.hasText("team_a", "renders the group name as the identifier");
assert
- .dom(".email-group-user-chooser--group .name")
+ .dom(".email-group-user-chooser__group .name")
.hasText("Team A", "renders the full group name as the label");
});
@@ -74,7 +74,7 @@ module(
await this.subject.expand();
- const groupRow = find(".email-group-user-chooser--group");
+ const groupRow = find(".email-group-user-chooser__group");
assert
.dom(groupRow)
@@ -116,10 +116,10 @@ module(
await this.subject.expand();
assert
- .dom(".email-group-user-chooser--group .identifier")
+ .dom(".email-group-user-chooser__group .identifier")
.doesNotExist("hides the equivalent group name");
assert
- .dom(".email-group-user-chooser--group .name")
+ .dom(".email-group-user-chooser__group .name")
.hasText("Team A", "keeps the full group name visible");
});
@@ -148,7 +148,7 @@ module(
await this.subject.expand();
- const userRow = find(".email-group-user-chooser--user");
+ const userRow = find(".email-group-user-chooser__user");
assert
.dom(userRow)
@@ -187,7 +187,7 @@ module(
await this.subject.expand();
- const userRow = find(".email-group-user-chooser--user");
+ const userRow = find(".email-group-user-chooser__user");
assert
.dom(userRow)