@arquimedes.co/eureka-forms 1.9.123 → 1.9.124

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

@@ -56,13 +56,22 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { cloneElement, useEffect, useRef, useState } from 'react';
 import ReCAPTCHA from 'react-google-recaptcha';
 import SectionComponent from '../../Section/Section';
 import { useForm } from 'react-hook-form';
 import styles from './ColumnForm.module.css';
-import Types from '../../../constants/FormStepTypes';
+import Types, { EntityValueDataTypes } from '../../../constants/FormStepTypes';
 import { convertToRaw } from 'draft-js';
 import TermComponent from '../../Term/Term';
 import ConfirmationDialog from '../ConfirmationDialog/ConfirmationDialog';
@@ -314,15 +323,15 @@ function stringToDraft(text) {
     return draftStructure;
 }
 function calcDependencies(steps, originalValues, customSteps, allSteps, dependencies) {
-    var _a, _b;
+    var _a, _b, _c;
     if (customSteps === void 0) { customSteps = {}; }
     if (allSteps === void 0) { allSteps = steps; }
     if (dependencies === void 0) { dependencies = {}; }
-    for (var _i = 0, _c = Object.values(steps); _i < _c.length; _i++) {
-        var step = _c[_i];
+    for (var _i = 0, _d = Object.values(steps); _i < _d.length; _i++) {
+        var step = _d[_i];
         if (step.dependencies) {
-            for (var _d = 0, _e = step.dependencies; _d < _e.length; _d++) {
-                var idDep = _e[_d];
+            for (var _e = 0, _f = step.dependencies; _e < _f.length; _e++) {
+                var idDep = _f[_e];
                 var depStep = allSteps[idDep];
                 if (depStep && dependencies[idDep] === undefined) {
                     dependencies[idDep] = calcStepDependencyValue(depStep, originalValues, customSteps);
@@ -336,15 +345,15 @@ function calcDependencies(steps, originalValues, customSteps, allSteps, dependen
             var newSteps = {};
             var elements = (_a = originalValues[step.id]) !== null && _a !== void 0 ? _a : [];
             var _loop_1 = function (element) {
-                for (var _g = 0, _h = Object.keys(step.steps); _g < _h.length; _g++) {
-                    var idSubStep = _h[_g];
+                for (var _m = 0, _o = Object.keys(step.steps); _m < _o.length; _m++) {
+                    var idSubStep = _o[_m];
                     var subStep = step.steps[idSubStep];
                     var mappedId = element.ids[idSubStep];
                     newSteps[mappedId] = __assign(__assign({}, subStep), { id: mappedId, dependencies: (_b = subStep.dependencies) === null || _b === void 0 ? void 0 : _b.map(function (dep) { var _a; return (_a = element.ids[dep]) !== null && _a !== void 0 ? _a : dep; }) });
                 }
             };
-            for (var _f = 0, elements_2 = elements; _f < elements_2.length; _f++) {
-                var element = elements_2[_f];
+            for (var _g = 0, elements_2 = elements; _g < elements_2.length; _g++) {
+                var element = elements_2[_g];
                 _loop_1(element);
             }
             if (elements.length === 0) {
@@ -353,6 +362,22 @@ function calcDependencies(steps, originalValues, customSteps, allSteps, dependen
             calcDependencies(newSteps, originalValues, customSteps, __assign(__assign({}, allSteps), newSteps), dependencies);
         }
     }
+    /** After all steps have been checked check missing entityvalue dependencies */
+    for (var _h = 0, _j = Object.values(steps); _h < _j.length; _h++) {
+        var step = _j[_h];
+        if (step.type === Types.ENTITYVALUEPICKER) {
+            for (var _k = 0, _l = __spreadArray(__spreadArray([], step.path, true), step.filters, true); _k < _l.length; _k++) {
+                var path = _l[_k];
+                if (path.type !== EntityValueDataTypes.STEP)
+                    continue;
+                if ((_c = step.dependencies) === null || _c === void 0 ? void 0 : _c.includes(path.idStep))
+                    continue;
+                if (dependencies[path.idStep] === undefined) {
+                    dependencies[path.idStep] = originalValues[path.idStep];
+                }
+            }
+        }
+    }
     return dependencies;
 }
 export function calcStepDependencyValue(depStep, originalValues, customSteps) {

package/package.json

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