- Notifications
You must be signed in to change notification settings - Fork1.2k
fix!: stop workspace before update#18425
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
17 commits Select commitHold shift + click to select a range
9443453 chore: TestUpdate: remove extraneous cli invocation
johnstcn594d1d7 assert previous build state when updating workspace
johnstcn873794f chore: coderdtest: change argument types to remove unnecessary conver…
johnstcnf73b3f6 cli: stop before starting on update
johnstcn8a48d85 chore: refactor and extract stopWorkspace function
johnstcn123b51f update cli usage doc
johnstcn3d6106f confirm before stop
johnstcnf25c333 Revert "confirm before stop"
johnstcn9bf5141 ui: make update button stop before start
johnstcn8dd13d3 make fmt
johnstcnbe0c176 site: fix some tests
johnstcn1c703ca fixup! site: fix some tests
johnstcnda8bd12 reduce button explosion
johnstcned6399a adjust icons
johnstcn0cf0110 add testid to bulk update button and fix bulk update tests
johnstcnd4529c8 fix e2e race
johnstcncc236ab Merge branch 'main' into cj/prebuild-template-upgrade
johnstcnFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
ui: make update button stop before start
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commit9bf51410ef30af3766687907f7f86f3810a671f9
There are no files selected for viewing
14 changes: 14 additions & 0 deletionssite/src/api/api.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -2237,6 +2237,7 @@ class ApiMethods { | ||
| * - Update the build parameters and check if there are missed parameters for | ||
| * the newest version | ||
| * - If there are missing parameters raise an error | ||
| * - Stop the workspace with the current template version if it is already running | ||
| * - Create a build with the latest version and updated build parameters | ||
| */ | ||
| updateWorkspace = async ( | ||
| @@ -2274,6 +2275,19 @@ class ApiMethods { | ||
| throw new MissingBuildParameters(missingParameters, activeVersionId); | ||
| } | ||
| // Stop the workspace if it is already running. | ||
Member There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. hmm. I'm a bit worried about adding this directly inside the | ||
| if (workspace.latest_build.status === "running") { | ||
| const stopBuild = await this.stopWorkspace(workspace.id); | ||
| const awaitedStopBuild = await this.waitForBuild(stopBuild); | ||
| // If the stop is canceled halfway through, we bail. | ||
| // This is the same behaviour as restartWorkspace. | ||
| if (awaitedStopBuild?.status === "canceled") { | ||
| return Promise.reject( | ||
| new Error("Workspace stop was canceled, not proceeding with update."), | ||
| ); | ||
| } | ||
| } | ||
| return this.postWorkspaceBuild(workspace.id, { | ||
| transition: "start", | ||
| template_version_id: activeVersionId, | ||
19 changes: 11 additions & 8 deletionssite/src/modules/workspaces/actions.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
50 changes: 35 additions & 15 deletionssite/src/pages/WorkspacePage/WorkspaceActions/Buttons.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -21,19 +21,39 @@ export interface ActionButtonProps { | ||
| tooltipText?: string; | ||
| } | ||
| export constUpdateAndStartButton: FC<ActionButtonProps> = ({ | ||
johnstcn marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| handleAction, | ||
| loading, | ||
| }) => { | ||
| return ( | ||
| <Tooltip title="Start workspace with the latest template version."> | ||
| <TopbarButton | ||
| disabled={loading} | ||
| data-testid="workspace-update-button" | ||
| onClick={() => handleAction()} | ||
| > | ||
| <CirclePlayIcon /> | ||
| {loading ? <>Updating…</> : <>Update…</>} | ||
| </TopbarButton> | ||
| </Tooltip> | ||
| ); | ||
| }; | ||
| export const UpdateAndRestartButton: FC<ActionButtonProps> = ({ | ||
| handleAction, | ||
| loading, | ||
| }) => { | ||
| return ( | ||
| <Tooltip title="Stop workspace, if running, and restart it with the latest template version."> | ||
johnstcn marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| <TopbarButton | ||
| disabled={loading} | ||
| data-testid="workspace-update-and-restart-button" | ||
| onClick={() => handleAction()} | ||
| > | ||
| <RotateCcwIcon /> | ||
| {loading ? <>Updating…</> : <>Update and restart…</>} | ||
| </TopbarButton> | ||
| </Tooltip> | ||
| ); | ||
| }; | ||
| @@ -84,9 +104,9 @@ export const StartButton: FC<ActionButtonPropsWithWorkspace> = ({ | ||
| ); | ||
| }; | ||
| export constUpdateAndStartButtonRequireActiveVersion: FC< | ||
johnstcn marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| ActionButtonProps | ||
| > = ({ handleAction}) => { | ||
| return ( | ||
| <Tooltip title="This template requires automatic updates on workspace startup. Contact your administrator if you want to preserve the template version."> | ||
| <TopbarButton onClick={() => handleAction()}> | ||
| @@ -138,9 +158,9 @@ export const RestartButton: FC<ActionButtonPropsWithWorkspace> = ({ | ||
| ); | ||
| }; | ||
| export constUpdateAndRestartButtonRequireActiveVersion: FC< | ||
| ActionButtonProps | ||
| > = ({ handleAction}) => { | ||
| return ( | ||
| <Tooltip title="This template requires automatic updates on workspace startup. Contact your administrator if you want to preserve the template version."> | ||
| <TopbarButton onClick={() => handleAction()}> | ||
12 changes: 9 additions & 3 deletionssite/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.