feat: add assign org role permission

jaaydenh · jaaydenh · commit d3904792cf68 · 2024-08-02T01:02:16.000Z
diff --git a/site/src/contexts/auth/permissions.tsx b/site/src/contexts/auth/permissions.tsx
@@ -12,6 +12,7 @@ export const checks = {
   viewExternalAuthConfig: "viewExternalAuthConfig",
   viewDeploymentStats: "viewDeploymentStats",
   editWorkspaceProxies: "editWorkspaceProxies",
+  assignOrgRole: "assignOrgRole",
 } as const;
 
 export const permissionsToCheck = {
@@ -93,6 +94,12 @@ export const permissionsToCheck = {
     },
     action: "create",
   },
+  [checks.assignOrgRole]: {
+    object: {
+      resource_type: "assign_org_role",
+    },
+    action: "create",
+  },
 } as const;
 
 export type Permissions = Record<keyof typeof permissionsToCheck, boolean>;
diff --git a/site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPage.tsx b/site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPage.tsx
@@ -22,10 +22,10 @@ import CustomRolesPageView from "./CustomRolesPageView";
 
 export const CustomRolesPage: FC = () => {
   const { permissions } = useAuthenticated();
-  const { createGroup: canCreateGroup } = permissions;
+  const { assignOrgRole: canAssignOrgRole } = permissions;
   const {
     multiple_organizations: organizationsEnabled,
-    template_rbac: isTemplateRBACEnabled,
+    custom_roles: isCustomRolesEnabled,
   } = useFeatureVisibility();
   const { experiments } = useDashboard();
   const location = useLocation();
@@ -62,7 +62,7 @@ export const CustomRolesPage: FC = () => {
       <PageHeader
         actions={
           <>
-            {canCreateGroup && isTemplateRBACEnabled && (
+            {canAssignOrgRole && isCustomRolesEnabled && (
               <Button
                 component={RouterLink}
                 startIcon={<GroupAdd />}
@@ -79,8 +79,8 @@ export const CustomRolesPage: FC = () => {
 
       <CustomRolesPageView
         roles={organizationRolesQuery.data}
-        canCreateGroup={canCreateGroup}
-        isTemplateRBACEnabled={isTemplateRBACEnabled}
+        canAssignOrgRole={canAssignOrgRole}
+        isCustomRolesEnabled={isCustomRolesEnabled}
       />
     </>
   );
diff --git a/site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPageView.tsx b/site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPageView.tsx
@@ -29,25 +29,25 @@ import { docs } from "utils/docs";
 
 export type CustomRolesPageViewProps = {
   roles: Role[] | undefined;
-  canCreateGroup: boolean;
-  isTemplateRBACEnabled: boolean;
+  canAssignOrgRole: boolean;
+  isCustomRolesEnabled: boolean;
 };
 
 // const filter = createFilterOptions<Role>();
 
 export const CustomRolesPageView: FC<CustomRolesPageViewProps> = ({
   roles,
-  canCreateGroup,
-  isTemplateRBACEnabled,
+  canAssignOrgRole,
+  isCustomRolesEnabled,
 }) => {
   const isLoading = Boolean(roles === undefined);
   const isEmpty = Boolean(roles && roles.length === 0);
   // const [selectedRole, setSelectedRole] = useState<Role | null>(null);
-
+  console.log({ roles });
   return (
     <>
       <ChooseOne>
-        <Cond condition={!isTemplateRBACEnabled}>
+        <Cond condition={!isCustomRolesEnabled}>
           <Paywall
             message="Custom Roles"
             description="Organize users into groups with restricted access to templates. You need an Enterprise license to use this feature."
@@ -77,19 +77,19 @@ export const CustomRolesPageView: FC<CustomRolesPageViewProps> = ({
                         <EmptyState
                           message="No groups yet"
                           description={
-                            canCreateGroup
-                              ? "Create your first group"
-                              : "You don't have permission to create a group"
+                            canAssignOrgRole
+                              ? "Create your first custom role"
+                              : "You don't have permission to create a custom role"
                           }
                           cta={
-                            canCreateGroup && (
+                            canAssignOrgRole && (
                               <Button
                                 component={RouterLink}
                                 to="create"
                                 startIcon={<AddOutlined />}
                                 variant="contained"
                               >
-                                Create group
+                                Create custom role
                               </Button>
                             )
                           }
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -2485,6 +2485,7 @@ export const MockPermissions: Permissions = {
   viewDeploymentStats: true,
   viewExternalAuthConfig: true,
   editWorkspaceProxies: true,
+  assignOrgRole: true,
 };
 
 export const MockDeploymentConfig: DeploymentConfig = {
