Use consts in util

f0ssel · f0ssel · commit c1f4392fbc49 · 2022-06-06T22:50:37.000Z
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
@@ -20,6 +20,7 @@ import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
 import { pageTitle } from "../../util/page"
 import { workspacesMachine } from "../../xServices/workspaces/workspacesXService"
 import { WorkspacesPageView } from "./WorkspacesPageView"
+import { workspaceFilterQuery } from "../../util/workspace"
 
 interface FilterFormValues {
   query: string
@@ -63,13 +64,13 @@ const WorkspacesPage: FC = () => {
   }
 
   const setYourWorkspaces = () => {
-    void form.setFieldValue("query", "owner:me")
+    void form.setFieldValue("query", workspaceFilterQuery.me)
     void form.submitForm()
     handleClose()
   }
 
   const setAllWorkspaces = () => {
-    void form.setFieldValue("query", "")
+    void form.setFieldValue("query", workspaceFilterQuery.all)
     void form.submitForm()
     handleClose()
   }
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
@@ -17,7 +17,7 @@ import { AvatarData } from "../../components/AvatarData/AvatarData"
 import { EmptyState } from "../../components/EmptyState/EmptyState"
 import { Stack } from "../../components/Stack/Stack"
 import { TableLoader } from "../../components/TableLoader/TableLoader"
-import { getDisplayStatus } from "../../util/workspace"
+import { getDisplayStatus, workspaceFilterQuery } from "../../util/workspace"
 
 dayjs.extend(relativeTime)
 
@@ -54,7 +54,7 @@ export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({ loading, works
           {!workspaces && loading && <TableLoader />}
           {workspaces && workspaces.length === 0 && (
             <>
-              {query === "owner:me" || query === "" ? (
+              {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
@@ -247,3 +247,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
`@@ -247,3 +247,8 @@ export const workspaceQueryToFilter = (query?: string): TypesGen.WorkspaceFilter`
`247`	`247`	`return defaultFilter`
`248`	`248`	`}`
`249`	`249`	`}`
	`250`	`+`
	`251`	`+export const workspaceFilterQuery = {`
	`252`	`+ me: "owner:me",`
	`253`	`+ all: "",`
	`254`	`+}`