Commit43ce786

committed

fix: force organizations to be readonly array

1 parent4956ebb commit43ce786Copy full SHA for 43ce786

File tree

+21

-11

lines changed

+21

-11

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export interface DashboardValue {`
`19`	`19`	`entitlements:Entitlements;`
`20`	`20`	`experiments:Experiments;`
`21`	`21`	`appearance:AppearanceConfig;`
`22`		`-organizations:Organization[];`
	`22`	`+organizations:readonlyOrganization[];`
`23`	`23`	`showOrganizations:boolean;`
`24`	`24`	`}`
`25`	`25`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,5 +99,8 @@ export const GroupsPage: FC = () => {`
`99`	`99`
`100`	`100`	`exportdefaultGroupsPage;`
`101`	`101`
`102`		`-exportconstgetOrganizationNameByDefault=(organizations:Organization[])=>`
`103`		`-organizations.find((org)=>org.is_default)?.name;`
	`102`	`+exportconstgetOrganizationNameByDefault=(`
	`103`	`+organizations:readonlyOrganization[],`
	`104`	`+)=>{`
	`105`	`+returnorganizations.find((org)=>org.is_default)?.name;`
	`106`	`+};`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ import { Outlet } from "react-router-dom";`
`12`	`12`	`import{DeploySettingsContext}from"../DeploySettingsPage/DeploySettingsLayout";`
`13`	`13`	`import{Sidebar}from"./Sidebar";`
`14`	`14`
`15`		`-typeOrganizationSettingsValue={`
`16`		`-organizations:Organization[];`
`17`		`-};`
	`15`	`+typeOrganizationSettingsValue=Readonly<{`
	`16`	`+organizations:readonlyOrganization[];`
	`17`	`+}>;`
`18`	`18`
`19`	`19`	`exportconstuseOrganizationSettings=():OrganizationSettingsValue=>{`
`20`	`20`	`const{ organizations}=useDashboard();`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ const OrganizationSettingsPage: FC = () => {`
`50`	`50`	`// Redirect /organizations => /organizations/default-org, or if they cannot edit`
`51`	`51`	`// the default org, then the first org they can edit, if any.`
`52`	`52`	`if(!organizationName){`
`53`		`-consteditableOrg=organizations`
	`53`	`+consteditableOrg=[...organizations]`
`54`	`54`	`.sort((a,b)=>{`
`55`	`55`	`// Prefer default org (it may not be first).`
`56`	`56`	`// JavaScript will happily subtract booleans, but use numbers to keep`
`@@ -107,5 +107,9 @@ const OrganizationSettingsPage: FC = () => {`
`107`	`107`
`108`	`108`	`exportdefaultOrganizationSettingsPage;`
`109`	`109`
`110`		`-constgetOrganizationByName=(organizations:Organization[],name:string)=>`
`111`		`-organizations.find((org)=>org.name===name);`
	`110`	`+constgetOrganizationByName=(`
	`111`	`+organizations:readonlyOrganization[],`
	`112`	`+name:string,`
	`113`	`+)=>{`
	`114`	`+returnorganizations.find((org)=>org.name===name);`
	`115`	`+};`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,11 @@ export const TemplateRedirectController: FC = () => {`
`45`	`45`	`return<Outlet/>;`
`46`	`46`	`};`
`47`	`47`
`48`		`-constgetOrganizationNameByDefault=(organizations:Organization[])=>`
`49`		`-organizations.find((org)=>org.is_default)?.name;`
	`48`	`+constgetOrganizationNameByDefault=(`
	`49`	`+organizations:readonlyOrganization[],`
	`50`	`+)=>{`
	`51`	`+returnorganizations.find((org)=>org.is_default)?.name;`
	`52`	`+};`
`50`	`53`
`51`	`54`	`// I really hate doing it this way, but React Router does not provide a better way.`
`52`	`55`	`constremovePrefix=(self:string,prefix:string)=>`

Comments

(0)