chore: cleanup

jaaydenh · jaaydenh · commit 4ade2248587a · 2024-08-05T21:39:37.000Z
diff --git a/site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePage.tsx b/site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePage.tsx
@@ -10,7 +10,7 @@ import { patchOrganizationRole, organizationRoles } from "api/queries/roles";
 import type { PatchRoleRequest } from "api/typesGenerated";
 import { displayError } from "components/GlobalSnackbar/utils";
 import { Loader } from "components/Loader/Loader";
-import { PageHeader } from "components/PageHeader/PageHeader";
+import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
 import { useAuthenticated } from "contexts/auth/RequireAuth";
 import { nameValidator } from "utils/formUtils";
 import { pageTitle } from "utils/page";
@@ -20,13 +20,13 @@ export const CreateEditRolePage: FC = () => {
   const { permissions } = useAuthenticated();
   const queryClient = useQueryClient();
   const navigate = useNavigate();
-  const { organization, roleName } = useParams() as {
+  const { organization = "default", roleName } = useParams() as {
     organization: string;
     roleName: string;
   };
   const { assignOrgRole: canAssignOrgRole } = permissions;
   const patchOrganizationRoleMutation = useMutation(
-    patchOrganizationRole(queryClient, organization ?? "default"),
+    patchOrganizationRole(queryClient, organization),
   );
   const { data: roleData, isLoading } = useQuery(
     organizationRoles(organization),
@@ -95,7 +95,11 @@ export const CreateEditRolePage: FC = () => {
             </>
           )
         }
-      ></PageHeader>
+      >
+        <PageHeaderTitle>
+          {role ? "Edit" : "Create"} custom role
+        </PageHeaderTitle>
+      </PageHeader>
 
       <CreateEditRolePageView
         role={role}
diff --git a/site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePageView.tsx b/site/src/pages/ManagementSettingsPage/CustomRolesPage/CreateEditRolePageView.tsx
@@ -26,7 +26,6 @@ import {
   FormSection,
   HorizontalForm,
 } from "components/Form/Form";
-import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
 import { getFormHelpers } from "utils/formUtils";
 
 export type CreateEditRolePageViewProps = {
@@ -48,11 +47,6 @@ export const CreateEditRolePageView: FC<CreateEditRolePageViewProps> = ({
 
   return (
     <>
-      <PageHeader css={{ paddingTop: 8 }}>
-        <PageHeaderTitle>
-          {role ? "Edit" : "Create"} custom role
-        </PageHeaderTitle>
-      </PageHeader>
       <HorizontalForm onSubmit={form.handleSubmit}>
         <FormSection
           title="Role settings"
@@ -101,6 +95,14 @@ interface ActionCheckboxesProps {
   form: ReturnType<typeof useFormik<Role>> & { values: Role };
 }
 
+const ResourceActionComparator = (
+  p: Permission,
+  resource: string,
+  action: string,
+) =>
+  p.resource_type === resource &&
+  (p.action.toString() === "*" || p.action === action);
+
 const ActionCheckboxes: FC<ActionCheckboxesProps> = ({ permissions, form }) => {
   const [checkedActions, setCheckActions] = useState(permissions);
 
@@ -146,18 +148,19 @@ const ActionCheckboxes: FC<ActionCheckboxesProps> = ({ permissions, form }) => {
                               <Checkbox
                                 name={`${resourceKey}:${actionKey}`}
                                 checked={
-                                  checkedActions?.some(
-                                    (p) =>
-                                      p.resource_type === resourceKey &&
-                                      (p.action.toString() === "*" ||
-                                        p.action === actionKey),
+                                  checkedActions?.some((p) =>
+                                    ResourceActionComparator(
+                                      p,
+                                      resourceKey,
+                                      actionKey,
+                                    ),
                                   ) || false
                                 }
                                 onChange={(e) => handleCheckChange(e, form)}
                               />
                               {actionKey}
                             </span>{" "}
-                            -{" "}
+                            &ndash;{" "}
                             <span css={styles.actionDescription}>{value}</span>
                           </li>
                         );
