selfhosted
/
coder
mirror of https://github.com/coder/coder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Bruno Quaresma 2023-02-02 10:38:05 -03:00 committed by GitHub
parent 8ef0306c08
commit c9f3acabd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
site/src/components/Workspace/Workspace.tsx
View File

@ -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"

31
site/src/xServices/workspace/workspaceXService.ts
View File

@ -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,10 +270,7 @@ export const workspaceMachine = createMachine(
initial: "gettingEvents",
states: {
gettingEvents: {
entry: [
"clearRefreshWorkspaceWarning",
"initializeEventSource",
],
entry: ["initializeEventSource"],
exit: "closeEventSource",
invoke: {
src: "listening",
@ -281,7 +278,10 @@ export const workspaceMachine = createMachine(
},
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",
},
],