@sumaris-net/ngx-components 1.21.1 → 1.21.2

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
@@ -26157,6 +26157,9 @@
             configurable: true
         });
         Object.defineProperty(AppTable.prototype, "loading$", {
+            /**
+             * @deprecated
+             */
             get: function () {
                 return this.loadingSubject.asObservable();
             },
@@ -26164,6 +26167,9 @@
             configurable: true
         });
         Object.defineProperty(AppTable.prototype, "saving$", {
+            /**
+             * @deprecated
+             */
             get: function () {
                 return this.savingSubject.asObservable();
             },
@@ -26333,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) {
@@ -28000,7 +28004,7 @@
              *  @deprecated
              */
             set: function (value) {
-                this.readySubject.next(value);
+                this.loadingSubject.next(value);
             },
             enumerable: false,
             configurable: true
@@ -28572,6 +28576,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;
@@ -28677,6 +28683,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 = [
@@ -28713,7 +28735,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);
@@ -28771,7 +28793,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
@@ -28784,15 +28813,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();
             }
@@ -28822,12 +28851,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);
         };
         /**
@@ -29114,7 +29143,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:
@@ -29133,9 +29162,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];
                             }
@@ -29145,24 +29175,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
@@ -29170,7 +29205,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);
@@ -29186,10 +29221,10 @@
                                 });
                             }
                             return [2 /*return*/, false];
-                        case 8:
+                        case 9:
                             this.markAsSaved();
                             return [7 /*endfinally*/];
-                        case 9: return [2 /*return*/];
+                        case 10: return [2 /*return*/];
                     }
                 });
             });
@@ -29308,7 +29343,7 @@
                     this.registerForms();
                     this._dirty = false;
                     this.data = null;
-                    this.saving = false;
+                    this.savingSubject.next(false);
                     return [2 /*return*/];
                 });
             });
@@ -29571,7 +29606,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);
@@ -29621,16 +29656,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();
             }
@@ -29679,12 +29721,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 () {
@@ -29834,9 +29876,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];
                             }
@@ -29997,22 +30039,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);
         };