fix: force organizations to be readonly array

Parkreiner · Parkreiner · commit 43ce78641f30 · 2024-09-04T16:43:49.000Z
diff --git a/site/src/modules/dashboard/DashboardProvider.tsx b/site/src/modules/dashboard/DashboardProvider.tsx
@@ -19,7 +19,7 @@ export interface DashboardValue {
 	entitlements: Entitlements;
 	experiments: Experiments;
 	appearance: AppearanceConfig;
-	organizations: Organization[];
+	organizations: readonly Organization[];
 	showOrganizations: boolean;
 }
 
diff --git a/site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx b/site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx
@@ -99,5 +99,8 @@ export const GroupsPage: FC = () => {
 
 export default GroupsPage;
 
-export const getOrganizationNameByDefault = (organizations: Organization[]) =>
-	organizations.find((org) => org.is_default)?.name;
+export const getOrganizationNameByDefault = (
+	organizations: readonly Organization[],
+) => {
+	return organizations.find((org) => org.is_default)?.name;
+};
diff --git a/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx b/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx
@@ -12,9 +12,9 @@ import { Outlet } from "react-router-dom";
 import { DeploySettingsContext } from "../DeploySettingsPage/DeploySettingsLayout";
 import { Sidebar } from "./Sidebar";
 
-type OrganizationSettingsValue = {
-	organizations: Organization[];
-};
+type OrganizationSettingsValue = Readonly<{
+	organizations: readonly Organization[];
+}>;
 
 export const useOrganizationSettings = (): OrganizationSettingsValue => {
 	const { organizations } = useDashboard();
diff --git a/site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx b/site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx
@@ -50,7 +50,7 @@ const OrganizationSettingsPage: FC = () => {
 	// Redirect /organizations => /organizations/default-org, or if they cannot edit
 	// the default org, then the first org they can edit, if any.
 	if (!organizationName) {
-		const editableOrg = organizations
+		const editableOrg = [...organizations]
 			.sort((a, b) => {
 				// Prefer default org (it may not be first).
 				// JavaScript will happily subtract booleans, but use numbers to keep
@@ -107,5 +107,9 @@ const OrganizationSettingsPage: FC = () => {
 
 export default OrganizationSettingsPage;
 
-const getOrganizationByName = (organizations: Organization[], name: string) =>
-	organizations.find((org) => org.name === name);
+const getOrganizationByName = (
+	organizations: readonly Organization[],
+	name: string,
+) => {
+	return organizations.find((org) => org.name === name);
+};
diff --git a/site/src/pages/TemplatePage/TemplateRedirectController.tsx b/site/src/pages/TemplatePage/TemplateRedirectController.tsx
@@ -45,8 +45,11 @@ export const TemplateRedirectController: FC = () => {
 	return <Outlet />;
 };
 
-const getOrganizationNameByDefault = (organizations: Organization[]) =>
-	organizations.find((org) => org.is_default)?.name;
+const getOrganizationNameByDefault = (
+	organizations: readonly Organization[],
+) => {
+	return organizations.find((org) => org.is_default)?.name;
+};
 
 // I really hate doing it this way, but React Router does not provide a better way.
 const removePrefix = (self: string, prefix: string) =>

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: readonly Organization[];`
`23`	`23`	`showOrganizations: boolean;`
`24`	`24`	`}`
`25`	`25`