15768: restoreFromTrash now properly navigates after multi Arvados-DCO-1.1-Signed...

diff --git a/src/store/trash/trash-actions.ts b/src/store/trash/trash-actions.ts
index 85ffd4a0bed5681424a39d24d948aa648bc11683..9672642287fc870ac2a0ca8c61d32287fcaa6b46 100644 (file)
--- a/src/store/trash/trash-actions.ts
+++ b/src/store/trash/trash-actions.ts
@@ -2,86 +2,95 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Dispatch } from "redux";
-import { RootState } from "store/store";
-import { ServiceRepository } from "services/services";
-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 { Dispatch } from 'redux';
+import { RootState } from 'store/store';
+import { ServiceRepository } from 'services/services';
+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 { navigateTo, navigateToTrash } from 'store/navigation/navigation-action';
 import { matchCollectionRoute } from 'routes/routes';
 
-export const toggleProjectTrashed = (uuid: string, ownerUuid: string, isTrashed: boolean) =>
+export const toggleProjectTrashed =
+    (uuid: string, ownerUuid: string, isTrashed: boolean, isMulti: boolean) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
         let errorMessage = '';
         let successMessage = '';
         try {
             if (isTrashed) {
-                errorMessage = "Could not restore project from trash";
-                successMessage = "Restored from trash";
+                errorMessage = 'Could not restore project from trash';
+                successMessage = 'Restored from trash';
                 await services.groupsService.untrash(uuid);
-                dispatch<any>(navigateTo(uuid));
+                dispatch<any>(isMulti ? navigateToTrash : navigateTo(uuid));
                 dispatch<any>(activateSidePanelTreeItem(uuid));
             } else {
-                errorMessage = "Could not move project to trash";
-                successMessage = "Added to trash";
+                errorMessage = 'Could not move project to trash';
+                successMessage = 'Added to trash';
                 await services.groupsService.trash(uuid);
                 dispatch<any>(loadSidePanelTreeProjects(ownerUuid));
                 dispatch<any>(navigateTo(ownerUuid));
             }
         } catch (e) {
-            dispatch(snackbarActions.OPEN_SNACKBAR({
-                message: errorMessage,
-                kind: SnackbarKind.ERROR
-            }));
+            dispatch(
+                snackbarActions.OPEN_SNACKBAR({
+                    message: errorMessage,
+                    kind: SnackbarKind.ERROR,
+                })
+            );
         }
-        dispatch(snackbarActions.OPEN_SNACKBAR({
-            message: successMessage,
-            hideDuration: 2000,
-            kind: SnackbarKind.SUCCESS
-        }));
+        dispatch(
+            snackbarActions.OPEN_SNACKBAR({
+                message: successMessage,
+                hideDuration: 2000,
+                kind: SnackbarKind.SUCCESS,
+            })
+        );
     };
 
-export const toggleCollectionTrashed = (uuid: string, isTrashed: boolean) =>
+export const toggleCollectionTrashed =
+    (uuid: string, isTrashed: boolean) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
         let errorMessage = '';
         let successMessage = '';
         try {
             if (isTrashed) {
                 const { location } = getState().router;
-                errorMessage = "Could not restore collection from trash";
-                successMessage = "Restored from trash";
+                errorMessage = 'Could not restore collection from trash';
+                successMessage = 'Restored from trash';
                 await services.collectionService.untrash(uuid);
                 if (matchCollectionRoute(location ? location.pathname : '')) {
                     dispatch(navigateToTrash);
                 }
                 dispatch(trashPanelActions.REQUEST_ITEMS());
             } else {
-                errorMessage = "Could not move collection to trash";
-                successMessage = "Added to trash";
+                errorMessage = 'Could not move collection to trash';
+                successMessage = 'Added to trash';
                 await services.collectionService.trash(uuid);
                 dispatch(projectPanelActions.REQUEST_ITEMS());
             }
         } catch (e) {
-            dispatch(snackbarActions.OPEN_SNACKBAR({
-                message: errorMessage,
-                kind: SnackbarKind.ERROR
-            }));
+            dispatch(
+                snackbarActions.OPEN_SNACKBAR({
+                    message: errorMessage,
+                    kind: SnackbarKind.ERROR,
+                })
+            );
         }
-        dispatch(snackbarActions.OPEN_SNACKBAR({
-            message: successMessage,
-            hideDuration: 2000,
-            kind: SnackbarKind.SUCCESS
-        }));
+        dispatch(
+            snackbarActions.OPEN_SNACKBAR({
+                message: successMessage,
+                hideDuration: 2000,
+                kind: SnackbarKind.SUCCESS,
+            })
+        );
     };
 
-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!!));
-        }
-    };
+export const toggleTrashed = (kind: ResourceKind, uuid: string, ownerUuid: string, isTrashed: boolean) => (dispatch: Dispatch) => {
+    if (kind === ResourceKind.PROJECT) {
+        dispatch<any>(toggleProjectTrashed(uuid, ownerUuid, isTrashed!!, false));
+    } else if (kind === ResourceKind.COLLECTION) {
+        dispatch<any>(toggleCollectionTrashed(uuid, isTrashed!!));
+    }
+};

diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-action-set.ts
index 7425902912190aabce70daa0b6c232e24687f81e..b24283dd5f3f2a5ad653193740b4a4e70f7f5ce6 100644 (file)
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@ -103,7 +103,9 @@ export const toggleTrashAction = {
     component: ToggleTrashAction,
     name: 'ToggleTrashAction',
     execute: (dispatch, resources) => {
-        resources.forEach((resource) => dispatch(toggleProjectTrashed(resource.uuid, resource.ownerUuid, resource.isTrashed!!)));
+        resources.forEach((resource) =>
+            dispatch(toggleProjectTrashed(resource.uuid, resource.ownerUuid, resource.isTrashed!!, resources.length > 1))
+        );
     },
 };