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

package/dist/App.js

@@ -68,18 +68,10 @@ import widgetInstance from './AxiosWidget';
 function App(_a) {
     var _this = this;
     var _b, _c, _d, _e;
-    var apiKey = _a.apiKey, domain = _a.domain, preview = _a.preview, formData = _a.formData, postview = _a.postview, isWidget = _a.isWidget, internal = _a.internal, valuesData = _a.valuesData, _f = _a.customSend, customSend = _f === void 0 ? function (a, b) { return __awaiter(_this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            // eslint-disable-next-line no-console
-            console.log('HOLA', a, b);
-            return [2 /*return*/];
-        });
-    }); } : _f, customSteps = _a.customSteps, handleConfirmed = _a.handleConfirmed, others = __rest(_a, ["apiKey", "domain", "preview", "formData", "postview", "isWidget", "internal", "valuesData", "customSend", "customSteps", "handleConfirmed"]);
-    // eslint-disable-next-line no-console
-    console.log(formData, valuesData, customSend);
-    var _g = useState(undefined), form = _g[0], setForm = _g[1];
-    var _h = useState({}), originalValues = _h[0], setOriginalValues = _h[1];
-    var _j = useState(undefined), organizationInfo = _j[0], setOrganizationInfo = _j[1];
+    var apiKey = _a.apiKey, domain = _a.domain, preview = _a.preview, formData = _a.formData, postview = _a.postview, isWidget = _a.isWidget, internal = _a.internal, valuesData = _a.valuesData, customSend = _a.customSend, customSteps = _a.customSteps, handleConfirmed = _a.handleConfirmed, others = __rest(_a, ["apiKey", "domain", "preview", "formData", "postview", "isWidget", "internal", "valuesData", "customSend", "customSteps", "handleConfirmed"]);
+    var _f = useState(undefined), form = _f[0], setForm = _f[1];
+    var _g = useState({}), originalValues = _g[0], setOriginalValues = _g[1];
+    var _h = useState(undefined), organizationInfo = _h[0], setOrganizationInfo = _h[1];
     function fetchPreview(formData) {
         return __awaiter(this, void 0, void 0, function () {
             var response;

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,13 +278,12 @@ function calcDependencies(steps, originalValues) {
                             break;
                         }
                         default:
-                            dependencies[idDep] = originalValues[idDep];
+                            dependencies[idDep] = (_a = originalValues[idDep]) !== null && _a !== void 0 ? _a : null;
                             break;
                     }
                 }
             }
         }
     }
-    dependencies['CBR_PROYECTO'] = null; //REMOVE
     return dependencies;
 }

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

@@ -57,8 +57,13 @@ function CBRLocativasStep(props) {
                 marginTop: 2,
             } }, void 0), getOptions: getLocativasOptions, getOptionSelected: function (option, value) {
             return option.id === value.id;
-        }, valueOverwrite: function (value) {
-            return __assign(__assign({}, value), { subStep: props.step.subStep });
+        }, calcDepError: calcDepError, calcInvalidDeps: calcInvaidDependencies, valueOverwrite: function (value) {
+            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;
@@ -77,7 +82,7 @@ function LocativasSubStepRenderer(_a) {
                 height: 23,
                 width: 23,
                 marginTop: 2,
-            } }, void 0), getOptions: getLocativasOptions, getOptionSelected: function (option, value) {
+            } }, void 0), calcInvalidDeps: calcInvaidDependencies, getOptions: getLocativasOptions, calcDepError: calcDepError, getOptionSelected: function (option, value) {
             return option.id === value.id;
         }, iconComponent: LeakIconComponent }, { children: _jsx(LocativasSubStepRenderer, {}, void 0) }), void 0));
 }
@@ -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;
@@ -121,4 +130,29 @@ var getLocativasOptions = function (step, dependencyStore) { return __awaiter(vo
         return [2 /*return*/];
     });
 }); };
+var calcInvaidDependencies = 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 (types) {
+    for (var _i = 0, _a = types; _i < _a.length; _i++) {
+        var type = _a[_i];
+        if (type === CBRFormStepTypes.CBR_PROYECTO) {
+            return 'Selecciona un proyecto';
+        }
+        if (type === CBRFormStepTypes.CBR_LOCATIVAS) {
+            return 'Selecciona un padre';
+        }
+    }
+    return undefined;
+};
 var Leak = function (props) { return (_jsxs("svg", __assign({ fill: props.fill, className: props.class, style: props.style, height: "512pt", viewBox: "0 -86 512.00056 512", width: "512pt", xmlns: "http://www.w3.org/2000/svg" }, { children: [_jsx("path", { d: "m203.484375 196.359375c2.402344 0 4.753906-.867187 6.601563-2.492187l26.621093-23.394532c3.03125-2.664062 4.164063-6.890625 2.871094-10.714844l-9.21875-27.257812 21.613281-18.996094c3.03125-2.664062 4.164063-6.890625 2.871094-10.714844l-11.359375-33.570312c-1.070313-3.167969-3.652344-5.589844-6.882813-6.457031l-57.925781-15.519531c-5.335937-1.433594-10.816406 1.734374-12.246093 7.070312-1.429688 5.335938 1.734374 10.820312 7.070312 12.25l52.753906 14.132812 7.507813 22.1875-21.613281 18.996094c-3.03125 2.664063-4.164063 6.890625-2.871094 10.714844l9.21875 27.257812-17.59375 15.460938-130.027344-34.839844 30.992188-115.667968c.6875-2.5625.328124-5.292969-.996094-7.589844-1.328125-2.296875-3.511719-3.972656-6.074219-4.660156l-45.574219-12.210938c-5.332031-1.429688-10.816406 1.734375-12.246094 7.070312l-36.636718 136.722657c-.6875 2.5625-.324219 5.292969 1 7.589843 1.324218 2.292969 3.511718 3.972657 6.070312 4.65625l45.574219 12.210938c.867187.234375 1.738281.34375 2.597656.34375 4.414063 0 8.453125-2.945312 9.652344-7.414062l.464844-1.734376 135.199219 36.226563c.851562.230469 1.722656.34375 2.585937.34375zm-181.238281-56.703125 31.460937-117.40625 26.253907 7.035156-31.457032 117.40625zm0 0" }, void 0), _jsx("path", { d: "m511.660156 144.136719-36.636718-136.722657c-1.429688-5.332031-6.910157-8.5-12.246094-7.070312l-45.574219 12.210938c-2.5625.6875-4.746094 2.363281-6.070313 4.660156-1.328124 2.296875-1.6875 5.023437-1 7.585937l.464844 1.734375-135.199218 36.226563c-3.28125.878906-5.894532 3.367187-6.933594 6.605469-1.039063 3.238281-.363282 6.777343 1.796875 9.40625l19.121093 23.265624-5.867187 25.070313c-.796875 3.40625.242187 6.980469 2.738281 9.425781l19.386719 18.988282-6.847656 28.496093c-.824219 3.429688.21875 7.039063 2.742187 9.5 1.894532 1.84375 4.40625 2.839844 6.980469 2.839844.863281 0 1.730469-.113281 2.585937-.34375l57.925782-15.519531c5.335937-1.429688 8.5-6.914063 7.070312-12.25-1.429687-5.332032-6.914062-8.5-12.246094-7.070313l-41.683593 11.171875 4.246093-17.664062c.820313-3.421875-.214843-7.023438-2.726562-9.484375l-19.417969-19.015625 5.714844-24.398438c.710937-3.035156-.035156-6.222656-2.011719-8.628906l-12.40625-15.09375 120.207032-32.207031 30.992187 115.667969c1.199219 4.46875 5.238281 7.414062 9.65625 7.414062.855469 0 1.726563-.109375 2.59375-.339844l45.574219-12.210937c2.5625-.6875 4.746094-2.363281 6.070312-4.660157 1.328125-2.296874 1.6875-5.027343 1-7.589843zm-48.160156 2.554687-30.996094-115.667968s0 0 0-.003907v-.003906l-.464844-1.730469 26.257813-7.035156 31.457031 117.40625zm0 0" }, void 0), _jsx("path", { d: "m263.386719 203.265625c-1.894531-2.078125-4.574219-3.261719-7.386719-3.261719-2.808594 0-5.492188 1.183594-7.386719 3.261719-.78125.855469-1.640625 1.789063-2.570312 2.792969-14.488281 15.730468-44.640625 48.457031-44.640625 79.34375 0 30.105468 24.492187 54.601562 54.597656 54.601562s54.597656-24.496094 54.597656-54.601562c0-30.886719-30.148437-63.613282-44.640625-79.339844-.925781-1.007812-1.789062-1.941406-2.570312-2.796875zm-7.386719 116.738281c-19.078125 0-34.597656-15.523437-34.597656-34.601562 0-20.492188 20.960937-45.539063 34.597656-60.601563 13.636719 15.0625 34.597656 40.109375 34.597656 60.601563 0 19.078125-15.519531 34.601562-34.597656 34.601562zm0 0" }, void 0), _jsx("path", { d: "m129.878906 54.871094c.917969.261718 1.839844.386718 2.75.386718 4.351563 0 8.355469-2.863281 9.609375-7.253906 1.519531-5.3125-1.554687-10.847656-6.867187-12.363281h-.007813c-5.308593-1.519531-10.839843 1.554687-12.359375 6.867187-1.515625 5.308594 1.5625 10.847657 6.875 12.363282zm0 0" }, void 0), _jsx("path", { d: "m407.335938 149.527344-.007813.003906c-5.335937 1.421875-8.507813 6.898438-7.082031 12.238281 1.191406 4.472657 5.238281 7.421875 9.65625 7.421875.855468 0 1.722656-.109375 2.585937-.339844 5.335938-1.421874 8.507813-6.902343 7.085938-12.238281-1.425781-5.335937-6.90625-8.511719-12.238281-7.085937zm0 0" }, void 0)] }), void 0)); };

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

@@ -66,18 +66,43 @@ 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, 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", "getOptionSelected", "setDependencyStore"]);
-    var _e = useState(), options = _e[0], setOptions = _e[1];
-    var _f = useState(), depError = _f[0], setDepError = _f[1];
-    var calcOptions = function () { return __awaiter(_this, void 0, void 0, function () {
-        var resp;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+    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) {
                 case 0: return [4 /*yield*/, (getOptions === null || getOptions === void 0 ? void 0 : getOptions(step, dependencyStore))];
                 case 1:
-                    resp = _a.sent();
+                    resp = _b.sent();
                     if (resp !== null) {
-                        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);
                     return [2 /*return*/];
@@ -85,26 +110,29 @@ function SmartSelect(_a) {
         });
     }); };
     useEffect(function () {
-        if (value) {
-            onChange(null);
+        if (first) {
+            setFirst(false);
+            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);
+            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*/];
         });
@@ -126,16 +154,18 @@ 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),
                 })] }, void 0));
 }
 function SmartSelectStep(props) {
-    return (_jsx(Controller, { name: props.step.id, control: props.control, defaultValue: null, rules: {
+    var _a;
+    return (_jsx(Controller, { name: props.step.id, control: props.control, defaultValue: (_a = props.originalValues[props.step.id]) !== null && _a !== void 0 ? _a : null, rules: {
             required: props.step.required
                 ? 'Este campo es obligatorio'
                 : undefined,

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

@@ -10,15 +10,17 @@ 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 */
+    calcInvalidDeps?: (step: GSmartSelect, dependencyStore: Record<string, any>) => string[];
     /** 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/dist/shared/RoundedSmartSelect/RoundedSmartSelect.js

@@ -143,7 +143,7 @@ export default function RoundedSmartSelect(_a) {
                 if (typeof option === 'string') {
                     return option;
                 }
-                else if (option.inputValue) {
+                else if (option === null || option === void 0 ? void 0 : option.inputValue) {
                     return option.inputValue;
                 }
                 else {

package/package.json

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