Merge pull request #849 from bodintsov/fix/fix-authenticated-ORCID-is-not-displayed

[ENG-9975] Fix(profile-information): fix orcid displayed on user profile

Author: adlius

src/app/features/profile/components/profile-information/profile-information.component.html

@@ -14,12 +14,10 @@ <h1>{{ currentUser()?.fullName }}</h1>
 
     <div class="flex flex-column gap-4 min-w-0 xl:align-items-end xl:flex-1">
       <div class="flex flex-column gap-3 w-full md:flex-row xl:gap-4 xl:justify-content-end">
-        @if (currentUser()?.social?.orcid) {
+        @if (orcidId()) {
           <div class="flex flex-row align-items-center gap-2">
             <img ngSrc="assets/icons/colored/orcid.svg" width="16" height="16" alt="orcid" />
-            <a class="font-bold" [href]="'https://orcid.org/' + currentUser()?.social?.orcid">
-              https://orcid.org/{{ currentUser()?.social?.orcid }}
-            </a>
+            <a class="font-bold" [href]="'https://orcid.org/' + orcidId()"> https://orcid.org/{{ orcidId() }} </a>
           </div>
         }
 

src/app/features/profile/components/profile-information/profile-information.component.ts

@@ -43,6 +43,11 @@ export class ProfileInformationComponent {
 
   userSocials = computed(() => mapUserSocials(this.currentUser()?.social, SOCIAL_LINKS));
 
+  orcidId = computed(() => {
+    const orcid = this.currentUser()?.external_identity?.ORCID;
+    return orcid?.status?.toUpperCase() === 'VERIFIED' ? orcid.id : undefined;
+  });
+
   toProfileSettings() {
     this.editProfile.emit();
   }

src/app/shared/mappers/user/user.mapper.ts

@@ -32,6 +32,7 @@ export class UserMapper {
       employment: user.attributes.employment,
       iri: user.links.iri,
       social: user.attributes.social,
+      external_identity: user.attributes.external_identity,
       defaultRegionId: user.relationships?.default_region?.data?.id,
       canViewReviews: user.attributes.can_view_reviews === true, // [NS] Do not simplify it
       timezone: user.attributes.timezone,

src/app/shared/models/user/external-identity.model.ts

@@ -0,0 +1,8 @@
+export interface OrcidInfo {
+  id: string;
+  status: string;
+}
+
+export interface ExternalIdentityModel {
+  ORCID?: OrcidInfo | null;
+}

src/app/shared/models/user/user-json-api.model.ts

@@ -2,6 +2,7 @@ import { ResponseDataJsonApi } from '../common/json-api.model';
 
 import { Education } from './education.model';
 import { Employment } from './employment.model';
+import { ExternalIdentityModel } from './external-identity.model';
 import { SocialModel } from './social.model';
 
 export type UserResponseJsonApi = ResponseDataJsonApi<UserDataJsonApi>;
@@ -47,6 +48,7 @@ export interface UserAttributesJsonApi {
   suffix: string;
   locale: string;
   social: SocialModel;
+  external_identity: ExternalIdentityModel;
   timezone: string;
 }
 

src/app/shared/models/user/user.models.ts

@@ -1,5 +1,6 @@
 import { Education } from './education.model';
 import { Employment } from './employment.model';
+import { ExternalIdentityModel } from './external-identity.model';
 import { SocialModel } from './social.model';
 
 export interface UserData {
@@ -24,6 +25,7 @@ export interface UserModel {
   timezone: string;
   locale: string;
   social: SocialModel;
+  external_identity: ExternalIdentityModel;
   defaultRegionId: string;
   link?: string;
   iri?: string;