From aea8ac93a871d29e10cce20ec7d956e123a83425 Mon Sep 17 00:00:00 2001 From: amontenegro Date: Mon, 19 Aug 2024 13:20:40 -0600 Subject: [PATCH 01/10] Link to the email domains page --- .../cdk/side-bar/modals/modal-email/modal-email.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@

address. Date: Tue, 20 Aug 2024 10:35:33 -0600 Subject: [PATCH 02/10] Check the email domain list as well --- .../cdk/side-bar/side-bar/side-bar.component.html | 15 ++++++++++----- .../cdk/side-bar/side-bar/side-bar.component.ts | 7 ++----- src/app/shared/utils/record.util.ts | 2 ++ 3 files changed, 14 insertions(+), 10 deletions(-) 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..9a2338ad2 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 @@ -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,7 +63,7 @@

0 && + userRecord.emails?.emails?.length > 0 && !isPublicRecord && emailDomainsTogglz && !loadingTogglz 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 && From cc06ce3d5d759d63fce6a531c5f109b334eedd52 Mon Sep 17 00:00:00 2001 From: amontenegro Date: Tue, 20 Aug 2024 11:13:14 -0600 Subject: [PATCH 03/10] Fix unit tests --- src/app/cdk/side-bar/side-bar/side-bar.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 e4c1964e7..6219805db 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,7 +154,7 @@ export class SideBarComponent implements OnInit, OnDestroy { this.publicEmailList.length === 0 && this.publicDomainList.length === 0 ) { - 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 ) @@ -172,7 +172,7 @@ 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' ) { From aa5e6e1fac093e5e5a53ea2f91a8c71a53251b27 Mon Sep 17 00:00:00 2001 From: amontenegro Date: Tue, 20 Aug 2024 11:16:57 -0600 Subject: [PATCH 04/10] Fix unit tests --- src/app/cdk/side-bar/side-bar/side-bar.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6219805db..cd05a7bf3 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 @@ -155,7 +155,7 @@ export class SideBarComponent implements OnInit, OnDestroy { this.publicDomainList.length === 0 ) { this.userRecord?.emails?.emails?.forEach((email) => { - const professionalDomain = this.userRecord.emails.emailDomains?.find( + const professionalDomain = this.userRecord?.emails?.emailDomains?.find( (emailDomain) => email.value.split('@')[1] === emailDomain.value ) From d1b36dd64a47b221ee4f59fe47b1dd9dd84d2057 Mon Sep 17 00:00:00 2001 From: leomendoza123 Date: Tue, 20 Aug 2024 11:30:32 -0600 Subject: [PATCH 05/10] Update src/app/cdk/side-bar/side-bar/side-bar.component.html --- src/app/cdk/side-bar/side-bar/side-bar.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9a2338ad2..0d0cbbc39 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 @@ -45,8 +45,8 @@ [(openState)]="emailsOpenState" *ngIf=" (!isPublicRecord || - (userRecord.emails?.emails && userRecord.emails?.emails?.length > 0) || - (userRecord.emails?.emailDomains && userRecord.emails?.emailDomains?.length > 0) + (userRecord?.emails?.emails && userRecord?.emails?.emails?.length > 0) || + (userRecord?.emails?.emailDomains && userRecord?.emails?.emailDomains?.length > 0) ) " [userRecord]="userRecord" From f02245c056dabafda9b329840fb9239e7dffd320 Mon Sep 17 00:00:00 2001 From: leomendoza123 Date: Tue, 20 Aug 2024 11:30:36 -0600 Subject: [PATCH 06/10] Update src/app/cdk/side-bar/side-bar/side-bar.component.html --- src/app/cdk/side-bar/side-bar/side-bar.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0d0cbbc39..182a2670d 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 @@ -63,7 +63,7 @@ Date: Tue, 20 Aug 2024 11:30:40 -0600 Subject: [PATCH 07/10] Update src/app/cdk/side-bar/side-bar/side-bar.component.html --- src/app/cdk/side-bar/side-bar/side-bar.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 182a2670d..e8106797b 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 @@ -91,8 +91,8 @@ 0 && + userRecord?.emails?.emails?.length > 0 && !isPublicRecord && emailDomainsTogglz && !loadingTogglz From c14fd91c97711f7959dd4ec6e589fe886e69c425 Mon Sep 17 00:00:00 2001 From: leomendoza123 Date: Tue, 20 Aug 2024 11:42:19 -0600 Subject: [PATCH 09/10] Update src/app/shared/utils/record.util.ts --- src/app/shared/utils/record.util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/utils/record.util.ts b/src/app/shared/utils/record.util.ts index b18208779..614b2a374 100644 --- a/src/app/shared/utils/record.util.ts +++ b/src/app/shared/utils/record.util.ts @@ -81,7 +81,7 @@ export class RecordUtil { (userRecord?.emails?.emails && (!isPublicRecord || userRecord.emails.emails.length > 0)) || (userRecord?.emails?.emailDomains && - (!isPublicRecord || userRecord.emails.emailDomains.length > 0)) || + (!isPublicRecord || userRecord?.emails.emailDomains.length > 0)) || (userRecord?.website?.websites && (!isPublicRecord || userRecord.website.websites.length > 0)) || (userRecord?.externalIdentifier?.externalIdentifiers && From 09a1cf1c8b3e16a388d39e0d3700744604e6ff16 Mon Sep 17 00:00:00 2001 From: leomendoza123 Date: Tue, 20 Aug 2024 11:56:03 -0600 Subject: [PATCH 10/10] Update src/app/shared/utils/record.util.ts --- src/app/shared/utils/record.util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/utils/record.util.ts b/src/app/shared/utils/record.util.ts index 614b2a374..d20a2cf8f 100644 --- a/src/app/shared/utils/record.util.ts +++ b/src/app/shared/utils/record.util.ts @@ -79,7 +79,7 @@ export class RecordUtil { ): boolean { if ( (userRecord?.emails?.emails && - (!isPublicRecord || userRecord.emails.emails.length > 0)) || + (!isPublicRecord || userRecord?.emails?.emails.length > 0)) || (userRecord?.emails?.emailDomains && (!isPublicRecord || userRecord?.emails.emailDomains.length > 0)) || (userRecord?.website?.websites &&