require license, add key func

coder · aslilac · Jul 26, 2024 · Jul 25, 2024 · Jul 25, 2024 · Jul 25, 2024
commit 7999b927bf0591f276cd06b9f8de7eeb45228b38
diff --git a/site/src/api/queries/groups.ts b/site/src/api/queries/groups.ts
@@ -8,20 +8,26 @@ import type {
 
 type GroupSortOrder = "asc" | "desc";
 
-const getGroupQueryKey = (organizationId: string, groupName: string) => [
+const getGroupsQueryKey = (organizationId: string) => [
   "organization",
   organizationId,
-  "group",
-  groupName,
+  "groups",
 ];
 
 export const groups = (organizationId: string) => {
   return {
-    queryKey: ["organization", organizationId, "groups"],
+    queryKey: getGroupsQueryKey(organizationId),
     queryFn: () => API.getGroups(organizationId),
   } satisfies UseQueryOptions<Group[]>;
 };
 
+const getGroupQueryKey = (organizationId: string, groupName: string) => [
+  "organization",
+  organizationId,
+  "group",
+  groupName,
+];
+
 export const group = (organizationId: string, groupName: string) => {
   return {
     queryKey: getGroupQueryKey(organizationId, groupName),
@@ -97,11 +103,7 @@ export const createGroup = (
     mutationFn: (request: CreateGroupRequest) =>
       API.createGroup(organizationId, request),
     onSuccess: async () => {
-      await queryClient.invalidateQueries([
-        "organization",
-        organizationId,
-        "groups",
-      ]);
+      await queryClient.invalidateQueries(getGroupsQueryKey(organizationId));
     },
   };
 };
@@ -150,7 +152,7 @@ export const invalidateGroup = (
   groupId: string,
 ) =>
   Promise.all([
-    queryClient.invalidateQueries(["organization", organizationId, "groups"]),
+    queryClient.invalidateQueries(getGroupsQueryKey(organizationId)),
     queryClient.invalidateQueries(getGroupQueryKey(organizationId, groupId)),
   ]);
 

diff --git a/site/src/modules/dashboard/Navbar/Navbar.tsx b/site/src/modules/dashboard/Navbar/Navbar.tsx
@@ -18,6 +18,9 @@ export const Navbar: FC = () => {
   const canViewAuditLog =
     featureVisibility["audit_log"] && Boolean(permissions.viewAuditLog);
   const canViewDeployment = Boolean(permissions.viewDeploymentValues);
+  const canViewOrganizations =
+    featureVisibility.multiple_organizations &&
+    experiments.includes("multi-organization");
   const canViewAllUsers = Boolean(permissions.readAllUsers);
   const proxyContextValue = useProxy();
   const canViewHealth = canViewDeployment;
@@ -30,7 +33,7 @@ export const Navbar: FC = () => {
       supportLinks={appearance.support_links}
       onSignOut={signOut}
       canViewDeployment={canViewDeployment}
-      canViewOrganizations={experiments.includes("multi-organization")}
+      canViewOrganizations={canViewOrganizations}
       canViewAllUsers={canViewAllUsers}
       canViewHealth={canViewHealth}
       canViewAuditLog={canViewAuditLog}

diff --git a/site/src/pages/ManagementSettingsPage/GroupsPage/CreateGroupPage.tsx b/site/src/pages/ManagementSettingsPage/GroupsPage/CreateGroupPage.tsx
@@ -9,9 +9,9 @@ import CreateGroupPageView from "./CreateGroupPageView";
 export const CreateGroupPage: FC = () => {
   const queryClient = useQueryClient();
   const navigate = useNavigate();
-  const { organization = "default" } = useParams() as { organization: string };
+  const { organization } = useParams() as { organization: string };
   const createGroupMutation = useMutation(
-    createGroup(queryClient, organization),
+    createGroup(queryClient, organization ?? "default"),
   );
 
   return (
@@ -22,7 +22,11 @@ export const CreateGroupPage: FC = () => {
       <CreateGroupPageView
         onSubmit={async (data) => {
           const newGroup = await createGroupMutation.mutateAsync(data);
-          navigate(`/organizations/${organization}/groups/${newGroup.name}`);
+          navigate(
+            organization
+              ? `/organizations/${organization}/groups/${newGroup.name}`
+              : `/deployment/groups/${newGroup.name}`,
+          );
         }}
         error={createGroupMutation.error}
         isLoading={createGroupMutation.isLoading}

diff --git a/site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx b/site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx
@@ -27,8 +27,8 @@ const OrganizationSettingsPage: FC = () => {
   );
 
   const org = organizationName
-    ? getOrganizationIdByName(organizations, organizationName)
-    : getOrganizationIdByDefault(organizations);
+    ? getOrganizationByName(organizations, organizationName)
+    : getOrganizationByDefault(organizations);
 
   const error =
     updateOrganizationMutation.error ?? deleteOrganizationMutation.error;
@@ -61,8 +61,8 @@ const OrganizationSettingsPage: FC = () => {
 
 export default OrganizationSettingsPage;
 
-const getOrganizationIdByDefault = (organizations: Organization[]) =>
+const getOrganizationByDefault = (organizations: Organization[]) =>
   organizations.find((org) => org.is_default);
 
-const getOrganizationIdByName = (organizations: Organization[], name: string) =>
+const getOrganizationByName = (organizations: Organization[], name: string) =>
   organizations.find((org) => org.name === name);
diff --git a/site/src/pages/ManagementSettingsPage/Sidebar.tsx b/site/src/pages/ManagementSettingsPage/Sidebar.tsx
@@ -14,10 +14,9 @@ import { USERS_LINK } from "modules/navigation";
 import { useOrganizationSettings } from "./ManagementSettingsLayout";
 
 export const Sidebar: FC = () => {
-  const { organization: organizationName = "default" } = useParams() as {
-    organization: string;
-  };
   const { organizations } = useOrganizationSettings();
+  const { organization = getOrganizationNameByDefault(organizations) } =
+    useParams() as { organization: string };
   const { multiple_organizations: organizationsEnabled } =
     useFeatureVisibility();
 
@@ -41,11 +40,11 @@ export const Sidebar: FC = () => {
           >
             New organization
           </SidebarNavItem>
-          {organizations.map((organization) => (
+          {organizations.map((org) => (
             <OrganizationSettingsNavigation
-              key={organization.id}
-              organization={organization}
-              active={organization.name === organizationName}
+              key={org.id}
+              organization={org}
+              active={org.name === organization}
             />
           ))}
         </>
@@ -282,3 +281,6 @@ const classNames = {
     font-weight: 600;
   `,
 } satisfies Record<string, ClassName>;
+
+const getOrganizationNameByDefault = (organizations: Organization[]) =>
+  organizations.find((org) => org.is_default)?.name;