[arvados-workbench2] updated: 2.7.0-206-gce4a1cdc

git repository hosting git at public.arvados.org
Thu Nov 16 15:47:53 UTC 2023


Summary of changes:
 src/components/multiselect-toolbar/MultiselectToolbar.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

       via  ce4a1cdc67fd97c83f0249f04dde762bb6a6251a (commit)
      from  6ab26da3803adcd9d04b57aed3628b63c3502cb7 (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 ce4a1cdc67fd97c83f0249f04dde762bb6a6251a
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Thu Nov 16 10:47:48 2023 -0500

    21128: divided single and multi toolbars 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 f90b0b20..927da8c3 100644
--- a/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -53,15 +53,16 @@ export const MultiselectToolbar = connect(
     mapDispatchToProps
 )(
     withStyles(styles)((props: MultiselectToolbarProps & WithStyles<CssRules>) => {
-        const { classes, checkedList, resources, selectedUuid, favorites } = props;
+        const { classes, checkedList, resources, selectedUuid: singleSelectedUuid, favorites } = props;
         const currentResourceKinds = Array.from(selectedToKindSet(checkedList));
 
         const currentPathIsTrash = window.location.pathname === "/trash";
 
         const actions =
-            currentPathIsTrash && selectedToKindSet(checkedList).size 
-            ? [msToggleTrashAction] 
-            : selectActionsByKind(currentResourceKinds, multiselectActionsFilters);
+            currentPathIsTrash && selectedToKindSet(checkedList).size
+                ? [msToggleTrashAction]
+                : selectActionsByKind(currentResourceKinds, multiselectActionsFilters)
+                .filter((action) => (singleSelectedUuid === null ? action.isForMulti : true));
 
         return (
             <React.Fragment>
@@ -74,12 +75,12 @@ export const MultiselectToolbar = connect(
                             action.hasAlts ? (
                                 <Tooltip
                                     className={classes.button}
-                                    title={action.useAlts(selectedUuid, resources, favorites) ? action.altName: action.name}
+                                    title={action.useAlts(singleSelectedUuid, resources, favorites) ? action.altName: action.name}
                                     key={i}
                                     disableFocusListener
                                 >
                                     <IconButton onClick={() => props.executeMulti(action, checkedList, resources)}>
-                                        {action.useAlts(selectedUuid, resources, favorites) ? action.altIcon && action.altIcon({}):  action.icon({})}
+                                        {action.useAlts(singleSelectedUuid, resources, favorites) ? action.altIcon && action.altIcon({}):  action.icon({})}
                                     </IconButton>
                                 </Tooltip>
                             ) : (

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list