tuain-ng-forms-lib 12.0.11 → 12.0.15

package/README.md

@@ -80,7 +80,7 @@ This component allows to receive the following information
 | --- | ----------- |
 | actionObjec | Defines the action object of the form |
 | currentMode | Defines the current state of the form in order to define if the element can be visible or actionable |
-| formBusy | Defines in the form is makinh an exclusive process that prevents the action execution |
+| busy | Defines in the form is makinh an exclusive process that prevents the action execution |
 | relatedField | Describe the field object related with this action |
 | style | Define a style attribute for the action |
 | showLabel | Define if the action shows it's label

package/bundles/tuain-ng-forms-lib.umd.js

@@ -21,18 +21,30 @@
                 this.actionObject.notifyActivation();
             }
         };
-        Object.defineProperty(ActionComponent.prototype, "isVisible", {
+        ActionComponent.prototype.visibleOnRestriction = function () {
+            var _a, _b, _c, _d, _e;
+            if (!((_a = this.actionObject) === null || _a === void 0 ? void 0 : _a.restrictedOnField)) {
+                return true;
+            }
+            if ((((_b = this.actionObject) === null || _b === void 0 ? void 0 : _b.restrictedOnOperator) === '=='
+                && this.relatedField === ((_c = this.actionObject) === null || _c === void 0 ? void 0 : _c.restrictedOnValue))
+                || (((_d = this.actionObject) === null || _d === void 0 ? void 0 : _d.restrictedOnOperator) === '!='
+                    && this.relatedField !== ((_e = this.actionObject) === null || _e === void 0 ? void 0 : _e.restrictedOnValue))) {
+                return true;
+            }
+        };
+        Object.defineProperty(ActionComponent.prototype, "visible", {
             get: function () {
-                var _a, _b, _c, _d, _e;
-                if (!((_a = this.actionObject) === null || _a === void 0 ? void 0 : _a.restrictedOnField)) {
-                    return true;
-                }
-                if ((((_b = this.actionObject) === null || _b === void 0 ? void 0 : _b.restrictedOnOperator) === '=='
-                    && this.relatedField === ((_c = this.actionObject) === null || _c === void 0 ? void 0 : _c.restrictedOnValue))
-                    || (((_d = this.actionObject) === null || _d === void 0 ? void 0 : _d.restrictedOnOperator) === '!='
-                        && this.relatedField !== ((_e = this.actionObject) === null || _e === void 0 ? void 0 : _e.restrictedOnValue))) {
-                    return true;
-                }
+                var _a;
+                return ((_a = this.actionObject) === null || _a === void 0 ? void 0 : _a.visibleOn(this.currentState)) && this.visibleOnRestriction();
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(ActionComponent.prototype, "disabled", {
+            get: function () {
+                var _a;
+                return !((_a = this.actionObject) === null || _a === void 0 ? void 0 : _a.enabledOn(this.currentState));
             },
             enumerable: false,
             configurable: true
@@ -47,9 +59,9 @@
     ];
     ActionComponent.propDecorators = {
         actionObject: [{ type: core.Input }],
-        disabled: [{ type: core.Input }],
-        formBusy: [{ type: core.Input }],
+        busy: [{ type: core.Input }],
         relatedField: [{ type: core.Input }],
+        currentState: [{ type: core.Input }],
         style: [{ type: core.Input }],
         showLabel: [{ type: core.Input }]
     };
@@ -384,8 +396,14 @@
                 // Inicialización
                 var mapping = Object.entries(this.formConfig.componentFieldAttrMap);
                 for (var index = 0; index < mapping.length; index++) {
-                    var _c = __read(mapping[index], 2), fieldAttr = _c[0], compAttr = _c[1];
-                    this[compAttr.toString()] = (_b = this.fieldObject) === null || _b === void 0 ? void 0 : _b[fieldAttr.toString()];
+                    var _c = __read(mapping[index], 2), fieldAttr = _c[0], compAttr1 = _c[1];
+                    var compAttr = compAttr1.toString();
+                    if (compAttr === VALUE) {
+                        this.updateValue();
+                    }
+                    else {
+                        this[compAttr] = (_b = this.fieldObject) === null || _b === void 0 ? void 0 : _b[fieldAttr.toString()];
+                    }
                 }
                 // Subscripción a cambios en atributos
                 this.fieldObject.attributeChange.subscribe(function (event) {
@@ -394,7 +412,7 @@
                     if (compAttr === VALUE) {
                         _this.updateValue();
                     }
-                    else if (_this.hasOwnProperty(compAttr)) {
+                    else {
                         _this[compAttr] = value;
                     }
                 });
@@ -421,6 +439,22 @@
             var k = event.charCode;
             return (k > 47 && k < 58);
         };
+        Object.defineProperty(FieldComponent.prototype, "visible", {
+            get: function () {
+                var _a;
+                return (_a = this.fieldObject) === null || _a === void 0 ? void 0 : _a.visibleOn(this.currentState);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(FieldComponent.prototype, "disabled", {
+            get: function () {
+                var _a;
+                return !((_a = this.fieldObject) === null || _a === void 0 ? void 0 : _a.enabledOn(this.currentState));
+            },
+            enumerable: false,
+            configurable: true
+        });
         return FieldComponent;
     }());
     FieldComponent.decorators = [
@@ -431,7 +465,7 @@
     ];
     FieldComponent.propDecorators = {
         fieldObject: [{ type: core.Input }],
-        disabled: [{ type: core.Input }]
+        currentState: [{ type: core.Input }]
     };
 
     var ElementComponent = /** @class */ (function () {
@@ -445,18 +479,16 @@
         ElementComponent.prototype.start = function () { };
         Object.defineProperty(ElementComponent.prototype, "visible", {
             get: function () {
-                var _a, _b, _c, _d;
-                var visible = (_b = (_a = this.formElement) === null || _a === void 0 ? void 0 : _a.visible) !== null && _b !== void 0 ? _b : true;
-                return visible && ((_c = this.formElement) === null || _c === void 0 ? void 0 : _c.viewOnState((_d = this.formManager) === null || _d === void 0 ? void 0 : _d.currentState));
+                var _a, _b;
+                return (_a = this.formElement) === null || _a === void 0 ? void 0 : _a.visibleOn((_b = this.formManager) === null || _b === void 0 ? void 0 : _b.currentState);
             },
             enumerable: false,
             configurable: true
         });
         Object.defineProperty(ElementComponent.prototype, "disabled", {
             get: function () {
-                var _a, _b, _c, _d;
-                var disabled = (_b = (_a = this.formElement) === null || _a === void 0 ? void 0 : _a.disabled) !== null && _b !== void 0 ? _b : false;
-                return disabled || !((_c = this.formElement) === null || _c === void 0 ? void 0 : _c.enabledOnState((_d = this.formManager) === null || _d === void 0 ? void 0 : _d.currentState));
+                var _a, _b;
+                return !((_a = this.formElement) === null || _a === void 0 ? void 0 : _a.enabledOn((_b = this.formManager) === null || _b === void 0 ? void 0 : _b.currentState));
             },
             enumerable: false,
             configurable: true
@@ -638,6 +670,12 @@
             enumerable: false,
             configurable: true
         });
+        FormElement.prototype.visibleOn = function (state) {
+            return this.visible && this.viewOnState(state);
+        };
+        FormElement.prototype.enabledOn = function (state) {
+            return !this.disabled && this.enabledOnState(state);
+        };
         FormElement.prototype.setVisibility = function (visible, forced) {
             if (forced === void 0) { forced = null; }
             this._visible = visible && true;
@@ -2601,7 +2639,7 @@
             return (section) ? section.getSubsection(subsectionCode) : null;
         };
         Object.defineProperty(FormStructureAndData.prototype, "actions", {
-            get: function () { return this.getActions(); },
+            get: function () { return this._actionsObj; },
             enumerable: false,
             configurable: true
         });
@@ -2790,7 +2828,7 @@
             actionNames.forEach(function (actionCode) { return _this.disableAction(actionCode); });
         };
         Object.defineProperty(FormStructureAndData.prototype, "fields", {
-            get: function () { return this.getFields(); },
+            get: function () { return this._fieldsObj; },
             enumerable: false,
             configurable: true
         });
@@ -3255,7 +3293,7 @@
             this.extraData = {};
             this.definitionObtained = false;
             this.formVisible = false;
-            this.inServerProcess = false;
+            this.busy = false;
             this.formSectionsActivate = {};
             this.formSectionsInactivate = {};
             this.formActionsStart = {};
@@ -3274,6 +3312,11 @@
             this.cleanStart();
             this.customPreProcessing();
         }
+        Object.defineProperty(BasicFormComponent.prototype, "inServerProcess", {
+            get: function () { return this.busy; },
+            enumerable: false,
+            configurable: true
+        });
         BasicFormComponent.prototype.setConfig = function (formConfig) {
             this.formConfig = formConfig;
         };
@@ -3290,7 +3333,7 @@
             this.definitionObtained = false;
             // Se limpian los manejadores de eventos
             this.formVisible = false;
-            this.inServerProcess = false;
+            this.busy = false;
             this.formSectionsActivate = {};
             this.formSectionsInactivate = {};
             this.formActionsStart = {};
@@ -3305,6 +3348,11 @@
             this.tableGetDataStart = {};
             this.tableGetDataFinish = {};
         };
+        Object.defineProperty(BasicFormComponent.prototype, "form", {
+            get: function () { return this.formStructure; },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(BasicFormComponent.prototype, "currentState", {
             get: function () { return this.formStructure.state; },
             set: function (state) { this.formStructure.changeState(state); },
@@ -3592,11 +3640,11 @@
                                 return [2 /*return*/];
                             }
                             if (!!this.definitionObtained) return [3 /*break*/, 2];
-                            this.inServerProcess = true;
+                            this.busy = true;
                             return [4 /*yield*/, this.formManagerService.getFormDefinition(this.name)];
                         case 1:
                             formDefinition = _j.sent();
-                            this.inServerProcess = false;
+                            this.busy = false;
                             this.formStructure = new FormStructureAndData(formDefinition, this.formConfig);
                             this.fields = this.formStructure.fields;
                             this.actions = this.formStructure.actions;
@@ -3665,11 +3713,11 @@
                             this.errorCode = NO_ERROR;
                             this.errorMessage = '';
                             this.errorDetail = '';
-                            this.inServerProcess = true;
+                            this.busy = true;
                             return [4 /*yield*/, this.formManagerService.execServerAction(actionDetail)];
                         case 1:
                             formActionResponse = _j.sent();
-                            this.inServerProcess = false;
+                            this.busy = false;
                             if (formActionResponse && formActionResponse.error.errorType) {
                                 console.log('Excepción no soportada');
                             }
@@ -3689,7 +3737,7 @@
         BasicFormComponent.prototype.updateFormWithServerData = function (formContent) {
             var e_1, _j, e_2, _k, e_3, _l;
             var currentMode = formContent.currentMode, formSubject = formContent.formSubject, actions = formContent.actions, fields = formContent.fields, recordTables = formContent.recordTables, returnedFile = formContent.returnedFile, immutableData = formContent.immutableData, extraInfo = formContent.extraInfo;
-            this.changeState(currentMode !== null && currentMode !== void 0 ? currentMode : this.formStructure.state);
+            currentMode && this.changeState(currentMode);
             if (formSubject) {
                 this.formSubject = formSubject;
             }
@@ -3921,7 +3969,7 @@
                             return [4 /*yield*/, this.finishAction(action, actionResult)];
                         case 3:
                             _j.sent();
-                            this.changeState(action.newState);
+                            action.newState && this.changeState(action.newState);
                             return [3 /*break*/, 5];
                         case 4:
                             this.displayActionServerError();
@@ -4353,7 +4401,7 @@
                             return [4 /*yield*/, this.finishTableGlobalAction(tableActionDetail, actionResult)];
                         case 3:
                             _j.sent();
-                            this.changeState(action.newState);
+                            action.newState && this.changeState(action.newState);
                             return [3 /*break*/, 5];
                         case 4:
                             this.displayTableServerError();
@@ -4488,7 +4536,7 @@
                         case 2:
                             if (finish) {
                                 this.finishTableAction(tableActionDetail, actionResult);
-                                this.changeState(action.newState);
+                                action.newState && this.changeState(action.newState);
                             }
                             else {
                                 this.displayTableServerError();
@@ -4748,7 +4796,7 @@
                         case 2:
                             if (finish) {
                                 this.finishTableSelectionAction(tableActionDetail, actionResult);
-                                this.changeState(action.newState);
+                                action.newState && this.changeState(action.newState);
                             }
                             else {
                                 this.displayTableServerError();