From 0697beffee71eb0db13014c4b642463edc252546 Mon Sep 17 00:00:00 2001
From: Angel Montenegro <a.montenegro@orcid.org>
Date: Thu, 22 Aug 2024 08:41:18 -0600
Subject: [PATCH] Link to the email domains page (#2328)

* Link to the email domains page

* Check the email domain list as well

* fix testign

---------

Co-authored-by: Leonardo Mendoza Fernadez <leomendoza123@gmail.com>
---
 .../modal-email/modal-email.component.html    |   2 +-
 .../side-bar/side-bar/side-bar.component.html |  25 +++++++++++-------
 .../side-bar/side-bar/side-bar.component.ts   |   7 ++---
 src/app/shared/utils/record.util.ts           |   2 ++
 .../summary/.summary.en.properties.swp        | Bin 0 -> 12288 bytes
 5 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 src/locale/properties/summary/.summary.en.properties.swp

diff --git a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html
index 598a87850..8508a2fc5 100644
--- a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html
+++ b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html
@@ -249,7 +249,7 @@ <h2 class="orc-font-body-large" i18n="@@side-bar.emailAddressesUppercase">
           address.</ng-container
         >
         <a
-          href=""
+          href="https://support.orcid.org/hc/en-us/articles/25578292888215-Email-Domains"
           target="_blank"
           rel="noopener noreferrer"
           i18n="@@side-bar.findOutMoreAboutVerifiedEmailDomains"
diff --git a/src/app/cdk/side-bar/side-bar/side-bar.component.html b/src/app/cdk/side-bar/side-bar/side-bar.component.html
index f9faff7c2..87ff94990 100644
--- a/src/app/cdk/side-bar/side-bar/side-bar.component.html
+++ b/src/app/cdk/side-bar/side-bar/side-bar.component.html
@@ -35,7 +35,7 @@
       panelId="emails-panel"
       expandButtonsPosition="right"
       [isPublicRecord]="isPublicRecord"
-      [elements]="userRecord.emails.emails"
+      [elements]="userRecord?.emails?.emails"
       [editModalComponent]="modalEmailComponent"
       [customControls]="isPublicRecord && emailDomainsTogglz && !loadingTogglz"
       [email]="true"
@@ -44,8 +44,10 @@
       id="emails-panel"
       [(openState)]="emailsOpenState"
       *ngIf="
-        userRecord?.emails?.emails &&
-        (!isPublicRecord || userRecord.emails.emails.length > 0)
+        (!isPublicRecord ||
+          (userRecord?.emails?.emails && userRecord?.emails?.emails?.length > 0) ||
+          (userRecord?.emails?.emailDomains && userRecord?.emails?.emailDomains?.length > 0)
+        )
       "
       [userRecord]="userRecord"
     >
@@ -61,13 +63,13 @@
       </h3>
       <app-panel-data
         *ngIf="
-          userRecord.emails.emails.length > 0 &&
+          userRecord?.emails?.emails?.length > 0 &&
           !emailDomainsTogglz &&
           !loadingTogglz
         "
       >
         <app-panel-element
-          *ngFor="let email of userRecord.emails.emails; let last = last"
+          *ngFor="let email of userRecord?.emails?.emails; let last = last"
           [visibility]="
             isPublicRecord ? '' : email.verified ? email.visibility : 'PRIVATE'
           "
@@ -88,7 +90,10 @@
       </h3>
       <app-panel-data
         *ngIf="
-          userRecord.emails.emails.length > 0 &&
+          (
+            (userRecord?.emails?.emails && userRecord?.emails?.emails?.length > 0) ||
+            (userRecord?.emails?.emailDomains && userRecord?.emails?.emailDomains?.length > 0)
+          )  &&
           isPublicRecord &&
           emailDomainsTogglz &&
           !loadingTogglz
@@ -131,7 +136,7 @@
       </h3>
       <app-panel-data
         *ngIf="
-          userRecord.emails.emails.length > 0 &&
+          userRecord?.emails?.emails?.length > 0 &&
           !isPublicRecord &&
           emailDomainsTogglz &&
           !loadingTogglz
@@ -139,7 +144,7 @@
       >
         <h4 header i18n="@@side-bar.emailAddresses">Email addresses</h4>
         <app-panel-element
-          *ngFor="let email of userRecord.emails.emails; let last = last"
+          *ngFor="let email of userRecord?.emails?.emails; let last = last"
           [visibility]="email.verified ? email.visibility : 'PRIVATE'"
           [separator]="!last"
           >{{ email.value }}
@@ -147,7 +152,7 @@ <h4 header i18n="@@side-bar.emailAddresses">Email addresses</h4>
       </app-panel-data>
       <app-panel-data
         *ngIf="
-          userRecord.emails?.emailDomains?.length > 0 &&
+          userRecord?.emails?.emailDomains?.length > 0 &&
           !isPublicRecord &&
           emailDomainsTogglz &&
           !loadingTogglz
@@ -158,7 +163,7 @@ <h4 header i18n="@@side-bar.verifiedEmailDomains">
         </h4>
         <app-panel-element
           *ngFor="
-            let emailDomain of userRecord.emails.emailDomains;
+            let emailDomain of userRecord?.emails.emailDomains;
             let last = last
           "
           [visibility]="isPublicRecord ? '' : emailDomain.visibility"
diff --git a/src/app/cdk/side-bar/side-bar/side-bar.component.ts b/src/app/cdk/side-bar/side-bar/side-bar.component.ts
index f65324955..e4c1964e7 100644
--- a/src/app/cdk/side-bar/side-bar/side-bar.component.ts
+++ b/src/app/cdk/side-bar/side-bar/side-bar.component.ts
@@ -154,8 +154,7 @@ export class SideBarComponent implements OnInit, OnDestroy {
       this.publicEmailList.length === 0 &&
       this.publicDomainList.length === 0
     ) {
-      const domainsToExclude: AssertionVisibilityString[] = []
-      this.userRecord.emails?.emails.forEach((email) => {
+      this.userRecord.emails?.emails?.forEach((email) => {
         const professionalDomain = this.userRecord.emails.emailDomains?.find(
           (emailDomain) => email.value.split('@')[1] === emailDomain.value
         )
@@ -163,7 +162,6 @@ export class SideBarComponent implements OnInit, OnDestroy {
         if (professionalDomain) {
           if (email.visibility === 'PUBLIC') {
             this.publicEmailList.push(email)
-            domainsToExclude.push(professionalDomain)
           } else if (
             professionalDomain.visibility === 'PUBLIC' &&
             !this.publicDomainList.includes(professionalDomain)
@@ -176,8 +174,7 @@ export class SideBarComponent implements OnInit, OnDestroy {
       })
       this.userRecord.emails?.emailDomains?.forEach((emailDomain) => {
         if (
-          emailDomain.visibility === 'PUBLIC' &&
-          !domainsToExclude.includes(emailDomain)
+          emailDomain.visibility === 'PUBLIC'
         ) {
           this.publicDomainList.push(emailDomain)
         }
diff --git a/src/app/shared/utils/record.util.ts b/src/app/shared/utils/record.util.ts
index 6013e9052..b18208779 100644
--- a/src/app/shared/utils/record.util.ts
+++ b/src/app/shared/utils/record.util.ts
@@ -80,6 +80,8 @@ export class RecordUtil {
     if (
       (userRecord?.emails?.emails &&
         (!isPublicRecord || userRecord.emails.emails.length > 0)) ||
+      (userRecord?.emails?.emailDomains &&
+        (!isPublicRecord || userRecord.emails.emailDomains.length > 0)) ||
       (userRecord?.website?.websites &&
         (!isPublicRecord || userRecord.website.websites.length > 0)) ||
       (userRecord?.externalIdentifier?.externalIdentifiers &&
diff --git a/src/locale/properties/summary/.summary.en.properties.swp b/src/locale/properties/summary/.summary.en.properties.swp
new file mode 100644
index 0000000000000000000000000000000000000000..32782ebc82a3946f695b87a75d0aa3ebd4789698
GIT binary patch
literal 12288
zcmeHN&yO256!xx!D3lgN552l@ZIVJIDh_iPnn^oqHd!UvthgY&GtS0jG9KBJEU7B`
zmsBbzKuDbV1CS60ByPZo0~an_xFR9mj3>5dHoG?tR37QmjNkj-^YiB)(Q18iXBr;h
z_uF?6JZ~WM^Zr+}C*P0vZ<0Nfw3jrE`D0S}E_wQtr$oeDwhl=20q2X>q2TR=M<l65
zeWnw3A|BHY7ZHnFBt2avM0BKxI%N#)WP)c@<c!LWTrHPGY_{(<P20v>%kCOZ0jI#_
z3S2{X-+iat>Tkbw3*UJ2=yJOAIt82pP64NYQ@|<U6mSYS1)KselmdCShn~WS_N!5~
zs`p;wT{YdyDc}@v3OEIv0!{&^fK$LJ;1qBQI0c*nPJ#cS0whLg@iId9u0Zkd|NrgZ
z|9`!X&<}v;fDAAI+yz_*{CORrUjg3&o&!DsJOE(8-`5cO5%4)+4F~}@0l&Y7(070@
z0G|R505<@CTt(<hKn}PEcnR>!s|Y;<d<?h^_~#Xbegb?A_y}+ta0T!i)cg(L6j0Rv
z9>6_L0jGddz$xGqa0>iq3RKtf+G|G7!kDHxn=vY+H-$DPNrIU%VwNJC50?XHR7wVy
z1`|KZ*_stM{Y)s_@6&!vG~rwtO2vp41=z7*#6nq{0lifkv-H$r&y=M}Jmz9yvCfKS
zljF~3EMX*vQCL)BS?!1!OXJ}xKj4D;Cw!HUXv9T4F7GxLWAA|<gB>q{fk{DuQ4}1k
zlmn91P&ria##5;(+D4P)oS)gfY`ig8>PZcI4%1a<KLpD~?1Ym-$a+9u883<v<!D0L
zrR9v0oW|Z{&g7OqCla4fn&Q|H^k7VI2A`M3ZvE#%`#f4Sx`fW*zA0EWxln(Y&#5p=
z+AC+IG-6||MeJP9D$aIom$FfPM|W~}e`fNF7(1)Afyzp4-?m44@f4)m+AX7Oiym7_
zmNb-yf~`UEq3E+ED`sr~W(?Y8%7MASiE`=4Y;}?_m?zjAr-G!pXBj%B<w7cK28%2e
z+YDcA?H(7N`oc3VbgpXO8?UUnB~50&lyI?_#`-K6gRw;_E3OU%)8CF5Z)b=uVoeej
z7fV!kG2L3ur*D$Ib6lO*uB14i8f6rR)P-ERgKWmAizw5Y3Ti29BslT(m<pE3#f#m;
zV(ASh4}%d7yTM=*_QGH^*2QJk@m{T7nDoQZuosNS;c(#hv44LOPQytUn5b%Iyx!5E
z8x9_rY}T*9VE|o@f@v5Wo4~R@?|3+RWNZnM`B7HRlGlfCyiyIFRUJ6@1uf5-kvfSZ
z)zqW~-E_e(y+^@^xa&`>YVF?v&+qlZe&|nNY^DTzI>&q^BHEZESsHa`TK|e{CZIuV
RY;bj+So>RN%(<6y^e^NNNlyR(

literal 0
HcmV?d00001