15768: fixed double error messages Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa...

diff --git a/src/components/data-table/data-table.tsx b/src/components/data-table/data-table.tsx
index 59e154138a29389d617ff31310bb4671e562d49a..96f03651cb8b12d3de992734ef252a3bec97aa4b 100644 (file)
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@ -169,7 +169,7 @@ export const DataTable = withStyles(styles)(
                         type="checkbox"
                         name={uuid}
                         className={classes.checkBox}
-                        checked={checkedList ? checkedList[uuid] : false}
+                        checked={checkedList[uuid] ? checkedList[uuid] : false}
                         onChange={() => this.handleSelectOne(uuid)}
                         onDoubleClick={ev => ev.stopPropagation()}></input>
                 );

diff --git a/src/store/trash/trash-actions.ts b/src/store/trash/trash-actions.ts
index 9672642287fc870ac2a0ca8c61d32287fcaa6b46..e999719db4987e685ed3c246e81f2d182ab17a57 100644 (file)
--- a/src/store/trash/trash-actions.ts
+++ b/src/store/trash/trash-actions.ts
@@ -2,32 +2,32 @@
 //
 // 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 { navigateTo, navigateToTrash } from 'store/navigation/navigation-action';
-import { matchCollectionRoute } from 'routes/routes';
+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, isMulti: boolean) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
-        let errorMessage = '';
-        let successMessage = '';
+        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 project from trash";
                 await services.groupsService.untrash(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));
@@ -52,24 +52,31 @@ export const toggleProjectTrashed =
 export const toggleCollectionTrashed =
     (uuid: string, isTrashed: boolean) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
-        let errorMessage = '';
-        let successMessage = '';
+        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 : '')) {
+                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());
             }
+            dispatch(
+                snackbarActions.OPEN_SNACKBAR({
+                    message: successMessage,
+                    hideDuration: 2000,
+                    kind: SnackbarKind.SUCCESS,
+                })
+            );
         } catch (e) {
             dispatch(
                 snackbarActions.OPEN_SNACKBAR({
@@ -78,13 +85,6 @@ export const toggleCollectionTrashed =
                 })
             );
         }
-        dispatch(
-            snackbarActions.OPEN_SNACKBAR({
-                message: successMessage,
-                hideDuration: 2000,
-                kind: SnackbarKind.SUCCESS,
-            })
-        );
     };
 
 export const toggleTrashed = (kind: ResourceKind, uuid: string, ownerUuid: string, isTrashed: boolean) => (dispatch: Dispatch) => {