- updates and fixes;

2024-09-03 17:24:41 +02:00
parent 429ca3c1d1
commit 949ff95933
21 changed files with 342 additions and 117 deletions
--- a/src/pages/Bandi/components/AllBandiTable/index.js
+++ b/src/pages/Bandi/components/AllBandiTable/index.js
@@ -36,11 +36,6 @@ const AllBandiTable = () => {
    const [statuses, setStatuses] = useState([]);

    useEffect(() => {
-        const isAsyncRequest = storeGet.main.isAsyncRequest();
-        if (isAsyncRequest !== 0) {
-            return;
-        }
-
        storeSet.main.setAsyncRequest();
        BandoService.getBandi(getCallback, errGetCallbacks);
    }, []);
--- a/src/pages/BandoEdit/components/BandoEditFormStep1/index.js
+++ b/src/pages/BandoEdit/components/BandoEditFormStep1/index.js
@@ -198,7 +198,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
            />

            <FormFieldRepeater
-                data={values}
+                data={values['aimedTo']}
                setDataFn={setValue}
                fieldName="aimedTo"
                options={aimedToOptions}
--- a/src/pages/BandoEdit/components/BandoEditFormStep2/index.js
+++ b/src/pages/BandoEdit/components/BandoEditFormStep2/index.js
@@ -156,7 +156,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
                }}/>

            <FormField
-                type="fileupload"
+                type="fileuploadasync"
                setDataFn={setValue}
                fieldName="docs"
                label={__('Documentazione', 'gepafin')}
@@ -173,7 +173,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
            />

            <FormField
-                type="fileupload"
+                type="fileuploadasync"
                setDataFn={setValue}
                fieldName="images"
                label={__('Immagine del Bando', 'gepafin')}
@@ -186,7 +186,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
            />

            <FormFieldRepeater
-                data={values}
+                data={values['checkList']}
                setDataFn={setValue}
                fieldName="checkList"
                options={checklistOptions}
--- a/src/pages/BandoEdit/index.js
+++ b/src/pages/BandoEdit/index.js
@@ -20,6 +20,7 @@ import BandoEditFormStep1 from './components/BandoEditFormStep1';
 import BandoEditFormStep2 from './components/BandoEditFormStep2';
 import { Messages } from 'primereact/messages';
 import FormsService from '../../service/forms-service';
+import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';

 const BandoEdit = () => {
    const isAsyncRequest = useStore().main.isAsyncRequest();
@@ -94,6 +95,10 @@ const BandoEdit = () => {
        navigate(`/bandi/${id}/forms`);
    }

+    const openBandoFlowManagement = () => {
+        navigate(`/bandi/${id}/flow`);
+    }
+
    const validateBando = () => {
        storeSet.main.setAsyncRequest();
        bandoMsgs.current.clear();
@@ -182,7 +187,8 @@ const BandoEdit = () => {
    }

    const errGetCallback = (data) => {
-        standardErrCallback(data);
+        set404FromErrorResponse(data);
+        storeSet.main.unsetAsyncRequest();
    }

    const standardErrCallback = (data) => {
@@ -289,10 +295,20 @@ const BandoEdit = () => {

                    <div className="appPageSection">
                        <h2>{__('Crea o modifica il Form compilabile dal Beneficiario', 'gepafin')}</h2>
-                        <Button
-                            type="button"
-                            onClick={openBandoFormManagement}
-                            label={__('Crea/modifica form', 'gepafin')}/>
+
+                        <div className="row">
+                            <Button
+                                type="button"
+                                onClick={openBandoFormManagement}
+                                label={__('Crea/modifica form', 'gepafin')}/>
+
+                            <Button
+                                type="button"
+                                onClick={openBandoFlowManagement}
+                                icon="pi pi-sitemap"
+                                iconPos="right"
+                                label={__('Gestisci flusso dei form', 'gepafin')}/>
+                        </div>

                        {forms.length
                            ? <ul className="">
--- a/src/pages/BandoForms/index.js
+++ b/src/pages/BandoForms/index.js
@@ -13,6 +13,7 @@ import FormsService from '../../service/forms-service';

 // store
 import { storeSet } from '../../store';
+import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';

 const BandoForms = () => {
    const { id } = useParams();
@@ -30,6 +31,10 @@ const BandoForms = () => {
        navigate(`/bandi/${id}`);
    }

+    const openBandoFlowManagement = () => {
+        navigate(`/bandi/${id}/flow`);
+    }
+
    const goToEditForm = () => {
        if (selectedForm && selectedForm !== 0) {
            navigate(`/bandi/${id}/forms/${selectedForm}`);
@@ -49,6 +54,11 @@ const BandoForms = () => {
        storeSet.main.unsetAsyncRequest();
    }

+    const errGetFormsCallback = (data) => {
+        set404FromErrorResponse(data);
+        storeSet.main.unsetAsyncRequest();
+    }
+
    useEffect(() => {
        const parsed = parseInt(id)
        const bandoId = !isNaN(parsed) ? parsed : 0;
@@ -58,7 +68,7 @@ const BandoForms = () => {
        ])

        storeSet.main.setAsyncRequest();
-        FormsService.getFormsForCall(bandoId, getFormsCallback, () => {});
+        FormsService.getFormsForCall(bandoId, getFormsCallback, errGetFormsCallback);
    }, [id]);

    return (
@@ -73,14 +83,6 @@ const BandoForms = () => {
            <div className="appPage__spacer"></div>

            <div className="appPage__content">
-                <div className="appPageSection">
-                    <Button
-                        type="button"
-                        outlined
-                        onClick={goToEditBando}
-                        label={__('Modifica bando', 'gepafin')}
-                        icon="pi pi-arrow-left" iconPos="left"/>
-                </div>

                <div className="appPageSection__withBorder disabled">
                    <h2>{__('Usa un template', 'gepafin')}</h2>
@@ -136,6 +138,25 @@ const BandoForms = () => {
                            icon="pi pi-cog" iconPos="right"/>
                    </div>
                </div>
+
+                <div className="appPageSection">
+
+                    <div className="row">
+                        <Button
+                            type="button"
+                            outlined
+                            onClick={goToEditBando}
+                            label={__('Indietro', 'gepafin')}
+                            icon="pi pi-arrow-left" iconPos="left"/>
+
+                        <Button
+                            type="button"
+                            onClick={openBandoFlowManagement}
+                            icon="pi pi-sitemap"
+                            iconPos="right"
+                            label={__('Gestisci flusso dei form', 'gepafin')}/>
+                    </div>
+                </div>
            </div>
        </div>
    )
--- a/src/pages/BandoFormsEdit/index.js
+++ b/src/pages/BandoFormsEdit/index.js
@@ -16,6 +16,8 @@ import { InputText } from 'primereact/inputtext';

 // api
 import FormsService from '../../service/forms-service';
+import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
+import { elementItems } from '../../tempData';

 const BandoFormsEdit = () => {
    const { id, formId } = useParams();
@@ -76,6 +78,7 @@ const BandoFormsEdit = () => {
        confirmPopup({
            target: event.currentTarget,
            message: __('Sei sicuro di cancellare questo form?', 'gepafin'),
+            acceptLabel: __('Si', 'gepafin'),
            icon: 'pi pi-info-circle',
            defaultFocus: 'reject',
            acceptClassName: 'p-button-danger',
@@ -84,9 +87,9 @@ const BandoFormsEdit = () => {
        });
    };

-    const doPublish = () => {
+    /*const doPublish = () => {
        console.log('doPublish');
-    }
+    }*/

    const doDelete = () => {
        storeSet.main.setAsyncRequest();
@@ -108,7 +111,8 @@ const BandoFormsEdit = () => {

    const getElementItemsCallback = (data) => {
        if (data.status === 'SUCCESS') {
-            storeSet.main.elementItems(data.data);
+            storeSet.main.elementItems(elementItems);
+            //storeSet.main.elementItems(data.data);
        }
        storeSet.main.unsetAsyncRequest();
    }
@@ -130,7 +134,7 @@ const BandoFormsEdit = () => {
    }

    const errGetFormCallbacks = (data) => {
-        console.log('errGetElementItemsCallbacks', data)
+        set404FromErrorResponse(data);
        storeSet.main.unsetAsyncRequest();
    }

@@ -198,10 +202,10 @@ const BandoFormsEdit = () => {
                        outlined
                        onClick={openPreview}
                        label={__('Visualizza Anteprima Beneficiario', 'gepafin')} icon="pi pi-image" iconPos="right"/>
-                    <Button
+                    {/*<Button
                        disabled={true}
                        onClick={doPublish}
-                        label={__('Pubblica', 'gepafin')}/>
+                        label={__('Pubblica', 'gepafin')}/>*/}
                </div>
                <div className="appPageSection__actions">
                    <ConfirmPopup />
--- a/src/pages/BandoFormsPreview/index.js
+++ b/src/pages/BandoFormsPreview/index.js
@@ -1,68 +1,75 @@
 import React, { useState, useEffect } from 'react';
-import { __, sprintf } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 import { useNavigate, useParams } from 'react-router-dom';
-import { bandoTest, formData } from '../../tempData';
+import { klona } from 'klona';
+import { head } from 'ramda';
+import { useForm } from 'react-hook-form';

-// tools
-import getNumberWithCurrency from '../../helpers/getNumberWithCurrency';
-import getDateFromISOstring from '../../helpers/getDateFromISOstring';
+// store
+import { storeSet, useStore } from '../../store';
+
+// api
+import FormsService from '../../service/forms-service';

 // components
 import { Skeleton } from 'primereact/skeleton';
-import { Accordion } from 'primereact/accordion';
-import { AccordionTab } from 'primereact/accordion';
-import { InputTextarea } from 'primereact/inputtextarea';
 import { Button } from 'primereact/button';
-import { useForm } from 'react-hook-form';
-import { is, isNil } from 'ramda';
 import FormField from '../../components/FormField';
+import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';

 const BandoFormsPreview = () => {
    const { id, formId } = useParams();
    const navigate = useNavigate();
-    const [bando, setBando] = useState({});
-    const [data, setData] = useState({});
-    const [isLoading, setIsLoading] = useState(true);
+    const [formData, setFormData] = useState([]);
+    const [formName, setFormName] = useState('');
+    const isAsyncRequest = useStore().main.isAsyncRequest();
    const {
        control,
        handleSubmit,
-        formState: { errors, isValid },
-        setValue,
-        register,
-        trigger,
+        formState: { errors },
        getValues,
-        clearErrors
-    } = useForm({defaultValues: {}, mode: 'onChange'});
+    } = useForm({ defaultValues: {}, mode: 'onChange' });
    const values = getValues();

-    const onSubmit = (formData) => {
-        console.log('onSubmit', formData);
-    };
+    const onSubmit = () => {}

    const closePreview = () => {
-        navigate(`/bandi/${id}`);
+        const parsedId = parseInt(id)
+        const bandoId = !isNaN(parsedId) ? parsedId : 0;
+        const parsedFormId = parseInt(formId)
+        const bandoFormId = !isNaN(parsedFormId) ? parsedFormId : 0;
+        navigate(`/bandi/${bandoId}/forms/${bandoFormId}`);
+    }
+
+    const getFormCallback = (data) => {
+        if (data.status === 'SUCCESS') {
+            setFormName(data.data.label);
+            const elements = klona(data.data.content);
+            setFormData(elements);
+        }
+        storeSet.main.unsetAsyncRequest();
+    }
+
+    const errGetFormCallbacks = (data) => {
+        set404FromErrorResponse(data);
+        storeSet.main.unsetAsyncRequest();
    }

    useEffect(() => {
-        //const parsed = parseInt(id)
-        //const bandoId = !isNaN(parsed) ? parsed : 0;
+        const parsedFormId = parseInt(formId)
+        const bandoFormId = !isNaN(parsedFormId) ? parsedFormId : 0;

-        setTimeout(() => {
-            const data = formData;
-            setData(data);
-
-            const bandoData = bandoTest;
-            setBando(bandoData);
-
-            setIsLoading(false)
-        }, 3000);
-    }, [id]);
+        if (bandoFormId) {
+            storeSet.main.setAsyncRequest();
+            FormsService.getFormById(bandoFormId, getFormCallback, errGetFormCallbacks);
+        }
+    }, [id, formId]);

    return (
        <div className="appPage">
-            {!isLoading
+            {!isAsyncRequest
                ? <div className="appPage__pageHeader">
-                    <h1>{sprintf(__('Domanda per il Bando: %s', 'gepafin'), bando.name)}</h1>
+                    <h1>{formName}</h1>
                </div>
                : <>
                    <Skeleton width="20%" height="1rem" className="mb-2"></Skeleton>
@@ -71,7 +78,7 @@ const BandoFormsPreview = () => {

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

-            {!isLoading
+            {!isAsyncRequest
                ? <div className="appPage__content">
                    <div className="appPageSection__preview">
                        <Button
@@ -83,15 +90,23 @@ const BandoFormsPreview = () => {
                    </div>

                    <form className="appForm" onSubmit={handleSubmit(onSubmit)}>
-                        {data.content.map(o => <FormField
-                            key={o.id}
-                            type={o.name}
-                            fieldName={`field_${o.id}`}
-                            label={o.label}
-                            control={control}
-                            errors={errors}
-                            defaultValue={values[`field_${o.id}`]}
-                        />)}
+                        {formData.map(o => {
+                            const label = head(o.settings.filter(o => o.name === 'label'));
+                            const placeholder = head(o.settings.filter(o => o.name === 'placeholder'));
+                            const options = head(o.settings.filter(o => o.name === 'options'));
+                            return <FormField
+                                key={o.id}
+                                type={o.name}
+                                fieldName={`field_${o.id}`}
+                                label={label ? label.value : ''}
+                                placeholder={placeholder ? placeholder.value : ''}
+                                control={control}
+                                errors={errors}
+                                defaultValue={values[`field_${o.id}`]}
+                                config={o.validators}
+                                options={options ? options.value : []}
+                            />
+                        })}
                    </form>

                    <div className="appPageSection__preview">
--- a/src/pages/BandoView/index.js
+++ b/src/pages/BandoView/index.js
@@ -18,6 +18,7 @@ import { InputTextarea } from 'primereact/inputtextarea';
 import { Button } from 'primereact/button';
 import BandoService from '../../service/bando-service';
 import { Messages } from 'primereact/messages';
+import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';

 const BandoView = () => {
    const isAsyncRequest = useStore().main.isAsyncRequest();
@@ -64,6 +65,7 @@ const BandoView = () => {
                }
            ]);
        }
+        set404FromErrorResponse(data);
        storeSet.main.unsetAsyncRequest();
    }