@movalib/movalib-commons 1.1.91 → 1.2.0

package/dist/src/AccountValidation.js

@@ -47,7 +47,7 @@ var AccountValidation = function (_a) {
     var movaAppType = _a.movaAppType, smsValidation = _a.smsValidation, resetPassword = _a.resetPassword, onSubmit = _a.onSubmit, onResendSecurityCode = _a.onResendSecurityCode;
     var _f = (0, react_1.useState)(true), loading = _f[0], setLoading = _f[1];
     var _g = (0, react_1.useState)(initialFormState), validationForm = _g[0], setValidationForm = _g[1];
-    //const location = useLocation();
+    var location = (0, react_router_dom_1.useLocation)();
     var history = (0, react_router_dom_1.useHistory)();
     var theme = (0, material_1.useTheme)();
     var _h = (0, react_1.useState)(false), emptyPwd = _h[0], setEmptyPwd = _h[1];
@@ -238,10 +238,7 @@ var AccountValidation = function (_a) {
                                         display: 'flex',
                                         flexDirection: 'column',
                                         alignItems: 'center',
-                                    } }, { children: [(0, jsx_runtime_1.jsx)("img", { src: getMovaLogo(), style: { width: '50%' } }), (0, jsx_runtime_1.jsx)("br", {})] })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ sx: { mt: 2, mb: 3 } }, { children: movaAppType === Enums_1.MovaAppType.INDIVIDUAL ?
-                                        resetPassword ? "Définis ton nouveau mot de passe" : "Pour commencer, définis ton mot de passe et active ton compte 😉"
-                                        :
-                                            resetPassword ? "Définissez votre nouveau mot de passe" : "Pour commencer, définissez votre mot de passe et activez votre compte 😉" })) })), smsValidation && (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsx)(material_1.TextField, { label: "Code re\u00E7u par SMS", required: true, fullWidth: true, name: "securityCode", variant: "outlined", value: (_b = validationForm.securityCode) === null || _b === void 0 ? void 0 : _b.value, error: !((_c = validationForm.securityCode) === null || _c === void 0 ? void 0 : _c.isValid), helperText: Boolean((_d = validationForm.securityCode) === null || _d === void 0 ? void 0 : _d.error) ? (_e = validationForm.securityCode) === null || _e === void 0 ? void 0 : _e.error : null, onChange: function (e) { return handleInputChange(e); }, inputProps: {
+                                    } }, { children: [(0, jsx_runtime_1.jsx)("img", { src: getMovaLogo(), style: { width: '50%' } }), (0, jsx_runtime_1.jsx)("br", {})] })) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ sx: { mt: 2, mb: 3 } }, { children: resetPassword ? "Définissez votre nouveau mot de passe" : "Pour commencer, définissez votre mot de passe et activez votre compte 😉" })) })), smsValidation && (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsx)(material_1.TextField, { label: "Code re\u00E7u par SMS", required: true, fullWidth: true, name: "securityCode", variant: "outlined", value: (_b = validationForm.securityCode) === null || _b === void 0 ? void 0 : _b.value, error: !((_c = validationForm.securityCode) === null || _c === void 0 ? void 0 : _c.isValid), helperText: Boolean((_d = validationForm.securityCode) === null || _d === void 0 ? void 0 : _d.error) ? (_e = validationForm.securityCode) === null || _e === void 0 ? void 0 : _e.error : null, onChange: function (e) { return handleInputChange(e); }, inputProps: {
                                                 maxLength: 6,
                                                 inputMode: 'numeric',
                                                 pattern: '[0-9]*' // Permet seulement la saisie de chiffres
@@ -251,6 +248,6 @@ var AccountValidation = function (_a) {
                                         endAdornment: ((0, jsx_runtime_1.jsx)(InputAdornment_1.default, __assign({ position: "end" }, { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, __assign({ edge: "end", onClick: function (e) { return setShowPassword(function (prev) { return !prev; }); } }, { children: showPassword ? (0, jsx_runtime_1.jsx)(VisibilityOff_1.default, {}) : (0, jsx_runtime_1.jsx)(Visibility_1.default, {}) })) }))),
                                     } }) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12, sx: { mt: 2, display: 'flex', justifyContent: 'start' } }, { children: (0, jsx_runtime_1.jsxs)(material_1.FormControl, __assign({ error: !validationForm.acceptsTerms.isValid }, { children: [(0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { name: "acceptsTerms", color: "primary", checked: validationForm.acceptsTerms.value, onChange: function (e, checked) { return handleCheckboxChange(e, checked); }, sx: { pr: 4 } }), label: (0, jsx_runtime_1.jsxs)("span", { children: ["J'accepte ", movaAppType === Enums_1.MovaAppType.GARAGE ? "sans réserve" : '', " les", ' ', (0, jsx_runtime_1.jsx)("a", __assign({ href: movaAppType === Enums_1.MovaAppType.GARAGE ? proCGUPath : CGUPath, target: "_blank", style: { color: theme.palette.primary.main } }, { children: "Conditions G\u00E9n\u00E9rales d'Utilisation" })), movaAppType === Enums_1.MovaAppType.GARAGE &&
                                                         (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["\u00A0", (0, jsx_runtime_1.jsx)("br", {}), "et les ", ' ', (0, jsx_runtime_1.jsx)("a", __assign({ href: proCGVPath, target: "_blank", style: { color: theme.palette.primary.main } }, { children: "Conditions G\u00E9n\u00E9rales de Vente" }))] })] }) }), (0, jsx_runtime_1.jsx)(material_1.FormHelperText, { children: validationForm.acceptsTerms.error })] })) }))] })) })), loading &&
-                (0, jsx_runtime_1.jsx)(material_1.Box, __assign({ display: "flex", justifyContent: "center", alignItems: "center", minHeight: "100vh" }, { children: (0, jsx_runtime_1.jsx)(material_1.CircularProgress, {}) })), openPhoneNumberInput && (0, jsx_runtime_1.jsx)(ConfirmationDialog_1.default, { open: openPhoneNumberInput, confirmLabel: "Envoyer", closeLabel: "Annuler", onClose: function () { return setOpenPhoneNumberInput(false); }, onConfirm: resendCode, message: (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(material_1.Typography, { children: [(0, jsx_runtime_1.jsx)("b", { children: "Indique nous ton num\u00E9ro de t\u00E9l\u00E9phone" }), (0, jsx_runtime_1.jsx)("br", {})] }), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", fullWidth: true, required: true, id: "phoneNumber", label: "N\u00B0 de t\u00E9l\u00E9phone", name: "phoneNumber", autoComplete: "tel", onChange: function (e) { return handleInputChange(e); }, value: validationForm.phoneNumber.value, error: Boolean(validationForm.phoneNumber.error), helperText: validationForm.phoneNumber.error }) }))] }) })] }));
+                (0, jsx_runtime_1.jsx)(material_1.Box, __assign({ display: "flex", justifyContent: "center", alignItems: "center", minHeight: "100vh" }, { children: (0, jsx_runtime_1.jsx)(material_1.CircularProgress, {}) })), openPhoneNumberInput && (0, jsx_runtime_1.jsx)(ConfirmationDialog_1.default, { open: openPhoneNumberInput, confirmLabel: "Envoyer", closeLabel: "Annuler", onClose: function () { return setOpenPhoneNumberInput(false); }, onConfirm: resendCode, message: (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(material_1.Typography, { children: [(0, jsx_runtime_1.jsx)("b", { children: "Indiquez nous votre num\u00E9ro de t\u00E9l\u00E9phone" }), (0, jsx_runtime_1.jsx)("br", {})] }), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", fullWidth: true, required: true, id: "phoneNumber", label: "N\u00B0 de t\u00E9l\u00E9phone", name: "phoneNumber", autoComplete: "tel", onChange: function (e) { return handleInputChange(e); }, value: validationForm.phoneNumber.value, error: Boolean(validationForm.phoneNumber.error), helperText: validationForm.phoneNumber.error }) }))] }) })] }));
 };
 exports.default = AccountValidation;

package/dist/src/GenderSelector.d.ts

@@ -4,7 +4,7 @@ import { MovaFormField } from './helpers/Types';
 interface GenderSelectorProps {
     handleSelectChange: (event: SelectChangeEvent<string>) => void;
     form: {
-        gender: MovaFormField;
+        gender?: MovaFormField;
     };
     required?: boolean;
     sx?: SxProps<Theme>;

package/dist/src/GenderSelector.js

@@ -14,8 +14,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var material_1 = require("@mui/material");
 var GenderSelector = function (_a) {
+    var _b, _c, _d;
     var handleSelectChange = _a.handleSelectChange, form = _a.form, required = _a.required, sx = _a.sx;
     var theme = (0, material_1.useTheme)();
-    return ((0, jsx_runtime_1.jsxs)(material_1.FormControl, __assign({ fullWidth: true, margin: "normal", required: required, sx: __assign({}, sx) }, { children: [(0, jsx_runtime_1.jsx)(material_1.InputLabel, __assign({ id: "gender-label" }, { children: "Sexe" })), (0, jsx_runtime_1.jsxs)(material_1.Select, __assign({ labelId: "gender-label", id: "gender", name: "gender", label: "Sexe", value: form.gender.value, onChange: function (e) { return handleSelectChange(e); }, error: Boolean(form.gender.error) }, { children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: "MALE" }, { children: "Homme" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: "FEMALE" }, { children: "Femme" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: "OTHER" }, { children: "Autre" }))] })), (0, jsx_runtime_1.jsx)(material_1.FormHelperText, __assign({ sx: { color: theme.palette.error.main } }, { children: form.gender.error }))] })));
+    return ((0, jsx_runtime_1.jsxs)(material_1.FormControl, __assign({ fullWidth: true, margin: "normal", required: required, sx: __assign({}, sx) }, { children: [(0, jsx_runtime_1.jsx)(material_1.InputLabel, __assign({ id: "gender-label" }, { children: "Sexe" })), (0, jsx_runtime_1.jsxs)(material_1.Select, __assign({ labelId: "gender-label", id: "gender", name: "gender", label: "Sexe", value: (_b = form.gender) === null || _b === void 0 ? void 0 : _b.value, onChange: function (e) { return handleSelectChange(e); }, error: Boolean((_c = form.gender) === null || _c === void 0 ? void 0 : _c.error) }, { children: [(0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: "MALE" }, { children: "Homme" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: "FEMALE" }, { children: "Femme" })), (0, jsx_runtime_1.jsx)(material_1.MenuItem, __assign({ value: "OTHER" }, { children: "Autre" }))] })), (0, jsx_runtime_1.jsx)(material_1.FormHelperText, __assign({ sx: { color: theme.palette.error.main } }, { children: (_d = form.gender) === null || _d === void 0 ? void 0 : _d.error }))] })));
 };
 exports.default = GenderSelector;

package/dist/src/MovaDialog.js

@@ -60,6 +60,6 @@ var MovaDialog = function (_a) {
                     zIndex: 0,
                     left: 0,
                     opacity: '0.2'
-                }, alt: 'Feuille Movalib' }), title && (0, jsx_runtime_1.jsx)(material_1.DialogTitle, __assign({ id: "garage-dialog-title", sx: { textAlign: 'center', p: 0, pt: 1, mt: 0, mb: 0, zIndex: 10 } }, { children: (0, jsx_runtime_1.jsx)(material_1.AppBar, __assign({ sx: { position: 'relative' }, color: "transparent", elevation: 0 }, { children: (0, jsx_runtime_1.jsxs)(material_1.Toolbar, { children: [closable && (0, jsx_runtime_1.jsx)(material_1.IconButton, __assign({ edge: "start", color: "inherit", onClick: handleOnBack, "aria-label": "close" }, { children: (0, jsx_runtime_1.jsx)(ArrowBackIosNewRounded_1.default, {}) })), (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ sx: { textAlign: 'center', fontSize: 20, flexGrow: 1, pl: '20px', pr: '40px' }, style: titleStyle }, { children: title }))] }) })) })), (0, jsx_runtime_1.jsxs)(material_1.DialogContent, __assign({ sx: { zIndex: 20 } }, { children: [children, message && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: "error", sx: { mb: 2 } }, { children: message }))] })), (0, jsx_runtime_1.jsx)(material_1.DialogActions, __assign({ sx: { justifyContent: 'center' } }, { children: actions }))] })));
+                }, alt: 'Feuille Movalib' }), title && (0, jsx_runtime_1.jsx)(material_1.DialogTitle, __assign({ id: "garage-dialog-title", sx: { textAlign: 'center', p: 0, pt: 1, mt: 0, mb: 0, zIndex: 10 } }, { children: (0, jsx_runtime_1.jsx)(material_1.AppBar, __assign({ sx: { position: 'relative' }, color: "transparent", elevation: 0 }, { children: (0, jsx_runtime_1.jsxs)(material_1.Toolbar, { children: [closable && (0, jsx_runtime_1.jsx)(material_1.IconButton, __assign({ edge: "start", color: "inherit", onClick: handleOnBack, "aria-label": "close" }, { children: (0, jsx_runtime_1.jsx)(ArrowBackIosNewRounded_1.default, {}) })), (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ sx: { textAlign: 'center', fontSize: 20, flexGrow: 1, pl: closable ? '20px' : 'Opx', pr: closable ? '40px' : '0px' }, style: titleStyle }, { children: title }))] }) })) })), (0, jsx_runtime_1.jsxs)(material_1.DialogContent, __assign({ sx: { zIndex: 20 } }, { children: [children, message && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: "error", sx: { mb: 2 } }, { children: message }))] })), (0, jsx_runtime_1.jsx)(material_1.DialogActions, __assign({ sx: { justifyContent: 'center' } }, { children: actions }))] })));
 };
 exports.default = MovaDialog;

package/dist/src/MovaSignUp.js

@@ -53,7 +53,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
 var lab_1 = require("@mui/lab");
-var DatePicker_1 = require("@mui/x-date-pickers/DatePicker");
 var logo_large_border_png_1 = __importDefault(require("./assets/images/logo/logo_large_border.png"));
 var logo_pro_large_border_png_1 = __importDefault(require("./assets/images/logo/logo_pro_large_border.png"));
 var logo_large_dm_png_1 = __importDefault(require("./assets/images/logo/logo_large_dm.png"));
@@ -64,14 +63,15 @@ var material_1 = require("@mui/material");
 var MovaCopyright_1 = __importDefault(require("./MovaCopyright"));
 var Enums_1 = require("./helpers/Enums");
 var Validator_1 = require("./helpers/Validator");
-var GenderSelector_1 = __importDefault(require("./GenderSelector"));
 var Tools_1 = require("./helpers/Tools");
 var react_router_dom_1 = require("react-router-dom");
 var InputAdornment_1 = __importDefault(require("@mui/material/InputAdornment"));
 var Visibility_1 = __importDefault(require("@mui/icons-material/Visibility"));
 var VisibilityOff_1 = __importDefault(require("@mui/icons-material/VisibilityOff"));
 var Info_1 = __importDefault(require("@mui/icons-material/Info"));
-var isValid_1 = __importDefault(require("date-fns/isValid"));
+var Logger_1 = __importDefault(require("./helpers/Logger"));
+// ATTENTION : s'assurer de la présence des documents suivants à la racine du composant porteur (dossier 'public')
+var CGUPath = "/Movalib_CGU.pdf";
 // Permet de centrer le contenu de l'application
 var styles = {
     display: 'flex',
@@ -93,15 +93,14 @@ var initialUserFormState = {
  * ATTENTION : le lien de consultation des CGU doit pointer vers "/terms-and-conditions"
  */
 var MovaLogin = function (_a) {
-    var _b, _c, _d;
-    var loading = _a.loading, movaAppType = _a.movaAppType, onSubmit = _a.onSubmit, _e = _a.darkMode, darkMode = _e === void 0 ? false : _e, alertMessage = _a.alertMessage, alertSeverity = _a.alertSeverity, headerText = _a.headerText;
-    var _f = (0, react_1.useState)(initialUserFormState), userForm = _f[0], setUserForm = _f[1];
+    var loading = _a.loading, movaAppType = _a.movaAppType, onSubmit = _a.onSubmit, _b = _a.darkMode, darkMode = _b === void 0 ? false : _b, alertMessage = _a.alertMessage, alertSeverity = _a.alertSeverity, headerText = _a.headerText;
+    var _c = (0, react_1.useState)(initialUserFormState), userForm = _c[0], setUserForm = _c[1];
     var history = (0, react_router_dom_1.useHistory)();
-    var _g = (0, react_1.useState)(""), message = _g[0], setMessage = _g[1];
+    var _d = (0, react_1.useState)(""), message = _d[0], setMessage = _d[1];
     var theme = (0, material_1.useTheme)();
-    var _h = (0, react_1.useState)(false), showPassword = _h[0], setShowPassword = _h[1];
-    var _j = (0, react_1.useState)(false), openEmailInfo = _j[0], setOpenEmailInfo = _j[1];
-    var _k = (0, react_1.useState)(false), openPhoneNumberInfo = _k[0], setOpenPhoneNumberInfo = _k[1];
+    var _e = (0, react_1.useState)(false), showPassword = _e[0], setShowPassword = _e[1];
+    var _f = (0, react_1.useState)(false), openEmailInfo = _f[0], setOpenEmailInfo = _f[1];
+    var _g = (0, react_1.useState)(false), openPhoneNumberInfo = _g[0], setOpenPhoneNumberInfo = _g[1];
     var handleDateChange = function (name, date) {
         var _a;
         if (name && date) {
@@ -171,21 +170,22 @@ var MovaLogin = function (_a) {
         newForm.firstname = (0, Tools_1.validateField)(userForm.firstname, function (value) { return !!value; }, 'Champ obligatoire');
         newForm.lastname = (0, Tools_1.validateField)(userForm.lastname, function (value) { return !!value; }, 'Champ obligatoire');
         newForm.email = (0, Tools_1.validateField)(userForm.email, function (value) { return !!value; }, 'Champ obligatoire');
-        newForm.password = (0, Tools_1.validateField)(userForm.password, function (value) { return !!value; }, 'Champ obligatoire');
-        newForm.gender = (0, Tools_1.validateField)(userForm.gender, function (value) { return !!value; }, 'Champ obligatoire');
-        newForm.birthDate = (0, Tools_1.validateField)(userForm.birthDate, function (value) { return !!value && (0, isValid_1.default)(value); }, 'Champ obligatoire');
         newForm.phoneNumber = (0, Tools_1.validateField)(userForm.phoneNumber, function (value) { return !!value; }, 'Champ obligatoire');
+        newForm.password = (0, Tools_1.validateField)(userForm.password, function (value) { return !!value; }, 'Champ obligatoire');
+        //newForm.gender = validateField(userForm.gender, value => !!value, 'Champ obligatoire');
+        //newForm.birthDate = validateField(userForm.birthDate, value => !!value && isValid(value), 'Champ obligatoire');
         // Validator pour l'email
         newForm.email = (0, Tools_1.validateField)(userForm.email, Validator_1.validateEmail, 'Adresse email invalide');
         // Validator pour le mot de passe
         newForm.password = (0, Tools_1.validateField)(userForm.password, function (value) { return value.length >= 10 && /[a-z]/.test(value) && /[A-Z]/.test(value); }, 'Votre mot de passe doit faire au moins 10 caractères de long, contenir au moins une majuscule et une minuscule');
         // Validator 'phoneNumber'
         newForm.phoneNumber = (0, Tools_1.validateField)(userForm.phoneNumber, Validator_1.validatePhoneNumber, "Le n° de téléphone est invalide.");
+        Logger_1.default.info(newForm.phoneNumber === null || newForm.phoneNumber === undefined);
         // Validator pour les CGU
         newForm.acceptsTerms = (0, Tools_1.validateField)(userForm.acceptsTerms, function (value) { return Boolean(value); }, 'Vous devez accepter les termes de nos CGU');
         setUserForm(newForm);
         return newForm.firstname.isValid && newForm.lastname.isValid && newForm.email.isValid && newForm.password.isValid
-            && newForm.gender.isValid && newForm.birthDate.isValid && newForm.acceptsTerms.isValid && newForm.phoneNumber.isValid;
+            && newForm.acceptsTerms.isValid && newForm.phoneNumber.isValid;
     };
     var getMovaLogo = function () {
         if (darkMode) {
@@ -229,7 +229,7 @@ var MovaLogin = function (_a) {
                                     '& .MuiOutlinedInput-notchedOutline': {
                                         borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure
                                     }
-                                } }), (0, jsx_runtime_1.jsx)(material_1.TextField, { type: "tel", margin: "normal", required: true, fullWidth: true, id: "phoneNumber", label: "N\u00B0 de t\u00E9l\u00E9phone", name: "phoneNumber", autoComplete: "tel", onChange: function (e) { return handleInputChange(e); }, value: (_b = userForm.phoneNumber) === null || _b === void 0 ? void 0 : _b.value, error: Boolean((_c = userForm.phoneNumber) === null || _c === void 0 ? void 0 : _c.error), helperText: (_d = userForm.phoneNumber) === null || _d === void 0 ? void 0 : _d.error, InputProps: {
+                                } }), (0, jsx_runtime_1.jsx)(material_1.TextField, { type: "tel", margin: "normal", required: true, fullWidth: true, id: "phoneNumber", label: "N\u00B0 de t\u00E9l\u00E9phone", name: "phoneNumber", autoComplete: "tel", onChange: function (e) { return handleInputChange(e); }, value: userForm.phoneNumber.value, error: Boolean(userForm.phoneNumber.error), helperText: userForm.phoneNumber.error, InputProps: {
                                     endAdornment: ((0, jsx_runtime_1.jsx)(InputAdornment_1.default, __assign({ position: "end" }, { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, __assign({ edge: "end", onClick: function () { return setOpenPhoneNumberInfo(!openPhoneNumberInfo); } }, { children: (0, jsx_runtime_1.jsx)(Info_1.default, {}) })) }))),
                                 } }), openPhoneNumberInfo && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: "info", variant: 'standard' }, { children: "Indispensable pour votre garagiste, il doit pouvoir vous appeler en cas d'impr\u00E9vu avec votre v\u00E9hicule." })), (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, fullWidth: true, id: "email", label: "Adresse email", name: "email", autoComplete: "email", onChange: function (e) { return handleInputChange(e); }, value: userForm.email.value, error: !userForm.email.isValid, helperText: userForm.email.error, sx: {
                                     '& .MuiOutlinedInput-notchedOutline': {
@@ -243,25 +243,7 @@ var MovaLogin = function (_a) {
                                     '& .MuiOutlinedInput-notchedOutline': {
                                         borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure
                                     }
-                                } }), (0, jsx_runtime_1.jsx)(GenderSelector_1.default, { handleSelectChange: handleSelectChange, form: userForm, required: true, sx: {
-                                    width: '40%',
-                                    mr: 2,
-                                    '& .MuiOutlinedInput-notchedOutline': {
-                                        borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure
-                                    }
-                                } }), (0, jsx_runtime_1.jsx)(DatePicker_1.DatePicker, { label: "Date de naissance", value: userForm.birthDate.value, format: 'dd / MM / yyyy', formatDensity: 'dense', openTo: "year", views: ['year', 'month', 'day'], onChange: function (newValue) { return handleDateChange('birthDate', newValue); }, slotProps: {
-                                    textField: {
-                                        required: true,
-                                        error: !userForm.birthDate.isValid,
-                                        sx: {
-                                            width: '50%', mt: 2, float: 'right',
-                                            padding: 0,
-                                            '& .MuiOutlinedInput-notchedOutline': {
-                                                borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure
-                                            }
-                                        },
-                                    },
-                                } }), (0, jsx_runtime_1.jsxs)(material_1.FormControl, __assign({ error: !userForm.acceptsTerms.isValid }, { children: [(0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { name: "acceptsTerms", color: "primary", checked: userForm.acceptsTerms.value, onChange: function (e, checked) { return handleCheckboxChange(e, checked); } }), label: (0, jsx_runtime_1.jsxs)("span", { children: ["J'accepte les", ' ', (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ href: "/terms-and-conditions", target: "_blank" }, { children: "Conditions G\u00E9n\u00E9rales d'Utilisation" }))] }) }), (0, jsx_runtime_1.jsx)(material_1.FormHelperText, { children: userForm.acceptsTerms.error })] })), alertMessage && alertSeverity && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: alertSeverity, sx: { mb: 2 } }, { children: alertMessage })), (0, jsx_runtime_1.jsx)(lab_1.LoadingButton, __assign({ loading: loading, type: "submit", fullWidth: true, variant: "contained", sx: { mt: 3, mb: 2, backgroundColor: darkMode ? theme.palette.primary.dark : theme.palette.primary.main } }, { children: (0, jsx_runtime_1.jsx)("span", { children: "Cr\u00E9er mon compte" }) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ container: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ variant: "body2", color: "text.secondary", onClick: function (e) { return handleOnClickLogin(e); }, sx: { cursor: 'pointer' } }, { children: "Se connecter" })) })) }))] })), (0, jsx_runtime_1.jsx)(MovaCopyright_1.default, { sx: { mt: 8, mb: 4 } })] })), (0, jsx_runtime_1.jsx)("img", { src: leaf_pink_large_png_1.default, style: { position: 'fixed',
+                                } }), (0, jsx_runtime_1.jsxs)(material_1.FormControl, __assign({ error: !userForm.acceptsTerms.isValid }, { children: [(0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { name: "acceptsTerms", color: "primary", checked: userForm.acceptsTerms.value, onChange: function (e, checked) { return handleCheckboxChange(e, checked); } }), label: (0, jsx_runtime_1.jsxs)("span", { children: ["J'accepte les", ' ', (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ href: CGUPath, target: "_blank" }, { children: "Conditions G\u00E9n\u00E9rales d'Utilisation" }))] }) }), (0, jsx_runtime_1.jsx)(material_1.FormHelperText, { children: userForm.acceptsTerms.error })] })), alertMessage && alertSeverity && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: alertSeverity, sx: { mb: 2 } }, { children: alertMessage })), (0, jsx_runtime_1.jsx)(lab_1.LoadingButton, __assign({ loading: loading, type: "submit", fullWidth: true, variant: "contained", sx: { mt: 3, mb: 2, backgroundColor: darkMode ? theme.palette.primary.dark : theme.palette.primary.main } }, { children: (0, jsx_runtime_1.jsx)("span", { children: "Cr\u00E9er mon compte" }) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ container: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ variant: "body2", color: "text.secondary", onClick: function (e) { return handleOnClickLogin(e); }, sx: { cursor: 'pointer' } }, { children: "Se connecter" })) })) }))] })), (0, jsx_runtime_1.jsx)(MovaCopyright_1.default, { sx: { mt: 8, mb: 4 } })] })), (0, jsx_runtime_1.jsx)("img", { src: leaf_pink_large_png_1.default, style: { position: 'fixed',
                     float: 'right',
                     width: '250px',
                     height: '400px',

package/dist/src/helpers/Tools.d.ts

@@ -32,4 +32,4 @@ export declare const formatVehicleTireStr: (input: string) => string;
  * @param {string} errorMsg - Le message d'erreur à associer au champ si la validation échoue.
  * @returns {MovaFormField} - Le champ de formulaire avec les propriétés `error` et `isValid` mises à jour.
  */
-export declare const validateField: (field: MovaFormField, validator: (value: string) => boolean, errorMsg: string) => MovaFormField;
+export declare const validateField: (field: MovaFormField | undefined, validator: (value: string) => boolean, errorMsg: string) => MovaFormField;

package/dist/src/helpers/Tools.js

@@ -233,9 +233,14 @@ exports.formatVehicleTireStr = formatVehicleTireStr;
  * @returns {MovaFormField} - Le champ de formulaire avec les propriétés `error` et `isValid` mises à jour.
  */
 var validateField = function (field, validator, errorMsg) {
-    if (!validator(field.value)) {
+    if (field && !validator(field.value)) {
         return { value: field.value, error: errorMsg, isValid: false };
     }
-    return { value: field.value, error: '', isValid: true };
+    else if (field) {
+        return { value: field.value, error: '', isValid: true };
+    }
+    else {
+        return { value: '', error: '', isValid: true };
+    }
 };
 exports.validateField = validateField;

package/dist/src/helpers/Types.d.ts

@@ -29,8 +29,8 @@ export type MovaUserSignUpForm = {
     email: MovaFormField;
     phoneNumber: MovaFormField;
     password: MovaFormField;
-    gender: MovaFormField;
-    birthDate: MovaFormField;
+    gender?: MovaFormField;
+    birthDate?: MovaFormField;
     acceptsTerms: MovaFormField;
 };
 export type MovaLoginForm = {

package/dist/src/helpers/Validator.js

@@ -31,7 +31,7 @@ var userNameRegex = /^[a-z0-9_-]{3,20}$/;
  */
 var textRegex = /^[a-zA-Z0-9\s.,!?'"()+=-_-éèçà]+$/;
 function validatePhoneNumber(phoneNumber) {
-    if (phoneNumber === null || phoneNumber === undefined) {
+    if (phoneNumber === null || phoneNumber === undefined || phoneNumber === '') {
         return false;
     }
     return phoneNumberRegex.test(phoneNumber);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movalib/movalib-commons",
-  "version": "1.1.91",
+  "version": "1.2.0",
   "description": "Bibliothèque d'objets communs à l'ensemble des projets React de Movalib",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/AccountValidation.tsx

@@ -41,7 +41,7 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
 
     const [loading, setLoading] = useState(true);
     const [validationForm, setValidationForm] = useState<MovaValidationForm>(initialFormState);
-    //const location = useLocation();
+    const location = useLocation();
     const history = useHistory();
     const theme = useTheme();
     const [emptyPwd, setEmptyPwd] = useState<boolean>(false);
@@ -310,11 +310,7 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
                         </Grid>
                         <Grid item xs={12}>
                             <Typography sx={{ mt: 2, mb: 3 }}>
-                                {movaAppType === MovaAppType.INDIVIDUAL ?
-                                    resetPassword ? "Définis ton nouveau mot de passe" : "Pour commencer, définis ton mot de passe et active ton compte 😉"
-                                :
-                                    resetPassword ? "Définissez votre nouveau mot de passe" : "Pour commencer, définissez votre mot de passe et activez votre compte 😉"
-                                }                                
+                                {resetPassword ? "Définissez votre nouveau mot de passe" : "Pour commencer, définissez votre mot de passe et activez votre compte 😉"}
                             </Typography>
                         </Grid>
                         {smsValidation && <>
@@ -452,7 +448,7 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
                 onClose={() => setOpenPhoneNumberInput(false)}
                 onConfirm={resendCode}
                 message={<>
-                    <Typography><b>Indique nous ton numéro de téléphone</b><br /></Typography>
+                    <Typography><b>Indiquez nous votre numéro de téléphone</b><br /></Typography>
                     <Grid item xs={6}>
                         <TextField
                             margin="normal"

package/src/GenderSelector.tsx

@@ -5,7 +5,7 @@ import { MovaFormField } from './helpers/Types';
 interface GenderSelectorProps {
     handleSelectChange: (event: SelectChangeEvent<string>) => void;
     form: {
-        gender: MovaFormField
+        gender?: MovaFormField
       };
     required?: boolean,
     sx?: SxProps<Theme>;
@@ -21,15 +21,15 @@ const GenderSelector: React.FC<GenderSelectorProps> = ({ handleSelectChange, for
         id="gender"
         name="gender"
         label="Sexe"
-        value={form.gender.value}
+        value={form.gender?.value}
         onChange={e => handleSelectChange(e)}
-        error={Boolean(form.gender.error)}
+        error={Boolean(form.gender?.error)}
       >
         <MenuItem value="MALE">Homme</MenuItem>
         <MenuItem value="FEMALE">Femme</MenuItem>
         <MenuItem value="OTHER">Autre</MenuItem>
       </Select>
-      <FormHelperText sx={{ color: theme.palette.error.main}}>{form.gender.error}</FormHelperText>
+      <FormHelperText sx={{ color: theme.palette.error.main}}>{form.gender?.error}</FormHelperText>
     </FormControl>
   );
 };

package/src/MovaDialog.tsx

@@ -99,7 +99,7 @@ const MovaDialog: FC<MovaDialogProps> = ({fullScreen, open, onClose, closable =
                                 >
                                     <BackIcon />
                                 </IconButton>}
-                                <Typography sx={{ textAlign:'center', fontSize: 20, flexGrow: 1, pl: '20px', pr: '40px' }} style={titleStyle}>
+                                <Typography sx={{ textAlign:'center', fontSize: 20, flexGrow: 1, pl: closable ? '20px' : 'Opx', pr: closable ? '40px' : '0px' }} style={titleStyle}>
                                     {title}
                                 </Typography>
                             </Toolbar>

package/src/MovaSignUp.tsx

@@ -21,6 +21,10 @@ import Visibility from '@mui/icons-material/Visibility';
 import VisibilityOff from '@mui/icons-material/VisibilityOff';
 import InfoIcon from '@mui/icons-material/Info';
 import isValid from 'date-fns/isValid';
+import Logger from "./helpers/Logger";
+
+// ATTENTION : s'assurer de la présence des documents suivants à la racine du composant porteur (dossier 'public')
+const CGUPath:string = "/Movalib_CGU.pdf";
 
 // Permet de centrer le contenu de l'application
 const styles: CSSProperties = {
@@ -150,11 +154,14 @@ const MovaLogin: FunctionComponent<MovaSignUpProps> = ({ loading, movaAppType, o
         newForm.firstname = validateField(userForm.firstname, value => !!value, 'Champ obligatoire');
         newForm.lastname = validateField(userForm.lastname, value => !!value, 'Champ obligatoire');
         newForm.email = validateField(userForm.email, value => !!value, 'Champ obligatoire');
-        newForm.password = validateField(userForm.password, value => !!value, 'Champ obligatoire');
-        newForm.gender = validateField(userForm.gender, value => !!value, 'Champ obligatoire');
-        newForm.birthDate = validateField(userForm.birthDate, value => !!value && isValid(value), 'Champ obligatoire');
         newForm.phoneNumber = validateField(userForm.phoneNumber, value => !!value, 'Champ obligatoire');
 
+
+
+        newForm.password = validateField(userForm.password, value => !!value, 'Champ obligatoire');
+        //newForm.gender = validateField(userForm.gender, value => !!value, 'Champ obligatoire');
+        //newForm.birthDate = validateField(userForm.birthDate, value => !!value && isValid(value), 'Champ obligatoire');
+
         // Validator pour l'email
         newForm.email = validateField(userForm.email, validateEmail, 'Adresse email invalide');
 
@@ -165,14 +172,14 @@ const MovaLogin: FunctionComponent<MovaSignUpProps> = ({ loading, movaAppType, o
 
         // Validator 'phoneNumber'
         newForm.phoneNumber = validateField(userForm.phoneNumber, validatePhoneNumber, "Le n° de téléphone est invalide.");
-            
+        Logger.info(newForm.phoneNumber === null || newForm.phoneNumber === undefined);
         // Validator pour les CGU
         newForm.acceptsTerms = validateField(userForm.acceptsTerms, value => Boolean(value), 'Vous devez accepter les termes de nos CGU');
 
         setUserForm(newForm);
 
-        return newForm.firstname.isValid && newForm.lastname.isValid && newForm.email.isValid && newForm.password.isValid 
-            && newForm.gender.isValid && newForm.birthDate.isValid && newForm.acceptsTerms.isValid && newForm.phoneNumber.isValid;
+        return newForm.firstname.isValid && newForm.lastname.isValid && newForm.email.isValid && newForm.password.isValid
+         && newForm.acceptsTerms.isValid && newForm.phoneNumber.isValid;
     }   
   
     const getMovaLogo = () => {
@@ -272,9 +279,9 @@ const MovaLogin: FunctionComponent<MovaSignUpProps> = ({ loading, movaAppType, o
                         name="phoneNumber"
                         autoComplete="tel"                      
                         onChange={e => handleInputChange(e)}
-                        value={userForm.phoneNumber?.value}
-                        error={Boolean(userForm.phoneNumber?.error)}
-                        helperText={userForm.phoneNumber?.error}
+                        value={userForm.phoneNumber.value}
+                        error={Boolean(userForm.phoneNumber.error)}
+                        helperText={userForm.phoneNumber.error}
                         InputProps={{
                             endAdornment: (
                               <InputAdornment position="end">
@@ -349,54 +356,41 @@ const MovaLogin: FunctionComponent<MovaSignUpProps> = ({ loading, movaAppType, o
                         }}  
                     />
 
-                    <GenderSelector handleSelectChange={handleSelectChange} form={userForm} required sx={{ 
+{/*                     {userForm.gender && <GenderSelector handleSelectChange={handleSelectChange} form={userForm} required sx={{ 
                         width:'40%', 
                         mr: 2,
                         '& .MuiOutlinedInput-notchedOutline': {
                             borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure
                         }
                         }} />
-
-                    {/* <TextField 
-                        margin="normal"
-                        required
-                        name="birthDate"
-                        label="Date de naissance" 
-                        type="date" 
-                        InputLabelProps={{
-                            shrink: true,
-                        }}
-                        autoComplete="bday"
-                        value={userForm.birthDate.value}
-                        error={!userForm.birthDate.isValid}
-                        helperText={userForm.birthDate.error}        
-                        onChange={(e) => handleInputChange(e)}
-                        sx={{ width:'50%', float: 'right'}} 
-                    /> */}
-
-                    <DatePicker
-                        label="Date de naissance"
-                        value={userForm.birthDate.value}
-                        format='dd / MM / yyyy'
-                        formatDensity='dense'
-                        openTo="year"
-                        views={['year', 'month', 'day']}
-                        onChange={(newValue) => handleDateChange('birthDate', newValue)}
-                        slotProps={{
-                            textField: {
-                                required: true,
-                                error:!userForm.birthDate.isValid,
-                                sx: {
-                                    width:'50%', mt: 2, float: 'right',
-                                    padding: 0,
-                                    '& .MuiOutlinedInput-notchedOutline': {
-                                        borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure
-                                    }
+                    }
+
+                    { userForm.birthDate && 
+                        <DatePicker
+                            label="Date de naissance"
+                            value={userForm.birthDate.value}
+                            format='dd / MM / yyyy'
+                            formatDensity='dense'
+                            openTo="year"
+                            views={['year', 'month', 'day']}
+                            onChange={(newValue) => handleDateChange('birthDate', newValue)}
+                            slotProps={{
+                                textField: {
+                                    required: true,
+                                    error:!userForm.birthDate.isValid,
+                                    sx: {
+                                        width:'50%', mt: 2, float: 'right',
+                                        padding: 0,
+                                        '& .MuiOutlinedInput-notchedOutline': {
+                                            borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure
+                                        }
+                                    },
                                 },
-                            },
-                        }}
-                    />
-                    
+                            }}
+                        />
+                    }
+                     */}
+
                     <FormControl error={!userForm.acceptsTerms.isValid}>
                         <FormControlLabel
                             control={
@@ -410,7 +404,7 @@ const MovaLogin: FunctionComponent<MovaSignUpProps> = ({ loading, movaAppType, o
                             label={
                             <span>
                                 J'accepte les{' '}
-                                <Link href="/terms-and-conditions" target="_blank">
+                                <Link href={CGUPath} target="_blank">
                                 Conditions Générales d'Utilisation
                                 </Link>
                             </span>

package/src/helpers/Tools.ts

@@ -257,10 +257,13 @@ export const formatVehicleTireStr = (input: string) => {
  * @param {string} errorMsg - Le message d'erreur à associer au champ si la validation échoue.
  * @returns {MovaFormField} - Le champ de formulaire avec les propriétés `error` et `isValid` mises à jour.
  */
-export const validateField = (field: MovaFormField, validator: (value: string) => boolean, errorMsg: string): MovaFormField => {
-    if (!validator(field.value)) {
+export const validateField = (field: MovaFormField | undefined, validator: (value: string) => boolean, errorMsg: string): MovaFormField => {
+    if (field && !validator(field.value)) {
       return { value: field.value, error: errorMsg, isValid: false };
+    } else if (field) {
+      return { value: field.value, error: '', isValid: true };
+    } else {
+      return  { value: '', error: '', isValid: true };
     }
-    return { value: field.value, error: '', isValid: true };
   };
   

package/src/helpers/Types.ts

@@ -33,8 +33,8 @@ export type MovaUserSignUpForm = {
     email: MovaFormField,
     phoneNumber: MovaFormField,
     password: MovaFormField,
-    gender: MovaFormField,
-    birthDate: MovaFormField,
+    gender?: MovaFormField,
+    birthDate?: MovaFormField,
     acceptsTerms: MovaFormField
 }
 

package/src/helpers/Validator.ts

@@ -36,7 +36,7 @@ const textRegex:RegExp = /^[a-zA-Z0-9\s.,!?'"()+=-_-éèçà]+$/;
 
 
 export function validatePhoneNumber(phoneNumber: string) : boolean {
-    if (phoneNumber === null || phoneNumber === undefined) {
+    if (phoneNumber === null || phoneNumber === undefined || phoneNumber === '') {
         return false;
     }
     return phoneNumberRegex.test(phoneNumber);