npm - @sumaris-net/ngx-components - Versions diffs - 18.22.22 → 18.22.23 - Mend

@sumaris-net/ngx-components 18.22.22 → 18.22.23

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.

Files changed (6) hide show

package/esm2022/src/app/shared/validator/form-error-adapter.class.mjs +4 -3
package/fesm2022/sumaris-net.ngx-components.mjs +3 -2
package/fesm2022/sumaris-net.ngx-components.mjs.map +1 -1
package/package.json +1 -1
package/src/app/shared/inputs.d.ts +1 -1
package/src/assets/manifest.json +1 -1

package/esm2022/src/app/shared/validator/form-error-adapter.class.mjs CHANGED Viewed

@@ -27,13 +27,14 @@ export class FormErrorTranslator {
         return (errors &&
             Object.keys(errors).reduce((res, path) => {
                 const childControl = control.get(path);
-                const childErrors = errors[path];
+                let childErrors = errors[path];
                 // Should be a control map of errors
                 if (childControl) {
                     // Try to convert the control path
                     const i18nPath = this.translateFormPath(path, opts);
                     // OK, we have a field name: use it
-                    const columnErrors = Object.keys({ ...childErrors, ...childControl.errors }).map((errorKey) => this.translateError(errorKey, childControl.errors[errorKey]));
+                    childErrors = { ...childErrors, ...childControl.errors };
+                    const columnErrors = Object.keys(childErrors).map((errorKey) => this.translateError(errorKey, childErrors[errorKey]));
                     if (isEmptyArray(columnErrors))
                         return res;
                     // Add separator
@@ -112,4 +113,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
                     type: Inject,
                     args: [APP_FORM_ERROR_I18N_KEYS]
                 }] }] });
-//# 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';\nimport { FormErrors } from '../forms';\nimport { TranslateContextService } from '../services/translate-context.service';\n\nexport const APP_FORM_ERROR_I18N_KEYS = new InjectionToken<ObjectMap<string>>('appFormErrorKeys');\n\nexport interface IFormPathTranslatorOptions {\n  i18nPrefix?: string;\n  i18nSuffix?: string;\n  [key: string]: any;\n}\nexport interface IFormPathTranslator<O extends IFormPathTranslatorOptions = IFormPathTranslatorOptions> {\n  translateFormPath: (path: string, opts?: O) => string;\n}\n\nexport interface FormErrorTranslateOptions extends IFormPathTranslatorOptions {\n  pathTranslator?: IFormPathTranslator;\n  separator?: string;\n  recursive?: boolean;\n}\n\n@Injectable({ providedIn: 'root' })\nexport class FormErrorTranslator implements IFormPathTranslator {\n  private readonly errorI18nKeys: ObjectMap<string>;\n\n  constructor(\n    private translate: TranslateService,\n    private translateContext: TranslateContextService,\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?: FormErrorTranslateOptions): 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 (\n      errors &&\n      Object.keys(errors).reduce((res, path) => {\n        const childControl = control.get(path);\n        const childErrors = errors[path];\n        // Should be a control map of errors\n        if (childControl) {\n          // Try to convert the control path\n          const i18nPath = this.translateFormPath(path, opts);\n\n          // OK, we have a field name: use it\n          const columnErrors = Object.keys({ ...childErrors, ...childControl.errors }).map((errorKey) =>\n            this.translateError(errorKey, childControl.errors[errorKey])\n          );\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\n  translateErrors(errors: FormErrors, opts?: FormErrorTranslateOptions): string {\n    const separator = (opts && opts.separator) || ', ';\n    return (\n      errors &&\n      Object.keys(errors).reduce((res, path) => {\n        const pathErrors = errors[path];\n        // Should be a control map of errors\n\n        if (typeof pathErrors === 'object' && !Array.isArray(pathErrors)) {\n          // Try to convert the control path\n          const i18nPath = this.translateFormPath(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\n  translateFormPath(path: string, opts?: FormErrorTranslateOptions): string {\n    // Delegate to a path translator, if any\n    if (opts?.pathTranslator && opts.pathTranslator !== this) {\n      return opts.pathTranslator.translateFormPath(path, { ...opts, pathTranslator: null /*avoid recursive call*/ });\n    }\n\n    // Default translation\n    const fieldName = path.substring(path.lastIndexOf('.') + 1);\n    const i18nKey = (opts?.i18nPrefix || '') + changeCaseToUnderscore(fieldName).toUpperCase();\n    return this.translateContext.instant(i18nKey, opts?.i18nSuffix);\n  }\n\n  translateError(errorKey: string, errorContent?: any) {\n    const i18nKey =\n      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(\n      `[form-error-adapter] Cannot translate error key '${errorKey}'. Please add more formErrorsKey into APP_FORM_ERROR_I18N_KEYS injection token`\n    );\n\n    return errorKey;\n  }\n}\n"]}
+//# 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';\nimport { FormErrors } from '../forms';\nimport { TranslateContextService } from '../services/translate-context.service';\n\nexport const APP_FORM_ERROR_I18N_KEYS = new InjectionToken<ObjectMap<string>>('appFormErrorKeys');\n\nexport interface IFormPathTranslatorOptions {\n  i18nPrefix?: string;\n  i18nSuffix?: string;\n  [key: string]: any;\n}\nexport interface IFormPathTranslator<O extends IFormPathTranslatorOptions = IFormPathTranslatorOptions> {\n  translateFormPath: (path: string, opts?: O) => string;\n}\n\nexport interface FormErrorTranslateOptions extends IFormPathTranslatorOptions {\n  pathTranslator?: IFormPathTranslator;\n  separator?: string;\n  recursive?: boolean;\n}\n\n@Injectable({ providedIn: 'root' })\nexport class FormErrorTranslator implements IFormPathTranslator {\n  private readonly errorI18nKeys: ObjectMap<string>;\n\n  constructor(\n    private translate: TranslateService,\n    private translateContext: TranslateContextService,\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?: FormErrorTranslateOptions): 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 (\n      errors &&\n      Object.keys(errors).reduce((res, path) => {\n        const childControl = control.get(path);\n        let childErrors = errors[path];\n        // Should be a control map of errors\n        if (childControl) {\n          // Try to convert the control path\n          const i18nPath = this.translateFormPath(path, opts);\n\n          // OK, we have a field name: use it\n          childErrors = { ...childErrors, ...childControl.errors }\n          const columnErrors = Object.keys(childErrors).map((errorKey) =>\n            this.translateError(errorKey, childErrors[errorKey])\n          );\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\n  translateErrors(errors: FormErrors, opts?: FormErrorTranslateOptions): string {\n    const separator = (opts && opts.separator) || ', ';\n    return (\n      errors &&\n      Object.keys(errors).reduce((res, path) => {\n        const pathErrors = errors[path];\n        // Should be a control map of errors\n\n        if (typeof pathErrors === 'object' && !Array.isArray(pathErrors)) {\n          // Try to convert the control path\n          const i18nPath = this.translateFormPath(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\n  translateFormPath(path: string, opts?: FormErrorTranslateOptions): string {\n    // Delegate to a path translator, if any\n    if (opts?.pathTranslator && opts.pathTranslator !== this) {\n      return opts.pathTranslator.translateFormPath(path, { ...opts, pathTranslator: null /*avoid recursive call*/ });\n    }\n\n    // Default translation\n    const fieldName = path.substring(path.lastIndexOf('.') + 1);\n    const i18nKey = (opts?.i18nPrefix || '') + changeCaseToUnderscore(fieldName).toUpperCase();\n    return this.translateContext.instant(i18nKey, opts?.i18nSuffix);\n  }\n\n  translateError(errorKey: string, errorContent?: any) {\n    const i18nKey =\n      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(\n      `[form-error-adapter] Cannot translate error key '${errorKey}'. Please add more formErrorsKey into APP_FORM_ERROR_I18N_KEYS injection token`\n    );\n\n    return errorKey;\n  }\n}\n"]}

package/fesm2022/sumaris-net.ngx-components.mjs CHANGED Viewed

@@ -4711,13 +4711,14 @@ class FormErrorTranslator {
         return (errors &&
             Object.keys(errors).reduce((res, path) => {
                 const childControl = control.get(path);
-                const childErrors = errors[path];
+                let childErrors = errors[path];
                 // Should be a control map of errors
                 if (childControl) {
                     // Try to convert the control path
                     const i18nPath = this.translateFormPath(path, opts);
                     // OK, we have a field name: use it
-                    const columnErrors = Object.keys({ ...childErrors, ...childControl.errors }).map((errorKey) => this.translateError(errorKey, childControl.errors[errorKey]));
+                    childErrors = { ...childErrors, ...childControl.errors };
+                    const columnErrors = Object.keys(childErrors).map((errorKey) => this.translateError(errorKey, childErrors[errorKey]));
                     if (isEmptyArray(columnErrors))
                         return res;
                     // Add separator