updated

src/assets/scss/components/error404.scss

@@ -0,0 +1,16 @@
+.error404 {
+  display: flex;
+  flex-grow: 2;
+  width: 100%;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+
+  h1 {
+
+  }
+
+  span {
+
+  }
+}

src/assets/scss/theme.scss

@@ -36,4 +36,5 @@
 @import "./components/formBuilder.scss";
 @import "./components/misc.scss";
 @import "./components/login.scss";
-@import "./components/flowBuilder.scss";
+@import "./components/flowBuilder.scss";
+@import "./components/error404.scss";

src/components/FormField/components/Datepicker/index.js

@@ -9,7 +9,7 @@ const Datepicker = ({
                         label,
                         control,
                         errors,
-                        defaultValue = [],
+                        defaultValue = new Date(),
                         config = {},
                         infoText = null,
                         minDate = null,

src/components/FormField/components/DatepickerRange/index.js

@@ -11,7 +11,7 @@ const DatepickerRange = ({
                              label,
                              control,
                              errors,
-                             defaultValue = [],
+                             defaultValue = [new Date()],
                              config = {},
                              infoText = null,
                              minDate = null,

src/components/TopBarProfileMenu/index.js

@@ -3,54 +3,61 @@ import { __ } from '@wordpress/i18n';
 import { useNavigate } from 'react-router-dom';
 
 // store
-import { storeSet, useTrackedStore } from '../../store';
+import { storeSet, useStore, useTrackedStore } from '../../store';
 
 // components
 import { Menu } from 'primereact/menu';
 import { Avatar } from 'primereact/avatar';
+import { intersection } from 'ramda';
 
 const TopBarProfileMenu = ({ menuLeftRef }) => {
     const navigate = useNavigate();
     const userData = useTrackedStore().main.userData();
     const fulleName = `${userData.firstName} ${userData.lastName}`;
+    const permissions = useStore().main.getPermissions();
 
     let items = [
         {
             template: (item, options) => {
                 return (
                     <div className="topBar__menuProfileItem">
-                        <Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />
+                        {/*<Avatar image="https://primefaces.org/cdn/primereact/images/avatar/amyelsner.png" shape="circle" />*/}
                         <div className="userInfo">
                             <span className="userName" title={fulleName}>{fulleName}</span>
                             <span className="userEmail" title={userData.email}>{userData.email}</span>
                         </div>
                     </div>
                 );
-            }
+            },
+            enable: true
         },
         {
             label: __('Il mio profilo', 'gepafin'),
             command: () => {
                 navigate('/profilo')
-            }
+            },
+            enable: true
         },
         {
             label: __('Profilo aziendale', 'gepafin'),
             command: () => {
                 navigate('/profilo-aziendale')
-            }
+            },
+            enable: !intersection(permissions, ['MANAGE_TENDERS']).length
         },
         {
-            separator: true
+            separator: true,
+            enable: true
         },
         {
             label: __('Logout', 'gepafin'),
             icon: 'pi pi-sign-out',
             command: () => {
                 storeSet.main.doLogout();
-            }
+            },
+            enable: true
         }
-    ];
+    ].filter(o => o.enable);
 
     return <>
         <Menu model={items} popup ref={menuLeftRef} id="topBar_profileMenu" className="topBar__menuProfile"/>

src/layouts/DefaultLayout/components/AppSidebar/index.js

@@ -10,7 +10,6 @@ import { NavLink } from 'react-router-dom';
 
 const AppSidebar = () => {
     const permissions = useStore().main.getPermissions();
-    const role = useStore().main.getRole();
 
     const items = [
         {
@@ -31,21 +30,21 @@ const AppSidebar = () => {
             label: __('Domande in lavorazione', 'gepafin'),
             icon: 'pi pi-file',
             href: '/imieibandi',
-            id: 11,
+            id: 3,
             enable: intersection(permissions, ['APPLY_CALLS']).length
         },
         {
             label: __('Bandi disponibili', 'gepafin'),
             icon: 'pi pi-bookmark',
             href: '/bandi',
-            id: 12,
+            id: 4,
             enable: intersection(permissions, ['VIEW_CALLS']).length
         },
         {
             label: __('Gestione Utenti', 'gepafin'),
             icon: 'pi pi-users',
-            //href: '/utenti',
-            id: 3,
+            href: '/utenti',
+            id: 5,
             enable: false
             //enable: intersection(permissions, ['VIEW_USERS', 'MANAGE_USERS']).length
         },
@@ -53,21 +52,21 @@ const AppSidebar = () => {
             label: __('Configurazione', 'gepafin'),
             icon: 'pi pi-cog',
             //href: '/configurazione',
-            id: 4,
+            id: 6,
             enable: false
         },
         {
             label: __('Report e Analisi', 'gepafin'),
             icon: 'pi pi-chart-bar',
             //href: '/stats',
-            id: 5,
+            id: 7,
             enable: false
         },
         {
             label: __('Log di Sistema', 'gepafin'),
             icon: 'pi pi-receipt',
             clickFn: () => {},
-            id: 6,
+            id: 8,
             enable: false
         }
     ]

src/pages/Bandi/index.js

@@ -16,7 +16,7 @@ const Bandi = () => {
     return(
         <div className="appPage">
             <div className="appPage__pageHeader">
-                <h1>{__('Gestione Bandi', 'gepafin')}</h1>
+                <h1>{__('Gestione bandi', 'gepafin')}</h1>
             </div>
 
             <div className="appPage__spacer"></div>

src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js

@@ -91,6 +91,7 @@ const BuilderElementSettings = ({ closeSettings }) => {
 
     useEffect(() => {
         const chosen = head(elements.filter(o => o.id === activeElement));
+
         if (chosen) {
             setActiveElementData(klona(chosen));
             setSettings(klona(chosen.settings));

src/pages/Login/index.js

@@ -1,7 +1,7 @@
 import React, { useRef, useEffect, useState } from 'react';
 import { __, sprintf } from '@wordpress/i18n';
 import { classNames } from 'primereact/utils';
-import { isEmpty } from 'ramda';
+import { isEmpty, isNil } from 'ramda';
 
 // store
 import { storeSet, useStore } from '../../store';
@@ -22,7 +22,7 @@ const Login = () => {
 
     const loginWithSpid = () => {
         if (!loading) {
-            window.location.replace(`${API_BASE_URL}/saml2/authenticate/loginumbria`);
+            //window.location.replace(`${API_BASE_URL}/saml2/authenticate/loginumbria`);
         }
     }
 
@@ -63,7 +63,8 @@ const Login = () => {
 
     useEffect(() => {
         const temp_token = searchParams.get('temp_token');
-        if (temp_token) {
+
+        if (!isNil(temp_token) && !isEmpty(temp_token)) {
             errorMsgs.current.clear();
             AuthenticationService.validateExistingUser(temp_token, validateCallback, validateError);
         }

src/pages/PageNotFound/index.js

@@ -2,8 +2,11 @@ import React from 'react';
 
 const PageNotFound = () => {
     return(
-        <div>
-            Page not found
+        <div className="error404">
+            <div>
+                <h1>Error 404</h1>
+                <span>Pagina non trovata</span>
+            </div>
         </div>
     )
 }

src/pages/Registration/index.js

@@ -34,9 +34,12 @@ const Registration = () => {
 
     const onSubmit = (formData) => {
         errorMsgs.current.clear();
+        const temp_token = searchParams.get('temp_token');
         setLoading(true);
 
-        AuthenticationService.registerUser(formData, regCallback, regError);
+        AuthenticationService.registerUser(formData, regCallback, regError, [
+            ['tempToken', temp_token]
+        ]);
     };
 
     const regCallback = (data) => {
@@ -106,7 +109,8 @@ const Registration = () => {
 
     useEffect(() => {
         const temp_token = searchParams.get('temp_token');
-        if (temp_token) {
+
+        if (temp_token && !isEmpty(temp_token)) {
             AuthenticationService.validateNewUser(temp_token, validateCallback, validateError);
         }
     }, [searchParams]);

src/pages/Utenti/components/AllBandiTable/index.js

@@ -0,0 +1,158 @@
+import React, { useState, useEffect} from 'react';
+import { __ } from '@wordpress/i18n';
+import { is, uniq } from 'ramda';
+
+// store
+import { storeSet, storeGet } from '../../../../store';
+
+// tools
+import getBandoSeverity from '../../../../helpers/getBandoSeverity';
+import getBandoLabel from '../../../../helpers/getBandoLabel';
+import getDateFromISOstring from '../../../../helpers/getDateFromISOstring';
+
+// api
+import BandoService from '../../../../service/bando-service';
+
+// components
+import { FilterMatchMode, FilterOperator } from 'primereact/api';
+import { DataTable } from 'primereact/datatable';
+import { Column } from 'primereact/column';
+import { InputText } from 'primereact/inputtext';
+import { IconField } from 'primereact/iconfield';
+import { InputIcon } from 'primereact/inputicon';
+import { Dropdown } from 'primereact/dropdown';
+import { Button } from 'primereact/button';
+import { Calendar } from 'primereact/calendar';
+import { Tag } from 'primereact/tag';
+import ProperBandoLabel from '../../../../components/ProperBandoLabel';
+import { Link } from 'react-router-dom';
+
+
+const AllBandiTable = () => {
+    const [items, setItems] = useState(null);
+    const [filters, setFilters] = useState(null);
+    const [loading, setLoading] = useState(false);
+    const [globalFilterValue, setGlobalFilterValue] = useState('');
+    const [statuses, setStatuses] = useState([]);
+
+    useEffect(() => {
+        storeSet.main.setAsyncRequest();
+        BandoService.getBandi(getCallback, errGetCallbacks);
+    }, []);
+
+    const getCallback = (data) => {
+        if (data.status === 'SUCCESS') {
+            setItems(getFormattedBandiData(data.data));
+            setStatuses(uniq(data.data.map(o => o.status)))
+            initFilters();
+        }
+        storeSet.main.unsetAsyncRequest();
+    }
+
+    const errGetCallbacks = (data) => {
+        console.log('errGetCallbacks', data)
+        storeSet.main.unsetAsyncRequest();
+    }
+
+    const getFormattedBandiData = (data) => {
+        return data.map((d) => {
+            d.dates = d.dates.map(v => is(String, v) ? new Date(v) : (v ? v : ''));
+            return d;
+        });
+    };
+
+    const clearFilter = () => {
+        initFilters();
+    };
+
+    const onGlobalFilterChange = (e) => {
+        const value = e.target.value;
+        let _filters = { ...filters };
+
+        _filters['global'].value = value;
+
+        setFilters(_filters);
+        setGlobalFilterValue(value);
+    };
+
+    const initFilters = () => {
+        setFilters({
+            global: { value: null, matchMode: FilterMatchMode.CONTAINS },
+            name: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.STARTS_WITH }] },
+            start_date: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] },
+            end_date: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] },
+            status: { operator: FilterOperator.OR, constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] },
+        });
+        setGlobalFilterValue('');
+    };
+
+    const renderHeader = () => {
+        return (
+            <div className="appTableHeader">
+                <Button type="button" icon="pi pi-filter-slash" label={__('Pulisci', 'gepafin')} outlined onClick={clearFilter} />
+                <IconField iconPosition="left">
+                    <InputIcon className="pi pi-search" />
+                    <InputText value={globalFilterValue} onChange={onGlobalFilterChange} placeholder={__('Cerca', 'gepafin')} />
+                </IconField>
+            </div>
+        );
+    };
+
+    const dateStartBodyTemplate = (rowData) => {
+        return getDateFromISOstring(rowData.dates[0]);
+    };
+
+    const dateEndBodyTemplate = (rowData) => {
+        return getDateFromISOstring(rowData.dates[1]);
+    };
+
+    const dateFilterTemplate = (options) => {
+        return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)} dateFormat="mm/dd/yy" placeholder="mm/dd/yyyy" mask="99/99/9999" />;
+    };
+
+    const statusBodyTemplate = (rowData) => {
+        return <ProperBandoLabel status={rowData.status}/>;
+    };
+
+    const statusFilterTemplate = (options) => {
+        return <Dropdown value={options.value} options={statuses} onChange={(e) => options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder="Select One" className="p-column-filter" showClear />;
+    };
+
+    const statusItemTemplate = (option) => {
+        return <Tag value={getBandoLabel(option)} severity={getBandoSeverity(option)} />;
+    };
+
+    const actionsBodyTemplate = (rowData) => {
+        return <Link to={`/bandi/${rowData.id}`}>
+            <Button severity="info" label={__('Modifica', 'gepafin')} icon="pi pi-pencil" size="small" iconPos="right" />
+        </Link>
+    }
+
+    const header = renderHeader();
+
+    return(
+        <div className="appPageSection__table">
+            <DataTable value={items} paginator showGridlines rows={10} loading={loading} dataKey="id"
+                       filters={filters}
+                       globalFilterFields={['name', 'status']}
+                       header={header}
+                       emptyMessage="Nothing found." onFilter={(e) => setFilters(e.filters)}>
+                <Column field="name" header={__('Nome Bando', 'gepafin')} filter filterPlaceholder="Search by name"
+                        style={{ minWidth: '12rem' }}/>
+                <Column header={__('Data Pubblicazione', 'gepafin')} filterField="start_date" dataType="date"
+                        style={{ minWidth: '10rem' }}
+                        body={dateStartBodyTemplate} filter filterElement={dateFilterTemplate}/>
+                <Column header={__('Data Scadenza', 'gepafin')} filterField="end_date" dataType="date"
+                        style={{ minWidth: '10rem' }}
+                        body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>
+                <Column field="status" header={__('Stato', 'gepafin')} filterMenuStyle={{ width: '14rem' }}
+                        style={{ width: '120px' }} body={statusBodyTemplate} filter
+                        filterElement={statusFilterTemplate}/>
+                <Column header={__('Azioni', 'gepafin')}
+                        body={actionsBodyTemplate}/>
+            </DataTable>
+        </div>
+    )
+}
+
+export default AllBandiTable;

src/pages/Utenti/index.js

@@ -0,0 +1,37 @@
+import React from 'react';
+import { __ } from '@wordpress/i18n';
+import { useNavigate } from 'react-router-dom';
+
+// components
+import AllBandiTable from './components/AllBandiTable';
+import { Button } from 'primereact/button';
+
+const Utenti = () => {
+    const navigate = useNavigate();
+
+    const onCreateNewUser = () => {
+        navigate('/utenti/new');
+    }
+
+    return(
+        <div className="appPage">
+            <div className="appPage__pageHeader">
+                <h1>{__('Gestione utenti', 'gepafin')}</h1>
+            </div>
+
+            <div className="appPage__spacer"></div>
+
+            <div className="appPageSection">
+                <div className="appPageSection__actions">
+                    <Button
+                        onClick={onCreateNewUser}
+                        label={__('Crea nuovo bando')} icon="pi pi-plus" iconPos="right"/>
+                </div>
+
+                <AllBandiTable/>
+            </div>
+        </div>
+    )
+}
+
+export default Utenti;

src/routes.js

@@ -22,6 +22,7 @@ import BandiBeneficiario from './pages/BandiBeneficiario';
 import LoginAdmin from './pages/LoginAdmin';
 import Profile from './pages/Profile';
 import ProfileCompany from './pages/ProfileCompany';
+import Utenti from './pages/Utenti';
 
 const routes = ({ role }) => {
     return (
@@ -79,6 +80,10 @@ const routes = ({ role }) => {
                     {'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
                     {'ROLE_BENEFICIARY' === role ? <ProfileCompany/> : null}
                 </DefaultLayout>}/>
+                <Route path="/utenti" element={<DefaultLayout>
+                    {'ROLE_SUPER_ADMIN' === role ? <Utenti/> : null}
+                    {'ROLE_BENEFICIARY' === role ? <PageNotFound/> : null}
+                </DefaultLayout>}/>
             </Route>
             <Route exact path="/login" element={<Login/>}/>
             <Route exact path="/loginAdmin" element={<LoginAdmin/>}/>

src/service/authentication-service.js

@@ -61,8 +61,8 @@ export default class AuthenticationService {
         NetworkService.unauthorizedPost(`${API_BASE_URL}/user/login`, loginRequest, callback, errCallback);
     };
 
-    static registerUser = (registerRequest, callback, errCallback) => {
-        NetworkService.unauthorizedPost(`${API_BASE_URL}/user`, registerRequest, callback, errCallback);
+    static registerUser = (registerRequest, callback, errCallback, queryParams) => {
+        NetworkService.unauthorizedPost(`${API_BASE_URL}/user`, registerRequest, callback, errCallback, queryParams);
     };
 
     static forgotPassword = (request, callback, errCallback) => {

src/service/network-service.js

@@ -126,7 +126,24 @@ export class NetworkService {
             .catch(err => errorCallback(err));
     };
 
-    static unauthorizedPost = (url, body, callback, errorCallback) => {
+    static unauthorizedPost = (url, body, callback, errorCallback, queryParams) => {
+        if (queryParams) {
+            url += '?'
+            for (let i = 0; i < queryParams.length; i++) {
+                if (queryParams[i] && this.isNotBlank(queryParams[i][0]) && this.isNotBlank(queryParams[i][1])) {
+                    let param = queryParams[i][0] + '=' + queryParams[i][1]
+
+                    if (i !== queryParams.length - 1)
+                        param += '&'
+
+                    url += param;
+                }
+            }
+
+            if (url.charAt(url.length) === '&')
+                url = url.substring(0, url.length - 1);
+        }
+
         fetch(url, {
             method: 'POST',
             mode: 'cors',