@sumaris-net/ngx-components 0.25.13 → 0.25.14
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 +12 -12
- 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/table/table.class.js +3 -3
- package/esm2015/src/app/shared/pipes/form.pipes.js +2 -2
- package/esm2015/src/app/shared/validator/form-error-adapter.class.js +10 -10
- package/fesm2015/sumaris-net.ngx-components.js +12 -12
- package/fesm2015/sumaris-net.ngx-components.js.map +1 -1
- package/package.json +1 -1
- package/src/app/core/table/table.class.d.ts +3 -3
- package/src/app/shared/validator/form-error-adapter.class.d.ts +7 -7
- package/sumaris-net.ngx-components.metadata.json +1 -1
|
@@ -5,7 +5,7 @@ export class FormErrorTranslatePipe {
|
|
|
5
5
|
this.adapter = adapter;
|
|
6
6
|
}
|
|
7
7
|
transform(form, opts) {
|
|
8
|
-
return this.adapter.
|
|
8
|
+
return this.adapter.translateErrors(form, opts);
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
11
|
FormErrorTranslatePipe.decorators = [
|
|
@@ -16,4 +16,4 @@ FormErrorTranslatePipe.decorators = [
|
|
|
16
16
|
FormErrorTranslatePipe.ctorParameters = () => [
|
|
17
17
|
{ type: FormErrorAdapter }
|
|
18
18
|
];
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS5waXBlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcHAvc2hhcmVkL3BpcGVzL2Zvcm0ucGlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLElBQUksRUFBZ0IsTUFBTSxlQUFlLENBQUM7QUFFbEQsT0FBTyxFQUFDLGdCQUFnQixFQUEwQixNQUFNLHVDQUF1QyxDQUFDO0FBS2hHLE1BQU0sT0FBTyxzQkFBc0I7SUFFakMsWUFDVSxPQUF5QjtRQUF6QixZQUFPLEdBQVAsT0FBTyxDQUFrQjtJQUVuQyxDQUFDO0lBRUQsU0FBUyxDQUFDLElBQWUsRUFBRSxJQUE4QjtRQUN2RCxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNsRCxDQUFDOzs7WUFaRixJQUFJLFNBQUM7Z0JBQ0osSUFBSSxFQUFFLG9CQUFvQjthQUMzQjs7O1lBSk8sZ0JBQWdCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtQaXBlLCBQaXBlVHJhbnNmb3JtfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7Rm9ybUdyb3VwfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XG5pbXBvcnQge0Zvcm1FcnJvckFkYXB0ZXIsIEZvcm1FcnJvckFkYXB0ZXJPcHRpb25zfSBmcm9tICcuLi92YWxpZGF0b3IvZm9ybS1lcnJvci1hZGFwdGVyLmNsYXNzJztcblxuQFBpcGUoe1xuICBuYW1lOiAndHJhbnNsYXRlRm9ybUVycm9yJyxcbn0pXG5leHBvcnQgY2xhc3MgRm9ybUVycm9yVHJhbnNsYXRlUGlwZSBpbXBsZW1lbnRzIFBpcGVUcmFuc2Zvcm0ge1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgYWRhcHRlcjogRm9ybUVycm9yQWRhcHRlclxuICApIHtcbiAgfVxuXG4gIHRyYW5zZm9ybShmb3JtOiBGb3JtR3JvdXAsIG9wdHM/OiBGb3JtRXJyb3JBZGFwdGVyT3B0aW9ucyk6IHN0cmluZyB7XG4gICAgcmV0dXJuIHRoaXMuYWRhcHRlci50cmFuc2xhdGVFcnJvcnMoZm9ybSwgb3B0cyk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -11,20 +11,20 @@ export class FormErrorAdapter {
|
|
|
11
11
|
this.translate = translate;
|
|
12
12
|
this.errorI18nKeys = Object.assign(Object.assign({}, SharedValidators.I18N_ERROR_KEYS), errorI18nKeys);
|
|
13
13
|
}
|
|
14
|
-
|
|
15
|
-
if (!
|
|
14
|
+
translateErrors(control, opts) {
|
|
15
|
+
if (!control || !control.invalid)
|
|
16
16
|
return '';
|
|
17
17
|
const separator = opts && opts.separator || ', ';
|
|
18
18
|
const recursive = !opts || opts.recursive !== false;
|
|
19
|
-
const errors = AppFormUtils.getFormErrors(
|
|
19
|
+
const errors = AppFormUtils.getFormErrors(control, { recursive });
|
|
20
20
|
return errors && Object.keys(errors).reduce((res, path) => {
|
|
21
|
-
const
|
|
21
|
+
const childControl = control.get(path);
|
|
22
22
|
// Should be a control map of errors
|
|
23
|
-
if (
|
|
23
|
+
if (childControl) {
|
|
24
24
|
// Try to convert the control path
|
|
25
|
-
const i18nPath = this.
|
|
25
|
+
const i18nPath = this.translateControlPath(path, opts);
|
|
26
26
|
// OK, we have a field name: use it
|
|
27
|
-
const columnErrors = Object.keys(
|
|
27
|
+
const columnErrors = Object.keys(childControl.errors).map(errorKey => this.translateError(errorKey, childControl.errors[errorKey]));
|
|
28
28
|
if (isEmptyArray(columnErrors))
|
|
29
29
|
return res;
|
|
30
30
|
// Add separator
|
|
@@ -39,9 +39,9 @@ export class FormErrorAdapter {
|
|
|
39
39
|
return res + (res.length ? separator : '') + formError;
|
|
40
40
|
}, "");
|
|
41
41
|
}
|
|
42
|
-
|
|
42
|
+
translateControlPath(path, opts) {
|
|
43
43
|
if (opts === null || opts === void 0 ? void 0 : opts.pathTranslateService) {
|
|
44
|
-
return opts === null || opts === void 0 ? void 0 : opts.pathTranslateService.
|
|
44
|
+
return opts === null || opts === void 0 ? void 0 : opts.pathTranslateService.translateControlPath(path);
|
|
45
45
|
}
|
|
46
46
|
const i18nKey = (opts && opts.i18nPrefix || '') + changeCaseToUnderscore(path).toUpperCase();
|
|
47
47
|
return this.translate.instant(i18nKey);
|
|
@@ -72,4 +72,4 @@ FormErrorAdapter.ctorParameters = () => [
|
|
|
72
72
|
{ type: TranslateService },
|
|
73
73
|
{ type: undefined, decorators: [{ type: Optional }, { type: Inject, args: [APP_FORM_ERROR_I18N_KEYS,] }] }
|
|
74
74
|
];
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
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, FormGroup} 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 IFormControlPathTranslateService {\n  translateControlPath: (controlPath: string) => string;\n}\nexport interface FormErrorAdapterOptions {\n  i18nPrefix?: string;\n  pathTranslateService?: IFormControlPathTranslateService;\n  separator?: string;\n  recursive?: boolean;\n}\n\n@Injectable({providedIn: 'root'})\nexport class FormErrorAdapter implements IFormControlPathTranslateService {\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?: FormErrorAdapterOptions): 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?: FormErrorAdapterOptions): string{\n    if (opts?.pathTranslateService) {\n      return opts?.pathTranslateService.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"]}
|
|
@@ -3475,20 +3475,20 @@ class FormErrorAdapter {
|
|
|
3475
3475
|
this.translate = translate;
|
|
3476
3476
|
this.errorI18nKeys = Object.assign(Object.assign({}, SharedValidators.I18N_ERROR_KEYS), errorI18nKeys);
|
|
3477
3477
|
}
|
|
3478
|
-
|
|
3479
|
-
if (!
|
|
3478
|
+
translateErrors(control, opts) {
|
|
3479
|
+
if (!control || !control.invalid)
|
|
3480
3480
|
return '';
|
|
3481
3481
|
const separator = opts && opts.separator || ', ';
|
|
3482
3482
|
const recursive = !opts || opts.recursive !== false;
|
|
3483
|
-
const errors = AppFormUtils.getFormErrors(
|
|
3483
|
+
const errors = AppFormUtils.getFormErrors(control, { recursive });
|
|
3484
3484
|
return errors && Object.keys(errors).reduce((res, path) => {
|
|
3485
|
-
const
|
|
3485
|
+
const childControl = control.get(path);
|
|
3486
3486
|
// Should be a control map of errors
|
|
3487
|
-
if (
|
|
3487
|
+
if (childControl) {
|
|
3488
3488
|
// Try to convert the control path
|
|
3489
|
-
const i18nPath = this.
|
|
3489
|
+
const i18nPath = this.translateControlPath(path, opts);
|
|
3490
3490
|
// OK, we have a field name: use it
|
|
3491
|
-
const columnErrors = Object.keys(
|
|
3491
|
+
const columnErrors = Object.keys(childControl.errors).map(errorKey => this.translateError(errorKey, childControl.errors[errorKey]));
|
|
3492
3492
|
if (isEmptyArray(columnErrors))
|
|
3493
3493
|
return res;
|
|
3494
3494
|
// Add separator
|
|
@@ -3503,9 +3503,9 @@ class FormErrorAdapter {
|
|
|
3503
3503
|
return res + (res.length ? separator : '') + formError;
|
|
3504
3504
|
}, "");
|
|
3505
3505
|
}
|
|
3506
|
-
|
|
3506
|
+
translateControlPath(path, opts) {
|
|
3507
3507
|
if (opts === null || opts === void 0 ? void 0 : opts.pathTranslateService) {
|
|
3508
|
-
return opts === null || opts === void 0 ? void 0 : opts.pathTranslateService.
|
|
3508
|
+
return opts === null || opts === void 0 ? void 0 : opts.pathTranslateService.translateControlPath(path);
|
|
3509
3509
|
}
|
|
3510
3510
|
const i18nKey = (opts && opts.i18nPrefix || '') + changeCaseToUnderscore(path).toUpperCase();
|
|
3511
3511
|
return this.translate.instant(i18nKey);
|
|
@@ -3542,7 +3542,7 @@ class FormErrorTranslatePipe {
|
|
|
3542
3542
|
this.adapter = adapter;
|
|
3543
3543
|
}
|
|
3544
3544
|
transform(form, opts) {
|
|
3545
|
-
return this.adapter.
|
|
3545
|
+
return this.adapter.translateErrors(form, opts);
|
|
3546
3546
|
}
|
|
3547
3547
|
}
|
|
3548
3548
|
FormErrorTranslatePipe.decorators = [
|
|
@@ -21112,7 +21112,7 @@ class AppTable {
|
|
|
21112
21112
|
}
|
|
21113
21113
|
}
|
|
21114
21114
|
}
|
|
21115
|
-
|
|
21115
|
+
translateControlPath(path) {
|
|
21116
21116
|
// Can be override by subclasses, to resolve all field name
|
|
21117
21117
|
var _a;
|
|
21118
21118
|
// Use columns key, has default name
|
|
@@ -21493,7 +21493,7 @@ class AppTable {
|
|
|
21493
21493
|
row = row || this.editedRow;
|
|
21494
21494
|
if (!row || !this.formErrorAdapter)
|
|
21495
21495
|
return undefined;
|
|
21496
|
-
return this.formErrorAdapter.
|
|
21496
|
+
return this.formErrorAdapter.translateErrors(row.validator, Object.assign({ pathTranslateService: this }, opts));
|
|
21497
21497
|
}
|
|
21498
21498
|
setError(value, opts) {
|
|
21499
21499
|
if (this.errorSubject.value !== value) {
|