@sumaris-net/ngx-components 0.28.1 → 0.28.5

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

@@ -36,7 +36,7 @@ import { MatAutocomplete, MatAutocompleteTrigger, MatAutocompleteModule, MAT_AUT
 import { __awaiter, __decorate } from 'tslib';
 import * as i1$6 from '@angular/forms';
 import { NG_VALUE_ACCESSOR, FormGroupDirective, AbstractControl, FormGroup, FormArray, FormControl, ReactiveFormsModule, Validators, FormBuilder } from '@angular/forms';
-import { timer, merge, fromEvent, Subscription, BehaviorSubject, Subject, isObservable, of, noop as noop$8, Observable, defer, from, combineLatest, EMPTY } from 'rxjs';
+import { timer, merge, fromEvent, Subscription, BehaviorSubject, Subject, isObservable, noop as noop$8, Observable, defer, of, from, combineLatest, EMPTY } from 'rxjs';
 import { filter, first, map, takeUntil, startWith, debounceTime, takeWhile, switchMap, tap, distinctUntilChanged, mergeMap, catchError, throttleTime, skip } from 'rxjs/operators';
 import * as i1$1 from '@ngx-translate/core';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
@@ -2431,23 +2431,41 @@ class TranslateContextService {
     }
     get(key, context, interpolateParams) {
         // No context: do a normal translate
-        if (!isNil(context))
+        if (!key || !isNil(context))
             return this.translate.get(key, interpolateParams);
         // Compute a contextual i18n key, using the context as suffix
-        const contextKey = this.contextualKey(key, context);
+        const contextualKeys = this.contextualKeys(key, context);
         // Return the contextual translation, or default of not exists
-        return this.translate.get(contextKey, interpolateParams)
-            .pipe(mergeMap(translation => (translation !== contextKey) ? of(translation) : this.translate.get(key)));
+        return this.translate.get(contextualKeys, interpolateParams)
+            .pipe(map(translations => this.findFirstValid(contextualKeys, translations)));
     }
     instant(key, context, interpolateParams) {
         // No context: do a normal translate
-        if (isNilOrBlank(context))
+        if (!key || isNilOrBlank(context))
             return this.translate.instant(key, interpolateParams);
         // Compute a contextual i18n key, using the context as suffix
-        const contextualKey = this.contextualKey(key, context);
-        // Return the contextual translation, or default of not exists
-        const translation = this.translate.instant(contextualKey, interpolateParams);
-        return (translation !== contextualKey) ? translation : this.translate.instant(key, interpolateParams);
+        const contextualKeys = this.contextualKeys(key, context);
+        const translations = this.translate.instant(contextualKeys, interpolateParams);
+        return this.findFirstValid(contextualKeys, translations);
+    }
+    /**
+     * Compute contextual i18n keys, using the context as suffix.<br>
+     * Suffix can be simple name (like 'aaa' - will return ['<key>.aaa']) or complexe (like 'aaa.bbb' - will return ['<key>.aaa.bbb', '<key>.aaa']
+     *
+     * @param key
+     * @param context
+     * @private
+     */
+    contextualKeys(key, context) {
+        return context.split('.')
+            .filter(isNotNilOrBlank)
+            .reduce((res, item) => {
+            const inheritedContext = res.length > 0 ? (res[res.length - 1] + '.') : '';
+            return res.concat(inheritedContext + item);
+        }, [])
+            .reverse() // Start with children, ends with parent key
+            .map(contextItem => this.contextualKey(key, contextItem))
+            .concat(key);
     }
     /**
      * Compute a contextual i18n key, using the context as suffix
@@ -2467,6 +2485,14 @@ class TranslateContextService {
             ? `${context}${key}`
             : parts.slice(0, parts.length - 1).concat(context + parts[parts.length - 1]).join('.');
     }
+    findFirstValid(keys, translations) {
+        // For eac contextual key: try to find translation, then use the first valid
+        for (let key of keys) {
+            if (translations[key] !== key)
+                return translations[key];
+        }
+        return translations[keys[keys.length - 1]]; // Return the last keys translation
+    }
 }
 TranslateContextService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TranslateContextService_Factory() { return new TranslateContextService(i0.ɵɵinject(i1$1.TranslateService)); }, token: TranslateContextService, providedIn: "root" });
 TranslateContextService.decorators = [
@@ -16657,7 +16683,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;
@@ -16673,8 +16699,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;
@@ -16768,9 +16806,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) {
@@ -16819,15 +16859,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();
         }
@@ -16917,7 +16957,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();
@@ -16965,13 +17004,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,
@@ -17610,7 +17649,6 @@ class AccountPage extends AppForm {
         this.translate = translate;
         this.settings = settings;
         this.cd = cd;
-        this.loading = true;
         this.email = {
             confirmed: false,
             notConfirmed: false,
@@ -17640,7 +17678,7 @@ class AccountPage extends AppForm {
                 this.onLogin(this.accountService.account);
             }
             else {
-                this.loading = false;
+                this.markAsLoaded();
             }
         }));
     }
@@ -17657,7 +17695,7 @@ class AccountPage extends AppForm {
         this.enable();
         this.markAsPristine();
         this.startListenChanges();
-        this.loading = false;
+        this.markAsLoaded();
     }
     onLogout() {
         this.isLogin = false;
@@ -17674,7 +17712,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();
         });
     }
@@ -18147,7 +18185,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 = {};
@@ -18207,7 +18244,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
@@ -18238,7 +18275,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();
     }
@@ -18423,7 +18460,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;
@@ -18492,7 +18528,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) {
@@ -18536,7 +18572,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();
@@ -18620,7 +18655,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() {
@@ -22015,6 +22050,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;
@@ -22135,10 +22173,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) {
@@ -22656,12 +22699,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 {