Commit599ad91

committed

fixup! Throw error if no default org

1 parent4a7c9d9 commit599ad91Copy full SHA for 599ad91

File tree

-2

lines changed

site/src/pages/ManagementSettingsPage
- GroupsPage
  - GroupsPage.tsx
- OrganizationSettingsPage.tsx

-2

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import { getErrorMessage } from "api/errors";`
`8`	`8`	`import{groups}from"api/queries/groups";`
`9`	`9`	`import{organizationPermissions}from"api/queries/organizations";`
`10`	`10`	`importtype{Organization}from"api/typesGenerated";`
	`11`	`+import{EmptyState}from"components/EmptyState/EmptyState";`
`11`	`12`	`import{displayError}from"components/GlobalSnackbar/utils";`
`12`	`13`	`import{Loader}from"components/Loader/Loader";`
`13`	`14`	`import{PageHeader,PageHeaderTitle}from"components/PageHeader/PageHeader";`
`@@ -56,7 +57,11 @@ export const GroupsPage: FC = () => {`
`56`	`57`	return<Navigateto={`/organizations/${defaultName}/groups`}replace/>;
`57`	`58`	`}`
`58`	`59`	`// We expect there to always be a default organization.`
`59`		`-thrownewError("No default organization found")`
	`60`	`+thrownewError("No default organization found");`
	`61`	`+}`
	`62`	`+`
	`63`	`+if(!organization){`
	`64`	`+return<EmptyStatemessage="Organization not found"/>;`
`60`	`65`	`}`
`61`	`66`
`62`	`67`	`constpermissions=permissionsQuery.data;`

Lines changed: 2 additions & 1 deletion

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

Comments

(0)