Check license for organizations

code-asher · code-asher · commit 848815c4d3e9 · 2024-07-30T13:11:30.000-08:00
All the checks now require both the experiment and license.

I also renamed the variable canViewOrganizations everywhere for
consistency.
diff --git a/site/src/pages/AuditPage/AuditPage.tsx b/site/src/pages/AuditPage/AuditPage.tsx
@@ -17,10 +17,9 @@ import {
 import { AuditPageView } from "./AuditPageView";
 
 const AuditPage: FC = () => {
-  const { audit_log: isAuditLogVisible } = useFeatureVisibility();
+  const feats = useFeatureVisibility();
   const { experiments } = useDashboard();
   const location = useLocation();
-  const isMultiOrg = experiments.includes("multi-organization");
 
   /**
    * There is an implicit link between auditsQuery and filter via the
@@ -75,7 +74,9 @@ const AuditPage: FC = () => {
   // TODO: Once multi-org is stable, we should place this redirect into the
   //       router directly, if we still need to maintain it (for users who are
   //       typing the old URL manually or have it bookmarked).
-  if (isMultiOrg && location.pathname !== "/deployment/audit") {
+  const canViewOrganizations =
+    feats.multiple_organizations && experiments.includes("multi-organization");
+  if (canViewOrganizations && location.pathname !== "/deployment/audit") {
     return <Navigate to={`/deployment/audit${location.search}`} replace />;
   }
 
@@ -88,18 +89,18 @@ const AuditPage: FC = () => {
       <AuditPageView
         auditLogs={auditsQuery.data?.audit_logs}
         isNonInitialPage={isNonInitialPage(searchParams)}
-        isAuditLogVisible={isAuditLogVisible}
+        isAuditLogVisible={feats.audit_log}
         auditsQuery={auditsQuery}
         error={auditsQuery.error}
-        showOrgDetails={isMultiOrg}
+        showOrgDetails={canViewOrganizations}
         filterProps={{
           filter,
           error: auditsQuery.error,
           menus: {
             user: userMenu,
             action: actionMenu,
             resourceType: resourceTypeMenu,
-            organization: isMultiOrg ? organizationsMenu : undefined,
+            organization: canViewOrganizations ? organizationsMenu : undefined,
           },
         }}
       />
diff --git a/site/src/pages/DeploySettingsPage/DeploySettingsLayout.tsx b/site/src/pages/DeploySettingsPage/DeploySettingsLayout.tsx
@@ -9,6 +9,7 @@ import { Stack } from "components/Stack/Stack";
 import { useAuthenticated } from "contexts/auth/RequireAuth";
 import { RequirePermission } from "contexts/auth/RequirePermission";
 import { useDashboard } from "modules/dashboard/useDashboard";
+import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
 import { ManagementSettingsLayout } from "pages/ManagementSettingsPage/ManagementSettingsLayout";
 import { Sidebar } from "./Sidebar";
 
@@ -33,9 +34,11 @@ export const useDeploySettings = (): DeploySettingsContextValue => {
 export const DeploySettingsLayout: FC = () => {
   const { experiments } = useDashboard();
 
-  const multiOrgExperimentEnabled = experiments.includes("multi-organization");
+  const feats = useFeatureVisibility();
+  const canViewOrganizations =
+    feats.multiple_organizations && experiments.includes("multi-organization");
 
-  return multiOrgExperimentEnabled ? (
+  return canViewOrganizations ? (
     <ManagementSettingsLayout />
   ) : (
     <DeploySettingsLayoutInner />
diff --git a/site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx b/site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx
@@ -24,10 +24,7 @@ import GroupsPageView from "./GroupsPageView";
 export const GroupsPage: FC = () => {
   const { permissions } = useAuthenticated();
   const { createGroup: canCreateGroup } = permissions;
-  const {
-    multiple_organizations: organizationsEnabled,
-    template_rbac: isTemplateRBACEnabled,
-  } = useFeatureVisibility();
+  const feats = useFeatureVisibility();
   const { experiments } = useDashboard();
   const location = useLocation();
   const { organization = "default" } = useParams() as { organization: string };
@@ -42,11 +39,9 @@ export const GroupsPage: FC = () => {
     }
   }, [groupsQuery.error]);
 
-  if (
-    organizationsEnabled &&
-    experiments.includes("multi-organization") &&
-    location.pathname === "/deployment/groups"
-  ) {
+  const canViewOrganizations =
+    feats.multiple_organizations && experiments.includes("multi-organization");
+  if (canViewOrganizations && location.pathname === "/deployment/groups") {
     const defaultName =
       getOrganizationNameByDefault(organizations) ?? "default";
     return <Navigate to={`/organizations/${defaultName}/groups`} replace />;
@@ -61,7 +56,7 @@ export const GroupsPage: FC = () => {
       <PageHeader
         actions={
           <>
-            {canCreateGroup && isTemplateRBACEnabled && (
+            {canCreateGroup && feats.template_rbac && (
               <Button
                 component={RouterLink}
                 startIcon={<GroupAdd />}
@@ -79,7 +74,7 @@ export const GroupsPage: FC = () => {
       <GroupsPageView
         groups={groupsQuery.data}
         canCreateGroup={canCreateGroup}
-        isTemplateRBACEnabled={isTemplateRBACEnabled}
+        isTemplateRBACEnabled={feats.template_rbac}
       />
     </>
   );
diff --git a/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx b/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx
@@ -10,6 +10,7 @@ import { Stack } from "components/Stack/Stack";
 import { useAuthenticated } from "contexts/auth/RequireAuth";
 import { RequirePermission } from "contexts/auth/RequirePermission";
 import { useDashboard } from "modules/dashboard/useDashboard";
+import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
 import NotFoundPage from "pages/404Page/404Page";
 import { DeploySettingsContext } from "../DeploySettingsPage/DeploySettingsLayout";
 import { Sidebar } from "./Sidebar";
@@ -35,12 +36,14 @@ export const useOrganizationSettings = (): OrganizationSettingsContextValue => {
 export const ManagementSettingsLayout: FC = () => {
   const { permissions } = useAuthenticated();
   const { experiments } = useDashboard();
+  const feats = useFeatureVisibility();
   const deploymentConfigQuery = useQuery(deploymentConfig());
   const organizationsQuery = useQuery(organizations());
 
-  const multiOrgExperimentEnabled = experiments.includes("multi-organization");
+  const canViewOrganizations =
+    feats.multiple_organizations && experiments.includes("multi-organization");
 
-  if (!multiOrgExperimentEnabled) {
+  if (!canViewOrganizations) {
     return <NotFoundPage />;
   }
 
diff --git a/site/src/pages/UsersPage/UsersLayout.tsx b/site/src/pages/UsersPage/UsersLayout.tsx
@@ -23,11 +23,12 @@ export const UsersLayout: FC = () => {
   const { createUser: canCreateUser, createGroup: canCreateGroup } =
     permissions;
   const navigate = useNavigate();
-  const { template_rbac: isTemplateRBACEnabled } = useFeatureVisibility();
+  const feats = useFeatureVisibility();
   const location = useLocation();
   const activeTab = location.pathname.endsWith("groups") ? "groups" : "users";
 
-  const isMultiOrg = experiments.includes("multi-organization");
+  const canViewOrganizations =
+    feats.multiple_organizations && experiments.includes("multi-organization");
 
   return (
     <>
@@ -45,7 +46,7 @@ export const UsersLayout: FC = () => {
                   Create user
                 </Button>
               )}
-              {canCreateGroup && isTemplateRBACEnabled && (
+              {canCreateGroup && feats.template_rbac && (
                 <Button
                   component={RouterLink}
                   startIcon={<GroupAdd />}
@@ -61,7 +62,7 @@ export const UsersLayout: FC = () => {
         </PageHeader>
       </Margins>
 
-      {!isMultiOrg && (
+      {!canViewOrganizations && (
         <Tabs
           css={{ marginBottom: 40, marginTop: -TAB_PADDING_Y }}
           active={activeTab}
diff --git a/site/src/pages/UsersPage/UsersPage.tsx b/site/src/pages/UsersPage/UsersPage.tsx
@@ -29,6 +29,7 @@ import { isNonInitialPage } from "components/PaginationWidget/utils";
 import { useAuthenticated } from "contexts/auth/RequireAuth";
 import { usePaginatedQuery } from "hooks/usePaginatedQuery";
 import { useDashboard } from "modules/dashboard/useDashboard";
+import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
 import { pageTitle } from "utils/page";
 import { generateRandomString } from "utils/random";
 import { ResetPasswordDialog } from "./ResetPasswordDialog";
@@ -42,7 +43,7 @@ const UsersPage: FC = () => {
   const searchParamsResult = useSearchParams();
   const { entitlements, experiments, organizationId } = useDashboard();
   const [searchParams] = searchParamsResult;
-  const isMultiOrg = experiments.includes("multi-organization");
+  const feats = useFeatureVisibility();
 
   const groupsByUserIdQuery = useQuery(groupsByUserId(organizationId));
   const authMethodsQuery = useQuery(authMethods());
@@ -103,10 +104,9 @@ const UsersPage: FC = () => {
     authMethodsQuery.isLoading ||
     groupsByUserIdQuery.isLoading;
 
-  if (
-    experiments.includes("multi-organization") &&
-    location.pathname !== "/deployment/users"
-  ) {
+  const canViewOrganizations =
+    feats.multiple_organizations && experiments.includes("multi-organization");
+  if (canViewOrganizations && location.pathname !== "/deployment/users") {
     return <Navigate to={`/deployment/users${location.search}`} replace />;
   }
 
@@ -164,7 +164,7 @@ const UsersPage: FC = () => {
           menus: { status: statusMenu },
         }}
         usersQuery={usersQuery}
-        isMultiOrg={isMultiOrg}
+        canViewOrganizations={canViewOrganizations}
         canCreateUser={canCreateUser}
       />
 
diff --git a/site/src/pages/UsersPage/UsersPageView.tsx b/site/src/pages/UsersPage/UsersPageView.tsx
@@ -38,7 +38,7 @@ export interface UsersPageViewProps {
   usersQuery: PaginationResult;
 
   // TODO: Refactor these out once we remove the multi-organization experiment.
-  isMultiOrg?: boolean;
+  canViewOrganizations?: boolean;
   canCreateUser?: boolean;
 }
 
@@ -63,14 +63,14 @@ export const UsersPageView: FC<UsersPageViewProps> = ({
   authMethods,
   groupsByUserId,
   usersQuery,
-  isMultiOrg,
+  canViewOrganizations,
   canCreateUser,
 }) => {
   const navigate = useNavigate();
 
   return (
     <>
-      {isMultiOrg && (
+      {canViewOrganizations && (
         <PageHeader
           css={{ paddingTop: 0 }}
           actions={
