@applica-software-guru/react-admin 1.3.139 → 1.3.141

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applica-software-guru/react-admin",
-  "version": "1.3.139",
+  "version": "1.3.141",
   "private": false,
   "repository": {
     "type": "git",

package/src/components/Layout/Drawer/Drawer.tsx

@@ -32,7 +32,8 @@ function Drawer(props: IDrawerProps) {
                 width: width,
                 borderRight: `1px solid ${theme.palette.divider}`,
                 backgroundImage: 'none',
-                boxShadow: 'inherit'
+                boxShadow: 'inherit',
+                overflow: 'hidden'
               }
             }
           };

package/src/components/Layout/Header/Notification/Notification.tsx

@@ -1,11 +1,25 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
-import { Badge, Box, ClickAwayListener, List, Paper, Popper, Tooltip, useTheme } from '@mui/material';
+import {
+  Badge,
+  Box,
+  ClickAwayListener,
+  Divider,
+  List,
+  ListItemButton,
+  ListItemText,
+  Paper,
+  Popper,
+  Tooltip,
+  Typography,
+  useTheme
+} from '@mui/material';
 import { useLayoutMediaState, useLayoutNotificationsState, useLayoutThemeState } from '../../Provider';
 import { IconButton, Transitions } from '../../../@extended';
 import { BellOutlined, CheckCircleOutlined } from '@ant-design/icons';
-import { useGetList } from 'ra-core';
+import { useGetList, useTranslate } from 'ra-core';
 import MainCard from '../../../MainCard';
 import { HeaderNotificationItem, INotification } from './NotificationItem';
+import { Link } from 'react-router-dom';
 
 const avatarSX = {
   width: 36,
@@ -32,6 +46,7 @@ function HeaderNotification() {
 function HeaderNotificationButton() {
   const theme = useTheme(),
     anchorRef = useRef(),
+    translate = useTranslate(),
     { resource } = useLayoutNotificationsState(),
     { downMd } = useLayoutMediaState(),
     { iconColor, iconColorOpen } = useLayoutThemeState(),
@@ -44,10 +59,11 @@ function HeaderNotificationButton() {
       if (anchorRef.current && anchorRef.current.contains(event.target)) {
         return;
       }
+
       setNotificationOpen(false);
     }, [anchorRef.current, setNotificationOpen]),
     { data, isLoading } = useGetList<INotification>(resource, {
-      pagination: { page: 1, perPage: 50 },
+      pagination: { page: 1, perPage: 25 },
       sort: { field: 'created', order: 'DESC' },
       filter: {
         readed: false
@@ -138,7 +154,9 @@ function HeaderNotificationButton() {
                         '&.Mui-selected': { bgcolor: 'grey.50', color: 'text.primary' },
                         '& .MuiAvatar-root': avatarSX,
                         '& .MuiListItemSecondaryAction-root': { ...actionSX, position: 'relative' }
-                      }
+                      },
+                      maxHeight: 'calc(100vh - 240px)',
+                      overflow: 'auto'
                     }}
                   >
                     {notifications.map((item, index) => (
@@ -146,11 +164,27 @@ function HeaderNotificationButton() {
                         key={item.id}
                         selected={read > 0}
                         notification={item}
-                        onClick={handleClose}
+                        onClick={handleToggle}
                         divider={index < notifications.length - 1}
                       />
                     ))}
                   </List>
+                  <Divider />
+                  {/*@ts-ignore*/}
+                  <ListItemButton
+                    sx={{ textAlign: 'center', py: `${12}px !important` }}
+                    to={`/${resource}`}
+                    LinkComponent={Link}
+                    onClick={handleClose}
+                  >
+                    <ListItemText
+                      primary={
+                        <Typography variant="h6" color="primary">
+                          {translate('ra.notification.view_all')}
+                        </Typography>
+                      }
+                    />
+                  </ListItemButton>
                 </MainCard>
               </ClickAwayListener>
             </Paper>

package/src/components/Layout/Header/Notification/NotificationItem.tsx

@@ -37,11 +37,13 @@ function HeaderNotificationItem(props: IHeaderNotificationItemProps) {
       },
       {
         onSuccess: () => {
+          // eslint-disable-next-line no-console
           if (notification?.resource) {
             if (notification?.resource.startsWith('/')) {
               redirect(notification?.resource);
               onClick();
             } else {
+              onClick();
               document.location.href = notification?.resource;
             }
           } else {

package/src/components/ra-lists/List.tsx

@@ -181,6 +181,7 @@ const ApplicaStyledList = styled(RaList, {
     },
 
     '& .RaList-content': {
+      borderRadius: 0,
       // Resolve an issue related to the visualization of the bulk actions toolbar.
       // Padding and margin create a non empty space that allows the toolbar to be displayed when
       // the selection is empty.

package/src/hooks/useMenu.jsx

@@ -109,7 +109,11 @@ const createNodes = ({ userGroups, resources, permissions, translate, roles }) =
     if (group.children) {
       group.children = group.children.filter((child) => {
         if (child.resource === false) {
-          return true;
+          const childRoles = child.roles || [];
+          if (childRoles.length === 0 || childRoles.some((role) => roles.includes(role))) {
+            return true;
+          }
+          return false;
         }
         if (child.type === 'item') {
           return resources.includes(child.id);