Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d43a15a

Browse files
f0sself0ssel
committed
pr fixes
1 parent bc2ed33 commit d43a15a

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

‎site/src/pages/WorkspacesPage/WorkspacesPage.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { makeStyles } from "@material-ui/core/styles"
66
import TextField from "@material-ui/core/TextField"
77
import AddCircleOutline from "@material-ui/icons/AddCircleOutline"
88
import { useMachine } from "@xstate/react"
9-
import { FormikContextType, FormikErrors, useFormik } from "formik"
9+
import { FormikErrors, useFormik } from "formik"
1010
import { FC, useState } from "react"
1111
import { Link as RouterLink } from "react-router-dom"
1212
import { Margins } from "../../components/Margins/Margins"
@@ -25,7 +25,7 @@ const WorkspacesPage: FC = () => {
2525
const styles = useStyles()
2626
const [workspacesState, send] = useMachine(workspacesMachine)
2727

28-
const form = useFormik<FilterFormValues>({
28+
const form = useFormik<FilterFormValues>({
2929
initialValues: {
3030
query: workspacesState.context.filter || "",
3131
},
@@ -50,13 +50,13 @@ const form = useFormik<FilterFormValues>({
5050
}
5151

5252
const setYourWorkspaces = () => {
53-
form.setFieldValue("query", "owner:me")
53+
void form.setFieldValue("query", "owner:me")
5454
void form.submitForm()
5555
handleClose()
5656
}
5757

5858
const setAllWorkspaces = () => {
59-
form.setFieldValue("query", "")
59+
void form.setFieldValue("query", "")
6060
void form.submitForm()
6161
handleClose()
6262
}
@@ -88,7 +88,6 @@ const form = useFormik<FilterFormValues>({
8888
<WorkspacesPageView
8989
loading={workspacesState.hasTag("loading")}
9090
workspaces={workspacesState.context.workspaces}
91-
error={workspacesState.context.getWorkspacesError}
9291
/>
9392
</Margins>
9493
</>

‎site/src/pages/WorkspacesPage/WorkspacesPageView.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export const Language = {
3030
export interface WorkspacesPageViewProps {
3131
loading?: boolean
3232
workspaces?: TypesGen.Workspace[]
33-
error?: unknown
3433
}
3534

3635
export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({ loading, workspaces }) => {

‎site/src/util/workspace.ts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Theme } from "@material-ui/core/styles"
22
import dayjs from "dayjs"
33
import { WorkspaceBuildTransition } from "../api/types"
4-
import { Workspace, WorkspaceAgent, WorkspaceBuild, WorkspaceFilter } from "../api/typesGenerated"
4+
import * as TypeGen from "../api/typesGenerated"
55

66
export type WorkspaceStatus =
77
| "queued"
@@ -29,7 +29,7 @@ const succeededToStatus: Record<WorkspaceBuildTransition, WorkspaceStatus> = {
2929
}
3030

3131
// Converts a workspaces status to a human-readable form.
32-
export const getWorkspaceStatus = (workspaceBuild?: WorkspaceBuild): WorkspaceStatus => {
32+
export const getWorkspaceStatus = (workspaceBuild?: TypeGen.WorkspaceBuild): WorkspaceStatus => {
3333
const transition = workspaceBuild?.transition as WorkspaceBuildTransition
3434
const jobStatus = workspaceBuild?.job.status
3535
switch (jobStatus) {
@@ -66,7 +66,7 @@ export const DisplayStatusLanguage = {
6666

6767
export const getDisplayStatus = (
6868
theme: Theme,
69-
build: WorkspaceBuild,
69+
build: TypeGen.WorkspaceBuild,
7070
): {
7171
color: string
7272
status: string
@@ -132,7 +132,7 @@ export const getDisplayStatus = (
132132
throw new Error("unknown status " + status)
133133
}
134134

135-
export const getWorkspaceBuildDurationInSeconds = (build: WorkspaceBuild): number | undefined => {
135+
export const getWorkspaceBuildDurationInSeconds = (build: TypeGen.WorkspaceBuild): number | undefined => {
136136
const isCompleted = build.job.started_at && build.job.completed_at
137137

138138
if (!isCompleted) {
@@ -144,7 +144,10 @@ export const getWorkspaceBuildDurationInSeconds = (build: WorkspaceBuild): numbe
144144
return completedAt.diff(startedAt, "seconds")
145145
}
146146

147-
export const displayWorkspaceBuildDuration = (build: WorkspaceBuild, inProgressLabel = "In progress"): string => {
147+
export const displayWorkspaceBuildDuration = (
148+
build: TypeGen.WorkspaceBuild,
149+
inProgressLabel = "In progress",
150+
): string => {
148151
const duration = getWorkspaceBuildDurationInSeconds(build)
149152
return duration ? `${duration} seconds` : inProgressLabel
150153
}
@@ -157,7 +160,7 @@ export const DisplayAgentStatusLanguage = {
157160

158161
export const getDisplayAgentStatus = (
159162
theme: Theme,
160-
agent: WorkspaceAgent,
163+
agent: TypeGen.WorkspaceAgent,
161164
): {
162165
color: string
163166
status: string
@@ -186,14 +189,14 @@ export const getDisplayAgentStatus = (
186189
}
187190
}
188191

189-
export const isWorkspaceOn = (workspace: Workspace): boolean => {
192+
export const isWorkspaceOn = (workspace: TypeGen.Workspace): boolean => {
190193
const transition = workspace.latest_build.transition
191194
const status = workspace.latest_build.job.status
192195
return transition === "start" && status === "succeeded"
193196
}
194197

195-
export const workspaceQueryToFilter = (query?: string): WorkspaceFilter => {
196-
const defaultFilter: WorkspaceFilter = {
198+
export const workspaceQueryToFilter = (query?: string): TypeGen.WorkspaceFilter => {
199+
const defaultFilter: TypeGen.WorkspaceFilter = {
197200
Owner: "",
198201
OrganizationID: "",
199202
}

‎site/src/xServices/workspaces/workspacesXService.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export const workspacesMachine = createMachine(
5151
},
5252
onError: {
5353
target: "ready",
54-
actions: "assignGetWorkspacesError",
54+
actions: ["assignGetWorkspacesError", "clearWorkspaces"],
5555
},
5656
},
5757
tags: "loading",
@@ -70,6 +70,7 @@ export const workspacesMachine = createMachine(
7070
getWorkspacesError: (_, event) => event.data,
7171
}),
7272
clearGetWorkspacesError: (context) => assign({ ...context, getWorkspacesError: undefined }),
73+
clearWorkspaces: (context) => assign({ ...context, workspaces: undefined }),
7374
},
7475
services: {
7576
getWorkspaces: (context) => API.getWorkspaces(workspaceQueryToFilter(context.filter)),

0 commit comments

Comments
 (0)