update ui to use list all orgs

Emyrk · Emyrk · commit eafd8977e80e · 2024-07-18T17:09:11.000-05:00
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -565,7 +565,7 @@ class ApiMethods {
 
   getOrganizations = async (): Promise<TypesGen.Organization[]> => {
     const response = await this.axios.get<TypesGen.Organization[]>(
-      "/api/v2/users/me/organizations",
+      "/api/v2/organizations",
     );
     return response.data;
   };
diff --git a/site/src/api/queries/organizations.ts b/site/src/api/queries/organizations.ts
@@ -4,7 +4,7 @@ import type {
   CreateOrganizationRequest,
   UpdateOrganizationRequest,
 } from "api/typesGenerated";
-import { meKey, myOrganizationsKey } from "./users";
+import { meKey } from "./users";
 
 export const createOrganization = (queryClient: QueryClient) => {
   return {
@@ -13,7 +13,7 @@ export const createOrganization = (queryClient: QueryClient) => {
 
     onSuccess: async () => {
       await queryClient.invalidateQueries(meKey);
-      await queryClient.invalidateQueries(myOrganizationsKey);
+      await queryClient.invalidateQueries(organizationsKey);
     },
   };
 };
@@ -29,7 +29,7 @@ export const updateOrganization = (queryClient: QueryClient) => {
       API.updateOrganization(variables.orgId, variables.req),
 
     onSuccess: async () => {
-      await queryClient.invalidateQueries(myOrganizationsKey);
+      await queryClient.invalidateQueries(organizationsKey);
     },
   };
 };
@@ -40,7 +40,7 @@ export const deleteOrganization = (queryClient: QueryClient) => {
 
     onSuccess: async () => {
       await queryClient.invalidateQueries(meKey);
-      await queryClient.invalidateQueries(myOrganizationsKey);
+      await queryClient.invalidateQueries(organizationsKey);
     },
   };
 };
@@ -78,3 +78,12 @@ export const removeOrganizationMember = (
     },
   };
 };
+
+export const organizationsKey = ["organizations", "me"] as const;
+
+export const organizations = () => {
+  return {
+    queryKey: organizationsKey,
+    queryFn: () => API.getOrganizations(),
+  };
+};
diff --git a/site/src/api/queries/users.ts b/site/src/api/queries/users.ts
@@ -249,12 +249,3 @@ export const updateAppearanceSettings = (
     },
   };
 };
-
-export const myOrganizationsKey = ["organizations", "me"] as const;
-
-export const myOrganizations = () => {
-  return {
-    queryKey: myOrganizationsKey,
-    queryFn: () => API.getOrganizations(),
-  };
-};
diff --git a/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx b/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx
@@ -2,7 +2,7 @@ import { createContext, type FC, Suspense, useContext } from "react";
 import { useQuery } from "react-query";
 import { Outlet, useLocation, useParams } from "react-router-dom";
 import { deploymentConfig } from "api/queries/deployment";
-import { myOrganizations } from "api/queries/users";
+import { organizations } from "api/queries/organizations";
 import type { Organization } from "api/typesGenerated";
 import { Loader } from "components/Loader/Loader";
 import { Margins } from "components/Margins/Margins";
@@ -39,7 +39,7 @@ export const ManagementSettingsLayout: FC = () => {
   const { experiments } = useDashboard();
   const { organization } = useParams() as { organization: string };
   const deploymentConfigQuery = useQuery(deploymentConfig());
-  const organizationsQuery = useQuery(myOrganizations());
+  const organizationsQuery = useQuery(organizations());
 
   const multiOrgExperimentEnabled = experiments.includes("multi-organization");
 
