pr fixes

coder · f0ssel · Jun 3, 2022 · Jun 1, 2022 · Jun 1, 2022 · Jun 1, 2022
commit 568e3a61ec55d0e0d1cd8963074f36aec0573731
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPage.tsx b/site/src/pages/WorkspacesPage/WorkspacesPage.tsx
@@ -6,7 +6,7 @@ import { makeStyles } from "@material-ui/core/styles"
 import TextField from "@material-ui/core/TextField"
 import AddCircleOutline from "@material-ui/icons/AddCircleOutline"
 import { useMachine } from "@xstate/react"
-import { FormikContextType, FormikErrors, useFormik } from "formik"
+import { FormikErrors, useFormik } from "formik"
 import { FC, useState } from "react"
 import { Link as RouterLink } from "react-router-dom"
 import { Margins } from "../../components/Margins/Margins"
@@ -25,7 +25,7 @@ const WorkspacesPage: FC = () => {
   const styles = useStyles()
   const [workspacesState, send] = useMachine(workspacesMachine)
 
-const form = useFormik<FilterFormValues>({
+  const form = useFormik<FilterFormValues>({
     initialValues: {
       query: workspacesState.context.filter || "",
     },
@@ -50,13 +50,13 @@ const form = useFormik<FilterFormValues>({
   }
 
   const setYourWorkspaces = () => {
-    form.setFieldValue("query", "owner:me")
+    void form.setFieldValue("query", "owner:me")
     void form.submitForm()
     handleClose()
   }
 
   const setAllWorkspaces = () => {
-    form.setFieldValue("query", "")
+    void form.setFieldValue("query", "")
     void form.submitForm()
     handleClose()
   }
@@ -88,7 +88,6 @@ const form = useFormik<FilterFormValues>({
         <WorkspacesPageView
           loading={workspacesState.hasTag("loading")}
           workspaces={workspacesState.context.workspaces}
-          error={workspacesState.context.getWorkspacesError}
         />
       </Margins>
     </>

diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
@@ -30,7 +30,6 @@ export const Language = {
 export interface WorkspacesPageViewProps {
   loading?: boolean
   workspaces?: TypesGen.Workspace[]
-  error?: unknown
 }
 
 export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({ loading, workspaces }) => {

diff --git a/site/src/util/workspace.ts b/site/src/util/workspace.ts
@@ -199,6 +199,7 @@ export const isWorkspaceOn = (workspace: TypesGen.Workspace): boolean => {
   return transition === "start" && status === "succeeded"
 }
 
+
 export const defaultWorkspaceExtension = (__startDate?: dayjs.Dayjs): TypesGen.PutExtendWorkspaceRequest => {
   const now = __startDate ? dayjs(__startDate) : dayjs()
   const NinetyMinutesFromNow = now.add(90, "minutes").utc()

diff --git a/site/src/xServices/workspaces/workspacesXService.ts b/site/src/xServices/workspaces/workspacesXService.ts
@@ -51,7 +51,7 @@ export const workspacesMachine = createMachine(
           },
           onError: {
             target: "ready",
-            actions: "assignGetWorkspacesError",
+            actions: ["assignGetWorkspacesError", "clearWorkspaces"],
           },
         },
         tags: "loading",
@@ -70,6 +70,7 @@ export const workspacesMachine = createMachine(
         getWorkspacesError: (_, event) => event.data,
       }),
       clearGetWorkspacesError: (context) => assign({ ...context, getWorkspacesError: undefined }),
+      clearWorkspaces: (context) => assign({ ...context, workspaces: undefined }),
     },
     services: {
       getWorkspaces: (context) => API.getWorkspaces(workspaceQueryToFilter(context.filter)),