21448: removed dividers from overflow menuArvados-DCO-1.1-Signed-off-by: Lisa Knox...

diff --git a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index cf7763b19c2314f280e8e75d0fee059ee690e690..41d25bb6f828a31e94ad9b07f49f48e0ef659952 100644 (file)
--- 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 9f8ced940dbaeef8625d370ede55501c8dd0cb62..fd62b20439a7c2616411a25f5537c8a40608354a 100644 (file)
--- 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;
                 })}