From 51b52adb06ebde82750438e1be97cb2bd1af3610 Mon Sep 17 00:00:00 2001
From: Lucas Hengelhaupt <104495679+LucasHengelhaupt@users.noreply.github.com>
Date: Fri, 13 Oct 2023 11:32:37 +0200
Subject: [PATCH] fix: display salutions on registration page rendering (#1518)

Co-authored-by: LucasHengelhaupt <l.hengelhaupt@intershop.com>
Co-authored-by: Silke <s.grueber@intershop.de>
---
 .../shared/forms/utils/forms.service.spec.ts  | 39 +++++++++++++------
 src/app/shared/forms/utils/forms.service.ts   | 20 +++++-----
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/app/shared/forms/utils/forms.service.spec.ts b/src/app/shared/forms/utils/forms.service.spec.ts
index 782ca6281b..751f6a1ed7 100644
--- a/src/app/shared/forms/utils/forms.service.spec.ts
+++ b/src/app/shared/forms/utils/forms.service.spec.ts
@@ -1,7 +1,7 @@
 import { TestBed } from '@angular/core/testing';
 import { TranslateService } from '@ngx-translate/core';
-import { of } from 'rxjs';
-import { instance, mock } from 'ts-mockito';
+import { isEmpty, of } from 'rxjs';
+import { anyString, instance, mock, when } from 'ts-mockito';
 
 import { Address } from 'ish-core/models/address/address.model';
 import { SelectOption } from 'ish-core/models/select-option/select-option.model';
@@ -15,10 +15,13 @@ describe('Forms Service', () => {
 
   beforeEach(() => {
     translateServiceMock = mock(TranslateService);
+    when(translateServiceMock.get(anyString())).thenReturn(of([]));
+
     TestBed.configureTestingModule({
       imports: [CoreStoreModule.forTesting(['configuration'])],
       providers: [{ provide: TranslateService, useFactory: () => instance(translateServiceMock) }],
     });
+
     formsService = TestBed.inject(FormsService);
   });
 
@@ -28,27 +31,39 @@ describe('Forms Service', () => {
 
   describe('getSalutationOptionsForCountryCode', () => {
     it('should return an empty array if countryCode is empty', () => {
-      expect(formsService.getSalutationOptionsForCountryCode('')).toBeEmpty();
+      formsService.getSalutationOptionsForCountryCode('').pipe(isEmpty());
     });
 
     it('should return an empty array if countryCode is not known', () => {
-      expect(formsService.getSalutationOptionsForCountryCode('BG')).toBeEmpty();
+      formsService.getSalutationOptionsForCountryCode('BG').pipe(isEmpty());
     });
 
-    it('should return salutations if countryCode is GB', () => {
-      expect(formsService.getSalutationOptionsForCountryCode('GB')).toHaveLength(3);
+    it('should return salutations if countryCode is GB', done => {
+      formsService.getSalutationOptionsForCountryCode('GB').subscribe(data => {
+        expect(data).toHaveLength(3);
+        done();
+      });
     });
 
-    it('should return salutations if countryCode is US', () => {
-      expect(formsService.getSalutationOptionsForCountryCode('US')).toHaveLength(3);
+    it('should return salutations if countryCode is US', done => {
+      formsService.getSalutationOptionsForCountryCode('US').subscribe(data => {
+        expect(data).toHaveLength(3);
+        done();
+      });
     });
 
-    it('should return salutations if countryCode is DE', () => {
-      expect(formsService.getSalutationOptionsForCountryCode('DE')).toHaveLength(3);
+    it('should return salutations if countryCode is DE', done => {
+      formsService.getSalutationOptionsForCountryCode('DE').subscribe(data => {
+        expect(data).toHaveLength(3);
+        done();
+      });
     });
 
-    it('should return salutations if countryCode is FR', () => {
-      expect(formsService.getSalutationOptionsForCountryCode('FR')).toHaveLength(3);
+    it('should return salutations if countryCode is FR', done => {
+      formsService.getSalutationOptionsForCountryCode('FR').subscribe(data => {
+        expect(data).toHaveLength(3);
+        done();
+      });
     });
   });
 
diff --git a/src/app/shared/forms/utils/forms.service.ts b/src/app/shared/forms/utils/forms.service.ts
index c28e27d291..8bcdf6ab5c 100644
--- a/src/app/shared/forms/utils/forms.service.ts
+++ b/src/app/shared/forms/utils/forms.service.ts
@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { Store, select } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, OperatorFunction } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, OperatorFunction, forkJoin } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
 
 import { Address } from 'ish-core/models/address/address.model';
 import { SelectOption } from 'ish-core/models/select-option/select-option.model';
@@ -56,28 +56,26 @@ export class FormsService {
   /**
    * Gets all possible salutation options for a certain country.
    *
-   * @param translate instance of a translation service
    * @param countryCode country code of the country for which the salutations should be determined.
    * @returns salutation select options
    */
-  getSalutationOptionsForCountryCode(countryCode: string): SelectOption[] {
-    return this.determineSalutations(countryCode).map(title => ({
-      value: this.translate.instant(title),
-      label: title,
-    }));
+  getSalutationOptionsForCountryCode(countryCode: string): Observable<SelectOption[]> {
+    return forkJoin<SelectOption[]>(
+      this.determineSalutations(countryCode).map(title =>
+        this.translate.get(title).pipe(map(translation => ({ value: translation, label: title })))
+      )
+    );
   }
 
   /**
    * Gets all possible salutation options for the current locale.
    *
-   * @param  appFacade instance of the an application facade
-   * @param translate instance of a translation service
    * @returns salutation select options
    */
   getSalutationOptions(): Observable<SelectOption[]> {
     return this.store.pipe(select(getCurrentLocale)).pipe(
       whenTruthy(),
-      map(locale => this.getSalutationOptionsForCountryCode(locale?.substring(3)))
+      switchMap(locale => this.getSalutationOptionsForCountryCode(locale?.substring(3)))
     );
   }