@sumaris-net/ngx-components 0.27.23 → 0.28.3

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

@@ -46,7 +46,6 @@ import * as momentImported from 'moment';
 import { isMoment } from 'moment';
 import * as i1 from '@angular/material-moment-adapter';
 import { MomentDateAdapter, MatMomentDateModule } from '@angular/material-moment-adapter';
-import { isDefined } from '@ngx-translate/core/lib/util';
 import { Keyboard } from '@ionic-native/keyboard/ngx';
 import { TextMaskModule } from 'angular2-text-mask';
 import { NgxMaterialTimepickerModule } from 'ngx-material-timepicker';
@@ -2113,7 +2112,7 @@ class DateUtils {
         return date1 && date2 && date1.isSameOrBefore(date2) ? date1 : date2;
     }
     static max(date1, date2) {
-        return date1 && date2 && date1.isSameOrAfter(date2) ? date1 : date2;
+        return !date1 ? date2 : (!date2 || date1.isSameOrAfter(date2) ? date1 : date2);
     }
 }
 function toDateISOString(value) {
@@ -2432,7 +2431,7 @@ class TranslateContextService {
     }
     get(key, context, interpolateParams) {
         // No context: do a normal translate
-        if (!isDefined(context))
+        if (!isNil(context))
             return this.translate.get(key, interpolateParams);
         // Compute a contextual i18n key, using the context as suffix
         const contextKey = this.contextualKey(key, context);
@@ -2509,12 +2508,11 @@ class TranslateContextPipe {
         return this.value;
     }
 }
-TranslateContextPipe.ɵprov = i0.ɵɵdefineInjectable({ factory: function TranslateContextPipe_Factory() { return new TranslateContextPipe(i0.ɵɵinject(TranslateContextService), i0.ɵɵinject(i0.ChangeDetectorRef)); }, token: TranslateContextPipe, providedIn: "root" });
 TranslateContextPipe.decorators = [
+    { type: Injectable },
     { type: Pipe, args: [{
                 name: 'translateContext'
-            },] },
-    { type: Injectable, args: [{ providedIn: 'root' },] }
+            },] }
 ];
 TranslateContextPipe.ctorParameters = () => [
     { type: TranslateContextService },
@@ -2527,12 +2525,11 @@ class TranslatablePipe {
         return (_a = changeCaseToUnderscore(value)) === null || _a === void 0 ? void 0 : _a.toUpperCase();
     }
 }
-TranslatablePipe.ɵprov = i0.ɵɵdefineInjectable({ factory: function TranslatablePipe_Factory() { return new TranslatablePipe(); }, token: TranslatablePipe, providedIn: "root" });
 TranslatablePipe.decorators = [
     { type: Pipe, args: [{
                 name: 'translatable'
             },] },
-    { type: Injectable, args: [{ providedIn: 'root' },] }
+    { type: Injectable }
 ];
 
 class PropertyGetPipe {
@@ -16660,7 +16657,7 @@ class AppForm {
         this.error = null;
         this._enable = false;
         this._$ready = new BehaviorSubject(false);
-        this._loading = true;
+        this._$loading = new BehaviorSubject(true);
         this.i18nFieldPrefix = null;
         this._subscription = new Subscription();
         this.debug = false;
@@ -16676,8 +16673,20 @@ class AppForm {
         });
         this.autocompleteFields = this.autocompleteHelper.fields;
     }
-    get _ready() {
-        return this._$ready.value == true;
+    /**
+     *  @deprecated
+     */
+    set _loading(value) {
+        this._$loading.next(value);
+    }
+    /**
+     *  @deprecated
+     */
+    get _loading() {
+        return this._$loading.value;
+    }
+    get loading() {
+        return this._$loading.value;
     }
     get value() {
         return this.form.value;
@@ -16771,9 +16780,11 @@ class AppForm {
         if (this.debug)
             console.debug('[form] Updating form (using entity)', data);
         // Convert object to json, then apply it to form (e.g. convert 'undefined' into 'null')
-        AppFormUtils.copyEntity2Form(data, this.form, Object.assign({ emitEvent: false, onlySelf: true }, opts));
-        if (!opts || opts.emitEvent !== true)
+        AppFormUtils.copyEntity2Form(data, this.form, opts);
+        if (!opts || opts.emitEvent !== false) {
+            this.markAsLoaded({ emitEvent: false });
             this.markForCheck();
+        }
     }
     reset(data, opts) {
         if (data) {
@@ -16822,15 +16833,15 @@ class AppForm {
             this.markForCheck();
     }
     markAsLoading(opts) {
-        if (!this._loading) {
-            this._loading = true;
+        if (this._$loading.value !== true) {
+            this._$loading.next(true);
             if (!opts || opts.emitEvent !== false)
                 this.markForCheck();
         }
     }
     markAsLoaded(opts) {
-        if (this._loading) {
-            this._loading = false;
+        if (this._$loading.value !== false) {
+            this._$loading.next(false);
             if (!opts || opts.emitEvent !== false)
                 this.markForCheck();
         }
@@ -16920,7 +16931,6 @@ class AuthForm extends AppForm {
         this.network = network;
         this.cd = cd;
         this.environment = environment;
-        this.loading = false;
         this.canWorkOffline = false;
         this.showPwd = false;
         this.onCancel = new EventEmitter();
@@ -16968,13 +16978,13 @@ class AuthForm extends AppForm {
         }
         if (this.form.invalid || this.loading)
             return;
-        this.loading = true;
+        this.markAsLoading();
         const data = this.form.value;
         this.showPwd = false; // Hide password
         this.error = null; // Reset error
         this.registerSubscription(this.onSubmit
             .pipe(debounceTime(500))
-            .subscribe(res => this.loading = false));
+            .subscribe(res => this.markAsLoaded()));
         setTimeout(() => this.onSubmit.emit({
             username: data.username,
             password: data.password,
@@ -17613,7 +17623,6 @@ class AccountPage extends AppForm {
         this.translate = translate;
         this.settings = settings;
         this.cd = cd;
-        this.loading = true;
         this.email = {
             confirmed: false,
             notConfirmed: false,
@@ -17643,7 +17652,7 @@ class AccountPage extends AppForm {
                 this.onLogin(this.accountService.account);
             }
             else {
-                this.loading = false;
+                this.markAsLoaded();
             }
         }));
     }
@@ -17660,7 +17669,7 @@ class AccountPage extends AppForm {
         this.enable();
         this.markAsPristine();
         this.startListenChanges();
-        this.loading = false;
+        this.markAsLoaded();
     }
     onLogout() {
         this.isLogin = false;
@@ -17677,7 +17686,7 @@ class AccountPage extends AppForm {
     refresh(event) {
         return __awaiter(this, void 0, void 0, function* () {
             this.disable();
-            this.loading = true;
+            this.markAsLoading();
             return this.accountService.refresh();
         });
     }
@@ -18150,7 +18159,6 @@ class SettingsPage extends AppForm {
         this.cd = cd;
         this.network = network;
         this.locales = locales;
-        this.loading = true;
         this.saving = false;
         this.usageModes = ['FIELD', 'DESK'];
         this.propertyDefinitionsByKey = {};
@@ -18210,7 +18218,7 @@ class SettingsPage extends AppForm {
     }
     load() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.loading = true;
+            this.markAsLoading();
             console.debug('[settings] Loading settings...');
             const data = this.settings.settings;
             // Set defaults
@@ -18241,7 +18249,7 @@ class SettingsPage extends AppForm {
         this.enable({ emitEvent: false });
         // Apply inheritance
         this.setAccountInheritance(data.accountInheritance, { emitEvent: false });
-        this.loading = false;
+        this.markAsLoaded();
         this.error = null;
         this.markForCheck();
     }
@@ -18426,7 +18434,6 @@ class AppPropertiesForm extends AppForm {
         this.settings = settings;
         this.cd = cd;
         this.formGroupDir = formGroupDir;
-        this.loading = true;
         this.definitionsMapByKey = {};
         this.definitionsByIndex = {};
         //this.debug = !environment.production;
@@ -18495,7 +18502,7 @@ class AppPropertiesForm extends AppForm {
         this.helper.resize(values.length);
         this.helper.formArray.patchValue(values, { emitEvent: false });
         this.markAsPristine();
-        this.loading = false;
+        this.markAsLoaded();
     }
     /* -- protected methods -- */
     getPropertyFormGroup(data) {
@@ -18539,7 +18546,6 @@ class AppListForm extends AppForm {
         this.settings = settings;
         this.cd = cd;
         this.formGroupDir = formGroupDir;
-        this.loading = true;
         this.selection = new SelectionModel(true, []);
         this.displayWithFn = referentialToString;
         this.onNewItem = new EventEmitter();
@@ -18623,7 +18629,7 @@ class AppListForm extends AppForm {
         }
         this.selection.clear();
         this.markAsPristine();
-        this.loading = false;
+        this.markAsLoaded();
     }
     /** Whether the number of selected elements matches the total number of rows. */
     isAllSelected() {
@@ -22018,6 +22024,9 @@ class AppEditor {
     get tables() {
         return this._children && this._children.filter(c => c instanceof AppTable);
     }
+    get forms() {
+        return this._children && this._children.filter(c => c instanceof AppForm);
+    }
     get dirty() {
         var _a;
         return this._dirty || (((_a = this._children) === null || _a === void 0 ? void 0 : _a.findIndex(c => c.enabled && c.dirty)) !== -1) || false;
@@ -22138,10 +22147,15 @@ class AppEditor {
         }
     }
     markAsLoaded(opts) {
+        var _a;
         if (this._loading) {
             this._loading = false;
-            if (!opts || opts.emitEvent !== false)
+            if (!opts || opts.emitEvent !== false) {
+                // Emit to children forms
+                // Tables should be changed by parent
+                (_a = this.forms) === null || _a === void 0 ? void 0 : _a.forEach(c => c.markAsLoaded(opts));
                 this.markForCheck();
+            }
         }
     }
     markAsReady(opts) {
@@ -22659,12 +22673,20 @@ class AppEntityEditor extends AppTabEditor {
             this.error = null;
             // New data
             if (isNil(id)) {
-                // Create using default values
-                const data = new this.dataType();
-                this._usageMode = this.computeUsageMode(data);
-                yield this.onNewEntity(data, opts);
-                yield this.updateView(data, Object.assign({ openTabIndex: 0 }, opts));
-                this.markAsLoaded();
+                try {
+                    // Create using default values
+                    const data = new this.dataType();
+                    this._usageMode = this.computeUsageMode(data);
+                    yield this.onNewEntity(data, opts);
+                    yield this.updateView(data, Object.assign({ openTabIndex: 0 }, opts));
+                }
+                catch (err) {
+                    this.setError(err);
+                    this.selectedTabIndex = 0;
+                }
+                finally {
+                    this.markAsLoaded();
+                }
             }
             // Load existing data
             else {