Merge pull request #1977 from ORCID/8662-qa-items-in-countries-modal-not-displayed-correctly-for-de-pl-and-tr

8662 qa items in countries modal not displayed correctly for de pl and tr

Author: cryptalith

src/app/cdk/side-bar/modals/modal-country/modal-country.component.html

@@ -126,9 +126,8 @@
                   #descriptionInput
                   [attr.aria-label]="ariaLabelCountryLocationReadOnly"
                   matInput
-                  formControlName="country"
-                  placeholder=" {{ ngOrcidCountry }}"
                   [ngClass]="{ 'website-input': screenDirection === 'rtl' }"
+                  [value]="country.countryName || ''"
                 />
                 <mat-hint *ngIf="country.putCode.indexOf('new') < 0">
                   <app-source-hit

src/app/core/google-tag-manager/google-tag-manager.service.ts

@@ -13,7 +13,6 @@ import { ItemGTM } from '../../types/item_gtm'
 import { ERROR_REPORT } from '../../errors'
 import { ErrorHandlerService } from '../error-handler/error-handler.service'
 import { WINDOW } from 'src/app/cdk/window'
-import { log } from 'console'
 
 @Injectable({
   providedIn: 'root',

src/app/core/record-countries/record-countries.service.ts

@@ -1,9 +1,12 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http'
 import { Injectable } from '@angular/core'
-import { Observable, of, ReplaySubject } from 'rxjs'
+import { forkJoin, merge, Observable, of, ReplaySubject } from 'rxjs'
 import { retry, catchError, tap, map } from 'rxjs/operators'
 import { CountriesEndpoint } from 'src/app/types/record-country.endpoint'
-import { UserRecordOptions } from 'src/app/types/record.local'
+import {
+  SideBarPublicUserRecord,
+  UserRecordOptions,
+} from 'src/app/types/record.local'
 import { environment } from 'src/environments/environment'
 import { ErrorHandlerService } from '../error-handler/error-handler.service'
 import { RecordPublicSideBarService } from '../record-public-side-bar/record-public-side-bar.service'
@@ -297,9 +300,20 @@ export class RecordCountriesService {
     }
   ): Observable<CountriesEndpoint> {
     if (options.publicRecordId) {
-      return this._recordPublicSidebar
-        .getPublicRecordSideBar(options)
-        .pipe(map((value) => value.countries))
+      return forkJoin([
+        this._recordPublicSidebar.getPublicRecordSideBar(options),
+        this.getCountryCodes(),
+      ]).pipe(
+        map((value) => {
+          const countries = value[0].countries
+          const countryCodes = value[1]
+          countries.addresses.forEach((country) => {
+            //Override backend country name translations
+            country.countryName = countryCodes[country.iso2Country.value] || ''
+          })
+          return countries
+        })
+      )
     }
 
     if (!this.$addresses) {