[ARVADOS-WORKBENCH2] updated: 1.2.0-850-g3385e02

[Git user]

Summary of changes:
 src/store/collections/collection-create-actions.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

       via  3385e026886b5ad3dd7b20675a1ad79f8a3b4947 (commit)
      from  8c5e0acf680bb7f3527be8f474160c5f431fe581 (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 3385e026886b5ad3dd7b20675a1ad79f8a3b4947
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Tue Nov 13 15:40:57 2018 +0100

    cr change
    
    Feature #14466
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>

diff --git a/src/store/collections/collection-create-actions.ts b/src/store/collections/collection-create-actions.ts
index 707e080..f437568 100644
--- a/src/store/collections/collection-create-actions.ts
+++ b/src/store/collections/collection-create-actions.ts
@@ -13,6 +13,7 @@ import { fileUploaderActions } from '~/store/file-uploader/file-uploader-actions
 import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions";
 import { isItemNotInProject, isProjectOrRunProcessRoute } from '~/store/projects/project-create-actions';
 import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
+import { CollectionResource } from "~/models/collection";
 
 export interface CollectionCreateFormDialogData {
     ownerUuid: string;
@@ -39,9 +40,10 @@ export const openCollectionCreateDialog = (ownerUuid: string) =>
 export const createCollection = (data: CollectionCreateFormDialogData) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(startSubmit(COLLECTION_CREATE_FORM_NAME));
-        const newCollection = await services.collectionService.create(data);
-        try {            
-            dispatch(progressIndicatorActions.START_WORKING(COLLECTION_CREATE_FORM_NAME));    
+        let newCollection: CollectionResource | null = null;
+        try {
+            dispatch(progressIndicatorActions.START_WORKING(COLLECTION_CREATE_FORM_NAME));
+            newCollection = await services.collectionService.create(data);
             await dispatch<any>(uploadCollectionFiles(newCollection.uuid));
             dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_CREATE_FORM_NAME }));
             dispatch(reset(COLLECTION_CREATE_FORM_NAME));
@@ -58,11 +60,10 @@ export const createCollection = (data: CollectionCreateFormDialogData) =>
                     message: 'Collection has not been created.',
                     hideDuration: 2000,
                     kind: SnackbarKind.ERROR
-                }));       
-            await services.collectionService.delete(newCollection.uuid);
+                }));
+                await services.collectionService.delete(newCollection!.uuid);
             }
             dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_CREATE_FORM_NAME));
             return;
         }
     };
-    
\ No newline at end of file

-----------------------------------------------------------------------


hooks/post-receive
--