21128: add to trash > move to trash Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa...

diff --git a/src/store/project-panel/project-panel-middleware-service.ts b/src/store/project-panel/project-panel-middleware-service.ts
index 08eead97c8b21b8f4da98f3458795061d9893870..366e15ae04759e2a774563d8307fa8c4449eb8fe 100644 (file)
--- a/src/store/project-panel/project-panel-middleware-service.ts
+++ b/src/store/project-panel/project-panel-middleware-service.ts
@@ -80,7 +80,7 @@ export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService
             } finally {
                 if (!background) { 
                     api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
-                    api.dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.ADD_TO_TRASH))
+                    api.dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.MOVE_TO_TRASH))
                 }
             }
         }

diff --git a/src/store/trash-panel/trash-panel-middleware-service.ts b/src/store/trash-panel/trash-panel-middleware-service.ts
index 8b760ebb84804cc575989a44c72fd444b62651fd..c822cece8742856330a7d7734cd655cae923aec7 100644 (file)
--- a/src/store/trash-panel/trash-panel-middleware-service.ts
+++ b/src/store/trash-panel/trash-panel-middleware-service.ts
@@ -85,7 +85,7 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService {
             }));
             api.dispatch(couldNotFetchTrashContents());
         }
-        api.dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.ADD_TO_TRASH))
+        api.dispatch<any>(removeDisabledButton(MultiSelectMenuActionNames.MOVE_TO_TRASH))
     }
 }
 

diff --git a/src/store/trash/trash-actions.ts b/src/store/trash/trash-actions.ts
index d6f0d9a73d2618fea1d6a18cad1281c0b99ee826..dd442188314865bb6cae3c4174e9c56947458c45 100644 (file)
--- a/src/store/trash/trash-actions.ts
+++ b/src/store/trash/trash-actions.ts
@@ -22,7 +22,7 @@ export const toggleProjectTrashed =
             let errorMessage = "";
             let successMessage = "";
             let untrashedResource;
-            dispatch<any>(addDisabledButton(MultiSelectMenuActionNames.ADD_TO_TRASH))
+            dispatch<any>(addDisabledButton(MultiSelectMenuActionNames.MOVE_TO_TRASH))
             try {
                 if (isTrashed) {
                     errorMessage = "Could not restore project from trash";
@@ -78,7 +78,7 @@ export const toggleCollectionTrashed =
             let errorMessage = "";
             let successMessage = "";
             console.log('hi')
-            dispatch<any>(addDisabledButton(MultiSelectMenuActionNames.ADD_TO_TRASH))
+            dispatch<any>(addDisabledButton(MultiSelectMenuActionNames.MOVE_TO_TRASH))
             try {
                 if (isTrashed) {
                     const { location } = getState().router;

diff --git a/src/views-components/multiselect-toolbar/ms-collection-action-set.ts b/src/views-components/multiselect-toolbar/ms-collection-action-set.ts
index 821ffef2651708d0ed90816d629b58a0ee840232..cd7ce832074899e42d11ec88a34625484c96fb2b 100644 (file)
--- a/src/views-components/multiselect-toolbar/ms-collection-action-set.ts
+++ b/src/views-components/multiselect-toolbar/ms-collection-action-set.ts
@@ -13,7 +13,7 @@ import { openCollectionUpdateDialog } from "store/collections/collection-update-
 import { copyToClipboardAction } from "store/open-in-new-tab/open-in-new-tab.actions";
 import { openWebDavS3InfoDialog } from "store/collections/collection-info-actions";
 
-const { MAKE_A_COPY, MOVE_TO, ADD_TO_TRASH, EDIT_COLLECTION, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, ADD_TO_FAVORITES, SHARE} = MultiSelectMenuActionNames;
+const { MAKE_A_COPY, MOVE_TO, MOVE_TO_TRASH, EDIT_COLLECTION, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, COPY_TO_CLIPBOARD, VIEW_DETAILS, API_DETAILS, ADD_TO_FAVORITES, SHARE} = MultiSelectMenuActionNames;
 
 const msCopyCollection: MultiSelectMenuAction = {
     name: MAKE_A_COPY,
@@ -35,7 +35,7 @@ const msMoveCollection: MultiSelectMenuAction = {
 }
 
 const msToggleTrashAction: MultiSelectMenuAction = {
-    name: ADD_TO_TRASH,
+    name: MOVE_TO_TRASH,
     icon: TrashIcon,
     isForMulti: true,
     hasAlts: false,
@@ -89,5 +89,5 @@ export const msCollectionActionSet: MultiSelectMenuActionSet = [
 ];
 
 export const msReadOnlyCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, ADD_TO_FAVORITES, OPEN_W_3RD_PARTY_CLIENT]);
-export const msCommonCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, OPEN_W_3RD_PARTY_CLIENT, EDIT_COLLECTION, SHARE, MOVE_TO, ADD_TO_FAVORITES, ADD_TO_TRASH])
-export const msOldCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, OPEN_W_3RD_PARTY_CLIENT, EDIT_COLLECTION, SHARE, MOVE_TO, ADD_TO_FAVORITES, ADD_TO_TRASH])
\ No newline at end of file
+export const msCommonCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, OPEN_W_3RD_PARTY_CLIENT, EDIT_COLLECTION, SHARE, MOVE_TO, ADD_TO_FAVORITES, MOVE_TO_TRASH])
+export const msOldCollectionActionFilter = new Set([OPEN_IN_NEW_TAB, COPY_TO_CLIPBOARD, MAKE_A_COPY, VIEW_DETAILS, API_DETAILS, OPEN_W_3RD_PARTY_CLIENT, EDIT_COLLECTION, SHARE, MOVE_TO, ADD_TO_FAVORITES, MOVE_TO_TRASH])
\ No newline at end of file

diff --git a/src/views-components/multiselect-toolbar/ms-menu-actions.ts b/src/views-components/multiselect-toolbar/ms-menu-actions.ts
index c01b431e758ec5d919e40b84ac2a19ccbf97fc02..c34cf064fae02c4fcf5420e0a6bf4e93bcafc9ff 100644 (file)
--- a/src/views-components/multiselect-toolbar/ms-menu-actions.ts
+++ b/src/views-components/multiselect-toolbar/ms-menu-actions.ts
@@ -22,7 +22,7 @@ import { PublicFavoritesState } from 'store/public-favorites/public-favorites-re
 
 export enum MultiSelectMenuActionNames {
     ADD_TO_FAVORITES = 'Add to Favorites',
-    ADD_TO_TRASH = 'Add to Trash',
+    MOVE_TO_TRASH = 'Move to trash',
     ADD_TO_PUBLIC_FAVORITES = 'Add to public favorites',
     API_DETAILS = 'API Details',
     COPY_AND_RERUN_PROCESS = 'Copy and re-run process',

diff --git a/src/views-components/multiselect-toolbar/ms-project-action-set.ts b/src/views-components/multiselect-toolbar/ms-project-action-set.ts
index 9c0a4d88732877005e6a5dbf696c6efa00101cee..c394ea904d4ec77edbc10f7aa56ffa4827be2fc1 100644 (file)
--- a/src/views-components/multiselect-toolbar/ms-project-action-set.ts
+++ b/src/views-components/multiselect-toolbar/ms-project-action-set.ts
@@ -30,7 +30,7 @@ const {
     EDIT_PROJECT,
     SHARE,
     MOVE_TO,
-    ADD_TO_TRASH,
+    MOVE_TO_TRASH,
     FREEZE_PROJECT,
     NEW_PROJECT,
 } = MultiSelectMenuActionNames;
@@ -76,7 +76,7 @@ const msOpenWith3rdPartyClientAction: MultiSelectMenuAction  = {
 };
 
 export const msToggleTrashAction: MultiSelectMenuAction = {
-    name: ADD_TO_TRASH,
+    name: MOVE_TO_TRASH,
     icon: TrashIcon,
     hasAlts: true,
     altName: 'Restore from Trash',
@@ -136,7 +136,7 @@ export const msProjectActionSet: MultiSelectMenuActionSet = [
 
 export const msCommonProjectActionFilter = new Set<string>([
     ADD_TO_FAVORITES,
-    ADD_TO_TRASH,
+    MOVE_TO_TRASH,
     API_DETAILS,
     COPY_TO_CLIPBOARD,
     EDIT_PROJECT,
@@ -150,4 +150,4 @@ export const msCommonProjectActionFilter = new Set<string>([
 ]);
 export const msReadOnlyProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, VIEW_DETAILS,]);
 export const msFrozenProjectActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, FREEZE_PROJECT])
-export const msFilterGroupActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, ADD_TO_TRASH, EDIT_PROJECT, MOVE_TO])
\ No newline at end of file
+export const msFilterGroupActionFilter = new Set<string>([ADD_TO_FAVORITES, API_DETAILS, COPY_TO_CLIPBOARD, OPEN_IN_NEW_TAB, OPEN_W_3RD_PARTY_CLIENT, VIEW_DETAILS, SHARE, MOVE_TO_TRASH, EDIT_PROJECT, MOVE_TO])
\ No newline at end of file