Pass in ids instead of entire orgs

coder · code-asher · Aug 9, 2024 · Aug 6, 2024 · Aug 6, 2024 · Aug 7, 2024
commit e4f5bf7f0c4c03e76bb73567ed2b8e38f357ec58
diff --git a/site/src/api/queries/organizations.ts b/site/src/api/queries/organizations.ts
@@ -3,7 +3,6 @@ import { API } from "api/api";
 import type {
   AuthorizationResponse,
   CreateOrganizationRequest,
-  Organization,
   UpdateOrganizationRequest,
 } from "api/typesGenerated";
 import { meKey } from "./users";
@@ -169,9 +168,9 @@ export const organizationPermissions = (organizationId: string | undefined) => {
  * If organizations are undefined, return a disabled query.
  */
 export const organizationsPermissions = (
-  organizations: Organization[] | undefined,
+  organizationIds: string[] | undefined,
 ) => {
-  if (!organizations) {
+  if (!organizationIds) {
     return { enabled: false };
   }
 
@@ -215,10 +214,10 @@ export const organizationsPermissions = (
 
       // The endpoint takes a flat array, so to avoid collisions prepend each
       // check with the org ID (the key can be anything we want).
-      const prefixedChecks = organizations
-        .map((org) =>
-          Object.entries(checks(org.id)).map(([key, val]) => [
-            `${org.id}.${key}`,
+      const prefixedChecks = organizationIds
+        .map((orgId) =>
+          Object.entries(checks(orgId)).map(([key, val]) => [
+            `${orgId}.${key}`,
             val,
           ]),
         )

diff --git a/site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx b/site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx
@@ -35,7 +35,9 @@ const OrganizationSettingsPage: FC = () => {
     organizations && organizationName
       ? getOrganizationByName(organizations, organizationName)
       : undefined;
-  const permissionsQuery = useQuery(organizationsPermissions(organizations));
+  const permissionsQuery = useQuery(
+    organizationsPermissions(organizations?.map((o) => o.id)),
+  );
 
   const permissions = permissionsQuery.data;
   if (!organizations || !permissions) {

diff --git a/site/src/pages/ManagementSettingsPage/Sidebar.tsx b/site/src/pages/ManagementSettingsPage/Sidebar.tsx
@@ -25,7 +25,9 @@ export const Sidebar: FC = () => {
     organization?: string;
   };
 
-  const orgPermissionsQuery = useQuery(organizationsPermissions(organizations));
+  const orgPermissionsQuery = useQuery(
+    organizationsPermissions(organizations?.map((o) => o.id)),
+  );
 
   // Sometimes a user can read an organization but cannot actually do anything
   // with it.  For now, these are filtered out so you only see organizations you