@sumaris-net/ngx-components 0.25.11 → 0.25.12

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

@@ -22219,6 +22219,11 @@
         forward: [{ type: i0.Output }]
     };
 
+    var IFormI18nService = /** @class */ (function () {
+        function IFormI18nService() {
+        }
+        return IFormI18nService;
+    }());
     var FormErrorAdapter = /** @class */ (function () {
         function FormErrorAdapter(translate) {
             this.translate = translate;
@@ -22230,12 +22235,12 @@
             var separator = opts && opts.separator || ', ';
             var recursive = !opts || opts.recursive !== false;
             var errors = AppFormUtils.getFormErrors(form, { recursive: recursive });
-            var i18nErrors = errors && Object.keys(errors).reduce(function (res, key) {
-                var control = form.get(key);
+            var i18nErrors = errors && Object.keys(errors).reduce(function (res, fieldName) {
+                var control = form.get(fieldName);
                 // Should be a control map of errors
                 if (control) {
                     // Try to convert from a map, for one column control
-                    var i18nFieldNameKey = _this.getI18nFieldName(key, opts);
+                    var i18nFieldNameKey = _this.getI18nKey(fieldName, opts);
                     var i18nFieldName = _this.translate.instant(i18nFieldNameKey);
                     // OK, we have a field name: use it
                     var columnErrors = Object.keys(control.errors).map(function (errorKey) { return _this.getI18nError(errorKey, control.errors[errorKey]); });
@@ -22247,18 +22252,24 @@
                     return res + i18nFieldName + ": " + columnErrors.join(separator);
                 }
                 // Or try as global form error
-                var formError = _this.getI18nError(key, errors[key]);
+                var formError = _this.getI18nError(fieldName, errors[fieldName]);
                 if (isNil(formError))
                     return res;
                 return res + (res.length ? separator : '') + formError;
             }, "");
             return i18nErrors;
         };
-        FormErrorAdapter.prototype.getI18nFieldName = function (fieldName, opts) {
+        FormErrorAdapter.prototype.getI18nKey = function (fieldName, opts) {
+            if (opts === null || opts === void 0 ? void 0 : opts.i18nService) {
+                return opts === null || opts === void 0 ? void 0 : opts.i18nService.getI18nFieldName(fieldName);
+            }
             return (opts && opts.i18nPrefix || '') + changeCaseToUnderscore(fieldName).toUpperCase();
         };
-        FormErrorAdapter.prototype.getI18nError = function (errorKey, errorContent) {
+        FormErrorAdapter.prototype.getI18nError = function (errorKey, errorContent, opts) {
             var _this = this;
+            if ((opts === null || opts === void 0 ? void 0 : opts.i18nService) && (opts === null || opts === void 0 ? void 0 : opts.i18nService.getI18nError)) {
+                return opts === null || opts === void 0 ? void 0 : opts.i18nService.getI18nError(errorKey, errorContent);
+            }
             return SharedValidators.translateError(function (a, b) { return _this.translate.instant(a, b); }, errorKey, errorContent);
         };
         return FormErrorAdapter;
@@ -23362,6 +23373,7 @@
     // eslint-disable-next-line @angular-eslint/directive-class-suffix
     var AppTable = /** @class */ (function () {
         function AppTable(route, router, platform, location, modalCtrl, settings, columns, _dataSource, _filter, injector) {
+            var _this = this;
             this.route = route;
             this.router = router;
             this.platform = platform;
@@ -23410,13 +23422,18 @@
             this.onError = new i0.EventEmitter();
             this._paginator = null;
             this.mobile = this.platform.is('mobile');
-            this.translate = injector && injector.get(i1$2.TranslateService);
-            this.alertCtrl = injector && injector.get(i1$5.AlertController);
-            this.toastController = injector && injector.get(i1$5.ToastController);
+            this.translate = injector === null || injector === void 0 ? void 0 : injector.get(i1$2.TranslateService);
+            this.formErrorAdapter = injector === null || injector === void 0 ? void 0 : injector.get(FormErrorAdapter);
+            this.alertCtrl = injector === null || injector === void 0 ? void 0 : injector.get(i1$5.AlertController);
+            this.toastController = injector === null || injector === void 0 ? void 0 : injector.get(i1$5.ToastController);
             this._autocompleteConfigHolder = new MatAutocompleteConfigHolder({
                 getUserAttributes: function (a, b) { return settings.getFieldDisplayAttributes(a, b); }
             });
             this.autocompleteFields = this._autocompleteConfigHolder.fields;
+            this.i18nService = (injector === null || injector === void 0 ? void 0 : injector.get(IFormI18nService)) || {
+                getI18nFieldName: function (f) { return _this.getI18nFieldName(f); },
+                getI18nError: function (e, c) { return _this.getI18nError(e, c); }
+            };
         }
         Object.defineProperty(AppTable.prototype, "error", {
             get: function () {
@@ -24881,40 +24898,14 @@
             this.setError(undefined, opts);
         };
         AppTable.prototype.getRowError = function (row, opts) {
-            var _this = this;
             row = row || this.editedRow;
-            if (!row || !this.translate)
+            if (!row || !this.formErrorAdapter)
                 return undefined;
-            var separator = opts && opts.separator || ', ';
-            var recursive = !opts || opts.recursive !== false;
-            var errors = AppFormUtils.getFormErrors(row.validator, { recursive: recursive });
-            var i18nErrors = errors && Object.keys(errors).reduce(function (res, key) {
-                var control = row.validator.get(key);
-                // Should be a control map of errors
-                if (control) {
-                    // Try to convert from a map, for one column control
-                    var i18nFieldNameKey = _this.getI18nFieldName(key);
-                    var i18nFieldName = _this.translate.instant(i18nFieldNameKey);
-                    // OK, we have a field name: use it
-                    var columnErrors = Object.keys(control.errors).map(function (errorKey) { return _this.getI18nError(errorKey, control.errors[errorKey]); });
-                    if (isEmptyArray(columnErrors))
-                        return res;
-                    // Add separator
-                    if (res.length)
-                        res += separator;
-                    return res + i18nFieldName + ": " + columnErrors.join(separator);
-                }
-                // Or try as global form error
-                var formError = _this.getI18nError(key, errors[key]);
-                if (isNil(formError))
-                    return res;
-                return res + (res.length ? separator : '') + formError;
-            }, "");
-            return i18nErrors;
+            return this.formErrorAdapter.formatError(row.validator, Object.assign({ i18nService: this.i18nService }, opts));
         };
         AppTable.prototype.getI18nFieldName = function (fieldName) {
-            // Use columns has default name
             // Can be override by subclasses, to resolve all field name
+            // Use columns has default name
             return this.getI18nColumnName(fieldName);
         };
         AppTable.prototype.getI18nError = function (errorKey, errorContent) {
@@ -27790,6 +27781,7 @@
     exports.HomePage = HomePage;
     exports.Hotkeys = Hotkeys;
     exports.HotkeysDialogComponent = HotkeysDialogComponent;
+    exports.IFormI18nService = IFormI18nService;
     exports.InMemoryEntitiesService = InMemoryEntitiesService;
     exports.IsLoginAccountPipe = IsLoginAccountPipe;
     exports.IsNilOrBlankPipe = IsNilOrBlankPipe;