oh yeah

coder · aslilac · Feb 19, 2025 · Feb 5, 2025 · Feb 5, 2025 · Feb 7, 2025
commit 379bacd1556803a71f286121e16b3b7d63612812
diff --git a/site/src/modules/management/OrganizationSettingsLayout.tsx b/site/src/modules/management/OrganizationSettingsLayout.tsx
@@ -28,7 +28,10 @@ export const OrganizationSettingsContext = createContext<
 
 type OrganizationSettingsValue = Readonly<{
 	organizations: readonly Organization[];
-	permissionsByOrganizationId: Record<string, OrganizationPermissions>;
+	organizationPermissionsByOrganizationId: Record<
+		string,
+		OrganizationPermissions
+	>;
 	organization?: Organization;
 	organizationPermissions?: OrganizationPermissions;
 }>;
@@ -80,12 +83,14 @@ const OrganizationSettingsLayout: FC = () => {
 		return <NotFoundPage />;
 	}
 
+	console.log(orgPermissionsQuery.data);
+
 	return (
 		<RequirePermission isFeatureVisible={canViewOrganizationSettings}>
 			<OrganizationSettingsContext.Provider
 				value={{
 					organizations: viewableOrganizations,
-					permissionsByOrganizationId: orgPermissionsQuery.data,
+					organizationPermissionsByOrganizationId: orgPermissionsQuery.data,
 					organization,
 					organizationPermissions,
 				}}

diff --git a/site/src/modules/management/OrganizationSidebarView.tsx b/site/src/modules/management/OrganizationSidebarView.tsx
@@ -111,9 +111,11 @@ export const OrganizationSidebarView: FC<SidebarProps> = ({
 										))}
 									</div>
 								) : (
-									<span className="select-none text-content-disabled text-center rounded-sm px-2 py-2 text-sm font-medium">
-										No more organizations
-									</span>
+									!permissions.createOrganization && (
+										<span className="select-none text-content-disabled text-center rounded-sm px-2 py-2 text-sm font-medium">
+											No more organizations
+										</span>
+									)
 								)}
 								{permissions.createOrganization && (
 									<>

diff --git a/site/src/pages/OrganizationSettingsPage/DefaultOrganizationRedirect.tsx b/site/src/pages/OrganizationSettingsPage/DefaultOrganizationRedirect.tsx
@@ -5,19 +5,25 @@ import { Navigate } from "react-router-dom";
 import { canEditOrganization } from "modules/management/organizationPermissions";
 
 const DefaultOrganizationRedirect: FC = () => {
-	const { organizations, permissionsByOrganizationId } =
-		useOrganizationSettings();
+	const {
+		organizations,
+		organizationPermissionsByOrganizationId: organizationPermissions,
+	} = useOrganizationSettings();
 
-	// Redirect /organizations => /organizations/default-org, or if they cannot edit
-	// the default org, then the first org they can edit, if any.
-	// .find will stop at the first match found; make sure default
-	// organizations are placed first
+	// 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(permissionsByOrganizationId[org.id]));
+		.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 />;
+	}
 	return <EmptyState message="No organizations found" />;
 };
 

diff --git a/site/src/testHelpers/storybook.tsx b/site/src/testHelpers/storybook.tsx
@@ -161,7 +161,7 @@ export const withOrganizationSettingsProvider = (Story: FC) => {
 		<OrganizationSettingsContext.Provider
 			value={{
 				organizations: [MockDefaultOrganization],
-				permissionsByOrganizationId: {
+				organizationPermissionsByOrganizationId: {
 					[MockDefaultOrganization.id]: MockOrganizationPermissions,
 				},
 				organization: MockDefaultOrganization,