@arquimedes.co/eureka-forms 1.9.33-test → 1.9.34-test

package/dist/App.js

@@ -68,6 +68,7 @@ import widgetInstance from './AxiosWidget';
 import InternalFormStyle from './constants/InternalFormStyle';
 import { calcCbrForm } from './utils/CbrFunctions';
 import CBRStepTypes from './constants/CBRFormStepTypes';
+import { nanoid } from 'nanoid';
 function App(_a) {
     var _this = this;
     var _b, _c, _d, _e;
@@ -89,7 +90,7 @@ function App(_a) {
             setForm(form);
         }
         if (valuesData !== undefined) {
-            setOriginalValues(valuesData);
+            setOriginalValues(mapOriginalValues(valuesData, form));
         }
     };
     function fetchPreview(formData, valuesData) {
@@ -351,3 +352,61 @@ function getStaticWidth(step) {
         return 4;
     }
 }
+var mapOriginalValues = function (originalValues, form) {
+    var newValues = {};
+    for (var _i = 0, _a = Object.keys(originalValues); _i < _a.length; _i++) {
+        var idValue = _a[_i];
+        var step = form.steps[idValue];
+        if (step) {
+            if (step.type === StepTypes.MAPPER) {
+                var elements = originalValues[step.id];
+                var mappedElements = [];
+                for (var _b = 0, elements_1 = elements; _b < elements_1.length; _b++) {
+                    var element = elements_1[_b];
+                    var idElement = nanoid();
+                    var mappedElement = {
+                        ids: {},
+                    };
+                    for (var _c = 0, _d = Object.keys(step.steps); _c < _d.length; _c++) {
+                        var idStep = _d[_c];
+                        var newIdStep = step.id + '-' + idStep + '-' + idElement;
+                        mappedElement.ids[idStep] = newIdStep;
+                        if (element[idStep] !== undefined) {
+                            var value = mapOriginalValue(step.steps[idStep], element[idStep]);
+                            if (value !== undefined) {
+                                newValues[newIdStep] = value;
+                            }
+                        }
+                    }
+                    mappedElements.push(mappedElement);
+                }
+                newValues[step.id] = mappedElements;
+            }
+            else {
+                var value = mapOriginalValue(step, originalValues[step.id]);
+                if (value !== undefined) {
+                    newValues[step.id] = value;
+                }
+            }
+        }
+    }
+    return newValues;
+};
+var mapOriginalValue = function (step, value) {
+    switch (step === null || step === void 0 ? void 0 : step.type) {
+        case StepTypes.TEXTAREA: {
+            if (step.hasTextEditor) {
+                return;
+            }
+            return value.value;
+        }
+        case StepTypes.SELECTOR: {
+            var option = step.options.find(function (option) { return option.value == value; });
+            if (!(value === null || value === void 0 ? void 0 : value.value))
+                return option;
+            return value;
+        }
+        default:
+            return value;
+    }
+};

package/dist/FormComponents/Form/ColumnForm/ColumnForm.d.ts

@@ -1,8 +1,6 @@
 /// <reference types="react" />
-import { Form } from '../../../@Types/Form';
 import { FormComponentProps } from '../Form';
 import { FormStep } from '../../../@Types/FormStep';
 declare function ColumnForm({ form, apiKey, reload, domain, postview, internal, formStyle, sendLabel, widthStats, customSteps, customSend, customSubmit, handleLoaded, originalValues, ...others }: FormComponentProps): JSX.Element;
 export default ColumnForm;
-export declare const mapOriginalValues: (originalValues: Record<string, any>, form: Form) => any;
 export declare function calcStepDependencyValue(depStep: FormStep, originalValues: Record<string, any>): any;

package/dist/FormComponents/Form/ColumnForm/ColumnForm.js

@@ -70,14 +70,13 @@ import Loader from '../../../shared/Loader/Loader';
 import axiosInstance from '../../../AxiosAPI';
 import widgetInstance from '../../../AxiosWidget';
 import React from 'react';
-import { nanoid } from 'nanoid';
 function ColumnForm(_a) {
     var _this = this;
     var form = _a.form, apiKey = _a.apiKey, reload = _a.reload, domain = _a.domain, postview = _a.postview, internal = _a.internal, formStyle = _a.formStyle, sendLabel = _a.sendLabel, widthStats = _a.widthStats, customSteps = _a.customSteps, customSend = _a.customSend, customSubmit = _a.customSubmit, handleLoaded = _a.handleLoaded, originalValues = _a.originalValues, others = __rest(_a, ["form", "apiKey", "reload", "domain", "postview", "internal", "formStyle", "sendLabel", "widthStats", "customSteps", "customSend", "customSubmit", "handleLoaded", "originalValues"]);
     var _b = useState(false), tempError = _b[0], setTempError = _b[1];
     var _c = useState(calcDependencies(form.steps, originalValues)), dependencyStore = _c[0], setDependencyStore = _c[1];
     var _d = useForm({
-        defaultValues: mapOriginalValues(originalValues, form),
+        defaultValues: originalValues,
         mode: 'onTouched',
         shouldFocusError: true,
     }), getValues = _d.getValues, setValue = _d.setValue, clearErrors = _d.clearErrors, control = _d.control, errors = _d.formState.errors, trigger = _d.trigger;
@@ -95,7 +94,7 @@ function ColumnForm(_a) {
         return _jsx("div", {});
     }
     var onSubmit = function (token) { return __awaiter(_this, void 0, void 0, function () {
-        var valid, values, newValues, _i, _a, idStep, step, payload, url, resp, _b, error_1;
+        var valid, values, newValues, _i, _a, idStep, step, test_1, payload, url, resp, _b, error_1;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -120,6 +119,10 @@ function ColumnForm(_a) {
                         step = form.steps[idStep];
                         newValues[idStep] = calcValue(step, values, customSteps);
                     }
+                    test_1 = true;
+                    setLoading(false);
+                    if (test_1)
+                        return [2 /*return*/];
                     if (!customSend) return [3 /*break*/, 4];
                     return [4 /*yield*/, customSend(newValues, reload)];
                 case 3:
@@ -221,59 +224,6 @@ function calcNextSection(form, idSection, sections) {
         }
     }
 }
-export var mapOriginalValues = function (originalValues, form) {
-    var newValues = __assign({}, originalValues);
-    var _loop_1 = function (val) {
-        var step = form.steps[val];
-        if (step) {
-            switch (step === null || step === void 0 ? void 0 : step.type) {
-                case Types.TEXTAREA: {
-                    var value = originalValues[step.id];
-                    if (step.hasTextEditor) {
-                        delete newValues[step.id];
-                    }
-                    else {
-                        newValues[step.id] = value.value;
-                    }
-                    break;
-                }
-                case Types.SELECTOR: {
-                    var value_1 = originalValues[step.id];
-                    var option = step.options.find(function (option) { return option.value == value_1; });
-                    if (!(value_1 === null || value_1 === void 0 ? void 0 : value_1.value))
-                        newValues[step.id] = option;
-                    break;
-                }
-                case Types.MAPPER: {
-                    var valueArr = originalValues[step.id];
-                    var elements = [];
-                    for (var _b = 0, valueArr_1 = valueArr; _b < valueArr_1.length; _b++) {
-                        var values = valueArr_1[_b];
-                        var idElement = nanoid();
-                        var newElement = {
-                            ids: {},
-                        };
-                        for (var _c = 0, _d = Object.keys(step.steps); _c < _d.length; _c++) {
-                            var idStep = _d[_c];
-                            var newIdStep = step.id + '-' + idStep + '-' + idElement;
-                            newElement.ids[idStep] = newIdStep;
-                            newValues[newIdStep] = values[idStep];
-                        }
-                    }
-                    newValues[step.id] = elements;
-                    break;
-                }
-                default:
-                    break;
-            }
-        }
-    };
-    for (var _i = 0, _a = Object.keys(originalValues); _i < _a.length; _i++) {
-        var val = _a[_i];
-        _loop_1(val);
-    }
-    return newValues;
-};
 var calcValue = function (step, values, customSteps, value) {
     var _a, _b, _c;
     if (value === void 0) { value = values[(_a = step === null || step === void 0 ? void 0 : step.id) !== null && _a !== void 0 ? _a : '']; }
@@ -320,7 +270,9 @@ var calcValue = function (step, values, customSteps, value) {
                         var idStep = _e[_d];
                         var mappedId = element.ids[idStep];
                         if (values[mappedId] !== undefined) {
-                            newValue[idStep] = calcValue(step.steps[idStep], values, customSteps, values[mappedId]);
+                            var substep = step.steps[idStep];
+                            var test_2 = calcValue(substep, values, customSteps, values[mappedId]);
+                            newValue[idStep] = test_2;
                         }
                     }
                     mappedValues.push(newValue);

package/dist/FormComponents/Step/MapperStep/MaterialMapperStep/Element/MapperElement.d.ts

@@ -2,7 +2,7 @@
 import { MapperStepProps } from '../../MapperStep';
 import { MapperElement } from '../MaterialMapperStep';
 declare function MapperElementComponent({ step, form, level, element, handleDelete, ...others }: MapperStepProps & {
-    index: number;
+    num: number;
     element: MapperElement;
     handleDelete: Function;
 }): JSX.Element;

package/dist/FormComponents/Step/MapperStep/MaterialMapperStep/Element/PillElementContainer/PillElementContainer.d.ts

@@ -2,9 +2,9 @@
 import { MapperStepProps } from '../../../MapperStep';
 import { Form } from '../../../../../../@Types';
 import { Mapper } from '../../../../../../@Types/FormStep';
-declare function PillElementContainer({ step, size, index, children, editable, postview, formStyle, handleDelete, widthStats, }: Pick<MapperStepProps, 'editable' | 'postview' | 'widthStats'> & {
+declare function PillElementContainer({ step, size, num, children, editable, postview, formStyle, handleDelete, widthStats, }: Pick<MapperStepProps, 'editable' | 'postview' | 'widthStats'> & {
     step: Mapper;
-    index: number;
+    num: number;
     formStyle: {
         textColor: string;
     };

package/dist/FormComponents/Step/MapperStep/MaterialMapperStep/Element/PillElementContainer/PillElementContainer.js

@@ -13,13 +13,13 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import styles from './PillElementContainer.module.css';
 import DeleteRoundedIcon from '@material-ui/icons/DeleteRounded';
 function PillElementContainer(_a) {
-    var step = _a.step, size = _a.size, index = _a.index, children = _a.children, editable = _a.editable, postview = _a.postview, formStyle = _a.formStyle, handleDelete = _a.handleDelete, widthStats = _a.widthStats;
+    var step = _a.step, size = _a.size, num = _a.num, children = _a.children, editable = _a.editable, postview = _a.postview, formStyle = _a.formStyle, handleDelete = _a.handleDelete, widthStats = _a.widthStats;
     return (_jsx("div", __assign({ className: widthStats.isMobile || size.blockNum < 3
             ? styles.mobileContainer
             : styles.container }, { children: _jsxs("div", __assign({ className: styles.contentContainer, style: {
                 width: (size.blockSize + size.spacingSize) *
                     (size.blockNum - 1),
-            } }, { children: [_jsxs("div", __assign({ className: styles.titleLbl, style: { color: formStyle.textColor } }, { children: [step.unitLabel + ' ' + index + 1, ":"] })), _jsx("div", __assign({ className: !editable || postview
+            } }, { children: [_jsxs("div", __assign({ className: styles.titleLbl, style: { color: formStyle.textColor } }, { children: [step.unitLabel + ' ' + (num + 1), ":"] })), _jsx("div", __assign({ className: !editable || postview
                         ? styles.disabledDeleteBtn
                         : styles.deleteBtn, style: { color: formStyle.textColor }, onClick: function () {
                         if (editable && !postview) {

package/dist/FormComponents/Step/MapperStep/MaterialMapperStep/MaterialMapperStep.js

@@ -45,26 +45,31 @@ function Elements(_a) {
     var _c = useState(), localSteps = _c[0], setLocalSteps = _c[1];
     useEffect(function () {
         setFirstRender(true);
-        var steps = {};
-        var deps = __assign({}, dependencyStore);
-        for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
-            var element = elements_1[_i];
-            var newSteps = {};
-            for (var _a = 0, _b = Object.keys(step.steps); _a < _b.length; _a++) {
-                var idStep = _b[_a];
-                var baseStep = step.steps[idStep];
-                var newIdStep = element.ids[idStep];
-                newSteps[newIdStep] = __assign(__assign({}, baseStep), { id: newIdStep });
-                steps[newIdStep] = newSteps[newIdStep];
-            }
-            calcRecursiveData(element, newSteps, deps);
-        }
-        setDependencyStore(deps);
-        setLocalSteps(steps);
     }, []);
     useEffect(function () {
-        if (firstRender && elements.length === 0 && !postview && editable) {
-            handleAddElement();
+        if (firstRender) {
+            if (elements.length > 0) {
+                var newSteps = {};
+                var deps = __assign({}, dependencyStore);
+                for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
+                    var element = elements_1[_i];
+                    var elemSteps = {};
+                    for (var _a = 0, _b = Object.keys(step.steps); _a < _b.length; _a++) {
+                        var idStep = _b[_a];
+                        var baseStep = JSON.parse(JSON.stringify(form.steps[idStep]));
+                        var newIdStep = element.ids[idStep];
+                        baseStep.id = newIdStep;
+                        elemSteps[newIdStep] = baseStep;
+                        newSteps[newIdStep] = baseStep;
+                    }
+                    calcRecursiveData(element, elemSteps, deps);
+                }
+                setDependencyStore(deps);
+                setLocalSteps(__assign(__assign({}, localSteps), newSteps));
+            }
+            else if (elements.length === 0 && !postview && editable) {
+                handleAddElement();
+            }
         }
     }, [firstRender]);
     var handleAddElement = function () {
@@ -103,7 +108,7 @@ function Elements(_a) {
                     margin: step.description
                         ? '10px 0px'
                         : '0px 0px 5px 0px',
-                } }, { children: step.description }))), elements.map(function (incident, index) { return (_jsx(MapperElementComponent, __assign({ index: index, element: incident, formStyle: formStyle, step: step, form: __assign(__assign({}, form), { steps: localSteps }), editable: editable, postview: postview, dependencyStore: dependencyStore, setDependencyStore: setDependencyStore, handleDelete: function () {
+                } }, { children: step.description }))), elements.map(function (incident, index) { return (_jsx(MapperElementComponent, __assign({ num: index, element: incident, formStyle: formStyle, step: step, form: __assign(__assign({}, form), { steps: localSteps }), editable: editable, postview: postview, dependencyStore: dependencyStore, setDependencyStore: setDependencyStore, handleDelete: function () {
                     var tempElements = __spreadArray([], elements, true);
                     tempElements[index].deleted = true;
                     onChange(tempElements);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arquimedes.co/eureka-forms",
     "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
-    "version":"1.9.33-test",
+    "version":"1.9.34-test",
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",