arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issues with form validation messages and some styling fixes

Browse Source
This commit is contained in:
Erik Tiekstra
2021-10-11 12:07:23 +02:00
parent 8bcd591a08
commit 0e766ccad2
18 changed files with 214 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/mina-sidor-fa/src/app/shared/models/validation-error.model.ts
View File

@@ -1,4 +1,3 @@
export interface ValidationError {
type: string;
message: string;
[key: string]: string;
}

2
apps/mina-sidor-fa/src/app/shared/utils/validators/date.validator.ts
View File

@@ -12,7 +12,7 @@ export function isoDateWithoutTimeValidator(): ValidatorFn {
const value: string = control.value as string;
if (!isoDateIsValid(value)) {
return { type: 'invalid', message: `Ogiltigt datum, vänligen ange YYYY-MM-DD` };
return { invalid: `Ogiltigt datum, vänligen ange YYYY-MM-DD` };
}
}

4
apps/mina-sidor-fa/src/app/shared/utils/validators/email.validator.ts
View File

@@ -12,7 +12,7 @@ export function EmailValidator(label = 'Fältet'): ValidatorFn {
const value: string = control.value as string;
if (!emailIsValid(value)) {
return { type: 'invalid', message: `Ogiltig ${label}` };
return { invalid: `Ogiltig ${label}` };
}
}
@@ -38,7 +38,7 @@ export function CommaSeparatedEmailValidator(): ValidatorFn {
if (invalidEmailaddresses.length) {
const messagePrepend =
invalidEmailaddresses.length > 1 ? 'Ogiltiga e-postadresser: ' : 'Ogiltig e-postadress: ';
return { type: 'invalid', message: `${messagePrepend}${invalidEmailaddresses.join(', ')}` };
return { invalid: `${messagePrepend}${invalidEmailaddresses.join(', ')}` };
}
}

2
apps/mina-sidor-fa/src/app/shared/utils/validators/required.validator.ts
View File

@@ -5,7 +5,7 @@ export function RequiredValidator(message = 'Fältet är obligatoriskt'): Valida
return (control: AbstractControl): ValidationError => {
if (control) {
if (!control.value || (Array.isArray(control.value) && !control.value.length)) {
return { type: 'required', message };
return { required: message };
}
}

10
apps/mina-sidor-fa/src/app/shared/utils/validators/social-security-number.validator.ts
View File

@@ -10,7 +10,7 @@ export function SocialSecurityNumberValidator(): ValidatorFn {
const ssn = control.value as string;
if (/[^0-9-]/g.test(ssn)) {
return { type: 'ssnInvalid', message: 'Inkorrekt personnummer' };
return { ssnInvalid: 'Inkorrekt personnummer' };
}
let strippedSsn = ssn.replace(/[^0-9]/g, '');
@@ -22,12 +22,12 @@ export function SocialSecurityNumberValidator(): ValidatorFn {
// Check length
if (strippedSsn.length !== 10) {
return { type: 'ssnNotComplete', message: 'Personnummret är inte fullständigt' };
return { ssnNotComplete: 'Personnummret är inte fullständigt' };
}
// Check month
if (+strippedSsn.substr(2, 2) > 12 || strippedSsn.substr(2, 2) === '00') {
return { type: 'ssnInvalid', message: 'Inkorrekt personnummer' };
return { ssnInvalid: 'Inkorrekt personnummer' };
}
// Check date (valid date + 60 is also apporved because of co-ordination number)
@@ -35,10 +35,10 @@ export function SocialSecurityNumberValidator(): ValidatorFn {
(+strippedSsn.substr(4, 2) > 31 || strippedSsn.substr(4, 2) === '00') &&
(+strippedSsn.substr(4, 2) > 91 || +strippedSsn.substr(4, 2) <= 60)
) {
return { type: 'ssnInvalid', message: 'Inkorrekt personnummer' };
return { ssnInvalid: 'Inkorrekt personnummer' };
}
return isControlDigitLegit(strippedSsn) ? null : { type: 'ssnInvalid', message: 'Inkorrekt personnummer' };
return isControlDigitLegit(strippedSsn) ? null : { ssnInvalid: 'Inkorrekt personnummer' };
};
}