@sumaris-net/ngx-components 1.23.23 → 1.23.25

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

@@ -21026,17 +21026,21 @@
             this.stop();
         };
         InMemoryEntitiesService.prototype.setValue = function (data) {
-            if (this.dataSubject.value !== data) {
-                // If service already started, then update data
-                if (this.started) {
+            // If service already started
+            if (this.started) {
+                // Update the data, if changed
+                if (this.dataSubject.value !== data) {
                     this._hiddenData = [];
                     this.dataSubject.next(data);
-                    this.markAsPristine();
-                }
-                // if service not started yet, then start it, using given data
-                else {
-                    this.start(data);
                 }
+                // Reset dirty and saving state
+                // (Fix ObsBio issue on samples table : still dirty after setting the same value again)
+                this.markAsSaved();
+                this.markAsPristine();
+            }
+            // If service not started yet, then start it, using given data
+            else {
+                this.start(data);
             }
         };
         InMemoryEntitiesService.prototype.loadAll = function (offset, size, sortBy, sortDirection, filter, opts) {
@@ -21286,6 +21290,16 @@
                 });
             });
         };
+        InMemoryEntitiesService.prototype.markAsDirty = function () {
+            if (!this.dirtySubject.value) {
+                this.dirtySubject.next(true);
+            }
+        };
+        InMemoryEntitiesService.prototype.markAsPristine = function () {
+            if (this.dirtySubject.value) {
+                this.dirtySubject.next(false);
+            }
+        };
         /* -- protected methods -- */
         InMemoryEntitiesService.prototype.filter = function (data, _filter, hiddenData) {
             // if filter is DataFilter instance, use its test function
@@ -21330,16 +21344,6 @@
                 this.savingSubject.next(false);
             }
         };
-        InMemoryEntitiesService.prototype.markAsDirty = function () {
-            if (!this.dirtySubject.value) {
-                this.dirtySubject.next(true);
-            }
-        };
-        InMemoryEntitiesService.prototype.markAsPristine = function () {
-            if (this.dirtySubject.value) {
-                this.dirtySubject.next(false);
-            }
-        };
         return InMemoryEntitiesService;
     }(StartableObservableService));
     InMemoryEntitiesService.decorators = [
@@ -28426,11 +28430,12 @@
             this.translate = translate;
             this._subscription = new rxjs.Subscription();
             this._enabled = false;
-            this._dirty = false;
             this.destroySubject = new rxjs.Subject();
             this.readySubject = new rxjs.BehaviorSubject(false);
+            this.dirtySubject = new rxjs.BehaviorSubject(false);
             this.loadingSubject = new rxjs.BehaviorSubject(true);
             this.errorSubject = new rxjs.BehaviorSubject(undefined);
+            this.savingSubject = new rxjs.BehaviorSubject(false);
             this.debug = false;
             this.submitted = false;
             this.toolbar = null;
@@ -28482,6 +28487,14 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(AppEditor.prototype, "saving", {
+            get: function () {
+                var _a;
+                return this.savingSubject.value || ((_a = this.editors) === null || _a === void 0 ? void 0 : _a.some(function (e) { return e.saving; }));
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(AppEditor.prototype, "tables", {
             get: function () {
                 return this._children && this._children.filter(function (c) { return c instanceof AppTable; });
@@ -28505,7 +28518,7 @@
         });
         Object.defineProperty(AppEditor.prototype, "dirty", {
             get: function () {
-                return this._dirty || (this._children && this._children.findIndex(function (c) { return c.enabled && c.dirty; }) !== -1) || false;
+                return this.dirtySubject.value || (this._children && this._children.findIndex(function (c) { return c.enabled && c.dirty; }) !== -1) || false;
             },
             enumerable: false,
             configurable: true
@@ -28565,7 +28578,7 @@
         });
         Object.defineProperty(AppEditor.prototype, "empty", {
             get: function () {
-                return this._enabled;
+                return !this._enabled;
             },
             enumerable: false,
             configurable: true
@@ -28630,7 +28643,9 @@
             var _a;
             this.error = null;
             this.submitted = false;
-            this._dirty = false;
+            if (this.dirtySubject.value !== false) {
+                this.dirtySubject.next(false);
+            }
             (_a = this._children) === null || _a === void 0 ? void 0 : _a.forEach(function (c) { return c.markAsPristine(opts); });
             if (!this.loading && (!opts || opts.emitEvent !== false))
                 this.markForCheck();
@@ -28658,9 +28673,11 @@
                 this.markForCheck();
         };
         AppEditor.prototype.markAsDirty = function (opts) {
-            this._dirty = true;
-            if (!this.loading && (!opts || opts.emitEvent !== false))
-                this.markForCheck();
+            if (!this.dirtySubject.value) {
+                this.dirtySubject.next(true);
+                if (!this.loading && (!opts || opts.emitEvent !== false))
+                    this.markForCheck();
+            }
         };
         AppEditor.prototype.markAsLoading = function (opts) {
             if (!this.loadingSubject.value) {
@@ -28699,6 +28716,20 @@
                 return Promise.resolve();
             return waitForFalse(this.loadingSubject, opts);
         };
+        AppEditor.prototype.markAsSaving = function (opts) {
+            if (this.savingSubject.value !== true) {
+                this.savingSubject.next(true);
+                if (!opts || opts.emitEvent !== false)
+                    this.markForCheck();
+            }
+        };
+        AppEditor.prototype.markAsSaved = function (opts) {
+            if (this.savingSubject.value !== false) {
+                this.savingSubject.next(false);
+                if (!opts || opts.emitEvent !== false)
+                    this.markForCheck();
+            }
+        };
         AppEditor.prototype.cancel = function (event) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_c) {
@@ -28729,7 +28760,7 @@
             var _a;
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_c) {
-                    console.debug('[tab-page] Unloading data...');
+                    console.debug('[editor] Unloading data...');
                     this.markAsLoading();
                     (_a = this._children) === null || _a === void 0 ? void 0 : _a.forEach(function (f) {
                         if (f instanceof AppForm) {
@@ -28738,7 +28769,12 @@
                         else if (f instanceof AppTable) {
                             f.dataSource.disconnect();
                         }
+                        else if (f instanceof AppEditor) {
+                            f.unload(opts);
+                        }
                     });
+                    this.markAsPristine(opts);
+                    this.markAsSaved(opts);
                     return [2 /*return*/];
                 });
             });
@@ -28807,12 +28843,12 @@
                 });
             });
         };
-        AppEditor.prototype.logFormErrors = function () {
+        AppEditor.prototype.logFormErrors = function (prefix) {
             var _this = this;
             var _a;
             if (this.debug)
-                console.debug('[app-tab-editor] Page not valid. Checking where (forms, tables)...');
-            (_a = this._children) === null || _a === void 0 ? void 0 : _a.forEach(function (c) { return _this.logChildrenFormErrors(c); });
+                console.debug('[editor] Editor not valid. Checking where (forms, tables)...');
+            (_a = this._children) === null || _a === void 0 ? void 0 : _a.forEach(function (c) { return _this.logChildrenErrors(c, prefix); });
         };
         /* -- protected methods -- */
         AppEditor.prototype.scrollToTop = function (duration) {
@@ -28914,7 +28950,7 @@
                 });
             });
         };
-        AppEditor.prototype.logChildrenFormErrors = function (c, prefix, path) {
+        AppEditor.prototype.logChildrenErrors = function (c, prefix, path) {
             var _this = this;
             prefix = prefix || '[app-tab-editor] ';
             // If editor
@@ -28928,7 +28964,7 @@
             // If form provider: get delegate
             else if (c instanceof AppFormProvider) {
                 if (!c.empty && !c.valid) {
-                    c.waitDelegate({ timeout: 1000 }).then(function (delegate) { return _this.logChildrenFormErrors(delegate, prefix, 'provider'); });
+                    c.waitDelegate({ timeout: 1000 }).then(function (delegate) { return _this.logChildrenErrors(delegate, prefix, 'provider'); });
                 }
             }
             // If table
@@ -28938,20 +28974,34 @@
                     AppFormUtils.logFormErrors(c.editedRow.validator, prefix, path_1);
                 }
             }
-            // If IAppForm
+            // If form
             else if (c instanceof AppForm) {
                 if (!c.empty && !c.valid) {
                     if (c.pending) {
                         var path_2 = c.constructor.name.toLowerCase();
                         console.warn(prefix + " -> " + path_2 + ": waiting while pending...");
                         AppFormUtils.waitWhilePending(c, { timeout: 1000 })
-                            .then(function () { return _this.logChildrenFormErrors(c.form, prefix, path_2); });
+                            .then(function () { return _this.logChildrenErrors(c.form, prefix, path_2); });
                     }
                     else {
                         AppFormUtils.logFormErrors(c.form, prefix);
                     }
                 }
             }
+            // If editor
+            else if (c instanceof AppEditor) {
+                if (!c.empty && !c.valid) {
+                    if (c.pending) {
+                        var path_3 = c.constructor.name.toLowerCase();
+                        console.warn(prefix + " -> " + path_3 + ": waiting while pending...");
+                        AppFormUtils.waitWhilePending(c, { timeout: 1000 })
+                            .then(function () { return c.logFormErrors(prefix); });
+                    }
+                    else {
+                        c.logFormErrors(prefix);
+                    }
+                }
+            }
             else {
                 console.warn(prefix + " Unknown children sub-form: ", c);
             }
@@ -29178,24 +29228,23 @@
         tabGroup: [{ type: i0.ViewChild, args: ['tabGroup', { static: true },] }]
     };
 
-    var AppEditorOptions = /** @class */ (function (_super) {
-        __extends(AppEditorOptions, _super);
+    var AppEditorOptions = /** @class */ (function (_super_1) {
+        __extends(AppEditorOptions, _super_1);
         function AppEditorOptions() {
-            return _super !== null && _super.apply(this, arguments) || this;
+            return _super_1 !== null && _super_1.apply(this, arguments) || this;
         }
         return AppEditorOptions;
     }(AppTabEditorOptions));
     // @dynamic
     // eslint-disable-next-line @angular-eslint/directive-class-suffix
-    var AppEntityEditor = /** @class */ (function (_super) {
-        __extends(AppEntityEditor, _super);
+    var AppEntityEditor = /** @class */ (function (_super_1) {
+        __extends(AppEntityEditor, _super_1);
         function AppEntityEditor(injector, dataType, dataService, options) {
             var _this = this;
             var _a, _b;
-            _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 = _super_1.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.savingSubject = new rxjs.BehaviorSubject(false);
             _this.$title = new rxjs.Subject();
             _this.onUpdateView = new i0.EventEmitter();
             _this.environment = injector.get(ENVIRONMENT);
@@ -29251,20 +29300,6 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(AppEntityEditor.prototype, "loading", {
-            get: function () {
-                return this.loadingSubject.value;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(AppEntityEditor.prototype, "saving", {
-            get: function () {
-                return this.savingSubject.value;
-            },
-            enumerable: false,
-            configurable: true
-        });
         Object.defineProperty(AppEntityEditor.prototype, "service", {
             get: function () {
                 return this.dataService;
@@ -29272,22 +29307,8 @@
             enumerable: false,
             configurable: true
         });
-        AppEntityEditor.prototype.markAsSaving = function (opts) {
-            if (this.savingSubject.value !== true) {
-                this.savingSubject.next(true);
-                if (!opts || opts.emitEvent !== false)
-                    this.markForCheck();
-            }
-        };
-        AppEntityEditor.prototype.markAsSaved = function (opts) {
-            if (this.savingSubject.value !== false) {
-                this.savingSubject.next(false);
-                if (!opts || opts.emitEvent !== false)
-                    this.markForCheck();
-            }
-        };
         AppEntityEditor.prototype.ngOnInit = function () {
-            _super.prototype.ngOnInit.call(this);
+            _super_1.prototype.ngOnInit.call(this);
             // Defaults
             this._autoOpenNextTab = toBoolean(this._autoOpenNextTab, !this.isOnFieldMode);
             this.historyIcon = this.historyIcon || { icon: 'list' };
@@ -29298,14 +29319,14 @@
         };
         AppEntityEditor.prototype.ngAfterViewInit = function () {
             var _this = this;
-            _super.prototype.ngAfterViewInit.call(this);
+            _super_1.prototype.ngAfterViewInit.call(this);
             // Load data
             if (this._autoLoad) {
                 setTimeout(function () { return _this.loadFromRoute(); }, this._autoLoadDelay);
             }
         };
         AppEntityEditor.prototype.ngOnDestroy = function () {
-            _super.prototype.ngOnDestroy.call(this);
+            _super_1.prototype.ngOnDestroy.call(this);
             this._listenChangesSubscription = null; // already unsubscribe in the super function
             this.$title.complete();
             this.$title.unsubscribe();
@@ -29317,7 +29338,7 @@
             // Wait end of saving
             if (this.saving)
                 return waitForFalse(this.savingSubject);
-            return _super.prototype.waitIdle.call(this, opts);
+            return _super_1.prototype.waitIdle.call(this, opts);
         };
         /**
          * Load data from the snapshot route
@@ -29452,7 +29473,7 @@
         };
         AppEntityEditor.prototype.updateView = function (data, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var idChanged, promiseOrVoid;
+                var idChanged;
                 var _this = this;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
@@ -29466,13 +29487,9 @@
                             return [4 /*yield*/, this.ready()];
                         case 1:
                             _c.sent();
-                            promiseOrVoid = this.setValue(data);
-                            if (!promiseOrVoid) return [3 /*break*/, 3];
-                            return [4 /*yield*/, promiseOrVoid];
+                            return [4 /*yield*/, this.setValue(data)];
                         case 2:
                             _c.sent();
-                            _c.label = 3;
-                        case 3:
                             if (!opts || opts.emitEvent !== false) {
                                 this.markAsPristine();
                                 this.markAsUntouched();
@@ -29796,16 +29813,22 @@
                 });
             });
         };
-        AppEntityEditor.prototype.unload = function () {
+        AppEntityEditor.prototype.unload = function (opts) {
+            var _super = Object.create(null, {
+                unload: { get: function () { return _super_1.prototype.unload; } }
+            });
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_c) {
-                    this.stopListenRemoteChanges();
-                    this.form.reset();
-                    this.registerForms();
-                    this._dirty = false;
-                    this.data = null;
-                    this.savingSubject.next(false);
-                    return [2 /*return*/];
+                    switch (_c.label) {
+                        case 0: return [4 /*yield*/, _super.unload.call(this, opts)];
+                        case 1:
+                            _c.sent();
+                            this.stopListenRemoteChanges();
+                            this.form.reset();
+                            this.registerForms();
+                            this.data = null;
+                            return [2 /*return*/];
+                    }
                 });
             });
         };
@@ -29829,15 +29852,15 @@
             });
         };
         AppEntityEditor.prototype.resetError = function (opts) {
-            _super.prototype.resetError.call(this, opts);
+            _super_1.prototype.resetError.call(this, opts);
         };
         AppEntityEditor.prototype.setError = function (err, opts) {
             if (!err) {
-                _super.prototype.setError.call(this, undefined, opts);
+                _super_1.prototype.setError.call(this, undefined, opts);
             }
             else if (typeof err === 'string') {
                 console.error('[entity-editor] Error: ' + (err || ''));
-                _super.prototype.setError.call(this, err, opts);
+                _super_1.prototype.setError.call(this, err, opts);
             }
             else {
                 console.error('[entity-editor] Error: ' + err.message || '', err);
@@ -29852,7 +29875,7 @@
                     userMessage += detailMessage.length < 70 ? detailMessage : detailMessage.substring(0, 67) + '...';
                     userMessage += '</small>';
                 }
-                _super.prototype.setError.call(this, userMessage, opts);
+                _super_1.prototype.setError.call(this, userMessage, opts);
             }
         };
         /* -- protected methods -- */