From d39cd59cd9f62d8fffd22faa26d70f02d48754e3 Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Tue, 15 Oct 2024 18:57:02 +0300 Subject: [PATCH 1/5] email modal verification changes --- .../modal-email/modal-email.component.html | 42 +++++++++++++++---- .../modal-email/modal-email.component.scss | 14 +++++-- .../modal-email/modal-email.component.ts | 4 +- .../record-emails/record-emails.service.ts | 7 ++++ src/app/types/record.endpoint.ts | 2 + .../properties/shared/shared.en.properties | 1 + .../side-bar/side-bar.en.properties | 1 + 7 files changed, 57 insertions(+), 14 deletions(-) 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 7badc5956..172ec49eb 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 @@ -80,12 +80,26 @@

class="orc-font-small-print" > Please enter a valid email address, for example - joe@institution.edu + joe@institution.edu {{ domain.value }} - Verified email domain +
verificationsSend: string[] = [] @@ -82,7 +84,7 @@ export class ModalEmailComponent implements OnInit, OnDestroy { addedEmailsCount = 0 emailsForm: UntypedFormGroup = new UntypedFormGroup({}) emails: AssertionVisibilityString[] = [] - verifiedDomains = [] + verifiedDomains: AssertionVisibilityString[] = [] primaryEmail: AssertionVisibilityString | undefined = undefined originalEmailsBackendCopy: AssertionVisibilityString[] defaultVisibility: VisibilityStrings = 'PRIVATE' diff --git a/src/app/core/record-emails/record-emails.service.ts b/src/app/core/record-emails/record-emails.service.ts index ed8ed24fa..d79a75bad 100644 --- a/src/app/core/record-emails/record-emails.service.ts +++ b/src/app/core/record-emails/record-emails.service.ts @@ -62,6 +62,13 @@ export class RecordEmailsService { catchError((error) => of({ emails: [] })), map((value: EmailsEndpoint) => { value.emails.sort(this.sortByEmailCreationDate) + value.emailDomains.forEach((domain) => { + value.emails.forEach((email) => { + if (email.value.includes(domain.value)) { + email.professionalEmail = true + } + }) + }) return value }), tap((value) => { diff --git a/src/app/types/record.endpoint.ts b/src/app/types/record.endpoint.ts index a30c9f9e2..f4a03433f 100644 --- a/src/app/types/record.endpoint.ts +++ b/src/app/types/record.endpoint.ts @@ -104,8 +104,10 @@ export interface AssertionBase { urlName?: string sourceName?: string content?: string + professionalEmail?: boolean createdDate?: MonthDayYearDate lastModified?: MonthDayYearDate + verificationDate?: MonthDayYearDate assertionOriginOrcid?: any assertionOriginClientId?: any assertionOriginName?: any diff --git a/src/locale/properties/shared/shared.en.properties b/src/locale/properties/shared/shared.en.properties index 97493b809..65c0e52af 100644 --- a/src/locale/properties/shared/shared.en.properties +++ b/src/locale/properties/shared/shared.en.properties @@ -21,6 +21,7 @@ shared.whoCanSeeBio=Control who can see your biography by setting the visibility shared.whoCanSeeName=Control who can see your given, family and published names by setting the visibility. The default visibility for your names is shared.requiredInformation=Required information shared.created=Created: +shared.verified=Verified: shared.delete=Delete shared.showMore=Show more shared.showLess=Show less diff --git a/src/locale/properties/side-bar/side-bar.en.properties b/src/locale/properties/side-bar/side-bar.en.properties index dfed5e5f2..3e0165f4b 100644 --- a/src/locale/properties/side-bar/side-bar.en.properties +++ b/src/locale/properties/side-bar/side-bar.en.properties @@ -23,6 +23,7 @@ side-bar.verifiedEmailDomain=Verified email domain side-bar.whenYouVerifyEmail=When you verify a professional email address we will add the associated domain to your record. You can choose to show an email domain on your public record instead of the full email address. side-bar.findOutMoreAboutVerifiedEmailDomains=Find out more about verified email domains side-bar.noVerifiedEmailDomains=No verified email domains +side-bar.orcidEmailValidation=ORCID email validation side-bar.inYourOrcidRecord=in your ORCID record. side-bar.youNeedToVerify=You need to verify your primary email in order to access all of ORCID’s editing features. side-bar.youNeedToVerify2=To verify your email, click the link in the message sent to: From 179590fbf0825c393d8a72d1a9f370d64da3c14d Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Tue, 15 Oct 2024 19:08:06 +0300 Subject: [PATCH 2/5] add missing input --- .../panel/panel-element-source/panel-element-source.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/cdk/panel/panel-element-source/panel-element-source.component.ts b/src/app/cdk/panel/panel-element-source/panel-element-source.component.ts index d73929bcc..9c308e92a 100644 --- a/src/app/cdk/panel/panel-element-source/panel-element-source.component.ts +++ b/src/app/cdk/panel/panel-element-source/panel-element-source.component.ts @@ -11,6 +11,7 @@ import { Component, Input, OnInit } from '@angular/core' export class PanelElementSourceComponent implements OnInit { @Input() name: string @Input() date: string + @Input() isEmailOrDomain = false @Input() isLastItem: boolean @Input() assertion: string constructor() {} From 6548596da21e05f4decc33229ba2143f2ad1f918 Mon Sep 17 00:00:00 2001 From: leomendoza123 Date: Tue, 15 Oct 2024 11:53:02 -0600 Subject: [PATCH 3/5] Update unit_tests.yml --- .github/workflows/unit_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index a2fae5add..23c84b157 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -6,7 +6,7 @@ name: unit_tests jobs: unit_tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 From 74c9756d185a9d9174d235f84839d41fa41e17ab Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Fernadez Date: Tue, 15 Oct 2024 12:38:33 -0600 Subject: [PATCH 4/5] 9417-update-the-public-api-developer-tools-page-with-new-text --- .../components/terms-of-use/terms-of-use.component.html | 4 ++-- .../properties/developer-tools/developer-tools.en.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html index 91f92fc45..e04c61287 100644 --- a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html +++ b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html @@ -10,7 +10,7 @@

ORCID offers a free Public API (Application Programming Interface) that allows your systems and applications to connect to the ORCID registry for - non-commercial use + non-commercial use.

By registering for Public API Credentials, your system or application can: @@ -128,7 +128,7 @@

By “non-commercial” we mean that you may not charge any re-use fees for the Public API, and you may not make use of the Public API in connection with - any revenue-generating product or service + any revenue-generating product or service.

diff --git a/src/locale/properties/developer-tools/developer-tools.en.properties b/src/locale/properties/developer-tools/developer-tools.en.properties index a20d30706..2be999455 100644 --- a/src/locale/properties/developer-tools/developer-tools.en.properties +++ b/src/locale/properties/developer-tools/developer-tools.en.properties @@ -4,7 +4,7 @@ developerTools.ressettingYourClientSecret=Resetting your client secret will gene developerTools.developerTools=Developer tools developerTools.thisSectionIsIntended=This section is intended for developers who plan to integrate ORCID into their system using the ORCID Public API. developerTools.gettingStarted=Getting started with the free ORCID Public API -developerTools.orcidOffersAnApi=ORCID offers a free Public API (Application Programming Interface) that allows your systems and applications to connect to the ORCID registry for non-commercial use +developerTools.orcidOffersAnApi=ORCID offers a free Public API (Application Programming Interface) that allows your systems and applications to connect to the ORCID registry for non-commercial use. developerTools.allowUserToSignInto=Allow users to sign into your system/application with their ORCID account developerTools.getAUserAuthenticated=Obtain a user's’ authenticated ORCID iDs developerTools.retrieveMachineReadable=Read public information from ORCID records in machine-readable format @@ -81,4 +81,4 @@ developerTools.obtainHigher=Obtain a higher usage quota than the ORCID Anonymous developerTools.publicClientApplicationsAreGranted2=If you need access to an ORCID API for commercial use, need a higher usage quota, organizational administration of your API credentials, or the ability to write data to or access Trusted Party data in ORCID records, our developerTools.memberApi=Member API developerTools.mayBeMoreAppropriate=is available to ORCID member organizations. -developerTools.byRegisteringForPublicApi=By “non-commercial” we mean that you may not charge any re-use fees for the Public API, and you may not make use of the Public API in connection with any revenue-generating product or service +developerTools.byRegisteringForPublicApi=By “non-commercial” we mean that you may not charge any re-use fees for the Public API, and you may not make use of the Public API in connection with any revenue-generating product or service. From 00ac3a9fc0186ab21d8bca58ce499324a1b027f3 Mon Sep 17 00:00:00 2001 From: leomendoza123 Date: Tue, 15 Oct 2024 18:42:14 +0000 Subject: [PATCH 5/5] =?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/shared/shared.lr.properties | 1 + src/locale/properties/shared/shared.rl.properties | 1 + src/locale/properties/shared/shared.xx.properties | 1 + 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 + 6 files changed, 6 insertions(+) diff --git a/src/locale/properties/shared/shared.lr.properties b/src/locale/properties/shared/shared.lr.properties index fdb21ff39..e499ca8f4 100644 --- a/src/locale/properties/shared/shared.lr.properties +++ b/src/locale/properties/shared/shared.lr.properties @@ -665,3 +665,4 @@ shared.selectCountryOrLocation=LR shared.opensInNewTab=LR shared.emailsAndDomains=LR shared.verifiedEmailsAndDomains=LR +shared.verified=LR diff --git a/src/locale/properties/shared/shared.rl.properties b/src/locale/properties/shared/shared.rl.properties index a25e806dd..4380d4ec7 100644 --- a/src/locale/properties/shared/shared.rl.properties +++ b/src/locale/properties/shared/shared.rl.properties @@ -661,3 +661,4 @@ shared.selectCountryOrLocation=RL shared.opensInNewTab=RL shared.emailsAndDomains=RL shared.verifiedEmailsAndDomains=RL +shared.verified=RL diff --git a/src/locale/properties/shared/shared.xx.properties b/src/locale/properties/shared/shared.xx.properties index 7f5945d11..a51e7e3ad 100644 --- a/src/locale/properties/shared/shared.xx.properties +++ b/src/locale/properties/shared/shared.xx.properties @@ -661,3 +661,4 @@ shared.selectCountryOrLocation=X shared.opensInNewTab=X shared.emailsAndDomains=X shared.verifiedEmailsAndDomains=X +shared.verified=X diff --git a/src/locale/properties/side-bar/side-bar.lr.properties b/src/locale/properties/side-bar/side-bar.lr.properties index d07ae57c1..b1fd5bb1f 100644 --- a/src/locale/properties/side-bar/side-bar.lr.properties +++ b/src/locale/properties/side-bar/side-bar.lr.properties @@ -109,3 +109,4 @@ side-bar.verifiedEmailAddresses=LR side-bar.ariaLabelDomainVisibilityPublic=LR side-bar.ariaLabelDomainVisibilityTrustedParties=LR side-bar.ariaLabelDomainVisibilityPrivate=LR +side-bar.orcidEmailValidation=LR diff --git a/src/locale/properties/side-bar/side-bar.rl.properties b/src/locale/properties/side-bar/side-bar.rl.properties index 8daff4da1..916394523 100644 --- a/src/locale/properties/side-bar/side-bar.rl.properties +++ b/src/locale/properties/side-bar/side-bar.rl.properties @@ -109,3 +109,4 @@ side-bar.verifiedEmailAddresses=RL side-bar.ariaLabelDomainVisibilityPublic=RL side-bar.ariaLabelDomainVisibilityTrustedParties=RL side-bar.ariaLabelDomainVisibilityPrivate=RL +side-bar.orcidEmailValidation=RL diff --git a/src/locale/properties/side-bar/side-bar.xx.properties b/src/locale/properties/side-bar/side-bar.xx.properties index 9efa34cb1..6c4181f46 100644 --- a/src/locale/properties/side-bar/side-bar.xx.properties +++ b/src/locale/properties/side-bar/side-bar.xx.properties @@ -110,3 +110,4 @@ side-bar.verifiedEmailAddresses=X side-bar.ariaLabelDomainVisibilityPublic=X side-bar.ariaLabelDomainVisibilityTrustedParties=X side-bar.ariaLabelDomainVisibilityPrivate=X +side-bar.orcidEmailValidation=X