From 8ae34cc6c505d6359bf300d111d0c7b4e4e68a15 Mon Sep 17 00:00:00 2001 From: Michal Klobukowski Date: Tue, 25 Sep 2018 11:36:32 +0200 Subject: [PATCH] Navigate back to the trash after restoring a collection Feature #14244 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- src/store/trash/trash-actions.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/store/trash/trash-actions.ts b/src/store/trash/trash-actions.ts index 5cf952eb..b59276c1 100644 --- a/src/store/trash/trash-actions.ts +++ b/src/store/trash/trash-actions.ts @@ -10,6 +10,8 @@ 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 '../navigation/navigation-action'; +import { matchTrashRoute, matchCollectionRoute } from '../../routes/routes'; export const toggleProjectTrashed = (uuid: string, ownerUuid: string, isTrashed: boolean) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise => { @@ -46,8 +48,12 @@ export const toggleCollectionTrashed = (uuid: string, isTrashed: boolean) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise => { 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", -- 2.30.2