@arquimedes.co/eureka-forms 2.0.62-test → 2.0.64-test

package/dist/App/App.d.ts

@@ -36,7 +36,7 @@ export interface AppProps {
     /** Custom submit function, when passed it is called */
     submit?: (submit: () => Promise<Record<string, any> | void>) => Promise<void>;
     /** Custom submit buttons */
-    customSubmitBtns?: (onSubmit: () => Promise<Record<string, any> | void>, loading: boolean) => JSX.Element;
+    customSubmitBtns?: null | ((onSubmit: () => Promise<Record<string, any> | void>, loading: boolean) => JSX.Element);
     /** Function to call on postview to fetch the download url of a file */
     fetchDownloadUrl?: (S3Key: string, fileName: string) => Promise<string>;
     /** Function to call after the confimation dialog has been closed */

package/dist/App/AppFunctions.d.ts

@@ -3,7 +3,6 @@ import { FormStep, Mapper } from '../@Types/FormStep';
 import { SiteState, ValuesStore } from '../States/SiteSlice';
 import { CustomStep } from '../FormSteps/CustomStep';
 import { MapperElement } from '../@Types/MapperElement';
-import { Condition } from '../@Types/Condition';
 import { MapperValue } from '../FormSteps/MapperStep/MaterialMapperStep/MaterialMapperStep';
 export declare const calcValuesStore: (idOrganization: string, form: Readonly<Form>, originalValues?: Record<string, any>, postview?: boolean, customSteps?: Record<string, CustomStep>) => Promise<ValuesStore>;
 export declare const addMapperStep: <Type>(step: Mapper, customSteps: Record<string, CustomStep>, path?: string) => {
@@ -13,7 +12,5 @@ export declare const addMapperStep: <Type>(step: Mapper, customSteps: Record<str
     /** Record of all the new steps created */
     steps: Record<string, FormStep>;
 };
-export declare function calcRecursiveData<Type>(element: Readonly<MapperElement<Type>>, newSteps: Record<string, FormStep>, customSteps: Record<string, CustomStep>): void;
-export declare const calcRecursiveCondition: (condition: Condition, ids: Record<string, string>) => void;
 export declare const mapOriginalValue: (idOrganization: string, step: FormStep, value: any, values: ValuesStore, form?: Readonly<Form>, path?: string) => Promise<any>;
 export declare const calcInitialSections: (form: Form) => Pick<SiteState, 'previousSections' | 'idCurrentSection' | 'nextSections'>;

package/dist/App/AppFunctions.js

@@ -57,9 +57,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 import { nanoid } from 'nanoid';
 import FormStepTypes, { EntityValueOptionTypes, FormTypes, } from '../constants/FormStepTypes';
 import { getRawText, stringToDraft } from '../Utils/DraftFunctions';
-import { calcSubSteps } from '../FormSteps/StepFunctions';
 import ConditionTypes from '../constants/ConditionTypes';
 import widgetInstance from '../Utils/AxiosWidget';
+import { calcRecursiveData } from '../Utils/FormStepFunctions';
 export var calcValuesStore = function (idOrganization, form, originalValues, postview, customSteps) {
     if (originalValues === void 0) { originalValues = {}; }
     if (postview === void 0) { postview = false; }
@@ -162,50 +162,6 @@ export var addMapperStep = function (step, customSteps, path) {
     }
     return { element: element, mappers: mappers, steps: steps };
 };
-export function calcRecursiveData(element, newSteps, customSteps) {
-    if (!newSteps)
-        return;
-    for (var _i = 0, _a = Object.entries(newSteps); _i < _a.length; _i++) {
-        var _b = _a[_i], idStep = _b[0], step = _b[1];
-        step.id = idStep;
-        if (step.dependencies) {
-            for (var i = 0; i < step.dependencies.length; i++) {
-                var idDep = step.dependencies[i];
-                var newId = element.ids[idDep];
-                if (newId) {
-                    step.dependencies[i] = newId;
-                }
-            }
-        }
-        var custom = customSteps[step === null || step === void 0 ? void 0 : step.type];
-        if (custom === null || custom === void 0 ? void 0 : custom.calcRecursiveData) {
-            custom.calcRecursiveData(step, element.ids);
-        }
-        if (step.condition) {
-            calcRecursiveCondition(step.condition, element.ids);
-        }
-        calcSubSteps(step.id, newSteps, function (idStep) { var _a; return (_a = element.ids[idStep]) !== null && _a !== void 0 ? _a : idStep; });
-    }
-}
-export var calcRecursiveCondition = function (condition, ids) {
-    switch (condition.type) {
-        case ConditionTypes.EXPRESSION:
-            for (var _i = 0, _a = condition.conditions; _i < _a.length; _i++) {
-                var subCondition = _a[_i];
-                calcRecursiveCondition(subCondition, ids);
-            }
-            break;
-        case ConditionTypes.FORM_STEP: {
-            var newId = ids[condition.idStep];
-            if (newId) {
-                condition.idStep = newId;
-            }
-            break;
-        }
-        default:
-            break;
-    }
-};
 export var mapOriginalValue = function (idOrganization, step, value, values, form, path) {
     if (path === void 0) { path = ''; }
     return __awaiter(void 0, void 0, void 0, function () {

package/dist/Form/FormFunctions.js

@@ -20,8 +20,8 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { convertFromRaw, convertToRaw } from 'draft-js';
 import FormStepTypes, { EntityValueDataTypes, } from '../constants/FormStepTypes';
-import { calcRecursiveData } from '../App/AppFunctions';
 import { calcStepDeps } from '../FormSteps/StepHooks';
+import { calcRecursiveData } from '../Utils/FormStepFunctions';
 /**
  * Function that cals the value of a step to output on submit
  */

package/dist/Form/FormTypes/ColumnForm/ColumnForm.js

@@ -120,6 +120,6 @@ function ColumnForm(_a) {
             }
         });
     }); }, []);
-    return (_jsxs("div", __assign({ className: styles.container, style: { color: formStyle.textColor } }, { children: [loading && _jsx("div", { className: styles.curtain }), previous.map(function (idSection) { return (_jsx(Section, { idSection: idSection }, idSection)); }), next.map(function (idSection) { return (_jsx(Section, { idSection: idSection }, idSection)); }), _jsx(Terms, {}), !postview && editable && (_jsxs(React.Fragment, { children: [!customSubmitBtns && (_jsx("div", __assign({ className: styles.submitBtnContainer }, { children: _jsx(CustomBtn, { onClick: submit, width: "calc(100% - 70px)", label: sendLabel !== null && sendLabel !== void 0 ? sendLabel : 'Enviar', backgroundColor: formStyle.primaryColor, color: formStyle.primaryContrastColor, loading: loading, "data-testid": "form__submit" }) }))), customSubmitBtns === null || customSubmitBtns === void 0 ? void 0 : customSubmitBtns(submit, loading)] }))] })));
+    return (_jsxs("div", __assign({ className: styles.container, style: { color: formStyle.textColor } }, { children: [loading && _jsx("div", { className: styles.curtain }), previous.map(function (idSection) { return (_jsx(Section, { idSection: idSection }, idSection)); }), next.map(function (idSection) { return (_jsx(Section, { idSection: idSection }, idSection)); }), _jsx(Terms, {}), !postview && editable && (_jsxs(React.Fragment, { children: [customSubmitBtns === undefined && (_jsx("div", __assign({ className: styles.submitBtnContainer }, { children: _jsx(CustomBtn, { onClick: submit, width: "calc(100% - 70px)", label: sendLabel !== null && sendLabel !== void 0 ? sendLabel : 'Enviar', backgroundColor: formStyle.primaryColor, color: formStyle.primaryContrastColor, loading: loading, "data-testid": "form__submit" }) }))), customSubmitBtns === null || customSubmitBtns === void 0 ? void 0 : customSubmitBtns(submit, loading)] }))] })));
 }
 export default ColumnForm;

package/dist/FormSteps/@Construction/CBRElementStep/CBRElementStep.js

@@ -106,7 +106,7 @@ var getElementOptions = function (idOrganization, step, dependencyStore) { retur
             case 1:
                 response = (_d.sent()).data;
                 father_1 = (_c = dependencyStore[step.dependencies[1]]) === null || _c === void 0 ? void 0 : _c.value;
-                if (father_1 !== undefined && father_1.id === undefined) {
+                if (father_1 && father_1.id === undefined) {
                     return [2 /*return*/, null];
                 }
                 return [2 /*return*/, response.filter(function (locativa) {

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

@@ -90,7 +90,7 @@ function MapperComponent(_a) {
                     margin: step.description
                         ? '10px 0px'
                         : '0px 0px 5px 0px',
-                } }, { children: step.description }))), mapElements(), _jsx("input", { id: step.id, ref: inputRef, className: 'hidden-input', readOnly: true, value: inputValue }), step.creatable !== false &&
+                } }, { children: step.description }))), mapElements(), _jsx("input", { id: step.id + '-input', ref: inputRef, className: 'hidden-input', readOnly: true, value: inputValue }), step.creatable !== false &&
                 (!step.max ||
                     elements.filter(function (elem) { return !elem.deleted; }).length < step.max) && (_jsxs("div", __assign({ className: styles.btnContainer }, { children: [!customAdd && (_jsx(RoundedButton, { disabled: !editable || postview, text: step.addBtnLabel +
                             (step.required ? ' *' : ''), color: formStyle.primaryContrastColor, backgroundColor: formStyle.primaryColor, fontSize: '1rem', padding: '5px 15px 5px 15px', onClick: function () {

package/dist/Utils/FormStepFunctions.d.ts

@@ -0,0 +1,15 @@
+import { AYFFormStep } from '../@Types/AYFFormStep';
+import { CBRFormStep } from '../@Types/CBRFormStep';
+import { Condition } from '../@Types/Condition';
+import { FormStep } from '../@Types/FormStep';
+import { MapperElement } from '../@Types/MapperElement';
+import { CustomStep } from '../FormSteps/CustomStep';
+export declare function calcRecursiveData<Type>(element: Readonly<MapperElement<Type>>, newSteps: Record<string, FormStep>, customSteps: Record<string, CustomStep>): void;
+export declare const calcRecursiveCondition: (condition: Condition, ids: Record<string, string>) => void;
+/**
+ * Utility function to calc the substeps of a step
+ * @param step step to calc the substeps
+ * @param idModifier optional modifier for the ids of the substeps and all other properties
+ * @returns list of the ids of the substeps of the step, if modifier returns modified steps
+ */
+export declare const calcSubSteps: (idStep: string, allSteps: Record<string, FormStep | CBRFormStep | AYFFormStep>, idModifier?: ((idSubStep: string) => string) | undefined) => string[];

package/dist/Utils/FormStepFunctions.js

@@ -0,0 +1,166 @@
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+import AYFFormStepTypes from '../constants/AYFFormStepTypes';
+import CBRFormStepTypes from '../constants/CBRFormStepTypes';
+import ConditionTypes from '../constants/ConditionTypes';
+import FormStepTypes, { ClassifierOptionTypes, EntityValueDataTypes, EntityValueOptionTypes, OptionTypes, } from '../constants/FormStepTypes';
+export function calcRecursiveData(element, newSteps, customSteps) {
+    if (!newSteps)
+        return;
+    for (var _i = 0, _a = Object.entries(newSteps); _i < _a.length; _i++) {
+        var _b = _a[_i], idStep = _b[0], step = _b[1];
+        step.id = idStep;
+        if (step.dependencies) {
+            for (var i = 0; i < step.dependencies.length; i++) {
+                var idDep = step.dependencies[i];
+                var newId = element.ids[idDep];
+                if (newId) {
+                    step.dependencies[i] = newId;
+                }
+            }
+        }
+        var custom = customSteps[step === null || step === void 0 ? void 0 : step.type];
+        if (custom === null || custom === void 0 ? void 0 : custom.calcRecursiveData) {
+            custom.calcRecursiveData(step, element.ids);
+        }
+        if (step.condition) {
+            calcRecursiveCondition(step.condition, element.ids);
+        }
+        // calcSubSteps(
+        //     step.id,
+        //     newSteps,
+        //     (idStep: string): string => element.ids[idStep] ?? idStep
+        // );
+    }
+}
+export var calcRecursiveCondition = function (condition, ids) {
+    switch (condition.type) {
+        case ConditionTypes.EXPRESSION:
+            for (var _i = 0, _a = condition.conditions; _i < _a.length; _i++) {
+                var subCondition = _a[_i];
+                calcRecursiveCondition(subCondition, ids);
+            }
+            break;
+        case ConditionTypes.FORM_STEP: {
+            var newId = ids[condition.idStep];
+            if (newId) {
+                condition.idStep = newId;
+            }
+            break;
+        }
+        default:
+            break;
+    }
+};
+/**
+ * Utility function to calc the substeps of a step
+ * @param step step to calc the substeps
+ * @param idModifier optional modifier for the ids of the substeps and all other properties
+ * @returns list of the ids of the substeps of the step, if modifier returns modified steps
+ */
+export var calcSubSteps = function (idStep, allSteps, idModifier) {
+    var _a;
+    var step = allSteps[idStep];
+    var subSteps = [];
+    if (!step)
+        return [];
+    var handleSteps = function (steps) {
+        for (var i = 0; i < steps.length; i++) {
+            var idSubStep = steps[i];
+            if (idModifier)
+                steps[i] = idModifier(steps[i]);
+            subSteps.push.apply(subSteps, __spreadArray([idSubStep], calcSubSteps(idSubStep, allSteps, idModifier), false));
+        }
+    };
+    switch (step.type) {
+        case FormStepTypes.SELECTOR: {
+            for (var _i = 0, _b = step.options; _i < _b.length; _i++) {
+                var option = _b[_i];
+                if (option.type === OptionTypes.NESTED) {
+                    handleSteps(option.steps);
+                }
+            }
+            break;
+        }
+        case FormStepTypes.CLASSIFIER_SELECTOR:
+            for (var _c = 0, _d = Object.keys(step.options); _c < _d.length; _c++) {
+                var idOption = _d[_c];
+                var option = step.options[idOption];
+                if (option.type === ClassifierOptionTypes.NESTED) {
+                    handleSteps(option.steps);
+                }
+            }
+            break;
+        case FormStepTypes.RATING:
+            if (step.nestedSteps) {
+                for (var _e = 0, _f = step.nestedSteps; _e < _f.length; _e++) {
+                    var steps = _f[_e];
+                    handleSteps(steps);
+                }
+            }
+            break;
+        case FormStepTypes.COLLAPSIBLE: {
+            handleSteps(step.steps);
+            break;
+        }
+        case FormStepTypes.CHECKBOX: {
+            if (step.steps)
+                handleSteps(step.steps);
+            if (step.uncheckedSteps)
+                handleSteps(step.uncheckedSteps);
+            break;
+        }
+        case FormStepTypes.ENTITYVALUEPICKER:
+            if (idModifier) {
+                for (var _g = 0, _h = step.path; _g < _h.length; _g++) {
+                    var path = _h[_g];
+                    if (path.type === EntityValueDataTypes.STEP) {
+                        path.idStep = idModifier(path.idStep);
+                    }
+                }
+                for (var _j = 0, _k = step.filters; _j < _k.length; _j++) {
+                    var filter = _k[_j];
+                    if (filter.type === EntityValueDataTypes.STEP) {
+                        filter.idStep = idModifier(filter.idStep);
+                    }
+                }
+            }
+            for (var _l = 0, _m = Object.keys((_a = step.options) !== null && _a !== void 0 ? _a : {}); _l < _m.length; _l++) {
+                var idOption = _m[_l];
+                var option = step.options[idOption];
+                if (option.type === EntityValueOptionTypes.NESTED) {
+                    handleSteps(option.steps);
+                }
+            }
+            break;
+        case CBRFormStepTypes.CBR_LOCATIVAS:
+            {
+                var elementStep = step;
+                if (elementStep.subStep) {
+                    if (idModifier)
+                        elementStep.subStep = idModifier(elementStep.subStep);
+                    subSteps.push(elementStep.subStep);
+                }
+            }
+            break;
+        case AYFFormStepTypes.AYF_ICA_CITY: {
+            var cityStep = step;
+            if (cityStep.idNitStep) {
+                if (idModifier)
+                    cityStep.idNitStep = idModifier(cityStep.idNitStep);
+                subSteps.push(cityStep.idNitStep);
+            }
+            break;
+        }
+        default:
+            break;
+    }
+    return subSteps;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arquimedes.co/eureka-forms",
     "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
-    "version":"2.0.62-test",
+    "version":"2.0.64-test",
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",
@@ -81,7 +81,7 @@
         "@typescript-eslint/eslint-plugin": "^6.13.1",
         "@typescript-eslint/parser": "^6.13.1",
         "chromatic": "^10.0.0",
-        "cypress": "^13.7.1",
+        "cypress": "^13.8.1",
         "dotenv-webpack": "^8.0.1",
         "eslint": "^8.55.0",
         "eslint-config-prettier": "^9.1.0",