[arvados] updated: 2.7.0-6279-g62e557a331
git repository hosting
git at public.arvados.org
Tue Apr 2 18:35:21 UTC 2024
Summary of changes:
.../src/components/multiselect-toolbar/MultiselectToolbar.tsx | 2 +-
.../src/components/multiselect-toolbar/ms-toolbar-overflow-menu.tsx | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
via 62e557a3314a607b5701db7e64f7609a5af00adc (commit)
from 857687c280c2a84152de6e8df840d0bcf1282bcf (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 62e557a3314a607b5701db7e64f7609a5af00adc
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Tue Apr 2 14:35:15 2024 -0400
21448: removed dividers from overflow menuArvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index cf7763b19c..41d25bb6f8 100644
--- a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -133,7 +133,7 @@ export const MultiselectToolbar = connect(
<IntersectionObserverWrapper menuLength={actions.length}>
{actions.map((action, i) =>{
const { hasAlts, useAlts, name, altName, icon, altIcon } = action;
- return action.name === ContextMenuActionNames.DIVIDER ? (action.component && <action.component />)
+ return action.name === ContextMenuActionNames.DIVIDER ? (action.component && <action.component data-targetid={name} key={i} />)
: hasAlts ? (
<Tooltip
className={classes.button}
diff --git a/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-menu.tsx b/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-menu.tsx
index 9f8ced940d..fd62b20439 100644
--- a/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-menu.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-menu.tsx
@@ -83,9 +83,8 @@ export const OverflowMenu = withStyles(styles)((props: OverflowMenuProps & WithS
className={classes.menu}
>
{React.Children.map(children, (child: any) => {
- if (!visibilityMap[child.props['data-targetid']]) {
- return (
- <MenuItem
+ if (!visibilityMap[child.props['data-targetid']] && child.props['data-targetid'] !== 'Divider') {
+ return <MenuItem
key={child}
onClick={handleClose}
className={classes.menuItem}
@@ -94,7 +93,6 @@ export const OverflowMenu = withStyles(styles)((props: OverflowMenuProps & WithS
className: classnames(classes.menuElement),
})}
</MenuItem>
- );
}
return null;
})}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list