@sumaris-net/ngx-components 1.21.0 → 1.21.3

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

@@ -17447,13 +17447,13 @@ class AppForm {
      *  @deprecated
      */
     set _loading(value) {
-        this._$loading.next(value);
+        this.loadingSubject.next(value);
     }
     /**
      *  @deprecated
      */
     get _loading() {
-        return this._$loading.value;
+        return this.loadingSubject.value;
     }
     /**
      *  @deprecated
@@ -17666,6 +17666,8 @@ class AppForm {
      * @param opts
      */
     ready(opts) {
+        if (this.readySubject.value)
+            return Promise.resolve();
         return waitForTrue(this.readySubject, opts);
     }
     /**
@@ -17673,6 +17675,8 @@ class AppForm {
      * @param opts
      */
     waitIdle(opts) {
+        if (!this.loadingSubject.value)
+            return Promise.resolve();
         return waitForFalse(this.loadingSubject, opts);
     }
     updateValueAndValidity(opts) {
@@ -22631,9 +22635,15 @@ class AppTable {
     set error(error) {
         this.setError(error);
     }
+    /**
+     * @deprecated
+     */
     get loading$() {
         return this.loadingSubject.asObservable();
     }
+    /**
+     * @deprecated
+     */
     get saving$() {
         return this.savingSubject.asObservable();
     }
@@ -22756,17 +22766,15 @@ class AppTable {
         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();
-            }
         }
     }
     markAsSaved(opts) {
         if (this.savingSubject.value !== false) {
             this.savingSubject.next(false);
-            if (!opts || opts.emitEvent !== false) {
+            if (!opts || opts.emitEvent !== false)
                 this.markForCheck();
-            }
         }
     }
     markAsLoading(opts) {
@@ -24173,8 +24181,9 @@ class AppEditor {
         this._subscription = new Subscription();
         this._enabled = false;
         this._dirty = false;
-        this._$ready = new BehaviorSubject(false);
-        this._$loading = new BehaviorSubject(true);
+        this.readySubject = new BehaviorSubject(false);
+        this.loadingSubject = new BehaviorSubject(true);
+        this.errorSubject = new BehaviorSubject(undefined);
         this.debug = false;
         this.submitted = false;
         this.toolbar = null;
@@ -24184,13 +24193,31 @@ class AppEditor {
      *  @deprecated
      */
     set _loading(value) {
-        this._$loading.next(value);
+        this.loadingSubject.next(value);
     }
     /**
      *  @deprecated
      */
     get _loading() {
-        return this._$loading.value;
+        return this.loadingSubject.value;
+    }
+    /**
+     *  @deprecated
+     */
+    get _$ready() {
+        return this.readySubject;
+    }
+    /**
+     *  @deprecated
+     */
+    get _$loading() {
+        return this.loadingSubject;
+    }
+    get error() {
+        return this.errorSubject.value;
+    }
+    set error(error) {
+        this.setError(error);
     }
     get tables() {
         return this._children && this._children.filter(c => c instanceof AppTable);
@@ -24219,7 +24246,7 @@ class AppEditor {
     }
     get loading() {
         var _a;
-        return this._$loading.value || (((_a = this._children) === null || _a === void 0 ? void 0 : _a.findIndex(c => c.enabled && c.loading)) !== -1) || false;
+        return this.loadingSubject.value || (((_a = this._children) === null || _a === void 0 ? void 0 : _a.findIndex(c => c.enabled && c.loading)) !== -1) || false;
     }
     get enabled() {
         return this._enabled;
@@ -24243,10 +24270,9 @@ class AppEditor {
     }
     ngOnDestroy() {
         this._subscription.unsubscribe();
-        this._$ready.complete();
-        this._$ready.unsubscribe();
-        this._$loading.complete();
-        this._$loading.unsubscribe();
+        this.readySubject.unsubscribe();
+        this.loadingSubject.unsubscribe();
+        this.errorSubject.unsubscribe();
     }
     addChildForm(form) {
         if (!form)
@@ -24315,16 +24341,16 @@ class AppEditor {
             this.markForCheck();
     }
     markAsLoading(opts) {
-        if (!this._loading) {
-            this._loading = true;
+        if (!this.loadingSubject.value) {
+            this.loadingSubject.next(true);
             if (!opts || opts.emitEvent !== false)
                 this.markForCheck();
         }
     }
     markAsLoaded(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
@@ -24338,17 +24364,17 @@ class AppEditor {
     markAsReady(opts) {
         var _a;
         (_a = this._children) === null || _a === void 0 ? void 0 : _a.forEach(c => c.markAsReady(opts));
-        this._$ready.next(true);
+        this.readySubject.next(true);
     }
     ready(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._$ready.value)
-                return;
-            return waitForTrue(this._$ready, opts);
-        });
+        if (this.readySubject.value)
+            return Promise.resolve();
+        return waitForTrue(this.readySubject, opts);
     }
     waitIdle(opts) {
-        return AppFormUtils.waitIdle(this, opts);
+        if (!this.loadingSubject.value)
+            return Promise.resolve();
+        return waitForFalse(this.loadingSubject, opts);
     }
     cancel(event) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -24551,6 +24577,16 @@ class AppEditor {
             console.warn(`${prefix} Unknown children sub-form: `, c);
         }
     }
+    setError(value, opts) {
+        if (this.errorSubject.value !== value) {
+            this.errorSubject.next(value);
+            if (!opts || opts.emitEvent !== false)
+                this.markForCheck();
+        }
+    }
+    resetError(opts) {
+        this.setError(undefined, opts);
+    }
     markForCheck() {
         // Should be override by subclasses, if change detection is Push
     }
@@ -24615,6 +24651,8 @@ class AppTabEditor extends AppEditor {
     ngOnDestroy() {
         super.ngOnDestroy();
         this.selectedTabIndexChange.complete();
+        this.loadingSubject.unsubscribe();
+        this.errorSubject.unsubscribe();
     }
     setSelectedTabIndex(value, opts) {
         // Fix value
@@ -24710,6 +24748,16 @@ class AppTabEditor extends AppEditor {
             yield _super.unload.call(this, opts);
         });
     }
+    saveDirtyTables() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Save all dirty tables
+            const results = yield Promise.all((this.tables || [])
+                .filter(c => c.dirty)
+                .map(c => c.save()));
+            const saved = results.findIndex(result => result !== true) === -1;
+            return saved;
+        });
+    }
 }
 AppTabEditor.decorators = [
     { type: Directive }
@@ -24738,7 +24786,7 @@ 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.saving = false;
+        this.savingSubject = new BehaviorSubject(false);
         this.$title = new Subject();
         this.onUpdateView = new EventEmitter();
         this.environement = injector.get(ENVIRONMENT);
@@ -24781,21 +24829,24 @@ class AppEntityEditor extends AppTabEditor {
         return isNil((_a = this.data) === null || _a === void 0 ? void 0 : _a.id);
     }
     get loading() {
-        return this._loading;
+        return this.loadingSubject.value;
+    }
+    get saving() {
+        return this.savingSubject.value;
     }
     get service() {
         return this.dataService;
     }
     markAsSaving(opts) {
-        if (!this.saving) {
-            this.saving = true;
+        if (this.savingSubject.value !== true) {
+            this.savingSubject.next(true);
             if (!opts || opts.emitEvent !== false)
                 this.markForCheck();
         }
     }
     markAsSaved(opts) {
-        if (this.saving) {
-            this.saving = false;
+        if (this.savingSubject.value !== false) {
+            this.savingSubject.next(false);
             if (!opts || opts.emitEvent !== false)
                 this.markForCheck();
         }
@@ -24824,11 +24875,12 @@ class AppEntityEditor extends AppTabEditor {
         this.$title.unsubscribe();
         this.onUpdateView.complete();
         this.onUpdateView.unsubscribe();
+        this.savingSubject.unsubscribe();
     }
     waitIdle(opts) {
         // Wait end of saving
         if (this.saving)
-            return waitFor(() => this.saving !== true);
+            return waitForFalse(this.savingSubject);
         return super.waitIdle(opts);
     }
     /**
@@ -25073,9 +25125,10 @@ class AppEntityEditor extends AppTabEditor {
             yield this.waitWhilePending();
             // If invalid
             if (this.invalid) {
-                this.markAllAsTouched();
                 this.logFormErrors();
                 this.openFirstInvalidTab();
+                this.scrollToTop();
+                this.markAllAsTouched();
                 this.submitted = true;
                 return false;
             }
@@ -25086,6 +25139,10 @@ class AppEntityEditor extends AppTabEditor {
             try {
                 // Compute next tab index (if enable)
                 const nextTabIndex = this._autoOpenNextTab && isNil(this.previousDataId) && this.computeNextTabIndex();
+                // Save all dirty tables
+                const saved = yield this.saveDirtyTables();
+                if (!saved)
+                    return false;
                 // Get data
                 const data = yield this.getValue();
                 this.disable();
@@ -25199,7 +25256,7 @@ class AppEntityEditor extends AppTabEditor {
             this.registerForms();
             this._dirty = false;
             this.data = null;
-            this.saving = false;
+            this.savingSubject.next(false);
         });
     }
     goBack(event) {
@@ -25219,19 +25276,15 @@ class AppEntityEditor extends AppTabEditor {
         });
     }
     resetError(opts) {
-        if (isNotNilOrBlank(this.error)) {
-            this.error = null;
-            if (!opts || opts.emitEvent !== false)
-                this.markForCheck();
-        }
+        super.resetError(opts);
     }
     setError(err, opts) {
         if (!err) {
-            this.error = undefined;
+            super.setError(undefined, opts);
         }
         else if (typeof err === 'string') {
             console.error('[entity-editor] Error: ' + (err || ''));
-            this.error = err;
+            super.setError(err, opts);
         }
         else {
             console.error('[entity-editor] Error: ' + err.message || '', err);
@@ -25246,10 +25299,8 @@ class AppEntityEditor extends AppTabEditor {
                 userMessage += detailMessage.length < 70 ? detailMessage : detailMessage.substring(0, 67) + '...';
                 userMessage += '</small>';
             }
-            this.error = userMessage;
+            super.setError(userMessage, opts);
         }
-        if (!opts || opts.emitEvent !== false)
-            this.markForCheck();
     }
     /* -- protected methods -- */
     /**
@@ -25409,7 +25460,7 @@ class AppEntityEditorModal extends AppTabEditor {
     constructor(injector, dataType, options) {
         super(null, injector.get(Router), injector.get(AlertController), injector.get(TranslateService), options);
         this.dataType = dataType;
-        this.saving = false;
+        this.savingSubject = new BehaviorSubject(false);
         this.$title = new Subject();
         this.i18nSuffix = null;
         this.environement = injector.get(ENVIRONMENT);
@@ -25445,16 +25496,19 @@ class AppEntityEditorModal extends AppTabEditor {
     get isOnFieldMode() {
         return this.settings.isOnFieldMode(this._usageMode);
     }
+    get saving() {
+        return this.savingSubject.value;
+    }
     markAsSaving(opts) {
-        if (!this.saving) {
-            this.saving = true;
+        if (this.savingSubject.value !== true) {
+            this.savingSubject.next(true);
             if (!opts || opts.emitEvent !== false)
                 this.markForCheck();
         }
     }
     markAsSaved(opts) {
-        if (this.saving) {
-            this.saving = false;
+        if (this.savingSubject.value !== false) {
+            this.savingSubject.next(false);
             if (!opts || opts.emitEvent !== false)
                 this.markForCheck();
         }
@@ -25498,11 +25552,12 @@ class AppEntityEditorModal extends AppTabEditor {
         super.ngOnDestroy();
         this.$title.complete();
         this.$title.unsubscribe();
+        this.savingSubject.unsubscribe();
     }
     waitIdle(opts) {
         // Wait end of saving
         if (this.saving)
-            return waitFor(() => this.saving !== true);
+            return waitForFalse(this.savingSubject);
         return super.waitIdle(opts);
     }
     load() {
@@ -25608,9 +25663,9 @@ class AppEntityEditorModal extends AppTabEditor {
             if (this.invalid) {
                 this.logFormErrors();
                 this.setError('COMMON.FORM.HAS_ERROR');
-                this.markAllAsTouched();
                 this.openFirstInvalidTab();
                 this.scrollToTop();
+                this.markAllAsTouched();
                 this.submitted = true;
                 return false;
             }
@@ -25739,16 +25794,6 @@ class AppEntityEditorModal extends AppTabEditor {
             this.markForCheck();
     }
     /* -- protected methods -- */
-    saveDirtyTables() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Save all dirty tables
-            const results = yield Promise.all((this.tables || [])
-                .filter(c => c.dirty)
-                .map(c => c.save()));
-            const saved = results.findIndex(result => result !== true) === -1;
-            return saved;
-        });
-    }
     waitWhilePending(opts) {
         return AppFormUtils.waitWhilePending(this, opts);
     }