X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/3eeb63ce55c9156f96f933a0cff5eab3dab86392..ca091dbfbc7df1a3f81eca2b16925b3225d43138:/src/store/trash/trash-actions.ts

diff --git a/src/store/trash/trash-actions.ts b/src/store/trash/trash-actions.ts
index 34d034a2..92d01582 100644
--- a/src/store/trash/trash-actions.ts
+++ b/src/store/trash/trash-actions.ts
@@ -5,56 +5,84 @@
 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 } from "~/models/resource";
+import { navigateToTrash } from '~/store/navigation/navigation-action';
+import { matchCollectionRoute } from '~/routes/routes';
 
-export const toggleProjectTrashed = (resource: { uuid: string; name: string, isTrashed?: boolean, ownerUuid?: string }) =>
+export const toggleProjectTrashed = (uuid: string, ownerUuid: string, isTrashed: boolean) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
-        if (resource.isTrashed) {
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Restoring from trash..." }));
-            return services.groupsService.untrash(resource.uuid).then(() => {
-                dispatch<any>(activateSidePanelTreeItem(resource.uuid));
+        try {
+            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());
                 dispatch(snackbarActions.OPEN_SNACKBAR({
                     message: "Restored from trash",
-                    hideDuration: 2000
+                    hideDuration: 2000,
+                    kind: SnackbarKind.SUCCESS
                 }));
-            });
-        } else {
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Moving to trash..." }));
-            return services.groupsService.trash(resource.uuid).then(() => {
-                dispatch<any>(loadSidePanelTreeProjects(resource.ownerUuid!!));
-                dispatch(snackbarActions.CLOSE_SNACKBAR());
+            } else {
+                dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Moving to trash..." }));
+                await services.groupsService.trash(uuid);
+                dispatch<any>(loadSidePanelTreeProjects(ownerUuid));
                 dispatch(snackbarActions.OPEN_SNACKBAR({
                     message: "Added to trash",
-                    hideDuration: 2000
+                    hideDuration: 2000,
+                    kind: SnackbarKind.SUCCESS
                 }));
-            });
+            }
+        } catch (e) {
+            dispatch(snackbarActions.OPEN_SNACKBAR({
+                message: "Could not move project to trash",
+                kind: SnackbarKind.ERROR
+            }));
         }
     };
 
-export const toggleCollectionTrashed = (resource: { uuid: string; name: string, isTrashed?: boolean, ownerUuid?: string }) =>
+export const toggleCollectionTrashed = (uuid: string, isTrashed: boolean) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
-        if (resource.isTrashed) {
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Restoring from trash..." }));
-            return services.collectionService.untrash(resource.uuid).then(() => {
+        try {
+            if (isTrashed) {
+                const { location } = getState().router;
+                dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Restoring from trash..." }));
+                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
+                    hideDuration: 2000,
+                    kind: SnackbarKind.SUCCESS
                 }));
-            });
-        } else {
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Moving to trash..." }));
-            return services.collectionService.trash(resource.uuid).then(() => {
+            } else {
+                dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Moving to trash..." }));
+                await services.collectionService.trash(uuid);
                 dispatch(projectPanelActions.REQUEST_ITEMS());
                 dispatch(snackbarActions.OPEN_SNACKBAR({
                     message: "Added to trash",
-                    hideDuration: 2000
+                    hideDuration: 2000,
+                    kind: SnackbarKind.SUCCESS
                 }));
-            });
+            }
+        } catch (e) {
+            dispatch(snackbarActions.OPEN_SNACKBAR({
+                message: "Could not move collection to trash",
+                kind: SnackbarKind.ERROR
+            }));
+        }
+    };
+
+export const toggleTrashed = (kind: ResourceKind, uuid: string, ownerUuid: string, isTrashed: boolean) =>
+    (dispatch: Dispatch) => {
+        if (kind === ResourceKind.PROJECT) {
+            dispatch<any>(toggleProjectTrashed(uuid, ownerUuid, isTrashed!!));
+        } else if (kind === ResourceKind.COLLECTION) {
+            dispatch<any>(toggleCollectionTrashed(uuid, isTrashed!!));
         }
     };