@arquimedes.co/eureka-forms 1.9.36-test → 1.9.38-test

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

@@ -94,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, test_1, payload, url, resp, _b, error_1;
+        var valid, values, newValues, _i, _a, idStep, step, payload, url, resp, _b, error_1;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -119,10 +119,6 @@ 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:
@@ -271,8 +267,8 @@ var calcValue = function (step, values, customSteps, value) {
                         var mappedId = element.ids[idStep];
                         if (values[mappedId] !== undefined) {
                             var substep = step.steps[idStep];
-                            var test_2 = calcValue(substep, values, customSteps, values[mappedId]);
-                            newValue[idStep] = test_2;
+                            var test_1 = calcValue(substep, values, customSteps, values[mappedId]);
+                            newValue[idStep] = test_1;
                         }
                     }
                     mappedValues.push(newValue);
@@ -305,19 +301,23 @@ function stringToDraft(text) {
     });
     return draftStructure;
 }
-function calcDependencies(steps, originalValues) {
-    var dependencies = {};
+function calcDependencies(steps, originalValues, allSteps, dependencies) {
+    if (allSteps === void 0) { allSteps = steps; }
+    if (dependencies === void 0) { dependencies = {}; }
     for (var _i = 0, _a = Object.values(steps); _i < _a.length; _i++) {
         var step = _a[_i];
         if (step.dependencies) {
             for (var _b = 0, _c = step.dependencies; _b < _c.length; _b++) {
                 var idDep = _c[_b];
-                var depStep = steps[idDep];
+                var depStep = allSteps[idDep];
                 if (depStep && dependencies[idDep] === undefined) {
                     dependencies[idDep] = calcStepDependencyValue(depStep, originalValues);
                 }
             }
         }
+        if (step.type === Types.MAPPER) {
+            calcDependencies(step.steps, originalValues, __assign(__assign({}, allSteps), step.steps), dependencies);
+        }
     }
     return dependencies;
 }

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

@@ -39,6 +39,7 @@ import { nanoid } from 'nanoid';
 import { calcStepDependencyValue } from '../../../Form/ColumnForm/ColumnForm';
 import MapperElementComponent from './Element/MapperElement';
 import AYFFormStepTypes from '../../../../constants/AYFFormStepTypes';
+import CBRFormStepTypes from '../../../../constants/CBRFormStepTypes';
 function Elements(_a) {
     var step = _a.step, form = _a.form, btnRef = _a.btnRef, editable = _a.editable, postview = _a.postview, onChange = _a.onChange, elements = _a.elements, formStyle = _a.formStyle, dependencyStore = _a.dependencyStore, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["step", "form", "btnRef", "editable", "postview", "onChange", "elements", "formStyle", "dependencyStore", "setDependencyStore"]);
     var _b = useState(false), firstRender = _b[0], setFirstRender = _b[1];
@@ -48,6 +49,7 @@ function Elements(_a) {
         setFirstRender(true);
     }, []);
     useEffect(function () {
+        var _a;
         if (firstRender) {
             if (elements.length > 0) {
                 var newSteps = {};
@@ -55,9 +57,9 @@ function Elements(_a) {
                 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]));
+                    for (var _b = 0, _c = Object.keys(step.steps); _b < _c.length; _b++) {
+                        var idStep = _c[_b];
+                        var baseStep = JSON.parse(JSON.stringify((_a = step.steps[idStep]) !== null && _a !== void 0 ? _a : '{}'));
                         var newIdStep = element.ids[idStep];
                         baseStep.id = newIdStep;
                         elemSteps[newIdStep] = baseStep;
@@ -109,7 +111,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({ num: 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: __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);
@@ -195,13 +197,21 @@ function calcRecursiveData(element, newSteps, deps) {
                     }
                 }
                 break;
+            case CBRFormStepTypes.CBR_LOCATIVAS:
+                var elementStep = step;
+                if (elementStep.subStep) {
+                    var newId = element.ids[elementStep.subStep];
+                    if (newId) {
+                        elementStep.subStep = newId;
+                    }
+                }
+                break;
             case AYFFormStepTypes.AYF_ICA_CITY:
                 var cityStep = step;
                 if (cityStep.idNitStep) {
                     var newId = element.ids[cityStep.idNitStep];
                     if (newId) {
                         cityStep.idNitStep = newId;
-                        deps[newId] = calcStepDependencyValue(newSteps[newId], {});
                     }
                 }
                 break;

package/package.json

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