X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/e4b54c3b5d99c99553e319ead28c3aa8dcd6eecc..02fe86a56f080ed1d5770ad6c6856a15f50ab508:/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts

diff --git a/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts b/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
index 3f82d29e..c661d9f8 100644
--- a/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
+++ b/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
@@ -11,7 +11,7 @@ import { snackbarActions, SnackbarKind } from "../../snackbar/snackbar-actions";
 import { dialogActions } from '../../dialog/dialog-actions';
 import { getNodeValue } from "~/models/tree";
 import { filterCollectionFilesBySelection } from './collection-panel-files-state';
-import { startSubmit, stopSubmit, reset, initialize } from 'redux-form';
+import { startSubmit, stopSubmit, initialize, FormErrors } from 'redux-form';
 import { getDialog } from "~/store/dialog/dialog-reducer";
 import { getFileFullPath } from "~/services/collection-service/collection-service-files-response";
 import { resourcesDataActions } from "~/store/resources-data/resources-data-actions";
@@ -39,9 +39,13 @@ export const removeCollectionFiles = (filePaths: string[]) =>
         if (currentCollection) {
             dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removing...' }));
             try {
-                await services.collectionService.deleteFiles('', filePaths);
+                await services.collectionService.deleteFiles(currentCollection.uuid, filePaths);
                 dispatch<any>(loadCollectionFiles(currentCollection.uuid));
-                dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removed.', hideDuration: 2000 }));
+                dispatch(snackbarActions.OPEN_SNACKBAR({
+                    message: 'Removed.',
+                    hideDuration: 2000,
+                    kind: SnackbarKind.SUCCESS
+                }));
             } catch (e) {
                 dispatch(snackbarActions.OPEN_SNACKBAR({
                     message: 'Could not remove file.',
@@ -73,8 +77,8 @@ export const openFileRemoveDialog = (filePath: string) =>
                 ? 'Are you sure you want to remove this directory?'
                 : 'Are you sure you want to remove this file?';
             const info = isDirectory
-                ? 'Removing files will change content adress.'
-                : 'Removing a file will change content adress.';
+                ? 'Removing files will change content address.'
+                : 'Removing a file will change content address.';
 
             dispatch(dialogActions.OPEN_DIALOG({
                 id: FILE_REMOVE_DIALOG,
@@ -97,7 +101,7 @@ export const openMultipleFilesRemoveDialog = () =>
         data: {
             title: 'Removing files',
             text: 'Are you sure you want to remove selected files?',
-            info: 'Removing files will change content adress.',
+            info: 'Removing files will change content address.',
             confirmButtonLabel: 'Remove'
         }
     });
@@ -130,7 +134,10 @@ export const renameFile = (newName: string) =>
                     dispatch(dialogActions.CLOSE_DIALOG({ id: RENAME_FILE_DIALOG }));
                     dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'File name changed.', hideDuration: 2000 }));
                 } catch (e) {
-                    dispatch(stopSubmit(RENAME_FILE_DIALOG, { name: 'Could not rename the file' }));
+                    const errors: FormErrors<RenameFileDialogData, string> = {
+                        name: 'Could not rename the file'
+                    };
+                    dispatch(stopSubmit(RENAME_FILE_DIALOG, errors));
                 }
             }
         }