@sumaris-net/ngx-components 1.21.0 → 1.21.3

package/bundles/sumaris-net.ngx-components.umd.js

@@ -19962,13 +19962,13 @@
              *  @deprecated
              */
             get: function () {
-                return this._$loading.value;
+                return this.loadingSubject.value;
             },
             /**
              *  @deprecated
              */
             set: function (value) {
-                this._$loading.next(value);
+                this.loadingSubject.next(value);
             },
             enumerable: false,
             configurable: true
@@ -20257,6 +20257,8 @@
          * @param opts
          */
         AppForm.prototype.ready = function (opts) {
+            if (this.readySubject.value)
+                return Promise.resolve();
             return waitForTrue(this.readySubject, opts);
         };
         /**
@@ -20264,6 +20266,8 @@
          * @param opts
          */
         AppForm.prototype.waitIdle = function (opts) {
+            if (!this.loadingSubject.value)
+                return Promise.resolve();
             return waitForFalse(this.loadingSubject, opts);
         };
         AppForm.prototype.updateValueAndValidity = function (opts) {
@@ -26153,6 +26157,9 @@
             configurable: true
         });
         Object.defineProperty(AppTable.prototype, "loading$", {
+            /**
+             * @deprecated
+             */
             get: function () {
                 return this.loadingSubject.asObservable();
             },
@@ -26160,6 +26167,9 @@
             configurable: true
         });
         Object.defineProperty(AppTable.prototype, "saving$", {
+            /**
+             * @deprecated
+             */
             get: function () {
                 return this.savingSubject.asObservable();
             },
@@ -26329,17 +26339,15 @@
             if (this.savingSubject.value !== true) {
                 this.focusColumn = undefined; // unselect focus column
                 this.savingSubject.next(true);
-                if (!opts || opts.emitEvent !== false) {
+                if (!opts || opts.emitEvent !== false)
                     this.markForCheck();
-                }
             }
         };
         AppTable.prototype.markAsSaved = function (opts) {
             if (this.savingSubject.value !== false) {
                 this.savingSubject.next(false);
-                if (!opts || opts.emitEvent !== false) {
+                if (!opts || opts.emitEvent !== false)
                     this.markForCheck();
-                }
             }
         };
         AppTable.prototype.markAsLoading = function (opts) {
@@ -27977,8 +27985,9 @@
             this._subscription = new rxjs.Subscription();
             this._enabled = false;
             this._dirty = false;
-            this._$ready = new rxjs.BehaviorSubject(false);
-            this._$loading = new rxjs.BehaviorSubject(true);
+            this.readySubject = new rxjs.BehaviorSubject(false);
+            this.loadingSubject = new rxjs.BehaviorSubject(true);
+            this.errorSubject = new rxjs.BehaviorSubject(undefined);
             this.debug = false;
             this.submitted = false;
             this.toolbar = null;
@@ -27989,13 +27998,43 @@
              *  @deprecated
              */
             get: function () {
-                return this._$loading.value;
+                return this.loadingSubject.value;
             },
             /**
              *  @deprecated
              */
             set: function (value) {
-                this._$loading.next(value);
+                this.loadingSubject.next(value);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(AppEditor.prototype, "_$ready", {
+            /**
+             *  @deprecated
+             */
+            get: function () {
+                return this.readySubject;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(AppEditor.prototype, "_$loading", {
+            /**
+             *  @deprecated
+             */
+            get: function () {
+                return this.loadingSubject;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(AppEditor.prototype, "error", {
+            get: function () {
+                return this.errorSubject.value;
+            },
+            set: function (error) {
+                this.setError(error);
             },
             enumerable: false,
             configurable: true
@@ -28052,7 +28091,7 @@
         Object.defineProperty(AppEditor.prototype, "loading", {
             get: function () {
                 var _a;
-                return this._$loading.value || (((_a = this._children) === null || _a === void 0 ? void 0 : _a.findIndex(function (c) { return c.enabled && c.loading; })) !== -1) || false;
+                return this.loadingSubject.value || (((_a = this._children) === null || _a === void 0 ? void 0 : _a.findIndex(function (c) { return c.enabled && c.loading; })) !== -1) || false;
             },
             enumerable: false,
             configurable: true
@@ -28096,10 +28135,9 @@
         };
         AppEditor.prototype.ngOnDestroy = function () {
             this._subscription.unsubscribe();
-            this._$ready.complete();
-            this._$ready.unsubscribe();
-            this._$loading.complete();
-            this._$loading.unsubscribe();
+            this.readySubject.unsubscribe();
+            this.loadingSubject.unsubscribe();
+            this.errorSubject.unsubscribe();
         };
         AppEditor.prototype.addChildForm = function (form) {
             if (!form)
@@ -28169,16 +28207,16 @@
                 this.markForCheck();
         };
         AppEditor.prototype.markAsLoading = function (opts) {
-            if (!this._loading) {
-                this._loading = true;
+            if (!this.loadingSubject.value) {
+                this.loadingSubject.next(true);
                 if (!opts || opts.emitEvent !== false)
                     this.markForCheck();
             }
         };
         AppEditor.prototype.markAsLoaded = function (opts) {
             var _a;
-            if (this._loading) {
-                this._loading = false;
+            if (this.loadingSubject.value) {
+                this.loadingSubject.next(false);
                 if (!opts || opts.onlySelf !== true) {
                     // Emit to children forms
                     // Tables should be changed by parent
@@ -28192,19 +28230,17 @@
         AppEditor.prototype.markAsReady = function (opts) {
             var _a;
             (_a = this._children) === null || _a === void 0 ? void 0 : _a.forEach(function (c) { return c.markAsReady(opts); });
-            this._$ready.next(true);
+            this.readySubject.next(true);
         };
         AppEditor.prototype.ready = function (opts) {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
-                    if (this._$ready.value)
-                        return [2 /*return*/];
-                    return [2 /*return*/, waitForTrue(this._$ready, opts)];
-                });
-            });
+            if (this.readySubject.value)
+                return Promise.resolve();
+            return waitForTrue(this.readySubject, opts);
         };
         AppEditor.prototype.waitIdle = function (opts) {
-            return AppFormUtils.waitIdle(this, opts);
+            if (!this.loadingSubject.value)
+                return Promise.resolve();
+            return waitForFalse(this.loadingSubject, opts);
         };
         AppEditor.prototype.cancel = function (event) {
             return __awaiter(this, void 0, void 0, function () {
@@ -28460,6 +28496,16 @@
                 console.warn(prefix + " Unknown children sub-form: ", c);
             }
         };
+        AppEditor.prototype.setError = function (value, opts) {
+            if (this.errorSubject.value !== value) {
+                this.errorSubject.next(value);
+                if (!opts || opts.emitEvent !== false)
+                    this.markForCheck();
+            }
+        };
+        AppEditor.prototype.resetError = function (opts) {
+            this.setError(undefined, opts);
+        };
         AppEditor.prototype.markForCheck = function () {
             // Should be override by subclasses, if change detection is Push
         };
@@ -28532,6 +28578,8 @@
         AppTabEditor.prototype.ngOnDestroy = function () {
             _super_1.prototype.ngOnDestroy.call(this);
             this.selectedTabIndexChange.complete();
+            this.loadingSubject.unsubscribe();
+            this.errorSubject.unsubscribe();
         };
         AppTabEditor.prototype.setSelectedTabIndex = function (value, opts) {
             var _this = this;
@@ -28637,6 +28685,22 @@
                 });
             });
         };
+        AppTabEditor.prototype.saveDirtyTables = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var results, saved;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, Promise.all((this.tables || [])
+                                .filter(function (c) { return c.dirty; })
+                                .map(function (c) { return c.save(); }))];
+                        case 1:
+                            results = _b.sent();
+                            saved = results.findIndex(function (result) { return result !== true; }) === -1;
+                            return [2 /*return*/, saved];
+                    }
+                });
+            });
+        };
         return AppTabEditor;
     }(AppEditor));
     AppTabEditor.decorators = [
@@ -28673,7 +28737,7 @@
             _this = _super.call(this, injector.get(i3.ActivatedRoute), injector.get(i3.Router), injector.get(i1$5.AlertController), injector.get(i1$2.TranslateService), options) || this;
             _this.dataType = dataType;
             _this.dataService = dataService;
-            _this.saving = false;
+            _this.savingSubject = new rxjs.BehaviorSubject(false);
             _this.$title = new rxjs.Subject();
             _this.onUpdateView = new i0.EventEmitter();
             _this.environement = injector.get(ENVIRONMENT);
@@ -28731,7 +28795,14 @@
         });
         Object.defineProperty(AppEntityEditor.prototype, "loading", {
             get: function () {
-                return this._loading;
+                return this.loadingSubject.value;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(AppEntityEditor.prototype, "saving", {
+            get: function () {
+                return this.savingSubject.value;
             },
             enumerable: false,
             configurable: true
@@ -28744,15 +28815,15 @@
             configurable: true
         });
         AppEntityEditor.prototype.markAsSaving = function (opts) {
-            if (!this.saving) {
-                this.saving = true;
+            if (this.savingSubject.value !== true) {
+                this.savingSubject.next(true);
                 if (!opts || opts.emitEvent !== false)
                     this.markForCheck();
             }
         };
         AppEntityEditor.prototype.markAsSaved = function (opts) {
-            if (this.saving) {
-                this.saving = false;
+            if (this.savingSubject.value !== false) {
+                this.savingSubject.next(false);
                 if (!opts || opts.emitEvent !== false)
                     this.markForCheck();
             }
@@ -28782,12 +28853,12 @@
             this.$title.unsubscribe();
             this.onUpdateView.complete();
             this.onUpdateView.unsubscribe();
+            this.savingSubject.unsubscribe();
         };
         AppEntityEditor.prototype.waitIdle = function (opts) {
-            var _this = this;
             // Wait end of saving
             if (this.saving)
-                return waitFor(function () { return _this.saving !== true; });
+                return waitForFalse(this.savingSubject);
             return _super.prototype.waitIdle.call(this, opts);
         };
         /**
@@ -29074,7 +29145,7 @@
          */
         AppEntityEditor.prototype.save = function (event, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var nextTabIndex, data, updatedData, err_3;
+                var nextTabIndex, saved, data, updatedData, err_3;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -29093,9 +29164,10 @@
                             _c.sent();
                             // If invalid
                             if (this.invalid) {
-                                this.markAllAsTouched();
                                 this.logFormErrors();
                                 this.openFirstInvalidTab();
+                                this.scrollToTop();
+                                this.markAllAsTouched();
                                 this.submitted = true;
                                 return [2 /*return*/, false];
                             }
@@ -29105,24 +29177,29 @@
                                 console.debug('[data-editor] Saving data...');
                             _c.label = 2;
                         case 2:
-                            _c.trys.push([2, 7, 8, 9]);
+                            _c.trys.push([2, 8, 9, 10]);
                             nextTabIndex = this._autoOpenNextTab && isNil(this.previousDataId) && this.computeNextTabIndex();
-                            return [4 /*yield*/, this.getValue()];
+                            return [4 /*yield*/, this.saveDirtyTables()];
                         case 3:
+                            saved = _c.sent();
+                            if (!saved)
+                                return [2 /*return*/, false];
+                            return [4 /*yield*/, this.getValue()];
+                        case 4:
                             data = _c.sent();
                             this.disable();
                             return [4 /*yield*/, this.dataService.save(data, opts)];
-                        case 4:
+                        case 5:
                             updatedData = _c.sent();
                             return [4 /*yield*/, this.onEntitySaved(updatedData)];
-                        case 5:
+                        case 6:
                             _c.sent();
                             // Update the view (e.g metadata)
                             return [4 /*yield*/, this.updateView(updatedData, Object.assign({
                                     // Open next tab only if user has not changed it
                                     openTabIndex: nextTabIndex > this._selectedTabIndex ? nextTabIndex : undefined
                                 }, opts))];
-                        case 6:
+                        case 7:
                             // Update the view (e.g metadata)
                             _c.sent();
                             // Subscribe to remote changes
@@ -29130,7 +29207,7 @@
                                 this.startListenRemoteChanges();
                             this.submitted = false;
                             return [2 /*return*/, true];
-                        case 7:
+                        case 8:
                             err_3 = _c.sent();
                             this.submitted = true;
                             this.setError(err_3);
@@ -29146,10 +29223,10 @@
                                 });
                             }
                             return [2 /*return*/, false];
-                        case 8:
+                        case 9:
                             this.markAsSaved();
                             return [7 /*endfinally*/];
-                        case 9: return [2 /*return*/];
+                        case 10: return [2 /*return*/];
                     }
                 });
             });
@@ -29268,7 +29345,7 @@
                     this.registerForms();
                     this._dirty = false;
                     this.data = null;
-                    this.saving = false;
+                    this.savingSubject.next(false);
                     return [2 /*return*/];
                 });
             });
@@ -29293,19 +29370,15 @@
             });
         };
         AppEntityEditor.prototype.resetError = function (opts) {
-            if (isNotNilOrBlank(this.error)) {
-                this.error = null;
-                if (!opts || opts.emitEvent !== false)
-                    this.markForCheck();
-            }
+            _super.prototype.resetError.call(this, opts);
         };
         AppEntityEditor.prototype.setError = function (err, opts) {
             if (!err) {
-                this.error = undefined;
+                _super.prototype.setError.call(this, undefined, opts);
             }
             else if (typeof err === 'string') {
                 console.error('[entity-editor] Error: ' + (err || ''));
-                this.error = err;
+                _super.prototype.setError.call(this, err, opts);
             }
             else {
                 console.error('[entity-editor] Error: ' + err.message || '', err);
@@ -29320,10 +29393,8 @@
                     userMessage += detailMessage.length < 70 ? detailMessage : detailMessage.substring(0, 67) + '...';
                     userMessage += '</small>';
                 }
-                this.error = userMessage;
+                _super.prototype.setError.call(this, userMessage, opts);
             }
-            if (!opts || opts.emitEvent !== false)
-                this.markForCheck();
         };
         /* -- protected methods -- */
         /**
@@ -29531,7 +29602,7 @@
         function AppEntityEditorModal(injector, dataType, options) {
             var _this = _super_1.call(this, null, injector.get(i3.Router), injector.get(i1$5.AlertController), injector.get(i1$2.TranslateService), options) || this;
             _this.dataType = dataType;
-            _this.saving = false;
+            _this.savingSubject = new rxjs.BehaviorSubject(false);
             _this.$title = new rxjs.Subject();
             _this.i18nSuffix = null;
             _this.environement = injector.get(ENVIRONMENT);
@@ -29581,16 +29652,23 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(AppEntityEditorModal.prototype, "saving", {
+            get: function () {
+                return this.savingSubject.value;
+            },
+            enumerable: false,
+            configurable: true
+        });
         AppEntityEditorModal.prototype.markAsSaving = function (opts) {
-            if (!this.saving) {
-                this.saving = true;
+            if (this.savingSubject.value !== true) {
+                this.savingSubject.next(true);
                 if (!opts || opts.emitEvent !== false)
                     this.markForCheck();
             }
         };
         AppEntityEditorModal.prototype.markAsSaved = function (opts) {
-            if (this.saving) {
-                this.saving = false;
+            if (this.savingSubject.value !== false) {
+                this.savingSubject.next(false);
                 if (!opts || opts.emitEvent !== false)
                     this.markForCheck();
             }
@@ -29639,12 +29717,12 @@
             _super_1.prototype.ngOnDestroy.call(this);
             this.$title.complete();
             this.$title.unsubscribe();
+            this.savingSubject.unsubscribe();
         };
         AppEntityEditorModal.prototype.waitIdle = function (opts) {
-            var _this = this;
             // Wait end of saving
             if (this.saving)
-                return waitFor(function () { return _this.saving !== true; });
+                return waitForFalse(this.savingSubject);
             return _super_1.prototype.waitIdle.call(this, opts);
         };
         AppEntityEditorModal.prototype.load = function () {
@@ -29794,9 +29872,9 @@
                             if (this.invalid) {
                                 this.logFormErrors();
                                 this.setError('COMMON.FORM.HAS_ERROR');
-                                this.markAllAsTouched();
                                 this.openFirstInvalidTab();
                                 this.scrollToTop();
+                                this.markAllAsTouched();
                                 this.submitted = true;
                                 return [2 /*return*/, false];
                             }
@@ -29957,22 +30035,6 @@
                 this.markForCheck();
         };
         /* -- protected methods -- */
-        AppEntityEditorModal.prototype.saveDirtyTables = function () {
-            return __awaiter(this, void 0, void 0, function () {
-                var results, saved;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0: return [4 /*yield*/, Promise.all((this.tables || [])
-                                .filter(function (c) { return c.dirty; })
-                                .map(function (c) { return c.save(); }))];
-                        case 1:
-                            results = _b.sent();
-                            saved = results.findIndex(function (result) { return result !== true; }) === -1;
-                            return [2 /*return*/, saved];
-                    }
-                });
-            });
-        };
         AppEntityEditorModal.prototype.waitWhilePending = function (opts) {
             return AppFormUtils.waitWhilePending(this, opts);
         };