@applica-software-guru/react-admin 1.5.325 → 1.5.327

package/package.json

@@ -107,5 +107,5 @@
   "type": "module",
   "types": "dist/index.d.ts",
   "typings": "dist/index.d.ts",
-  "version": "1.5.325"
+  "version": "1.5.327"
 }

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

@@ -3,6 +3,7 @@ import { IconButton, Transitions } from '@/components/@extended';
 import { HeaderToggleButton } from '@/components/Layout/Header/Buttons';
 import { useLayoutMediaState, useLayoutNotificationsState } from '@/components/Layout/Provider';
 import { MainCard } from '@/components/MainCard';
+import { Empty } from '@/components/ra-lists';
 import { usePopoverState } from '@/hooks';
 import { BellOutlined, CheckCircleOutlined } from '@ant-design/icons';
 import {
@@ -140,45 +141,58 @@ function HeaderNotificationButton() {
                     </>
                   }
                 >
-                  <List
-                    component="nav"
-                    sx={{
-                      p: 0,
-                      '& .MuiListItemButton-root': {
-                        py: 0.5,
-                        '&.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) => (
-                      <HeaderNotificationItem
-                        key={item.id}
-                        selected={read > 0}
-                        notification={item}
-                        onClick={handleClose}
-                        divider={index < notifications.length - 1}
-                      />
-                    ))}
-                  </List>
-                  {/*@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>
-                      }
+                  {notifications.length === 0 ? (
+                    <Empty
+                      hasCreate={false}
+                      title={<Typography variant="h5">{translate('ra.notification.empty')}</Typography>}
+                      sx={{
+                        '& .ApplicaEmpty-icon': { fontSize: '60px' },
+                        '& .ApplicaEmpty-toolbar': { display: 'none' }
+                      }}
                     />
-                  </ListItemButton>
+                  ) : (
+                    <>
+                      <List
+                        component="nav"
+                        sx={{
+                          p: 0,
+                          '& .MuiListItemButton-root': {
+                            py: 0.5,
+                            '&.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) => (
+                          <HeaderNotificationItem
+                            key={item.id}
+                            selected={read > 0}
+                            notification={item}
+                            onClick={handleClose}
+                            divider={index < notifications.length - 1}
+                          />
+                        ))}
+                      </List>
+                      {/*@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>
+                    </>
+                  )}
                   <Divider />
                 </MainCard>
               </ClickAwayListener>

package/src/components/Pagination/Pagination.tsx

@@ -1,4 +1,4 @@
-import { FC, ReactElement, memo, useCallback, useMemo, useState } from 'react';
+import { FC, ReactElement, memo, useCallback, useEffect, useMemo, useState } from 'react';
 import PropTypes from 'prop-types';
 import { TablePagination, TablePaginationBaseProps, Theme, Toolbar, useMediaQuery } from '@mui/material';
 import {
@@ -20,6 +20,17 @@ const Pagination: FC<PaginationProps> = memo((props) => {
   const isSmall = useMediaQuery((theme: Theme) => theme.breakpoints.down('md'));
   const [currentPage, setCurrentPage] = useState(page - 1); // Stato per la UI
   const { hasCreate } = useResourceDefinition(props);
+  const [isSelectedPage, setIsSelectedPage] = useState(false);
+
+  useEffect(() => {
+    if (page !== currentPage + 1 && !isSelectedPage) {
+      setCurrentPage(page - 1);
+    }
+  }, [currentPage, isSelectedPage, page]);
+
+  useEffect(() => {
+    setIsSelectedPage(false);
+  }, [page]);
 
   const totalPages = useMemo(() => {
     return total != null ? Math.ceil(total / perPage) : undefined;
@@ -62,6 +73,7 @@ const Pagination: FC<PaginationProps> = memo((props) => {
         arrowSelected.includes('KeyboardArrowRightIcon');
 
       setCurrentPage(page);
+      setIsSelectedPage(true);
 
       if (isArrowClick) {
         // apply debounced API call for arrows clicks
@@ -71,7 +83,7 @@ const Pagination: FC<PaginationProps> = memo((props) => {
         setPage(page + 1);
       }
     },
-    [debouncedPageChange, setPage, translate, totalPages]
+    [debouncedPageChange, setPage, translate, totalPages, setIsSelectedPage]
   );
 
   const handlePerPageChange = useCallback(

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

@@ -112,10 +112,12 @@ function Empty({
   const translate = useTranslate();
 
   const getResourceLabel = useGetResourceLabel();
-  const resourceName = translate(`resources.${resource}.forcedCaseName`, {
-    smart_count: 0,
-    _: getResourceLabel(resource, 0)
-  });
+  const resourceName = resource
+    ? translate(`resources.${resource}.forcedCaseName`, {
+        smart_count: 0,
+        _: getResourceLabel(resource, 0)
+      })
+    : translate('ra.empty.no_resource');
 
   const emptyMessage = translate('ra.page.empty', { name: resourceName });
   const inviteMessage = translate('ra.page.invite');