@sumaris-net/ngx-components 1.23.23 → 1.23.25

package/fesm2015/sumaris-net.ngx-components.js

@@ -18317,17 +18317,21 @@ class InMemoryEntitiesService extends StartableObservableService {
         this.stop();
     }
     setValue(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);
         }
     }
     loadAll(offset, size, sortBy, sortDirection, filter, opts) {
@@ -18520,6 +18524,16 @@ class InMemoryEntitiesService extends StartableObservableService {
             yield this.waitWhileSaving(opts);
         });
     }
+    markAsDirty() {
+        if (!this.dirtySubject.value) {
+            this.dirtySubject.next(true);
+        }
+    }
+    markAsPristine() {
+        if (this.dirtySubject.value) {
+            this.dirtySubject.next(false);
+        }
+    }
     /* -- protected methods -- */
     filter(data, _filter, hiddenData) {
         // if filter is DataFilter instance, use its test function
@@ -18561,16 +18575,6 @@ class InMemoryEntitiesService extends StartableObservableService {
             this.savingSubject.next(false);
         }
     }
-    markAsDirty() {
-        if (!this.dirtySubject.value) {
-            this.dirtySubject.next(true);
-        }
-    }
-    markAsPristine() {
-        if (this.dirtySubject.value) {
-            this.dirtySubject.next(false);
-        }
-    }
 }
 InMemoryEntitiesService.decorators = [
     { type: Directive }
@@ -24550,11 +24554,12 @@ class AppEditor {
         this.translate = translate;
         this._subscription = new Subscription();
         this._enabled = false;
-        this._dirty = false;
         this.destroySubject = new Subject();
         this.readySubject = new BehaviorSubject(false);
+        this.dirtySubject = new BehaviorSubject(false);
         this.loadingSubject = new BehaviorSubject(true);
         this.errorSubject = new BehaviorSubject(undefined);
+        this.savingSubject = new BehaviorSubject(false);
         this.debug = false;
         this.submitted = false;
         this.toolbar = null;
@@ -24590,6 +24595,10 @@ class AppEditor {
     set error(error) {
         this.setError(error);
     }
+    get saving() {
+        var _a;
+        return this.savingSubject.value || ((_a = this.editors) === null || _a === void 0 ? void 0 : _a.some(e => e.saving));
+    }
     get tables() {
         return this._children && this._children.filter(c => c instanceof AppTable);
     }
@@ -24600,7 +24609,7 @@ class AppEditor {
         return this._children && this._children.filter(c => c instanceof AppEditor);
     }
     get dirty() {
-        return this._dirty || (this._children && this._children.findIndex(c => c.enabled && c.dirty) !== -1) || false;
+        return this.dirtySubject.value || (this._children && this._children.findIndex(c => c.enabled && c.dirty) !== -1) || false;
     }
     /**
      * Is valid (tables and forms)
@@ -24628,7 +24637,7 @@ class AppEditor {
         return this._children;
     }
     get empty() {
-        return this._enabled;
+        return !this._enabled;
     }
     ngOnInit() {
         if (this.formButtonsBar) {
@@ -24688,7 +24697,9 @@ class AppEditor {
         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(c => c.markAsPristine(opts));
         if (!this.loading && (!opts || opts.emitEvent !== false))
             this.markForCheck();
@@ -24716,9 +24727,11 @@ class AppEditor {
             this.markForCheck();
     }
     markAsDirty(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();
+        }
     }
     markAsLoading(opts) {
         if (!this.loadingSubject.value) {
@@ -24757,6 +24770,20 @@ class AppEditor {
             return Promise.resolve();
         return waitForFalse(this.loadingSubject, opts);
     }
+    markAsSaving(opts) {
+        if (this.savingSubject.value !== true) {
+            this.savingSubject.next(true);
+            if (!opts || opts.emitEvent !== false)
+                this.markForCheck();
+        }
+    }
+    markAsSaved(opts) {
+        if (this.savingSubject.value !== false) {
+            this.savingSubject.next(false);
+            if (!opts || opts.emitEvent !== false)
+                this.markForCheck();
+        }
+    }
     cancel(event) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isNewData) {
@@ -24775,7 +24802,7 @@ class AppEditor {
     unload(opts) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            console.debug('[tab-page] Unloading data...');
+            console.debug('[editor] Unloading data...');
             this.markAsLoading();
             (_a = this._children) === null || _a === void 0 ? void 0 : _a.forEach(f => {
                 if (f instanceof AppForm) {
@@ -24784,7 +24811,12 @@ class AppEditor {
                 else if (f instanceof AppTable) {
                     f.dataSource.disconnect();
                 }
+                else if (f instanceof AppEditor) {
+                    f.unload(opts);
+                }
             });
+            this.markAsPristine(opts);
+            this.markAsSaved(opts);
         });
     }
     reloadWithConfirmation(confirm) {
@@ -24836,11 +24868,11 @@ class AppEditor {
             }
         });
     }
-    logFormErrors() {
+    logFormErrors(prefix) {
         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(c => this.logChildrenFormErrors(c));
+            console.debug('[editor] Editor not valid. Checking where (forms, tables)...');
+        (_a = this._children) === null || _a === void 0 ? void 0 : _a.forEach(c => this.logChildrenErrors(c, prefix));
     }
     /* -- protected methods -- */
     scrollToTop(duration) {
@@ -24919,7 +24951,7 @@ class AppEditor {
             yield Toasts.show(this.toastController, this.translate, opts);
         });
     }
-    logChildrenFormErrors(c, prefix, path) {
+    logChildrenErrors(c, prefix, path) {
         prefix = prefix || '[app-tab-editor] ';
         // If editor
         if (c instanceof AppEditor) {
@@ -24932,7 +24964,7 @@ class AppEditor {
         // If form provider: get delegate
         else if (c instanceof AppFormProvider) {
             if (!c.empty && !c.valid) {
-                c.waitDelegate({ timeout: 1000 }).then(delegate => this.logChildrenFormErrors(delegate, prefix, 'provider'));
+                c.waitDelegate({ timeout: 1000 }).then(delegate => this.logChildrenErrors(delegate, prefix, 'provider'));
             }
         }
         // If table
@@ -24942,20 +24974,34 @@ class AppEditor {
                 AppFormUtils.logFormErrors(c.editedRow.validator, prefix, path);
             }
         }
-        // If IAppForm
+        // If form
         else if (c instanceof AppForm) {
             if (!c.empty && !c.valid) {
                 if (c.pending) {
                     const path = c.constructor.name.toLowerCase();
                     console.warn(`${prefix} -> ${path}: waiting while pending...`);
                     AppFormUtils.waitWhilePending(c, { timeout: 1000 })
-                        .then(() => this.logChildrenFormErrors(c.form, prefix, path));
+                        .then(() => this.logChildrenErrors(c.form, prefix, path));
                 }
                 else {
                     AppFormUtils.logFormErrors(c.form, prefix);
                 }
             }
         }
+        // If editor
+        else if (c instanceof AppEditor) {
+            if (!c.empty && !c.valid) {
+                if (c.pending) {
+                    const path = c.constructor.name.toLowerCase();
+                    console.warn(`${prefix} -> ${path}: waiting while pending...`);
+                    AppFormUtils.waitWhilePending(c, { timeout: 1000 })
+                        .then(() => c.logFormErrors(prefix));
+                }
+                else {
+                    c.logFormErrors(prefix);
+                }
+            }
+        }
         else {
             console.warn(`${prefix} Unknown children sub-form: `, c);
         }
@@ -25171,7 +25217,6 @@ class AppEntityEditor extends AppTabEditor {
         super(injector.get(ActivatedRoute), injector.get(Router), injector.get(AlertController), injector.get(TranslateService), options);
         this.dataType = dataType;
         this.dataService = dataService;
-        this.savingSubject = new BehaviorSubject(false);
         this.$title = new Subject();
         this.onUpdateView = new EventEmitter();
         this.environment = injector.get(ENVIRONMENT);
@@ -25213,29 +25258,9 @@ class AppEntityEditor extends AppTabEditor {
         var _a;
         return isNil((_a = this.data) === null || _a === void 0 ? void 0 : _a.id);
     }
-    get loading() {
-        return this.loadingSubject.value;
-    }
-    get saving() {
-        return this.savingSubject.value;
-    }
     get service() {
         return this.dataService;
     }
-    markAsSaving(opts) {
-        if (this.savingSubject.value !== true) {
-            this.savingSubject.next(true);
-            if (!opts || opts.emitEvent !== false)
-                this.markForCheck();
-        }
-    }
-    markAsSaved(opts) {
-        if (this.savingSubject.value !== false) {
-            this.savingSubject.next(false);
-            if (!opts || opts.emitEvent !== false)
-                this.markForCheck();
-        }
-    }
     ngOnInit() {
         super.ngOnInit();
         // Defaults
@@ -25390,9 +25415,7 @@ class AppEntityEditor extends AppTabEditor {
             this.data = data;
             this.previousDataId = data.id || null;
             yield this.ready();
-            const promiseOrVoid = this.setValue(data);
-            if (promiseOrVoid)
-                yield promiseOrVoid;
+            yield this.setValue(data);
             if (!opts || opts.emitEvent !== false) {
                 this.markAsPristine();
                 this.markAsUntouched();
@@ -25635,14 +25658,17 @@ class AppEntityEditor extends AppTabEditor {
             yield this.load((_a = this.data) === null || _a === void 0 ? void 0 : _a.id);
         });
     }
-    unload() {
+    unload(opts) {
+        const _super = Object.create(null, {
+            unload: { get: () => super.unload }
+        });
         return __awaiter(this, void 0, void 0, function* () {
+            yield _super.unload.call(this, opts);
             this.stopListenRemoteChanges();
             this.form.reset();
             this.registerForms();
-            this._dirty = false;
             this.data = null;
-            this.savingSubject.next(false);
+            // TODO: find a way to remove current page from the navigation history
         });
     }
     goBack(event) {