@arquimedes.co/eureka-forms 2.0.20-test → 2.0.22

package/dist/Form/FormFunctions.d.ts

@@ -5,5 +5,5 @@ import { CBRFormStep } from '../@Types/CBRFormStep';
 import { MapperElement } from '../@Types/MapperElement';
 import { ValuesStore } from '../States/SiteSlice';
 export declare const calcValue: (idStep: string, steps: Record<string, FormStep>, values: Record<string, any>, customSteps: Record<string, CustomStep> | undefined, deleteIds: string[], value?: any) => any;
-export declare function calcDependencies(steps: Record<string, FormStep | CBRFormStep>, customSteps?: Record<string, CustomStep>, allSteps?: Record<string, FormStep | CBRFormStep>, dependencies?: DependencyStore, values?: ValuesStore): DependencyStore;
+export declare function calcDependencies(steps: Record<string, FormStep | CBRFormStep>, customSteps?: Record<string, CustomStep>, allSteps?: Record<string, FormStep | CBRFormStep>, dependencies?: DependencyStore, values?: ValuesStore, addDependents?: boolean): DependencyStore;
 export declare const calcMapperSubSteps: (step: Mapper, elements: MapperElement<any>[] | undefined, customSteps: Record<string, CustomStep>) => Record<string, FormStep>;

package/dist/Form/FormFunctions.js

@@ -115,7 +115,7 @@ function stringToDraft(text) {
     });
     return draftStructure;
 }
-export function calcDependencies(steps, customSteps, allSteps, dependencies, values) {
+export function calcDependencies(steps, customSteps, allSteps, dependencies, values, addDependents) {
     var _a, _b;
     if (customSteps === void 0) { customSteps = {}; }
     if (allSteps === void 0) { allSteps = steps; }
@@ -124,34 +124,39 @@ export function calcDependencies(steps, customSteps, allSteps, dependencies, val
         global: {},
         sections: {},
     }; }
+    if (addDependents === void 0) { addDependents = true; }
     for (var _i = 0, _c = Object.values(steps); _i < _c.length; _i++) {
         var step = _c[_i];
         var originalValue = (_a = values.sections[step.idSection]) === null || _a === void 0 ? void 0 : _a[step.id];
         if (step.dependencies) {
             for (var _d = 0, _e = step.dependencies; _d < _e.length; _d++) {
                 var idDep = _e[_d];
-                if (dependencies[idDep] === undefined)
+                if (dependencies[idDep] === undefined &&
+                    (addDependents || allSteps[idDep]))
                     dependencies[idDep] = calcStepDependency(idDep, allSteps, values, customSteps);
-                dependencies[idDep].dependents.push(step);
+                if (addDependents)
+                    dependencies[idDep].dependents.push(step);
             }
         }
         if (step.type === StepTypes.ENTITYVALUEPICKER) {
             for (var _f = 0, _g = __spreadArray(__spreadArray([], step.path, true), step.filters, true); _f < _g.length; _f++) {
-                var path = _g[_f];
-                if (path.type !== EntityValueDataTypes.STEP)
+                var dep = _g[_f];
+                if (dep.type !== EntityValueDataTypes.STEP)
                     continue;
-                if ((_b = step.dependencies) === null || _b === void 0 ? void 0 : _b.includes(path.idStep))
+                if ((_b = step.dependencies) === null || _b === void 0 ? void 0 : _b.includes(dep.idStep))
                     continue;
-                if (dependencies[path.idStep] === undefined) {
-                    dependencies[path.idStep] = calcStepDependency(path.idStep, allSteps, values, customSteps);
+                if (dependencies[dep.idStep] === undefined &&
+                    (addDependents || allSteps[dep.idStep])) {
+                    dependencies[dep.idStep] = calcStepDependency(dep.idStep, allSteps, values, customSteps);
                 }
-                dependencies[path.idStep].dependents.push(step);
+                if (addDependents)
+                    dependencies[dep.idStep].dependents.push(step);
             }
         }
         if (step.type === StepTypes.MAPPER) {
             var subSteps = calcMapperSubSteps(step, originalValue, customSteps);
-            if (Object.keys(subSteps).length > 0)
-                calcDependencies(subSteps, customSteps, __assign(__assign({}, allSteps), subSteps), dependencies, values);
+            var hasSubSteps = Object.keys(subSteps).length > 0;
+            calcDependencies(hasSubSteps ? subSteps : step.steps, customSteps, __assign(__assign({}, allSteps), subSteps), dependencies, values, hasSubSteps);
         }
     }
     return dependencies;

package/dist/FormSteps/@Construction/CBRIncidentsStep/MaterialCBRIncidentsStep/MaterialCBRIncidentsStep.d.ts

@@ -7,5 +7,5 @@ export interface Incident {
     deleted?: boolean;
     num: number;
 }
-declare function CBRIncidentsStep(props: CBRIncidentsStepProps): JSX.Element;
+declare function CBRIncidentsStep({ step, editable, ...others }: CBRIncidentsStepProps): JSX.Element;
 export default CBRIncidentsStep;

package/dist/FormSteps/@Construction/CBRIncidentsStep/MaterialCBRIncidentsStep/MaterialCBRIncidentsStep.js

@@ -41,27 +41,36 @@ import FormContext from '../../../../Contexts/FormContext';
 import { addStepsDependencies } from '../../../../States/SiteSlice';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import CustomContext from '../../../../Contexts/CustomContext';
-import { Controller } from 'react-hook-form';
-function Incidents(_a) {
-    var step = _a.step, btnRef = _a.btnRef, editable = _a.editable, onChange = _a.onChange, incidents = _a.incidents, others = __rest(_a, ["step", "btnRef", "editable", "onChange", "incidents"]);
+import { useFormStep } from '../../../StepHooks';
+function CBRIncidentsStep(_a) {
+    var step = _a.step, editable = _a.editable, others = __rest(_a, ["step", "editable"]);
+    var _b = useFormStep(step, {
+        rules: {
+            validate: function (array) {
+                return !step.required ||
+                    (step.required &&
+                        array.filter(function (elem) { return !elem.deleted; }).length > 0);
+            },
+        },
+    }), ref = _b.ref, value = _b.value, onChange = _b.onChange, error = _b.error;
     var customSteps = useContext(CustomContext).customSteps;
-    var _b = useAppSelector(function (state) { return state.global; }), formStyle = _b.formStyle, postview = _b.postview;
+    var _c = useAppSelector(function (state) { return state.global; }), formStyle = _c.formStyle, postview = _c.postview;
     var dispatch = useAppDispatch();
     var form = useContext(FormContext);
     /** Form to pass down with aditional steps */
-    var _c = useState(__assign(__assign({}, form), { steps: __assign({}, form.steps) })), localForm = _c[0], setLocalForm = _c[1];
-    var _d = useState(false), firstRender = _d[0], setFirstRender = _d[1];
+    var _d = useState(__assign(__assign({}, form), { steps: __assign({}, form.steps) })), localForm = _d[0], setLocalForm = _d[1];
+    var _e = useState(false), firstRender = _e[0], setFirstRender = _e[1];
     useEffect(function () {
         setFirstRender(true);
     }, []);
     useEffect(function () {
-        if (firstRender && incidents.length === 0 && !postview && editable) {
+        if (firstRender && value.length === 0 && !postview && editable) {
             handleAddIncident();
         }
     }, [firstRender]);
     var handleAddIncident = function () {
         var _a, _b;
-        var current = incidents.filter(function (incident) { return !incident.deleted; });
+        var current = value.filter(function (incident) { return !incident.deleted; });
         var newIncident = {
             idSpaceStep: CBRFormStepTypes.CBR_TIPO_ESPACIO + '-' + nanoid(),
             idCommentStep: CBRFormStepTypes.CBR_COMENTARIO + '-' + nanoid(),
@@ -72,7 +81,7 @@ function Incidents(_a) {
         newSteps[newIncident.idSpaceStep] = __assign(__assign({}, step.spaceStep), { id: newIncident.idSpaceStep, type: CBRFormStepTypes.CBR_TIPO_ESPACIO, dependencies: step.dependencies });
         newSteps[newIncident.idCommentStep] = __assign(__assign({}, step.commentStep), { id: newIncident.idCommentStep, type: CBRFormStepTypes.CBR_COMENTARIO });
         addRecursiveElementStep(newIncident.idElementStep, step.elementStep, null, newSteps, (_b = (_a = step.dependencies) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : '');
-        onChange(__spreadArray(__spreadArray([], incidents, true), [newIncident], false));
+        onChange(__spreadArray(__spreadArray([], value, true), [newIncident], false));
         setLocalForm(__assign(__assign({}, localForm), { steps: newSteps }));
         dispatch(addStepsDependencies({
             steps: newSteps,
@@ -98,8 +107,8 @@ function Incidents(_a) {
                     margin: step.description
                         ? '10px 0px'
                         : '0px 0px 5px 0px',
-                } }, { children: step.description }))), _jsx(FormContext.Provider, __assign({ value: localForm }, { children: incidents.map(function (incident, index) { return (_jsx(IncidentComponent, __assign({ incident: incident, step: step, editable: editable, handleDelete: function () {
-                        var tempIncidents = __spreadArray([], incidents, true);
+                } }, { children: step.description }))), _jsx(FormContext.Provider, __assign({ value: localForm }, { children: value.map(function (incident, index) { return (_jsx(IncidentComponent, __assign({ incident: incident, step: step, editable: editable, handleDelete: function () {
+                        var tempIncidents = __spreadArray([], value, true);
                         tempIncidents[index].deleted = true;
                         var n = 1;
                         for (var _i = 0, tempIncidents_1 = tempIncidents; _i < tempIncidents_1.length; _i++) {
@@ -110,20 +119,10 @@ function Incidents(_a) {
                             }
                         }
                         onChange(tempIncidents);
-                    } }, others), index)); }) })), _jsxs("div", __assign({ className: styles.btnContainer }, { children: [_jsx("input", { ref: btnRef, className: 'hidden-input' }), _jsx(RoundedButton, { disabled: !editable || postview, text: step.addBtnLabel, color: formStyle.primaryContrastColor, backgroundColor: formStyle.primaryColor, fontSize: '1rem', padding: '5px 15px 5px 15px', onClick: function () {
+                    } }, others), index)); }) })), _jsxs("div", __assign({ className: styles.btnContainer }, { children: [_jsx("input", { ref: ref, className: 'hidden-input' }), _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 () {
                             if (editable && !postview) {
                                 handleAddIncident();
                             }
-                        } })] }))] })));
-}
-function CBRIncidentsStep(props) {
-    return (_jsx(Controller, { name: props.step.id, defaultValue: [], rules: {
-            required: props.step.required
-                ? 'Este campo es obligatorio'
-                : undefined,
-        }, shouldUnregister: true, render: function (_a) {
-            var _b = _a.field, ref = _b.ref, value = _b.value, field = __rest(_b, ["ref", "value"]);
-            return (_jsx(Incidents, __assign({}, props, field, { incidents: value, onChange: field.onChange, btnRef: ref })));
-        } }));
+                        } })] })), !!error && value.filter(function (elem) { return !elem.deleted; }).length === 0 && (_jsx("div", __assign({ className: styles.errorMsg, style: { color: formStyle.errorColor } }, { children: "Este campo es obligatorio" })))] })));
 }
 export default CBRIncidentsStep;

package/dist/FormSteps/@Construction/CBRIncidentsStep/MaterialCBRIncidentsStep/MaterialCBRIncidentsStep.module.css

@@ -26,3 +26,9 @@
     margin-bottom: 3px;
     width: fit-content;
 }
+
+.errorMsg {
+    font-size: 0.75rem;
+    margin-top: 5px;
+    margin-left: 15px;
+}

package/dist/FormSteps/StepFunctions.js

@@ -127,6 +127,7 @@ export var calcDefaultValue = function (step) {
             return null;
         case StepTypes.MAPPER:
         case StepTypes.FILEUPLOAD:
+        case CBRFormStepTypes.CBR_INCIDENCIAS:
             return [];
         case StepTypes.COLLAPSIBLE:
             return false;

package/dist/FormSteps/TextAreaStep/MaterialTextAreaStep/MaterialTextAreaEditorStep.js

@@ -126,9 +126,9 @@ function TextAreaStep(_a) {
                         if (canEdit) {
                             setFocus(true);
                         }
-                    } }, { children: _jsx(Editor, __assign({}, field, { editorRef: ref, onFocus: function () {
+                    }, "data-testid": step.id }, { children: _jsx(Editor, __assign({}, field, { editorRef: ref, onFocus: function () {
                             setFocus(true);
-                        }, readOnly: !canEdit, stripPastedStyles: true, onEditorStateChange: handleChange, toolbarClassName: !canEdit ? ' postview-editor-toolbar' : '', "data-testid": step.id, editorClassName: editorClassName, wrapperClassName: styles.wrapper, placeholder: (_b = step.description) !== null && _b !== void 0 ? _b : '', toolbar: {
+                        }, readOnly: !canEdit, stripPastedStyles: true, onEditorStateChange: handleChange, toolbarClassName: !canEdit ? ' postview-editor-toolbar' : '', editorClassName: editorClassName, wrapperClassName: styles.wrapper, placeholder: (_b = step.description) !== null && _b !== void 0 ? _b : '', toolbar: {
                             options: ['inline', 'list', 'history'],
                             inline: {
                                 options: [

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arquimedes.co/eureka-forms",
     "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
-    "version":"2.0.20-test",
+    "version": "2.0.22",
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",
@@ -9,7 +9,7 @@
         "test": "react-scripts test",
         "test-ci": "react-scripts test --reporters=default --reporters=jest-junit --coverage --coverageReporters cobertura html",
         "tsc-build": "tsc --noEmit false --outDir ./dist --incremental false",
-        "watch": "tsc -w --preserveWatchOutput",
+        "watch": "tsc -w --noEmit false --outDir ./dist --preserveWatchOutput",
         "storybook": "storybook dev -p 6006",
         "build-storybook": "storybook build",
         "cypress": "DISPLAY=:0 cypress open"