X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d842372e4f45ee06315e511529e65ae1d3f319a0..1a90c384645ab8880d68abb5dbee1d1193f80538:/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 2c339f2867..1981af0d41 100644
--- a/src/store/collections/collection-create-actions.ts
+++ b/src/store/collections/collection-create-actions.ts
@@ -3,17 +3,16 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { Dispatch } from "redux";
-import { reset, startSubmit, stopSubmit } from "redux-form";
+import { reset, startSubmit, stopSubmit, initialize } from 'redux-form';
 import { RootState } from '~/store/store';
 import { uploadCollectionFiles } from '~/store/collections/uploader/collection-uploader-actions';
-import { projectPanelActions } from "~/store/project-panel/project-panel-action";
-import { snackbarActions } from "~/store/snackbar/snackbar-actions";
 import { dialogActions } from "~/store/dialog/dialog-actions";
 import { CollectionResource } from '~/models/collection';
 import { ServiceRepository } from '~/services/services';
 import { getCommonResourceServiceError, CommonResourceServiceError } from "~/common/api/common-resource-service";
 
 export interface CollectionCreateFormDialogData {
+    ownerUuid: string;
     name: string;
     description: string;
     files: File[];
@@ -21,18 +20,10 @@ export interface CollectionCreateFormDialogData {
 
 export const COLLECTION_CREATE_FORM_NAME = "collectionCreateFormName";
 
-export const openCollectionCreateDialog = () =>
+export const openCollectionCreateDialog = (ownerUuid: string) =>
     (dispatch: Dispatch) => {
-        dispatch(dialogActions.OPEN_DIALOG({ id: COLLECTION_CREATE_FORM_NAME, data: {} }));
-    };
-
-export const addCollection = (data: CollectionCreateFormDialogData) =>
-    async (dispatch: Dispatch) => {
-        await dispatch<any>(createCollection(data));
-        dispatch(snackbarActions.OPEN_SNACKBAR({
-            message: "Collection has been successfully created.",
-            hideDuration: 2000
-        }));
+        dispatch(initialize(COLLECTION_CREATE_FORM_NAME, { ownerUuid }));
+        dispatch(dialogActions.OPEN_DIALOG({ id: COLLECTION_CREATE_FORM_NAME, data: { ownerUuid } }));
     };
 
 export const createCollection = (collection: Partial<CollectionResource>) =>
@@ -41,13 +32,14 @@ export const createCollection = (collection: Partial<CollectionResource>) =>
         try {
             const newCollection = await services.collectionService.create(collection);
             await dispatch<any>(uploadCollectionFiles(newCollection.uuid));
-            dispatch(projectPanelActions.REQUEST_ITEMS());
             dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_CREATE_FORM_NAME }));
             dispatch(reset(COLLECTION_CREATE_FORM_NAME));
+            return newCollection;
         } 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.' }));
             }
+            return ;
         }
     };
\ No newline at end of file