- updated version;

2024-09-06 17:28:25 +02:00
parent 4054745695
commit 19e17ec2d7
14 changed files with 160 additions and 51 deletions
--- a/src/pages/BandoEdit/components/BandoEditFormStep1/index.js
+++ b/src/pages/BandoEdit/components/BandoEditFormStep1/index.js
@@ -1,4 +1,4 @@
-import React, { forwardRef, useImperativeHandle, useEffect, useState, useMemo } from 'react';
+import React, { forwardRef, useImperativeHandle, useEffect, useState, useMemo, useRef } from 'react';
 import { __ } from '@wordpress/i18n';
 import { useNavigate } from 'react-router-dom';
 import { useForm } from 'react-hook-form';
@@ -11,6 +11,9 @@ import FormFieldRepeater from '../../../../components/FormFieldRepeater';
 import FormFieldRepeaterFaq from '../../../../components/FormFieldRepeaterFaq';
 import BandoEditFormActions from '../BandoEditFormActions';
 import UnsavedChangesDetector from '../../../../components/UnsavedChangesDetector';
+import { Toast } from 'primereact/toast';
+
+// api
 import BandoService from '../../../../service/bando-service';
 import LookupdataService from '../../../../service/lookupdata-service';

@@ -39,6 +42,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
        }, [formInitialData]), mode: 'onChange'
    });
    const values = getValues();
+    const toast = useRef(null);

    const onSubmit = (formData) => {
        if (!isNil(formData.dates) && formData.dates.length) {
@@ -54,6 +58,11 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },

    const createCallback = (data) => {
        if (data.status === 'SUCCESS') {
+            toast.current.show({
+                severity: 'success',
+                summary: '',
+                detail: __('Il bando è stato aggiornato corretamente!', 'gepafin')
+            });
            const values = getValues();
            if (!values.id && data.data.id) {
                navigate(`/tenders/${data.data.id}`);
@@ -84,7 +93,8 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
                    delete o.type;
                    return {
                        ...o,
-                        lookUpDataId: o.id
+                        lookUpDataId: o.id,
+                        id: null
                    };
                });
            setAimedToOptions(aimedTo);
@@ -94,7 +104,8 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
                    delete o.type;
                    return {
                        ...o,
-                        lookUpDataId: o.id
+                        lookUpDataId: o.id,
+                        id: null
                    };
                });
            setFaqOptions(faqItems);
@@ -290,6 +301,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
                <span>{__('Azioni', 'gepafin')}</span>
            </div>

+            <Toast ref={toast} />
            <BandoEditFormActions
                id={values.id}
                openPreview={openPreview}
--- a/src/pages/BandoEdit/components/BandoEditFormStep2/index.js
+++ b/src/pages/BandoEdit/components/BandoEditFormStep2/index.js
@@ -1,4 +1,4 @@
-import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useState } from 'react';
+import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { __ } from '@wordpress/i18n';
 import { useNavigate } from 'react-router-dom';
 import { useForm } from 'react-hook-form';
@@ -11,8 +11,13 @@ import FormFieldRepeater from '../../../../components/FormFieldRepeater';
 import FormFieldRepeaterCriteria from '../../../../components/FormFieldRepeaterCriteria';
 import BandoEditFormActions from '../BandoEditFormActions';
 import UnsavedChangesDetector from '../../../../components/UnsavedChangesDetector';
+import { Toast } from 'primereact/toast';
+
+// api
 import BandoService from '../../../../service/bando-service';
 import LookupdataService from '../../../../service/lookupdata-service';
+
+// store
 import { storeSet } from '../../../../store';

 const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors }, ref) {
@@ -37,6 +42,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
    });
    const values = getValues();
    const step2Props = ['threshold', 'criteria', 'checkList', 'docs', 'images'];
+    const toast = useRef(null);

    const onSubmit = (formData) => {
        if (!isNil(formData.dates) && formData.dates.length) {
@@ -55,6 +61,11 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },

    const createCallback = (data) => {
        if (data.status === 'SUCCESS') {
+            toast.current.show({
+                severity: 'success',
+                summary: '',
+                detail: __('Il bando è stato aggiornato corretamente!', 'gepafin')
+            });
            setFormInitialData(data.data);
            reset();
        }
@@ -73,7 +84,8 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
                    return {
                        ...o,
                        score: 0,
-                        lookUpDataId: o.id
+                        lookUpDataId: o.id,
+                        id: null
                    };
                });
            setCriteriaOptions(criteria);
@@ -83,7 +95,8 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
                    delete o.type;
                    return {
                        ...o,
-                        lookUpDataId: o.id
+                        lookUpDataId: o.id,
+                        id: null
                    };
                });
            setChecklistOptions(checklist);
@@ -215,6 +228,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
                <span>{__('Azioni', 'gepafin')}</span>
            </div>

+            <Toast ref={toast} />
            <BandoEditFormActions
                openPreview={openPreview}
                openPreviewEvaluation={openPreviewEvaluation}/>
--- a/src/pages/BandoFlowEdit/index.js
+++ b/src/pages/BandoFlowEdit/index.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useCallback } from 'react';
+import React, { useEffect, useState, useCallback, useRef } from 'react';
 import { __ } from '@wordpress/i18n';
 import { useNavigate, useParams } from 'react-router-dom';
 import { isEmpty } from 'ramda';
@@ -16,15 +16,18 @@ import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
 import { Button } from 'primereact/button';
 import { Dropdown } from 'primereact/dropdown';
 import FlowBuilder from '../../components/FlowBuilder';
+import { Messages } from 'primereact/messages';

 const BandoFlowEdit = () => {
    const { id } = useParams();
    const navigate = useNavigate();
+    const forms = useStore().main.flowForms();
    const flowData = useStore().main.flowData();
    const flowEdges = useStore().main.flowEdges();
    const [formOptions, setFormOptions] = useState([]);
    const [initialForm, setInitialForm] = useState(0);
    const [finalForm, setFinalForm] = useState(0);
+    const flowMsgs = useRef(null);

    const getBandoId = () => {
        const parsed = parseInt(id)
@@ -51,7 +54,7 @@ const BandoFlowEdit = () => {

    const getFormsCallback = (data) => {
        if (data.status === 'SUCCESS') {
-            const formOptions = data.data.map(o => ({label: o.label, value: o.id}))
+            const formOptions = data.data.map(o => ({ label: o.label, value: o.id }))
            storeSet.main.flowForms(data.data);
            setFormOptions(formOptions);
        }
@@ -69,6 +72,20 @@ const BandoFlowEdit = () => {
        FormsService.getFormsForCall(bandoId, getFormsCallback, errGetFormsCallback);
    }, [id]);

+    useEffect(() => {
+        if (flowMsgs.current && forms.length < 2) {
+            flowMsgs.current.clear();
+            flowMsgs.current.show([
+                {
+                    id: '1',
+                    sticky: true, severity: 'info', summary: '',
+                    detail: __('Devi creare almeno 2 form.', 'gepafin'),
+                    closable: false
+                }
+            ]);
+        }
+    }, [forms]);
+
    useEffect(() => {
        return () => {
            storeSet.main.flowForms([]);
@@ -100,28 +117,31 @@ const BandoFlowEdit = () => {
                            options={formOptions}
                            optionLabel="label"
                            optionValue="value"
-                            placeholder={__('Scegli il form', 'gepafin')} />
+                            placeholder={__('Scegli il form', 'gepafin')}/>
                    </div>

-                    <div className="appForm__field">
-                        <label htmlFor="finalForm">{__('Scegli form finale', 'gepafin')}</label>
-                        <Dropdown
-                            id="finalForm"
-                            value={finalForm}
-                            onChange={(e) => setFinalForm(e.value)}
-                            optionDisabled={(opt) => initialForm === opt.value}
-                            options={formOptions}
-                            optionLabel="label"
-                            optionValue="value"
-                            placeholder={__('Scegli il form', 'gepafin')} />
-                    </div>
+                    {forms.length > 2
+                        ? <div className="appForm__field">
+                            <label htmlFor="finalForm">{__('Scegli form finale', 'gepafin')}</label>
+                            <Dropdown
+                                id="finalForm"
+                                value={finalForm}
+                                onChange={(e) => setFinalForm(e.value)}
+                                optionDisabled={(opt) => initialForm === opt.value}
+                                options={formOptions}
+                                optionLabel="label"
+                                optionValue="value"
+                                placeholder={__('Scegli il form', 'gepafin')}/>
+                        </div> : null}
                </div>
            </div>

            <div className="appPage__spacer"></div>

            <div className="appPageSection">
-                <FlowBuilder initialForm={initialForm} finalForm={finalForm}/>
+                {forms.length >= 2
+                    ? <FlowBuilder initialForm={initialForm} finalForm={finalForm}/>
+                    : <Messages ref={flowMsgs}/>}
            </div>

            <div className="appPage__spacer"></div>
--- a/src/pages/BandoFormsEdit/index.js
+++ b/src/pages/BandoFormsEdit/index.js
@@ -57,7 +57,6 @@ const BandoFormsEdit = () => {
        if (data.status === 'SUCCESS') {
            storeSet.main.unsetAsyncRequest();
            const bandoId = getBandoId();
-
            if (shouldRedirect) {
                navigate(`/tenders/${bandoId}/forms/${data.data.id}/preview`);
                return;
@@ -198,7 +197,7 @@ const BandoFormsEdit = () => {
                        outlined
                        label={__('Indietro', 'gepafin')} icon="pi pi-arrow-left" iconPos="left"/>
                    <Button
-                        onClick={doSave}
+                        onClick={() => doSave()}
                        label={__('Salva progressi', 'gepafin')} icon="pi pi-save" iconPos="right"/>
                    <Button
                        outlined
--- a/src/pages/Dashboard/components/LatestBandiTable/index.js
+++ b/src/pages/Dashboard/components/LatestBandiTable/index.js
@@ -6,6 +6,12 @@ import { uniq } from 'ramda';
 import getBandoLabel from '../../../../helpers/getBandoLabel';
 import getBandoSeverity from '../../../../helpers/getBandoSeverity';

+// store
+import { storeSet } from '../../../../store';
+
+// api
+import BandoService from '../../../../service/bando-service';
+
 // components
 import { FilterMatchMode, FilterOperator } from 'primereact/api';
 import { DataTable } from 'primereact/datatable';
@@ -30,7 +36,7 @@ const LatestBandiTable = () => {

    useEffect(() => {
        // TODO
-        const items = [
+        /*const items = [
            {
                name: 'Bando Innovazione 2024',
                start_date: '2024-08-08T00:00:00+00:00',
@@ -59,9 +65,26 @@ const LatestBandiTable = () => {
        setItems(getFormattedBandiData(items));
        setStatuses(uniq(items.map(o => o.status)))
        setLoading(false);
-        initFilters();
+        initFilters();*/
+
+        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.start_date = new Date(d.start_date);