[arvados-workbench2] updated: 2.7.0-214-g14e2af3f
git repository hosting
git at public.arvados.org
Wed Nov 22 16:33:13 UTC 2023
Summary of changes:
src/components/multiselect-toolbar/MultiselectToolbar.tsx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
via 14e2af3f458ac220ff88cb059cea7f3568595cfc (commit)
from f50cf0fda2c66fb16238b22bbf87f2e8cdfb574b (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 14e2af3f458ac220ff88cb059cea7f3568595cfc
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Wed Nov 22 11:33:09 2023 -0500
21128: fixed multitrash icon Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index f2aeb9e9..780d7c43 100644
--- a/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -62,6 +62,9 @@ export const MultiselectToolbar = connect(
const currentPathIsTrash = window.location.pathname === "/trash";
+console.log(currentPathIsTrash && selectedToKindSet(checkedList).size)
+
+
const actions =
currentPathIsTrash && selectedToKindSet(checkedList).size
? [msToggleTrashAction]
@@ -79,12 +82,12 @@ export const MultiselectToolbar = connect(
action.hasAlts ? (
<Tooltip
className={classes.button}
- title={action.useAlts(singleSelectedUuid, iconProps) ? action.altName: action.name}
+ title={currentPathIsTrash || action.useAlts(singleSelectedUuid, iconProps) ? action.altName : action.name}
key={i}
disableFocusListener
>
<IconButton onClick={() => props.executeMulti(action, checkedList, iconProps.resources)}>
- {action.useAlts(singleSelectedUuid, iconProps) ? action.altIcon && action.altIcon({}): action.icon({})}
+ {currentPathIsTrash || action.useAlts(singleSelectedUuid, iconProps) ? action.altIcon && action.altIcon({}) : action.icon({})}
</IconButton>
</Tooltip>
) : (
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list