21128: added hasAlts field Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox@curii...

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 338c18ef42dd4f2995a46443ac06a8c4a9401676..641645e081fe694c76eecdbce44a2c59ab0e33a9 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,8 +13,9 @@ import { TrashIcon } from "components/icon/icon";
 export const msCollectionActionSet: MultiSelectMenuActionSet = [
     [
         {
-            icon: CopyIcon,
             name: MultiSelectMenuActionNames.MAKE_A_COPY,
+            icon: CopyIcon,
+            hasAlts: false,
             isForMulti: true,
             execute: (dispatch, [...resources]) => {
                 if (resources[0].fromContextMenu || resources.length === 1) dispatch<any>(openCollectionCopyDialog(resources[0]));
@@ -22,8 +23,9 @@ export const msCollectionActionSet: MultiSelectMenuActionSet = [
             },
         },
         {
-            icon: MoveToIcon,
             name: MultiSelectMenuActionNames.MOVE_TO,
+            icon: MoveToIcon,
+            hasAlts: false,
             isForMulti: true,
             execute: (dispatch, resources) => dispatch<any>(openMoveCollectionDialog(resources[0])),
         },
@@ -31,6 +33,7 @@ export const msCollectionActionSet: MultiSelectMenuActionSet = [
             name: MultiSelectMenuActionNames.ADD_TO_TRASH,
             icon: TrashIcon,
             isForMulti: true,
+            hasAlts: false,
             execute: (dispatch, resources: ContextMenuResource[]) => {
                 for (const resource of [...resources]) {
                     dispatch<any>(toggleCollectionTrashed(resource.uuid, resource.isTrashed!!));

diff --git a/src/views-components/multiselect-toolbar/ms-menu-action-set.ts b/src/views-components/multiselect-toolbar/ms-menu-action-set.ts
index 44a5e51f6f84a602e217d727af7d1800312cc8a2..c7b7fa1b6c0d78e6fb90474f5b80be1ee0f8d500 100644 (file)
--- a/src/views-components/multiselect-toolbar/ms-menu-action-set.ts
+++ b/src/views-components/multiselect-toolbar/ms-menu-action-set.ts
@@ -21,6 +21,7 @@ export const MultiSelectMenuActionNames = {
 export type MultiSelectMenuAction = {
     name: string;
     icon: IconType;
+    hasAlts: boolean;
     altText?: string;
     altIcon?: IconType;
     isForMulti: boolean;

diff --git a/src/views-components/multiselect-toolbar/ms-process-action-set.ts b/src/views-components/multiselect-toolbar/ms-process-action-set.ts
index 57c8e5771f2256c314d65ebed34e6cef172bb04a..be6d9f98e59823d64cd391bfc996d4a915ba3b55 100644 (file)
--- a/src/views-components/multiselect-toolbar/ms-process-action-set.ts
+++ b/src/views-components/multiselect-toolbar/ms-process-action-set.ts
@@ -11,9 +11,10 @@ import { MultiSelectMenuActionSet, MultiSelectMenuActionNames } from "./ms-menu-
 export const msProcessActionSet: MultiSelectMenuActionSet = [
     [
         {
-            icon: ReRunProcessIcon,
             name: MultiSelectMenuActionNames.COPY_AND_RERUN_PROCESS,
-            isForMulti: true,
+            icon: ReRunProcessIcon,
+            hasAlts: false,
+            isForMulti: false,
             execute: (dispatch, resources) => {
                 for (const resource of [...resources]) {
                     dispatch<any>(openCopyProcessDialog(resource));
@@ -21,8 +22,9 @@ export const msProcessActionSet: MultiSelectMenuActionSet = [
             },
         },
         {
-            icon: MoveToIcon,
             name: MultiSelectMenuActionNames.MOVE_TO,
+            icon: MoveToIcon,
+            hasAlts: false,
             isForMulti: true,
             execute: (dispatch, resources) => {
                 dispatch<any>(openMoveProcessDialog(resources[0]));
@@ -31,6 +33,7 @@ export const msProcessActionSet: MultiSelectMenuActionSet = [
         {
             name: MultiSelectMenuActionNames.REMOVE,
             icon: RemoveIcon,
+            hasAlts: false,
             isForMulti: true,
             execute: (dispatch, resources) => {
                 dispatch<any>(openRemoveProcessDialog(resources[0], resources.length));

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 d31fddddea61989a9b249d45d566a876951191b9..a86832a5fc67f98cd8a7e7a950c931aafb1a14d8 100644 (file)
--- a/src/views-components/multiselect-toolbar/ms-project-action-set.ts
+++ b/src/views-components/multiselect-toolbar/ms-project-action-set.ts
@@ -16,8 +16,9 @@ import { checkFavorite } from "store/favorites/favorites-reducer";
 
 export const msToggleFavoriteAction = {
     name: MultiSelectMenuActionNames.ADD_TO_FAVORITES,
-    altText: 'Remove from Favorites',
     icon: AddFavoriteIcon,
+    hasAlts: true,
+    altText: 'Remove from Favorites',
     altIcon: RemoveFavoriteIcon,
     isForMulti: false,
     isDefault: (uuid, resources, favorites)=>{
@@ -31,8 +32,9 @@ export const msToggleFavoriteAction = {
 };
 
 export const msCopyToClipboardMenuAction = {
-    icon: Link,
     name: MultiSelectMenuActionNames.COPY_TO_CLIPBOARD,
+    icon: Link,
+    hasAlts: false,
     isForMulti: false,
     execute: (dispatch, resources) => {
         dispatch(copyToClipboardAction(resources));
@@ -40,8 +42,9 @@ export const msCopyToClipboardMenuAction = {
 };
 
 export const msMoveToAction = {
-    icon: MoveToIcon,
     name: MultiSelectMenuActionNames.MOVE_TO,
+    icon: MoveToIcon,
+    hasAlts: false,
     isForMulti: true,
     execute: (dispatch, resource) => {
         dispatch(openMoveProjectDialog(resource[0]));
@@ -50,8 +53,9 @@ export const msMoveToAction = {
 
 export const msToggleTrashAction = {
     name: MultiSelectMenuActionNames.ADD_TO_TRASH,
-    altText: 'Restore from Trash',
     icon: TrashIcon,
+    hasAlts: true,
+    altText: 'Restore from Trash',
     altIcon: RestoreFromTrashIcon,
     isForMulti: true,
     isDefault: (uuid, resources, favorites = []) => {