fixup! Throw error if no default org

code-asher · code-asher · commit 599ad91e80e6 · 2024-08-05T15:47:20.000-08:00
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";
@@ -56,7 +57,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/OrganizationSettingsPage.tsx b/site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx
@@ -47,7 +47,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) {

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ const OrganizationSettingsPage: FC = () => {`
`47`	`47`	`if (defaultOrg) {`
`48`	`48`	return <Navigate to={`/organizations/${defaultOrg.name}`} replace />;
`49`	`49`	`}`
`50`		`- return <EmptyState message="No default organization found" />;`
	`50`	`+ // We expect there to always be a default organization.`
	`51`	`+ throw new Error("No default organization found");`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`if (!organization) {`