hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2640 from hutattedonmyarm/regex-error-messages

Browse Source 
More meaningful regex error messages
This commit is contained in:
Tim Donohue
2024-05-01 16:20:22 -05:00
committed by GitHub
parent 8c5fe13bb9 0c6dc895db
commit 0607878799
20 changed files with 127 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/shared/form/builder/parsers/field-parser.ts
View File

@@ -8,6 +8,7 @@ import {
MATCH_VISIBLE,
OR_OPERATOR,
} from '@ng-dynamic-forms/core';
import { TranslateService } from '@ngx-translate/core';
import uniqueId from 'lodash/uniqueId';
import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
@@ -61,6 +62,7 @@ export abstract class FieldParser {
@Inject(CONFIG_DATA) protected configData: FormFieldModel,
@Inject(INIT_FORM_VALUES) protected initFormValues: any,
@Inject(PARSER_OPTIONS) protected parserOptions: ParserOptions,
protected translate: TranslateService,
) {
}
@@ -405,11 +407,14 @@ export abstract class FieldParser {
} else {
regex = new RegExp(this.configData.input.regex);
}
const baseTranslationKey = 'error.validation.pattern';
const fieldranslationKey = `${baseTranslationKey}.${controlModel.id}`;
const fieldTranslationExists = this.translate.instant(fieldranslationKey) !== fieldranslationKey;
controlModel.validators = Object.assign({}, controlModel.validators, { pattern: regex });
controlModel.errorMessages = Object.assign(
{},
controlModel.errorMessages,
{ pattern: 'error.validation.pattern' });
{ pattern: fieldTranslationExists ? fieldranslationKey : baseTranslationKey });
}
protected markAsRequired(controlModel) {