Skip to content

fix: derive running ws stop time from deadline #1920

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 11 commits into from
May 31, 2022
Merged

fix: derive running ws stop time from deadline #1920

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a72b187
refactor: isWorkspaceOn utility
greyscaled May 31, 2022
24ccaee
fix: derive running ws stop time from deadline
greyscaled May 31, 2022
0f72a6d
fixup! fix: derive running ws stop time from deadline
greyscaled May 31, 2022
c5c5f4f
fixup! fix: derive running ws stop time from deadline
greyscaled May 31, 2022
11fe7f2
fixup! fix: derive running ws stop time from deadline
greyscaled May 31, 2022
538bbe8
Merge origin/main
greyscaled May 31, 2022
5e6472d
fixup! Merge origin/main
greyscaled May 31, 2022
d0a9656
fixup! Merge origin/main
greyscaled May 31, 2022
df54df0
Update stories
greyscaled May 31, 2022
f825f2d
Merge origin/main
greyscaled May 31, 2022
6a48ea6
fixup! Merge origin/main
greyscaled May 31, 2022
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
fixup! fix: derive running ws stop time from deadline
  • Loading branch information
@greyscaled
greyscaled committed May 31, 2022
commit 11fe7f2d42eef431ce6c0e7b7528a8df57b00be8
40 changes: 32 additions & 8 deletions site/src/components/Workspace/Workspace.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,49 @@ Starting.args = {
}

export const Stopped = Template.bind({})
Stopped.args = { ...Started.args, workspace: MockStoppedWorkspace }
Stopped.args = {
...Started.args,
workspace: MockStoppedWorkspace,
}

export const Stopping = Template.bind({})
Stopping.args = { ...Started.args, workspace: MockStoppingWorkspace }
Stopping.args = {
...Started.args,
workspace: MockStoppingWorkspace,
}

export const Error = Template.bind({})
Error.args = { ...Started.args, workspace: MockFailedWorkspace }
Error.args = {
...Started.args,
workspace: MockFailedWorkspace,
}

export const Deleting = Template.bind({})
Deleting.args = { ...Started.args, workspace: MockDeletingWorkspace }
Deleting.args = {
...Started.args,
workspace: MockDeletingWorkspace,
}

export const Deleted = Template.bind({})
Deleted.args = { ...Started.args, workspace: MockDeletedWorkspace }
Deleted.args = {
...Started.args,
workspace: MockDeletedWorkspace,
}

export const Canceling = Template.bind({})
Canceling.args = { ...Started.args, workspace: MockCancelingWorkspace }
Canceling.args = {
...Started.args,
workspace: MockCancelingWorkspace,
}

export const Canceled = Template.bind({})
Canceled.args = { ...Started.args, workspace: MockCanceledWorkspace }
Canceled.args = {
...Started.args,
workspace: MockCanceledWorkspace,
}

export const Outdated = Template.bind({})
Outdated.args = { ...Started.args, workspace: MockOutdatedWorkspace }
Outdated.args = {
...Started.args,
workspace: MockOutdatedWorkspace,
}
10 changes: 8 additions & 2 deletions site/src/testHelpers/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,16 @@ export const MockWorkspace: TypesGen.Workspace = {
latest_build: MockWorkspaceBuild,
}

export const MockStoppedWorkspace: TypesGen.Workspace = { ...MockWorkspace, latest_build: MockWorkspaceBuildStop }
export const MockStoppedWorkspace: TypesGen.Workspace = {
...MockWorkspace,
latest_build: MockWorkspaceBuildStop,
}
export const MockStoppingWorkspace: TypesGen.Workspace = {
...MockWorkspace,
latest_build: { ...MockWorkspaceBuildStop, job: MockRunningProvisionerJob },
latest_build: {
...MockWorkspaceBuildStop,
job: MockRunningProvisionerJob,
},
}
export const MockStartingWorkspace: TypesGen.Workspace = {
...MockWorkspace,
Expand Down