move out of deployment settings

aslilac · aslilac · commit 325148c7fa9d · 2024-06-03T21:43:14.000Z
diff --git a/site/src/modules/dashboard/Navbar/DeploymentDropdown.tsx b/site/src/modules/dashboard/Navbar/DeploymentDropdown.tsx
@@ -13,22 +13,25 @@ import {
 import { USERS_LINK } from "modules/navigation";
 
 interface DeploymentDropdownProps {
-  canViewAuditLog: boolean;
   canViewDeployment: boolean;
+  canViewOrganizations: boolean;
   canViewAllUsers: boolean;
+  canViewAuditLog: boolean;
   canViewHealth: boolean;
 }
 
 export const DeploymentDropdown: FC<DeploymentDropdownProps> = ({
-  canViewAuditLog,
   canViewDeployment,
+  canViewOrganizations,
   canViewAllUsers,
+  canViewAuditLog,
   canViewHealth,
 }) => {
   const theme = useTheme();
 
   if (
     !canViewAuditLog &&
+    !canViewOrganizations &&
     !canViewDeployment &&
     !canViewAllUsers &&
     !canViewHealth
@@ -64,9 +67,10 @@ export const DeploymentDropdown: FC<DeploymentDropdownProps> = ({
         }}
       >
         <DeploymentDropdownContent
-          canViewAuditLog={canViewAuditLog}
           canViewDeployment={canViewDeployment}
+          canViewOrganizations={canViewOrganizations}
           canViewAllUsers={canViewAllUsers}
+          canViewAuditLog={canViewAuditLog}
           canViewHealth={canViewHealth}
         />
       </PopoverContent>
@@ -75,9 +79,10 @@ export const DeploymentDropdown: FC<DeploymentDropdownProps> = ({
 };
 
 const DeploymentDropdownContent: FC<DeploymentDropdownProps> = ({
-  canViewAuditLog,
   canViewDeployment,
+  canViewOrganizations,
   canViewAllUsers,
+  canViewAuditLog,
   canViewHealth,
 }) => {
   const popover = usePopover();
@@ -96,6 +101,16 @@ const DeploymentDropdownContent: FC<DeploymentDropdownProps> = ({
           Settings
         </MenuItem>
       )}
+      {canViewDeployment && (
+        <MenuItem
+          component={NavLink}
+          to="/organizations"
+          css={styles.menuItem}
+          onClick={onPopoverClose}
+        >
+          Organizations
+        </MenuItem>
+      )}
       {canViewAllUsers && (
         <MenuItem
           component={NavLink}
diff --git a/site/src/modules/dashboard/Navbar/NavbarView.tsx b/site/src/modules/dashboard/Navbar/NavbarView.tsx
@@ -144,6 +144,7 @@ export const NavbarView: FC<NavbarViewProps> = ({
 
           <DeploymentDropdown
             canViewAuditLog={canViewAuditLog}
+            canViewOrganizations
             canViewDeployment={canViewDeployment}
             canViewAllUsers={canViewAllUsers}
             canViewHealth={canViewHealth}
diff --git a/site/src/pages/OrganizationSettingsPage/OrganizationSettingsPage.tsx b/site/src/pages/OrganizationSettingsPage/OrganizationSettingsPage.tsx
diff --git a/site/src/router.tsx b/site/src/router.tsx
@@ -220,9 +220,8 @@ const AddNewLicensePage = lazy(
   () =>
     import("./pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePage"),
 );
-const TeamsSettingsPage = lazy(
-  () =>
-    import("./pages/DeploySettingsPage/TeamsSettingsPage/TeamsSettingsPage"),
+const OrganizationSettingsPage = lazy(
+  () => import("./pages/OrganizationSettingsPage/OrganizationSettingsPage"),
 );
 const TemplateEmbedPage = lazy(
   () => import("./pages/TemplatePage/TemplateEmbedPage/TemplateEmbedPage"),
@@ -329,11 +328,12 @@ export const router = createBrowserRouter(
 
           <Route path="/audit" element={<AuditPage />} />
 
+          <Route path="/organizations" element={<OrganizationSettingsPage />} />
+
           <Route path="/deployment" element={<DeploySettingsLayout />}>
             <Route path="general" element={<GeneralSettingsPage />} />
             <Route path="licenses" element={<LicensesSettingsPage />} />
             <Route path="licenses/add" element={<AddNewLicensePage />} />
-            <Route path="teams" element={<TeamsSettingsPage />} />
             <Route path="security" element={<SecuritySettingsPage />} />
             <Route
               path="observability"
