@sumaris-net/ngx-components 2.4.34 → 2.4.35

package/fesm2020/sumaris-net.ngx-components.mjs

@@ -9986,13 +9986,9 @@ class MatPaginatorI18n extends MatPaginatorIntl {
     constructor(translate) {
         super();
         this.translate = translate;
-        this.itemsPerPageLabel = 'Items per page';
-        this.nextPageLabel = 'Next page';
-        this.previousPageLabel = 'Previous page';
-        this.getRangeLabel = function (page, pageSize, length) {
-            const of = this.translate ? this.translate.instant('COMMON.PAGINATOR.OF') : 'of';
+        this.getRangeLabel = (page, pageSize, length) => {
             if (length === 0 || pageSize === 0) {
-                return '0 ' + of + ' ' + length;
+                return '0 ' + this.ofLabel + ' ' + length;
             }
             length = Math.max(length, 0);
             const startIndex = page * pageSize;
@@ -10000,17 +9996,25 @@ class MatPaginatorI18n extends MatPaginatorIntl {
             const endIndex = startIndex < length ?
                 Math.min(startIndex + pageSize, length) :
                 startIndex + pageSize;
-            return startIndex + 1 + ' - ' + endIndex + ' ' + of + ' ' + length;
+            return startIndex + 1 + ' - ' + endIndex + ' ' + this.ofLabel + ' ' + length;
         };
-        this.translate = translate;
-        translate.onLangChange.subscribe(() => this.translateLabels());
-        this.translateLabels();
+        this.translate.get([
+            'COMMON.PAGINATOR.ITEMS_PER_PAGE',
+            'COMMON.PAGINATOR.NEXT_PAGE',
+            'COMMON.PAGINATOR.PREVIOUS_PAGE',
+            'COMMON.PAGINATOR.OF',
+        ])
+            .subscribe((translations) => {
+            console.info('[MatPaginatorI18n] Update pagination translations');
+            this.itemsPerPageLabel = this._getTranslationValue(translations, 'COMMON.PAGINATOR.ITEMS_PER_PAGE', '');
+            this.nextPageLabel = this._getTranslationValue(translations, 'COMMON.PAGINATOR.NEXT_PAGE', '>');
+            this.previousPageLabel = this._getTranslationValue(translations, 'COMMON.PAGINATOR.PREVIOUS_PAGE', '<');
+            this.ofLabel = this._getTranslationValue(translations, 'COMMON.PAGINATOR.OF', '/');
+            this.changes.next();
+        });
     }
-    translateLabels() {
-        //console.debug("[i18n] Update pagination translations");
-        this.itemsPerPageLabel = this.translate.instant('COMMON.PAGINATOR.ITEMS_PER_PAGE');
-        this.nextPageLabel = this.translate.instant('COMMON.PAGINATOR.NEXT_PAGE');
-        this.previousPageLabel = this.translate.instant('COMMON.PAGINATOR.PREVIOUS_PAGE');
+    _getTranslationValue(translations, key, defaultValue) {
+        return (translations[key] !== key) ? translations[key] : defaultValue;
     }
 }
 MatPaginatorI18n.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: MatPaginatorI18n, deps: [{ token: i1$2.TranslateService }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -28923,8 +28927,9 @@ class AppEntityEditorModal extends AppTabEditor {
     }
     async updateView(data, opts) {
         this.resetError();
-        if (!this.data)
+        if (!data)
             throw { code: ErrorCodes.DATA_NOT_FOUND_ERROR, message: 'ERROR.DATA_NO_FOUND' };
+        this.data = data;
         await this.setValue(data);
         if (!opts || opts.emitEvent !== false) {
             this.markAsPristine();