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

package/src/hooks/useMenu.jsx

@@ -176,15 +176,17 @@ const createNodes = ({ userGroups, resources, permissions, translate, roles }) =
 const useMenu = () => {
   const resources = useResourceDefinitions();
   const { isLoading: loadingIdentity, data: identity } = useGetIdentity();
-  const { permissions } = usePermissions();
+  // Utilizziamo l'identità come discriminante per chiedere a react-query, eventualmente, dati aggiornati.
+  // Il rischio, senza questo passaggio, è di ricevere dati precedenti che non consentono di caricare correttamente la UX.
+  const isAuthenticated = identity && identity.id > 0;
+
+  const { isLoading: loadingPermissions, permissions } = usePermissions(isAuthenticated);
   const { groups: userGroups } = useMenuConfig();
   const translate = useTranslate();
-
   const menu = useMemo(() => {
     if (loadingIdentity || !identity || identity === null || identity?.id <= 0) {
       return null;
     }
-
     const roles = (identity?.roles || []).map((role) => role.id);
     const groups = createNodes({
       resources,
@@ -193,9 +195,8 @@ const useMenu = () => {
       userGroups,
       roles
     });
-
     return groups;
-  }, [loadingIdentity, identity, resources, permissions, translate, userGroups]);
+  }, [loadingIdentity, loadingPermissions, identity, resources, permissions, translate, userGroups]);
 
   const isLoading = useMemo(() => loadingIdentity, [loadingIdentity]);
 

package/src/playground/App.jsx

@@ -2,8 +2,8 @@
 
 import * as entities from './entities';
 
-import { API_URL, FILE_FIELDS } from './config';
-import { ApplicaAdmin, HttpError, Resource } from '@applica-software-guru/react-admin';
+import { API_URL, APP_NAME, FILE_FIELDS } from './config';
+import { ApplicaAdmin, HttpError, RecoverPage, RegisterPage, Resource } from '@applica-software-guru/react-admin';
 import { createAttachmentsParser, createDataProvider } from '@applica-software-guru/crud-client';
 
 import { CustomPage } from './components/pages';
@@ -32,17 +32,20 @@ const App = () => {
       dataProvider={dataProvider}
       defaultLocale="it"
       menu={menu}
-      name="RA"
+      name={APP_NAME}
       version={build.version}
-      disableSignup
-      disableForgotPassword
     >
+      <CustomRoutes>
+        <Route path="/custom-page" element={<CustomPage />} />
+      </CustomRoutes>
+
       <Resource name="entities/notification" {...entities.notification} />
       <Resource name="entities/user" {...entities.user} />
       <Resource name="entities/i18n-message" {...entities.i18nMessage} />
       <Resource name="entities/device" {...entities.device} />
-      <CustomRoutes>
-        <Route path="/custom-page" element={<CustomPage />} />
+      <CustomRoutes noLayout>
+        <Route path="/register" element={<RegisterPage name={APP_NAME} version={build.version} />} />
+        <Route path="/recover" element={<RecoverPage name={APP_NAME} version={build.version} />} />
       </CustomRoutes>
     </ApplicaAdmin>
   );

package/src/playground/config.jsx

@@ -4,6 +4,7 @@ if (appUrl.endsWith(':3000/') || appUrl.indexOf(':51') !== -1) {
   appUrl = 'http://localhost:8080/';
   environment = 'DEVELOPER';
 }
+export const APP_NAME = 'RApplica';
 export const APP_URL = appUrl;
 export const API_URL = `${APP_URL}api`;
 export const ENVIRONMENT = environment;

package/src/playground/menu.jsx

@@ -13,14 +13,6 @@ const config = [
         type: 'item',
         url: '/entities/notification',
         icon: NotificationOutlined
-      },
-      {
-        id: 'entities/bom',
-        title: 'ra.menu.item.entities/bom',
-        type: 'item',
-        url: '/entities/bom',
-        resource: true,
-        icon: TableOutlined
       }
     ]
   },

package/dist/components/ra-pages/LoginPage/AuthCard.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AuthCard.d.ts","sourceRoot":"","sources":["../../../../../src/components/ra-pages/LoginPage/AuthCard.jsx"],"names":[],"mappings":";AAKA;;;4CAqBC;;;;;;sBAxBqB,YAAY"}

package/dist/components/ra-pages/LoginPage/AuthLogin.d.ts

@@ -1,6 +0,0 @@
-export default AuthLogin;
-declare function AuthLogin({ enablePasswordForgot, ...props }: {
-    [x: string]: any;
-    enablePasswordForgot: any;
-}): import("react/jsx-runtime").JSX.Element;
-//# sourceMappingURL=AuthLogin.d.ts.map

package/dist/components/ra-pages/LoginPage/AuthLogin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AuthLogin.d.ts","sourceRoot":"","sources":["../../../../../src/components/ra-pages/LoginPage/AuthLogin.jsx"],"names":[],"mappings":";AAMA;;;4CAsEC"}

package/dist/components/ra-pages/LoginPage/AuthWrapper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AuthWrapper.d.ts","sourceRoot":"","sources":["../../../../../src/components/ra-pages/LoginPage/AuthWrapper.jsx"],"names":[],"mappings":";AAOA;;;;4CA8BC;;;;;;;;sBAhCqB,YAAY"}

package/dist/components/ra-pages/LoginPage/Login.d.ts

@@ -1,34 +0,0 @@
-import PropTypes from 'prop-types';
-export type LoginProps = {
-    /**
-     * Versione dell'applicazione.
-     */
-    version: string;
-    /**
-     * Nome dell'applicazione.
-     */
-    name: string;
-    /**
-     * Indica se abilitare o meno la schermata di recupero password.
-     */
-    enablePasswordForgot?: boolean;
-    /**
-     * Indica se abilitare o meno la schermata di registrazione.
-     */
-    enableSignup?: boolean;
-};
-declare const Login: {
-    ({ version, name, enablePasswordForgot, enableSignup }: LoginProps): import("react/jsx-runtime").JSX.Element;
-    propTypes: {
-        version: PropTypes.Validator<string>;
-        name: PropTypes.Validator<string>;
-        enablePasswordForgot: PropTypes.Requireable<boolean>;
-        enableSignup: PropTypes.Requireable<boolean>;
-    };
-    defaultProps: {
-        enablePasswordForgot: boolean;
-        enableSignup: boolean;
-    };
-};
-export default Login;
-//# sourceMappingURL=Login.d.ts.map

package/dist/components/ra-pages/LoginPage/Login.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Login.d.ts","sourceRoot":"","sources":["../../../../../src/components/ra-pages/LoginPage/Login.tsx"],"names":[],"mappings":"AAKA,OAAO,SAAS,MAAM,YAAY,CAAC;AAGnC,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AACF,QAAA,MAAM,KAAK;4DAA2D,UAAU;;;;;;;;;;;CAqB/E,CAAC;AAaF,eAAe,KAAK,CAAC"}

package/dist/components/ra-pages/LoginPage/index.d.ts

@@ -1,3 +0,0 @@
-export default Login;
-import Login from './Login';
-//# sourceMappingURL=index.d.ts.map

package/dist/components/ra-pages/LoginPage/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/ra-pages/LoginPage/index.jsx"],"names":[],"mappings":";kBAAkB,SAAS"}

package/src/components/ra-pages/LoginPage/AuthLogin.jsx

@@ -1,79 +0,0 @@
-import { AnimateButton, TextInput } from '../../../components';
-import { Button, CircularProgress, Grid, Link, Stack } from '@mui/material';
-import { Form, required, useLogin, useNotify, useSafeSetState, useTranslate } from 'react-admin';
-
-import { Link as RouterLink } from 'react-router-dom';
-
-const AuthLogin = ({ enablePasswordForgot, ...props }) => {
-  const { redirectTo } = props;
-  const [loading, setLoading] = useSafeSetState(false);
-  const login = useLogin();
-  const translate = useTranslate();
-  const notify = useNotify();
-
-  const handleSubmit = (values) => {
-    setLoading(true);
-    login(values, redirectTo)
-      .then(() => {
-        setLoading(false);
-      })
-      .catch((error) => {
-        setLoading(false);
-        notify(
-          typeof error === 'string' ? error : typeof error === 'undefined' || !error.message ? 'ra.auth.sign_in_error' : error.message,
-          {
-            type: 'error',
-            messageArgs: {
-              _: typeof error === 'string' ? error : error && error.message ? error.message : undefined
-            }
-          }
-        );
-      });
-  };
-  return (
-    <Form onSubmit={handleSubmit}>
-      <Grid container>
-        <Grid item xs={12} sx={{ mb: 2 }}>
-          <TextInput
-            autoFocus
-            source="username"
-            label={translate('ra.auth.username')}
-            autoComplete="username"
-            validate={required()}
-            placeholder="user@company.name"
-            fullWidth
-          />
-        </Grid>
-        <Grid item xs={12} sx={{ mb: 2 }}>
-          <TextInput
-            source="password"
-            label={translate('ra.auth.password')}
-            type="password"
-            autoComplete="current-password"
-            validate={required()}
-            placeholder={translate('ra.auth.password_placeholder')}
-            fullWidth
-          />
-        </Grid>
-      </Grid>
-      {enablePasswordForgot && (
-        <Grid item xs={12} sx={{ mt: 1 }}>
-          <Stack direction="row" justifyContent="flex-end" alignItems="flex-end" spacing={2}>
-            <Link variant="h6" component={RouterLink} to={'/forgot-password'} color="text.primary">
-              {translate('ra.auth.forgot_password')}
-            </Link>
-          </Stack>
-        </Grid>
-      )}
-      <Grid item xs={12} sx={{ mt: 1 }}>
-        <AnimateButton>
-          <Button variant="contained" type="submit" color="primary" disabled={loading} fullWidth>
-            {loading ? <CircularProgress size={19} thickness={3} /> : translate('ra.auth.sign_in')}
-          </Button>
-        </AnimateButton>
-      </Grid>
-    </Form>
-  );
-};
-
-export default AuthLogin;

package/src/components/ra-pages/LoginPage/AuthWrapper.jsx

@@ -1,46 +0,0 @@
-import { Box, Grid } from '@mui/material';
-
-import AuthCard from './AuthCard';
-import Footer from '../../Layout/Footer';
-import MainIcon from '../../MainIcon';
-import PropTypes from 'prop-types';
-
-const AuthWrapper = ({ version, name, children }) => (
-  <Box sx={{ minHeight: '100vh' }}>
-    <Grid
-      container
-      direction="column"
-      justifyContent="flex-end"
-      sx={{
-        minHeight: '100vh'
-      }}
-    >
-      <Grid item xs={12} sx={{ ml: 3, mt: 3 }}>
-        <MainIcon title={name} />
-      </Grid>
-      <Grid item xs={12}>
-        <Grid
-          item
-          xs={12}
-          container
-          justifyContent="center"
-          alignItems="center"
-          sx={{ minHeight: { xs: 'calc(100vh - 210px)', sm: 'calc(100vh - 134px)', md: 'calc(100vh - 112px)' } }}
-        >
-          <Grid item>
-            <AuthCard>{children}</AuthCard>
-          </Grid>
-        </Grid>
-        <Footer name={name} version={version} />
-      </Grid>
-    </Grid>
-  </Box>
-);
-
-AuthWrapper.propTypes = {
-  children: PropTypes.node,
-  version: PropTypes.string,
-  name: PropTypes.string
-};
-
-export default AuthWrapper;

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

@@ -1,61 +0,0 @@
-import { Grid, Stack, Typography } from '@mui/material';
-
-import AuthLogin from './AuthLogin';
-import AuthWrapper from './AuthWrapper';
-import { Link } from 'react-router-dom';
-import PropTypes from 'prop-types';
-import { useTranslate } from 'ra-core';
-
-export type LoginProps = {
-  /**
-   * Versione dell'applicazione.
-   */
-  version: string;
-  /**
-   * Nome dell'applicazione.
-   */
-  name: string;
-  /**
-   * Indica se abilitare o meno la schermata di recupero password.
-   */
-  enablePasswordForgot?: boolean;
-  /**
-   * Indica se abilitare o meno la schermata di registrazione.
-   */
-  enableSignup?: boolean;
-};
-const Login = ({ version, name, enablePasswordForgot, enableSignup }: LoginProps) => {
-  const translate = useTranslate();
-  return (
-    <AuthWrapper name={name} version={version}>
-      <Grid container spacing={3}>
-        <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>
-            {enableSignup && (
-              <Typography component={Link} to={'/signup'} variant="body1" sx={{ textDecoration: 'none' }} color="primary">
-                {translate('ra.auth.signup')}
-              </Typography>
-            )}
-          </Stack>
-        </Grid>
-        <Grid item xs={12}>
-          <AuthLogin enablePasswordForgot={enablePasswordForgot} />
-        </Grid>
-      </Grid>
-    </AuthWrapper>
-  );
-};
-
-Login.propTypes = {
-  version: PropTypes.string.isRequired,
-  name: PropTypes.string.isRequired,
-  enablePasswordForgot: PropTypes.bool,
-  enableSignup: PropTypes.bool
-};
-Login.defaultProps = {
-  enablePasswordForgot: true,
-  enableSignup: true
-};
-
-export default Login;

package/src/components/ra-pages/LoginPage/index.jsx

@@ -1,3 +0,0 @@
-import Login from './Login';
-
-export default Login;