Skip to content

feat: display builtin roles alongside custom roles #14843

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 3 commits into from
Sep 27, 2024
Merged

feat: display builtin roles alongside custom roles #14843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0f8d27
feat: display builtin roles
jaaydenh Sep 27, 2024
daf4ce9
chore: add additional default resource, idpsync_settings
jaaydenh Sep 27, 2024
8ca8c8c
fix: remove explicit boolean check
jaaydenh Sep 27, 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
1 change: 1 addition & 0 deletions site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ const DEFAULT_RESOURCES = [
"organization_member",
"provisioner_daemon",
"workspace",
"idpsync_settings",
];

const resources = new Set(DEFAULT_RESOURCES);
Expand Down
23 changes: 10 additions & 13 deletions site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import AddIcon from "@mui/icons-material/AddOutlined";
import Button from "@mui/material/Button";
import { getErrorMessage } from "api/errors";
import { organizationPermissions } from "api/queries/organizations";
import { deleteOrganizationRole, organizationRoles } from "api/queries/roles";
Expand All @@ -13,7 +11,7 @@ import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
import { type FC, useEffect, useState } from "react";
import { Helmet } from "react-helmet-async";
import { useMutation, useQuery, useQueryClient } from "react-query";
import { Link as RouterLink, useParams } from "react-router-dom";
import { useParams } from "react-router-dom";
import { pageTitle } from "utils/page";
import { useOrganizationSettings } from "../ManagementSettingsLayout";
import CustomRolesPageView from "./CustomRolesPageView";
Expand All @@ -32,8 +30,11 @@ export const CustomRolesPage: FC = () => {
);
const [roleToDelete, setRoleToDelete] = useState<Role>();
const organizationRolesQuery = useQuery(organizationRoles(organizationName));
const filteredRoleData = organizationRolesQuery.data?.filter(
(role) => role.built_in === false,
const builtInRoles = organizationRolesQuery.data?.filter(
(role) => role.built_in,
);
const customRoles = organizationRolesQuery.data?.filter(
(role) => !role.built_in,
);
const permissions = permissionsQuery.data;

Expand Down Expand Up @@ -64,18 +65,14 @@ export const CustomRolesPage: FC = () => {
justifyContent="space-between"
>
<SettingsHeader
title="Custom Roles"
description="Manage custom roles for this organization."
title="Roles"
description="Manage roles for this organization."
/>
{permissions.assignOrgRole && isCustomRolesEnabled && (
<Button component={RouterLink} startIcon={<AddIcon />} to="create">
Create custom role
</Button>
)}
</Stack>

<CustomRolesPageView
roles={filteredRoleData}
builtInRoles={builtInRoles}
customRoles={customRoles}
onDeleteRole={setRoleToDelete}
canAssignOrgRole={permissions.assignOrgRole}
isCustomRolesEnabled={isCustomRolesEnabled}
Expand Down
21 changes: 14 additions & 7 deletions site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPageView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,61 +15,68 @@ type Story = StoryObj<typeof CustomRolesPageView>;

export const NotEnabled: Story = {
args: {
roles: [MockRoleWithOrgPermissions],
builtInRoles: [MockRoleWithOrgPermissions],
customRoles: [MockRoleWithOrgPermissions],
canAssignOrgRole: true,
isCustomRolesEnabled: false,
},
};

export const NotEnabledEmptyTable: Story = {
args: {
roles: [],
builtInRoles: [MockRoleWithOrgPermissions],
customRoles: [],
canAssignOrgRole: true,
isCustomRolesEnabled: false,
},
};

export const Enabled: Story = {
args: {
roles: [MockRoleWithOrgPermissions],
builtInRoles: [MockRoleWithOrgPermissions],
customRoles: [MockRoleWithOrgPermissions],
canAssignOrgRole: true,
isCustomRolesEnabled: true,
},
};

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

export const EmptyDisplayName: Story = {
args: {
roles: [
customRoles: [
{
...MockRoleWithOrgPermissions,
name: "my-custom-role",
display_name: "",
},
],
builtInRoles: [MockRoleWithOrgPermissions],
canAssignOrgRole: true,
isCustomRolesEnabled: true,
},
};

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

export const EmptyTableUserWithPermission: Story = {
args: {
roles: [],
builtInRoles: [MockRoleWithOrgPermissions],
customRoles: [],
canAssignOrgRole: true,
isCustomRolesEnabled: true,
},
Expand Down
Loading
Loading