[arvados-workbench2] updated: 2.7.0-204-g0b08c3e2
git repository hosting
git at public.arvados.org
Wed Nov 15 16:50:31 UTC 2023
Summary of changes:
.../multiselect-toolbar/ms-collection-action-set.ts | 7 +++++--
.../multiselect-toolbar/ms-menu-action-set.ts | 1 +
.../multiselect-toolbar/ms-process-action-set.ts | 9 ++++++---
.../multiselect-toolbar/ms-project-action-set.ts | 12 ++++++++----
4 files changed, 20 insertions(+), 9 deletions(-)
via 0b08c3e2a037fb13efd24037111ee6d147a4c6c8 (commit)
from 953fa9de6f70c1de6e875d86b47d5bf3ac40830c (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 0b08c3e2a037fb13efd24037111ee6d147a4c6c8
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Wed Nov 15 11:50:26 2023 -0500
21128: added hasAlts field Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
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 338c18ef..641645e0 100644
--- 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 44a5e51f..c7b7fa1b 100644
--- 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 57c8e577..be6d9f98 100644
--- 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 d31fdddd..a86832a5 100644
--- 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 = []) => {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list