Merge branch '17016-delete-single-file-deletes-whole-collection'

[arvados-workbench2.git] / 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 704e299990a055742c5a19fdc5cba2e112bc2de0..c7a3bdc50372fdd457de1df63b7523174592f1ea 100644 (file)
--- 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
@@ -15,6 +15,7 @@ import { startSubmit, stopSubmit, initialize, FormErrors } from 'redux-form';
 import { getDialog } from "~/store/dialog/dialog-reducer";
 import { getFileFullPath, sortFilesTree } from "~/services/collection-service/collection-service-files-response";
 import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions";
+import { loadCollectionPanel } from "../collection-panel-action";
 
 export const collectionPanelFilesAction = unionize({
     SET_COLLECTION_FILES: ofType<CollectionFilesTree>(),
@@ -31,39 +32,44 @@ export const COLLECTION_PANEL_LOAD_FILES = 'collectionPanelLoadFiles';
 export const COLLECTION_PANEL_LOAD_FILES_THRESHOLD = 40000;
 
 export const loadCollectionFiles = (uuid: string) =>
-    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(progressIndicatorActions.START_WORKING(COLLECTION_PANEL_LOAD_FILES));
-        const files = await services.collectionService.files(uuid);
-
-        // Given the array of directories and files, create the appropriate tree nodes,
-        // sort them, and add the complete url to each.
-        const tree = createCollectionFilesTree(files);
-        const sorted = sortFilesTree(tree);
-        const mapped = mapTreeValues(services.collectionService.extendFileURL)(sorted);
-        dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES(mapped));
-        dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PANEL_LOAD_FILES));
+        services.collectionService.files(uuid).then(files => {
+            // Given the array of directories and files, create the appropriate tree nodes,
+            // sort them, and add the complete url to each.
+            const tree = createCollectionFilesTree(files);
+            const sorted = sortFilesTree(tree);
+            const mapped = mapTreeValues(services.collectionService.extendFileURL)(sorted);
+            dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES(mapped));
+            dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PANEL_LOAD_FILES));
+        }).catch(() => {
+            dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PANEL_LOAD_FILES));
+            dispatch(snackbarActions.OPEN_SNACKBAR({
+                message: `Error getting file list`,
+                hideDuration: 2000,
+                kind: SnackbarKind.ERROR
+            }));
+        });
     };
 
 export const removeCollectionFiles = (filePaths: string[]) =>
-    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         const currentCollection = getState().collectionPanel.item;
         if (currentCollection) {
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removing...' }));
-            try {
-                await services.collectionService.deleteFiles(currentCollection.uuid, filePaths);
-                dispatch<any>(loadCollectionFiles(currentCollection.uuid));
+            services.collectionService.deleteFiles(currentCollection.uuid, filePaths).then(() => {
+                dispatch<any>(loadCollectionPanel(currentCollection.uuid, true));
                 dispatch(snackbarActions.OPEN_SNACKBAR({
                     message: 'Removed.',
                     hideDuration: 2000,
                     kind: SnackbarKind.SUCCESS
                 }));
-            } catch (e) {
+            }).catch(e =>
                 dispatch(snackbarActions.OPEN_SNACKBAR({
                     message: 'Could not remove file.',
                     hideDuration: 2000,
                     kind: SnackbarKind.ERROR
-                }));
-            }
+                }))
+            );
         }
     };
 
@@ -121,6 +127,7 @@ export const RENAME_FILE_DIALOG = 'renameFileDialog';
 export interface RenameFileDialogData {
     name: string;
     id: string;
+    path: string;
 }
 
 export const openRenameFileDialog = (data: RenameFileDialogData) =>
@@ -129,8 +136,8 @@ export const openRenameFileDialog = (data: RenameFileDialogData) =>
         dispatch(dialogActions.OPEN_DIALOG({ id: RENAME_FILE_DIALOG, data }));
     };
 
-export const renameFile = (newName: string) =>
-    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+export const renameFile = (newFullPath: string) =>
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         const dialog = getDialog<RenameFileDialogData>(getState().dialog, RENAME_FILE_DIALOG);
         const currentCollection = getState().collectionPanel.item;
         if (dialog && currentCollection) {
@@ -138,18 +145,17 @@ export const renameFile = (newName: string) =>
             if (file) {
                 dispatch(startSubmit(RENAME_FILE_DIALOG));
                 const oldPath = getFileFullPath(file);
-                const newPath = getFileFullPath({ ...file, name: newName });
-                try {
-                    await services.collectionService.moveFile(currentCollection.uuid, oldPath, newPath);
-                    dispatch<any>(loadCollectionFiles(currentCollection.uuid));
+                const newPath = newFullPath;
+                services.collectionService.moveFile(currentCollection.uuid, oldPath, newPath).then(() => {
+                    dispatch<any>(loadCollectionPanel(currentCollection.uuid, true));
                     dispatch(dialogActions.CLOSE_DIALOG({ id: RENAME_FILE_DIALOG }));
                     dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'File name changed.', hideDuration: 2000 }));
-                } catch (e) {
+                }).catch(e => {
                     const errors: FormErrors<RenameFileDialogData, string> = {
-                        name: 'Could not rename the file'
+                        path: `Could not rename the file: ${e.responseText}`
                     };
                     dispatch(stopSubmit(RENAME_FILE_DIALOG, errors));
-                }
+                });
             }
         }
     };