@arquimedes.co/eureka-forms 1.9.93-test → 1.9.95-test

package/dist/@Types/FormStep.d.ts

@@ -1,4 +1,4 @@
-import Types, { ClassifierOptionTypes, OptionTypes, RatingTypes, MapperStyleTypes, EntityValueOptionTypes } from '../constants/FormStepTypes';
+import Types, { ClassifierOptionTypes, OptionTypes, RatingTypes, MapperStyleTypes, EntityValueOptionTypes, EntityValueDataTypes } from '../constants/FormStepTypes';
 import * as GSteps from './GenericFormSteps';
 export type FormStep = Title | Rating | CheckBox | TextArea | TextInput | DatePicker | FileUpload | Separator | FormSelector | ClassifierSelector | Collapsible | EntityValuePicker | Mapper;
 export interface Title extends GSteps.GBaseStep {
@@ -98,17 +98,8 @@ export interface EntityValuePicker extends GSteps.GSmartSelect {
     type: Types.ENTITYVALUEPICKER;
     idEntity: string;
     icon: string | null;
-    filters: {
-        idProperty: string;
-        idStep?: string;
-        value?: string;
-        required?: boolean;
-    }[];
-    path: {
-        idEntity: string;
-        idStep?: string;
-        idEntityValue?: string;
-    }[];
+    filters: EntityValuePickerFilter[];
+    path: EntityValuePickerPath[];
     options: Record<string, FormEntityValuePickerOption>;
     maxSize?: number;
 }
@@ -122,6 +113,31 @@ interface HideFormEntityValuePickerOption {
     type: EntityValueOptionTypes.HIDE;
     idEntityValue: String;
 }
+export type EntityValuePickerPath = StepEntityValuePickerPath | ValueEntityValuePickerPath;
+export interface StepEntityValuePickerPath {
+    idEntity: string;
+    type: EntityValueDataTypes.STEP;
+    idStep: string;
+    any: boolean;
+}
+export interface ValueEntityValuePickerPath {
+    idEntity: string;
+    type: EntityValueDataTypes.VALUE;
+    idEntityValue: string | null;
+}
+export type EntityValuePickerFilter = StepEntityValuePickerFilter | ValueEntityValuePickerFilter;
+export interface StepEntityValuePickerFilter {
+    idProperty: string;
+    type: EntityValueDataTypes.STEP;
+    idStep: string;
+    any: boolean;
+    required: boolean;
+}
+export interface ValueEntityValuePickerFilter {
+    idProperty: string;
+    type: EntityValueDataTypes.VALUE;
+    value: any;
+}
 export interface Mapper extends GSteps.GBaseStep {
     type: Types.MAPPER;
     style: {

package/dist/App.d.ts

@@ -49,14 +49,4 @@ export interface CustomStep {
 }
 declare function App({ apiKey, domain, preview, partial, formData, postview, editable, isWidget, internal, valuesData, customSend, customSteps, classifiers, handleConfirmed, customStepProps, ...others }: AppProps): JSX.Element;
 export default App;
-export declare enum SIZES {
-    SMALL = "SMALL",
-    MEDIUM = "MEDIUM",
-    LARGE = "LARGE"
-}
-export declare const SizesToNum: {
-    LARGE: number;
-    MEDIUM: number;
-    SMALL: number;
-};
 export declare const mapOriginalValue: (step: FormStep, value: any, form?: Form) => any;

package/dist/App.js

@@ -56,7 +56,6 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _a;
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useRef, useState } from 'react';
 import Loader from './shared/Loader/Loader';
@@ -65,7 +64,6 @@ import FormComponent from './FormComponents/Form/Form';
 import StepTypes from './constants/FormStepTypes';
 import axiosInstance from './AxiosAPI';
 import widgetInstance from './AxiosWidget';
-import InternalFormStyle from './constants/InternalFormStyle';
 import { calcCbrForm } from './utils/CbrFunctions';
 import CBRStepTypes from './constants/CBRFormStepTypes';
 import { nanoid } from 'nanoid';
@@ -275,62 +273,13 @@ function App(_a) {
     }
 }
 export default App;
-//THIS IS TEMP
-export var SIZES;
-(function (SIZES) {
-    SIZES["SMALL"] = "SMALL";
-    SIZES["MEDIUM"] = "MEDIUM";
-    SIZES["LARGE"] = "LARGE";
-})(SIZES || (SIZES = {}));
-export var SizesToNum = (_a = {},
-    _a[SIZES.LARGE] = 4,
-    _a[SIZES.MEDIUM] = 2,
-    _a[SIZES.SMALL] = 1,
-    _a);
 var migrateForm = function (form, classifiers) {
-    var steps = __assign({}, form.steps);
+    var steps = {};
     for (var _i = 0, _a = Object.keys(form.steps); _i < _a.length; _i++) {
         var idStep = _a[_i];
-        var step = __assign({}, form.steps[idStep]);
-        if (step.size && isNaN(step.size)) {
-            step.size = getStaticWidth(step);
-        }
-        if (step.type === CBRStepTypes.CBR_EMAIL) {
-            step.validation = {
-                value: /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
-                    .source,
-                message: 'El correo no es válido',
-            };
-        }
-        else if (step.type === CBRStepTypes.CBR_PHONE ||
-            step.type === CBRStepTypes.CBR_CEL) {
-            step.validation = {
-                value: /^(\+[0-9])|([0-9])$/.source,
-                message: 'El teléfono no es válido',
-            };
-        }
-        steps[idStep] = step;
+        steps[idStep] = migrateStep(form.steps, form.steps[idStep]);
     }
     var newForm = __assign(__assign({}, form), { steps: steps });
-    if (form.size === undefined) {
-        if (form.spacingSize) {
-            newForm.size = {
-                spacingSize: form.spacingSize,
-                blockNum: form.blockNum,
-                blockSize: form.blockSize,
-            };
-        }
-        else {
-            newForm.size = {
-                spacingSize: 20,
-                blockNum: 4,
-                blockSize: 210,
-            };
-        }
-    }
-    if (form.style === undefined) {
-        newForm.style = InternalFormStyle;
-    }
     if (form.classifiers) {
         var mappedClassifiers = {};
         for (var _b = 0, _c = Object.keys(form.classifiers); _b < _c.length; _b++) {
@@ -360,17 +309,33 @@ var migrateForm = function (form, classifiers) {
     }
     return newForm;
 };
-function getStaticWidth(step) {
-    switch (step.size) {
-        case SIZES.SMALL:
-            return 1;
-        case SIZES.MEDIUM:
-            return 2;
-        case SIZES.LARGE:
-        default:
-            return 4;
+var migrateStep = function (steps, pStep) {
+    var step = __assign({}, pStep);
+    if (step.type === StepTypes.MAPPER) {
+        var newSteps = {};
+        for (var _i = 0, _a = Object.keys(step.steps); _i < _a.length; _i++) {
+            var idStep = _a[_i];
+            newSteps[idStep] = migrateStep(__assign(__assign({}, steps), step.steps), step.steps[idStep]);
+        }
+        step.steps = newSteps;
     }
-}
+    //TODO: Pasar esto al back
+    if (step.type === CBRStepTypes.CBR_EMAIL) {
+        step.validation = {
+            value: /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+                .source,
+            message: 'El correo no es válido',
+        };
+    }
+    else if (step.type === CBRStepTypes.CBR_PHONE ||
+        step.type === CBRStepTypes.CBR_CEL) {
+        step.validation = {
+            value: /^(\+[0-9])|([0-9])$/.source,
+            message: 'El teléfono no es válido',
+        };
+    }
+    return step;
+};
 var mapOriginalValues = function (originalValues, form) {
     var _a;
     var newValues = {};

package/dist/FormComponents/Section/Section.d.ts

@@ -25,7 +25,7 @@ export interface RecursiveData {
     /** Function to call on postview to fetch the download url of a file */
     fetchDownloadUrl?: (S3Key: string, fileName: string) => Promise<string>;
     dependencyStore: Record<string, any>;
-    setDependencyStore: (values: Record<string, any>) => void;
+    setDependencyStore: React.Dispatch<React.SetStateAction<Record<string, any>>>;
     setFocus: (id: string) => void;
 }
 export interface SectionComponentProps extends RecursiveData {

package/dist/FormComponents/Step/@Construction/CBRElementStep/CBRElementStep.js

@@ -53,7 +53,7 @@ import InputIcon from '../../../../shared/InputIcon/InputIcon';
 function CBRElementStepComponent(props) {
     return (_jsx(SmartSelectStep, __assign({}, props, { step: props.step, icon: _jsx(InputIcon, { icon: 'LEAK' }), getOptions: getElementOptions, getOptionSelected: function (option, value) {
             return option.id === value.id;
-        }, getValueString: function (value) { return value === null || value === void 0 ? void 0 : value.id; }, calcDepError: calcDepError, calcInvalidDeps: calcInvalidDependencies, valueOverwrite: function (value) {
+        }, getValueString: function (value) { return value === null || value === void 0 ? void 0 : value.id; }, calcDepError: calcDepError, valueOverwrite: function (value) {
             if (value) {
                 return __assign(__assign({}, value), { subStep: props.step.subStep });
             }
@@ -73,7 +73,7 @@ function ElementSubStepRenderer(_a) {
     if ((subStep === null || subStep === void 0 ? void 0 : subStep.type) !== CBRFormStepTypes.CBR_LOCATIVAS) {
         return _jsx("div", {});
     }
-    return (_jsx(SmartSelectStep, __assign({}, stepProps, { step: subStep, level: stepProps.level + 1, icon: _jsx(InputIcon, { icon: 'LEAK' }), calcInvalidDeps: calcInvalidDependencies, getOptions: getElementOptions, calcDepError: calcDepError, getOptionSelected: function (option, value) {
+    return (_jsx(SmartSelectStep, __assign({}, stepProps, { step: subStep, level: stepProps.level + 1, icon: _jsx(InputIcon, { icon: 'LEAK' }), getOptions: getElementOptions, calcDepError: calcDepError, getOptionSelected: function (option, value) {
             return option.id === value.id;
         }, getValueString: function (value) { return value === null || value === void 0 ? void 0 : value.id; } }, { children: _jsx(ElementSubStepRenderer, {}) })));
 }
@@ -111,19 +111,6 @@ var getElementOptions = function (_a, step, dependencyStore) {
         });
     });
 };
-var calcInvalidDependencies = function (step, dependencyStore) {
-    var _a;
-    var deps = [];
-    if (step.dependencies) {
-        for (var _i = 0, _b = step.dependencies; _i < _b.length; _i++) {
-            var idDep = _b[_i];
-            if (((_a = dependencyStore[idDep]) === null || _a === void 0 ? void 0 : _a.id) === undefined) {
-                deps.push(idDep);
-            }
-        }
-    }
-    return deps;
-};
 var calcDepError = function (steps) {
     for (var _i = 0, steps_1 = steps; _i < steps_1.length; _i++) {
         var step = steps_1[_i];

package/dist/FormComponents/Step/@Construction/CBRIncidentsStep/MaterialCBRIncidentsStep/MaterialCBRIncidentsStep.js

@@ -52,7 +52,6 @@ function Incidents(_a) {
         }
     }, [firstRender]);
     var handleAddIncident = function () {
-        var _a, _b;
         var current = incidents.filter(function (incident) { return !incident.deleted; });
         var newIncident = {
             idSpaceStep: CBRFormStepTypes.CBR_TIPO_ESPACIO + '-' + nanoid(),
@@ -63,11 +62,13 @@ function Incidents(_a) {
         var newSteps = __assign({}, localForm.steps);
         newSteps[newIncident.idSpaceStep] = __assign(__assign({}, step.spaceStep), { id: newIncident.idSpaceStep, type: CBRFormStepTypes.CBR_TIPO_ESPACIO, dependencies: step.dependencies });
         newSteps[newIncident.idCommentStep] = __assign(__assign({}, step.commentStep), { id: newIncident.idCommentStep, type: CBRFormStepTypes.CBR_COMENTARIO });
-        var deps = __assign({}, dependencyStore);
-        addRecursiveElementStep(newIncident.idElementStep, step.elementStep, null, newSteps, deps, (_b = (_a = step.dependencies) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : '');
-        onChange(__spreadArray(__spreadArray([], incidents, true), [newIncident], false));
-        setLocalForm(__assign(__assign({}, localForm), { steps: newSteps }));
-        setDependencyStore(deps);
+        setDependencyStore(function (dependencies) {
+            var _a, _b;
+            var deps = __assign({}, dependencies);
+            addRecursiveElementStep(newIncident.idElementStep, step.elementStep, null, newSteps, deps, (_b = (_a = step.dependencies) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : '');
+            onChange(__spreadArray(__spreadArray([], incidents, true), [newIncident], false));
+            setLocalForm(__assign(__assign({}, localForm), { steps: newSteps }));
+        });
     };
     var addRecursiveElementStep = function (idStep, step, idParent, steps, dependencyStore, idProjectDep) {
         var _a, _b;

package/dist/FormComponents/Step/AYFStepMapper.js

@@ -146,17 +146,7 @@ function AYFStepMapper(props) {
         case AYFFormStepTypes.AYF_ICA_CITY:
             return (_jsx(SmartSelectStep, __assign({}, props, { step: props.step, getOptions: getCiudadesOptions, getOptionSelected: function (option, value) {
                     return option === value;
-                }, getValueString: function (value) { return value; }, calcInvalidDeps: function (step, depStore) {
-                    var _a;
-                    var missingDeps = [];
-                    for (var _i = 0, _b = (_a = step.dependencies) !== null && _a !== void 0 ? _a : []; _i < _b.length; _i++) {
-                        var idDep = _b[_i];
-                        if (depStore[idDep] === null) {
-                            missingDeps.push(idDep);
-                        }
-                    }
-                    return missingDeps;
-                }, icon: _jsx(LocationOnRoundedIcon, { fill: "#757575", style: {
+                }, getValueString: function (value) { return value; }, icon: _jsx(LocationOnRoundedIcon, { fill: "#757575", style: {
                         display: 'flex',
                         height: 23,
                         width: 23,

package/dist/FormComponents/Step/EntityValueStep/MaterialEntityValuePickerStep/MaterialEntityValuePickerStep.js

@@ -59,7 +59,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { createElement as _createElement } from "react";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useEffect, useState } from 'react';
-import FormStepTypes, { EntityValueOptionTypes, } from '../../../../constants/FormStepTypes';
+import FormStepTypes, { EntityValueDataTypes, EntityValueOptionTypes, } from '../../../../constants/FormStepTypes';
 import styles from './MaterialEntityValuePickerStep.module.css';
 import StepComponent from '../../Step';
 import { Controller } from 'react-hook-form';
@@ -74,61 +74,66 @@ function EntityValuePicker(_a) {
     var _b = useState(level === 0
         ? calcFillerSize(step, form.steps, getValues(), form.size)
         : 0), fillerSize = _b[0], setFillerSize = _b[1];
-    useEffect(function () {
-        if (!others.originalValues[step.id] && others.defaultValue) {
-            others.setDependencyStore(function (deps) {
-                var _a;
-                return (__assign(__assign({}, deps), (_a = {}, _a[step.id] = others.defaultValue, _a)));
-            });
-        }
-    }, []);
     var getEntityValueOptions = function (_a, _step, dependencyStore, domain) {
         var idOrganization = _a.idOrganization;
         return __awaiter(_this, void 0, void 0, function () {
-            var params, _i, _b, filter, value_1, currentValue, url, response;
-            var _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var params, _i, _b, filter, currentValue, urlPath, _c, _d, path, idEntityValue, currentValue, url, response;
+            var _e, _f, _g;
+            return __generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
                         params = new URLSearchParams({});
                         for (_i = 0, _b = step.filters; _i < _b.length; _i++) {
                             filter = _b[_i];
-                            value_1 = filter.value;
-                            if (filter.idStep) {
-                                currentValue = dependencyStore[filter.idStep];
-                                if (currentValue) {
-                                    if (typeof currentValue === 'string')
-                                        value_1 = currentValue;
-                                    else
-                                        value_1 = (_c = currentValue._id) !== null && _c !== void 0 ? _c : currentValue.id;
-                                    //TODO: Manejo de multiple!
-                                }
-                                else if (filter.required) {
-                                    return [2 /*return*/, null];
-                                }
+                            switch (filter.type) {
+                                case EntityValueDataTypes.STEP:
+                                    currentValue = dependencyStore[filter.idStep];
+                                    if (currentValue) {
+                                        if (typeof currentValue === 'string')
+                                            params.set(filter.idProperty, currentValue);
+                                        else
+                                            params.set(filter.idProperty, (_e = currentValue._id) !== null && _e !== void 0 ? _e : currentValue.id);
+                                    }
+                                    else if (filter.required) {
+                                        return [2 /*return*/, null];
+                                    }
+                                    break;
+                                case EntityValueDataTypes.VALUE:
+                                default:
+                                    params.set(filter.idProperty, filter.value);
+                                    break;
                             }
-                            if (value_1)
-                                params.set(filter.idProperty, value_1);
                         }
-                        url = "".concat(domain !== null && domain !== void 0 ? domain : idOrganization, "/entities/").concat(step.idEntity).concat(step.path.map(function (path) {
-                            var _a;
-                            var idEntityValue = path.idEntityValue;
-                            if (path.idStep) {
-                                var currentValue = dependencyStore[path.idStep];
-                                if (currentValue) {
+                        urlPath = '';
+                        for (_c = 0, _d = step.path; _c < _d.length; _c++) {
+                            path = _d[_c];
+                            idEntityValue = 'null';
+                            switch (path.type) {
+                                case EntityValueDataTypes.STEP:
+                                    currentValue = dependencyStore[path.idStep];
+                                    if (!currentValue)
+                                        return [2 /*return*/, null];
                                     if (typeof currentValue === 'string')
                                         idEntityValue = currentValue;
                                     else
-                                        idEntityValue = (_a = currentValue._id) !== null && _a !== void 0 ? _a : currentValue.id;
-                                }
+                                        idEntityValue = (_f = currentValue._id) !== null && _f !== void 0 ? _f : currentValue.id;
+                                    break;
+                                case EntityValueDataTypes.VALUE:
+                                default:
+                                    idEntityValue = (_g = path.idEntityValue) !== null && _g !== void 0 ? _g : 'null';
+                                    break;
                             }
-                            return ('/' + path.idEntity + (idEntityValue ? '/' + idEntityValue : ''));
-                        }), "?").concat(params.toString());
+                            urlPath +=
+                                '/' +
+                                    path.idEntity +
+                                    (idEntityValue ? '/' + idEntityValue : '');
+                        }
+                        url = "".concat(domain !== null && domain !== void 0 ? domain : idOrganization, "/entities/").concat(step.idEntity).concat(urlPath, "?").concat(params.toString());
                         return [4 /*yield*/, (domain
                                 ? widgetInstance.get(url)
                                 : axiosInstance.get(url))];
                     case 1:
-                        response = _d.sent();
+                        response = _h.sent();
                         return [2 /*return*/, response.data.filter(function (option) { var _a; return ((_a = step.options[option._id]) === null || _a === void 0 ? void 0 : _a.type) !== EntityValueOptionTypes.HIDE; })];
                 }
             });
@@ -182,12 +187,30 @@ function EntityValuePicker(_a) {
 export default EntityValuePickerStep;
 function EntityValuePickerStep(props) {
     var _a, _b;
+    var step = props.step, dependencyStore = props.dependencyStore, defaultValue = props.defaultValue, originalValues = props.originalValues;
+    useEffect(function () {
+        /** Al modificar tambien modificar en SmartSelect */
+        if (!originalValues[step.id] && defaultValue) {
+            props.setDependencyStore(function (dependencies) {
+                var _a;
+                return (__assign(__assign({}, dependencies), (_a = {}, _a[step.id] = props.defaultValue, _a)));
+            });
+        }
+    }, []);
     return (_jsx(Controller, { name: props.step.id, control: props.control, defaultValue: (_b = (_a = props.originalValues[props.step.id]) !== null && _a !== void 0 ? _a : props.defaultValue) !== null && _b !== void 0 ? _b : null, rules: {
             required: props.step.required
                 ? 'Este campo es obligatorio'
                 : undefined,
         }, shouldUnregister: true, render: function (_a) {
             var _b = _a.field, ref = _b.ref, field = __rest(_b, ["ref"]);
-            return (_jsx(EntityValuePicker, __assign({}, props, field, { inputRef: ref })));
+            return (_jsx(EntityValuePicker, __assign({}, props, field, { inputRef: ref, onChange: function (value) {
+                    if (dependencyStore[step.id] !== undefined) {
+                        props.setDependencyStore(function (dependencies) {
+                            var _a;
+                            return (__assign(__assign({}, dependencies), (_a = {}, _a[step.id] = value !== null && value !== void 0 ? value : null, _a)));
+                        });
+                    }
+                    field.onChange(value);
+                } })));
         } }));
 }

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

@@ -33,7 +33,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useState, useEffect, cloneElement } from 'react';
 import styles from './MaterialMapperStep.module.css';
 import { Controller } from 'react-hook-form';
-import StepTypes, { ClassifierOptionTypes, EntityValueOptionTypes, MapperStyleTypes, OptionTypes, } from '../../../../constants/FormStepTypes';
+import StepTypes, { ClassifierOptionTypes, EntityValueDataTypes, EntityValueOptionTypes, MapperStyleTypes, OptionTypes, } from '../../../../constants/FormStepTypes';
 import RoundedButton from '../../../../shared/RoundedButton/RoundedButton';
 import { nanoid } from 'nanoid';
 import { calcStepDependencyValue } from '../../../Form/ColumnForm/ColumnForm';
@@ -247,18 +247,36 @@ function calcRecursiveData(element, newSteps, deps, customSteps, originalValues)
                 break;
             }
             case StepTypes.ENTITYVALUEPICKER:
-                for (var _j = 0, _k = step.filters; _j < _k.length; _j++) {
-                    var filter = _k[_j];
-                    if (filter.idStep) {
-                        var newId = element.ids[filter.idStep];
-                        if (newId) {
-                            filter.idStep = newId;
-                            deps[newId] = calcStepDependencyValue(newSteps[newId], originalValues);
-                        }
+                for (var _j = 0, _k = step.path; _j < _k.length; _j++) {
+                    var path = _k[_j];
+                    switch (path.type) {
+                        case EntityValueDataTypes.STEP:
+                            var newId = element.ids[path.idStep];
+                            if (newId) {
+                                path.idStep = newId;
+                                deps[newId] = calcStepDependencyValue(newSteps[newId], originalValues);
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                for (var _l = 0, _m = step.filters; _l < _m.length; _l++) {
+                    var filter = _m[_l];
+                    switch (filter.type) {
+                        case EntityValueDataTypes.STEP:
+                            var newId = element.ids[filter.idStep];
+                            if (newId) {
+                                filter.idStep = newId;
+                                deps[newId] = calcStepDependencyValue(newSteps[newId], originalValues);
+                            }
+                            break;
+                        default:
+                            break;
                     }
                 }
-                for (var _l = 0, _m = Object.keys((_a = step.options) !== null && _a !== void 0 ? _a : {}); _l < _m.length; _l++) {
-                    var idOption = _m[_l];
+                for (var _o = 0, _p = Object.keys((_a = step.options) !== null && _a !== void 0 ? _a : {}); _o < _p.length; _o++) {
+                    var idOption = _p[_o];
                     var option = step.options[idOption];
                     if (option.type === EntityValueOptionTypes.NESTED) {
                         for (var i = 0; i < option.steps.length; i++) {

package/dist/FormComponents/Step/SmartSelectStep/MaterialSmartSelectStep/MaterialSmartSelectStep.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { SmartSelectStepProps } from '../SmartSelectStep';
-export declare function SmartSelect({ icon, step, form, value, onBlur, errors, setFocus, children, editable, onChange, inputRef, postview, formStyle, getOptions, widthStats, organization, calcDepError, valueOverwrite, getValueString, originalValues, changeListener, dependencyStore, calcInvalidDeps, getValueWarning, getOptionSelected, setDependencyStore, ...others }: SmartSelectStepProps & {
+export declare function SmartSelect({ icon, step, form, value, onBlur, errors, setFocus, children, editable, onChange, inputRef, postview, formStyle, getOptions, widthStats, organization, calcDepError, valueOverwrite, getValueString, originalValues, changeListener, dependencyStore, getValueWarning, getOptionSelected, setDependencyStore, ...others }: SmartSelectStepProps & {
     onChange: Function;
     onBlur: (event: any) => void;
     value: any;

package/dist/FormComponents/Step/SmartSelectStep/MaterialSmartSelectStep/MaterialSmartSelectStep.js

@@ -56,6 +56,15 @@ 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 styles from './MaterialSmartSelectStep.module.css';
 import { Controller } from 'react-hook-form';
@@ -66,34 +75,46 @@ import React from 'react';
 export function SmartSelect(_a) {
     var _this = this;
     var _b, _c, _d, _e;
-    var icon = _a.icon, step = _a.step, form = _a.form, value = _a.value, onBlur = _a.onBlur, errors = _a.errors, setFocus = _a.setFocus, children = _a.children, editable = _a.editable, onChange = _a.onChange, inputRef = _a.inputRef, postview = _a.postview, formStyle = _a.formStyle, getOptions = _a.getOptions, widthStats = _a.widthStats, organization = _a.organization, calcDepError = _a.calcDepError, valueOverwrite = _a.valueOverwrite, getValueString = _a.getValueString, originalValues = _a.originalValues, changeListener = _a.changeListener, dependencyStore = _a.dependencyStore, _f = _a.calcInvalidDeps, calcInvalidDeps = _f === void 0 ? function (step, depStore) {
-        var _a;
+    var icon = _a.icon, step = _a.step, form = _a.form, value = _a.value, onBlur = _a.onBlur, errors = _a.errors, setFocus = _a.setFocus, children = _a.children, editable = _a.editable, onChange = _a.onChange, inputRef = _a.inputRef, postview = _a.postview, formStyle = _a.formStyle, getOptions = _a.getOptions, widthStats = _a.widthStats, organization = _a.organization, calcDepError = _a.calcDepError, valueOverwrite = _a.valueOverwrite, getValueString = _a.getValueString, originalValues = _a.originalValues, changeListener = _a.changeListener, dependencyStore = _a.dependencyStore, getValueWarning = _a.getValueWarning, getOptionSelected = _a.getOptionSelected, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["icon", "step", "form", "value", "onBlur", "errors", "setFocus", "children", "editable", "onChange", "inputRef", "postview", "formStyle", "getOptions", "widthStats", "organization", "calcDepError", "valueOverwrite", "getValueString", "originalValues", "changeListener", "dependencyStore", "getValueWarning", "getOptionSelected", "setDependencyStore"]);
+    var _f = useState(true), first = _f[0], setFirst = _f[1];
+    var _g = useState(), options = _g[0], setOptions = _g[1];
+    var _h = useState(), error = _h[0], setError = _h[1];
+    var _j = useState(false), loading = _j[0], setLoading = _j[1];
+    var calcInvalidDeps = function () {
+        var calcDependencies = function (idStep, deps) {
+            if (deps === void 0) { deps = []; }
+            var step = form.steps[idStep];
+            if (step.dependencies) {
+                for (var _i = 0, _a = step.dependencies; _i < _a.length; _i++) {
+                    var dep = _a[_i];
+                    if (!deps.includes(dep)) {
+                        deps.push.apply(deps, __spreadArray(__spreadArray([], calcDependencies(dep, deps), false), [dep], false));
+                    }
+                }
+            }
+            return deps;
+        };
         var missingDeps = [];
-        for (var _i = 0, _b = (_a = step.dependencies) !== null && _a !== void 0 ? _a : []; _i < _b.length; _i++) {
-            var idDep = _b[_i];
-            if (depStore[idDep] === null) {
+        for (var _i = 0, _a = calcDependencies(step.id); _i < _a.length; _i++) {
+            var idDep = _a[_i];
+            if (dependencyStore[idDep] === null) {
                 missingDeps.push(idDep);
             }
         }
         return missingDeps;
-    } : _f, getValueWarning = _a.getValueWarning, getOptionSelected = _a.getOptionSelected, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["icon", "step", "form", "value", "onBlur", "errors", "setFocus", "children", "editable", "onChange", "inputRef", "postview", "formStyle", "getOptions", "widthStats", "organization", "calcDepError", "valueOverwrite", "getValueString", "originalValues", "changeListener", "dependencyStore", "calcInvalidDeps", "getValueWarning", "getOptionSelected", "setDependencyStore"]);
-    var _g = useState(true), first = _g[0], setFirst = _g[1];
-    var _h = useState(), options = _h[0], setOptions = _h[1];
-    var _j = useState(), error = _j[0], setError = _j[1];
-    var _k = useState(false), loading = _k[0], setLoading = _k[1];
+    };
     var calcOptions = function (currentValue, invalidDeps) { return __awaiter(_this, void 0, void 0, function () {
         var resp, currentOption, invalids, error_1;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     setOptions(undefined);
-                    _b.label = 1;
+                    _a.label = 1;
                 case 1:
-                    _b.trys.push([1, 3, , 4]);
+                    _a.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, (getOptions === null || getOptions === void 0 ? void 0 : getOptions(organization, step, dependencyStore, others.domain))];
                 case 2:
-                    resp = _b.sent();
+                    resp = _a.sent();
                     if (resp !== null) {
                         if (invalidDeps !== undefined && currentValue) {
                             currentOption = resp.find(function (option) {
@@ -104,7 +125,7 @@ export function SmartSelect(_a) {
                             }
                         }
                         else {
-                            invalids = (_a = calcInvalidDeps === null || calcInvalidDeps === void 0 ? void 0 : calcInvalidDeps(step, dependencyStore)) !== null && _a !== void 0 ? _a : [];
+                            invalids = calcInvalidDeps();
                             if (invalids.length === 0) {
                                 setError(undefined);
                             }
@@ -113,7 +134,7 @@ export function SmartSelect(_a) {
                     setOptions(resp);
                     return [3 /*break*/, 4];
                 case 3:
-                    error_1 = _b.sent();
+                    error_1 = _a.sent();
                     console.error(error_1);
                     setOptions(null);
                     return [3 /*break*/, 4];
@@ -127,7 +148,7 @@ export function SmartSelect(_a) {
         if (!postview) {
             if (first) {
                 setFirst(false);
-                var invalids = calcInvalidDeps(step, dependencyStore).filter(function (idDep) { return originalValues[idDep]; });
+                var invalids = calcInvalidDeps().filter(function (idDep) { return originalValues[idDep]; });
                 setError(calcDepError === null || calcDepError === void 0 ? void 0 : calcDepError(invalids.map(function (idDep) { return form.steps[idDep]; })));
                 calcOptions(value, invalids);
             }
@@ -161,7 +182,7 @@ export function SmartSelect(_a) {
         var invalids;
         return __generator(this, function (_a) {
             if (step.dependencies) {
-                invalids = calcInvalidDeps(step, dependencyStore);
+                invalids = calcInvalidDeps();
                 setError(calcDepError === null || calcDepError === void 0 ? void 0 : calcDepError(invalids
                     .map(function (idDep) { return form.steps[idDep]; })
                     .filter(function (idDep) { return idDep !== undefined; })));
@@ -201,10 +222,6 @@ export function SmartSelect(_a) {
                             setLoading(true);
                         }
                     }, disabled: options === null, loading: loading, options: options !== null && options !== void 0 ? options : undefined, inputRef: inputRef, cantEdit: !editable || postview, fullWidth: true, backgroundColor: (_d = formStyle.stepBackgroundColor) !== null && _d !== void 0 ? _d : 'white', label: step.label, required: step.required, height: '31px', changeListener: changeListener, searchable: step.searchable, icon: step.showIcon ? icon : undefined, helperTextColor: formStyle.descriptionTextColor, focusColor: formStyle.primaryColor, outlineColor: formStyle.outlineColor, errorColor: formStyle.errorColor, color: formStyle.textColor, containerMargin: "0px", handleUpdate: function (value) {
-                        var _a;
-                        if (dependencyStore[step.id] !== undefined) {
-                            setDependencyStore(__assign(__assign({}, dependencyStore), (_a = {}, _a[step.id] = value !== null && value !== void 0 ? value : null, _a)));
-                        }
                         valueOverwrite
                             ? onChange(valueOverwrite(value))
                             : onChange(value);
@@ -221,22 +238,31 @@ export function SmartSelect(_a) {
 }
 function SmartSelectStep(props) {
     var _a, _b;
+    var step = props.step, dependencyStore = props.dependencyStore, defaultValue = props.defaultValue, originalValues = props.originalValues;
     useEffect(function () {
-        /** Al modificar tambien modificar en EntityValues */
-        if (!props.originalValues[props.step.id] && props.defaultValue) {
-            props.setDependencyStore(function (deps) {
+        /** Al modificar tambien modificar en EntityValue */
+        if (!originalValues[step.id] && defaultValue) {
+            props.setDependencyStore(function (dependencies) {
                 var _a;
-                return (__assign(__assign({}, deps), (_a = {}, _a[props.step.id] = props.defaultValue, _a)));
+                return (__assign(__assign({}, dependencies), (_a = {}, _a[step.id] = props.defaultValue, _a)));
             });
         }
     }, []);
-    return (_jsx(Controller, { name: props.step.id, control: props.control, defaultValue: (_b = (_a = props.originalValues[props.step.id]) !== null && _a !== void 0 ? _a : props.defaultValue) !== null && _b !== void 0 ? _b : null, rules: {
-            required: props.step.required
+    return (_jsx(Controller, { name: step.id, control: props.control, defaultValue: (_b = (_a = originalValues[step.id]) !== null && _a !== void 0 ? _a : defaultValue) !== null && _b !== void 0 ? _b : null, rules: {
+            required: step.required
                 ? 'Este campo es obligatorio'
                 : undefined,
         }, shouldUnregister: true, render: function (_a) {
             var _b = _a.field, ref = _b.ref, field = __rest(_b, ["ref"]);
-            return (_jsx(SmartSelect, __assign({}, props, field, { inputRef: ref })));
+            return (_jsx(SmartSelect, __assign({}, props, field, { inputRef: ref, onChange: function (value) {
+                    if (dependencyStore[step.id] !== undefined) {
+                        props.setDependencyStore(function (dependencies) {
+                            var _a;
+                            return (__assign(__assign({}, dependencies), (_a = {}, _a[step.id] = value !== null && value !== void 0 ? value : null, _a)));
+                        });
+                    }
+                    field.onChange(value);
+                } })));
         } }));
 }
 export default SmartSelectStep;

package/dist/FormComponents/Step/SmartSelectStep/SmartSelectStep.d.ts

@@ -18,8 +18,6 @@ export interface SmartSelectStepProps extends Omit<StepProps, 'step'> {
     getValueWarning?: (value: any) => string | null;
     /** Function that returns the error message based on the types of the missing Dependencies, undefined if no error msg */
     calcDepError?: (types: FormStep[]) => string | undefined;
-    /** Function that returns the missing dependencies based on the current value */
-    calcInvalidDeps?: (step: GSmartSelect, dependencyStore: Record<string, any>) => string[];
     /** children to render */
     children?: React.ReactElement<any, string>;
     /** Function that overwrites the value before setting it */

package/dist/constants/FormStepTypes.d.ts

@@ -44,3 +44,7 @@ export declare enum MapperStyleTypes {
     LIST = "LIST",
     INLINE = "INLINE"
 }
+export declare enum EntityValueDataTypes {
+    STEP = "STEP",
+    VALUE = "VALUE"
+}

package/dist/constants/FormStepTypes.js

@@ -52,3 +52,8 @@ export var MapperStyleTypes;
     MapperStyleTypes["LIST"] = "LIST";
     MapperStyleTypes["INLINE"] = "INLINE";
 })(MapperStyleTypes || (MapperStyleTypes = {}));
+export var EntityValueDataTypes;
+(function (EntityValueDataTypes) {
+    EntityValueDataTypes["STEP"] = "STEP";
+    EntityValueDataTypes["VALUE"] = "VALUE";
+})(EntityValueDataTypes || (EntityValueDataTypes = {}));

package/package.json

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