@arquimedes.co/eureka-forms 1.5.8-test → 1.6.0-test

package/dist/App.js

@@ -257,7 +257,7 @@ function App(_a) {
                     if (handleConfirmed) {
                         handleConfirmed();
                     }
-                }, editable: editable, postview: postview === true, internal: internal === true, apiKey: apiKey, domain: domain, customSend: customSend, originalValues: originalValues, containerRef: containerRef, organization: organizationInfo, customSteps: customSteps !== null && customSteps !== void 0 ? customSteps : {} }), void 0) }), void 0));
+                }, editable: editable, postview: postview === true, internal: internal === true, apiKey: apiKey, domain: domain, customSend: customSend, originalValues: originalValues, containerRef: containerRef, organization: organizationInfo !== null && organizationInfo !== void 0 ? organizationInfo : { idOrganization: domain }, customSteps: customSteps !== null && customSteps !== void 0 ? customSteps : {} }), void 0) }), void 0));
     }
 }
 export default App;

package/dist/FormComponents/Form/Form.d.ts

@@ -10,6 +10,7 @@ export interface WidthStats {
 }
 export interface FormComponentProps {
     form: Form;
+    organization: Organization;
     originalValues: Record<string, unknown>;
     customSteps: Record<string, CustomStep>;
     customSend?: (values: any, reload: Function) => Promise<void>;

package/dist/FormComponents/Form/Form.js

@@ -93,7 +93,7 @@ function FormComponent(_a) {
                     : form.style.backgroundColor,
             } }, { children: _jsx(FormTypeComponent, __assign({}, others, { handleLoaded: function () {
                     setLoaded(true);
-                }, widthStats: widthStats, form: form, internal: internal, postview: postview, formStyle: internal ? InternalFormStyle : form.style }), void 0) }), void 0));
+                }, widthStats: widthStats, form: form, internal: internal, postview: postview, organization: organization, formStyle: internal ? InternalFormStyle : form.style }), void 0) }), void 0));
     }
     else if (organization && widthStats !== undefined) {
         //Standalone cant have widget
@@ -102,7 +102,7 @@ function FormComponent(_a) {
                             : styles.standAloneFormCard, style: {
                             backgroundColor: form.style.backgroundColor,
                             visibility: loaded ? 'visible' : 'hidden',
-                        } }, { children: _jsx(FormTypeComponent, __assign({}, others, { internal: internal, postview: postview, widthStats: widthStats, form: form, formStyle: form.style, handleLoaded: function () {
+                        } }, { children: _jsx(FormTypeComponent, __assign({}, others, { internal: internal, postview: postview, widthStats: widthStats, form: form, formStyle: form.style, organization: organization, handleLoaded: function () {
                                 setLoaded(true);
                             } }), void 0) }), void 0) }), void 0)] }, void 0));
     }

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

@@ -1,10 +1,12 @@
 /// <reference types="react" />
 import { Control, FieldValues, UseFormGetValues, UseFormTrigger } from 'react-hook-form';
+import { Organization } from '../../@Types';
 import { Form, FormStyle, Section } from '../../@Types/Form';
 import { CustomStep } from '../../App';
 import { WidthStats } from '../Form/Form';
 export interface RecursiveData {
     form: Form;
+    organization: Organization;
     control: Control<FieldValues, object>;
     formStyle: FormStyle;
     /** If the formsteps can be edited (For entities) */

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

@@ -47,8 +47,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import SmartSelectStep from '../../SmartSelectStep/SmartSelectStep';
-import LocativasData from '../../CBRStepValuesTemp/CBR_LOCATIVAS.json';
 import CBRFormStepTypes from '../../../../constants/CBRFormStepTypes';
+import axios from 'axios';
 function CBRLocativasStep(props) {
     return (_jsx(SmartSelectStep, __assign({}, props, { step: props.step, icon: _jsx(Leak, { fill: "#757575", style: {
                 display: 'flex',
@@ -57,7 +57,7 @@ function CBRLocativasStep(props) {
                 marginTop: 2,
             } }, void 0), getOptions: getLocativasOptions, getOptionSelected: function (option, value) {
             return option.id === value.id;
-        }, calcDepError: calcDepError, calcInvalidDeps: calcInvaidDependencies, valueOverwrite: function (value) {
+        }, calcDepError: calcDepError, calcInvalidDeps: calcInvalidDependencies, valueOverwrite: function (value) {
             if (value) {
                 return __assign(__assign({}, value), { subStep: props.step.subStep });
             }
@@ -82,7 +82,7 @@ function LocativasSubStepRenderer(_a) {
                 height: 23,
                 width: 23,
                 marginTop: 2,
-            } }, void 0), calcInvalidDeps: calcInvaidDependencies, getOptions: getLocativasOptions, calcDepError: calcDepError, getOptionSelected: function (option, value) {
+            } }, void 0), calcInvalidDeps: calcInvalidDependencies, getOptions: getLocativasOptions, calcDepError: calcDepError, getOptionSelected: function (option, value) {
             return option.id === value.id;
         }, iconComponent: LeakIconComponent }, { children: _jsx(LocativasSubStepRenderer, {}, void 0) }), void 0));
 }
@@ -94,43 +94,44 @@ function LeakIconComponent(props) {
             marginTop: 2,
         } }, void 0));
 }
-var getLocativasOptions = function (step, dependencyStore) { return __awaiter(void 0, void 0, void 0, function () {
+var getLocativasOptions = function (idOrganization, step, dependencyStore) { return __awaiter(void 0, void 0, void 0, function () {
     var idProyecto, response, father_1, locativasList;
     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 = 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 === null || father_1 === void 0 ? void 0 : father_1.id) {
-                    return (locativa.Id.startsWith(father_1.id) &&
-                        locativa.Id !== father_1.id);
+        switch (_b.label) {
+            case 0:
+                if (!step.dependencies) return [3 /*break*/, 2];
+                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
                 }
-                else {
-                    return locativa.Id.length === 2;
+                return [4 /*yield*/, axios.get("https://integrations." + process.env.REACT_APP_DOMAIN + "/sinco/cbr/ConsultaLocativas?idOrganization=" + idOrganization)];
+            case 1:
+                response = (_b.sent()).data;
+                father_1 = dependencyStore[step.dependencies[1]];
+                if (father_1 !== undefined && father_1.id === undefined) {
+                    return [2 /*return*/, null];
                 }
-            });
-            return [2 /*return*/, locativasList.map(function (option) {
-                    return {
-                        label: option.Descripcion,
-                        id: option.Id,
-                    };
-                })];
-        }
-        else {
-            return [2 /*return*/, null];
+                locativasList = response.lstLocativas.TipoLocativas.filter(function (locativa) {
+                    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;
+                    }
+                });
+                return [2 /*return*/, locativasList.map(function (option) {
+                        return {
+                            label: option.Descripcion,
+                            id: option.Id,
+                        };
+                    })];
+            case 2: return [2 /*return*/, null];
         }
-        return [2 /*return*/];
     });
 }); };
-var calcInvaidDependencies = function (step, dependencyStore) {
+var calcInvalidDependencies = function (step, dependencyStore) {
     var _a;
     var deps = [];
     if (step.dependencies) {

package/dist/FormComponents/Step/CBRStepMapper.js

@@ -52,93 +52,116 @@ import TextInputStep from './TextInputStep/TextInputStep';
 import SmartSelectStep from './SmartSelectStep/SmartSelectStep';
 import TextAreaStep from './TextAreaStep/TextAreaStep';
 import CBRIncidentsStep from './@Construction/CBRIncidentsStep/CBRIncidentsStep';
-import TipoDocData from './CBRStepValuesTemp/CBR_TIPO_DOC.json';
-import ProyectoData from './CBRStepValuesTemp/CBR_PROYECTO.json';
-import TipoSolicitanteData from './CBRStepValuesTemp/CBR_TIPO_SOLICITANTE.json';
-import TipoEspacioData from './CBRStepValuesTemp/CBR_TIPO_ESPACIO.json';
-import InmuebleData from './CBRStepValuesTemp/CBR_INMUEBLE.json';
 import CBRLocativasStep from './@Construction/CBRLocativasStep/CBRLocativasStep';
+import axios from 'axios';
+var baseUrl = "https://integrations." + process.env.REACT_APP_DOMAIN + "/sinco/cbr/";
 function CBRStepMapper(props) {
     var _this = this;
-    var getTipoDocOptions = function () { return __awaiter(_this, void 0, void 0, function () {
+    var getTipoDocOptions = function (idOrganization) { return __awaiter(_this, void 0, void 0, function () {
         var response;
         return __generator(this, function (_a) {
-            response = TipoDocData;
-            return [2 /*return*/, response.map(function (option) {
-                    return { label: option.Descripcion, id: option.Id };
-                })];
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, axios.get(baseUrl + 'ConsultaTiposDoc?idOrganization=' + idOrganization)];
+                case 1:
+                    response = (_a.sent()).data;
+                    return [2 /*return*/, response.map(function (option) {
+                            return { label: option.Descripcion, id: option.Id };
+                        })];
+            }
         });
     }); };
-    var getProyectoOptions = function () { return __awaiter(_this, void 0, void 0, function () {
+    var getProyectoOptions = function (idOrganization) { return __awaiter(_this, void 0, void 0, function () {
         var response;
         return __generator(this, function (_a) {
-            response = ProyectoData;
-            return [2 /*return*/, response.map(function (option) {
-                    return {
-                        label: option.NombreProyecto,
-                        id: option.IdProyecto,
-                        idMacroProyecto: option.IdMacroproyecto,
-                    };
-                })];
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, axios.get(baseUrl + 'Consultaproyectos?idOrganization=' + idOrganization)];
+                case 1:
+                    response = (_a.sent()).data;
+                    return [2 /*return*/, response.map(function (option) {
+                            return {
+                                label: option.NombreProyecto,
+                                id: option.IdProyecto,
+                                idMacroProyecto: option.IdMacroproyecto,
+                            };
+                        })];
+            }
         });
     }); };
-    var getTipoSolicitanteOptions = function () { return __awaiter(_this, void 0, void 0, function () {
+    var getTipoSolicitanteOptions = function (idOrganization) { return __awaiter(_this, void 0, void 0, function () {
         var response;
         return __generator(this, function (_a) {
-            response = TipoSolicitanteData;
-            return [2 /*return*/, response.map(function (option) {
-                    return {
-                        label: option.Descripcion,
-                        id: option.Id,
-                    };
-                })];
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, axios.get(baseUrl +
+                        'ConsultaTipoSolicitante?idOrganization=' +
+                        idOrganization)];
+                case 1:
+                    response = (_a.sent()).data;
+                    return [2 /*return*/, response.map(function (option) {
+                            return {
+                                label: option.Descripcion,
+                                id: option.Id,
+                            };
+                        })];
+            }
         });
     }); };
-    var getTipoEspaciosOptions = function (step, dependencyStore) { return __awaiter(_this, void 0, void 0, function () {
+    var getTipoEspaciosOptions = function (idOrganization, step, dependencyStore) { return __awaiter(_this, void 0, void 0, function () {
         var idProyecto, response;
         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 = TipoEspacioData;
-                return [2 /*return*/, response[String(idProyecto)].map(function (option) {
-                        return {
-                            label: option.Descripcion,
-                            id: option.Id,
-                        };
-                    })];
-            }
-            else {
-                return [2 /*return*/, null];
+            switch (_b.label) {
+                case 0:
+                    if (!step.dependencies) return [3 /*break*/, 2];
+                    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
+                    }
+                    return [4 /*yield*/, axios.get(baseUrl +
+                            'ConsultaTipoEspacios?idProyecto=' +
+                            idProyecto +
+                            '&idOrganization=' +
+                            idOrganization)];
+                case 1:
+                    response = (_b.sent()).data;
+                    return [2 /*return*/, response.map(function (option) {
+                            return {
+                                label: option.Descripcion,
+                                id: option.Id,
+                            };
+                        })];
+                case 2: return [2 /*return*/, null];
             }
-            return [2 /*return*/];
         });
     }); };
-    var getInmueblesOptions = function (step, dependencyStore) { return __awaiter(_this, void 0, void 0, function () {
+    var getInmueblesOptions = function (idOrganization, step, dependencyStore) { return __awaiter(_this, void 0, void 0, function () {
         var idProyecto, idMacroProyecto, response;
         var _a, _b;
         return __generator(this, function (_c) {
-            if (step.dependencies) {
-                idProyecto = (_a = dependencyStore[step.dependencies[0]]) === null || _a === void 0 ? void 0 : _a.id;
-                idMacroProyecto = (_b = dependencyStore[step.dependencies[0]]) === null || _b === void 0 ? void 0 : _b.idMacroProyecto;
-                if (!idProyecto) {
-                    return [2 /*return*/, null]; //null para indicar que falta la depedency
-                }
-                response = InmuebleData;
-                return [2 /*return*/, response[String(idMacroProyecto)][String(idProyecto)].map(function (option) {
-                        return {
-                            label: option.Descripcion,
-                            id: option.Id,
-                        };
-                    })];
-            }
-            else {
-                return [2 /*return*/, null];
+            switch (_c.label) {
+                case 0:
+                    if (!step.dependencies) return [3 /*break*/, 2];
+                    idProyecto = (_a = dependencyStore[step.dependencies[0]]) === null || _a === void 0 ? void 0 : _a.id;
+                    idMacroProyecto = (_b = dependencyStore[step.dependencies[0]]) === null || _b === void 0 ? void 0 : _b.idMacroProyecto;
+                    if (!idProyecto) {
+                        return [2 /*return*/, null]; //null para indicar que falta la depedency
+                    }
+                    return [4 /*yield*/, axios.get(baseUrl +
+                            'ConsultaInmuebles?idMacro=' +
+                            idMacroProyecto +
+                            '&idProyecto=' +
+                            idProyecto +
+                            '&idOrganization=' +
+                            idOrganization)];
+                case 1:
+                    response = (_c.sent()).data;
+                    return [2 /*return*/, response.map(function (option) {
+                            return {
+                                label: option.Descripcion,
+                                id: option.Id,
+                            };
+                        })];
+                case 2: return [2 /*return*/, null];
             }
-            return [2 /*return*/];
         });
     }); };
     switch (props.step.type) {

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

@@ -66,7 +66,7 @@ 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, editable = _a.editable, 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 icon = _a.icon, step = _a.step, form = _a.form, value = _a.value, onBlur = _a.onBlur, errors = _a.errors, trigger = _a.trigger, 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, 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++) {
@@ -76,7 +76,7 @@ function SmartSelect(_a) {
             }
         }
         return missingDeps;
-    } : _e, getOptionSelected = _a.getOptionSelected, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["icon", "step", "form", "value", "onBlur", "errors", "trigger", "children", "editable", "onChange", "inputRef", "postview", "formStyle", "getOptions", "widthStats", "calcDepError", "iconComponent", "valueOverwrite", "dependencyStore", "calcInvalidDeps", "getOptionSelected", "setDependencyStore"]);
+    } : _e, getOptionSelected = _a.getOptionSelected, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["icon", "step", "form", "value", "onBlur", "errors", "trigger", "children", "editable", "onChange", "inputRef", "postview", "formStyle", "getOptions", "widthStats", "organization", "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];
@@ -85,7 +85,7 @@ function SmartSelect(_a) {
         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 0: return [4 /*yield*/, (getOptions === null || getOptions === void 0 ? void 0 : getOptions(organization.idOrganization, step, dependencyStore))];
                 case 1:
                     resp = _b.sent();
                     if (resp !== null) {
@@ -112,7 +112,7 @@ function SmartSelect(_a) {
     useEffect(function () {
         if (first) {
             setFirst(false);
-            var invalids = calcInvalidDeps(step, dependencyStore);
+            var invalids = calcInvalidDeps(step, dependencyStore).filter(function (idDep) { return others.originalValues[idDep]; });
             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);
         }
@@ -146,7 +146,7 @@ function SmartSelect(_a) {
                     if (options === null) {
                         handleMissingDep();
                     }
-                } }, { children: _jsx(RoundedSmartSelect, { value: value, onBlur: onBlur, disabled: options === null, loading: options === undefined, options: options !== null && options !== void 0 ? options : [], "data-testid": step.id, inputRef: inputRef, cantEdit: !editable || postview, fullWidth: true, backgroundColor: "transparent", innerBackgroundColor: (_d = formStyle.stepBackgroundColor) !== null && _d !== void 0 ? _d : 'white', label: step.label, required: step.required, height: '31px', searchable: step.searchable, icon: step.showIcon ? icon : undefined, iconComponent: step.showIcon ? iconComponent : undefined, helperTextColor: formStyle.descriptionTextColor, focusColor: formStyle.primaryColor, outlineColor: formStyle.outlineColor, errorColor: formStyle.errorColor, color: formStyle.textColor, containerMargin: "0px", handleUpdate: function (value) {
+                }, "data-testid": step.id }, { children: _jsx(RoundedSmartSelect, { value: value, onBlur: onBlur, disabled: options === null, loading: options === undefined, options: options !== null && options !== void 0 ? options : [], inputRef: inputRef, cantEdit: !editable || postview, fullWidth: true, backgroundColor: "transparent", innerBackgroundColor: (_d = formStyle.stepBackgroundColor) !== null && _d !== void 0 ? _d : 'white', label: step.label, required: step.required, height: '31px', searchable: step.searchable, icon: step.showIcon ? icon : undefined, iconComponent: step.showIcon ? iconComponent : 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, _a)));
@@ -160,7 +160,7 @@ function SmartSelect(_a) {
                         : 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, editable: editable, formStyle: formStyle, widthStats: widthStats, dependencyStore: dependencyStore, setDependencyStore: setDependencyStore }, others),
+                    stepProps: __assign({ step: step, form: form, errors: errors, trigger: trigger, postview: postview, editable: editable, formStyle: formStyle, widthStats: widthStats, organization: organization, dependencyStore: dependencyStore, setDependencyStore: setDependencyStore }, others),
                 })] }, void 0));
 }
 function SmartSelectStep(props) {

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

@@ -10,7 +10,7 @@ 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: (idOrganization: string, step: GSmartSelect, dependencyStore: Record<string, any>) => Promise<any[] | null>;
     /** Function to determine the currently selected option */
     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 */

package/package.json

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