@arquimedes.co/eureka-forms 2.0.21 → 2.0.22

package/dist/Form/FormFunctions.d.ts

@@ -5,5 +5,5 @@ import { CBRFormStep } from '../@Types/CBRFormStep';
 import { MapperElement } from '../@Types/MapperElement';
 import { ValuesStore } from '../States/SiteSlice';
 export declare const calcValue: (idStep: string, steps: Record<string, FormStep>, values: Record<string, any>, customSteps: Record<string, CustomStep> | undefined, deleteIds: string[], value?: any) => any;
-export declare function calcDependencies(steps: Record<string, FormStep | CBRFormStep>, customSteps?: Record<string, CustomStep>, allSteps?: Record<string, FormStep | CBRFormStep>, dependencies?: DependencyStore, values?: ValuesStore): DependencyStore;
+export declare function calcDependencies(steps: Record<string, FormStep | CBRFormStep>, customSteps?: Record<string, CustomStep>, allSteps?: Record<string, FormStep | CBRFormStep>, dependencies?: DependencyStore, values?: ValuesStore, addDependents?: boolean): DependencyStore;
 export declare const calcMapperSubSteps: (step: Mapper, elements: MapperElement<any>[] | undefined, customSteps: Record<string, CustomStep>) => Record<string, FormStep>;

package/dist/Form/FormFunctions.js

@@ -115,7 +115,7 @@ function stringToDraft(text) {
     });
     return draftStructure;
 }
-export function calcDependencies(steps, customSteps, allSteps, dependencies, values) {
+export function calcDependencies(steps, customSteps, allSteps, dependencies, values, addDependents) {
     var _a, _b;
     if (customSteps === void 0) { customSteps = {}; }
     if (allSteps === void 0) { allSteps = steps; }
@@ -124,34 +124,39 @@ export function calcDependencies(steps, customSteps, allSteps, dependencies, val
         global: {},
         sections: {},
     }; }
+    if (addDependents === void 0) { addDependents = true; }
     for (var _i = 0, _c = Object.values(steps); _i < _c.length; _i++) {
         var step = _c[_i];
         var originalValue = (_a = values.sections[step.idSection]) === null || _a === void 0 ? void 0 : _a[step.id];
         if (step.dependencies) {
             for (var _d = 0, _e = step.dependencies; _d < _e.length; _d++) {
                 var idDep = _e[_d];
-                if (dependencies[idDep] === undefined)
+                if (dependencies[idDep] === undefined &&
+                    (addDependents || allSteps[idDep]))
                     dependencies[idDep] = calcStepDependency(idDep, allSteps, values, customSteps);
-                dependencies[idDep].dependents.push(step);
+                if (addDependents)
+                    dependencies[idDep].dependents.push(step);
             }
         }
         if (step.type === StepTypes.ENTITYVALUEPICKER) {
             for (var _f = 0, _g = __spreadArray(__spreadArray([], step.path, true), step.filters, true); _f < _g.length; _f++) {
-                var path = _g[_f];
-                if (path.type !== EntityValueDataTypes.STEP)
+                var dep = _g[_f];
+                if (dep.type !== EntityValueDataTypes.STEP)
                     continue;
-                if ((_b = step.dependencies) === null || _b === void 0 ? void 0 : _b.includes(path.idStep))
+                if ((_b = step.dependencies) === null || _b === void 0 ? void 0 : _b.includes(dep.idStep))
                     continue;
-                if (dependencies[path.idStep] === undefined) {
-                    dependencies[path.idStep] = calcStepDependency(path.idStep, allSteps, values, customSteps);
+                if (dependencies[dep.idStep] === undefined &&
+                    (addDependents || allSteps[dep.idStep])) {
+                    dependencies[dep.idStep] = calcStepDependency(dep.idStep, allSteps, values, customSteps);
                 }
-                dependencies[path.idStep].dependents.push(step);
+                if (addDependents)
+                    dependencies[dep.idStep].dependents.push(step);
             }
         }
         if (step.type === StepTypes.MAPPER) {
             var subSteps = calcMapperSubSteps(step, originalValue, customSteps);
-            if (Object.keys(subSteps).length > 0)
-                calcDependencies(subSteps, customSteps, __assign(__assign({}, allSteps), subSteps), dependencies, values);
+            var hasSubSteps = Object.keys(subSteps).length > 0;
+            calcDependencies(hasSubSteps ? subSteps : step.steps, customSteps, __assign(__assign({}, allSteps), subSteps), dependencies, values, hasSubSteps);
         }
     }
     return dependencies;

package/dist/FormSteps/@Construction/CBRIncidentsStep/MaterialCBRIncidentsStep/MaterialCBRIncidentsStep.js

@@ -44,7 +44,6 @@ import CustomContext from '../../../../Contexts/CustomContext';
 import { useFormStep } from '../../../StepHooks';
 function CBRIncidentsStep(_a) {
     var step = _a.step, editable = _a.editable, others = __rest(_a, ["step", "editable"]);
-    console.log(step.required);
     var _b = useFormStep(step, {
         rules: {
             validate: function (array) {

package/package.json

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