From d04ca908da46de5350530415e99fdffb4d577920 Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Fri, 13 Sep 2024 19:20:51 +0300 Subject: [PATCH 1/3] display both domains and emails on the public page (#2350) * display both domains and emails on the public page * add missing translation string --- .../side-bar/side-bar/side-bar.component.html | 64 +++++++++++++------ .../side-bar/side-bar/side-bar.component.scss | 16 +++-- .../side-bar/side-bar/side-bar.component.ts | 45 ------------- .../side-bar/side-bar.en.properties | 1 + 4 files changed, 57 insertions(+), 69 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 fd046878e..d337d067c 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 @@ -84,48 +84,72 @@

- Verified emails & domains + Emails & domains

+

+ Verified email addresses +

check_circle
{{ entry.value }} - Verified email address - Verified email domain
+ +

+ Verified email domains +

+
+ check_circle +
+ {{ entry.value }} +
+
+ +

{ - 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) - ) { - this.publicDomainList.push(professionalDomain) - } - } else if (email.visibility === 'PUBLIC') { - this.publicEmailList.push(email) - } - }) - this.userRecord.emails?.emailDomains?.forEach((emailDomain) => { - if ( - emailDomain.visibility === 'PUBLIC' && - !domainsToExclude.includes(emailDomain) - ) { - this.publicDomainList.push(emailDomain) - } }) - this.publicEmailAndDomainList = this.publicEmailList.concat( - this.publicDomainList - ) - } } getWebsite(website: Assertion) { diff --git a/src/locale/properties/side-bar/side-bar.en.properties b/src/locale/properties/side-bar/side-bar.en.properties index 0b39a9313..7689206cc 100644 --- a/src/locale/properties/side-bar/side-bar.en.properties +++ b/src/locale/properties/side-bar/side-bar.en.properties @@ -4,6 +4,7 @@ side-bar.termOfUse=ORCID terms of use side-bar.youMayOnly=you may only add email addresses that you have control over. Each time you add an email address we will send you an email asking you to verify it. side-bar.primaryEmail=Primary email address side-bar.verifiedEmail=Verified email address +side-bar.verifiedEmailAddresses=Verified email addresses side-bar.emailCanNotBeDuplicated=Email can not be duplicated side-bar.noOtherEmails=You haven’t added any other email addresses yet. side-bar.invalidEmailFormat=Invalid email format From d29583ba9bd1c5adf36354d00d2c0ddc1f89b9c4 Mon Sep 17 00:00:00 2001 From: amontenegro Date: Fri, 13 Sep 2024 16:26:40 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A4=96=20GITHUB=20ACTIONS=20i18n=20ge?= =?UTF-8?q?nerator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locale/properties/side-bar/side-bar.lr.properties | 1 + src/locale/properties/side-bar/side-bar.rl.properties | 1 + src/locale/properties/side-bar/side-bar.xx.properties | 1 + 3 files changed, 3 insertions(+) diff --git a/src/locale/properties/side-bar/side-bar.lr.properties b/src/locale/properties/side-bar/side-bar.lr.properties index be520e58e..c1c1f8d54 100644 --- a/src/locale/properties/side-bar/side-bar.lr.properties +++ b/src/locale/properties/side-bar/side-bar.lr.properties @@ -105,3 +105,4 @@ side-bar.noVerifiedEmailDomains=LR side-bar.ariaLabelEmailAndDomainsSave=LR side-bar.ariaLabelEmailAndDomainsCancel=LR side-bar.ariaLabelEmailAndDomainsClose=LR +side-bar.verifiedEmailAddresses=LR diff --git a/src/locale/properties/side-bar/side-bar.rl.properties b/src/locale/properties/side-bar/side-bar.rl.properties index 183244ae5..03dbc6755 100644 --- a/src/locale/properties/side-bar/side-bar.rl.properties +++ b/src/locale/properties/side-bar/side-bar.rl.properties @@ -105,3 +105,4 @@ side-bar.noVerifiedEmailDomains=RL side-bar.ariaLabelEmailAndDomainsSave=RL side-bar.ariaLabelEmailAndDomainsCancel=RL side-bar.ariaLabelEmailAndDomainsClose=RL +side-bar.verifiedEmailAddresses=RL diff --git a/src/locale/properties/side-bar/side-bar.xx.properties b/src/locale/properties/side-bar/side-bar.xx.properties index 1e7355c95..824fdb0db 100644 --- a/src/locale/properties/side-bar/side-bar.xx.properties +++ b/src/locale/properties/side-bar/side-bar.xx.properties @@ -106,3 +106,4 @@ side-bar.noVerifiedEmailDomains=X side-bar.ariaLabelEmailAndDomainsSave=X side-bar.ariaLabelEmailAndDomainsCancel=X side-bar.ariaLabelEmailAndDomainsClose=X +side-bar.verifiedEmailAddresses=X From 32da2561a490338890a8f47f8887b150efe50148 Mon Sep 17 00:00:00 2001 From: github actions Date: Fri, 13 Sep 2024 16:50:45 +0000 Subject: [PATCH 3/3] v2.105.1 changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65535ac03..d8e5abb5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.105.1 - 2024-09-13 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.105.0...v2.105.1) + ## v2.105.0 - 2024-09-13 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.104.17...v2.105.0)