assume default

aslilac · aslilac · commit 1c223cf8f16b · 2024-07-23T17:35:58.000Z
diff --git a/site/src/pages/GroupsPage/CreateGroupPage.tsx b/site/src/pages/GroupsPage/CreateGroupPage.tsx
@@ -3,15 +3,13 @@ import { Helmet } from "react-helmet-async";
 import { useMutation, useQueryClient } from "react-query";
 import { useNavigate } from "react-router-dom";
 import { createGroup } from "api/queries/groups";
-import { useDashboard } from "modules/dashboard/useDashboard";
 import { pageTitle } from "utils/page";
 import CreateGroupPageView from "./CreateGroupPageView";
 
 export const CreateGroupPage: FC = () => {
   const queryClient = useQueryClient();
   const navigate = useNavigate();
   const createGroupMutation = useMutation(createGroup(queryClient, "default"));
-  const { experiments } = useDashboard();
 
   return (
     <>
@@ -21,13 +19,7 @@ export const CreateGroupPage: FC = () => {
       <CreateGroupPageView
         onSubmit={async (data) => {
           const newGroup = await createGroupMutation.mutateAsync(data);
-
-          let groupURL = `/groups/${newGroup.name}`;
-          if (experiments.includes("multi-organization")) {
-            groupURL = `/organizations/${newGroup.organization_id}/groups/${newGroup.name}`;
-          }
-
-          navigate(groupURL);
+          navigate(`/groups/${newGroup.name}`);
         }}
         error={createGroupMutation.error}
         isLoading={createGroupMutation.isLoading}
diff --git a/site/src/pages/GroupsPage/GroupPage.tsx b/site/src/pages/GroupsPage/GroupPage.tsx
@@ -54,8 +54,7 @@ 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();
@@ -64,7 +63,7 @@ export const GroupPage: FC = () => {
   // is /groups/:groupName, which does not include the organization. So the orgID cannot
   // be inferred from the URL. The organization is only included in the url when the multi-org
   // experiment is enabled.
-  const groupQuery = useQuery(group(organization ?? "default", groupName));
+  const groupQuery = useQuery(group("default", groupName));
   const groupData = groupQuery.data;
   const { data: permissions } = useQuery(
     groupData !== undefined
