fixup! Merge remote-tracking branch 'github/main' into asher/show-editable-orgs

code-asher · code-asher · commit ba22bc96dc4f · 2024-08-08T22:07:51.000-08:00
diff --git a/site/src/api/queries/organizations.ts b/site/src/api/queries/organizations.ts
@@ -185,9 +185,9 @@ export const organizationsPermissions = (
     queryKey: ["organizations", organizationIds.sort(), "permissions"],
     queryFn: async () => {
       // Only request what we need for the sidebar, which is one edit permission
-      // per sub-link (audit page, settings page, groups page, and members page)
-      // that tells us whether to show that page, since we only show them if you
-      // can edit (and not, at the moment if you can only view).
+      // per sub-link (audit, settings, groups, roles, and members pages) that
+      // tells us whether to show that page, since we only show them if you can
+      // edit (and not, at the moment if you can only view).
       const checks = (organizationId: string) => ({
         editMembers: {
           object: {
@@ -217,6 +217,13 @@ export const organizationsPermissions = (
           },
           action: "read",
         },
+        assignOrgRole: {
+          object: {
+            resource_type: "assign_org_role",
+            organization_id: organizationId,
+          },
+          action: "create",
+        },
       });
 
       // The endpoint takes a flat array, so to avoid collisions prepend each
diff --git a/site/src/pages/ManagementSettingsPage/SidebarView.tsx b/site/src/pages/ManagementSettingsPage/SidebarView.tsx
@@ -256,10 +256,10 @@ const OrganizationSettingsNavigation: FC<
               Groups
             </SidebarNavSubItem>
           )}
-          {props.permissions.assignOrgRole &&
+          {organization.permissions.assignOrgRole &&
             experiments.includes("custom-roles") && (
               <SidebarNavSubItem
-                href={urlForSubpage(props.organization.name, "roles")}
+                href={urlForSubpage(organization.name, "roles")}
               >
                 Roles
               </SidebarNavSubItem>
