@arquimedes.co/eureka-forms 1.4.7-test → 1.4.8-test

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

@@ -257,12 +257,13 @@ function stringToDraft(text) {
     return draftStructure;
 }
 function calcDependencies(steps, originalValues) {
+    var _a;
     var dependencies = {};
-    for (var _i = 0, _a = Object.values(steps); _i < _a.length; _i++) {
-        var step = _a[_i];
+    for (var _i = 0, _b = Object.values(steps); _i < _b.length; _i++) {
+        var step = _b[_i];
         if (step.dependencies) {
-            for (var _b = 0, _c = step.dependencies; _b < _c.length; _b++) {
-                var idDep = _c[_b];
+            for (var _c = 0, _d = step.dependencies; _c < _d.length; _c++) {
+                var idDep = _d[_c];
                 var depStep = steps[idDep];
                 if (depStep && dependencies[idDep] === undefined) {
                     switch (depStep === null || depStep === void 0 ? void 0 : depStep.type) {
@@ -277,7 +278,7 @@ function calcDependencies(steps, originalValues) {
                             break;
                         }
                         default:
-                            dependencies[idDep] = originalValues[idDep];
+                            dependencies[idDep] = (_a = originalValues[idDep]) !== null && _a !== void 0 ? _a : null;
                             break;
                     }
                 }

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

@@ -58,7 +58,12 @@ function CBRLocativasStep(props) {
             } }, void 0), getOptions: getLocativasOptions, getOptionSelected: function (option, value) {
             return option.id === value.id;
         }, calcDepError: calcDepError, calcInvalidDeps: calcInvaidDependencies, valueOverwrite: function (value) {
-            return __assign(__assign({}, value), { subStep: props.step.subStep });
+            if (value) {
+                return __assign(__assign({}, value), { subStep: props.step.subStep });
+            }
+            else {
+                return null;
+            }
         }, iconComponent: LeakIconComponent }, { children: _jsx(LocativasSubStepRenderer, {}, void 0) }), void 0));
 }
 export default CBRLocativasStep;
@@ -91,18 +96,22 @@ function LeakIconComponent(props) {
 }
 var getLocativasOptions = function (step, dependencyStore) { return __awaiter(void 0, void 0, void 0, function () {
     var idProyecto, response, father_1, locativasList;
-    var _a, _b;
-    return __generator(this, function (_c) {
+    var _a;
+    return __generator(this, function (_b) {
         if (step.dependencies) {
             idProyecto = (_a = dependencyStore[step.dependencies[0]]) === null || _a === void 0 ? void 0 : _a.id;
             if (!idProyecto) {
                 return [2 /*return*/, null]; //null para indicar que falta la depedency
             }
             response = LocativasData;
-            father_1 = (_b = dependencyStore[step.dependencies[1]]) === null || _b === void 0 ? void 0 : _b.id;
+            father_1 = dependencyStore[step.dependencies[1]];
+            if (father_1 !== undefined && father_1.id === undefined) {
+                return [2 /*return*/, null];
+            }
             locativasList = response.lstLocativas.TipoLocativas.filter(function (locativa) {
-                if (father_1) {
-                    return (locativa.Id.startsWith(father_1) && locativa.Id !== father_1);
+                if (father_1 === null || father_1 === void 0 ? void 0 : father_1.id) {
+                    return (locativa.Id.startsWith(father_1.id) &&
+                        locativa.Id !== father_1.id);
                 }
                 else {
                     return locativa.Id.length === 2;

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

@@ -66,12 +66,22 @@ import React from 'react';
 function SmartSelect(_a) {
     var _this = this;
     var _b, _c, _d;
-    var icon = _a.icon, step = _a.step, form = _a.form, value = _a.value, onBlur = _a.onBlur, errors = _a.errors, trigger = _a.trigger, children = _a.children, onChange = _a.onChange, inputRef = _a.inputRef, postview = _a.postview, formStyle = _a.formStyle, getOptions = _a.getOptions, widthStats = _a.widthStats, calcDepError = _a.calcDepError, iconComponent = _a.iconComponent, valueOverwrite = _a.valueOverwrite, dependencyStore = _a.dependencyStore, calcInvalidDeps = _a.calcInvalidDeps, getOptionSelected = _a.getOptionSelected, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["icon", "step", "form", "value", "onBlur", "errors", "trigger", "children", "onChange", "inputRef", "postview", "formStyle", "getOptions", "widthStats", "calcDepError", "iconComponent", "valueOverwrite", "dependencyStore", "calcInvalidDeps", "getOptionSelected", "setDependencyStore"]);
-    var _e = useState(true), first = _e[0], setFirst = _e[1];
-    var _f = useState(), options = _f[0], setOptions = _f[1];
-    var _g = useState(), depError = _g[0], setDepError = _g[1];
-    var calcOptions = function () { return __awaiter(_this, void 0, void 0, function () {
-        var resp, invalidDeps;
+    var icon = _a.icon, step = _a.step, form = _a.form, value = _a.value, onBlur = _a.onBlur, errors = _a.errors, trigger = _a.trigger, children = _a.children, onChange = _a.onChange, inputRef = _a.inputRef, postview = _a.postview, formStyle = _a.formStyle, getOptions = _a.getOptions, widthStats = _a.widthStats, calcDepError = _a.calcDepError, iconComponent = _a.iconComponent, valueOverwrite = _a.valueOverwrite, dependencyStore = _a.dependencyStore, _e = _a.calcInvalidDeps, calcInvalidDeps = _e === void 0 ? 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;
+    } : _e, getOptionSelected = _a.getOptionSelected, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["icon", "step", "form", "value", "onBlur", "errors", "trigger", "children", "onChange", "inputRef", "postview", "formStyle", "getOptions", "widthStats", "calcDepError", "iconComponent", "valueOverwrite", "dependencyStore", "calcInvalidDeps", "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 calcOptions = function (currentValue, invalidDeps) { return __awaiter(_this, void 0, void 0, function () {
+        var resp, currentOption, invalids;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
@@ -79,9 +89,19 @@ function SmartSelect(_a) {
                 case 1:
                     resp = _b.sent();
                     if (resp !== null) {
-                        invalidDeps = (_a = calcInvalidDeps === null || calcInvalidDeps === void 0 ? void 0 : calcInvalidDeps(step, dependencyStore)) !== null && _a !== void 0 ? _a : [];
-                        if (invalidDeps.length === 0) {
-                            setDepError(undefined);
+                        if (invalidDeps !== undefined && currentValue) {
+                            currentOption = resp.find(function (option) {
+                                return getOptionSelected(option, currentValue);
+                            });
+                            if (!currentOption) {
+                                setError('Este campo es obligatorio');
+                            }
+                        }
+                        else {
+                            invalids = (_a = calcInvalidDeps === null || calcInvalidDeps === void 0 ? void 0 : calcInvalidDeps(step, dependencyStore)) !== null && _a !== void 0 ? _a : [];
+                            if (invalids.length === 0) {
+                                setError(undefined);
+                            }
                         }
                     }
                     setOptions(resp);
@@ -90,34 +110,29 @@ function SmartSelect(_a) {
         });
     }); };
     useEffect(function () {
-        var _a;
         if (first) {
             setFirst(false);
-            var invalidDeps = (_a = calcInvalidDeps === null || calcInvalidDeps === void 0 ? void 0 : calcInvalidDeps(step, dependencyStore)) !== null && _a !== void 0 ? _a : [];
-            if (invalidDeps.length > 0) {
-                setDepError(calcDepError === null || calcDepError === void 0 ? void 0 : calcDepError(invalidDeps.map(function (idDep) { var _a; return (_a = form.steps[idDep]) === null || _a === void 0 ? void 0 : _a.type; })));
-            }
+            var invalids = calcInvalidDeps(step, dependencyStore);
+            setError(calcDepError === null || calcDepError === void 0 ? void 0 : calcDepError(invalids.map(function (idDep) { var _a; return (_a = form.steps[idDep]) === null || _a === void 0 ? void 0 : _a.type; })));
+            calcOptions(value, invalids);
         }
-        else if (value) {
-            onChange(null);
+        else {
+            if (value)
+                onChange(null);
+            calcOptions(null);
         }
-        calcOptions();
     }, (_c = (_b = step.dependencies) === null || _b === void 0 ? void 0 : _b.map(function (dep) { return dependencyStore[dep]; })) !== null && _c !== void 0 ? _c : []);
     var handleMissingDep = function () { return __awaiter(_this, void 0, void 0, function () {
-        var missingDeps, _i, _a, idDep;
-        return __generator(this, function (_b) {
+        var invalids;
+        return __generator(this, function (_a) {
             if (step.dependencies) {
-                missingDeps = [];
-                for (_i = 0, _a = step.dependencies; _i < _a.length; _i++) {
-                    idDep = _a[_i];
-                    if (dependencyStore[idDep] === null) {
-                        missingDeps.push(idDep);
+                invalids = calcInvalidDeps(step, dependencyStore);
+                setError(calcDepError === null || calcDepError === void 0 ? void 0 : calcDepError(invalids.map(function (idDep) { var _a; return (_a = form.steps[idDep]) === null || _a === void 0 ? void 0 : _a.type; })));
+                if (!value) {
+                    if (invalids.length > 0) {
+                        trigger(invalids, { shouldFocus: true });
                     }
                 }
-                setDepError(calcDepError === null || calcDepError === void 0 ? void 0 : calcDepError(missingDeps.map(function (idDep) { var _a; return (_a = form.steps[idDep]) === null || _a === void 0 ? void 0 : _a.type; })));
-                if (missingDeps.length > 0) {
-                    trigger(missingDeps, { shouldFocus: true });
-                }
             }
             return [2 /*return*/];
         });
@@ -139,9 +154,10 @@ function SmartSelect(_a) {
                         valueOverwrite
                             ? onChange(valueOverwrite(value))
                             : onChange(value);
-                    }, getOptionSelected: getOptionSelected, helperText: depError !== null && depError !== void 0 ? depError : (errors[step.id]
+                        setError(undefined);
+                    }, getOptionSelected: getOptionSelected, helperText: error !== null && error !== void 0 ? error : (errors[step.id]
                         ? errors[step.id].message
-                        : step.description), error: depError !== undefined || !!errors[step.id] }, void 0) }), void 0), children &&
+                        : step.description), error: error !== undefined || !!errors[step.id] }, void 0) }), void 0), children &&
                 cloneElement(children, {
                     value: value,
                     stepProps: __assign({ step: step, form: form, errors: errors, trigger: trigger, postview: postview, formStyle: formStyle, widthStats: widthStats, dependencyStore: dependencyStore, setDependencyStore: setDependencyStore }, others),

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

@@ -10,9 +10,9 @@ export interface SmartSelectStepProps extends Omit<StepProps, 'step'> {
     /** The iconComponent to display in the selector */
     iconComponent?: any;
     /** Function to call to get the options of the selector, return null if dependency is not met */
-    getOptions?: (step: GSmartSelect, dependencyStore: Record<string, any>) => Promise<any[] | null>;
+    getOptions: (step: GSmartSelect, dependencyStore: Record<string, any>) => Promise<any[] | null>;
     /** Function to determine the currently selected option */
-    getOptionSelected?: (option: any, value: any) => boolean;
+    getOptionSelected: (option: any, value: any) => boolean;
     /** Function that returns the error message based on the types of the missing Dependencies, undefined if no error msg */
     calcDepError?: (types: Types[]) => string | undefined;
     /** Function that returns the missing dependencies based on the current value */
@@ -20,7 +20,7 @@ export interface SmartSelectStepProps extends Omit<StepProps, 'step'> {
     /** children to render */
     children?: React.ReactElement<any, string>;
     /** Function that overwrites the value before setting it */
-    valueOverwrite?: (value: any) => any;
+    valueOverwrite?: (value: any | null) => any;
 }
 declare function SmartSelectStep(props: SmartSelectStepProps): JSX.Element;
 export default SmartSelectStep;

package/package.json

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