Use consts in util

f0ssel · f0ssel · commit f6068d91dcd2 · 2022-06-07T16:20:46.000Z
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
@@ -4,6 +4,7 @@ import { Helmet } from "react-helmet"
 import { pageTitle } from "../../util/page"
 import { workspacesMachine } from "../../xServices/workspaces/workspacesXService"
 import { WorkspacesPageView } from "./WorkspacesPageView"
+import { workspaceFilterQuery } from "../../util/workspace"
 
 const WorkspacesPage: FC = () => {
   const [workspacesState, send] = useMachine(workspacesMachine)
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
@@ -35,7 +35,7 @@ import { PageHeader, PageHeaderTitle } from "../../components/PageHeader/PageHea
 import { Stack } from "../../components/Stack/Stack"
 import { TableLoader } from "../../components/TableLoader/TableLoader"
 import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
-import { getDisplayStatus } from "../../util/workspace"
+import { getDisplayStatus, workspaceFilterQuery } from "../../util/workspace"
 
 dayjs.extend(relativeTime)
 
@@ -201,7 +201,7 @@ export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({ loading, works
           {!workspaces && loading && <TableLoader />}
           {workspaces && workspaces.length === 0 && (
             <>
-              {filter === "owner:me" || filter === "" ? (
+              {query === workspaceFilterQuery.me || query === workspaceFilterQuery.all ? (
                 <TableRow>
                   <TableCell colSpan={999}>
                     <EmptyState
diff --git a/site/src/util/workspace.ts b/site/src/util/workspace.ts
@@ -297,3 +297,8 @@ export const workspaceQueryToFilter = (query?: string): TypesGen.WorkspaceFilter
     return defaultFilter
   }
 }
+
+export const workspaceFilterQuery = {
+  me: "owner:me",
+  all: "",
+}

Original file line number	Diff line number	Diff line change
`@@ -297,3 +297,8 @@ export const workspaceQueryToFilter = (query?: string): TypesGen.WorkspaceFilter`
`297`	`297`	`return defaultFilter`
`298`	`298`	`}`
`299`	`299`	`}`
	`300`	`+`
	`301`	`+export const workspaceFilterQuery = {`
	`302`	`+ me: "owner:me",`
	`303`	`+ all: "",`
	`304`	`+}`