- temp fix: form field items from JS config;

- fixed displaying times for call;
- fixed reading saved flow;

src/App.js

@@ -24,7 +24,7 @@ function App() {
         }
     }
 
-    const errCallback = () => {
+    const errCallback = (data) => {
         storeSet.main.doLogout();
         storeSet.main.unsetAsyncRequest();
     }

src/helpers/getTimeParsedFromString.js

@@ -0,0 +1,9 @@
+const getTimeParsedFromString = ( t ) => {
+    let d = new Date();
+    const time = t.match( /(\d+)(?::(\d\d))?\s*(p?)/ );
+    d.setHours( parseInt( time[1]) + (time[3] ? 12 : 0) );
+    d.setMinutes( parseInt( time[2]) || 0 );
+    return d;
+}
+
+export default getTimeParsedFromString;

src/index.js

@@ -7,7 +7,10 @@ const rootEl = document.getElementById('root');
 const rootReact = createRoot(rootEl);
 
 rootReact.render(
+    <App/>
+);
+/*rootReact.render(
     <React.StrictMode>
         <App/>
     </React.StrictMode>
-);
+);*/

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

@@ -23,6 +23,8 @@ import { isEmail } from '../../../../helpers/validators';
 
 // store
 import { storeSet } from '../../../../store';
+import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse';
+import getTimeParsedFromString from '../../../../helpers/getTimeParsedFromString';
 
 const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, status }, ref) {
     const navigate = useNavigate();
@@ -119,7 +121,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
     }
 
     const errCreateCallback = (data) => {
-        console.log('errCreateCallback', data);
+        set404FromErrorResponse(data);
         storeSet.main.unsetAsyncRequest();
     }
 
@@ -194,6 +196,17 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
         if (!isNil(formInitialData.dates) && formInitialData.dates.length) {
             newFormData.dates = formInitialData.dates.map(v => is(String, v) ? new Date(v) : (v ? v : ''));
         }
+        if (!isNil(formInitialData.startTime) && !isEmpty(formInitialData.startTime)) {
+            newFormData.startTime = is(String, formInitialData.startTime)
+                ? getTimeParsedFromString(formInitialData.startTime)
+                : formInitialData.startTime;
+        }
+        if (!isNil(formInitialData.endTime) && !isEmpty(formInitialData.endTime)) {
+            newFormData.endTime = is(String, formInitialData.endTime)
+                ? getTimeParsedFromString(formInitialData.endTime)
+                : formInitialData.endTime;
+        }
+
         Object.keys(newFormData).map(v => setValue(v, newFormData[v]));
     }, [formInitialData]);
 

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

@@ -20,6 +20,7 @@ import LookupdataService from '../../../../service/lookupdata-service';
 
 // store
 import { storeSet } from '../../../../store';
+import getTimeParsedFromString from '../../../../helpers/getTimeParsedFromString';
 
 const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, status }, ref) {
     const navigate = useNavigate();
@@ -186,6 +187,17 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
         if (!isNil(formInitialData.dates) && formInitialData.dates.length) {
             newFormData.dates = formInitialData.dates.map(v => is(String, v) ? new Date(v) : (v ? v : ''));
         }
+        if (!isNil(formInitialData.startTime) && !isEmpty(formInitialData.startTime)) {
+            newFormData.startTime = is(String, formInitialData.startTime)
+                ? getTimeParsedFromString(formInitialData.startTime)
+                : formInitialData.startTime;
+        }
+        if (!isNil(formInitialData.endTime) && !isEmpty(formInitialData.endTime)) {
+            newFormData.endTime = is(String, formInitialData.endTime)
+                ? getTimeParsedFromString(formInitialData.endTime)
+                : formInitialData.endTime;
+        }
+
         Object.keys(newFormData).map(v => setValue(v, newFormData[v]));
     }, [formInitialData]);
 

src/pages/BandoFlowEdit/index.js

@@ -252,6 +252,13 @@ const BandoFlowEdit = () => {
         }
     }, [forms]);
 
+    useEffect(() => {
+        const chosenFieldItem = head(flowData.filter(o => !isEmpty(o.chosenField)));
+        if (chosenFieldItem) {
+            setMainField(chosenFieldItem.chosenField);
+        }
+    }, [flowData])
+
     useEffect(() => {
         return () => {
             storeSet.main.flowForms([]);
@@ -302,7 +309,7 @@ const BandoFlowEdit = () => {
                                 placeholder={__('Scegli il campo', 'gepafin')}/>
                         </div> : null}
 
-                    {forms.length > 2 && mainField && isFlowAllowed || forms.length === 2 && isFlowAllowed
+                    {(forms.length > 2 && mainField && isFlowAllowed) || (forms.length === 2 && isFlowAllowed)
                         ? <div className="appForm__field">
                             <label htmlFor="finalForm">{__('Scegli form finale', 'gepafin')}</label>
                             <Dropdown

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import { __ } from '@wordpress/i18n';
+import { is } from 'ramda';
 
 // components
 import ElementSettingRepeater from '../ElementSettingRepeater';
@@ -39,14 +40,17 @@ const ElementSetting = ({ setting, changeFn, updateDataFn }) => {
     };
 
     const header = renderHeader();
-
+console.log('setting', setting)
     return <div className="formElementSettings__field" key={setting.name}>
         <label htmlFor={setting.name}>{settingLabels[setting.name]}</label>
         {setting.name === 'options'
-            ? <ElementSettingRepeater value={setting.value} name={setting.name} setDataFn={updateDataFn}/>
+            ? <ElementSettingRepeater
+                value={is(Array, setting.value) ? setting.value : []}
+                name={setting.name}
+                setDataFn={updateDataFn}/>
             : setting.name === 'mime'
                 ? <MultiSelect
-                    value={setting.value}
+                    value={is(Array, setting.value) ? setting.value : []}
                     onChange={(e) => updateDataFn(setting.name, e.value)}
                     options={mimeTypes}
                     optionLabel="name"

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

@@ -45,9 +45,10 @@ const ElementSettingRepeater = ({
     }, []);
 
     useEffect(() => {
+        console.log('useEffect', [...stateFieldData])
         setDataFn(name, [...stateFieldData]);
     }, [stateFieldData])
-
+console.log('stateFieldData', stateFieldData, value)
     return (
         <div className="formElementSettings__repeater">
             {stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem">

src/pages/BandoFormsEdit/index.js

@@ -23,7 +23,7 @@ import FormsService from '../../service/forms-service';
 import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
 
 // TODO temp data
-//import { elementItems } from '../../tempData';
+import { elementItems } from '../../tempData';
 
 const BandoFormsEdit = () => {
     const { id, formId } = useParams();
@@ -208,8 +208,8 @@ const BandoFormsEdit = () => {
 
     const getElementItemsCallback = (data) => {
         if (data.status === 'SUCCESS') {
-            //storeSet.main.elementItems(elementItems.sort((a, b) => a.sortOrder - b.sortOrder));
+            storeSet.main.elementItems(elementItems.sort((a, b) => a.sortOrder - b.sortOrder));
-            storeSet.main.elementItems(data.data.sort((a, b) => a.sortOrder - b.sortOrder));
+            //storeSet.main.elementItems(data.data.sort((a, b) => a.sortOrder - b.sortOrder));
         }
         storeSet.main.unsetAsyncRequest();
     }

src/tempData.js

@@ -734,7 +734,7 @@ export const elementItems = [
         ],
         validators: {}
     },
-    {
+    /*{
         id: 20,
         sortOrder: 20,
         name: 'table',
@@ -747,5 +747,5 @@ export const elementItems = [
             }
         ],
         validators: {}
-    }
+    }*/
 ]