- {__('Grazie, la tua domanda è stata inviata correttamente. Entro 24 ore riceverai una pec con data, ora e numero di protocollo.', 'gepafin')}
+ {APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE'
+ ? __('Grazie, la tua domanda è stata inviata correttamente. Entro 24 ore riceverai una email con data, ora e numero di protocollo.', 'gepafin')
+ : __('Grazie, la tua domanda è stata inviata correttamente. Entro 24 ore riceverai una pec con data, ora e numero di protocollo.', 'gepafin')
+ }
@@ -750,9 +749,9 @@ const BandoApplication = () => {
return acc;
}, {});
- if (o.name === 'fileselect') {
+ /*if (o.name === 'fileselect') {
console.log('options::', options)
- }
+ }*/
return ['paragraph'].includes(o.name) && text
?
diff --git a/src/pages/Login/index.js b/src/pages/Login/index.js
index c7047cf..3ee1205 100644
--- a/src/pages/Login/index.js
+++ b/src/pages/Login/index.js
@@ -118,9 +118,12 @@ const Login = () => {
/*if ('t7jh5wfg9QXylNaTZkPoE' === APP_HUB_ID) {
setIsMaintenance(true);
}*/
- hotkeys('command+x,ctrl+x', function(event, handler){
+ hotkeys('command+x,ctrl+x', function(){
window.location.replace('/loginadmin')
});
+ hotkeys('command+shift+x,ctrl+shift+x', function(){
+ window.location.replace('/confidi')
+ });
}, []);
return (
diff --git a/src/pages/LoginAdmin/index.js b/src/pages/LoginAdmin/index.js
index 0fb1e3d..96d6466 100644
--- a/src/pages/LoginAdmin/index.js
+++ b/src/pages/LoginAdmin/index.js
@@ -16,6 +16,7 @@ import FormField from '../../components/FormField';
import LogoIcon from '../../icons/LogoIcon';
import { Button } from 'primereact/button';
import { Messages } from 'primereact/messages';
+import hotkeys from 'hotkeys-js';
const APP_HUB_ID = process.env.REACT_APP_HUB_ID;
@@ -31,7 +32,7 @@ const LoginAdmin = () => {
} = useForm({ mode: 'onChange' });
const gotToResetPassword = () => {
- navigate('/reset-password');
+ navigate('/reset-password-admin');
}
const onSubmit = (formData) => {
@@ -78,12 +79,18 @@ const LoginAdmin = () => {
}
}, [token]);
+ useEffect(() => {
+ hotkeys('command+shift+x,ctrl+shift+x', function(){
+ window.location.replace('/confidi')
+ });
+ }, []);
+
return (
-
{__('Accedi o Registrati', 'gepafin')}
+
{__('Accedi', 'gepafin')}
diff --git a/src/pages/LoginConfidi/index.js b/src/pages/LoginConfidi/index.js
new file mode 100644
index 0000000..4042d7d
--- /dev/null
+++ b/src/pages/LoginConfidi/index.js
@@ -0,0 +1,133 @@
+import React, { useRef, useState, useEffect } from 'react';
+import { __, sprintf } from '@wordpress/i18n';
+import { useForm } from 'react-hook-form';
+import { classNames } from 'primereact/utils';
+import { isEmpty } from 'ramda';
+import { useNavigate } from 'react-router-dom';
+
+// tools
+import AuthenticationService from '../../service/authentication-service';
+
+// store
+import { storeSet, useStore } from '../../store';
+
+// components
+import FormField from '../../components/FormField';
+import LogoIcon from '../../icons/LogoIcon';
+import { Button } from 'primereact/button';
+import { Messages } from 'primereact/messages';
+import hotkeys from 'hotkeys-js';
+
+const APP_HUB_ID = process.env.REACT_APP_HUB_ID;
+
+const LoginConfidi = () => {
+ const navigate = useNavigate();
+ const token = useStore().main.token();
+ const [loading, setLoading] = useState(false);
+ const errorMsgs = useRef(null);
+ const {
+ control,
+ handleSubmit,
+ formState: { errors },
+ } = useForm({ mode: 'onChange' });
+
+ const gotToResetPassword = () => {
+ navigate('/reset-password');
+ }
+
+ const onSubmit = (formData) => {
+ errorMsgs.current.clear();
+ setLoading(true);
+ const request = {
+ ...formData,
+ hubUuid: APP_HUB_ID,
+ rememberMe: true
+ }
+
+ AuthenticationService.login(request, loginCallback, loginError);
+ };
+
+ const loginCallback = (data) => {
+ if (data.status === 'SUCCESS') {
+ storeSet.main.setAuthData({
+ token: data.data.token,
+ userData: data.data.user
+ });
+ } else {
+ errorMsgs.current.show([
+ { sticky: true, severity: 'error', summary: '',
+ detail: data.message,
+ closable: true }
+ ]);
+ }
+ setLoading(false);
+ }
+
+ const loginError = (err) => {
+ errorMsgs.current.show([
+ { sticky: true, severity: 'error', summary: '',
+ detail: sprintf(__('%s', 'gepafin'), err.message),
+ closable: true }
+ ]);
+ setLoading(false);
+ }
+
+ useEffect(() => {
+ if (!isEmpty(token)) {
+ setLoading(true);
+ window.location.replace('/')
+ }
+ }, [token]);
+
+ useEffect(() => {
+ hotkeys('command+x,ctrl+x', function(){
+ window.location.replace('/loginadmin')
+ });
+ }, []);
+
+ return (
+
+
+
+
+
{__('Accedi', 'gepafin')}
+
+
+
+
+
+
+
+
+ link onClick={gotToLogin}/>
diff --git a/src/pages/ResetPasswordAdmin/index.js b/src/pages/ResetPasswordAdmin/index.js
new file mode 100644
index 0000000..df9f7d7
--- /dev/null
+++ b/src/pages/ResetPasswordAdmin/index.js
@@ -0,0 +1,200 @@
+import React, { useRef, useState, useEffect } from 'react';
+import { __, sprintf } from '@wordpress/i18n';
+import { useForm } from 'react-hook-form';
+import { classNames } from 'primereact/utils';
+import { isEmpty } from 'ramda';
+import { useNavigate, useSearchParams } from 'react-router-dom';
+
+// tools
+import AuthenticationService from '../../service/authentication-service';
+
+// store
+import { useStore } from '../../store';
+
+// components
+import FormField from '../../components/FormField';
+import LogoIcon from '../../icons/LogoIcon';
+import { Button } from 'primereact/button';
+import { Messages } from 'primereact/messages';
+
+const APP_HUB_ID = process.env.REACT_APP_HUB_ID;
+
+const ResetPasswordAdmin = () => {
+ const navigate = useNavigate();
+ const token = useStore().main.token();
+ const [loading, setLoading] = useState(false);
+ const [resetPassToken, setResetPassToken] = useState('');
+ const [resetPassEmail, setResetPassEmail] = useState('');
+ const errorMsgs = useRef(null);
+ let [searchParams] = useSearchParams();
+ const {
+ control,
+ handleSubmit,
+ formState: { errors },
+ reset,
+ register,
+ setValue
+ } = useForm({ mode: 'onChange' });
+
+ const gotToLogin = () => {
+ navigate('/loginadmin');
+ }
+
+ const onSubmit = (formData) => {
+ errorMsgs.current.clear();
+ setLoading(true);
+ const request = {
+ ...formData,
+ hubUuid: APP_HUB_ID
+ }
+
+ if (request.token && !isEmpty(request.token)) {
+ AuthenticationService.resetPassword(request, getCallbackReset, errCallback);
+ } else {
+ AuthenticationService.forgotPassword(request, getCallback, errCallback);
+ }
+ };
+
+ const getCallbackReset = (data) => {
+ if (data.status === 'SUCCESS') {
+ errorMsgs.current.show([
+ {
+ sticky: true, severity: 'success', summary: '',
+ detail: data.message,
+ closable: true
+ }
+ ]);
+ } else {
+ errorMsgs.current.show([
+ {
+ sticky: true, severity: 'error', summary: '',
+ detail: data.message,
+ closable: true
+ }
+ ]);
+ }
+ setLoading(false);
+ }
+
+ const getCallback = (data) => {
+ if (data.status === 'SUCCESS') {
+ setResetPassToken(data.data)
+ } else {
+ errorMsgs.current.show([
+ {
+ sticky: true, severity: 'error', summary: '',
+ detail: data.message,
+ closable: true
+ }
+ ]);
+ }
+ setLoading(false);
+ }
+
+ const errCallback = (err) => {
+ errorMsgs.current.show([
+ {
+ sticky: true, severity: 'error', summary: '',
+ detail: sprintf(__('%s', 'gepafin'), err.message),
+ closable: true
+ }
+ ]);
+ setLoading(false);
+ }
+
+ useEffect(() => {
+ if (!isEmpty(token)) {
+ setLoading(true);
+ window.location.replace('/')
+ }
+ }, [token]);
+
+ useEffect(() => {
+ reset();
+ setValue('token', resetPassToken);
+ setValue('email', resetPassEmail);
+ }, [resetPassToken, resetPassEmail]);
+
+ useEffect(() => {
+ const token = searchParams.get('token');
+ const email = searchParams.get('email');
+ setResetPassToken(token);
+ setResetPassEmail(email);
+ }, [searchParams]);
+
+ return (
+
+
+
+
+
{__('Password dimenticata', 'gepafin')}
+
+
+
+
+
+
+
+
+ )
+}
+
+export default ResetPasswordAdmin;
\ No newline at end of file
diff --git a/src/pages/Users/components/AllUsersTable/index.js b/src/pages/Users/components/AllUsersTable/index.js
index 26f2556..8d3ff72 100644
--- a/src/pages/Users/components/AllUsersTable/index.js
+++ b/src/pages/Users/components/AllUsersTable/index.js
@@ -54,7 +54,9 @@ const AllUsersTable = () => {
const getFormattedData = (data) => {
return data
- .filter(o => ['ROLE_SUPER_ADMIN', 'ROLE_PRE_INSTRUCTOR', 'ROLE_INSTRUCTOR_MANAGER'].includes(o.role.roleType));
+ .filter(o => [
+ 'ROLE_SUPER_ADMIN', 'ROLE_PRE_INSTRUCTOR', 'ROLE_INSTRUCTOR_MANAGER', 'ROLE_CONFIDI'
+ ].includes(o.role.roleType));
};
const clearFilter = () => {
diff --git a/src/pages/Users/index.js b/src/pages/Users/index.js
index a34b17f..44a66ce 100644
--- a/src/pages/Users/index.js
+++ b/src/pages/Users/index.js
@@ -1,6 +1,6 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect, useRef, useCallback } from 'react';
import { __ } from '@wordpress/i18n';
-import { isEmpty, isNil } from 'ramda';
+import { head, isEmpty, isNil } from 'ramda';
import { klona } from 'klona';
// store
@@ -11,7 +11,7 @@ import UserService from '../../service/user-service';
// tools
import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
-import { isEmail } from '../../helpers/validators';
+import { isCodiceFiscale, isEmail, isPIVA } from '../../helpers/validators';
// components
import AllUsersTable from './components/AllUsersTable';
@@ -34,7 +34,8 @@ const Users = () => {
phoneNumber: '',
password: '',
confPassword: '',
- roleId: 0
+ roleId: 0,
+ codiceFiscale: ''
});
const [roles, setRoles] = useState([]);
const toast = useRef(null);
@@ -56,18 +57,27 @@ const Users = () => {
phoneNumber: '',
password: '',
confPassword: '',
- roleId: 0
+ roleId: 0,
+ codiceFiscale: ''
});
}
const saveEditDialog = () => {
- const emptyValues = Object.values(newUserData).filter(v => isEmpty(v));
+ const isConfidi = isConfidiRoleChosen();
+ const emptyValues = Object.keys(newUserData)
+ .filter(v => v !== 'phoneNumber')
+ .filter(v => isConfidi ? v : v !== 'codiceFiscale')
+ .filter(v => isInvalidField(newUserData, v));
if (isEmpty(emptyValues) && newUserData.password === newUserData.confPassword && !loading) {
setLoading(true);
- const body = {
+ let body = klona({
...newUserData,
hubUuid: APP_HUB_ID
+ });
+
+ if (!isConfidi) {
+ delete body.codiceFiscale;
}
UserService.createUser(body, createUserCallback, errCreateUserCallback);
@@ -108,23 +118,33 @@ const Users = () => {
setNewUserData(userData);
}
- const footerEditDialog = () => {
+ const footerEditDialog = useCallback(() => {
+ const isConfidi = isConfidiRoleChosen();
+ const errorValues = Object.keys(newUserData)
+ .filter(v => v !== 'phoneNumber')
+ .filter(v => isConfidi ? v : v !== 'codiceFiscale')
+ .filter(v => isInvalidField(newUserData, v));
+
return
- }
+ }, [newUserData]);
const getRolesCallback = (data) => {
if (data.status === 'SUCCESS') {
const roles = data.data
- .filter(o => ['ROLE_SUPER_ADMIN', 'ROLE_PRE_INSTRUCTOR', 'ROLE_INSTRUCTOR_MANAGER'].includes(o.roleType))
+ .filter(o => [
+ 'ROLE_SUPER_ADMIN', 'ROLE_PRE_INSTRUCTOR', 'ROLE_INSTRUCTOR_MANAGER', 'ROLE_CONFIDI'
+ ].includes(o.roleType))
.map(o => ({
name: o.roleName,
- value: o.id
+ value: o.id,
+ id: o.id,
+ roleType: o.roleType
}));
setRoles(roles);
}
@@ -136,7 +156,14 @@ const Users = () => {
storeSet.main.unsetAsyncRequest();
}
- const isInvalidField = (data, key) => isEmpty(data[key]) || isNil(data[key])
+ const isInvalidField = (data, key) => key === 'codiceFiscale'
+ ? !isCodiceFiscale(data[key]) && !isPIVA(data[key])
+ : isEmpty(data[key]) || isNil(data[key]);
+
+ const isConfidiRoleChosen = useCallback(() => {
+ const chosen = head(roles.filter(o => o.id === newUserData.roleId));
+ return chosen ? chosen.roleType === 'ROLE_CONFIDI' : false;
+ }, [roles, newUserData])
useEffect(() => {
if (isVisibleEditDialog) {
@@ -151,7 +178,7 @@ const Users = () => {