@arquimedes.co/eureka-forms 1.9.128-test → 1.9.129

package/dist/App.js

@@ -377,6 +377,7 @@ export var addInitialMapper = function (newValues, step) {
         ids: {},
         id: idElement,
         originalValues: {},
+        isOriginal: false,
     };
     var newSteps = {};
     for (var _i = 0, _a = Object.keys(step.steps); _i < _a.length; _i++) {
@@ -407,6 +408,7 @@ export var mapOriginalValue = function (step, value, newValues, form) {
                     id: idElement,
                     ids: {},
                     originalValues: {},
+                    isOriginal: true,
                 };
                 if (element.value) {
                     mappedElement.value = element.value;

package/dist/Form/FormFunctions.d.ts

@@ -3,4 +3,4 @@ import { CustomStep } from '../App';
 import { DependencyStore, StepDependency } from './Form';
 export declare const calcValue: (idStep: string, steps: Record<string, FormStep>, values: Record<string, any>, customSteps: Record<string, CustomStep>, deleteIds: string[], value?: any) => any;
 export declare function calcDependencies(steps: Record<string, FormStep>, originalValues: Record<string, any>, customSteps?: Record<string, CustomStep>, allSteps?: Record<string, FormStep>, dependencies?: DependencyStore): DependencyStore;
-export declare function calcStepDependencyValue(depStep: FormStep, originalValues: Record<string, any>, customSteps?: Record<string, CustomStep>): StepDependency['value'];
+export declare function calcStepDependency(idStep: string, steps: Record<string, FormStep>, originalValues: Record<string, any>, customSteps: Record<string, CustomStep>): StepDependency;

package/dist/Form/FormFunctions.js

@@ -113,43 +113,33 @@ function stringToDraft(text) {
     return draftStructure;
 }
 export function calcDependencies(steps, originalValues, customSteps, allSteps, dependencies) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     if (customSteps === void 0) { customSteps = {}; }
     if (allSteps === void 0) { allSteps = steps; }
     if (dependencies === void 0) { dependencies = {}; }
-    for (var _i = 0, _e = Object.values(steps); _i < _e.length; _i++) {
-        var step = _e[_i];
+    for (var _i = 0, _d = Object.values(steps); _i < _d.length; _i++) {
+        var step = _d[_i];
         if (step.dependencies) {
-            for (var _f = 0, _g = step.dependencies; _f < _g.length; _f++) {
-                var idDep = _g[_f];
-                var depStep = allSteps[idDep];
-                if (depStep && dependencies[idDep] === undefined) {
-                    dependencies[idDep] = {
-                        type: depStep.type,
-                        value: calcStepDependencyValue(depStep, originalValues, customSteps),
-                    };
-                }
-                else if (dependencies[idDep] === undefined) {
-                    dependencies[idDep] = {
-                        type: (_a = depStep === null || depStep === void 0 ? void 0 : depStep.type) !== null && _a !== void 0 ? _a : 'ORIGINAL',
-                        value: originalValues[idDep],
-                    };
-                }
+            for (var _e = 0, _f = step.dependencies; _e < _f.length; _e++) {
+                var idDep = _f[_e];
+                if (dependencies[idDep] !== undefined)
+                    continue;
+                dependencies[idDep] = calcStepDependency(idDep, allSteps, originalValues, customSteps);
             }
         }
         if (step.type === StepTypes.MAPPER) {
             var newSteps = {};
-            var elements = (_b = originalValues[step.id]) !== null && _b !== void 0 ? _b : [];
+            var elements = (_a = originalValues[step.id]) !== null && _a !== void 0 ? _a : [];
             var _loop_1 = function (element) {
-                for (var _o = 0, _p = Object.keys(step.steps); _o < _p.length; _o++) {
-                    var idSubStep = _p[_o];
+                for (var _m = 0, _o = Object.keys(step.steps); _m < _o.length; _m++) {
+                    var idSubStep = _o[_m];
                     var subStep = step.steps[idSubStep];
                     var mappedId = element.ids[idSubStep];
-                    newSteps[mappedId] = __assign(__assign({}, subStep), { id: mappedId, dependencies: (_c = subStep.dependencies) === null || _c === void 0 ? void 0 : _c.map(function (dep) { var _a; return (_a = element.ids[dep]) !== null && _a !== void 0 ? _a : dep; }) });
+                    newSteps[mappedId] = __assign(__assign({}, subStep), { id: mappedId, dependencies: (_b = subStep.dependencies) === null || _b === void 0 ? void 0 : _b.map(function (dep) { var _a; return (_a = element.ids[dep]) !== null && _a !== void 0 ? _a : dep; }) });
                 }
             };
-            for (var _h = 0, elements_2 = elements; _h < elements_2.length; _h++) {
-                var element = elements_2[_h];
+            for (var _g = 0, elements_2 = elements; _g < elements_2.length; _g++) {
+                var element = elements_2[_g];
                 _loop_1(element);
             }
             if (elements.length === 0) {
@@ -159,26 +149,35 @@ export function calcDependencies(steps, originalValues, customSteps, allSteps, d
         }
     }
     /** After all steps have been checked check missing entityvalue dependencies */
-    for (var _j = 0, _k = Object.values(steps); _j < _k.length; _j++) {
-        var step = _k[_j];
+    for (var _h = 0, _j = Object.values(steps); _h < _j.length; _h++) {
+        var step = _j[_h];
         if (step.type === StepTypes.ENTITYVALUEPICKER) {
-            for (var _l = 0, _m = __spreadArray(__spreadArray([], step.path, true), step.filters, true); _l < _m.length; _l++) {
-                var path = _m[_l];
+            for (var _k = 0, _l = __spreadArray(__spreadArray([], step.path, true), step.filters, true); _k < _l.length; _k++) {
+                var path = _l[_k];
                 if (path.type !== EntityValueDataTypes.STEP)
                     continue;
-                if ((_d = step.dependencies) === null || _d === void 0 ? void 0 : _d.includes(path.idStep))
+                if ((_c = step.dependencies) === null || _c === void 0 ? void 0 : _c.includes(path.idStep))
                     continue;
                 if (dependencies[path.idStep] === undefined) {
-                    dependencies[path.idStep] = originalValues[path.idStep];
+                    dependencies[path.idStep] = calcStepDependency(path.idStep, allSteps, originalValues, customSteps);
                 }
             }
         }
     }
     return dependencies;
 }
-export function calcStepDependencyValue(depStep, originalValues, customSteps) {
+export function calcStepDependency(idStep, steps, originalValues, customSteps) {
+    var _a, _b;
+    var depStep = steps[idStep];
+    return {
+        type: (_a = depStep === null || depStep === void 0 ? void 0 : depStep.type) !== null && _a !== void 0 ? _a : 'ORIGINAL',
+        value: depStep
+            ? calcStepDependencyValue(depStep, originalValues, customSteps)
+            : (_b = originalValues[idStep]) !== null && _b !== void 0 ? _b : null,
+    };
+}
+function calcStepDependencyValue(depStep, originalValues, customSteps) {
     var _a, _b, _c, _d;
-    if (customSteps === void 0) { customSteps = {}; }
     var custom = customSteps[depStep === null || depStep === void 0 ? void 0 : depStep.type];
     if (custom === null || custom === void 0 ? void 0 : custom.calcDependencyValue) {
         return custom.calcDependencyValue(depStep, originalValues[depStep.id]);

package/dist/Form/Terms/Terms.js

@@ -18,7 +18,6 @@ function Terms(_a) {
     var setValue = formController.setValue, control = formController.control, formState = formController.formState;
     var _b = useState(false), tempError = _b[0], setTempError = _b[1];
     useEffect(function () {
-        console.log(formState.isValidating);
         setTempError(true);
         setTimeout(function () {
             setTempError(false);

package/dist/FormSteps/MapperStep/MaterialMapperStep/Element/PillMapperElement/PillMapperElement.js

@@ -13,7 +13,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import styles from './PillMapperElement.module.css';
 import DeleteRoundedIcon from '@material-ui/icons/DeleteRounded';
 function PillMapperElement(_a) {
+    var _b;
     var step = _a.step, form = _a.form, num = _a.num, loading = _a.loading, element = _a.element, children = _a.children, editable = _a.editable, postview = _a.postview, formStyle = _a.formStyle, handleDelete = _a.handleDelete, widthStats = _a.widthStats, customElementModifiers = _a.customElementModifiers, customElementRender = _a.customElementRender;
+    var deletable = (_b = step.deletable) !== null && _b !== void 0 ? _b : true;
     var size = form.size;
     var calcName = (customElementModifiers !== null && customElementModifiers !== void 0 ? customElementModifiers : {}).calcName;
     var name = calcName
@@ -28,7 +30,7 @@ function PillMapperElement(_a) {
                 : styles.container }, { children: _jsxs("div", __assign({ className: styles.contentContainer, style: {
                     width: (size.blockSize + size.spacingSize) *
                         ((_b = (_a = step.style) === null || _a === void 0 ? void 0 : _a.size) !== null && _b !== void 0 ? _b : size.blockNum - 1),
-                } }, { children: [name && (_jsx("div", __assign({ className: styles.titleLbl, style: { color: formStyle.textColor } }, { children: loading ? 'Cargando...' : name + ':' }))), _jsxs("div", __assign({ className: styles.btnsContainer }, { children: [renderElementButtons === null || renderElementButtons === void 0 ? void 0 : renderElementButtons(element), step.deletable !== false && (_jsx("div", __assign({ className: !editable || postview
+                } }, { children: [name && (_jsx("div", __assign({ className: styles.titleLbl, style: { color: formStyle.textColor } }, { children: loading ? 'Cargando...' : name + ':' }))), _jsxs("div", __assign({ className: styles.btnsContainer }, { children: [renderElementButtons === null || renderElementButtons === void 0 ? void 0 : renderElementButtons(element), (deletable || !element.isOriginal) && (_jsx("div", __assign({ className: !editable || postview
                                     ? styles.disabledDeleteBtn
                                     : styles.deleteBtn, style: { color: formStyle.textColor }, onClick: function () {
                                     if (editable && !postview) {

package/dist/FormSteps/MapperStep/MaterialMapperStep/MaterialMapperStep.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="react" />
 import { MapperStepProps } from '../MapperStep';
 export interface MapperElement<Type> {
-    ids: Record<string, string>;
     id: string;
+    ids: Record<string, string>;
     deleted?: boolean;
     value?: Type;
     originalValues: Record<string, any>;
+    isOriginal: boolean;
 }
 export declare function ElementsComponent<Type = any>({ step, form, errors, inputRef, editable, postview, elements, formStyle, customAdd, loading, dependencyStore, setDependencyStore, ...others }: MapperStepProps<Type> & {
     loading?: boolean;

package/dist/FormSteps/MapperStep/MaterialMapperStep/MaterialMapperStep.js

@@ -41,7 +41,7 @@ import MapperElementComponent from './Element/MapperElement';
 import AYFFormStepTypes from '../../../constants/AYFFormStepTypes';
 import CBRFormStepTypes from '../../../constants/CBRFormStepTypes';
 import { addInitialMapper } from '../../../App';
-import { calcStepDependencyValue } from '../../../Form/FormFunctions';
+import { calcStepDependency } from '../../../Form/FormFunctions';
 export function ElementsComponent(_a) {
     var _b, _c;
     var step = _a.step, form = _a.form, errors = _a.errors, inputRef = _a.inputRef, editable = _a.editable, postview = _a.postview, elements = _a.elements, formStyle = _a.formStyle, customAdd = _a.customAdd, _d = _a.loading, loading = _d === void 0 ? false : _d, dependencyStore = _a.dependencyStore, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["step", "form", "errors", "inputRef", "editable", "postview", "elements", "formStyle", "customAdd", "loading", "dependencyStore", "setDependencyStore"]);
@@ -99,6 +99,7 @@ export function ElementsComponent(_a) {
             ids: {},
             id: idElement,
             originalValues: {},
+            isOriginal: false,
         };
         if (value)
             newElement.value = value;
@@ -188,10 +189,7 @@ function calcRecursiveData(element, newSteps, deps, customSteps, originalValues)
                 var newId = element.ids[idDep];
                 if (newId) {
                     step.dependencies[i] = newId;
-                    deps[newId] = {
-                        type: newSteps[newId].type,
-                        value: calcStepDependencyValue(newSteps[newId], originalValues),
-                    };
+                    deps[newId] = calcStepDependency(newId, newSteps, originalValues, customSteps);
                 }
             }
         }
@@ -269,10 +267,7 @@ function calcRecursiveData(element, newSteps, deps, customSteps, originalValues)
                             var newId = element.ids[path.idStep];
                             if (newId) {
                                 path.idStep = newId;
-                                deps[newId] = {
-                                    type: newSteps[newId].type,
-                                    value: calcStepDependencyValue(newSteps[newId], originalValues),
-                                };
+                                deps[newId] = calcStepDependency(newId, newSteps, originalValues, customSteps);
                             }
                             break;
                         default:
@@ -286,10 +281,7 @@ function calcRecursiveData(element, newSteps, deps, customSteps, originalValues)
                             var newId = element.ids[filter.idStep];
                             if (newId) {
                                 filter.idStep = newId;
-                                deps[newId] = {
-                                    type: newSteps[newId].type,
-                                    value: calcStepDependencyValue(newSteps[newId], originalValues),
-                                };
+                                deps[newId] = calcStepDependency(newId, newSteps, originalValues, customSteps);
                             }
                             break;
                         default:

package/dist/Widget.js

@@ -55,7 +55,5 @@ if (element) {
     if (partial) {
         props.partial = true;
     }
-    // eslint-disable-next-line no-console
-    console.log(props);
 }
 ReactDOM.render(_jsx(App, __assign({ isWidget: true }, props)), document.getElementById(WIDGET_ID));

package/dist/index.js

@@ -19,8 +19,6 @@ var dataValues = undefined;
 if (values) {
     try {
         dataValues = JSON.parse(decodeURIComponent(values));
-        // eslint-disable-next-line no-console
-        console.log('DATA:', dataValues);
     }
     catch (error) {
         console.error('Invalid data-values JSON', error);

package/package.json

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