@applica-software-guru/react-admin 1.1.97 → 1.1.99

package/package.json

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

package/src/ApplicaAdmin.tsx

@@ -83,6 +83,10 @@ export type ApplicaAdminProps = AdminProps & {
    * Nome dell'applicazione da mostrare nell'header.
    */
   name: string;
+  /**
+   * Testo da mostrare nel footer. Default: '© Applica Software Guru for'.
+   */
+  copy: string;
   /**
    * Versione dell'applicazione da mostrare nel footer.
    */
@@ -180,6 +184,7 @@ const ApplicaAdmin = ({
   loginPage,
   menu,
   name,
+  copy,
   version,
   dataProvider,
   authProvider,
@@ -244,6 +249,7 @@ const ApplicaAdmin = ({
         <Layout
           {...props}
           name={name}
+          copy={copy}
           version={version}
           logoMain={_logoMain}
           logoIcon={_logoIcon}

package/src/components/Layout/Footer.tsx

@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
 type IFooterProps = {
   name: string;
   version: string;
+  copy?: string;
 };
 
 function Footer(props: IFooterProps) {
@@ -12,7 +13,7 @@ function Footer(props: IFooterProps) {
   return (
     <Stack direction="row" justifyContent="space-between" alignItems="center" sx={{ p: '24px 16px 0px', mt: 'auto' }}>
       <Typography variant="caption">
-        &copy; Applica Software Guru for {name} - {version}
+        <span dangerouslySetInnerHTML={{ __html: props?.copy || '' }} /> {name} - {version}
       </Typography>
     </Stack>
   );
@@ -20,7 +21,11 @@ function Footer(props: IFooterProps) {
 
 Footer.propTypes = {
   name: PropTypes.string.isRequired,
-  version: PropTypes.string.isRequired
+  version: PropTypes.string.isRequired,
+  copy: PropTypes.string
+};
+Footer.defaultProps = {
+  copy: '&copy; Applica Software Guru for'
 };
 
 export { Footer };

package/src/components/Layout/Layout.tsx

@@ -1,18 +1,20 @@
-import { LoadingIndicator } from 'ra-ui-materialui';
 import { Header, HeaderNotification, HeaderProfile, HeaderSpacer, ResponsiveSection } from './Header';
-import { withLayoutProvider } from './Provider';
-import { LayoutWrapper } from './Wrapper';
-import { LayoutContent } from './Content';
-import { Footer } from './Footer';
-import { useBreadcrumbs } from '../../hooks';
+
 import { Breadcrumbs } from '../@extended';
-import { Outlet } from 'react-router-dom';
+import { Footer } from './Footer';
+import { LayoutContent } from './Content';
+import { LayoutWrapper } from './Wrapper';
+import { LoadingIndicator } from 'ra-ui-materialui';
 import { NavMenu } from './NavMenu';
 import { Navigation } from './Navigation';
+import { Outlet } from 'react-router-dom';
+import { useBreadcrumbs } from '../../hooks';
+import { withLayoutProvider } from './Provider';
 
 type ILayoutProps = React.PropsWithChildren<{
   name: string;
   version: string;
+  copy?: string;
 }>;
 
 const Layout = withLayoutProvider(function Layout(props: ILayoutProps) {
@@ -49,7 +51,7 @@ const Layout = withLayoutProvider(function Layout(props: ILayoutProps) {
         )}
         {props.children}
         <Outlet />
-        <Footer name={name} version={version} />
+        <Footer name={name} version={version} copy={props?.copy} />
       </LayoutContent>
     </LayoutWrapper>
   );

package/src/components/Layout/Navigation/NavCollapse.jsx

@@ -12,14 +12,14 @@ import {
   Typography
 } from '@mui/material';
 import { Dot, Transitions } from '../../@extended';
-import { useEffect, useMemo, useState } from 'react';
 import { styled, useTheme } from '@mui/material/styles';
+import { useEffect, useMemo, useState } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
-import { useMenuConfig } from '../../../hooks';
 
 import NavItem from './NavItem';
 import PropTypes from 'prop-types';
 import { useLayoutMediaState } from '../Provider';
+import { useMenuConfig } from '../../../hooks';
 
 const PopperStyled = styled(Popper)(({ theme }) => ({
   overflow: 'visible',

package/src/components/Layout/Navigation/NavItem.jsx

@@ -1,12 +1,12 @@
 import { Avatar, Chip, ListItemButton, ListItemIcon, ListItemText, Typography } from '@mui/material';
 import { Link, useLocation } from 'react-router-dom';
 import { forwardRef, useEffect } from 'react';
-import { useMenuConfig } from '../../../hooks';
 
 import { Dot } from '../../@extended';
 import PropTypes from 'prop-types';
-import { useTheme } from '@mui/material/styles';
 import { useLayoutMediaState } from '../Provider';
+import { useMenuConfig } from '../../../hooks';
+import { useTheme } from '@mui/material/styles';
 
 const NavItem = ({ item, level }) => {
   const theme = useTheme();
@@ -33,7 +33,7 @@ const NavItem = ({ item, level }) => {
 
   // active menu item on page load
   useEffect(() => {
-    if (pathname.includes(item.url)) {
+    if (pathname.endsWith(item.url)) {
       activeItem([item.id]);
     }
     // eslint-disable-next-line

package/src/components/index.jsx

@@ -11,6 +11,7 @@ import ScrollTop from './ScrollTop';
 import ScrollX from './ScrollX';
 import SmallIcon from './SmallIcon';
 export { MainIcon, ActionsMenu, Loadable, Loader, Layout, Logo, MainCard, ScrollTop, ScrollX, MenuPopover, Notification, SmallIcon };
+export * from './Layout';
 
 export * from './@extended';
 export * from './third-party';

package/src/components/ra-buttons/CreateInDialogButton.tsx

@@ -88,7 +88,7 @@ const CreateInDialogContent = ({
     },
     [onClose, onSuccess, queryClient, resource, notify, redirect, _redirect]
   );
-  const { save, isLoading } = useCreateController({
+  const { save, ...createProps } = useCreateController({
     mutationOptions: {
       onSuccess: handleSuccess,
       onError: onError
@@ -110,7 +110,7 @@ const CreateInDialogContent = ({
         {
           record: record,
           save: handleSave,
-          saving: isLoading,
+          saving: createProps?.saving,
           redirect: _redirect
         } as CreateControllerResult
       }
@@ -119,8 +119,8 @@ const CreateInDialogContent = ({
         ...children.props,
         toolbar: (
           <Toolbar>
-            <Button variant="text" size="medium" label="ra.action.cancel" onClick={onClose} />
-            <SaveButton />
+            <Button variant="text" size="medium" label="ra.action.cancel" onClick={onClose} disabled={createProps?.saving} />
+            <SaveButton disabled={createProps?.saving} />
           </Toolbar>
         )
       })}