Nov 14, 2023 · Nov 9, 2023 · Nov 9, 2023 · Nov 9, 2023 · Nov 9, 2023 · Nov 9, 2023
diff --git a/site/src/api/queries/workspaceBuilds.ts b/site/src/api/queries/workspaceBuilds.ts
  };
 };

 export const workspaceBuildsKey = (workspaceId: string) => [
  "workspaceBuilds",
  workspaceId,
 ];

 export const infiniteWorkspaceBuilds = (
  workspaceId: string,
  req?: WorkspaceBuildsRequest,
 ): UseInfiniteQueryOptions<WorkspaceBuild[]> => {
  const limit = req?.limit ?? 25;

  return {
    queryKey: ["workspaceBuilds",workspaceId, req],
    queryKey: [...workspaceBuildsKey(workspaceId), req],
    getNextPageParam: (lastPage, pages) => {
      if (lastPage.length < limit) {
        return undefined;
diff --git a/site/src/api/queries/workspaces.ts b/site/src/api/queries/workspaces.ts
  type WorkspacesRequest,
  WorkspaceBuild,
 } from "api/typesGenerated";
 import { workspaceBuildsKey } from "./workspaceBuilds";

 export const workspaceByOwnerAndNameKey = (owner: string, name: string) => [
  "workspace",
    }) => {
      return API.changeWorkspaceVersion(workspace, versionId, buildParameters);
    },
    onSuccess: (build: WorkspaceBuild) => {
      updateWorkspaceBuild(build, queryClient);
    onSuccess:async(build: WorkspaceBuild) => {
 awaitupdateWorkspaceBuild(build, queryClient);
    },
  };
 };
    mutationFn: (buildParameters?: WorkspaceBuildParameter[]) => {
      return API.updateWorkspace(workspace, buildParameters);
    },
    onSuccess: (build: WorkspaceBuild) => {
      updateWorkspaceBuild(build, queryClient);
    onSuccess:async(build: WorkspaceBuild) => {
 awaitupdateWorkspaceBuild(build, queryClient);
    },
  };
 };
    mutationFn: () => {
      return API.deleteWorkspace(workspace.id);
    },
    onSuccess: (build: WorkspaceBuild) => {
      updateWorkspaceBuild(build, queryClient);
    onSuccess:async(build: WorkspaceBuild) => {
 awaitupdateWorkspaceBuild(build, queryClient);
    },
  };
 };
  };
 };

 const updateWorkspaceBuild = (
 const updateWorkspaceBuild =async(
  build: WorkspaceBuild,
  queryClient: QueryClient,
 ) => {
    ...previousData,
    latest_build: build,
  });
  await queryClient.invalidateQueries({
    queryKey: workspaceBuildsKey(build.workspace_id),
  });
 };
diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx
      workspaceName,
      username,
    },
    actions: {
      refreshBuilds: async () => {
        await buildsQuery.refetch();
      },
    },
  });

  const workspaceQueryOptions = workspaceByOwnerAndName(
diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts
  | { type: "START"; buildParameters?: TypesGen.WorkspaceBuildParameter[] }
  | { type: "STOP" }
  | { type: "CANCEL" }
  | {
      type: "REFRESH_TIMELINE";
    }
  | { type: "RETRY_BUILD" };

 export const workspaceMachine = createMachine(
    states: {
      ready: {
        type: "parallel",
        on: {
          REFRESH_TIMELINE: {
            actions: ["refreshBuilds"],
          },
        },
        states: {
          build: {
            initial: "idle",
      },
    },
    services: {
      startWorkspace: (context, data) => async (send) => {
      startWorkspace: (context, data) => async () => {
        if (context.workspace) {
          const startWorkspacePromise = await API.startWorkspace(
            context.workspace.id,
            context.workspace.latest_build.template_version_id,
            context.createBuildLogLevel,
            "buildParameters" in data ? data.buildParameters : undefined,
          );
          send({ type: "REFRESH_TIMELINE" });

          return startWorkspacePromise;
        } else {
          throw Error("Cannot start workspace without workspace id");
        }
      },
      stopWorkspace: (context) => async (send) => {
      stopWorkspace: (context) => async () => {
        if (context.workspace) {
          const stopWorkspacePromise = await API.stopWorkspace(
            context.workspace.id,
            context.createBuildLogLevel,
          );
          send({ type: "REFRESH_TIMELINE" });

          return stopWorkspacePromise;
        } else {
          throw Error("Cannot stop workspace without workspace id");
        }
      },
      cancelWorkspace: (context) => async (send) => {
      cancelWorkspace: (context) => async () => {
        if (context.workspace) {
          const cancelWorkspacePromise = await API.cancelWorkspaceBuild(
            context.workspace.latest_build.id,
          );
          send({ type: "REFRESH_TIMELINE" });

          return cancelWorkspacePromise;
        } else {
          throw Error("Cannot cancel workspace without build id");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,14 +29,19 @@ export const workspaceBuildByNumber = (
		};
		};

		export const workspaceBuildsKey = (workspaceId: string) => [
		"workspaceBuilds",
		workspaceId,
		];

		export const infiniteWorkspaceBuilds = (
		workspaceId: string,
		req?: WorkspaceBuildsRequest,
		): UseInfiniteQueryOptions<WorkspaceBuild[]> => {
		const limit = req?.limit ?? 25;

		return {
		queryKey: ["workspaceBuilds",workspaceId, req],
		queryKey: [...workspaceBuildsKey(workspaceId), req],
		getNextPageParam: (lastPage, pages) => {
		if (lastPage.length < limit) {
		return undefined;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,6 +11,7 @@ import {
		type WorkspacesRequest,
		WorkspaceBuild,
		} from "api/typesGenerated";
		import { workspaceBuildsKey } from "./workspaceBuilds";

		export const workspaceByOwnerAndNameKey = (owner: string, name: string) => [
		"workspace",
Expand DownExpand Up		@@ -138,8 +139,8 @@ export const changeVersion = (
		}) => {
		return API.changeWorkspaceVersion(workspace, versionId, buildParameters);
		},
		onSuccess: (build: WorkspaceBuild) => {
		updateWorkspaceBuild(build, queryClient);
		onSuccess:async(build: WorkspaceBuild) => {
		awaitupdateWorkspaceBuild(build, queryClient);
		},
		};
		};
Expand All		@@ -149,8 +150,8 @@ export const update = (workspace: Workspace, queryClient: QueryClient) => {
		mutationFn: (buildParameters?: WorkspaceBuildParameter[]) => {
		return API.updateWorkspace(workspace, buildParameters);
		},
		onSuccess: (build: WorkspaceBuild) => {
		updateWorkspaceBuild(build, queryClient);
		onSuccess:async(build: WorkspaceBuild) => {
		awaitupdateWorkspaceBuild(build, queryClient);
		},
		};
		};
Expand All		@@ -163,8 +164,8 @@ export const deleteWorkspace = (
		mutationFn: () => {
		return API.deleteWorkspace(workspace.id);
		},
		onSuccess: (build: WorkspaceBuild) => {
		updateWorkspaceBuild(build, queryClient);
		onSuccess:async(build: WorkspaceBuild) => {
		awaitupdateWorkspaceBuild(build, queryClient);
		},
		};
		};
Expand All		@@ -183,7 +184,7 @@ export const activate = (workspace: Workspace, queryClient: QueryClient) => {
		};
		};

		const updateWorkspaceBuild = (
		const updateWorkspaceBuild =async(
		build: WorkspaceBuild,
		queryClient: QueryClient,
		) => {
Expand All		@@ -196,4 +197,7 @@ const updateWorkspaceBuild = (
		...previousData,
		latest_build: build,
		});
		await queryClient.invalidateQueries({
		queryKey: workspaceBuildsKey(build.workspace_id),
		});
		};
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,11 +31,6 @@ export const WorkspacePage: FC = () => {
		workspaceName,
		username,
		},
		actions: {
		refreshBuilds: async () => {
		await buildsQuery.refetch();
		},
		},
		});

		const workspaceQueryOptions = workspaceByOwnerAndName(
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,9 +33,6 @@ export type WorkspaceEvent =
		\| { type: "START"; buildParameters?: TypesGen.WorkspaceBuildParameter[] }
		\| { type: "STOP" }
		\| { type: "CANCEL" }
		\| {
		type: "REFRESH_TIMELINE";
		}
		\| { type: "RETRY_BUILD" };

		export const workspaceMachine = createMachine(
Expand DownExpand Up		@@ -65,11 +62,6 @@ export const workspaceMachine = createMachine(
		states: {
		ready: {
		type: "parallel",
		on: {
		REFRESH_TIMELINE: {
		actions: ["refreshBuilds"],
		},
		},
		states: {
		build: {
		initial: "idle",
Expand DownExpand Up		@@ -204,38 +196,38 @@ export const workspaceMachine = createMachine(
		},
		},
		services: {
		startWorkspace: (context, data) => async (send) => {
		startWorkspace: (context, data) => async () => {
		if (context.workspace) {
		const startWorkspacePromise = await API.startWorkspace(
		context.workspace.id,
		context.workspace.latest_build.template_version_id,
		context.createBuildLogLevel,
		"buildParameters" in data ? data.buildParameters : undefined,
		);
		send({ type: "REFRESH_TIMELINE" });

		return startWorkspacePromise;
		} else {
		throw Error("Cannot start workspace without workspace id");
		}
		},
		stopWorkspace: (context) => async (send) => {
		stopWorkspace: (context) => async () => {
		if (context.workspace) {
		const stopWorkspacePromise = await API.stopWorkspace(
		context.workspace.id,
		context.createBuildLogLevel,
		);
		send({ type: "REFRESH_TIMELINE" });

		return stopWorkspacePromise;
		} else {
		throw Error("Cannot stop workspace without workspace id");
		}
		},
		cancelWorkspace: (context) => async (send) => {
		cancelWorkspace: (context) => async () => {
		if (context.workspace) {
		const cancelWorkspacePromise = await API.cancelWorkspaceBuild(
		context.workspace.latest_build.id,
		);
		send({ type: "REFRESH_TIMELINE" });

		return cancelWorkspacePromise;
		} else {
		throw Error("Cannot cancel workspace without build id");
Expand Down