@arquimedes.co/eureka-forms 1.7.1 → 1.7.3-test

package/dist/App.js

@@ -66,6 +66,7 @@ import StepTypes from './constants/FormStepTypes';
 import axiosInstance from './AxiosAPI';
 import widgetInstance from './AxiosWidget';
 import InternalFormStyle from './constants/InternalFormStyle';
+import { calcCbrForm } from './utils/CbrFunctions';
 function App(_a) {
     var _this = this;
     var _b, _c, _d, _e;
@@ -73,7 +74,24 @@ function App(_a) {
     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];
-    function fetchPreview(formData) {
+    var migrateFormData = function (formData, valuesData) {
+        var form = migrateForm(formData);
+        var steps = Object.values(form.steps);
+        var hasCBR = steps.find(function (step) {
+            return step.type.startsWith('CBR');
+        });
+        if (hasCBR !== undefined) {
+            var CBRForm = calcCbrForm(form, valuesData !== null && valuesData !== void 0 ? valuesData : {});
+            setForm(CBRForm);
+        }
+        else {
+            setForm(form);
+        }
+        if (valuesData !== undefined) {
+            setOriginalValues(valuesData);
+        }
+    };
+    function fetchPreview(formData, valuesData) {
         return __awaiter(this, void 0, void 0, function () {
             var response;
             return __generator(this, function (_a) {
@@ -83,7 +101,7 @@ function App(_a) {
                         response = _a.sent();
                         if (response.data) {
                             setOrganizationInfo(response.data);
-                            setForm(migrateFormData(formData));
+                            migrateFormData(formData, valuesData);
                         }
                         return [2 /*return*/];
                 }
@@ -93,15 +111,12 @@ function App(_a) {
     useEffect(function () {
         if (formData !== undefined) {
             if (preview && formData.isStandAlone) {
-                fetchPreview(formData);
+                fetchPreview(formData, valuesData);
             }
             else {
-                setForm(migrateFormData(__assign({}, formData)));
+                migrateFormData(__assign({}, formData), valuesData);
                 setOrganizationInfo(null);
             }
-            if (valuesData !== undefined) {
-                setOriginalValues(valuesData);
-            }
         }
         else if (!isWidget && apiKey) {
             //Is iframe
@@ -212,10 +227,7 @@ function App(_a) {
                 case 1:
                     response = _a.sent();
                     if (response) {
-                        setForm(migrateFormData(response.data));
-                        if (valuesData !== undefined) {
-                            setOriginalValues(valuesData);
-                        }
+                        migrateFormData(response.data, valuesData);
                     }
                     return [3 /*break*/, 3];
                 case 2:
@@ -273,7 +285,7 @@ export var SizesToNum = (_a = {},
     _a[SIZES.MEDIUM] = 2,
     _a[SIZES.SMALL] = 1,
     _a);
-var migrateFormData = function (form) {
+var migrateForm = function (form) {
     var steps = __assign({}, form.steps);
     for (var _i = 0, _a = Object.keys(form.steps); _i < _a.length; _i++) {
         var idStep = _a[_i];

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

@@ -31,7 +31,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable no-console */
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { Controller } from 'react-hook-form';
 import CBRFormStepTypes from '../../../../../constants/CBRFormStepTypes';
 import IncidentComponent from './Incident/Incident';
@@ -42,6 +42,11 @@ function Incidents(_a) {
     var step = _a.step, form = _a.form, btnRef = _a.btnRef, editable = _a.editable, postview = _a.postview, onChange = _a.onChange, incidents = _a.incidents, formStyle = _a.formStyle, dependencyStore = _a.dependencyStore, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["step", "form", "btnRef", "editable", "postview", "onChange", "incidents", "formStyle", "dependencyStore", "setDependencyStore"]);
     /** Form to pass down with aditional steps */
     var _b = useState(__assign(__assign({}, form), { steps: __assign({}, form.steps) })), localForm = _b[0], setLocalForm = _b[1];
+    useEffect(function () {
+        if (incidents.length === 0 && !postview && editable) {
+            handleAddIncident();
+        }
+    }, []);
     var handleAddIncident = function () {
         var _a, _b;
         var current = incidents.filter(function (incident) { return !incident.deleted; });

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

@@ -80,6 +80,7 @@ function SmartSelect(_a) {
     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;
         var _a;
@@ -105,6 +106,7 @@ function SmartSelect(_a) {
                         }
                     }
                     setOptions(resp);
+                    setLoading(false);
                     return [2 /*return*/];
             }
         });
@@ -132,6 +134,9 @@ function SmartSelect(_a) {
                     if (invalids.length > 0) {
                         trigger(invalids, { shouldFocus: true });
                     }
+                    else {
+                        setLoading(true);
+                    }
                 }
             }
             return [2 /*return*/];
@@ -147,7 +152,7 @@ function SmartSelect(_a) {
                     if (options === null) {
                         handleMissingDep();
                     }
-                }, "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) {
+                }, "data-testid": step.id }, { children: _jsx(RoundedSmartSelect, { value: value, onBlur: onBlur, disabled: options === null, loading: loading, 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)));

package/dist/shared/RoundedSmartSelect/RoundedSmartSelect.js

@@ -26,6 +26,7 @@ import { makeStyles } from '@material-ui/core/styles';
 import TextField from '@material-ui/core/TextField';
 import { MenuItem, Popper } from '@material-ui/core';
 import RoundedSelect from '../RoundedSelect/RoundedSelect';
+import CircularProgress from '@material-ui/core/CircularProgress';
 var filter = createFilterOptions();
 var useTextfieldStyles = function (props) {
     return makeStyles(function () { return ({
@@ -83,7 +84,7 @@ var useTextfieldStyles = function (props) {
                     marginTop: -10,
                 },
                 '& .EF-MuiAutocomplete-input::placeholder': {
-                    color: 'var(--greyFont)',
+                    color: '#787878',
                     opacity: 1,
                 },
             },
@@ -139,9 +140,7 @@ export default function RoundedSmartSelect(_a) {
     };
     var textFieldClasses = useTextfieldStyles(props)();
     if (searchable) {
-        return (_jsx(Autocomplete, { size: "small", fullWidth: true, openOnFocus: true, disabled: cantEdit || disabled, popupIcon: showIcon && icon ? icon : undefined, onOpen: function () {
-                //Show loading icon if loading
-            }, loading: loading, loadingText: 'Cargando...', closeIcon: false, options: options, getOptionLabel: function (option) {
+        return (_jsx(Autocomplete, { size: "small", fullWidth: true, openOnFocus: true, disabled: cantEdit || disabled, popupIcon: loading ? (_jsx(CircularProgress, { size: 22, style: { color: '#757575' } }, void 0)) : showIcon && icon ? (icon) : undefined, onOpen: function () { }, loading: loading, loadingText: 'Cargando...', closeIcon: false, options: options, getOptionLabel: function (option) {
                 var _a, _b;
                 // Value selected with enter, right from the input
                 if (typeof option === 'string') {

package/dist/utils/CbrFunctions.d.ts

@@ -0,0 +1,8 @@
+import { Form } from '../@Types';
+export interface Incident {
+    idSpaceStep: string;
+    idElementStep: string;
+    idCommentStep: string;
+    num: number;
+}
+export declare const calcCbrForm: (form: Form, formValues: Record<string, any>) => Form;

package/dist/utils/CbrFunctions.js

@@ -0,0 +1,53 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import CBRFormStepTypes from '../constants/CBRFormStepTypes';
+export var calcCbrForm = function (form, formValues) {
+    var _a;
+    for (var _i = 0, _b = Object.values(form.steps); _i < _b.length; _i++) {
+        var step = _b[_i];
+        if (step.type === CBRFormStepTypes.CBR_INCIDENCIAS) {
+            var incidentStep = step;
+            var incValue = formValues[(_a = incidentStep.id) !== null && _a !== void 0 ? _a : ''];
+            if (incValue) {
+                for (var _c = 0, incValue_1 = incValue; _c < incValue_1.length; _c++) {
+                    var incident = incValue_1[_c];
+                    handleAddIncident(incident, incidentStep, form.steps, formValues);
+                }
+            }
+        }
+    }
+    return form;
+};
+var handleAddIncident = function (incident, step, steps, formValues) {
+    var _a, _b;
+    var spaceStep = __assign(__assign({}, step.spaceStep), { id: incident.idSpaceStep, type: CBRFormStepTypes.CBR_TIPO_ESPACIO, dependencies: step.dependencies });
+    steps[incident.idSpaceStep] = spaceStep;
+    var commentStep = __assign(__assign({}, step.commentStep), { id: incident.idCommentStep, type: CBRFormStepTypes.CBR_COMENTARIO });
+    steps[incident.idCommentStep] = commentStep;
+    addRecursiveElementStep(incident.idElementStep, step.elementStep, null, steps, (_b = (_a = step.dependencies) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : '', formValues);
+};
+var addRecursiveElementStep = function (idStep, step, idParent, steps, idProjectDep, formValues) {
+    var _a, _b, _c;
+    var idSubStep = (_a = formValues[idStep]) === null || _a === void 0 ? void 0 : _a.subStep;
+    var newSubStep = step.subStep ? __assign({}, step.subStep) : undefined;
+    var newStep = __assign(__assign({}, step), { id: idStep, type: CBRFormStepTypes.CBR_LOCATIVAS, parentStep: idParent, dependencies: [idProjectDep], subStep: null });
+    if (newSubStep) {
+        newStep.subStep = idSubStep;
+    }
+    if (idParent) {
+        (_c = (_b = newStep.dependencies) === null || _b === void 0 ? void 0 : _b.push) === null || _c === void 0 ? void 0 : _c.call(_b, idParent);
+    }
+    steps[idStep] = newStep;
+    if (newSubStep) {
+        addRecursiveElementStep(idSubStep, newSubStep, idStep, steps, idProjectDep, formValues);
+    }
+};

package/package.json

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