[arvados-workbench2] updated: 2.6.0-62-gc5308511
git repository hosting
git at public.arvados.org
Fri Jul 28 16:51:56 UTC 2023
Summary of changes:
src/store/trash/trash-actions.ts | 99 ++++++++++++----------
.../context-menu/action-sets/project-action-set.ts | 4 +-
2 files changed, 57 insertions(+), 46 deletions(-)
via c5308511f31f9713ce961a72b29c39b7b64baaa6 (commit)
from 4d0420a83d27a90b8b15dda10f27a1b89c4ca1b6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit c5308511f31f9713ce961a72b29c39b7b64baaa6
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Fri Jul 28 12:51:52 2023 -0400
15768: restoreFromTrash now properly navigates after multi Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/src/store/trash/trash-actions.ts b/src/store/trash/trash-actions.ts
index 85ffd4a0..96726422 100644
--- 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 74259029..b24283dd 100644
--- 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))
+ );
},
};
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list