Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Email and domains show panel when there is no public emails but public domains #2329

Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
15 changes: 10 additions & 5 deletions src/app/cdk/side-bar/side-bar/side-bar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
Expand All @@ -61,7 +63,7 @@
</h3>
<app-panel-data
*ngIf="
userRecord.emails.emails.length > 0 &&
userRecord?.emails?.emails?.length > 0 &&
!emailDomainsTogglz &&
!loadingTogglz
"
Expand All @@ -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
Expand Down Expand Up @@ -131,7 +136,7 @@
</h3>
<app-panel-data
*ngIf="
userRecord.emails.emails.length > 0 &&
userRecord?.emails?.emails?.length > 0 &&
!isPublicRecord &&
emailDomainsTogglz &&
!loadingTogglz
Expand Down
11 changes: 4 additions & 7 deletions src/app/cdk/side-bar/side-bar/side-bar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,14 @@ export class SideBarComponent implements OnInit, OnDestroy {
this.publicEmailList.length === 0 &&
this.publicDomainList.length === 0
) {
const domainsToExclude: AssertionVisibilityString[] = []
this.userRecord.emails?.emails.forEach((email) => {
const professionalDomain = this.userRecord.emails.emailDomains?.find(
this.userRecord?.emails?.emails?.forEach((email) => {
const professionalDomain = this.userRecord?.emails?.emailDomains?.find(
(emailDomain) => email.value.split('@')[1] === emailDomain.value
)

if (professionalDomain) {
if (email.visibility === 'PUBLIC') {
this.publicEmailList.push(email)
domainsToExclude.push(professionalDomain)
} else if (
professionalDomain.visibility === 'PUBLIC' &&
!this.publicDomainList.includes(professionalDomain)
Expand All @@ -174,10 +172,9 @@ export class SideBarComponent implements OnInit, OnDestroy {
this.publicEmailList.push(email)
}
})
this.userRecord.emails?.emailDomains?.forEach((emailDomain) => {
this.userRecord?.emails?.emailDomains?.forEach((emailDomain) => {
if (
emailDomain.visibility === 'PUBLIC' &&
!domainsToExclude.includes(emailDomain)
emailDomain.visibility === 'PUBLIC'
) {
this.publicDomainList.push(emailDomain)
}
Expand Down
2 changes: 2 additions & 0 deletions src/app/shared/utils/record.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ export class RecordUtil {
if (
(userRecord?.emails?.emails &&
(!isPublicRecord || userRecord.emails.emails.length > 0)) ||
leomendoza123 marked this conversation as resolved.
Show resolved Hide resolved
(userRecord?.emails?.emailDomains &&
(!isPublicRecord || userRecord?.emails.emailDomains.length > 0)) ||
(userRecord?.website?.websites &&
(!isPublicRecord || userRecord.website.websites.length > 0)) ||
(userRecord?.externalIdentifier?.externalIdentifiers &&
Expand Down
Loading