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

coder · code-asher · Aug 9, 2024 · Aug 6, 2024 · Aug 6, 2024 · Aug 7, 2024
commit 9aca231d98b62fe4cd0698f01739bb587c5a8e37
diff --git a/site/src/api/queries/organizations.ts b/site/src/api/queries/organizations.ts
@@ -135,9 +135,9 @@ export const organizationPermissions = (organizationId: string | undefined) => {
     queryKey: ["organization", organizationId, "permissions"],
     queryFn: () =>
       // Only request what we use on individual org settings, members, and group
-      // pages, which at the moment is whether you can edit the members on the
-      // members page and whether you can see the create group button on the
-      // groups page.  The edit organization check for the settings page is
+      // pages, which at the moment is whether you can edit the members or roles
+      // on the members page and whether you can see the create group button on
+      // the groups page.  The edit organization check for the settings page is
       // covered by the multi-org query at the moment, and the edit group check
       // on the group page is done on the group itself, not the org, so neither
       // show up here.
@@ -157,6 +157,13 @@ export const organizationPermissions = (organizationId: string | undefined) => {
             },
             action: "create",
           },
+          assignOrgRole: {
+            object: {
+              resource_type: "assign_org_role",
+              organization_id: organizationId,
+            },
+            action: "create",
+          },
         },
       }),
   };

diff --git a/site/src/pages/ManagementSettingsPage/SidebarView.stories.tsx b/site/src/pages/ManagementSettingsPage/SidebarView.stories.tsx
@@ -123,6 +123,7 @@ export const SelectedOrgAdmin: Story = {
           editMembers: true,
           editGroups: true,
           auditOrganization: true,
+          assignOrgRole: true,
         },
       },
     ],

diff --git a/site/src/pages/ManagementSettingsPage/SidebarView.tsx b/site/src/pages/ManagementSettingsPage/SidebarView.tsx
@@ -217,6 +217,8 @@ interface OrganizationSettingsNavigationProps {
 const OrganizationSettingsNavigation: FC<
   OrganizationSettingsNavigationProps
 > = ({ active, organization }) => {
+  const { experiments } = useDashboard();
+
   return (
     <>
       <SidebarNavItem