X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/8c5e0acf680bb7f3527be8f474160c5f431fe581..fe477581df706f4c2c1669f2df584bd94dbb4bea:/src/store/collections/collection-create-actions.ts

diff --git a/src/store/collections/collection-create-actions.ts b/src/store/collections/collection-create-actions.ts
index 707e080c..8d1e9ba5 100644
--- a/src/store/collections/collection-create-actions.ts
+++ b/src/store/collections/collection-create-actions.ts
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { Dispatch } from "redux";
-import { reset, startSubmit, stopSubmit, initialize } from 'redux-form';
+import { reset, startSubmit, stopSubmit, initialize, FormErrors } from 'redux-form';
 import { RootState } from '~/store/store';
 import { dialogActions } from "~/store/dialog/dialog-actions";
 import { ServiceRepository } from '~/services/services';
@@ -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;
+        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));
@@ -50,7 +52,7 @@ export const createCollection = (data: CollectionCreateFormDialogData) =>
         } catch (e) {
             const error = getCommonResourceServiceError(e);
             if (error === CommonResourceServiceError.UNIQUE_VIOLATION) {
-                dispatch(stopSubmit(COLLECTION_CREATE_FORM_NAME, { name: 'Collection with the same name already exists.' }));
+                dispatch(stopSubmit(COLLECTION_CREATE_FORM_NAME, { name: 'Collection with the same name already exists.' } as FormErrors));
             } else if (error === CommonResourceServiceError.NONE) {
                 dispatch(stopSubmit(COLLECTION_CREATE_FORM_NAME));
                 dispatch(dialogActions.CLOSE_DIALOG({ id: 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