- updated bando form;

src/pages/BandoEdit/components/BandoEditFormStep1/index.js

@@ -5,6 +5,7 @@ import { useForm } from 'react-hook-form';
 import { isEmpty, isNil, is } from 'ramda';
 import { klona } from 'klona';
 import { TZDate } from '@date-fns/tz';
+import { wrap } from 'object-path-immutable';
 
 // components
 import FormField from '../../../../components/FormField';
@@ -48,38 +49,36 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
     const values = getValues();
     const toast = useRef(null);
 
-    const onSubmit = (formData) => {
-        /*if (!isNil(formData.dates) && formData.dates.length) {
-            formData.dates = formData.dates.map(v => {
-                if (is(String, v)) {
-                    return v;
-                } else {
-                    const tzAwareDate = new TZDate(v, 'Europe/Berlin');
-                    return tzAwareDate.toISOString().substring(0, 19);
-                }
-            });
-        }
-
-        storeSet.main.setAsyncRequest();
-        if (!formData.id) {
-            BandoService.createBando(formData, createCallback, errCreateCallback);
-        } else {
-            BandoService.updateBandoStep1(formData.id, formData, createCallback, errCreateCallback);
-        }*/
-    };
+    const onSubmit = () => {};
 
     const onSaveDraft = () => {
         trigger();
-        const formData = getValues();
-        if (!isNil(formData.dates) && formData.dates.length) {
-            formData.dates = formData.dates.map(v => {
-                if (is(String, v)) {
-                    return v;
-                } else {
-                    const tzAwareDate = new TZDate(v, 'Europe/Berlin');
-                    return tzAwareDate.toISOString().substring(0, 19);
-                }
-            });
+        let formData = klona(getValues());
+        formData.dates = [];
+
+        if (formData.startDate) {
+            let starDate;
+
+            if (is(String, formData.startDate)) {
+                starDate = formData.startDate;
+            } else {
+                const tzAwareDate = new TZDate(formData.startDate, 'Europe/Berlin');
+                starDate = tzAwareDate.toISOString().substring(0, 19);
+            }
+
+            formData = wrap(formData).insert(['dates'], starDate, 0).value();
+        }
+        if (formData.endDate) {
+            let endDate;
+
+            if (is(String, formData.endDate)) {
+                endDate = formData.endDate;
+            } else {
+                const tzAwareDate = new TZDate(formData.endDate, 'Europe/Berlin');
+                endDate = tzAwareDate.toISOString().substring(0, 19);
+            }
+
+            formData = wrap(formData).insert(['dates'], endDate, 1).value();
         }
         if (!isNil(formData.startTime)) {
             if (!is(String, formData.startTime)) {
@@ -95,6 +94,9 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
             }
         }
 
+        delete formData.startDate;
+        delete formData.endDate;
+
         storeSet.main.setAsyncRequest();
         if (!formData.id) {
             BandoService.createBando(formData, createCallback, errCreateCallback);
@@ -106,11 +108,13 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
     const createCallback = (data) => {
         storeSet.main.unsetAsyncRequest();
         if (data.status === 'SUCCESS') {
-            toast.current.show({
-                severity: 'success',
-                summary: '',
-                detail: __('Il bando è stato aggiornato corretamente!', 'gepafin')
-            });
+            if (toast.current) {
+                toast.current.show({
+                    severity: 'success',
+                    summary: '',
+                    detail: __('Il bando è stato aggiornato corretamente!', 'gepafin')
+                });
+            }
             const values = getValues();
             if (!values.id && data.data.id) {
                 navigate(`/bandi/${data.data.id}`);
@@ -121,6 +125,13 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
     }
 
     const errCreateCallback = (data) => {
+        if (toast.current && data.message) {
+            toast.current.show({
+                severity: 'error',
+                summary: '',
+                detail: data.message
+            });
+        }
         set404FromErrorResponse(data);
         storeSet.main.unsetAsyncRequest();
     }
@@ -193,7 +204,12 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
     useEffect(() => {
         const newFormData = klona(formInitialData);
         if (!isNil(formInitialData.dates) && formInitialData.dates.length) {
-            newFormData.dates = formInitialData.dates.map(v => is(String, v) ? new Date(v) : (v ? v : ''));
+            if (newFormData.dates[0]) {
+                newFormData.startDate = is(String, newFormData.dates[0]) ? new Date(newFormData.dates[0]) : (newFormData.dates[0] ? newFormData.dates[0] : '');
+            }
+            if (newFormData.dates[1]) {
+                newFormData.endDate = is(String, newFormData.dates[1]) ? new Date(newFormData.dates[1]) : (newFormData.dates[1] ? newFormData.dates[1] : '');
+            }
         }
         if (!isNil(formInitialData.startTime) && !isEmpty(formInitialData.startTime)) {
             newFormData.startTime = is(String, formInitialData.startTime)
@@ -305,7 +321,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
                 }}
             />
 
-            <FormField
+            {/*<FormField
                 type="datepickerrange"
                 disabled={shouldDisableField()}
                 fieldName="dates"
@@ -314,7 +330,30 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
                 errors={errors}
                 defaultValue={values['dates']}
                 config={{ required: __('È obbligatorio', 'gepafin') }}
-            />
+            />*/}
+            <div className="appForm__cols">
+                <FormField
+                    type="datepicker"
+                    disabled={shouldDisableField()}
+                    fieldName="startDate"
+                    label={__('Data di inizio', 'gepafin')}
+                    control={control}
+                    errors={errors}
+                    defaultValue={values['startDate']}
+                    config={{ required: __('È obbligatorio', 'gepafin') }}
+                />
+
+                <FormField
+                    type="datepicker"
+                    disabled={shouldDisableField()}
+                    fieldName="endDate"
+                    label={__('Data di fine', 'gepafin')}
+                    control={control}
+                    errors={errors}
+                    defaultValue={values['endDate']}
+                    config={{ required: __('È obbligatorio', 'gepafin') }}
+                />
+            </div>
 
             <div className="appForm__cols">
                 <FormField

src/pages/BandoEdit/components/BandoEditFormStep2/index.js

@@ -22,6 +22,7 @@ import LookupdataService from '../../../../service/lookupdata-service';
 import { storeSet } from '../../../../store';
 import getTimeParsedFromString from '../../../../helpers/getTimeParsedFromString';
 import { mimeTypes } from '../../../../configData';
+import { wrap } from 'object-path-immutable';
 
 const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, status }, ref) {
     const navigate = useNavigate();
@@ -46,41 +47,36 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
     //const step2Props = ['threshold', 'criteria', 'checkList', 'docs', 'images'];
     const toast = useRef(null);
 
-    const onSubmit = (formData) => {
-        /*if (!isNil(formData.dates) && formData.dates.length) {
-            formData.dates = formData.dates.map(v => {
-                if (is(String, v)) {
-                    return v;
-                } else {
-                    const tzAwareDate = new TZDate(v, 'Europe/Berlin');
-                    return tzAwareDate.toISOString().substring(0, 19);
-                }
-            });
-        }
-
-        const forSubmit = Object.keys(formData).reduce((acc, cur) => {
-            if (step2Props.includes(cur)) {
-                acc[cur] = formData[cur];
-            }
-            return acc;
-        }, {});
-
-        storeSet.main.setAsyncRequest();
-        BandoService.updateBandoStep2(formData.id, forSubmit, createCallback, errCreateCallback);*/
-    };
+    const onSubmit = () => {};
 
     const onSaveDraft = () => {
         trigger();
-        const formData = getValues();
-        if (!isNil(formData.dates) && formData.dates.length) {
-            formData.dates = formData.dates.map(v => {
-                if (is(String, v)) {
-                    return v;
-                } else {
-                    const tzAwareDate = new TZDate(v, 'Europe/Berlin');
-                    return tzAwareDate.toISOString().substring(0, 19);
-                }
-            });
+        let formData = klona(getValues());
+        formData.dates = [];
+
+        if (formData.startDate) {
+            let starDate;
+
+            if (is(String, formData.startDate)) {
+                starDate = formData.startDate;
+            } else {
+                const tzAwareDate = new TZDate(formData.startDate, 'Europe/Berlin');
+                starDate = tzAwareDate.toISOString().substring(0, 19);
+            }
+
+            formData = wrap(formData).insert(['dates'], starDate, 0).value();
+        }
+        if (formData.endDate) {
+            let endDate;
+
+            if (is(String, formData.endDate)) {
+                endDate = formData.endDate;
+            } else {
+                const tzAwareDate = new TZDate(formData.endDate, 'Europe/Berlin');
+                endDate = tzAwareDate.toISOString().substring(0, 19);
+            }
+
+            formData = wrap(formData).insert(['dates'], endDate, 1).value();
         }
         if (!isNil(formData.startTime)) {
             if (!is(String, formData.startTime)) {
@@ -88,7 +84,6 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
                 formData.startTime = tzAwareDate.toISOString().substring(11, 16);
             }
         }
-
         if (!isNil(formData.endTime)) {
             if (!is(String, formData.endTime)) {
                 const tzAwareDate = new TZDate(formData.endTime, 'Europe/Berlin');
@@ -96,6 +91,9 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
             }
         }
 
+        delete formData.startDate;
+        delete formData.endDate;
+
         storeSet.main.setAsyncRequest();
         BandoService.updateBandoStep2(formData.id, formData, createCallback, errCreateCallback);
     }