From 18afe1fe46b790f72e01b7ce8f2a5180b416e21f Mon Sep 17 00:00:00 2001 From: Presley Date: Thu, 26 May 2022 16:43:59 +0000 Subject: [PATCH 1/2] Delete Orgs Page --- site/src/AppRouter.tsx | 9 --------- .../components/AdminDropdown/AdminDropdown.test.tsx | 10 ---------- site/src/components/AdminDropdown/AdminDropdown.tsx | 9 --------- site/src/pages/OrgsPage/OrgsPage.tsx | 5 ----- 4 files changed, 33 deletions(-) delete mode 100644 site/src/pages/OrgsPage/OrgsPage.tsx diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx index c9c85149d2517..7f60dc8e9469d 100644 --- a/site/src/AppRouter.tsx +++ b/site/src/AppRouter.tsx @@ -8,7 +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" @@ -134,14 +133,6 @@ export const AppRouter: React.FC = () => ( } /> - - - - } - /> { 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() }) }) @@ -28,15 +27,6 @@ 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() diff --git a/site/src/components/AdminDropdown/AdminDropdown.tsx b/site/src/components/AdminDropdown/AdminDropdown.tsx index 7d39488ac550f..d0a70a6ef16b6 100644 --- a/site/src/components/AdminDropdown/AdminDropdown.tsx +++ b/site/src/components/AdminDropdown/AdminDropdown.tsx @@ -7,15 +7,12 @@ 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.", } @@ -27,12 +24,6 @@ const entries = [ path: "/users", Icon: UsersOutlinedIcon, }, - { - label: Language.orgsLabel, - description: Language.orgsDescription, - path: "/orgs", - Icon: BuildingIcon, - }, { label: Language.settingsLabel, description: Language.settingsDescription, diff --git a/site/src/pages/OrgsPage/OrgsPage.tsx b/site/src/pages/OrgsPage/OrgsPage.tsx deleted file mode 100644 index 07a94c5cf8aea..0000000000000 --- a/site/src/pages/OrgsPage/OrgsPage.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import React from "react" - -export const OrgsPage: React.FC = () => { - return
Coming soon!
-} From 13da0c6bc777acdc1effa99d4917c484dbfcf58a Mon Sep 17 00:00:00 2001 From: Presley Date: Thu, 26 May 2022 16:54:28 +0000 Subject: [PATCH 2/2] Delete Admin Settings page --- site/src/AppRouter.tsx | 9 --------- .../components/AdminDropdown/AdminDropdown.test.tsx | 10 ---------- site/src/components/AdminDropdown/AdminDropdown.tsx | 9 --------- site/src/pages/SettingsPage/SettingsPage.tsx | 5 ----- 4 files changed, 33 deletions(-) delete mode 100644 site/src/pages/SettingsPage/SettingsPage.tsx diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx index 7f60dc8e9469d..6d807838d5c50 100644 --- a/site/src/AppRouter.tsx +++ b/site/src/AppRouter.tsx @@ -8,7 +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 { 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" @@ -133,14 +132,6 @@ export const AppRouter: React.FC = () => ( } /> - - - - } - /> }> } /> diff --git a/site/src/components/AdminDropdown/AdminDropdown.test.tsx b/site/src/components/AdminDropdown/AdminDropdown.test.tsx index 9a17d1bfd87de..23e442adb5e79 100644 --- a/site/src/components/AdminDropdown/AdminDropdown.test.tsx +++ b/site/src/components/AdminDropdown/AdminDropdown.test.tsx @@ -14,7 +14,6 @@ describe("AdminDropdown", () => { it("opens the menu", async () => { await renderAndClick() expect(screen.getByText(Language.usersLabel)).toBeDefined() - expect(screen.getByText(Language.settingsLabel)).toBeDefined() }) }) @@ -26,13 +25,4 @@ describe("AdminDropdown", () => { expect(history.location.pathname).toEqual("/users") }) - - 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 d0a70a6ef16b6..5c889eba95d9e 100644 --- a/site/src/components/AdminDropdown/AdminDropdown.tsx +++ b/site/src/components/AdminDropdown/AdminDropdown.tsx @@ -1,7 +1,6 @@ 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" @@ -13,8 +12,6 @@ export const Language = { menuTitle: "Admin", usersLabel: "Users", usersDescription: "Manage users, roles, and permissions.", - settingsLabel: "Settings", - settingsDescription: "Configure authentication and more.", } const entries = [ @@ -24,12 +21,6 @@ const entries = [ path: "/users", Icon: UsersOutlinedIcon, }, - { - label: Language.settingsLabel, - description: Language.settingsDescription, - path: "/settings", - Icon: AdminIcon, - }, ] export const AdminDropdown: React.FC = () => { diff --git a/site/src/pages/SettingsPage/SettingsPage.tsx b/site/src/pages/SettingsPage/SettingsPage.tsx deleted file mode 100644 index fba4845cccae4..0000000000000 --- a/site/src/pages/SettingsPage/SettingsPage.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import React from "react" - -export const SettingsPage: React.FC = () => { - return
Coming soon!
-}