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 d3a6f02..a87d959 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 @@ -33,7 +33,7 @@ export class EmployeeInviteComponent { get emailsControlValueAsArray(): string[] { return (this.emailsControl.value as string) - .replaceAll(/\n|\t|\r/g, '') + .replace(/\n|\t|\r/g, '') .split(/[\s,;:]+/) .filter(email => !!email); } diff --git a/apps/mina-sidor-fa/src/app/shared/components/layout/layout.component.ts b/apps/mina-sidor-fa/src/app/shared/components/layout/layout.component.ts index 3da5077..2ad90d1 100644 --- a/apps/mina-sidor-fa/src/app/shared/components/layout/layout.component.ts +++ b/apps/mina-sidor-fa/src/app/shared/components/layout/layout.component.ts @@ -63,9 +63,6 @@ export class LayoutComponent extends UnsubscribeDirective { } get breadcrumbsItems(): NavigationBreadcrumbsItem[] { - return this._breadcrumbsItems$.getValue().map(breadcrumb => ({ - ...breadcrumb, - text: breadcrumb.text.replaceAll('-', ' '), - })); + return this._breadcrumbsItems$.getValue(); } } diff --git a/apps/mina-sidor-fa/src/app/shared/models/contact-information.model.ts b/apps/mina-sidor-fa/src/app/shared/models/contact-information.model.ts index 09cc0e8..2d88ab6 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/contact-information.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/contact-information.model.ts @@ -25,7 +25,7 @@ export function mapResponseToContactInformation(data: ContactInformationResponse firstName: fornamn || '', lastName: efternamn || '', fullName: fornamn && efternamn ? `${fornamn} ${efternamn}` : '', - ssn: personnummer ? mapStringToSsn(personnummer) : '', + ssn: mapStringToSsn(personnummer), email: epost || '', phoneNumbers: telekomadresser ? telekomadresser diff --git a/apps/mina-sidor-fa/src/app/shared/models/employee.model.ts b/apps/mina-sidor-fa/src/app/shared/models/employee.model.ts index 6881e97..1523870 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/employee.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/employee.model.ts @@ -57,7 +57,7 @@ export function mapResponseToEmployee(data: EmployeeResponse): Employee { lastName, fullName: `${firstName} ${lastName}`, email, - ssn: ssn ? mapStringToSsn(ssn) : null, + ssn: mapStringToSsn(ssn), roles: roles || [], tjanster: tjanster?.map(tjanst => mapResponseToEmployeeTjanst(tjanst)), allaUtforandeVerksamheter, diff --git a/apps/mina-sidor-fa/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts b/apps/mina-sidor-fa/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts index 857cc04..f27f2eb 100644 --- a/apps/mina-sidor-fa/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts +++ b/apps/mina-sidor-fa/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts @@ -9,7 +9,7 @@ export function mapPathsToBreadcrumbs( let breadcrumbs = [ ...(startBreadcrumb ? [startBreadcrumb] : []), ...paths.map((path, index) => ({ - text: mapPathToPageName(path), + text: mapPathToPageName(path).replace(/-/g, ' '), routerLink: `/${paths.slice(0, index + 1).join('/')}`, })), ]; diff --git a/apps/mina-sidor-fa/src/app/shared/utils/map-string-to-ssn.util.ts b/apps/mina-sidor-fa/src/app/shared/utils/map-string-to-ssn.util.ts index e826528..faa8f44 100644 --- a/apps/mina-sidor-fa/src/app/shared/utils/map-string-to-ssn.util.ts +++ b/apps/mina-sidor-fa/src/app/shared/utils/map-string-to-ssn.util.ts @@ -1,7 +1,7 @@ const CURRENT_YEAR = new Date().getFullYear().toString().slice(2, 4); export function mapStringToSsn(ssn: string): string { - ssn = ssn.replaceAll('-', ''); + ssn = (ssn || '').replace(/-/g, ''); if (ssn.length === 10) { const century = +CURRENT_YEAR - +ssn.slice(0, 2) > 0 ? '20' : '19'; ssn = ssn.padStart(12, century); 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 971ba28..2ea4f01 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,7 +25,7 @@ export function CommaSeparatedEmailValidator(): ValidatorFn { if (control && control.value) { const values: string[] = (control.value as string) .toLowerCase() - .replaceAll(/\n|\t|\r/g, '') + .replace(/\n|\t|\r/g, '') .split(/[\s,;:]+/); const invalidEmailaddresses = [];