Skip to content

chore: remove admin dropdown #1802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 26, 2022
Merged

chore: remove admin dropdown #1802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b405db
chore: remove admin dropdown
Kira-Pilot May 26, 2022
8f5a408
fixing merge conflict
Kira-Pilot May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions site/src/components/AdminDropdown/AdminDropdown.stories.tsx
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions site/src/components/AdminDropdown/AdminDropdown.test.tsx
View file
Open in desktop

This file was deleted.

137 changes: 0 additions & 137 deletions site/src/components/AdminDropdown/AdminDropdown.tsx
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions site/src/components/Navbar/Navbar.test.tsx
View file
Open in desktop

This file was deleted.

9 changes: 2 additions & 7 deletions site/src/components/Navbar/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
import { useActor, useSelector } from "@xstate/react"
import { useActor } from "@xstate/react"
import React, { useContext } from "react"
import { selectPermissions } from "../../xServices/auth/authSelectors"
import { XServiceContext } from "../../xServices/StateContext"
import { NavbarView } from "../NavbarView/NavbarView"

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

return <NavbarView user={me} onSignOut={onSignOut} displayAdminDropdown={displayAdminDropdown} />
return <NavbarView user={me} onSignOut={onSignOut} />
}
10 changes: 5 additions & 5 deletions site/src/components/NavbarView/NavbarView.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,26 @@ describe("NavbarView", () => {
}
it("renders content", async () => {
// When
render(<NavbarView user={MockUser} onSignOut={noop} displayAdminDropdown />)
render(<NavbarView user={MockUser} onSignOut={noop} />)

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

it("workspaces nav link has the correct href", async () => {
render(<NavbarView user={MockUser} onSignOut={noop} displayAdminDropdown />)
render(<NavbarView user={MockUser} onSignOut={noop} />)
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 />)
render(<NavbarView user={MockUser} onSignOut={noop} />)
const templatesLink = await screen.findByText(navLanguage.templates)
expect((templatesLink as HTMLAnchorElement).href).toContain("/templates")
})

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

// When
render(<NavbarView user={mockUser} onSignOut={noop} displayAdminDropdown />)
render(<NavbarView user={mockUser} onSignOut={noop} />)

// Then
// There should be a 'B' avatar!
Expand Down
5 changes: 1 addition & 4 deletions site/src/components/NavbarView/NavbarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ import React from "react"
import { NavLink } from "react-router-dom"
import * as TypesGen from "../../api/typesGenerated"
import { navHeight } from "../../theme/constants"
import { AdminDropdown } from "../AdminDropdown/AdminDropdown"
import { Logo } from "../Icons/Logo"
import { UserDropdown } from "../UserDropdown/UsersDropdown"

export interface NavbarViewProps {
user?: TypesGen.User
onSignOut: () => void
displayAdminDropdown: boolean
}

export const Language = {
Expand All @@ -21,7 +19,7 @@ export const Language = {
users: "Users",
}

export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut, displayAdminDropdown }) => {
export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut }) => {
const styles = useStyles()
return (
<nav className={styles.root}>
Expand All @@ -48,7 +46,6 @@ export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut, display
</ListItem>
</List>
<div className={styles.fullWidth} />
{displayAdminDropdown && <AdminDropdown />}
<div className={styles.fixed}>{user && <UserDropdown user={user} onSignOut={onSignOut} />}</div>
</nav>
)
Expand Down