hello

aslilac · aslilac · commit 4833748a8c3d · 2025-03-03T23:45:39.000Z
diff --git a/site/e2e/constants.ts b/site/e2e/constants.ts
@@ -20,10 +20,10 @@ export const defaultPassword = "SomeSecurePassword!";
 
 // Credentials for users
 export const users = {
-	admin: {
-		username: "admin",
+	owner: {
+		username: "owner",
 		password: defaultPassword,
-		email: "admin@coder.com",
+		email: "owner@coder.com",
 	},
 	templateAdmin: {
 		username: "template-admin",
diff --git a/site/e2e/helpers.ts b/site/e2e/helpers.ts
@@ -67,7 +67,7 @@ export type LoginOptions = {
 	password: string;
 };
 
-export async function login(page: Page, options: LoginOptions = users.admin) {
+export async function login(page: Page, options: LoginOptions = users.owner) {
 	const ctx = page.context();
 	// biome-ignore lint/suspicious/noExplicitAny: reset the current user
 	(ctx as any)[Symbol.for("currentUser")] = undefined;
diff --git a/site/e2e/setup/addUsersAndLicense.spec.ts b/site/e2e/setup/addUsersAndLicense.spec.ts
@@ -16,16 +16,16 @@ test("setup deployment", async ({ page }) => {
 	}
 
 	// Setup first user
-	await page.getByLabel(Language.emailLabel).fill(users.admin.email);
-	await page.getByLabel(Language.passwordLabel).fill(users.admin.password);
+	await page.getByLabel(Language.emailLabel).fill(users.owner.email);
+	await page.getByLabel(Language.passwordLabel).fill(users.owner.password);
 	await page.getByTestId("create").click();
 
 	await expectUrl(page).toHavePathName("/workspaces");
 	await page.getByTestId("button-select-template").isVisible();
 
 	for (const user of Object.values(users)) {
 		// Already created as first user
-		if (user.username === "admin") {
+		if (user.username === "owner") {
 			continue;
 		}
 
diff --git a/site/e2e/tests/roles.spec.ts b/site/e2e/tests/roles.spec.ts
@@ -82,8 +82,8 @@ test.describe("roles admin settings access", () => {
 		]);
 	});
 
-	test("admin can see admin settings", async ({ page }) => {
-		await login(page, users.admin);
+	test("owner can see admin settings", async ({ page }) => {
+		await login(page, users.owner);
 		await page.goto("/", { waitUntil: "domcontentloaded" });
 
 		await hasAccessToAdminSettings(page, [
diff --git a/site/src/modules/management/OrganizationSettingsLayout.tsx b/site/src/modules/management/OrganizationSettingsLayout.tsx
@@ -46,7 +46,7 @@ export const useOrganizationSettings = (): OrganizationSettingsValue => {
 };
 
 const OrganizationSettingsLayout: FC = () => {
-	const { organizations, showOrganizations } = useDashboard();
+	const { organizations } = useDashboard();
 	const { organization: orgName } = useParams() as {
 		organization?: string;
 	};
diff --git a/site/src/pages/OrganizationSettingsPage/OrganizationRedirect.tsx b/site/src/pages/OrganizationSettingsPage/OrganizationRedirect.tsx
@@ -10,19 +10,25 @@ const OrganizationRedirect: FC = () => {
 		organizationPermissionsByOrganizationId: organizationPermissions,
 	} = useOrganizationSettings();
 
+	const sortedOrganizations = [...organizations].sort(
+		(a, b) => (b.is_default ? 1 : 0) - (a.is_default ? 1 : 0),
+	);
+
 	// Redirect /organizations => /organizations/some-organization-name
 	// If they can edit the default org, we should redirect to the default.
 	// If they cannot edit the default, we should redirect to the first org that
 	// they can edit.
-	const editableOrg = [...organizations]
-		.sort((a, b) => (b.is_default ? 1 : 0) - (a.is_default ? 1 : 0))
-		.find((org) => canEditOrganization(organizationPermissions[org.id]));
+	const editableOrg = sortedOrganizations.find((org) =>
+		canEditOrganization(organizationPermissions[org.id]),
+	);
 	if (editableOrg) {
 		return <Navigate to={`/organizations/${editableOrg.name}`} replace />;
 	}
 	// If they cannot edit any org, just redirect to an org they can read.
-	if (organizations.length > 0) {
-		return <Navigate to={`/organizations/${organizations[0].name}`} replace />;
+	if (sortedOrganizations.length > 0) {
+		return (
+			<Navigate to={`/organizations/${sortedOrganizations[0].name}`} replace />
+		);
 	}
 	return <EmptyState message="No organizations found" />;
 };
