Commitebd6dcd

committed

fixup! Merge branch 'main' into asher/org-permissions

1 parent599ad91 commitebd6dcdCopy full SHA for ebd6dcd

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import { Margins } from "components/Margins/Margins";`
`8`	`8`	`import{Stack}from"components/Stack/Stack";`
`9`	`9`	`import{useAuthenticated}from"contexts/auth/RequireAuth";`
`10`	`10`	`import{RequirePermission}from"contexts/auth/RequirePermission";`
	`11`	`+import{useDashboard}from"modules/dashboard/useDashboard";`
`11`	`12`	`import{DeploySettingsContext}from"../DeploySettingsPage/DeploySettingsLayout";`
`12`	`13`	`import{Sidebar}from"./Sidebar";`
`13`	`14`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import type { Organization } from "api/typesGenerated";`
`10`	`10`	`import{EmptyState}from"components/EmptyState/EmptyState";`
`11`	`11`	`import{displaySuccess}from"components/GlobalSnackbar/utils";`
`12`	`12`	`import{Loader}from"components/Loader/Loader";`
`13`		`-import{AUDIT_LINK,withFilter}from"modules/navigation";`
	`13`	`+import{linkToAuditing,withFilter}from"modules/navigation";`
`14`	`14`	`import{useOrganizationSettings}from"./ManagementSettingsLayout";`
`15`	`15`	`import{OrganizationSettingsPageView}from"./OrganizationSettingsPageView";`
`16`	`16`
`@@ -76,7 +76,7 @@ const OrganizationSettingsPage: FC = () => {`
`76`	`76`	`return(`
`77`	`77`	`<Navigate`
`78`	`78`	to={`/deployment${withFilter(
`79`		`-AUDIT_LINK,`
	`79`	`+linkToAuditing,`
`80`	`80`	`organization:${organization.name}`,
`81`	`81`	)}`}
`82`	`82`	`replace`

Comments

(0)