Skip to content

Commit 32f7450

Browse files
committed
fix: custom role with no permissions
1 parent 78c817f commit 32f7450

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPageView.stories.tsx

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import type { Meta, StoryObj } from "@storybook/react";
2-
import { MockRoleWithOrgPermissions } from "testHelpers/entities";
2+
import {
3+
MockRoleWithOrgPermissions,
4+
MockOrganizationAuditorRole,
5+
} from "testHelpers/entities";
36
import { CustomRolesPageView } from "./CustomRolesPageView";
47

58
const meta: Meta<typeof CustomRolesPageView> = {
@@ -26,6 +29,14 @@ export const Enabled: Story = {
2629
},
2730
};
2831

32+
export const RoleWithoutPermissions: Story = {
33+
args: {
34+
roles: [MockOrganizationAuditorRole],
35+
canAssignOrgRole: true,
36+
isCustomRolesEnabled: true,
37+
},
38+
};
39+
2940
export const EmptyDisplayName: Story = {
3041
args: {
3142
roles: [
@@ -40,15 +51,15 @@ export const EmptyDisplayName: Story = {
4051
},
4152
};
4253

43-
export const EmptyRoleWithoutPermission: Story = {
54+
export const EmptyTableUserWithoutPermission: Story = {
4455
args: {
4556
roles: [],
4657
canAssignOrgRole: false,
4758
isCustomRolesEnabled: true,
4859
},
4960
};
5061

51-
export const EmptyRoleWithPermission: Story = {
62+
export const EmptyTableUserWithPermission: Story = {
5263
args: {
5364
roles: [],
5465
canAssignOrgRole: true,

site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPageView.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,14 @@ const RoleRow: FC<RoleRowProps> = ({ role, onDelete, canAssignOrgRole }) => {
145145

146146
<TableCell>
147147
<Stack direction="row" spacing={1}>
148-
<PermissionsPill
149-
resource={resourceTypes[0]}
150-
permissions={role.organization_permissions}
151-
/>
148+
{role.organization_permissions.length > 0 ? (
149+
<PermissionsPill
150+
resource={resourceTypes[0]}
151+
permissions={role.organization_permissions}
152+
/>
153+
) : (
154+
<p>None</p>
155+
)}
152156

153157
{resourceTypes.length > 1 && (
154158
<OverflowPermissionPill

0 commit comments

Comments
 (0)