From 8c64457f8754b2a7c4453c878612986eb2829be5 Mon Sep 17 00:00:00 2001
From: Kira Pilot <kira@coder.com>
Date: Thu, 26 May 2022 18:35:47 +0000
Subject: [PATCH 1/2] chore: add users link to nav bar

resolves #1746
---
 .../components/NavbarView/NavbarView.test.tsx | 20 ++++++++++++++++++-
 site/src/components/NavbarView/NavbarView.tsx | 15 ++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/site/src/components/NavbarView/NavbarView.test.tsx b/site/src/components/NavbarView/NavbarView.test.tsx
index 13cc85a789036..bd6782f9fba7f 100644
--- a/site/src/components/NavbarView/NavbarView.test.tsx
+++ b/site/src/components/NavbarView/NavbarView.test.tsx
@@ -2,7 +2,7 @@ import { screen } from "@testing-library/react"
 import React from "react"
 import { MockUser } from "../../testHelpers/entities"
 import { render } from "../../testHelpers/renderHelpers"
-import { NavbarView } from "./NavbarView"
+import { Language as navLanguage, NavbarView } from "./NavbarView"
 
 describe("NavbarView", () => {
   const noop = () => {
@@ -16,6 +16,24 @@ describe("NavbarView", () => {
     await screen.findAllByText("Coder", { exact: false })
   })
 
+  it("workspaces nav link has the correct href", async () => {
+    render(<NavbarView user={MockUser} onSignOut={noop} displayAdminDropdown />)
+    const userLink = await screen.findByText(navLanguage.workspaces)
+    expect((userLink as HTMLAnchorElement).href).toContain("/workspaces")
+  })
+
+  it("templates nav link has the correct href", async () => {
+    render(<NavbarView user={MockUser} onSignOut={noop} displayAdminDropdown />)
+    const userLink = await screen.findByText(navLanguage.templates)
+    expect((userLink as HTMLAnchorElement).href).toContain("/templates")
+  })
+
+  it("users nav link has the correct href", async () => {
+    render(<NavbarView user={MockUser} onSignOut={noop} displayAdminDropdown />)
+    const userLink = await screen.findByText(navLanguage.users)
+    expect((userLink as HTMLAnchorElement).href).toContain("/users")
+  })
+
   it("renders profile picture for user", async () => {
     // Given
     const mockUser = {
diff --git a/site/src/components/NavbarView/NavbarView.tsx b/site/src/components/NavbarView/NavbarView.tsx
index 1a471dc8bcb28..1c0edb236199f 100644
--- a/site/src/components/NavbarView/NavbarView.tsx
+++ b/site/src/components/NavbarView/NavbarView.tsx
@@ -15,6 +15,12 @@ export interface NavbarViewProps {
   displayAdminDropdown: boolean
 }
 
+export const Language = {
+  workspaces: "Workspaces",
+  templates: "Templates",
+  users: "Users",
+}
+
 export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut, displayAdminDropdown }) => {
   const styles = useStyles()
   return (
@@ -27,12 +33,17 @@ export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut, display
         </ListItem>
         <ListItem button className={styles.item}>
           <NavLink className={styles.link} to="/workspaces">
-            Workspaces
+            {Language.workspaces}
           </NavLink>
         </ListItem>
         <ListItem button className={styles.item}>
           <NavLink className={styles.link} to="/templates">
-            Templates
+            {Language.templates}
+          </NavLink>
+        </ListItem>
+        <ListItem button className={styles.item}>
+          <NavLink className={styles.link} to="/users">
+            {Language.users}
           </NavLink>
         </ListItem>
       </List>

From 9e1869e43c72fb235484e56f681903dec05e9da4 Mon Sep 17 00:00:00 2001
From: Kira Pilot <kira@coder.com>
Date: Thu, 26 May 2022 18:53:15 +0000
Subject: [PATCH 2/2] fix test names

---
 site/src/components/NavbarView/NavbarView.test.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/src/components/NavbarView/NavbarView.test.tsx b/site/src/components/NavbarView/NavbarView.test.tsx
index bd6782f9fba7f..15d643135d163 100644
--- a/site/src/components/NavbarView/NavbarView.test.tsx
+++ b/site/src/components/NavbarView/NavbarView.test.tsx
@@ -18,14 +18,14 @@ describe("NavbarView", () => {
 
   it("workspaces nav link has the correct href", async () => {
     render(<NavbarView user={MockUser} onSignOut={noop} displayAdminDropdown />)
-    const userLink = await screen.findByText(navLanguage.workspaces)
-    expect((userLink as HTMLAnchorElement).href).toContain("/workspaces")
+    const workspacesLink = await screen.findByText(navLanguage.workspaces)
+    expect((workspacesLink as HTMLAnchorElement).href).toContain("/workspaces")
   })
 
   it("templates nav link has the correct href", async () => {
     render(<NavbarView user={MockUser} onSignOut={noop} displayAdminDropdown />)
-    const userLink = await screen.findByText(navLanguage.templates)
-    expect((userLink as HTMLAnchorElement).href).toContain("/templates")
+    const templatesLink = await screen.findByText(navLanguage.templates)
+    expect((templatesLink as HTMLAnchorElement).href).toContain("/templates")
   })
 
   it("users nav link has the correct href", async () => {