Skip to content

Commit 1b405db

Browse files
committed
chore: remove admin dropdown
resolves #1748
1 parent 7b39352 commit 1b405db

File tree

7 files changed

+5
-235
lines changed

7 files changed

+5
-235
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ 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 })
@@ -24,7 +24,7 @@ describe("NavbarView", () => {
2424
}
2525

2626
// When
27-
render(<NavbarView user={mockUser} onSignOut={noop} displayAdminDropdown />)
27+
render(<NavbarView user={mockUser} onSignOut={noop} />)
2828

2929
// Then
3030
// There should be a 'B' avatar!

site/src/components/NavbarView/NavbarView.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,15 @@ 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

18-
export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut, displayAdminDropdown }) => {
16+
export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut }) => {
1917
const styles = useStyles()
2018
return (
2119
<nav className={styles.root}>
@@ -37,7 +35,6 @@ export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut, display
3735
</ListItem>
3836
</List>
3937
<div className={styles.fullWidth} />
40-
{displayAdminDropdown && <AdminDropdown />}
4138
<div className={styles.fixed}>{user && <UserDropdown user={user} onSignOut={onSignOut} />}</div>
4239
</nav>
4340
)

0 commit comments

Comments
 (0)