fix(site): Don't hide/show errors during requests (#5962)

BrunoQuaresma · web-flow · commit c9f3acabd346 · 2023-02-02T10:38:05.000-03:00
diff --git a/site/src/components/Workspace/Workspace.tsx b/site/src/components/Workspace/Workspace.tsx
@@ -30,6 +30,7 @@ export enum WorkspaceErrors {
   GET_BUILDS_ERROR = "getBuildsError",
   BUILD_ERROR = "buildError",
   CANCELLATION_ERROR = "cancellationError",
+  WORKSPACE_REFRESH_WARNING = "refreshWorkspaceWarning",
 }
 
 export interface WorkspaceProps {
@@ -113,7 +114,7 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
   )
 
   const workspaceRefreshWarning = Boolean(
-    workspaceErrors[WorkspaceErrors.GET_RESOURCES_ERROR],
+    workspaceErrors[WorkspaceErrors.WORKSPACE_REFRESH_WARNING],
   ) && (
     <AlertBanner
       severity="warning"
diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts
@@ -178,13 +178,13 @@ export const workspaceMachine = createMachine(
         tags: "loading",
       },
       gettingWorkspace: {
-        entry: ["clearGetWorkspaceError", "clearContext"],
+        entry: ["clearContext"],
         invoke: {
           src: "getWorkspace",
           id: "getWorkspace",
           onDone: [
             {
-              actions: "assignWorkspace",
+              actions: ["assignWorkspace", "clearGetWorkspaceError"],
               target: "gettingTemplate",
             },
           ],
@@ -198,13 +198,12 @@ export const workspaceMachine = createMachine(
         tags: "loading",
       },
       gettingTemplate: {
-        entry: "clearGetTemplateWarning",
         invoke: {
           src: "getTemplate",
           id: "getTemplate",
           onDone: [
             {
-              actions: "assignTemplate",
+              actions: ["assignTemplate", "clearGetTemplateWarning"],
               target: "gettingTemplateParameters",
             },
           ],
@@ -221,13 +220,15 @@ export const workspaceMachine = createMachine(
         tags: "loading",
       },
       gettingTemplateParameters: {
-        entry: "clearGetTemplateParametersWarning",
         invoke: {
           src: "getTemplateParameters",
           id: "getTemplateParameters",
           onDone: [
             {
-              actions: "assignTemplateParameters",
+              actions: [
+                "assignTemplateParameters",
+                "clearGetTemplateParametersWarning",
+              ],
               target: "gettingPermissions",
             },
           ],
@@ -244,13 +245,12 @@ export const workspaceMachine = createMachine(
         tags: "loading",
       },
       gettingPermissions: {
-        entry: "clearGetPermissionsError",
         invoke: {
           src: "checkPermissions",
           id: "checkPermissions",
           onDone: [
             {
-              actions: "assignPermissions",
+              actions: ["assignPermissions", "clearGetPermissionsError"],
               target: "ready",
             },
           ],
@@ -270,18 +270,18 @@ export const workspaceMachine = createMachine(
             initial: "gettingEvents",
             states: {
               gettingEvents: {
-                entry: [
-                  "clearRefreshWorkspaceWarning",
-                  "initializeEventSource",
-                ],
+                entry: ["initializeEventSource"],
                 exit: "closeEventSource",
                 invoke: {
                   src: "listening",
                   id: "listening",
                 },
                 on: {
                   REFRESH_WORKSPACE: {
-                    actions: ["refreshWorkspace"],
+                    actions: [
+                      "refreshWorkspace",
+                      "clearRefreshWorkspaceWarning",
+                    ],
                   },
                   EVENT_SOURCE_ERROR: {
                     target: "error",
@@ -291,7 +291,7 @@ export const workspaceMachine = createMachine(
               error: {
                 entry: "assignRefreshWorkspaceWarning",
                 after: {
-                  "1000": {
+                  "2000": {
                     target: "gettingEvents",
                   },
                 },
@@ -443,12 +443,11 @@ export const workspaceMachine = createMachine(
             initial: "gettingBuilds",
             states: {
               gettingBuilds: {
-                entry: "clearGetBuildsError",
                 invoke: {
                   src: "getBuilds",
                   onDone: [
                     {
-                      actions: "assignBuilds",
+                      actions: ["assignBuilds", "clearGetBuildsError"],
                       target: "loadedBuilds",
                     },
                   ],

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ export enum WorkspaceErrors {`
`30`	`30`	`GET_BUILDS_ERROR = "getBuildsError",`
`31`	`31`	`BUILD_ERROR = "buildError",`
`32`	`32`	`CANCELLATION_ERROR = "cancellationError",`
	`33`	`+ WORKSPACE_REFRESH_WARNING = "refreshWorkspaceWarning",`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`export interface WorkspaceProps {`
`@@ -113,7 +114,7 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({`
`113`	`114`	`)`
`114`	`115`
`115`	`116`	`const workspaceRefreshWarning = Boolean(`
`116`		`- workspaceErrors[WorkspaceErrors.GET_RESOURCES_ERROR],`
	`117`	`+ workspaceErrors[WorkspaceErrors.WORKSPACE_REFRESH_WARNING],`
`117`	`118`	`) && (`
`118`	`119`	`<AlertBanner`
`119`	`120`	`severity="warning"`