From 916550465ccabfdaa1fcb1801b2ce0b624361dfd Mon Sep 17 00:00:00 2001 From: Aden Hassan Date: Fri, 8 Oct 2021 14:14:11 +0200 Subject: [PATCH] feat(employee-invite): fixed so that email-separator can be of many types, including space Squashed commit of the following: commit 9501644682a9e9a1a631e7c4b2d698a857df7a61 Merge: 885abdad 132aba21 Author: Aden Hassan Date: Fri Oct 8 14:11:29 2021 +0200 Merge branch 'develop' into feature/TV-697 commit 885abdad3a304dee6df53a4d18d84118dd3a0ed8 Author: Aden Hassan Date: Thu Oct 7 17:43:04 2021 +0200 fixed so that email-separator can be of many types including space --- .../pages/employee-invite/employee-invite.component.ts | 4 ++-- .../src/app/shared/utils/validators/email.validator.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.ts index 4d829a2..602d5a1 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-invite/employee-invite.component.ts @@ -31,8 +31,8 @@ export class EmployeeInviteComponent { get emailsControlValueAsArray(): string[] { return (this.emailsControl.value as string) - .replaceAll(/\n|\t|\r|\s/g, '') - .split(',') + .replaceAll(/\n|\t|\r/g, '') + .split(/[\s,;:]+/) .filter(email => !!email); } diff --git a/apps/mina-sidor-fa/src/app/shared/utils/validators/email.validator.ts b/apps/mina-sidor-fa/src/app/shared/utils/validators/email.validator.ts index c9a5a34..db3ee55 100644 --- a/apps/mina-sidor-fa/src/app/shared/utils/validators/email.validator.ts +++ b/apps/mina-sidor-fa/src/app/shared/utils/validators/email.validator.ts @@ -25,8 +25,8 @@ export function CommaSeparatedEmailValidator(): ValidatorFn { if (control && control.value) { const values: string[] = (control.value as string) .toLowerCase() - .replaceAll(/\n|\t|\r|\s/g, '') - .split(','); + .replaceAll(/\n|\t|\r/g, '') + .split(/[\s,;:]+/); const invalidEmailaddresses = []; values.forEach(value => {