@applica-software-guru/react-admin 1.0.60 → 1.0.61

package/package.json

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

package/src/ApplicaAdmin.tsx

@@ -1,3 +1,4 @@
+import { AdminProps, AuthProvider, DataProvider } from 'react-admin';
 import { AppConfigProvider, MenuConfigProvider, MenuPropTypes, ThemeConfigProvider } from './contexts';
 import { CatchResult, useCliErrorCatcher } from './dev';
 import { Layout, LoginPage, MainIcon, Notification, SmallIcon } from './components';
@@ -5,7 +6,6 @@ import React, { useMemo } from 'react';
 import { createI18nProvider, useI18nCatcher, useI18nLanguages } from './i18n';
 
 import Admin from './Admin';
-import { AdminProps } from 'react-admin';
 import { I18nCatcherBodyBuilderResultProps } from './i18n/useI18nCatcher';
 import { MenuProps } from 'src/types';
 import PropTypes from 'prop-types';
@@ -85,13 +85,14 @@ export type ApplicaAdminProps = AdminProps & {
   /**
    * Il provider di autenticazione da utilizzare nell'applicazione.
    */
-  dataProvider: any;
+  dataProvider: DataProvider;
   /**
    * Il provider di dati da utilizzare nell'applicazione.
    */
-  authProvider: any;
+  authProvider: AuthProvider;
   /**
    * Indica il nome della risorsa REST da utilizzare per la gestione delle notifiche.
+   * @default "entities/notification"
    * @example
    * // In questo caso, le notifiche verranno gestite tramite la risorsa "entities/notification"
    * <ApplicaAdmin notification="entities/notification" />
@@ -102,18 +103,33 @@ export type ApplicaAdminProps = AdminProps & {
    * Se le notifiche sono abilitate comparirà automaticamente un'icona in alto a destra nell'header.
    *
    * @example
-   * // In questo caso, le notifiche verranno disabilitate
-   * <ApplicaAdmin disableNotification />
+   * <ApplicaAdmin enableNotification />
    */
-  disableNotification: boolean;
+  enableNotification: boolean;
   /**
    * Indica se la schermata di registrazione deve essere disabilitata.
+   * Se abilitata è necessario registrare una pagina, nelle rotte, che punti a /register
+   *
+   * @example
+   * // Pagina di base realizzata da Applica
+   * import { RegisterPage } from "@applica-software-guru/react-admin";
+   * <CustomRoutes noLayout>
+   *  <Route path="/register" component={RegisterPage} />
+   * </CustomRoutes>
    */
-  disableSignup: boolean;
+  enableRegistration: boolean;
   /**
    * Indica se la schermata di recupero password deve essere disabilitata.
+   * Se abilitata è necessario registrare una pagina, nelle rotte, che punti a /recover
+   *
+   * @example
+   * // Pagina di base realizzata da Applica
+   * import { RecoverPage } from "@applica-software-guru/react-admin";
+   * <CustomRoutes noLayout>
+   *  <Route path="/recover" component={RecoverPage} />
+   * </CustomRoutes>
    */
-  disableForgotPassword: boolean;
+  enablePasswordRecover: boolean;
 };
 
 /**
@@ -162,9 +178,9 @@ const ApplicaAdmin = ({
   dataProvider,
   authProvider,
   notification,
-  disableNotification,
-  disableSignup,
-  disableForgotPassword,
+  enableNotification,
+  enableRegistration,
+  enablePasswordRecover,
   ...props
 }: ApplicaAdminProps) => {
   const languages = useI18nLanguages({
@@ -204,11 +220,16 @@ const ApplicaAdmin = ({
   });
   const login = useMemo(() => {
     if (React.isValidElement(loginPage)) {
-      // @ts-ignore
-      return React.cloneElement(loginPage, { name, version, enableSignup: !disableSignup, enablePasswordForgot: !disableForgotPassword });
+      return React.cloneElement(loginPage, {
+        // @ts-ignore
+        name,
+        version,
+        enableRegistration,
+        enablePasswordRecover
+      });
     }
     return loginPage;
-  }, [loginPage, name, version, disableSignup, disableForgotPassword]);
+  }, [loginPage, name, version, enableRegistration, enablePasswordRecover]);
   const layout = useMemo(
     () => (props: any) => {
       const _logoMain = name ? <MainIcon title={name} /> : logoMain;
@@ -221,11 +242,11 @@ const ApplicaAdmin = ({
           logoMain={_logoMain}
           logoIcon={_logoIcon}
           notification={notification}
-          disableNotification={disableNotification}
+          enableNotification={enableNotification}
         />
       );
     },
-    [logoMain, logoIcon, name, version, notification, disableNotification]
+    [logoMain, logoIcon, name, version, notification, enableNotification]
   );
 
   if (languages?.loading) {
@@ -266,9 +287,9 @@ ApplicaAdmin.defaultProps = {
   development: false,
   version: '0.0.0',
   notification: 'entities/notification',
-  disableNotification: false,
-  disableSignup: false,
-  disableForgotPassword: false,
+  enableNotification: false,
+  enableRegistration: false,
+  enableForgotPassword: false,
   loginPage: <LoginPage version="0.0.0" name="Applica" redirectTo="/" />
 };
 
@@ -286,9 +307,9 @@ ApplicaAdmin.propTypes = {
   authProvider: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
   dataProvider: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
   notification: PropTypes.string,
-  disableNotification: PropTypes.bool,
-  disableSignup: PropTypes.bool,
-  disableForgotPassword: PropTypes.bool
+  enableNotification: PropTypes.bool,
+  enableRegistration: PropTypes.bool,
+  enableForgotPassword: PropTypes.bool
 };
 
 export default ApplicaAdmin;

package/src/components/Layout/Header/HeaderContent/index.jsx

@@ -8,7 +8,7 @@ import Notification from './Notification';
 import Profile from './Profile';
 import PropTypes from 'prop-types';
 
-const HeaderContent = ({ logoMain, logoIcon, notification, disableNotification }) => {
+const HeaderContent = ({ logoMain, logoIcon, notification, enableNotification }) => {
   const matchesXs = useMediaQuery((theme) => theme.breakpoints.down('md'));
   const { isHorizontalLayout, menuOrientation } = useThemeConfig();
   const { drawerOpen } = useMenuConfig();
@@ -19,7 +19,7 @@ const HeaderContent = ({ logoMain, logoIcon, notification, disableNotification }
       {matchesXs && <Box sx={{ width: '100%', ml: 1 }} />}
 
       <LoadingIndicator />
-      {!disableNotification && <Notification resource={notification} />}
+      {enableNotification && <Notification resource={notification} />}
       {!matchesXs && <Profile />}
       {matchesXs && <MobileSection />}
     </>
@@ -30,7 +30,7 @@ HeaderContent.propTypes = {
   logoMain: PropTypes.node,
   logoIcon: PropTypes.node,
   notification: PropTypes.string,
-  disableNotification: PropTypes.bool
+  enableNotification: PropTypes.bool
 };
 
 export default HeaderContent;

package/src/components/Layout/Header/index.jsx

@@ -9,14 +9,14 @@ import { useMemo } from 'react';
 import { useTheme } from '@mui/material/styles';
 import { useThemeConfig } from '../../../hooks';
 
-const Header = ({ open, logoMain, logoIcon, handleDrawerToggle, notification, disableNotification }) => {
+const Header = ({ open, logoMain, logoIcon, handleDrawerToggle, notification, enableNotification }) => {
   const theme = useTheme();
   const downLG = useMediaQuery(theme.breakpoints.down('lg'));
   const { menuOrientation, isHorizontalLayout } = useThemeConfig();
 
   const isHorizontal = isHorizontalLayout(menuOrientation) && !downLG;
   const headerContent = useMemo(
-    () => <HeaderContent logoMain={logoMain} logoIcon={logoIcon} notification={notification} disableNotification={disableNotification} />,
+    () => <HeaderContent logoMain={logoMain} logoIcon={logoIcon} notification={notification} enableNotification={enableNotification} />,
     [logoMain, logoIcon, notification]
   );
 
@@ -75,7 +75,7 @@ Header.propTypes = {
   logoMain: PropTypes.node,
   logoIcon: PropTypes.node,
   notification: PropTypes.string,
-  disableNotification: PropTypes.bool
+  enableNotification: PropTypes.bool
 };
 
 export default Header;

package/src/components/Layout/index.jsx

@@ -13,7 +13,7 @@ import { Outlet } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import { useTheme } from '@mui/material/styles';
 
-const Layout = ({ children, name, version, logoMain, logoIcon, notification, disableNotification }) => {
+const Layout = ({ children, name, version, logoMain, logoIcon, notification, enableNotification }) => {
   const theme = useTheme();
   const { openDrawer } = useMenuConfig();
   const { isLoading, navigation, breadcrumbs } = useBreadcrumbs();
@@ -49,7 +49,7 @@ const Layout = ({ children, name, version, logoMain, logoIcon, notification, dis
         logoMain={logoMain}
         logoIcon={logoIcon}
         notification={notification}
-        disableNotification={disableNotification}
+        enableNotification={enableNotification}
       />
       {!isHorizontal ? (
         <Drawer open={open} handleDrawerToggle={handleDrawerToggle} logoMain={logoMain} logoIcon={logoIcon} />
@@ -97,7 +97,7 @@ Layout.propTypes = {
   logoMain: PropTypes.node,
   logoIcon: PropTypes.node,
   notification: PropTypes.string,
-  disableNotification: PropTypes.bool
+  enableNotification: PropTypes.bool
 };
 
 export default Layout;

package/src/components/ra-pages/LoginPage.tsx

@@ -22,7 +22,7 @@ export type LoginPageProps = BaseAuthProps & {
    *  <Route path="/recover" component={RecoverPage} />
    * </CustomRoutes>
    */
-  enablePasswordForgot?: boolean;
+  enablePasswordRecover?: boolean;
   /**
    * Indica se abilitare o meno la schermata di registrazione.
    * Se abilitato è opportuno registrare una rotta a /register con un componente
@@ -35,14 +35,14 @@ export type LoginPageProps = BaseAuthProps & {
    *  <Route path="/register" component={RegisterPage} />
    * </CustomRoutes>
    */
-  enableRegister?: boolean;
+  enableRegistration?: boolean;
   /**
    * Indica la pagina a cui reindirizzare l'utente dopo il login.
    * Se non specificata viene utilizzata la home page di react-admin.
    */
   redirectTo: string;
 };
-const LoginPage = ({ version, name, enablePasswordForgot, enableRegister, redirectTo, background }: LoginPageProps) => {
+const LoginPage = ({ version, name, enablePasswordRecover, enableRegistration, redirectTo, background }: LoginPageProps) => {
   const [loading, setLoading] = useSafeSetState(false);
   const login = useLogin();
   const translate = useTranslate();
@@ -83,7 +83,7 @@ const LoginPage = ({ version, name, enablePasswordForgot, enableRegister, redire
         <Grid item xs={12}>
           <Stack direction="row" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
             <Typography variant="h3">Login</Typography>
-            {enableRegister && (
+            {enableRegistration && (
               <Typography component={RouterLink} to={'/register'} variant="body1" sx={{ textDecoration: 'none' }} color="primary">
                 {translate('ra.auth.register')}
               </Typography>
@@ -116,7 +116,7 @@ const LoginPage = ({ version, name, enablePasswordForgot, enableRegister, redire
                 />
               </Grid>
             </Grid>
-            {enablePasswordForgot && (
+            {enablePasswordRecover && (
               <Grid item xs={12} sx={{ mt: 1 }}>
                 <Stack direction="row" justifyContent="flex-end" alignItems="flex-end" spacing={2}>
                   <Link variant="h6" component={RouterLink} to={'/recover'} color="text.primary">
@@ -140,13 +140,13 @@ const LoginPage = ({ version, name, enablePasswordForgot, enableRegister, redire
 LoginPage.propTypes = {
   version: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
-  enablePasswordForgot: PropTypes.bool,
+  enablePasswordRecover: PropTypes.bool,
   enableRegister: PropTypes.bool,
   background: PropTypes.element
 };
 LoginPage.defaultProps = {
-  enablePasswordForgot: true,
-  enableRegister: true,
+  enablePasswordRecover: false,
+  enableRegister: false,
   background: <AuthBackground />
 };
 

package/src/playground/App.jsx

@@ -34,6 +34,9 @@ const App = () => {
       menu={menu}
       name={APP_NAME}
       version={build.version}
+      enableNotification
+      enableRegistration
+      enablePasswordRecover
     >
       <CustomRoutes>
         <Route path="/custom-page" element={<CustomPage />} />