Skip to content

fix: display explicit 'retry' button(s) when a workspace fails #10720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Nov 22, 2023
Merged

fix: display explicit 'retry' button(s) when a workspace fails #10720

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c28f1d8
refactor: remove workspace error enums
Parkreiner Nov 15, 2023
c249a40
refactor: improve co-location for serverVersion
Parkreiner Nov 15, 2023
718972f
fix: add in retry button for failed workspaces
Parkreiner Nov 15, 2023
6005cec
fix: make handleBuildRetry auto-detect debug permissions
Parkreiner Nov 15, 2023
0f91d44
chore: consolidate retry messaging
Parkreiner Nov 15, 2023
d635ecd
docs: clean up formatting for WorkspacePage.test comments
Parkreiner Nov 15, 2023
404e4c7
chore: update renderWorkspacePage to accept parameters
Parkreiner Nov 15, 2023
edecd14
fix: restore granularity to retry operations (debug vs normal)
Parkreiner Nov 16, 2023
b1f6660
chore: make workspace helpers take explicit workspace parameter
Parkreiner Nov 16, 2023
c3edba7
refactor: update how parameters for tests are defined
Parkreiner Nov 16, 2023
2c55fd8
wip: add tests for workspace retries (breaks 2 previous tests
Parkreiner Nov 16, 2023
8d7fe73
fix: update old tests to be correctly parameterized
Parkreiner Nov 17, 2023
91ce668
fix: make sure file formatting goes through
Parkreiner Nov 17, 2023
44f86d5
merge main
Parkreiner Nov 22, 2023
abc3ae6
fix: update variable name for clarity
Parkreiner Nov 22, 2023
fa64932
fix: add export for runtime buttonTypes array
Parkreiner Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: consolidate retry messaging
  • Loading branch information
@Parkreiner
Parkreiner committed Nov 15, 2023
commit 0f91d44eb4619ca3995063d05294eeefa800b093
1 change: 0 additions & 1 deletion site/src/pages/WorkspacePage/Workspace.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ export const FailedWithRetry: Story = {
},
},
},
canRetryDebugMode: true,
buildLogs: <WorkspaceBuildLogsSection logs={makeFailedBuildLogs()} />,
},
};
Expand Down
14 changes: 3 additions & 11 deletions site/src/pages/WorkspacePage/Workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ export interface WorkspaceProps {
resources?: TypesGen.WorkspaceResource[];
canUpdateWorkspace: boolean;
updateMessage?: string;
canRetryDebugMode: boolean;
canChangeVersions: boolean;
hideSSHButton?: boolean;
hideVSCodeDesktopButton?: boolean;
Expand Down Expand Up @@ -97,7 +96,6 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
builds,
canUpdateWorkspace,
updateMessage,
canRetryDebugMode,
canChangeVersions,
workspaceErrors,
hideSSHButton,
Expand Down Expand Up @@ -307,15 +305,9 @@ export const Workspace: FC<React.PropsWithChildren<WorkspaceProps>> = ({
<Alert
severity="error"
actions={
canRetryDebugMode && (
<Button
onClick={handleBuildRetry}
variant="text"
size="small"
>
Try in debug mode
</Button>
)
<Button onClick={handleBuildRetry} variant="text" size="small">
Retry
</Button>
}
>
<AlertTitle>Workspace build failed</AlertTitle>
Expand Down
1 change: 0 additions & 1 deletion site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@ export const WorkspaceReadyPage = ({
hasMoreBuilds={hasMoreBuilds}
canUpdateWorkspace={canUpdateWorkspace}
updateMessage={latestVersion?.message}
canRetryDebugMode={canRetryDebugMode}
canChangeVersions={canChangeVersions}
hideSSHButton={featureVisibility["browser_only"]}
hideVSCodeDesktopButton={featureVisibility["browser_only"]}
Expand Down