Skip to content

feat: add resource-action pills to custom roles table #14354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 3, 2024
Merged

feat: add resource-action pills to custom roles table #14354

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5a61d3f
feat: add resource-action pills to custom roles table
jaaydenh Aug 19, 2024
83c5b09
fix: remove permission from theme and change name to colorRoles
jaaydenh Aug 21, 2024
d78f9a7
fix: revert name from colorRoles to roles
jaaydenh Aug 21, 2024
a7b63ba
fix: format
jaaydenh Aug 30, 2024
437bbd0
fix: custom role with no permissions
jaaydenh Aug 31, 2024
9514f30
feat: extract permissions pull list component and add tests
jaaydenh Aug 31, 2024
9497583
chore: undo color roles name change
jaaydenh Sep 3, 2024
fae3881
feat: add experimental pill colors
jaaydenh Sep 3, 2024
de5e171
fix: format
jaaydenh Sep 3, 2024
af142e3
chore: update experiment name
jaaydenh Sep 3, 2024
1b10a76
chore: cleanup
jaaydenh Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: custom role with no permissions
  • Loading branch information
@jaaydenh
jaaydenh committed Sep 3, 2024
commit 437bbd0fc326aed51fce206b96d3bbcdbd8a901b
17 changes: 14 additions & 3 deletions site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPageView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import type { Meta, StoryObj } from "@storybook/react";
import { MockRoleWithOrgPermissions } from "testHelpers/entities";
import {
MockRoleWithOrgPermissions,
MockOrganizationAuditorRole,
} from "testHelpers/entities";
import { CustomRolesPageView } from "./CustomRolesPageView";

const meta: Meta<typeof CustomRolesPageView> = {
Expand All @@ -26,6 +29,14 @@ export const Enabled: Story = {
},
};

export const RoleWithoutPermissions: Story = {
args: {
roles: [MockOrganizationAuditorRole],
canAssignOrgRole: true,
isCustomRolesEnabled: true,
},
};

export const EmptyDisplayName: Story = {
args: {
roles: [
Expand All @@ -40,15 +51,15 @@ export const EmptyDisplayName: Story = {
},
};

export const EmptyRoleWithoutPermission: Story = {
export const EmptyTableUserWithoutPermission: Story = {
args: {
roles: [],
canAssignOrgRole: false,
isCustomRolesEnabled: true,
},
};

export const EmptyRoleWithPermission: Story = {
export const EmptyTableUserWithPermission: Story = {
args: {
roles: [],
canAssignOrgRole: true,
Expand Down
12 changes: 8 additions & 4 deletions site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,14 @@ const RoleRow: FC<RoleRowProps> = ({ role, onDelete, canAssignOrgRole }) => {

<TableCell>
<Stack direction="row" spacing={1}>
<PermissionsPill
resource={resourceTypes[0]}
permissions={role.organization_permissions}
/>
{role.organization_permissions.length > 0 ? (
<PermissionsPill
resource={resourceTypes[0]}
permissions={role.organization_permissions}
/>
) : (
<p>None</p>
)}

{resourceTypes.length > 1 && (
<OverflowPermissionPill
Expand Down