15557: Correct list of copied process properties, set priority to 500 when copying.

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>

diff --git a/src/models/container-request.ts b/src/models/container-request.ts
index e6e12da841ce06178df785bfce0e7b5a7db029a1..aa5e0f799934a935c2266c00f9882cfa4a3b5cad 100644 (file)
--- 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 4dc90be4a6186e87f23a7cb9f41f95f0ab17902d..caabdca70c943ce422575cd94fd30bcdf6bdd623 100644 (file)
--- 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 b28b943ef11fd50dae440a1762578caf773eff82..517e6451c8607787fe20e0e778cd147fe99955b0 100644 (file)
--- 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 }));