More porting, wip

coder · presleyp · Apr 8, 2022 · Apr 5, 2022 · Apr 5, 2022 · Apr 6, 2022
commit a9e4dd4fa9dc507f3a0eeed4170a9775f433e68e
diff --git a/site/src/components/BorderedMenu/types.ts b/site/src/components/BorderedMenu/types.ts
@@ -1,10 +1,29 @@
-/**
- * Shared types used by multiple components go here.
- */
+import SvgIcon from "@material-ui/core/SvgIcon";
+import { RouteProps } from "react-router-dom";
 
- import { RouteConfig } from "../../router"
+export type RouteNavbarGroup = "main" | "admin"
 
- export interface NavbarEntryProps extends Pick<RouteConfig, "description" | "featureFlag" | "Icon" | "label" | "path"> {
+ interface BasicRouteConfig {
+  path: string
+  /** Use to match when the path includes variables. */
+  re?: RegExp
+  component: RouteProps["component"]
+  enabled: boolean
+  label?: string
+  Icon?: typeof SvgIcon
+  group?: RouteNavbarGroup
+  hideNavbar?: boolean
+  description?: string
+}
+
+interface RouteConfigWithNav extends BasicRouteConfig {
+  label: string
+  icon: typeof SvgIcon
+  group: RouteNavbarGroup
+}
+
+export type RouteConfig = BasicRouteConfig | RouteConfigWithNav
+export interface NavbarEntryProps extends Pick<RouteConfig, "description" | "Icon" | "label" | "path"> {
    selected: boolean
    className?: string
    onClick?: () => void

diff --git a/site/src/components/Navbar/Admin/Admin.tsx → site/src/components/Navbar/Admin/index.tsx b/site/src/components/Navbar/Admin/Admin.tsx → site/src/components/Navbar/Admin/index.tsx
diff --git a/site/src/components/Sidebar/index.tsx b/site/src/components/Sidebar/index.tsx
@@ -2,7 +2,7 @@ import List from "@material-ui/core/List"
 import ListItem from "@material-ui/core/ListItem"
 import { makeStyles } from "@material-ui/core/styles"
 import React from "react"
-import { combineClasses } from "../../util/combine-classes"
+import { combineClasses } from "../../util/combineClasses"
 
 export interface SidebarItem {
   value: string

diff --git a/site/src/util/combineClasses.test.ts b/site/src/util/combineClasses.test.ts
@@ -0,0 +1,28 @@
+import { combineClasses } from "./combineClasses"
+
+const staticStyles = {
+  text: "MuiText",
+  success: "MuiText-Green",
+  warning: "MuiText-Red",
+}
+
+describe("combineClasses", () => {
+  it.each([
+    // Falsy
+    [undefined, undefined],
+    [{ [staticStyles.text]: false }, undefined],
+    [{ [staticStyles.text]: undefined }, undefined],
+    [[], undefined],
+
+    // Truthy
+    [{ [staticStyles.text]: true }, "MuiText"],
+    [{ [staticStyles.text]: true, [staticStyles.warning]: true }, "MuiText  MuiText-Red"],
+    [[staticStyles.text], "MuiText"],
+
+    // Mixed
+    [{ [staticStyles.text]: true, [staticStyles.success]: false }, "MuiText"],
+    [[staticStyles.text, staticStyles.success], "MuiText  MuiText-Green"],
+  ])(`classNames(%p) returns %p`, (staticClasses, result) => {
+    expect(combineClasses(staticClasses)).toBe(result)
+  })
+})
diff --git a/site/src/util/combine-classes.ts → site/src/util/combineClasses.ts b/site/src/util/combine-classes.ts → site/src/util/combineClasses.ts