Skip to content
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

NickAkhmetov/HMP-503-HOTFIX Fix workspace launch form lock #3341

Merged
merged 8 commits into from
Nov 21, 2023
Merged

NickAkhmetov/HMP-503-HOTFIX Fix workspace launch form lock #3341

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
45f03c0
Hotfix workspace launch form lock
NickAkhmetov Nov 21, 2023
2d11ef4
Update file path location lookups
NickAkhmetov Nov 21, 2023
d521090
Fix incorrect workspace types/path logic which was causing launch fai…
NickAkhmetov Nov 21, 2023
d08f3e4
update changelog
NickAkhmetov Nov 21, 2023
d4fd2df
adjust `getNotebookPath` to check both `current workspace details` an…
NickAkhmetov Nov 21, 2023
861e677
NickAkhmetov/HMP-515 Always display `Launch Workspace` button (#3342)
NickAkhmetov Nov 21, 2023
4faeb8a
add specs to handle request_workspace_details
NickAkhmetov Nov 21, 2023
5d474d9
Ensure there is always a leading `/` in workspace notebook paths
NickAkhmetov Nov 21, 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
2 changes: 2 additions & 0 deletions CHANGELOG-workspace-launch-form-fix.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Fix bug with workspace creation locking after unsuccessful submit.
- Fix errors launching workspace when another workspace is running.
6 changes: 3 additions & 3 deletions context/app/static/js/components/workspaces/NewWorkspaceDialog/useCreateWorkspaceForm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function useCreateWorkspaceForm({ defaultName }: UseCreateWorkspaceTypes) {
handleSubmit,
control,
reset,
formState: { errors, isSubmitting, isSubmitted },
formState: { errors, isSubmitting, isSubmitSuccessful },
} = useForm({
defaultValues: {
'workspace-name': defaultName ?? '',
Expand All @@ -68,7 +68,7 @@ function useCreateWorkspaceForm({ defaultName }: UseCreateWorkspaceTypes) {
}

async function onSubmit({ templateKeys, uuids, workspaceName }: CreateTemplateNotebooksTypes) {
if (isSubmitting || isSubmitted) return;
if (isSubmitting || isSubmitSuccessful) return;
await createTemplateNotebooks({ templateKeys, uuids, workspaceName });
reset();
handleClose();
Expand All @@ -82,7 +82,7 @@ function useCreateWorkspaceForm({ defaultName }: UseCreateWorkspaceTypes) {
control,
errors,
onSubmit,
isSubmitting: isSubmitting || isSubmitted,
isSubmitting: isSubmitting || isSubmitSuccessful,
};
}

Expand Down
2 changes: 1 addition & 1 deletion context/app/static/js/components/workspaces/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export interface Workspace {
disk_space: number;
datetime_created: string;
workspace_details: WorkspaceDetails;
path: string;
}

interface WorkspaceJobDetail {
Expand Down Expand Up @@ -69,6 +68,7 @@ export interface WorkspaceJobWithDisplayStatus extends Omit<WorkspaceJob, 'statu

export interface MergedWorkspace extends Workspace {
jobs: WorkspaceJob[];
path: string;
}

interface WorkspaceAPIFailure {
Expand Down
3 changes: 2 additions & 1 deletion context/app/static/js/components/workspaces/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ async function locationIfJobRunning({
}

function getWorkspaceStartLink(workspace: Workspace, templatePath?: string) {
return `/workspaces/start/${workspace.id}?notebook_path=${encodeURIComponent(templatePath ?? workspace.path)}`;
const path = getNotebookPath(workspace);
return `/workspaces/start/${workspace.id}?notebook_path=${encodeURIComponent(templatePath ?? path)}`;
}

function getWorkspaceLink(workspace: Workspace) {
Expand Down
Loading