Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

fix: use "All tenant users" group for tenant users in popover and modal (#67446)

Nicolò Pretto50e46d56a75f
diff --git a/e2e/test/scenarios/admin-2/tenants.cy.spec.ts b/e2e/test/scenarios/admin-2/tenants.cy.spec.ts
index 2c5cf53145b..345f4729821 100644
--- a/e2e/test/scenarios/admin-2/tenants.cy.spec.ts
+++ b/e2e/test/scenarios/admin-2/tenants.cy.spec.ts
@@ -511,6 +511,68 @@ describe("Tenants - management", () => {
});
});
+ it("should show 'All tenant users' in permission warning tooltip and modal for tenant groups on data permissions (UXW-2624)", () => {
+ cy.request("PUT", "/api/setting", { "use-tenants": true });
+
+ cy.request("POST", "/api/permissions/group", {
+ name: "Test Tenant Group",
+ is_tenant_group: true,
+ });
+
+ cy.visit("/admin/permissions/data/database/1");
+
+ cy.log("all tenant users should have 'Can view' access");
+ cy.findAllByRole("row")
+ .contains("tr", "All tenant users")
+ .should("contain", "Can view");
+
+ cy.log(
+ "tenant group should have 'Blocked' access (new group default) with warning icon",
+ );
+ cy.findAllByRole("row")
+ .contains("tr", "Test Tenant Group")
+ .should("contain", "Blocked")
+ .findAllByLabelText("warning icon")
+ .first()
+ .realHover();
+
+ cy.log("tooltip should reference 'All tenant users'");
+ H.tooltip().should(
+ "contain",
+ 'The "All tenant users" group has a higher level of access',
+ );
+
+ cy.log("click to change to 'Can view' and back to trigger modal");
+ cy.findAllByRole("row")
+ .contains("tr", "Test Tenant Group")
+ .findByText("Blocked")
+ .click();
+
+ H.popover().findByText("Can view").click();
+
+ cy.findAllByRole("row")
+ .contains("tr", "Test Tenant Group")
+ .findByText("Can view")
+ .click();
+
+ H.popover().findByText("Blocked").click();
+
+ H.modal().within(() => {
+ cy.log("title should mention tenant users group");
+ cy.findByText(/Revoke access even though "All tenant users"/).should(
+ "be.visible",
+ );
+
+ cy.log("description should mention tenant users group");
+ cy.findByText(
+ /The "All tenant users" group has a higher level of access/,
+ ).should("be.visible");
+
+ cy.log("should not mention internal users");
+ cy.contains("internal users").should("not.exist");
+ });
+ });
+
it("should not show send email modal when creating tenant users when SMTP is configured", () => {
H.setupSMTP();
cy.request("PUT", "/api/setting", {
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
index 61117b70ba9..484b72ca668 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
@@ -386,7 +386,7 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto
const sortedGroups = groups.flat();
const defaultGroup = _.find(sortedGroups, isDefaultGroup);
- const externalUsersGroup = _.find(
+ const allTenantUsersGroup = _.find(
sortedGroups,
PLUGIN_TENANTS.isExternalUsersGroup,
);
@@ -400,12 +400,16 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto
const entities = sortedGroups.map((group) => {
const isAdmin = isAdminGroup(group);
- const isExternal =
- !!externalUsersGroup && PLUGIN_TENANTS.isExternalUsersGroup(group);
+
+ const isAllTenantUsersGroup =
+ !!allTenantUsersGroup && PLUGIN_TENANTS.isExternalUsersGroup(group);
const isTenantGroup = PLUGIN_TENANTS.isTenantGroup(group);
let groupPermissions;
+ const shouldUseAllExternalUsersGroup =
+ !!allTenantUsersGroup && (isAllTenantUsersGroup || isTenantGroup);
+
if (tableId != null) {
groupPermissions = buildFieldsPermissions(
{
@@ -415,10 +419,10 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto
},
group.id,
isAdmin,
- isExternal,
+ isAllTenantUsersGroup,
permissions,
originalPermissions,
- isExternal ? externalUsersGroup : defaultGroup,
+ shouldUseAllExternalUsersGroup ? allTenantUsersGroup : defaultGroup,
database,
);
} else if (schemaName != null) {
@@ -429,10 +433,10 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto
},
group.id,
isAdmin,
- isExternal,
+ isAllTenantUsersGroup,
permissions,
originalPermissions,
- isExternal ? externalUsersGroup : defaultGroup,
+ shouldUseAllExternalUsersGroup ? allTenantUsersGroup : defaultGroup,
database,
);
} else if (databaseId != null) {
@@ -442,10 +446,10 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto
},
group.id,
isAdmin,
- isExternal,
+ isAllTenantUsersGroup,
permissions,
originalPermissions,
- isExternal ? externalUsersGroup : defaultGroup,
+ shouldUseAllExternalUsersGroup ? allTenantUsersGroup : defaultGroup,
database,
"database",
);