[arvados-workbench2] updated: 2.5.0-9-g33a742eb
git repository hosting
git at public.arvados.org
Mon Jan 23 23:16:01 UTC 2023
Summary of changes:
src/models/container-request.ts | 2 +
src/store/processes/process-copy-actions.ts | 47 ++++++++++++++++++++--
src/store/processes/processes-actions.ts | 2 +-
.../subprocess-panel-middleware-service.ts | 21 +++++-----
.../projects-tree-picker/tree-picker-field.tsx | 4 +-
5 files changed, 60 insertions(+), 16 deletions(-)
via 33a742eb6cc4c7a7f3c21e9fd91618a6012f68eb (commit)
via 4fe775d9c7be35da39f86528296954518fca760e (commit)
via d8ca0a7e17696ed74b3da26323ef88254783c20c (commit)
via b6ade0ccdd981765e52b6bcd66a52cc228525fd0 (commit)
from b114600c55e53b4c16f091edbabdb2ebeba0f032 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 33a742eb6cc4c7a7f3c21e9fd91618a6012f68eb
Author: Stephen Smith <stephen at curii.com>
Date: Mon Jan 23 18:03:55 2023 -0500
15557: Correct list of copied process properties, set priority to 500 when copying.
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/models/container-request.ts b/src/models/container-request.ts
index e6e12da8..aa5e0f79 100644
--- a/src/models/container-request.ts
+++ b/src/models/container-request.ts
@@ -33,6 +33,8 @@ export interface ContainerRequestResource
name: string;
outputName: string;
outputPath: string;
+ outputProperties: any;
+ outputStorageClasses: string[];
outputTtl: number;
outputUuid: string | null;
priority: number | null;
diff --git a/src/store/processes/process-copy-actions.ts b/src/store/processes/process-copy-actions.ts
index 4dc90be4..caabdca7 100644
--- a/src/store/processes/process-copy-actions.ts
+++ b/src/store/processes/process-copy-actions.ts
@@ -12,6 +12,7 @@ import { CopyFormDialogData } from 'store/copy-dialog/copy-dialog';
import { getProcess } from 'store/processes/process';
import {snackbarActions, SnackbarKind} from 'store/snackbar/snackbar-actions';
import { initProjectsTreePicker } from 'store/tree-picker/tree-picker-actions';
+import { ContainerRequestState } from "models/container-request";
export const PROCESS_COPY_FORM_NAME = 'processCopyFormName';
@@ -39,17 +40,16 @@ export const copyProcess = (resource: CopyFormDialogData) =>
containerCountMax,
containerImage,
cwd,
+ description,
environment,
- expiresAt,
- filters,
kind,
mounts,
outputName,
outputPath,
+ outputProperties,
+ outputStorageClasses,
outputTtl,
- priority,
properties,
- requestingContainerUuid,
runtimeConstraints,
schedulingParameters,
useExisting,
@@ -59,21 +59,22 @@ export const copyProcess = (resource: CopyFormDialogData) =>
containerCountMax,
containerImage,
cwd,
+ description,
environment,
- expiresAt,
- filters,
kind,
mounts,
name: resource.name,
outputName,
outputPath,
+ outputProperties,
+ outputStorageClasses,
outputTtl,
ownerUuid: resource.ownerUuid,
- priority,
+ priority: 500,
properties,
- requestingContainerUuid,
runtimeConstraints,
schedulingParameters,
+ state: ContainerRequestState.UNCOMMITTED,
useExisting,
});
dispatch(dialogActions.CLOSE_DIALOG({ id: PROCESS_COPY_FORM_NAME }));
diff --git a/src/store/processes/processes-actions.ts b/src/store/processes/processes-actions.ts
index b28b943e..517e6451 100644
--- a/src/store/processes/processes-actions.ts
+++ b/src/store/processes/processes-actions.ts
@@ -108,7 +108,7 @@ export const cancelRunningWorkflow = (uuid: string) =>
export const startWorkflow = (uuid: string) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
try {
- const process = await services.containerRequestService.update(uuid, { priority: 1, state: ContainerRequestState.COMMITTED });
+ const process = await services.containerRequestService.update(uuid, { state: ContainerRequestState.COMMITTED });
if (process) {
dispatch<any>(updateResources([process]));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Process started', hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
commit 4fe775d9c7be35da39f86528296954518fca760e
Author: Stephen Smith <stephen at curii.com>
Date: Mon Jan 23 17:57:10 2023 -0500
15557: Increase tree picker default height for dialog
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/views-components/projects-tree-picker/tree-picker-field.tsx b/src/views-components/projects-tree-picker/tree-picker-field.tsx
index 357058c5..2afa606e 100644
--- a/src/views-components/projects-tree-picker/tree-picker-field.tsx
+++ b/src/views-components/projects-tree-picker/tree-picker-field.tsx
@@ -12,7 +12,7 @@ import { PickerIdProp } from 'store/tree-picker/picker-id';
export const ProjectTreePickerField = (props: WrappedFieldProps & PickerIdProp) =>
<div style={{ display: 'flex', minHeight: 0, flexDirection: 'column' }}>
- <div style={{ flexBasis: '200px', flexShrink: 1, minHeight: 0, display: 'flex', flexDirection: 'column' }}>
+ <div style={{ flexBasis: '275px', flexShrink: 1, minHeight: 0, display: 'flex', flexDirection: 'column' }}>
<ProjectsTreePicker
pickerId={props.pickerId}
toggleItemActive={handleChange(props)}
@@ -30,7 +30,7 @@ const handleChange = (props: WrappedFieldProps) =>
export const CollectionTreePickerField = (props: WrappedFieldProps & PickerIdProp) =>
<div style={{ display: 'flex', minHeight: 0, flexDirection: 'column' }}>
- <div style={{ flexBasis: '200px', flexShrink: 1, minHeight: 0, display: 'flex', flexDirection: 'column' }}>
+ <div style={{ flexBasis: '275px', flexShrink: 1, minHeight: 0, display: 'flex', flexDirection: 'column' }}>
<ProjectsTreePicker
pickerId={props.pickerId}
toggleItemActive={handleChange(props)}
commit d8ca0a7e17696ed74b3da26323ef88254783c20c
Author: Stephen Smith <stephen at curii.com>
Date: Mon Jan 23 16:18:49 2023 -0500
15557: Sort copied process fields
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/store/processes/process-copy-actions.ts b/src/store/processes/process-copy-actions.ts
index 57e85397..4dc90be4 100644
--- a/src/store/processes/process-copy-actions.ts
+++ b/src/store/processes/process-copy-actions.ts
@@ -34,12 +34,52 @@ export const copyProcess = (resource: CopyFormDialogData) =>
dispatch(startSubmit(PROCESS_COPY_FORM_NAME));
try {
const process = await services.containerRequestService.get(resource.uuid);
- const { kind, containerImage, outputPath, outputName, containerCountMax, command, properties, requestingContainerUuid, mounts, runtimeConstraints, schedulingParameters, environment, cwd, outputTtl, priority, expiresAt, useExisting, filters } = process;
- await services.containerRequestService.create({ command, containerImage, outputPath, ownerUuid: resource.ownerUuid, name: resource.name, kind, outputName, containerCountMax, properties, requestingContainerUuid, mounts, runtimeConstraints, schedulingParameters, environment, cwd, outputTtl, priority, expiresAt, useExisting, filters });
+ const {
+ command,
+ containerCountMax,
+ containerImage,
+ cwd,
+ environment,
+ expiresAt,
+ filters,
+ kind,
+ mounts,
+ outputName,
+ outputPath,
+ outputTtl,
+ priority,
+ properties,
+ requestingContainerUuid,
+ runtimeConstraints,
+ schedulingParameters,
+ useExisting,
+ } = process;
+ await services.containerRequestService.create({
+ command,
+ containerCountMax,
+ containerImage,
+ cwd,
+ environment,
+ expiresAt,
+ filters,
+ kind,
+ mounts,
+ name: resource.name,
+ outputName,
+ outputPath,
+ outputTtl,
+ ownerUuid: resource.ownerUuid,
+ priority,
+ properties,
+ requestingContainerUuid,
+ runtimeConstraints,
+ schedulingParameters,
+ useExisting,
+ });
dispatch(dialogActions.CLOSE_DIALOG({ id: PROCESS_COPY_FORM_NAME }));
return process;
} catch (e) {
dispatch(dialogActions.CLOSE_DIALOG({ id: PROCESS_COPY_FORM_NAME }));
throw new Error('Could not copy the process.');
}
- };
\ No newline at end of file
+ };
commit b6ade0ccdd981765e52b6bcd66a52cc228525fd0
Author: Stephen Smith <stephen at curii.com>
Date: Mon Jan 23 14:16:35 2023 -0500
15557: Fix extraneous subprocesses on draft process subprocess panel
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/store/subprocess-panel/subprocess-panel-middleware-service.ts b/src/store/subprocess-panel/subprocess-panel-middleware-service.ts
index 0f306ac0..c6223627 100644
--- a/src/store/subprocess-panel/subprocess-panel-middleware-service.ts
+++ b/src/store/subprocess-panel/subprocess-panel-middleware-service.ts
@@ -39,17 +39,18 @@ export class SubprocessMiddlewareService extends DataExplorerMiddlewareService {
try {
api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
const parentContainerRequest = await this.services.containerRequestService.get(parentContainerRequestUuid);
- const containerRequests = await this.services.containerRequestService.list(
- {
- ...getParams(dataExplorer, parentContainerRequest) ,
- select: containerRequestFieldsNoMounts
- });
-
+ if (parentContainerRequest.containerUuid) {
+ const containerRequests = await this.services.containerRequestService.list(
+ {
+ ...getParams(dataExplorer, parentContainerRequest) ,
+ select: containerRequestFieldsNoMounts
+ });
+ api.dispatch(updateResources(containerRequests.items));
+ await api.dispatch<any>(loadMissingProcessesInformation(containerRequests.items));
+ // Populate the actual user view
+ api.dispatch(setItems(containerRequests));
+ }
api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
- api.dispatch(updateResources(containerRequests.items));
- await api.dispatch<any>(loadMissingProcessesInformation(containerRequests.items));
- // Populate the actual user view
- api.dispatch(setItems(containerRequests));
} catch {
api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
api.dispatch(couldNotFetchSubprocesses());
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list