From 0d453437de677ff29f9489c11ddca3de0d2e82d1 Mon Sep 17 00:00:00 2001
From: Kayla Washburn-Love <mckayla@hey.com>
Date: Tue, 23 Jul 2024 12:35:38 -0600
Subject: [PATCH] fix(site): select default organization on /organizations page
 (#13992)

---
 .../ManagementSettingsLayout.tsx                  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx b/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx
index ee21518840..026358c18a 100644
--- a/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx
+++ b/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx
@@ -61,10 +61,11 @@ export const ManagementSettingsLayout: FC = () => {
                 currentOrganizationId: !inOrganizationSettings
                   ? undefined
                   : !organization
-                    ? "00000000-0000-0000-0000-000000000000"
-                    : organizationsQuery.data.find(
-                        (org) => org.name === organization,
-                      )?.id,
+                    ? getOrganizationIdByDefault(organizationsQuery.data)
+                    : getOrganizationIdByName(
+                        organizationsQuery.data,
+                        organization,
+                      ),
                 organizations: organizationsQuery.data,
               }}
             >
@@ -93,3 +94,9 @@ export const ManagementSettingsLayout: FC = () => {
     </RequirePermission>
   );
 };
+
+const getOrganizationIdByName = (organizations: Organization[], name: string) =>
+  organizations.find((org) => org.name === name)?.id;
+
+const getOrganizationIdByDefault = (organizations: Organization[]) =>
+  organizations.find((org) => org.is_default)?.id;