fix: use correct group url in multi-org experiment

Emyrk · Emyrk · commit 76a7b86dea9d · 2024-07-23T09:30:42.000-05:00
When not using the experiment, default to the "default" org.
Assuming groups are all in the primary org
diff --git a/site/src/pages/GroupsPage/CreateGroupPage.tsx b/site/src/pages/GroupsPage/CreateGroupPage.tsx
@@ -5,11 +5,13 @@ import { useNavigate } from "react-router-dom";
 import { createGroup } from "api/queries/groups";
 import { pageTitle } from "utils/page";
 import CreateGroupPageView from "./CreateGroupPageView";
+import { useDashboard } from "modules/dashboard/useDashboard";
 
 export const CreateGroupPage: FC = () => {
   const queryClient = useQueryClient();
   const navigate = useNavigate();
   const createGroupMutation = useMutation(createGroup(queryClient, "default"));
+  const { experiments } = useDashboard();
 
   return (
     <>
@@ -19,7 +21,13 @@ export const CreateGroupPage: FC = () => {
       <CreateGroupPageView
         onSubmit={async (data) => {
           const newGroup = await createGroupMutation.mutateAsync(data);
-          navigate(`/groups/${newGroup.name}`);
+
+          let groupURL = `/groups/${newGroup.name}`;
+          if (experiments.includes("multi-organization")) {
+            groupURL = `/organizations/${newGroup.organization_id}/groups/${newGroup.name}`;
+          }
+
+          navigate(groupURL);
         }}
         error={createGroupMutation.error}
         isLoading={createGroupMutation.isLoading}
diff --git a/site/src/pages/GroupsPage/GroupPage.tsx b/site/src/pages/GroupsPage/GroupPage.tsx
@@ -60,7 +60,10 @@ export const GroupPage: FC = () => {
   };
   const queryClient = useQueryClient();
   const navigate = useNavigate();
-  const groupQuery = useQuery(group(organization, groupName));
+  // TODO: Always use the correct organization. At present, the url to fetch a group
+  // is /groups/:groupName, which does not include the organization. So the orgID cannot
+  // be inferred from the URL. Until this is resolved, assume the group is in the default org.
+  const groupQuery = useQuery(group(organization ?? "default", groupName));
   const groupData = groupQuery.data;
   const { data: permissions } = useQuery(
     groupData !== undefined
