21224: merged main to pass int tests

[arvados.git] / services / workbench2 / src / components / multiselect-toolbar / ms-toolbar-overflow-menu.tsx

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..efa776713ddae5851910c995d141d7cea1717535 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
@@ -62,13 +62,14 @@ export const OverflowMenu = withStyles(styles)((props: OverflowMenuProps & WithS
     }
     return (
         <div className={className}>
-            <Tooltip title="More Options" disableFocusListener>
+            <Tooltip title="More options" disableFocusListener>
                 <IconButton
                     aria-label='more'
                     aria-controls='long-menu'
                     aria-haspopup='true'
                     onClick={handleClick}
                     className={classes.openMenuButton}
+                    data-cy='overflow-menu-button'
                 >
                         <DoubleRightArrows />
                 </IconButton>
@@ -81,11 +82,11 @@ export const OverflowMenu = withStyles(styles)((props: OverflowMenuProps & WithS
                 onClose={handleClose}
                 disableAutoFocusItem
                 className={classes.menu}
+                data-cy='overflow-menu'
             >
                 {React.Children.map(children, (child: any) => {
                     if (!visibilityMap[child.props['data-targetid']]) {
-                        return (
-                            <MenuItem
+                        return <MenuItem
                                 key={child}
                                 onClick={handleClose}
                                 className={classes.menuItem}
@@ -94,7 +95,6 @@ export const OverflowMenu = withStyles(styles)((props: OverflowMenuProps & WithS
                                     className: classnames(classes.menuElement),
                                 })}
                             </MenuItem>
-                        );
                     }
                     return null;
                 })}