@sumaris-net/ngx-components 0.28.1 → 0.28.5

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

@@ -2854,23 +2854,42 @@
         TranslateContextService.prototype.get = function (key, context, interpolateParams) {
             var _this = this;
             // 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
-            var contextKey = this.contextualKey(key, context);
+            var contextualKeys = this.contextualKeys(key, context);
             // Return the contextual translation, or default of not exists
-            return this.translate.get(contextKey, interpolateParams)
-                .pipe(operators.mergeMap(function (translation) { return (translation !== contextKey) ? rxjs.of(translation) : _this.translate.get(key); }));
+            return this.translate.get(contextualKeys, interpolateParams)
+                .pipe(operators.map(function (translations) { return _this.findFirstValid(contextualKeys, translations); }));
         };
         TranslateContextService.prototype.instant = function (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
-            var contextualKey = this.contextualKey(key, context);
-            // Return the contextual translation, or default of not exists
-            var translation = this.translate.instant(contextualKey, interpolateParams);
-            return (translation !== contextualKey) ? translation : this.translate.instant(key, interpolateParams);
+            var contextualKeys = this.contextualKeys(key, context);
+            var 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
+         */
+        TranslateContextService.prototype.contextualKeys = function (key, context) {
+            var _this = this;
+            return context.split('.')
+                .filter(isNotNilOrBlank)
+                .reduce(function (res, item) {
+                var inheritedContext = res.length > 0 ? (res[res.length - 1] + '.') : '';
+                return res.concat(inheritedContext + item);
+            }, [])
+                .reverse() // Start with children, ends with parent key
+                .map(function (contextItem) { return _this.contextualKey(key, contextItem); })
+                .concat(key);
         };
         /**
          * Compute a contextual i18n key, using the context as suffix
@@ -2890,6 +2909,25 @@
                 ? "" + context + key
                 : parts.slice(0, parts.length - 1).concat(context + parts[parts.length - 1]).join('.');
         };
+        TranslateContextService.prototype.findFirstValid = function (keys, translations) {
+            var e_1, _a;
+            try {
+                // For eac contextual key: try to find translation, then use the first valid
+                for (var keys_1 = __values(keys), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
+                    var key = keys_1_1.value;
+                    if (translations[key] !== key)
+                        return translations[key];
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (keys_1_1 && !keys_1_1.done && (_a = keys_1.return)) _a.call(keys_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            return translations[keys[keys.length - 1]]; // Return the last keys translation
+        };
         return TranslateContextService;
     }());
     TranslateContextService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function TranslateContextService_Factory() { return new TranslateContextService(i0__namespace.ɵɵinject(i1__namespace$1.TranslateService)); }, token: TranslateContextService, providedIn: "root" });
@@ -19139,7 +19177,7 @@
             this.error = null;
             this._enable = false;
             this._$ready = new rxjs.BehaviorSubject(false);
-            this._loading = true;
+            this._$loading = new rxjs.BehaviorSubject(true);
             this.i18nFieldPrefix = null;
             this._subscription = new rxjs.Subscription();
             this.debug = false;
@@ -19155,9 +19193,25 @@
             });
             this.autocompleteFields = this.autocompleteHelper.fields;
         }
-        Object.defineProperty(AppForm.prototype, "_ready", {
+        Object.defineProperty(AppForm.prototype, "_loading", {
+            /**
+             *  @deprecated
+             */
             get: function () {
-                return this._$ready.value == true;
+                return this._$loading.value;
+            },
+            /**
+             *  @deprecated
+             */
+            set: function (value) {
+                this._$loading.next(value);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(AppForm.prototype, "loading", {
+            get: function () {
+                return this._$loading.value;
             },
             enumerable: false,
             configurable: true
@@ -19295,9 +19349,11 @@
             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();
+            }
         };
         AppForm.prototype.reset = function (data, opts) {
             if (data) {
@@ -19346,15 +19402,15 @@
                 this.markForCheck();
         };
         AppForm.prototype.markAsLoading = function (opts) {
-            if (!this._loading) {
-                this._loading = true;
+            if (this._$loading.value !== true) {
+                this._$loading.next(true);
                 if (!opts || opts.emitEvent !== false)
                     this.markForCheck();
             }
         };
         AppForm.prototype.markAsLoaded = function (opts) {
-            if (this._loading) {
-                this._loading = false;
+            if (this._$loading.value !== false) {
+                this._$loading.next(false);
                 if (!opts || opts.emitEvent !== false)
                     this.markForCheck();
             }
@@ -19455,7 +19511,6 @@
             _this.network = network;
             _this.cd = cd;
             _this.environment = environment;
-            _this.loading = false;
             _this.canWorkOffline = false;
             _this.showPwd = false;
             _this.onCancel = new i0.EventEmitter();
@@ -19506,13 +19561,13 @@
             }
             if (this.form.invalid || this.loading)
                 return;
-            this.loading = true;
+            this.markAsLoading();
             var data = this.form.value;
             this.showPwd = false; // Hide password
             this.error = null; // Reset error
             this.registerSubscription(this.onSubmit
                 .pipe(operators.debounceTime(500))
-                .subscribe(function (res) { return _this.loading = false; }));
+                .subscribe(function (res) { return _this.markAsLoaded(); }));
             setTimeout(function () { return _this.onSubmit.emit({
                 username: data.username,
                 password: data.password,
@@ -20267,7 +20322,6 @@
             _this.translate = translate;
             _this.settings = settings;
             _this.cd = cd;
-            _this.loading = true;
             _this.email = {
                 confirmed: false,
                 notConfirmed: false,
@@ -20297,7 +20351,7 @@
                     _this.onLogin(_this.accountService.account);
                 }
                 else {
-                    _this.loading = false;
+                    _this.markAsLoaded();
                 }
             }));
             return _this;
@@ -20315,7 +20369,7 @@
             this.enable();
             this.markAsPristine();
             this.startListenChanges();
-            this.loading = false;
+            this.markAsLoaded();
         };
         AccountPage.prototype.onLogout = function () {
             this.isLogin = false;
@@ -20333,7 +20387,7 @@
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     this.disable();
-                    this.loading = true;
+                    this.markAsLoading();
                     return [2 /*return*/, this.accountService.refresh()];
                 });
             });
@@ -20867,7 +20921,6 @@
             _this.cd = cd;
             _this.network = network;
             _this.locales = locales;
-            _this.loading = true;
             _this.saving = false;
             _this.usageModes = ['FIELD', 'DESK'];
             _this.propertyDefinitionsByKey = {};
@@ -20957,7 +21010,7 @@
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            this.loading = true;
+                            this.markAsLoading();
                             console.debug('[settings] Loading settings...');
                             data = this.settings.settings;
                             // Set defaults
@@ -20993,7 +21046,7 @@
             this.enable({ emitEvent: false });
             // Apply inheritance
             this.setAccountInheritance(data.accountInheritance, { emitEvent: false });
-            this.loading = false;
+            this.markAsLoaded();
             this.error = null;
             this.markForCheck();
         };
@@ -21232,7 +21285,6 @@
             _this.settings = settings;
             _this.cd = cd;
             _this.formGroupDir = formGroupDir;
-            _this.loading = true;
             _this.definitionsMapByKey = {};
             _this.definitionsByIndex = {};
             return _this;
@@ -21311,7 +21363,7 @@
             this.helper.resize(values.length);
             this.helper.formArray.patchValue(values, { emitEvent: false });
             this.markAsPristine();
-            this.loading = false;
+            this.markAsLoaded();
         };
         /* -- protected methods -- */
         AppPropertiesForm.prototype.getPropertyFormGroup = function (data) {
@@ -21357,7 +21409,6 @@
             _this.settings = settings;
             _this.cd = cd;
             _this.formGroupDir = formGroupDir;
-            _this.loading = true;
             _this.selection = new collections.SelectionModel(true, []);
             _this.displayWithFn = referentialToString;
             _this.onNewItem = new i0.EventEmitter();
@@ -21483,7 +21534,7 @@
             }
             this.selection.clear();
             this.markAsPristine();
-            this.loading = false;
+            this.markAsLoaded();
         };
         /** Whether the number of selected elements matches the total number of rows. */
         AppListForm.prototype.isAllSelected = function () {
@@ -25516,6 +25567,13 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(AppEditor.prototype, "forms", {
+            get: function () {
+                return this._children && this._children.filter(function (c) { return c instanceof AppForm; });
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(AppEditor.prototype, "dirty", {
             get: function () {
                 var _a;
@@ -25674,10 +25732,15 @@
             }
         };
         AppEditor.prototype.markAsLoaded = function (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(function (c) { return c.markAsLoaded(opts); });
                     this.markForCheck();
+                }
             }
         };
         AppEditor.prototype.markAsReady = function (opts) {
@@ -26298,49 +26361,60 @@
          */
         AppEntityEditor.prototype.load = function (id, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var data, data, err_1;
+                var data, err_1, data, err_2;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             if (!this.dataService)
                                 throw new Error('Cannot load data: missing \'dataService\'!');
                             this.error = null;
-                            if (!isNil(id)) return [3 /*break*/, 3];
+                            if (!isNil(id)) return [3 /*break*/, 7];
+                            _b.label = 1;
+                        case 1:
+                            _b.trys.push([1, 4, 5, 6]);
                             data = new this.dataType();
                             this._usageMode = this.computeUsageMode(data);
                             return [4 /*yield*/, this.onNewEntity(data, opts)];
-                        case 1:
+                        case 2:
                             _b.sent();
                             return [4 /*yield*/, this.updateView(data, Object.assign({ openTabIndex: 0 }, opts))];
-                        case 2:
+                        case 3:
                             _b.sent();
+                            return [3 /*break*/, 6];
+                        case 4:
+                            err_1 = _b.sent();
+                            this.setError(err_1);
+                            this.selectedTabIndex = 0;
+                            return [3 /*break*/, 6];
+                        case 5:
                             this.markAsLoaded();
-                            return [3 /*break*/, 9];
-                        case 3:
-                            _b.trys.push([3, 7, 8, 9]);
+                            return [7 /*endfinally*/];
+                        case 6: return [3 /*break*/, 13];
+                        case 7:
+                            _b.trys.push([7, 11, 12, 13]);
                             return [4 /*yield*/, this.dataService.load(id, opts)];
-                        case 4:
+                        case 8:
                             data = _b.sent();
                             if (!data)
                                 throw { code: ErrorCodes$2.DATA_NOT_FOUND_ERROR, message: 'ERROR.DATA_NO_FOUND' };
                             this._usageMode = this.computeUsageMode(data);
                             return [4 /*yield*/, this.onEntityLoaded(data, opts)];
-                        case 5:
+                        case 9:
                             _b.sent();
                             return [4 /*yield*/, this.updateView(data, opts)];
-                        case 6:
+                        case 10:
                             _b.sent();
                             this.startListenRemoteChanges();
-                            return [3 /*break*/, 9];
-                        case 7:
-                            err_1 = _b.sent();
-                            this.setError(err_1);
+                            return [3 /*break*/, 13];
+                        case 11:
+                            err_2 = _b.sent();
+                            this.setError(err_2);
                             this.selectedTabIndex = 0;
-                            return [3 /*break*/, 9];
-                        case 8:
+                            return [3 /*break*/, 13];
+                        case 12:
                             this.markAsLoaded();
                             return [7 /*endfinally*/];
-                        case 9: return [2 /*return*/];
+                        case 13: return [2 /*return*/];
                     }
                 });
             });
@@ -26515,7 +26589,7 @@
          */
         AppEntityEditor.prototype.save = function (event, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var data, updatedData, err_2;
+                var data, updatedData, err_3;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -26568,15 +26642,15 @@
                             this.submitted = false;
                             return [2 /*return*/, true];
                         case 7:
-                            err_2 = _b.sent();
+                            err_3 = _b.sent();
                             this.submitted = true;
-                            this.setError(err_2);
+                            this.setError(err_3);
                             this.selectedTabIndex = 0;
                             this.scrollToTop(); // Scroll to top (to show error)
                             this.markAsDirty();
                             this.enable();
                             // Concurrent change on pod
-                            if (err_2.code === ServerErrorCodes.BAD_UPDATE_DATE && isNotNil(this.data.id)) {
+                            if (err_3.code === ServerErrorCodes.BAD_UPDATE_DATE && isNotNil(this.data.id)) {
                                 // Call a data reload (in background), to update the GraphQL cache, and allow to cancel changes
                                 this.dataService.load(this.data.id, { fetchPolicy: 'network-only' }).then(function () {
                                     console.debug('[data-editor] Data cache reloaded. User can reload page');
@@ -26629,7 +26703,7 @@
         };
         AppEntityEditor.prototype.delete = function (event) {
             return __awaiter(this, void 0, void 0, function () {
-                var confirmation, data, isNew, err_3;
+                var confirmation, data, isNew, err_4;
                 var _this = this;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -26664,9 +26738,9 @@
                             this.removePageHistory();
                             return [3 /*break*/, 8];
                         case 7:
-                            err_3 = _b.sent();
+                            err_4 = _b.sent();
                             this.submitted = true;
-                            this.setError(err_3);
+                            this.setError(err_4);
                             this.selectedTabIndex = 0;
                             this.markAsSaved();
                             this.enable();