Use default org ID in old pages

code-asher · code-asher · commit da10e5f6ccb8 · 2024-08-05T16:44:50.000-08:00
The 0000 syntax does not work, it has to be the actual org ID.

Technically this is probably not necessary since it means only admins
can create groups which was already the case, but I think being explicit
about the org we are checking is a good idea, even if these pages will
eventually go away in favor of the multi-org ones.
diff --git a/site/src/pages/GroupsPage/GroupsPage.tsx b/site/src/pages/GroupsPage/GroupsPage.tsx
@@ -6,16 +6,17 @@ import { groups } from "api/queries/groups";
 import { organizationPermissions } from "api/queries/organizations";
 import { displayError } from "components/GlobalSnackbar/utils";
 import { Loader } from "components/Loader/Loader";
+import { useDashboard } from "modules/dashboard/useDashboard";
 import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
 import { pageTitle } from "utils/page";
 import GroupsPageView from "./GroupsPageView";
 
 export const GroupsPage: FC = () => {
+  const { organizations } = useDashboard();
   const { template_rbac: isTemplateRBACEnabled } = useFeatureVisibility();
-  const groupsQuery = useQuery(groups("default"));
-  const permissionsQuery = useQuery(
-    organizationPermissions("00000000-0000-0000-0000-00000000000"),
-  );
+  const organization = organizations.find((o) => o.is_default)
+  const groupsQuery = useQuery(organization ? groups(organization.id) : { enabled: false });
+  const permissionsQuery = useQuery(organizationPermissions(organization?.id));
 
   useEffect(() => {
     if (groupsQuery.error) {
@@ -33,6 +34,10 @@ export const GroupsPage: FC = () => {
     }
   }, [permissionsQuery.error]);
 
+  if (!organization) {
+    throw new Error("No default organization")
+  }
+
   const permissions = permissionsQuery.data;
   if (!permissions) {
     return <Loader />;
diff --git a/site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx b/site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx
@@ -8,6 +8,7 @@ import { getErrorMessage } from "api/errors";
 import { groups } from "api/queries/groups";
 import { organizationPermissions } from "api/queries/organizations";
 import type { Organization } from "api/typesGenerated";
+import { EmptyState } from "components/EmptyState/EmptyState";
 import { displayError } from "components/GlobalSnackbar/utils";
 import { Loader } from "components/Loader/Loader";
 import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
@@ -25,8 +26,6 @@ export const GroupsPage: FC = () => {
     organizationName ? groups(organizationName) : { enabled: false },
   );
   const { organizations } = useOrganizationSettings();
-  // TODO: If we could query permissions based on the name then we would not
-  //       have to cascade off the organizations query.
   const organization = organizations?.find((o) => o.name === organizationName);
   const permissionsQuery = useQuery(organizationPermissions(organization?.id));
 
@@ -56,7 +55,11 @@ export const GroupsPage: FC = () => {
       return <Navigate to={`/organizations/${defaultName}/groups`} replace />;
     }
     // We expect there to always be a default organization.
-    throw new Error("No default organization found")
+    throw new Error("No default organization found");
+  }
+
+  if (!organization) {
+    return <EmptyState message="Organization not found" />;
   }
 
   const permissions = permissionsQuery.data;
diff --git a/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx b/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx
@@ -8,6 +8,7 @@ import { Margins } from "components/Margins/Margins";
 import { Stack } from "components/Stack/Stack";
 import { useAuthenticated } from "contexts/auth/RequireAuth";
 import { RequirePermission } from "contexts/auth/RequirePermission";
+import { useDashboard } from "modules/dashboard/useDashboard";
 import { DeploySettingsContext } from "../DeploySettingsPage/DeploySettingsLayout";
 import { Sidebar } from "./Sidebar";
 
diff --git a/site/src/pages/ManagementSettingsPage/OrganizationMembersPage.tsx b/site/src/pages/ManagementSettingsPage/OrganizationMembersPage.tsx
@@ -35,8 +35,6 @@ const OrganizationMembersPage: FC = () => {
     updateOrganizationMemberRoles(queryClient, organizationName),
   );
 
-  // TODO: If we could query permissions based on the name then we would not
-  //       have to cascade off the organizations query.
   const { organizations } = useOrganizationSettings();
   const organization = organizations?.find((o) => o.name === organizationName);
   const permissionsQuery = useQuery(organizationPermissions(organization?.id));
diff --git a/site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx b/site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx
@@ -10,7 +10,7 @@ import type { Organization } from "api/typesGenerated";
 import { EmptyState } from "components/EmptyState/EmptyState";
 import { displaySuccess } from "components/GlobalSnackbar/utils";
 import { Loader } from "components/Loader/Loader";
-import { AUDIT_LINK, withFilter } from "modules/navigation";
+import { linkToAuditing, withFilter } from "modules/navigation";
 import { useOrganizationSettings } from "./ManagementSettingsLayout";
 import { OrganizationSettingsPageView } from "./OrganizationSettingsPageView";
 
@@ -29,8 +29,6 @@ const OrganizationSettingsPage: FC = () => {
     deleteOrganization(queryClient),
   );
 
-  // TODO: If we could query permissions based on the name then we would not
-  //       have to cascade off the organizations query.
   const organization =
     organizations && organizationName
       ? getOrganizationByName(organizations, organizationName)
@@ -47,7 +45,8 @@ const OrganizationSettingsPage: FC = () => {
     if (defaultOrg) {
       return <Navigate to={`/organizations/${defaultOrg.name}`} replace />;
     }
-    return <EmptyState message="No default organization found" />;
+    // We expect there to always be a default organization.
+    throw new Error("No default organization found");
   }
 
   if (!organization) {
@@ -75,7 +74,7 @@ const OrganizationSettingsPage: FC = () => {
       return (
         <Navigate
           to={`/deployment${withFilter(
-            AUDIT_LINK,
+            linkToAuditing,
             `organization:${organization.name}`,
           )}`}
           replace
diff --git a/site/src/pages/UsersPage/UsersLayout.tsx b/site/src/pages/UsersPage/UsersLayout.tsx
@@ -21,14 +21,17 @@ import { linkToUsers } from "modules/navigation";
 
 export const UsersLayout: FC = () => {
   const { permissions } = useAuthenticated();
-  const { experiments } = useDashboard();
+  const { experiments, organizations } = useDashboard();
   const navigate = useNavigate();
   const feats = useFeatureVisibility();
   const location = useLocation();
   const activeTab = location.pathname.endsWith("groups") ? "groups" : "users";
-  const permissionsQuery = useQuery(
-    organizationPermissions("00000000-0000-0000-0000-00000000000"),
-  );
+  const organization = organizations.find((o) => o.is_default)
+  const permissionsQuery = useQuery(organizationPermissions(organization?.id));
+
+  if (!organization) {
+    throw new Error("No default organization")
+  }
 
   const canViewOrganizations =
     feats.multiple_organizations && experiments.includes("multi-organization");
