@arquimedes.co/eureka-forms 2.0.99 → 2.0.101

package/dist/App/AppHooks.js

@@ -68,11 +68,13 @@ import { calcDependencies } from '../Form/FormFunctions';
 import { iterateNestedSteps } from '../FormSteps/StepFunctions';
 import { createNextState } from '@reduxjs/toolkit';
 import { BaseConfirmationMessage } from '../Contexts/FormContext';
+import FormStepTypes from '../constants/FormStepTypes';
+import { draftToString } from '../Utils/DraftFunctions';
 export var useSetupApp = function (isEmbedded, _a) {
+    var _b;
     var preview = _a.preview, internal = _a.internal, postview = _a.postview, partial = _a.partial, editable = _a.editable, handleConfirmed = _a.handleConfirmed, customSteps = _a.customSteps, valuesData = _a.valuesData, apiKey = _a.apiKey, formData = _a.formData, classifiers = _a.classifiers, others = __rest(_a, ["preview", "internal", "postview", "partial", "editable", "handleConfirmed", "customSteps", "valuesData", "apiKey", "formData", "classifiers"]);
-    var _b = useState(undefined), form = _b[0], setForm = _b[1];
-    var _c = useState(undefined), organization = _c[0], setOrganization = _c[1];
-    var _d = useState(), branding = _d[0], setBranding = _d[1];
+    var _c = useState(undefined), form = _c[0], setForm = _c[1];
+    var _d = useState(undefined), organization = _d[0], setOrganization = _d[1];
     var dispatch = useAppDispatch();
     var loadOrg = function (idOrganization) { return __awaiter(void 0, void 0, void 0, function () {
         var organization;
@@ -91,9 +93,6 @@ export var useSetupApp = function (isEmbedded, _a) {
                             //TODO cambiar el color del navbar en movil
                             // eslint-disable-next-line no-console
                         }
-                        if (!organization.customBrandings) {
-                            setBranding(organization.branding);
-                        }
                     }
                     return [2 /*return*/, organization];
             }
@@ -106,8 +105,6 @@ export var useSetupApp = function (isEmbedded, _a) {
                 case 0: return [4 /*yield*/, fetchForm(apiKey, idOrganization)];
                 case 1:
                     form = _a.sent();
-                    if (form && form.branding)
-                        setBranding(form.branding);
                     return [2 /*return*/, form];
             }
         });
@@ -161,7 +158,22 @@ export var useSetupApp = function (isEmbedded, _a) {
                                 for (var _b = 0, _c = section.steps; _b < _c.length; _b++) {
                                     var idStep = _c[_b];
                                     iterateNestedSteps(idStep, form.steps, function (step) {
+                                        var _a, _b, _c;
                                         step.idSection = section.id;
+                                        if (step.type === FormStepTypes.TITLE) {
+                                            if ((_a = step.title) === null || _a === void 0 ? void 0 : _a.blocks) {
+                                                if ((_b = step.title) === null || _b === void 0 ? void 0 : _b.blocks)
+                                                    step.title = draftToString({
+                                                        form: form,
+                                                        dependencies: {},
+                                                    }, step.title);
+                                                if ((_c = step.description) === null || _c === void 0 ? void 0 : _c.blocks)
+                                                    step.description = draftToString({
+                                                        form: form,
+                                                        dependencies: {},
+                                                    }, step.description);
+                                            }
+                                        }
                                     });
                                 }
                             };
@@ -210,7 +222,14 @@ export var useSetupApp = function (isEmbedded, _a) {
             handleConfirmed();
         }
     }, [form]);
-    return { form: form, organization: organization, branding: branding, reload: reload };
+    return {
+        form: form,
+        organization: organization,
+        branding: (organization === null || organization === void 0 ? void 0 : organization.customBrandings)
+            ? (_b = form === null || form === void 0 ? void 0 : form.branding) !== null && _b !== void 0 ? _b : organization.branding
+            : organization === null || organization === void 0 ? void 0 : organization.branding,
+        reload: reload,
+    };
 };
 export var useLogRocket = function (organization, form, _a) {
     var apiKey = _a.apiKey, internal = _a.internal, postview = _a.postview, preview = _a.preview;

package/dist/Form/ConfirmationDialog/ConfirmationDialog.js

@@ -66,7 +66,7 @@ function ConfirmationDialog(_a) {
         if (global.confirmation.showLink) {
             return (_jsxs(_Fragment, { children: [_jsx("div", __assign({ className: widthStats.isMobile
                             ? styles.mobileLinkContainer
-                            : styles.linkContainer }, { children: "Puedes consultar el estado aqui:" })), _jsx("a", __assign({ className: styles.url, "data-testid": "ResUrl", target: "_blank", href: confirmation.url, style: {
+                            : styles.linkContainer }, { children: "Puedes consultar el estado aqu\u00ED:" })), _jsx("a", __assign({ className: styles.url, "data-testid": "ResUrl", target: "_blank", href: confirmation.url, style: {
                             color: '#293241',
                             fontSize: widthStats.isMobile ? '1rem' : '1.2rem',
                         } }, { children: confirmation.url }))] }));

package/dist/Form/FormFunctions.js

@@ -228,7 +228,6 @@ function calcStepDependency(idStep, steps, values, customSteps) {
     };
 }
 function calcStepDependencyValue(depStep, originalValue, customSteps) {
-    var _a;
     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, originalValue);
@@ -246,10 +245,10 @@ function calcStepDependencyValue(depStep, originalValue, customSteps) {
         }
         case FormStepTypes.MAPPER: {
             //TODO: Esto aun no se usa
-            return ((_a = {
+            return {
                 elements: originalValue === null || originalValue === void 0 ? void 0 : originalValue.map(function (mapperValue) { var _a; return (_a = mapperValue.value) !== null && _a !== void 0 ? _a : mapperValue; }),
                 page: 0,
-            }) !== null && _a !== void 0 ? _a : null);
+            };
         }
         default:
             return originalValue !== null && originalValue !== void 0 ? originalValue : null;

package/dist/FormSteps/EntityValueStep/MaterialEntityValuePickerStep/MaterialEntityValuePickerStep.js

@@ -96,7 +96,7 @@ function EntityValuePickerStep(_a) {
                 : undefined;
         });
     }, []);
-    return (_jsxs(React.Fragment, { children: [dialogs !== undefined && ((_b = form.entities) === null || _b === void 0 ? void 0 : _b[step.idEntity]) && (_jsx(MaterialEntityValueDialog, { type: dialogs.current.type, entity: (_c = form.entities) === null || _c === void 0 ? void 0 : _c[step.idEntity], entityValue: dialogs.value, message: dialogs.current.message, handleClose: handleCloseDialog })), _jsx(StepFillerContainer, __assign({ step: step }, { children: _jsx(SmartSelect, { editable: editable, step: step, icon: step.icon ? _jsx(InputIcon, { icon: step.icon }) : undefined, getOptions: getEntityValueOptions, getOptionSelected: function (option, value) {
+    return (_jsxs(React.Fragment, { children: [dialogs !== undefined && ((_b = form.entities) === null || _b === void 0 ? void 0 : _b[step.idEntity]) && (_jsx(MaterialEntityValueDialog, { type: dialogs.current.type, entity: (_c = form.entities) === null || _c === void 0 ? void 0 : _c[step.idEntity], entityValue: dialogs.value, message: dialogs.current.message, handleClose: handleCloseDialog })), _jsx(StepFillerContainer, __assign({ step: step }, { children: _jsx(SmartSelect, { editable: editable, step: step, icon: step.icon ? _jsx(InputIcon, { icon: step.icon }) : undefined, getOptions: getEntityValueOptions, getOptionalDependencies: getOptionalDependencies, getOptionSelected: function (option, value) {
                         return option._id === value._id;
                     }, calcDepError: function (steps) {
                         for (var _i = 0, steps_1 = steps; _i < steps_1.length; _i++) {
@@ -235,3 +235,22 @@ var getEntityValueOptions = function (idOrganization, step, dependencyStore) { r
         }
     });
 }); };
+var getOptionalDependencies = function (step) {
+    var _a;
+    var optional = [];
+    for (var _i = 0, _b = step.filters; _i < _b.length; _i++) {
+        var filter = _b[_i];
+        switch (filter.type) {
+            case EntityValueDataTypes.STEP: {
+                if (filter.idStep &&
+                    !filter.required &&
+                    !((_a = step.dependencies) === null || _a === void 0 ? void 0 : _a.includes(filter.idStep)))
+                    optional.push(filter.idStep);
+                break;
+            }
+            default:
+                break;
+        }
+    }
+    return optional;
+};

package/dist/FormSteps/SmartSelectStep/MaterialSmartSelectStep/MaterialSmartSelectStep.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 import { SmartSelectStepProps } from '../SmartSelectStep';
 import { GSmartSelect } from '../../../@Types/GenericFormSteps';
-declare function SmartSelectStep<StepType extends GSmartSelect>({ icon, step, editable, getOptions, calcDepError, defaultValue, filterOptions, valueOverwrite, getValueString, changeListener, getValueWarning, getOptionSelected, getOptionsConditionsIdSteps, renderNestedSteps, }: SmartSelectStepProps<StepType>): JSX.Element;
+declare function SmartSelectStep<StepType extends GSmartSelect>({ icon, step, editable, getOptions, calcDepError, defaultValue, filterOptions, valueOverwrite, getValueString, changeListener, getValueWarning, getOptionSelected, getOptionalDependencies, getOptionsConditionsIdSteps, renderNestedSteps, }: SmartSelectStepProps<StepType>): JSX.Element;
 export default SmartSelectStep;

package/dist/FormSteps/SmartSelectStep/MaterialSmartSelectStep/MaterialSmartSelectStep.js

@@ -45,6 +45,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+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 { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useFormContext } from 'react-hook-form';
 import RoundedSmartSelect from '../../../Shared/RoundedSmartSelect/RoundedSmartSelect';
@@ -57,8 +66,8 @@ import { selectDependencies, selectStepDependencies, useFormStep, } from '../../
 import MaterialInputContainer from '../../Utils/MaterialInputContainer/MaterialInputContainer';
 function SmartSelectStep(_a) {
     var _this = this;
-    var _b, _c, _d, _e, _f, _g, _h;
-    var icon = _a.icon, step = _a.step, editable = _a.editable, getOptions = _a.getOptions, calcDepError = _a.calcDepError, defaultValue = _a.defaultValue, filterOptions = _a.filterOptions, valueOverwrite = _a.valueOverwrite, getValueString = _a.getValueString, changeListener = _a.changeListener, getValueWarning = _a.getValueWarning, getOptionSelected = _a.getOptionSelected, _j = _a.getOptionsConditionsIdSteps, getOptionsConditionsIdSteps = _j === void 0 ? function () { return []; } : _j, renderNestedSteps = _a.renderNestedSteps;
+    var _b, _c, _d, _e, _f, _g;
+    var icon = _a.icon, step = _a.step, editable = _a.editable, getOptions = _a.getOptions, calcDepError = _a.calcDepError, defaultValue = _a.defaultValue, filterOptions = _a.filterOptions, valueOverwrite = _a.valueOverwrite, getValueString = _a.getValueString, changeListener = _a.changeListener, getValueWarning = _a.getValueWarning, getOptionSelected = _a.getOptionSelected, _h = _a.getOptionalDependencies, getOptionalDependencies = _h === void 0 ? function () { return []; } : _h, _j = _a.getOptionsConditionsIdSteps, getOptionsConditionsIdSteps = _j === void 0 ? function () { return []; } : _j, renderNestedSteps = _a.renderNestedSteps;
     var _k = useFormStep(step, {
         sizeChange: true,
         defaultValue: defaultValue !== null && defaultValue !== void 0 ? defaultValue : null,
@@ -76,9 +85,10 @@ function SmartSelectStep(_a) {
     var _p = useState(true), firstTime = _p[0], setFirstTime = _p[1];
     var _q = useState(false), touched = _q[0], setTouched = _q[1];
     var dispatch = useAppDispatch();
+    var allDeps = useMemo(function () { var _a; return __spreadArray(__spreadArray([], ((_a = step.dependencies) !== null && _a !== void 0 ? _a : []), true), getOptionalDependencies(step), true); }, []);
     var idDependencies = useMemo(function () { return getOptionsConditionsIdSteps(step); }, []);
     var dependencies = useAppSelector(function (state) {
-        return selectDependencies(state, step.dependencies);
+        return selectDependencies(state, allDeps);
     });
     var deps = useAppSelector(function (state) {
         return selectDependencies(state, idDependencies);
@@ -99,7 +109,7 @@ function SmartSelectStep(_a) {
         else if (value && !step.searchable) {
             setOptions([value]);
         }
-    }, (_c = (_b = step.dependencies) === null || _b === void 0 ? void 0 : _b.map(function (dep) { var _a; return (_a = dependencies[dep]) === null || _a === void 0 ? void 0 : _a.value; })) !== null && _c !== void 0 ? _c : []);
+    }, (_b = allDeps.map(function (dep) { var _a; return (_a = dependencies[dep]) === null || _a === void 0 ? void 0 : _a.value; })) !== null && _b !== void 0 ? _b : []);
     var calcOptions = function (firstTime) { return __awaiter(_this, void 0, void 0, function () {
         var resp, newValue, empty, error_1;
         return __generator(this, function (_a) {
@@ -202,6 +212,6 @@ function SmartSelectStep(_a) {
         }
         return undefined;
     }, [invalids, touched, value, filteredOptions]);
-    return (_jsxs(React.Fragment, { children: [_jsx(MaterialInputContainer, __assign({ step: step, onClick: onFocus, editable: editable }, { children: _jsx(RoundedSmartSelect, __assign({}, field, { inputRef: ref, value: value, handleUpdate: onChange, onFocus: onFocus, disabled: filteredOptions === null || disabled, hidden: disabled, loading: loading, options: filteredOptions !== null && filteredOptions !== void 0 ? filteredOptions : undefined, cantEdit: !editable || postview, fullWidth: true, backgroundColor: (_d = formStyle.stepBackgroundColor) !== null && _d !== void 0 ? _d : 'white', label: step.label, required: step.required, height: '31px', changeListener: changeListener, searchable: step.searchable, icon: step.showIcon ? icon : undefined, helperTextColor: formStyle.descriptionTextColor, focusColor: formStyle.primaryColor, outlineColor: formStyle.outlineColor, errorColor: formStyle.errorColor, color: formStyle.textColor, containerMargin: "0px", getOptionSelected: getOptionSelected, getValueString: getValueString, helperText: (_h = (_g = (_e = errorMsg !== null && errorMsg !== void 0 ? errorMsg : warning) !== null && _e !== void 0 ? _e : (_f = error === null || error === void 0 ? void 0 : error.message) === null || _f === void 0 ? void 0 : _f.toString()) !== null && _g !== void 0 ? _g : step.description) !== null && _h !== void 0 ? _h : undefined, error: !!errorMsg || !!warning || !!error })) })), renderNestedSteps === null || renderNestedSteps === void 0 ? void 0 : renderNestedSteps(value)] }));
+    return (_jsxs(React.Fragment, { children: [_jsx(MaterialInputContainer, __assign({ step: step, onClick: onFocus, editable: editable }, { children: _jsx(RoundedSmartSelect, __assign({}, field, { inputRef: ref, value: value, handleUpdate: onChange, onFocus: onFocus, disabled: filteredOptions === null || disabled, hidden: disabled, loading: loading, options: filteredOptions !== null && filteredOptions !== void 0 ? filteredOptions : undefined, cantEdit: !editable || postview, fullWidth: true, backgroundColor: (_c = formStyle.stepBackgroundColor) !== null && _c !== void 0 ? _c : 'white', label: step.label, required: step.required, height: '31px', changeListener: changeListener, searchable: step.searchable, icon: step.showIcon ? icon : undefined, helperTextColor: formStyle.descriptionTextColor, focusColor: formStyle.primaryColor, outlineColor: formStyle.outlineColor, errorColor: formStyle.errorColor, color: formStyle.textColor, containerMargin: "0px", getOptionSelected: getOptionSelected, getValueString: getValueString, helperText: (_g = (_f = (_d = errorMsg !== null && errorMsg !== void 0 ? errorMsg : warning) !== null && _d !== void 0 ? _d : (_e = error === null || error === void 0 ? void 0 : error.message) === null || _e === void 0 ? void 0 : _e.toString()) !== null && _f !== void 0 ? _f : step.description) !== null && _g !== void 0 ? _g : undefined, error: !!errorMsg || !!warning || !!error })) })), renderNestedSteps === null || renderNestedSteps === void 0 ? void 0 : renderNestedSteps(value)] }));
 }
 export default SmartSelectStep;

package/dist/FormSteps/SmartSelectStep/SmartSelectStep.d.ts

@@ -18,6 +18,8 @@ export interface SmartSelectStepProps<StepType extends GSmartSelect = GSmartSele
     getValueString: (value: any | undefined) => string;
     /** Function to if currently selected option has warning */
     getValueWarning?: (value: any | undefined) => string | null;
+    /** Function called to get the idSteps of the optional dependencies */
+    getOptionalDependencies?: (step: StepType) => string[];
     /** Function called to get the idSteps of the step's conditions for better refreshing */
     getOptionsConditionsIdSteps?: (step: StepType) => string[];
     /** Function that returns the error message based on the steps 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": "2.0.99",
+    "version": "2.0.101",
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",