Merge branch 'main' into improve-org-members-table

aslilac · aslilac · commit d68adb0c02be · 2024-07-23T18:41:15.000Z
diff --git a/site/src/pages/GroupsPage/GroupPage.tsx b/site/src/pages/GroupsPage/GroupPage.tsx
@@ -54,13 +54,12 @@ import { isEveryoneGroup } from "utils/groups";
 import { pageTitle } from "utils/page";
 
 export const GroupPage: FC = () => {
-  const { groupName, organization } = useParams() as {
-    organization: string;
+  const { groupName } = useParams() as {
     groupName: string;
   };
   const queryClient = useQueryClient();
   const navigate = useNavigate();
-  const groupQuery = useQuery(group(organization, groupName));
+  const groupQuery = useQuery(group("default", groupName));
   const groupData = groupQuery.data;
   const { data: permissions } = useQuery(
     groupData !== undefined
diff --git 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;
