💇‍♀️

aslilac · aslilac · commit b081a12ad04b · 2024-06-03T19:46:27.000Z
diff --git a/site/src/modules/dashboard/Navbar/DeploymentDropdown.tsx b/site/src/modules/dashboard/Navbar/DeploymentDropdown.tsx
@@ -40,12 +40,17 @@ export const DeploymentDropdown: FC<DeploymentDropdownProps> = ({
   return (
     <Popover>
       <PopoverTrigger>
-        <Button>
+        <Button
+          size="small"
+          endIcon={
+            <DropdownArrow
+              color={theme.experimental.l2.fill.solid}
+              close={false}
+              margin={false}
+            />
+          }
+        >
           Deployment
-          <DropdownArrow
-            color={theme.experimental.l2.fill.solid}
-            close={false}
-          />
         </Button>
       </PopoverTrigger>
 
@@ -83,43 +88,53 @@ const DeploymentDropdownContent: FC<DeploymentDropdownProps> = ({
   return (
     <nav>
       {canViewDeployment && (
-        <NavLink css={styles.link} to="/deployment/general">
-          <MenuItem css={styles.menuItem} onClick={onPopoverClose}>
-            Settings
-          </MenuItem>
-        </NavLink>
+        <MenuItem
+          component={NavLink}
+          to="/deployment/general"
+          css={styles.menuItem}
+          onClick={onPopoverClose}
+        >
+          Settings
+        </MenuItem>
       )}
       {canViewAllUsers && (
-        <NavLink css={styles.link} to={USERS_LINK}>
-          <MenuItem css={styles.menuItem} onClick={onPopoverClose}>
-            Users
-          </MenuItem>
-        </NavLink>
+        <MenuItem
+          component={NavLink}
+          to={USERS_LINK}
+          css={styles.menuItem}
+          onClick={onPopoverClose}
+        >
+          Users
+        </MenuItem>
       )}
       {canViewAuditLog && (
-        <NavLink css={styles.link} to="/audit">
-          <MenuItem css={styles.menuItem} onClick={onPopoverClose}>
-            Auditing
-          </MenuItem>
-        </NavLink>
+        <MenuItem
+          component={NavLink}
+          to="/audit"
+          css={styles.menuItem}
+          onClick={onPopoverClose}
+        >
+          Auditing
+        </MenuItem>
       )}
       {canViewHealth && (
-        <NavLink css={styles.link} to="/health">
-          <MenuItem css={styles.menuItem} onClick={onPopoverClose}>
-            Healthcheck
-          </MenuItem>
-        </NavLink>
+        <MenuItem
+          component={NavLink}
+          to="/health"
+          css={styles.menuItem}
+          onClick={onPopoverClose}
+        >
+          Healthcheck
+        </MenuItem>
       )}
     </nav>
   );
 };
 
 const styles = {
-  link: {
-    textDecoration: "none",
-    color: "inherit",
-  },
   menuItem: (theme) => css`
+    text-decoration: none;
+    color: inherit;
     gap: 20px;
     padding: 8px 20px;
     font-size: 14px;
diff --git a/site/src/modules/dashboard/Navbar/NavbarView.stories.tsx b/site/src/modules/dashboard/Navbar/NavbarView.stories.tsx
@@ -3,13 +3,18 @@ import { chromaticWithTablet } from "testHelpers/chromatic";
 import { MockUser, MockUser2 } from "testHelpers/entities";
 import { withDashboardProvider } from "testHelpers/storybook";
 import { NavbarView } from "./NavbarView";
+import { action } from "@storybook/addon-actions";
 
 const meta: Meta<typeof NavbarView> = {
   title: "modules/dashboard/NavbarView",
   parameters: { chromatic: chromaticWithTablet, layout: "fullscreen" },
   component: NavbarView,
   args: {
     user: MockUser,
+    canViewAuditLog: true,
+    canViewDeployment: true,
+    canViewAllUsers: true,
+    canViewHealth: true,
   },
   decorators: [withDashboardProvider],
 };
@@ -25,6 +30,7 @@ export const ForMember: Story = {
     canViewAuditLog: false,
     canViewDeployment: false,
     canViewAllUsers: false,
+    canViewHealth: false,
   },
 };
 
diff --git a/site/src/modules/dashboard/Navbar/NavbarView.tsx b/site/src/modules/dashboard/Navbar/NavbarView.tsx
@@ -224,7 +224,6 @@ const ProxyMenu: FC<ProxyMenuProps> = ({ proxyContextValue }) => {
         size="small"
         endIcon={<KeyboardArrowDownOutlined />}
         css={{
-          borderRadius: "999px",
           "& .MuiSvgIcon-root": { fontSize: 14 },
         }}
       >

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,6 @@ const ProxyMenu: FC<ProxyMenuProps> = ({ proxyContextValue }) => {`
`224`	`224`	`size="small"`
`225`	`225`	`endIcon={<KeyboardArrowDownOutlined />}`
`226`	`226`	`css={{`
`227`		`- borderRadius: "999px",`
`228`	`227`	`"& .MuiSvgIcon-root": { fontSize: 14 },`
`229`	`228`	`}}`
`230`	`229`	`>`