Merge branch '14604-ui-improvements'

[arvados-workbench2.git] / src / store / trash / trash-actions.ts

diff --git a/src/store/trash/trash-actions.ts b/src/store/trash/trash-actions.ts
index cd6df55670d322044c5d386a3c597cc19f0db3e0..693a0ece7e9197a5ff494583cee4660ebd7f2a8d 100644 (file)
--- a/src/store/trash/trash-actions.ts
+++ b/src/store/trash/trash-actions.ts
@@ -5,53 +5,75 @@
 import { Dispatch } from "redux";
 import { RootState } from "~/store/store";
 import { ServiceRepository } from "~/services/services";
-import { snackbarActions } from "~/store/snackbar/snackbar-actions";
+import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions";
 import { trashPanelActions } from "~/store/trash-panel/trash-panel-action";
 import { activateSidePanelTreeItem, loadSidePanelTreeProjects } from "~/store/side-panel-tree/side-panel-tree-actions";
 import { projectPanelActions } from "~/store/project-panel/project-panel-action";
-import { ResourceKind, TrashableResource } from "~/models/resource";
+import { ResourceKind } from "~/models/resource";
+import { navigateToTrash } from '~/store/navigation/navigation-action';
+import { matchCollectionRoute } from '~/routes/routes';
 
 export const toggleProjectTrashed = (uuid: string, ownerUuid: string, isTrashed: boolean) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
-        if (isTrashed) {
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Restoring from trash..." }));
-            await services.groupsService.untrash(uuid);
-            dispatch<any>(activateSidePanelTreeItem(uuid));
-            dispatch(trashPanelActions.REQUEST_ITEMS());
-            dispatch(snackbarActions.CLOSE_SNACKBAR());
+        try {
+            if (isTrashed) {
+                dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Restoring from trash...", kind: SnackbarKind.INFO }));
+                await services.groupsService.untrash(uuid);
+                dispatch<any>(activateSidePanelTreeItem(uuid));
+                dispatch(trashPanelActions.REQUEST_ITEMS());
+                dispatch(snackbarActions.OPEN_SNACKBAR({
+                    message: "Restored from trash",
+                    hideDuration: 2000,
+                    kind: SnackbarKind.SUCCESS
+                }));
+            } else {
+                dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Moving to trash...", kind: SnackbarKind.INFO }));
+                await services.groupsService.trash(uuid);
+                dispatch<any>(loadSidePanelTreeProjects(ownerUuid));
+                dispatch(snackbarActions.OPEN_SNACKBAR({
+                    message: "Added to trash",
+                    hideDuration: 2000,
+                    kind: SnackbarKind.SUCCESS
+                }));
+            }
+        } catch (e) {
             dispatch(snackbarActions.OPEN_SNACKBAR({
-                message: "Restored from trash",
-                hideDuration: 2000
-            }));
-        } else {
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Moving to trash..." }));
-            await services.groupsService.trash(uuid);
-            dispatch<any>(loadSidePanelTreeProjects(ownerUuid));
-            dispatch(snackbarActions.CLOSE_SNACKBAR());
-            dispatch(snackbarActions.OPEN_SNACKBAR({
-                message: "Added to trash",
-                hideDuration: 2000
+                message: "Could not move project to trash",
+                kind: SnackbarKind.ERROR
             }));
         }
     };
 
 export const toggleCollectionTrashed = (uuid: string, isTrashed: boolean) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
-        if (isTrashed) {
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Restoring from trash..." }));
-            await services.collectionService.untrash(uuid);
-            dispatch(trashPanelActions.REQUEST_ITEMS());
-            dispatch(snackbarActions.OPEN_SNACKBAR({
-                message: "Restored from trash",
-                hideDuration: 2000
-            }));
-        } else {
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Moving to trash..." }));
-            await services.collectionService.trash(uuid);
-            dispatch(projectPanelActions.REQUEST_ITEMS());
+        try {
+            if (isTrashed) {
+                const { location } = getState().router;
+                dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Restoring from trash...", kind: SnackbarKind.INFO }));
+                await services.collectionService.untrash(uuid);
+                if (matchCollectionRoute(location ? location.pathname : '')) {
+                    dispatch(navigateToTrash);
+                }
+                dispatch(trashPanelActions.REQUEST_ITEMS());
+                dispatch(snackbarActions.OPEN_SNACKBAR({
+                    message: "Restored from trash",
+                    hideDuration: 2000,
+                    kind: SnackbarKind.SUCCESS
+                }));
+            } else {
+                dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Moving to trash...", kind: SnackbarKind.INFO }));
+                await services.collectionService.trash(uuid);
+                dispatch(projectPanelActions.REQUEST_ITEMS());
+                dispatch(snackbarActions.OPEN_SNACKBAR({
+                    message: "Added to trash",
+                    hideDuration: 2000,
+                    kind: SnackbarKind.SUCCESS
+                }));
+            }
+        } catch (e) {
             dispatch(snackbarActions.OPEN_SNACKBAR({
-                message: "Added to trash",
-                hideDuration: 2000
+                message: "Could not move collection to trash",
+                kind: SnackbarKind.ERROR
             }));
         }
     };