From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Tue, 11 Dec 2018 08:41:31 +0000 (+0100)
Subject: Merge branch '14581-it-is-impossible-to-edit-process-description-after-creating-it'
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/00e249f6a7b5e9da3a4b39bfc9d88ec96e928ec0?hp=fbeaaaf7f54590fc6fd02b990ee8e4fe1be41817

Merge branch '14581-it-is-impossible-to-edit-process-description-after-creating-it'

refs #14581

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
---

diff --git a/src/store/processes/process-update-actions.ts b/src/store/processes/process-update-actions.ts
index 372e18829d..1d6d95bb80 100644
--- a/src/store/processes/process-update-actions.ts
+++ b/src/store/processes/process-update-actions.ts
@@ -15,6 +15,7 @@ import { snackbarActions } from '~/store/snackbar/snackbar-actions';
 export interface ProcessUpdateFormDialogData {
     uuid: string;
     name: string;
+    description?: string;
 }
 
 export const PROCESS_UPDATE_FORM_NAME = 'processUpdateFormName';
@@ -34,7 +35,7 @@ export const updateProcess = (resource: ProcessUpdateFormDialogData) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(startSubmit(PROCESS_UPDATE_FORM_NAME));
         try {
-            const updatedProcess = await services.containerRequestService.update(resource.uuid, { name: resource.name });
+            const updatedProcess = await services.containerRequestService.update(resource.uuid, { name: resource.name, description: resource.description });
             dispatch(projectPanelActions.REQUEST_ITEMS());
             dispatch(dialogActions.CLOSE_DIALOG({ id: PROCESS_UPDATE_FORM_NAME }));
             return updatedProcess;
diff --git a/src/validators/validators.tsx b/src/validators/validators.tsx
index 30fa36bfeb..9bc76419ff 100644
--- a/src/validators/validators.tsx
+++ b/src/validators/validators.tsx
@@ -21,6 +21,7 @@ export const COPY_FILE_VALIDATION = [require];
 export const MOVE_TO_VALIDATION = [require];
 
 export const PROCESS_NAME_VALIDATION = [require, maxLength(255)];
+export const PROCESS_DESCRIPTION_VALIDATION = [maxLength(255)];
 
 export const REPOSITORY_NAME_VALIDATION = [require, maxLength(255)];
 
diff --git a/src/views-components/dialog-update/dialog-process-update.tsx b/src/views-components/dialog-update/dialog-process-update.tsx
index d5bbce69e7..8880330c78 100644
--- a/src/views-components/dialog-update/dialog-process-update.tsx
+++ b/src/views-components/dialog-update/dialog-process-update.tsx
@@ -7,7 +7,7 @@ import { InjectedFormProps } from 'redux-form';
 import { WithDialogProps } from '~/store/dialog/with-dialog';
 import { ProcessUpdateFormDialogData } from '~/store/processes/process-update-actions';
 import { FormDialog } from '~/components/form-dialog/form-dialog';
-import { ProcessNameField } from '~/views-components/form-fields/process-form-fields';
+import { ProcessNameField, ProcessDescriptionField } from '~/views-components/form-fields/process-form-fields';
 
 type DialogProcessProps = WithDialogProps<{}> & InjectedFormProps<ProcessUpdateFormDialogData>;
 
@@ -21,4 +21,5 @@ export const DialogProcessUpdate = (props: DialogProcessProps) =>
 
 const ProcessEditFields = () => <span>
     <ProcessNameField />
+    <ProcessDescriptionField />
 </span>;
diff --git a/src/views-components/form-fields/process-form-fields.tsx b/src/views-components/form-fields/process-form-fields.tsx
index 8f55e08456..bdae05315d 100644
--- a/src/views-components/form-fields/process-form-fields.tsx
+++ b/src/views-components/form-fields/process-form-fields.tsx
@@ -5,7 +5,7 @@
 import * as React from "react";
 import { Field } from "redux-form";
 import { TextField } from "~/components/text-field/text-field";
-import { PROCESS_NAME_VALIDATION } from "~/validators/validators";
+import { PROCESS_NAME_VALIDATION, PROCESS_DESCRIPTION_VALIDATION } from "~/validators/validators";
 
 export const ProcessNameField = () =>
     <Field
@@ -13,3 +13,10 @@ export const ProcessNameField = () =>
         component={TextField}
         validate={PROCESS_NAME_VALIDATION}
         label="Process Name" />;
+
+export const ProcessDescriptionField = () =>
+    <Field
+        name='description'
+        component={TextField}
+        validate={PROCESS_DESCRIPTION_VALIDATION}
+        label="Process Description" />;