grep-components 1.20.0-grepf-1808.1 → 1.20.0-grepf-1816.1

package/dist/components/AppBar/types.d.ts

@@ -5,7 +5,6 @@ export declare type UserMenuItem = {
     isAnchor?: boolean;
     href?: string;
     onClick?: (e: any) => void;
-    isDivider?: boolean;
 };
 export interface IAuthorizedPage {
     name: string;

package/dist/components/GrepTable/components/grep-table-header-cell.d.ts

@@ -4,6 +4,7 @@ import { TableColumn } from '..';
 interface Properties<T> extends TableSortLabelProps {
     column: TableColumn<T>;
     onSortBy?: (row: T) => void;
+    empty?: boolean;
 }
 declare type Component<T> = React.FunctionComponent<Properties<T>>;
 export declare const TableHeaderCell: Component<any>;

package/dist/index.js

@@ -3438,14 +3438,14 @@ var useTableHeaderStyles = makeStyles()(function (_theme, _a) {
 });
 
 var TableHeaderCell = function (_a) {
-    var column = _a.column, onSortBy = _a.onSortBy, direction = _a.direction, active = _a.active, children = _a.children, props = __rest$1(_a, ["column", "onSortBy", "direction", "active", "children"]);
+    var column = _a.column, onSortBy = _a.onSortBy, direction = _a.direction, active = _a.active, children = _a.children, _b = _a.empty, empty = _b === void 0 ? false : _b, props = __rest$1(_a, ["column", "onSortBy", "direction", "active", "children", "empty"]);
     var classes = useTableHeaderStyles({ column: column }).classes;
     var sortable = !!(onSortBy && column.sortable);
-    if (sortable) {
-        return (React__default.createElement(TableCell, __assign({ variant: "head", className: classes.th }, props),
+    if (sortable && !empty) {
+        return (React__default.createElement(TableCell, __assign({ variant: empty ? 'body' : 'head', className: classes.th }, props),
             React__default.createElement(TableSortLabel, { active: active, direction: direction }, children)));
     }
-    return (React__default.createElement(TableCell, __assign({ variant: "head", className: classes.th }, props), children));
+    return empty ? (React__default.createElement("td", { className: classes.th }, children)) : (React__default.createElement(TableCell, __assign({ variant: empty ? 'body' : 'head', className: classes.th }, props), children));
 };
 
 var TableHeader = function (_a) {
@@ -3457,7 +3457,7 @@ var TableHeader = function (_a) {
         React__default.createElement(TableRow, null, headerColumns.map(function (column, index) {
             var sortable = !!(onSortBy && column.sortable);
             var label = column.label, colDef = column.colDef;
-            return (React__default.createElement(TableHeaderCell, { key: index, column: column, direction: sortDirection, active: sortable ? sortBy === colDef : undefined, onClick: function () { return sortable && onSortBy(column); }, onKeyDown: onActivation(function (e) {
+            return (React__default.createElement(TableHeaderCell, { key: index, empty: !label, column: column, direction: sortDirection, active: sortable ? sortBy === colDef : undefined, onClick: function () { return sortable && onSortBy(column); }, onKeyDown: onActivation(function (e) {
                     if (sortable) {
                         e.preventDefault();
                         onSortBy(column);
@@ -20872,6 +20872,7 @@ var AppBar = function (_a) {
     var username = _a.username, currentPath = _a.currentPath, isProd = _a.isProd, appTitle = _a.appTitle, userMenuItems = _a.userMenuItems, menuItems = _a.menuItems, userRole = _a.userRole, colors = _a.colors;
     var _b = __read(React.useState(null), 2), userMenuAnchor = _b[0], setUserMenuAnchor = _b[1];
     var _handleIconButtonClick = function (event) {
+        event.preventDefault();
         setUserMenuAnchor(event.currentTarget);
     };
     var _handleCloseUserMenu = function () {
@@ -20883,24 +20884,6 @@ var AppBar = function (_a) {
             : currentPath.includes(page.redirectUrl || '');
         return (React.createElement(ToolbarMenuItem, { className: isActive ? 'active' : '', to: page.redirectUrl || '', key: page.name, tabIndex: 0 }, page === null || page === void 0 ? void 0 : page.translatedTextRef));
     };
-    var renderMenuItems = function () {
-        var newItemList = [];
-        userMenuItems.forEach(function (item, index) {
-            newItemList.push(item);
-            if (userMenuItems.length > index + 1) {
-                newItemList.push({ isDivider: true, id: '', label: '' });
-            }
-        });
-        return newItemList.map(function (i, index) {
-            return i.isDivider ? (React.createElement(Divider$1, { key: index })) : (React.createElement(MenuItem$1, { key: i.id, onClick: function () {
-                    setUserMenuAnchor(null);
-                    i.action && i.action();
-                } }, i.isAnchor ? (React.createElement("a", { style: {
-                    textDecoration: 'inherit',
-                    color: 'inherit',
-                }, tabIndex: -1, rel: "noreferrer", href: i.href, onClick: i.onClick }, i.label)) : (i.label)));
-        });
-    };
     return (React.createElement(Toolbar, null,
         React.createElement(ToolbarFixer, null,
             React.createElement(ToolbarInner, { colors: colors, role: "banner" },
@@ -20909,7 +20892,7 @@ var AppBar = function (_a) {
                         appTitle,
                         !isProd && (React.createElement(EnvironmentTitle, null, process.env.REACT_APP_HOST)))),
                 React.createElement(ToolbarRight, null,
-                    React.createElement(Button$1, { "aria-controls": userMenuAnchor ? 'basic-menu' : undefined, "aria-haspopup": "true", "aria-expanded": userMenuAnchor ? 'true' : undefined, onClick: _handleIconButtonClick },
+                    React.createElement(Button$1, { onClick: _handleIconButtonClick },
                         React.createElement(AccountCircle, { color: "primary", fontSize: "large" }),
                         React.createElement(UserContainer, null,
                             React.createElement(AccountName, null, username),
@@ -20921,7 +20904,17 @@ var AppBar = function (_a) {
                         }, transformOrigin: {
                             vertical: 'top',
                             horizontal: 'center',
-                        } }, renderMenuItems()))),
+                        } }, userMenuItems.map(function (i, index) {
+                        return (React.createElement(Box, { key: i.id },
+                            React.createElement(MenuItem$1, { key: i.id, onClick: function () {
+                                    setUserMenuAnchor(null);
+                                    i.action && i.action();
+                                } }, i.isAnchor ? (React.createElement("a", { style: {
+                                    textDecoration: 'inherit',
+                                    color: 'inherit',
+                                }, rel: "noreferrer", href: i.href, onClick: i.onClick }, i.label)) : (i.label)),
+                            userMenuItems.length > index + 1 && React.createElement(Divider$1, null)));
+                    })))),
             React.createElement(ToolbarMenu, { role: "navigation" },
                 React.createElement(ToolbarMenuInner, null, menuItems.map(function (page) { return _renderToolbarMenuItem(page); }))),
             React.createElement(MobileAppBar, { menuItems: menuItems, userMenuItems: userMenuItems, colors: colors }))));