From 33a742eb6cc4c7a7f3c21e9fd91618a6012f68eb Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Mon, 23 Jan 2023 18:03:55 -0500 Subject: [PATCH] 15557: Correct list of copied process properties, set priority to 500 when copying. Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- src/models/container-request.ts | 2 ++ src/store/processes/process-copy-actions.ts | 17 +++++++++-------- src/store/processes/processes-actions.ts | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) 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(updateResources([process])); dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Process started', hideDuration: 2000, kind: SnackbarKind.SUCCESS })); -- 2.30.2