X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/fb1ecf2421f8aac07d733d3bb56bb39312274f8c..9fbb245286171bc55fed5b5104361a1869a1d76b:/src/store/collections/collection-upload-actions.ts diff --git a/src/store/collections/collection-upload-actions.ts b/src/store/collections/collection-upload-actions.ts index c04ef1a2..4a5aff35 100644 --- a/src/store/collections/collection-upload-actions.ts +++ b/src/store/collections/collection-upload-actions.ts @@ -9,7 +9,7 @@ import { dialogActions } from '~/store/dialog/dialog-actions'; import { loadCollectionFiles } from '../collection-panel/collection-panel-files/collection-panel-files-actions'; import { snackbarActions } from '~/store/snackbar/snackbar-actions'; import { fileUploaderActions } from '~/store/file-uploader/file-uploader-actions'; -import { reset } from 'redux-form'; +import { reset, startSubmit } from 'redux-form'; export const uploadCollectionFiles = (collectionUuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { @@ -19,18 +19,19 @@ export const uploadCollectionFiles = (collectionUuid: string) => dispatch(fileUploaderActions.CLEAR_UPLOAD()); }; -export const UPLOAD_COLLECTION_FILES_DIALOG = 'uploadCollectionFilesDialog'; +export const COLLECTION_UPLOAD_FILES_DIALOG = 'uploadCollectionFilesDialog'; export const openUploadCollectionFilesDialog = () => (dispatch: Dispatch) => { - dispatch(reset(UPLOAD_COLLECTION_FILES_DIALOG)); + dispatch(reset(COLLECTION_UPLOAD_FILES_DIALOG)); dispatch(fileUploaderActions.CLEAR_UPLOAD()); - dispatch(dialogActions.OPEN_DIALOG({ id: UPLOAD_COLLECTION_FILES_DIALOG, data: {} })); + dispatch(dialogActions.OPEN_DIALOG({ id: COLLECTION_UPLOAD_FILES_DIALOG, data: {} })); }; -export const uploadCurrentCollectionFiles = () => +export const submitCollectionFiles = () => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const currentCollection = getState().collectionPanel.item; if (currentCollection) { + dispatch(startSubmit(COLLECTION_UPLOAD_FILES_DIALOG)); await dispatch(uploadCollectionFiles(currentCollection.uuid)); dispatch(loadCollectionFiles(currentCollection.uuid)); dispatch(closeUploadCollectionFilesDialog()); @@ -38,7 +39,7 @@ export const uploadCurrentCollectionFiles = () => } }; -export const closeUploadCollectionFilesDialog = () => dialogActions.CLOSE_DIALOG({ id: UPLOAD_COLLECTION_FILES_DIALOG }); +export const closeUploadCollectionFilesDialog = () => dialogActions.CLOSE_DIALOG({ id: COLLECTION_UPLOAD_FILES_DIALOG }); const handleUploadProgress = (dispatch: Dispatch) => (fileId: number, loaded: number, total: number, currentTime: number) => { dispatch(fileUploaderActions.SET_UPLOAD_PROGRESS({ fileId, loaded, total, currentTime }));