From fc67c6efb1f2166046f9cf606e5cd51c4880aebf Mon Sep 17 00:00:00 2001
From: Presley Pizzo <1290996+presleyp@users.noreply.github.com>
Date: Thu, 26 May 2022 13:10:54 -0400
Subject: [PATCH] fix: remove unused pages from Admin dropdown (org and
 settings) (#1788)

* Delete Orgs Page

* Delete Admin Settings page
---
 site/src/AppRouter.tsx                        | 18 -----------------
 .../AdminDropdown/AdminDropdown.test.tsx      | 20 -------------------
 .../AdminDropdown/AdminDropdown.tsx           | 18 -----------------
 site/src/pages/OrgsPage/OrgsPage.tsx          |  5 -----
 site/src/pages/SettingsPage/SettingsPage.tsx  |  5 -----
 5 files changed, 66 deletions(-)
 delete mode 100644 site/src/pages/OrgsPage/OrgsPage.tsx
 delete mode 100644 site/src/pages/SettingsPage/SettingsPage.tsx

diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
index c9c85149d2..6d807838d5 100644
--- a/site/src/AppRouter.tsx
+++ b/site/src/AppRouter.tsx
@@ -8,8 +8,6 @@ import { NotFoundPage } from "./pages/404Page/404Page"
 import { CliAuthenticationPage } from "./pages/CliAuthPage/CliAuthPage"
 import { HealthzPage } from "./pages/HealthzPage/HealthzPage"
 import { LoginPage } from "./pages/LoginPage/LoginPage"
-import { OrgsPage } from "./pages/OrgsPage/OrgsPage"
-import { SettingsPage } from "./pages/SettingsPage/SettingsPage"
 import { AccountPage } from "./pages/SettingsPages/AccountPage/AccountPage"
 import { SSHKeysPage } from "./pages/SettingsPages/SSHKeysPage/SSHKeysPage"
 import { TemplatePage } from "./pages/TemplatePage/TemplatePage"
@@ -134,22 +132,6 @@ export const AppRouter: React.FC = () => (
             }
           />
         </Route>
-        <Route
-          path="orgs"
-          element={
-            <AuthAndFrame>
-              <OrgsPage />
-            </AuthAndFrame>
-          }
-        />
-        <Route
-          path="settings"
-          element={
-            <AuthAndFrame>
-              <SettingsPage />
-            </AuthAndFrame>
-          }
-        />
 
         <Route path="settings" element={<SettingsLayout />}>
           <Route path="account" element={<AccountPage />} />
diff --git a/site/src/components/AdminDropdown/AdminDropdown.test.tsx b/site/src/components/AdminDropdown/AdminDropdown.test.tsx
index 67e0af1c56..23e442adb5 100644
--- a/site/src/components/AdminDropdown/AdminDropdown.test.tsx
+++ b/site/src/components/AdminDropdown/AdminDropdown.test.tsx
@@ -14,8 +14,6 @@ describe("AdminDropdown", () => {
     it("opens the menu", async () => {
       await renderAndClick()
       expect(screen.getByText(Language.usersLabel)).toBeDefined()
-      expect(screen.getByText(Language.orgsLabel)).toBeDefined()
-      expect(screen.getByText(Language.settingsLabel)).toBeDefined()
     })
   })
 
@@ -27,22 +25,4 @@ describe("AdminDropdown", () => {
 
     expect(history.location.pathname).toEqual("/users")
   })
-
-  it("links to the orgs page", async () => {
-    await renderAndClick()
-
-    const usersLink = screen.getByText(Language.orgsLabel).closest("a")
-    usersLink?.click()
-
-    expect(history.location.pathname).toEqual("/orgs")
-  })
-
-  it("links to the settings page", async () => {
-    await renderAndClick()
-
-    const usersLink = screen.getByText(Language.settingsLabel).closest("a")
-    usersLink?.click()
-
-    expect(history.location.pathname).toEqual("/settings")
-  })
 })
diff --git a/site/src/components/AdminDropdown/AdminDropdown.tsx b/site/src/components/AdminDropdown/AdminDropdown.tsx
index 7d39488ac5..5c889eba95 100644
--- a/site/src/components/AdminDropdown/AdminDropdown.tsx
+++ b/site/src/components/AdminDropdown/AdminDropdown.tsx
@@ -1,23 +1,17 @@
 import ListItem from "@material-ui/core/ListItem"
 import ListItemText from "@material-ui/core/ListItemText"
 import { fade, makeStyles, Theme } from "@material-ui/core/styles"
-import AdminIcon from "@material-ui/icons/SettingsOutlined"
 import React, { useState } from "react"
 import { navHeight } from "../../theme/constants"
 import { BorderedMenu } from "../BorderedMenu/BorderedMenu"
 import { BorderedMenuRow } from "../BorderedMenuRow/BorderedMenuRow"
 import { CloseDropdown, OpenDropdown } from "../DropdownArrows/DropdownArrows"
-import { BuildingIcon } from "../Icons/BuildingIcon"
 import { UsersOutlinedIcon } from "../Icons/UsersOutlinedIcon"
 
 export const Language = {
   menuTitle: "Admin",
   usersLabel: "Users",
   usersDescription: "Manage users, roles, and permissions.",
-  orgsLabel: "Organizations",
-  orgsDescription: "Manage organizations.",
-  settingsLabel: "Settings",
-  settingsDescription: "Configure authentication and more.",
 }
 
 const entries = [
@@ -27,18 +21,6 @@ const entries = [
     path: "/users",
     Icon: UsersOutlinedIcon,
   },
-  {
-    label: Language.orgsLabel,
-    description: Language.orgsDescription,
-    path: "/orgs",
-    Icon: BuildingIcon,
-  },
-  {
-    label: Language.settingsLabel,
-    description: Language.settingsDescription,
-    path: "/settings",
-    Icon: AdminIcon,
-  },
 ]
 
 export const AdminDropdown: React.FC = () => {
diff --git a/site/src/pages/OrgsPage/OrgsPage.tsx b/site/src/pages/OrgsPage/OrgsPage.tsx
deleted file mode 100644
index 07a94c5cf8..0000000000
--- a/site/src/pages/OrgsPage/OrgsPage.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import React from "react"
-
-export const OrgsPage: React.FC = () => {
-  return <div>Coming soon!</div>
-}
diff --git a/site/src/pages/SettingsPage/SettingsPage.tsx b/site/src/pages/SettingsPage/SettingsPage.tsx
deleted file mode 100644
index fba4845ccc..0000000000
--- a/site/src/pages/SettingsPage/SettingsPage.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import React from "react"
-
-export const SettingsPage: React.FC = () => {
-  return <div>Coming soon!</div>
-}