@sumaris-net/ngx-components 1.3.2 → 1.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/sumaris-net.ngx-components.umd.js +31 -6
- package/bundles/sumaris-net.ngx-components.umd.js.map +1 -1
- package/bundles/sumaris-net.ngx-components.umd.min.js +1 -1
- package/bundles/sumaris-net.ngx-components.umd.min.js.map +1 -1
- package/esm2015/src/app/core/form/entity-editor.class.js +4 -4
- package/esm2015/src/app/core/form/form.class.js +2 -2
- package/esm2015/src/app/core/table/table.class.js +2 -2
- package/esm2015/src/app/shared/pipes/form.pipes.js +2 -2
- package/esm2015/src/app/shared/validator/form-error-adapter.class.js +26 -2
- package/fesm2015/sumaris-net.ngx-components.js +30 -6
- package/fesm2015/sumaris-net.ngx-components.js.map +1 -1
- package/package.json +1 -1
- package/src/app/core/form/entity-editor.class.d.ts +1 -1
- package/src/app/shared/validator/form-error-adapter.class.d.ts +3 -1
- package/sumaris-net.ngx-components.metadata.json +1 -1
|
@@ -39,7 +39,7 @@ export class FormErrorTranslatePipe {
|
|
|
39
39
|
}
|
|
40
40
|
_updateValue(form, opts, status) {
|
|
41
41
|
if (status === 'INVALID' || form.invalid) {
|
|
42
|
-
this.value = this.adapter.
|
|
42
|
+
this.value = this.adapter.translateFormErrors(form, opts);
|
|
43
43
|
this._ref.markForCheck();
|
|
44
44
|
}
|
|
45
45
|
else if (this.value !== undefined) {
|
|
@@ -67,4 +67,4 @@ FormErrorTranslatePipe.ctorParameters = () => [
|
|
|
67
67
|
{ type: FormErrorTranslator },
|
|
68
68
|
{ type: ChangeDetectorRef }
|
|
69
69
|
];
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS5waXBlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcHAvc2hhcmVkL3BpcGVzL2Zvcm0ucGlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLGlCQUFpQixFQUFhLElBQUksRUFBZ0IsTUFBTSxlQUFlLENBQUM7QUFFaEYsT0FBTyxFQUFDLG1CQUFtQixFQUE2QixNQUFNLHVDQUF1QyxDQUFDO0FBRXRHLE9BQU8sRUFBQyxNQUFNLEVBQUMsTUFBTSxjQUFjLENBQUM7QUFNcEMsTUFBTSxPQUFPLHNCQUFzQjtJQVFqQyxZQUNVLE9BQTRCLEVBQzVCLElBQXVCO1FBRHZCLFlBQU8sR0FBUCxPQUFPLENBQXFCO1FBQzVCLFNBQUksR0FBSixJQUFJLENBQW1CO1FBUmpDLFVBQUssR0FBVyxFQUFFLENBQUM7UUFFWCxjQUFTLEdBQXFCLElBQUksQ0FBQztRQUNuQyxpQkFBWSxHQUFzQyxJQUFJLENBQUM7SUFPL0QsQ0FBQztJQUVELFNBQVMsQ0FBQyxJQUFlLEVBQUUsSUFBaUM7UUFDMUQsSUFBSSxDQUFDLElBQUksRUFBRTtZQUNULElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNoQixPQUFPLEVBQUUsQ0FBQztTQUNYO1FBRUQsMkVBQTJFO1FBQzNFLElBQUksSUFBSSxLQUFLLElBQUksQ0FBQyxTQUFTLElBQUksTUFBTSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsWUFBWSxDQUFDLEVBQUU7WUFDOUQsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDO1NBQ25CO1FBRUQsc0NBQXNDO1FBQ3RDLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDO1FBRXRCLHdDQUF3QztRQUN4QyxJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQztRQUV6QixnQkFBZ0I7UUFDaEIsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFOUIsdURBQXVEO1FBQ3ZELElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUVoQiwwRUFBMEU7UUFDMUUsSUFBSSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsRUFBRTtZQUM3QixJQUFJLENBQUMsbUJBQW1CLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQyxTQUFTLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRTtnQkFDakUsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1lBQ3hDLENBQUMsQ0FBQyxDQUFDO1NBQ0o7UUFFRCxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUM7SUFDcEIsQ0FBQztJQUVELFdBQVc7UUFDVCxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDbEIsQ0FBQztJQUVPLFlBQVksQ0FBQyxJQUFlLEVBQUUsSUFBaUMsRUFBRSxNQUFZO1FBQ25GLElBQUksTUFBTSxLQUFLLFNBQVMsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ3hDLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7WUFDMUQsSUFBSSxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztTQUMxQjthQUNJLElBQUksSUFBSSxDQUFDLEtBQUssS0FBSyxTQUFTLEVBQUU7WUFDakMsSUFBSSxDQUFDLEtBQUssR0FBRyxTQUFTLENBQUM7WUFDdkIsSUFBSSxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztTQUMxQjtJQUNILENBQUM7SUFFRDs7T0FFRztJQUNLLFFBQVE7UUFDZCxJQUFJLE9BQU8sSUFBSSxDQUFDLG1CQUFtQixLQUFLLFdBQVcsRUFBRTtZQUNuRCxJQUFJLENBQUMsbUJBQW1CLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDdkMsSUFBSSxDQUFDLG1CQUFtQixHQUFHLFNBQVMsQ0FBQztTQUN0QztJQUNILENBQUM7OztZQTFFRixJQUFJLFNBQUM7Z0JBQ0osSUFBSSxFQUFFLG9CQUFvQjtnQkFDMUIsSUFBSSxFQUFFLEtBQUs7YUFDWjs7O1lBUE8sbUJBQW1CO1lBRm5CLGlCQUFpQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7Q2hhbmdlRGV0ZWN0b3JSZWYsIE9uRGVzdHJveSwgUGlwZSwgUGlwZVRyYW5zZm9ybX0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQge0Zvcm1Hcm91cH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuaW1wb3J0IHtGb3JtRXJyb3JUcmFuc2xhdG9yLCBGb3JtRXJyb3JUcmFuc2xhdG9yT3B0aW9uc30gZnJvbSAnLi4vdmFsaWRhdG9yL2Zvcm0tZXJyb3ItYWRhcHRlci5jbGFzcyc7XG5pbXBvcnQge1N1YnNjcmlwdGlvbn0gZnJvbSAncnhqcyc7XG5pbXBvcnQge2VxdWFsc30gZnJvbSAnLi4vZnVuY3Rpb25zJztcblxuQFBpcGUoe1xuICBuYW1lOiAndHJhbnNsYXRlRm9ybUVycm9yJyxcbiAgcHVyZTogZmFsc2Vcbn0pXG5leHBvcnQgY2xhc3MgRm9ybUVycm9yVHJhbnNsYXRlUGlwZSBpbXBsZW1lbnRzIFBpcGVUcmFuc2Zvcm0sIE9uRGVzdHJveSB7XG5cbiAgdmFsdWU6IHN0cmluZyA9ICcnO1xuXG4gIHByaXZhdGUgX2xhc3RGb3JtOiBGb3JtR3JvdXAgfCBudWxsID0gbnVsbDtcbiAgcHJpdmF0ZSBfbGFzdE9wdGlvbnM6IEZvcm1FcnJvclRyYW5zbGF0b3JPcHRpb25zIHwgbnVsbCA9IG51bGw7XG4gIHByaXZhdGUgX29uRm9ybVN0YXR1c0NoYW5nZTogU3Vic2NyaXB0aW9uIHwgdW5kZWZpbmVkO1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgYWRhcHRlcjogRm9ybUVycm9yVHJhbnNsYXRvcixcbiAgICBwcml2YXRlIF9yZWY6IENoYW5nZURldGVjdG9yUmVmXG4gICkge1xuICB9XG5cbiAgdHJhbnNmb3JtKGZvcm06IEZvcm1Hcm91cCwgb3B0cz86IEZvcm1FcnJvclRyYW5zbGF0b3JPcHRpb25zKTogc3RyaW5nIHtcbiAgICBpZiAoIWZvcm0pIHtcbiAgICAgIHRoaXMuX2Rpc3Bvc2UoKTtcbiAgICAgIHJldHVybiAnJztcbiAgICB9XG5cbiAgICAvLyBpZiB3ZSBhc2sgYW5vdGhlciB0aW1lIGZvciB0aGUgc2FtZSBmb3JtIGFuZCBvcHRzLCByZXR1cm4gdGhlIGxhc3QgdmFsdWVcbiAgICBpZiAoZm9ybSA9PT0gdGhpcy5fbGFzdEZvcm0gJiYgZXF1YWxzKG9wdHMsIHRoaXMuX2xhc3RPcHRpb25zKSkge1xuICAgICAgcmV0dXJuIHRoaXMudmFsdWU7XG4gICAgfVxuXG4gICAgLy8gc3RvcmUgdGhlIHF1ZXJ5LCBpbiBjYXNlIGl0IGNoYW5nZXNcbiAgICB0aGlzLl9sYXN0Rm9ybSA9IGZvcm07XG5cbiAgICAvLyBzdG9yZSB0aGUgcGFyYW1zLCBpbiBjYXNlIHRoZXkgY2hhbmdlXG4gICAgdGhpcy5fbGFzdE9wdGlvbnMgPSBvcHRzO1xuXG4gICAgLy8gc2V0IHRoZSB2YWx1ZVxuICAgIHRoaXMuX3VwZGF0ZVZhbHVlKGZvcm0sIG9wdHMpO1xuXG4gICAgLy8gaWYgdGhlcmUgaXMgYSBzdWJzY3JpcHRpb24gdG8gb25MYW5nQ2hhbmdlLCBjbGVhbiBpdFxuICAgIHRoaXMuX2Rpc3Bvc2UoKTtcblxuICAgIC8vIHN1YnNjcmliZSB0byBvblRyYW5zbGF0aW9uQ2hhbmdlIGV2ZW50LCBpbiBjYXNlIHRoZSB0cmFuc2xhdGlvbnMgY2hhbmdlXG4gICAgaWYgKCF0aGlzLl9vbkZvcm1TdGF0dXNDaGFuZ2UpIHtcbiAgICAgIHRoaXMuX29uRm9ybVN0YXR1c0NoYW5nZSA9IGZvcm0uc3RhdHVzQ2hhbmdlcy5zdWJzY3JpYmUoKHN0YXR1cykgPT4ge1xuICAgICAgICB0aGlzLl91cGRhdGVWYWx1ZShmb3JtLCBvcHRzLCBzdGF0dXMpO1xuICAgICAgfSk7XG4gICAgfVxuXG4gICAgcmV0dXJuIHRoaXMudmFsdWU7XG4gIH1cblxuICBuZ09uRGVzdHJveSgpOiB2b2lkIHtcbiAgICB0aGlzLl9kaXNwb3NlKCk7XG4gIH1cblxuICBwcml2YXRlIF91cGRhdGVWYWx1ZShmb3JtOiBGb3JtR3JvdXAsIG9wdHM/OiBGb3JtRXJyb3JUcmFuc2xhdG9yT3B0aW9ucywgc3RhdHVzPzogYW55KSB7XG4gICAgaWYgKHN0YXR1cyA9PT0gJ0lOVkFMSUQnIHx8IGZvcm0uaW52YWxpZCkge1xuICAgICAgdGhpcy52YWx1ZSA9IHRoaXMuYWRhcHRlci50cmFuc2xhdGVGb3JtRXJyb3JzKGZvcm0sIG9wdHMpO1xuICAgICAgdGhpcy5fcmVmLm1hcmtGb3JDaGVjaygpO1xuICAgIH1cbiAgICBlbHNlIGlmICh0aGlzLnZhbHVlICE9PSB1bmRlZmluZWQpIHtcbiAgICAgIHRoaXMudmFsdWUgPSB1bmRlZmluZWQ7XG4gICAgICB0aGlzLl9yZWYubWFya0ZvckNoZWNrKCk7XG4gICAgfVxuICB9XG5cbiAgLyoqXG4gICAqIENsZWFuIGFueSBleGlzdGluZyBzdWJzY3JpcHRpb24gdG8gY2hhbmdlIGV2ZW50c1xuICAgKi9cbiAgcHJpdmF0ZSBfZGlzcG9zZSgpOiB2b2lkIHtcbiAgICBpZiAodHlwZW9mIHRoaXMuX29uRm9ybVN0YXR1c0NoYW5nZSAhPT0gJ3VuZGVmaW5lZCcpIHtcbiAgICAgIHRoaXMuX29uRm9ybVN0YXR1c0NoYW5nZS51bnN1YnNjcmliZSgpO1xuICAgICAgdGhpcy5fb25Gb3JtU3RhdHVzQ2hhbmdlID0gdW5kZWZpbmVkO1xuICAgIH1cbiAgfVxufVxuIl19
|
|
@@ -11,7 +11,7 @@ export class FormErrorTranslator {
|
|
|
11
11
|
this.translate = translate;
|
|
12
12
|
this.errorI18nKeys = Object.assign(Object.assign({}, SharedValidators.I18N_ERROR_KEYS), errorI18nKeys);
|
|
13
13
|
}
|
|
14
|
-
|
|
14
|
+
translateFormErrors(control, opts) {
|
|
15
15
|
if (!control || !control.invalid)
|
|
16
16
|
return '';
|
|
17
17
|
const separator = opts && opts.separator || ', ';
|
|
@@ -39,6 +39,30 @@ export class FormErrorTranslator {
|
|
|
39
39
|
return res + (res.length ? separator : '') + formError;
|
|
40
40
|
}, "");
|
|
41
41
|
}
|
|
42
|
+
translateErrors(errors, opts) {
|
|
43
|
+
const separator = opts && opts.separator || ', ';
|
|
44
|
+
return errors && Object.keys(errors).reduce((res, path) => {
|
|
45
|
+
const pathErrors = errors[path];
|
|
46
|
+
// Should be a control map of errors
|
|
47
|
+
if (pathErrors) {
|
|
48
|
+
// Try to convert the control path
|
|
49
|
+
const i18nPath = this.translateControlPath(path, opts);
|
|
50
|
+
// OK, we have a field name: use it
|
|
51
|
+
const columnErrors = Object.keys(pathErrors).map(errorKey => this.translateError(errorKey, pathErrors[errorKey]));
|
|
52
|
+
if (isEmptyArray(columnErrors))
|
|
53
|
+
return res;
|
|
54
|
+
// Add separator
|
|
55
|
+
if (res.length)
|
|
56
|
+
res += separator;
|
|
57
|
+
return res + i18nPath + ": " + columnErrors.join(separator);
|
|
58
|
+
}
|
|
59
|
+
// Or try as global form error
|
|
60
|
+
const formError = this.translateError(path, pathErrors);
|
|
61
|
+
if (isNil(formError))
|
|
62
|
+
return res;
|
|
63
|
+
return res + (res.length ? separator : '') + formError;
|
|
64
|
+
}, "");
|
|
65
|
+
}
|
|
42
66
|
translateControlPath(path, opts) {
|
|
43
67
|
if (opts === null || opts === void 0 ? void 0 : opts.controlPathTranslator) {
|
|
44
68
|
return opts === null || opts === void 0 ? void 0 : opts.controlPathTranslator.translateControlPath(path);
|
|
@@ -72,4 +96,4 @@ FormErrorTranslator.ctorParameters = () => [
|
|
|
72
96
|
{ type: TranslateService },
|
|
73
97
|
{ type: undefined, decorators: [{ type: Optional }, { type: Inject, args: [APP_FORM_ERROR_I18N_KEYS,] }] }
|
|
74
98
|
];
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form-error-adapter.class.js","sourceRoot":"","sources":["../../../../../../src/app/shared/validator/form-error-adapter.class.ts"],"names":[],"mappings":"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","sourcesContent":["import { changeCaseToUnderscore, isEmptyArray, isNil } from '../functions';\nimport { Inject, Injectable, InjectionToken, Optional } from '@angular/core';\nimport { TranslateService } from '@ngx-translate/core';\nimport { AbstractControl } from '@angular/forms';\nimport { AppFormUtils } from '../../core/form/form.utils';\nimport { SharedValidators } from './validators';\nimport { ObjectMap } from '../types';\n\n\nexport const APP_FORM_ERROR_I18N_KEYS = new InjectionToken<ObjectMap<string>>('appFormErrorKeys');\n\nexport interface IFormControlPathTranslator {\n  translateControlPath: (controlPath: string) => string;\n}\n\nexport interface FormErrorTranslatorOptions {\n  i18nPrefix?: string;\n  controlPathTranslator?: IFormControlPathTranslator;\n  separator?: string;\n  recursive?: boolean;\n}\n\n@Injectable({providedIn: 'root'})\nexport class FormErrorTranslator implements IFormControlPathTranslator {\n\n  private readonly errorI18nKeys: ObjectMap<string>;\n\n  constructor(\n    private translate: TranslateService,\n    @Optional() @Inject(APP_FORM_ERROR_I18N_KEYS) errorI18nKeys: ObjectMap<string>\n  ) {\n    this.errorI18nKeys = {\n      ...SharedValidators.I18N_ERROR_KEYS,\n      ...errorI18nKeys\n    };\n  }\n\n  translateErrors(control: AbstractControl, opts?: FormErrorTranslatorOptions): string {\n    if (!control || !control.invalid) return '';\n\n    const separator = opts && opts.separator || ', ';\n    const recursive = !opts || opts.recursive !== false\n    const errors = AppFormUtils.getFormErrors(control, {recursive});\n    return errors && Object.keys(errors).reduce((res, path) => {\n\n      const childControl = control.get(path);\n      // Should be a control map of errors\n      if (childControl) {\n        // Try to convert the control path\n        const i18nPath = this.translateControlPath(path, opts);\n\n        // OK, we have a field name: use it\n        const columnErrors = Object.keys(childControl.errors).map(errorKey => this.translateError(errorKey, childControl.errors[errorKey]));\n        if (isEmptyArray(columnErrors)) return res;\n        // Add separator\n        if (res.length) res += separator;\n        return res + i18nPath + \": \" + columnErrors.join(separator);\n      }\n\n      // Or try as global form error\n      const formError = this.translateError(path, errors[path]);\n      if (isNil(formError)) return res;\n      return res + (res.length ? separator : '') + formError;\n    }, \"\");\n  }\n\n  translateControlPath(path: string, opts?: FormErrorTranslatorOptions): string{\n    if (opts?.controlPathTranslator) {\n      return opts?.controlPathTranslator.translateControlPath(path);\n    }\n    const i18nKey = (opts && opts.i18nPrefix || '') + changeCaseToUnderscore(path).toUpperCase();\n    return this.translate.instant(i18nKey);\n  }\n\n  translateError(errorKey: string, errorContent?: any) {\n\n    const i18nKey = this.errorI18nKeys[errorKey]\n      // Try to generate a standard error key, like 'ERROR.FIELD_xxx_xxx'\n      || ('ERROR.FIELD_' + changeCaseToUnderscore(errorKey).toUpperCase());\n\n    let i18nMessage = this.translate.instant(i18nKey, errorContent);\n    if (i18nKey !== i18nMessage) return i18nMessage;\n\n    // Try to use the error content, as an i18n key\n    if (typeof errorContent === 'string') {\n      i18nMessage = this.translate.instant(errorContent);\n      if (errorContent !== i18nMessage) return i18nMessage;\n    }\n\n    // Not translated: show error\n    console.error(`[form-error-adapter] Cannot translate error key '${errorKey}'. Please add more formErrorsKey into APP_FORM_ERROR_I18N_KEYS injection token`);\n\n    return errorKey;\n  }\n}\n"]}
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form-error-adapter.class.js","sourceRoot":"","sources":["../../../../../../src/app/shared/validator/form-error-adapter.class.ts"],"names":[],"mappings":"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","sourcesContent":["import { changeCaseToUnderscore, isEmptyArray, isNil } from '../functions';\nimport { Inject, Injectable, InjectionToken, Optional } from '@angular/core';\nimport { TranslateService } from '@ngx-translate/core';\nimport { AbstractControl } from '@angular/forms';\nimport { AppFormUtils, FormErrors } from '../../core/form/form.utils';\nimport { SharedValidators } from './validators';\nimport { ObjectMap } from '../types';\n\n\nexport const APP_FORM_ERROR_I18N_KEYS = new InjectionToken<ObjectMap<string>>('appFormErrorKeys');\n\nexport interface IFormControlPathTranslator {\n  translateControlPath: (controlPath: string) => string;\n}\n\nexport interface FormErrorTranslatorOptions {\n  i18nPrefix?: string;\n  controlPathTranslator?: IFormControlPathTranslator;\n  separator?: string;\n  recursive?: boolean;\n}\n\n@Injectable({providedIn: 'root'})\nexport class FormErrorTranslator implements IFormControlPathTranslator {\n\n  private readonly errorI18nKeys: ObjectMap<string>;\n\n  constructor(\n    private translate: TranslateService,\n    @Optional() @Inject(APP_FORM_ERROR_I18N_KEYS) errorI18nKeys: ObjectMap<string>\n  ) {\n    this.errorI18nKeys = {\n      ...SharedValidators.I18N_ERROR_KEYS,\n      ...errorI18nKeys\n    };\n  }\n\n  translateFormErrors(control: AbstractControl, opts?: FormErrorTranslatorOptions): string {\n    if (!control || !control.invalid) return '';\n\n    const separator = opts && opts.separator || ', ';\n    const recursive = !opts || opts.recursive !== false\n    const errors = AppFormUtils.getFormErrors(control, {recursive});\n    return errors && Object.keys(errors).reduce((res, path) => {\n\n      const childControl = control.get(path);\n      // Should be a control map of errors\n      if (childControl) {\n        // Try to convert the control path\n        const i18nPath = this.translateControlPath(path, opts);\n\n        // OK, we have a field name: use it\n        const columnErrors = Object.keys(childControl.errors).map(errorKey => this.translateError(errorKey, childControl.errors[errorKey]));\n        if (isEmptyArray(columnErrors)) return res;\n        // Add separator\n        if (res.length) res += separator;\n        return res + i18nPath + \": \" + columnErrors.join(separator);\n      }\n\n      // Or try as global form error\n      const formError = this.translateError(path, errors[path]);\n      if (isNil(formError)) return res;\n      return res + (res.length ? separator : '') + formError;\n    }, \"\");\n  }\n\n  translateErrors(errors: FormErrors, opts?: FormErrorTranslatorOptions): string {\n\n    const separator = opts && opts.separator || ', ';\n    return errors && Object.keys(errors).reduce((res, path) => {\n\n      const pathErrors = errors[path];\n      // Should be a control map of errors\n\n      if (pathErrors) {\n        // Try to convert the control path\n        const i18nPath = this.translateControlPath(path, opts);\n\n        // OK, we have a field name: use it\n        const columnErrors = Object.keys(pathErrors).map(errorKey => this.translateError(errorKey, pathErrors[errorKey]));\n        if (isEmptyArray(columnErrors)) return res;\n        // Add separator\n        if (res.length) res += separator;\n        return res + i18nPath + \": \" + columnErrors.join(separator);\n      }\n\n      // Or try as global form error\n      const formError = this.translateError(path, pathErrors);\n      if (isNil(formError)) return res;\n      return res + (res.length ? separator : '') + formError;\n    }, \"\");\n  }\n\n  translateControlPath(path: string, opts?: FormErrorTranslatorOptions): string{\n    if (opts?.controlPathTranslator) {\n      return opts?.controlPathTranslator.translateControlPath(path);\n    }\n    const i18nKey = (opts && opts.i18nPrefix || '') + changeCaseToUnderscore(path).toUpperCase();\n    return this.translate.instant(i18nKey);\n  }\n\n  translateError(errorKey: string, errorContent?: any) {\n\n    const i18nKey = this.errorI18nKeys[errorKey]\n      // Try to generate a standard error key, like 'ERROR.FIELD_xxx_xxx'\n      || ('ERROR.FIELD_' + changeCaseToUnderscore(errorKey).toUpperCase());\n\n    let i18nMessage = this.translate.instant(i18nKey, errorContent);\n    if (i18nKey !== i18nMessage) return i18nMessage;\n\n    // Try to use the error content, as an i18n key\n    if (typeof errorContent === 'string') {\n      i18nMessage = this.translate.instant(errorContent);\n      if (errorContent !== i18nMessage) return i18nMessage;\n    }\n\n    // Not translated: show error\n    console.error(`[form-error-adapter] Cannot translate error key '${errorKey}'. Please add more formErrorsKey into APP_FORM_ERROR_I18N_KEYS injection token`);\n\n    return errorKey;\n  }\n}\n"]}
|
|
@@ -3599,7 +3599,7 @@ class FormErrorTranslator {
|
|
|
3599
3599
|
this.translate = translate;
|
|
3600
3600
|
this.errorI18nKeys = Object.assign(Object.assign({}, SharedValidators.I18N_ERROR_KEYS), errorI18nKeys);
|
|
3601
3601
|
}
|
|
3602
|
-
|
|
3602
|
+
translateFormErrors(control, opts) {
|
|
3603
3603
|
if (!control || !control.invalid)
|
|
3604
3604
|
return '';
|
|
3605
3605
|
const separator = opts && opts.separator || ', ';
|
|
@@ -3627,6 +3627,30 @@ class FormErrorTranslator {
|
|
|
3627
3627
|
return res + (res.length ? separator : '') + formError;
|
|
3628
3628
|
}, "");
|
|
3629
3629
|
}
|
|
3630
|
+
translateErrors(errors, opts) {
|
|
3631
|
+
const separator = opts && opts.separator || ', ';
|
|
3632
|
+
return errors && Object.keys(errors).reduce((res, path) => {
|
|
3633
|
+
const pathErrors = errors[path];
|
|
3634
|
+
// Should be a control map of errors
|
|
3635
|
+
if (pathErrors) {
|
|
3636
|
+
// Try to convert the control path
|
|
3637
|
+
const i18nPath = this.translateControlPath(path, opts);
|
|
3638
|
+
// OK, we have a field name: use it
|
|
3639
|
+
const columnErrors = Object.keys(pathErrors).map(errorKey => this.translateError(errorKey, pathErrors[errorKey]));
|
|
3640
|
+
if (isEmptyArray(columnErrors))
|
|
3641
|
+
return res;
|
|
3642
|
+
// Add separator
|
|
3643
|
+
if (res.length)
|
|
3644
|
+
res += separator;
|
|
3645
|
+
return res + i18nPath + ": " + columnErrors.join(separator);
|
|
3646
|
+
}
|
|
3647
|
+
// Or try as global form error
|
|
3648
|
+
const formError = this.translateError(path, pathErrors);
|
|
3649
|
+
if (isNil(formError))
|
|
3650
|
+
return res;
|
|
3651
|
+
return res + (res.length ? separator : '') + formError;
|
|
3652
|
+
}, "");
|
|
3653
|
+
}
|
|
3630
3654
|
translateControlPath(path, opts) {
|
|
3631
3655
|
if (opts === null || opts === void 0 ? void 0 : opts.controlPathTranslator) {
|
|
3632
3656
|
return opts === null || opts === void 0 ? void 0 : opts.controlPathTranslator.translateControlPath(path);
|
|
@@ -3699,7 +3723,7 @@ class FormErrorTranslatePipe {
|
|
|
3699
3723
|
}
|
|
3700
3724
|
_updateValue(form, opts, status) {
|
|
3701
3725
|
if (status === 'INVALID' || form.invalid) {
|
|
3702
|
-
this.value = this.adapter.
|
|
3726
|
+
this.value = this.adapter.translateFormErrors(form, opts);
|
|
3703
3727
|
this._ref.markForCheck();
|
|
3704
3728
|
}
|
|
3705
3729
|
else if (this.value !== undefined) {
|
|
@@ -17013,7 +17037,7 @@ class AppForm {
|
|
|
17013
17037
|
getFormError(form, opts) {
|
|
17014
17038
|
if (!form || !this.errorTranslator)
|
|
17015
17039
|
return undefined;
|
|
17016
|
-
return this.errorTranslator.
|
|
17040
|
+
return this.errorTranslator.translateFormErrors(this.form, Object.assign({ controlPathTranslator: this }, opts));
|
|
17017
17041
|
}
|
|
17018
17042
|
getI18nFieldName(path) {
|
|
17019
17043
|
return (this.i18nFieldPrefix || '') + changeCaseToUnderscore(path).toUpperCase();
|
|
@@ -21952,7 +21976,7 @@ class AppTable {
|
|
|
21952
21976
|
row = row || this.editedRow;
|
|
21953
21977
|
if (!row || !this.formErrorAdapter)
|
|
21954
21978
|
return undefined;
|
|
21955
|
-
return this.formErrorAdapter.
|
|
21979
|
+
return this.formErrorAdapter.translateFormErrors(row.validator, Object.assign(Object.assign({}, this.errorTranslatorOptions), opts));
|
|
21956
21980
|
}
|
|
21957
21981
|
setError(value, opts) {
|
|
21958
21982
|
if (this.errorSubject.value !== value) {
|
|
@@ -22730,7 +22754,7 @@ class AppEntityEditor extends AppTabEditor {
|
|
|
22730
22754
|
// Default options
|
|
22731
22755
|
enableListenChanges: (injector.get(ENVIRONMENT).listenRemoteChanges === true), pathIdAttribute: 'id', autoLoad: true, autoUpdateRoute: true, i18nPrefix: '' }, options);
|
|
22732
22756
|
this.settings = injector.get(LocalSettingsService);
|
|
22733
|
-
this.
|
|
22757
|
+
this.errorTranslator = injector.get(FormErrorTranslator);
|
|
22734
22758
|
this.cd = injector.get(ChangeDetectorRef);
|
|
22735
22759
|
this.dateFormat = injector.get(DateFormatPipe);
|
|
22736
22760
|
this.toastController = injector.get(ToastController);
|
|
@@ -23158,7 +23182,7 @@ class AppEntityEditor extends AppTabEditor {
|
|
|
23158
23182
|
let userMessage = err && err.message && this.translate.instant(err.message) || err;
|
|
23159
23183
|
// Add details error (if any) under the main message
|
|
23160
23184
|
const detailMessage = err && err.details && (err.details.message || err.details) || undefined;
|
|
23161
|
-
if (detailMessage) {
|
|
23185
|
+
if (isNotNilString(detailMessage)) {
|
|
23162
23186
|
userMessage += `<br/><small class="hidden-xs hidden-sm" title="${detailMessage}">`;
|
|
23163
23187
|
userMessage += detailMessage.length < 70 ? detailMessage : detailMessage.substring(0, 67) + '...';
|
|
23164
23188
|
userMessage += '</small>';
|