From 5fd90471fca405cf04ef87122d0e209d7f6585d1 Mon Sep 17 00:00:00 2001 From: Kira Pilot Date: Thu, 22 Sep 2022 13:32:40 -0400 Subject: [PATCH] Cleanup dead states in workspace machine * removed dead build states * removed dead code * removed guards --- .../xServices/workspace/workspaceXService.ts | 55 ------------------- 1 file changed, 55 deletions(-) diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts index 144f128670..0db51aa54f 100644 --- a/site/src/xServices/workspace/workspaceXService.ts +++ b/site/src/xServices/workspace/workspaceXService.ts @@ -32,7 +32,6 @@ export interface WorkspaceContext { // Builds builds?: TypesGen.WorkspaceBuild[] getBuildsError?: Error | unknown - loadMoreBuildsError?: Error | unknown // error creating a new WorkspaceBuild buildError?: Error | unknown cancellationMessage?: Types.Message @@ -53,7 +52,6 @@ export type WorkspaceEvent = | { type: "CANCEL_DELETE" } | { type: "UPDATE" } | { type: "CANCEL" } - | { type: "LOAD_MORE_BUILDS" } | { type: "CHECK_REFRESH_TIMELINE"; data: TypesGen.ServerSentEvent["data"] } | { type: "REFRESH_TIMELINE" } | { type: "EVENT_SOURCE_ERROR"; error: Error | unknown } @@ -118,9 +116,6 @@ export const workspaceMachine = createMachine( getBuilds: { data: TypesGen.WorkspaceBuild[] } - loadMoreBuilds: { - data: TypesGen.WorkspaceBuild[] - } checkPermissions: { data: TypesGen.UserAuthorizationResponse } @@ -396,33 +391,11 @@ export const workspaceMachine = createMachine( states: { idle: { on: { - LOAD_MORE_BUILDS: { - cond: "hasMoreBuilds", - target: "loadingMoreBuilds", - }, REFRESH_TIMELINE: { target: "#workspaceState.ready.timeline.gettingBuilds", }, }, }, - loadingMoreBuilds: { - entry: "clearLoadMoreBuildsError", - invoke: { - src: "loadMoreBuilds", - onDone: [ - { - actions: "assignNewBuilds", - target: "idle", - }, - ], - onError: [ - { - actions: "assignLoadMoreBuildsError", - target: "idle", - }, - ], - }, - }, }, }, }, @@ -530,24 +503,6 @@ export const workspaceMachine = createMachine( clearGetBuildsError: assign({ getBuildsError: (_) => undefined, }), - assignNewBuilds: assign({ - builds: (context, event) => { - const oldBuilds = context.builds - - if (!oldBuilds) { - // This state is theoretically impossible, but helps TS - throw new Error("workspaceXService: failed to load workspace builds") - } - - return [...oldBuilds, ...event.data] - }, - }), - assignLoadMoreBuildsError: assign({ - loadMoreBuildsError: (_, event) => event.data, - }), - clearLoadMoreBuildsError: assign({ - loadMoreBuildsError: (_) => undefined, - }), refreshTimeline: pure((context, event) => { // No need to refresh the timeline if it is not loaded if (!context.builds) { @@ -567,9 +522,6 @@ export const workspaceMachine = createMachine( } }), }, - guards: { - hasMoreBuilds: (_) => false, - }, services: { getWorkspace: async (_, event) => { return await API.getWorkspaceByOwnerAndName(event.username, event.workspaceName, { @@ -651,13 +603,6 @@ export const workspaceMachine = createMachine( throw Error("Cannot get builds without id") } }, - loadMoreBuilds: async (context) => { - if (context.workspace) { - return await API.getWorkspaceBuilds(context.workspace.id) - } else { - throw Error("Cannot load more builds without id") - } - }, checkPermissions: async (context) => { if (context.workspace && context.userId) { return await API.checkUserPermissions(context.userId, {