Skip to content

Commit d4c26d5

Browse files
authored
chore: remove admin dropdown (#1802)
resolves #1748
1 parent 07ebd59 commit d4c26d5

File tree

7 files changed

+8
-238
lines changed

7 files changed

+8
-238
lines changed

site/src/components/AdminDropdown/AdminDropdown.stories.tsx

-17
This file was deleted.

site/src/components/AdminDropdown/AdminDropdown.test.tsx

-28
This file was deleted.

site/src/components/AdminDropdown/AdminDropdown.tsx

-137
This file was deleted.

site/src/components/Navbar/Navbar.test.tsx

-40
This file was deleted.

site/src/components/Navbar/Navbar.tsx

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
import { useActor, useSelector } from "@xstate/react"
1+
import { useActor } from "@xstate/react"
22
import React, { useContext } from "react"
3-
import { selectPermissions } from "../../xServices/auth/authSelectors"
43
import { XServiceContext } from "../../xServices/StateContext"
54
import { NavbarView } from "../NavbarView/NavbarView"
65

76
export const Navbar: React.FC = () => {
87
const xServices = useContext(XServiceContext)
98
const [authState, authSend] = useActor(xServices.authXService)
109
const { me } = authState.context
11-
const permissions = useSelector(xServices.authXService, selectPermissions)
12-
// When we have more options in the admin dropdown we may want to check this
13-
// for more permissions
14-
const displayAdminDropdown = !!permissions?.updateUsers
1510
const onSignOut = () => authSend("SIGN_OUT")
1611

17-
return <NavbarView user={me} onSignOut={onSignOut} displayAdminDropdown={displayAdminDropdown} />
12+
return <NavbarView user={me} onSignOut={onSignOut} />
1813
}

site/src/components/NavbarView/NavbarView.test.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,26 @@ describe("NavbarView", () => {
1010
}
1111
it("renders content", async () => {
1212
// When
13-
render(<NavbarView user={MockUser} onSignOut={noop} displayAdminDropdown />)
13+
render(<NavbarView user={MockUser} onSignOut={noop} />)
1414

1515
// Then
1616
await screen.findAllByText("Coder", { exact: false })
1717
})
1818

1919
it("workspaces nav link has the correct href", async () => {
20-
render(<NavbarView user={MockUser} onSignOut={noop} displayAdminDropdown />)
20+
render(<NavbarView user={MockUser} onSignOut={noop} />)
2121
const workspacesLink = await screen.findByText(navLanguage.workspaces)
2222
expect((workspacesLink as HTMLAnchorElement).href).toContain("/workspaces")
2323
})
2424

2525
it("templates nav link has the correct href", async () => {
26-
render(<NavbarView user={MockUser} onSignOut={noop} displayAdminDropdown />)
26+
render(<NavbarView user={MockUser} onSignOut={noop} />)
2727
const templatesLink = await screen.findByText(navLanguage.templates)
2828
expect((templatesLink as HTMLAnchorElement).href).toContain("/templates")
2929
})
3030

3131
it("users nav link has the correct href", async () => {
32-
render(<NavbarView user={MockUser} onSignOut={noop} displayAdminDropdown />)
32+
render(<NavbarView user={MockUser} onSignOut={noop} />)
3333
const userLink = await screen.findByText(navLanguage.users)
3434
expect((userLink as HTMLAnchorElement).href).toContain("/users")
3535
})
@@ -42,7 +42,7 @@ describe("NavbarView", () => {
4242
}
4343

4444
// When
45-
render(<NavbarView user={mockUser} onSignOut={noop} displayAdminDropdown />)
45+
render(<NavbarView user={mockUser} onSignOut={noop} />)
4646

4747
// Then
4848
// There should be a 'B' avatar!

site/src/components/NavbarView/NavbarView.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ import React from "react"
55
import { NavLink } from "react-router-dom"
66
import * as TypesGen from "../../api/typesGenerated"
77
import { navHeight } from "../../theme/constants"
8-
import { AdminDropdown } from "../AdminDropdown/AdminDropdown"
98
import { Logo } from "../Icons/Logo"
109
import { UserDropdown } from "../UserDropdown/UsersDropdown"
1110

1211
export interface NavbarViewProps {
1312
user?: TypesGen.User
1413
onSignOut: () => void
15-
displayAdminDropdown: boolean
1614
}
1715

1816
export const Language = {
@@ -21,7 +19,7 @@ export const Language = {
2119
users: "Users",
2220
}
2321

24-
export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut, displayAdminDropdown }) => {
22+
export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut }) => {
2523
const styles = useStyles()
2624
return (
2725
<nav className={styles.root}>
@@ -48,7 +46,6 @@ export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut, display
4846
</ListItem>
4947
</List>
5048
<div className={styles.fullWidth} />
51-
{displayAdminDropdown && <AdminDropdown />}
5249
<div className={styles.fixed}>{user && <UserDropdown user={user} onSignOut={onSignOut} />}</div>
5350
</nav>
5451
)

0 commit comments

Comments
 (0)