From 7a78b0760f6d1745323108872ed4b49e3022602a Mon Sep 17 00:00:00 2001 From: leomendoza123 Date: Fri, 30 Aug 2024 02:10:33 +0000 Subject: [PATCH 1/7] =?UTF-8?q?=F0=9F=A4=96=20GITHUB=20ACTIONS=20format=5F?= =?UTF-8?q?prettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cdk/platform-info/browserlist.regexp.ts | 3 +- .../institutional/institutional.component.ts | 13 ++++--- src/app/link-account/link-account.module.ts | 2 +- .../link-account/link-account.component.html | 4 +- .../link-account/link-account.component.ts | 38 +++++++++---------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/app/cdk/platform-info/browserlist.regexp.ts b/src/app/cdk/platform-info/browserlist.regexp.ts index bf8c4aa5cf..545a90290e 100644 --- a/src/app/cdk/platform-info/browserlist.regexp.ts +++ b/src/app/cdk/platform-info/browserlist.regexp.ts @@ -1,2 +1,3 @@ // tslint:disable-next-line: max-line-length -export const BROWSERLIST_REGEXP = /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/ +export const BROWSERLIST_REGEXP = + /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/ diff --git a/src/app/institutional/pages/institutional/institutional.component.ts b/src/app/institutional/pages/institutional/institutional.component.ts index 7d0eb11ec8..8bef33b8f9 100644 --- a/src/app/institutional/pages/institutional/institutional.component.ts +++ b/src/app/institutional/pages/institutional/institutional.component.ts @@ -69,7 +69,7 @@ export class InstitutionalComponent implements OnInit { private _disco: DiscoService, private _router: Router, private _platformInfo: PlatformInfoService, - private _cookie: CookieService, + private _cookie: CookieService ) { this.loading = true this._disco.getDiscoFeed().subscribe((res) => { @@ -96,7 +96,10 @@ export class InstitutionalComponent implements OnInit { : institutionsFiltered }), tap(() => { - if (!this.institutionFormControl.valid && !this.institutionFormControl.pristine) { + if ( + !this.institutionFormControl.valid && + !this.institutionFormControl.pristine + ) { this.userSelectedInstitutions = [] } }) @@ -155,13 +158,11 @@ export class InstitutionalComponent implements OnInit { this.entityID = this.institution.entityID this.displayDefaultImage = false - this.imageLoadingTimeOut= false - this.imageLoadingFinish= false + this.imageLoadingTimeOut = false + this.imageLoadingFinish = false this.userSelectedInstitutions = [] this.userSelectedInstitutions.push(institutionSelected) - - } getNameInstitution(institution: Institutional): DisplayName { diff --git a/src/app/link-account/link-account.module.ts b/src/app/link-account/link-account.module.ts index f035af082e..4265c1d26d 100644 --- a/src/app/link-account/link-account.module.ts +++ b/src/app/link-account/link-account.module.ts @@ -23,7 +23,7 @@ import { A11yLinkModule } from '../cdk/a11y-link/a11y-link.module' MatProgressBarModule, LinkAccountRoutingModule, SignInModule, - A11yLinkModule + A11yLinkModule, ], }) export class LinkAccountModule {} diff --git a/src/app/link-account/pages/link-account/link-account.component.html b/src/app/link-account/pages/link-account/link-account.component.html index 294f5cf3fc..db825ab72a 100644 --- a/src/app/link-account/pages/link-account/link-account.component.html +++ b/src/app/link-account/pages/link-account/link-account.component.html @@ -22,9 +22,7 @@

Link your {{ entityDisplayName }} - - account - + account

diff --git a/src/app/link-account/pages/link-account/link-account.component.ts b/src/app/link-account/pages/link-account/link-account.component.ts index f835d1b082..bf66718ed4 100644 --- a/src/app/link-account/pages/link-account/link-account.component.ts +++ b/src/app/link-account/pages/link-account/link-account.component.ts @@ -87,7 +87,6 @@ export class LinkAccountComponent implements OnInit { }) } - register() { // always send the user with all query parameters this._platformInfo @@ -100,23 +99,26 @@ export class LinkAccountComponent implements OnInit { this._user .getUserSession() .pipe(first()) - .subscribe((userSession) => { - const params = platform.queryParameters - this._router.navigate(['/register'], { - /// TODO @leomendoza123 depend only on the user session thirty party login data - /// avoid taking data from the the parameters. + .subscribe( + (userSession) => { + const params = platform.queryParameters + this._router.navigate(['/register'], { + /// TODO @leomendoza123 depend only on the user session thirty party login data + /// avoid taking data from the the parameters. - queryParams: { - ...params, - providerId, - linkType, - }, - }) - }, (error) => { - this._router.navigate(['/register'], { - queryParams: platform.queryParameters, - }) - }) + queryParams: { + ...params, + providerId, + linkType, + }, + }) + }, + (error) => { + this._router.navigate(['/register'], { + queryParams: platform.queryParameters, + }) + } + ) } else { this._router.navigate(['/register'], { queryParams: platform.queryParameters, @@ -130,6 +132,4 @@ export class LinkAccountComponent implements OnInit { } }) } - - } From 19189f51bd5f80cf0c0eb5f995fabb264cf8cccc Mon Sep 17 00:00:00 2001 From: github actions Date: Fri, 30 Aug 2024 02:34:08 +0000 Subject: [PATCH 2/7] v2.104.5 changelog update --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63ddb7f11b..5620efdb73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v2.104.5 - 2024-08-30 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.104.4...v2.104.5) + +- [#2336](https://github.com/ORCID/orcid-angular/pull/2336): Lmendoza/batch of fixes 29 aug + ## v2.104.4 - 2024-08-28 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.104.3...v2.104.4) From 4fbedd555ce383249fea787a6c3bae1a87ff5062 Mon Sep 17 00:00:00 2001 From: leomendoza123 Date: Fri, 30 Aug 2024 03:00:58 +0000 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=A4=96=20GITHUB=20ACTIONS=20format=5F?= =?UTF-8?q?prettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../link-account/pages/link-account/link-account.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/link-account/pages/link-account/link-account.component.scss b/src/app/link-account/pages/link-account/link-account.component.scss index 4714e4bbaf..1a29b4c560 100644 --- a/src/app/link-account/pages/link-account/link-account.component.scss +++ b/src/app/link-account/pages/link-account/link-account.component.scss @@ -1,6 +1,6 @@ :host { width: 100%; - + ::ng-deep { .mat-card-header { width: unset !important; From 861706c5dddb9c23bb2956f51d821521f1a08e05 Mon Sep 17 00:00:00 2001 From: github actions Date: Fri, 30 Aug 2024 03:24:47 +0000 Subject: [PATCH 4/7] v2.104.6 changelog update --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5620efdb73..53f6d32c7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v2.104.6 - 2024-08-30 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.104.5...v2.104.6) + +- [#2337](https://github.com/ORCID/orcid-angular/pull/2337): update-inst-signin + ## v2.104.5 - 2024-08-30 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.104.4...v2.104.5) From 4d685698652250e8f40c107138239ed08586018c Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Fri, 30 Aug 2024 18:37:09 +0300 Subject: [PATCH 5/7] fix public page email section wrapping (#2338) --- src/app/cdk/side-bar/side-bar/side-bar.component.html | 4 +++- src/app/cdk/side-bar/side-bar/side-bar.component.scss | 5 +++++ 2 files changed, 8 insertions(+), 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 29e56a4b7e..fd046878e5 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 @@ -144,7 +144,9 @@ !loadingTogglz " > -

Email addresses

+

+ Email addresses +

Date: Fri, 30 Aug 2024 16:01:08 +0000 Subject: [PATCH 6/7] v2.104.7 changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53f6d32c7e..5e2196766a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.104.7 - 2024-08-30 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.104.6...v2.104.7) + ## v2.104.6 - 2024-08-30 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.104.5...v2.104.6) From 26bbb61a979f87353b9b6e31ee6869907b78d16a Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Fri, 30 Aug 2024 19:12:41 +0300 Subject: [PATCH 7/7] fix email and domains modal title (#2335) * fix email and domains modal title * add togglz to labels and titles --------- Co-authored-by: Angel Montenegro --- .../modal-email/modal-email.component.html | 21 ++++++++++++++++--- .../modal-email/modal-email.component.ts | 3 +++ 2 files changed, 21 insertions(+), 3 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 48401479ea..15ecc86ac9 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 @@ -1,5 +1,14 @@ - Emails & domains + Emails @@ -9,7 +18,9 @@ (click)="saveEvent()" i18n="@@shared.saveChanges" id="save-emails-button" - [attr.aria-label]="ariaLabelSave" + [attr.aria-label]=" + emailDomainsTogglz && !loadingTogglz ? ariaLabelSave : ariaLabelSaveOld + " > Save changes @@ -19,7 +30,11 @@ (click)="closeEvent()" i18n="@@shared.cancel" id="cancel-emails-button" - [attr.aria-label]="ariaLabelCancel" + [attr.aria-label]=" + emailDomainsTogglz && !loadingTogglz + ? ariaLabelCancel + : ariaLabelCancelOld + " > Cancel diff --git a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.ts b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.ts index 008bd67d40..b3533cd0c6 100644 --- a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.ts +++ b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.ts @@ -49,11 +49,14 @@ export class ModalEmailComponent implements OnInit, OnDestroy { ariaLabelKnowledgeBase = $localize`:@@side-bar.ariaLabelOrcidTermsOfUseBase:ORCID knowledge base (Opens in a new tab)` ariaLabelKnowledgeSupport = $localize`:@@side-bar.ariaLabelOrcidTermsSupport:ORCID support page (Opens in a new tab)` ariaLabelOrcidTermsOfUseLink = $localize`:@@side-bar.ariaLabelOrcidTermsOfUseLink:ORCID terms of use (Opens in a new tab)` + ariaLabelSaveOld = $localize`:@@side-bar.ariaLabelEmailSave:Save changes to Emails` ariaLabelSave = $localize`:@@side-bar.ariaLabelEmailAndDomainsSave:Save changes to Emails & domains` ariaLabelNotificationsAreSentToEmail = $localize`:@@side-bar.notificationsAreSentToEmail:Notifications are sent to` + ariaLabelCancelOld = $localize`:@@side-bar.ariaLabelEmailCancel:Cancel changes and close Emails` ariaLabelCancel = $localize`:@@side-bar.ariaLabelEmailAndDomainsCancel:Cancel changes and close Emails & domains` ariaLabelDelete = $localize`:@@side-bar.ariaLabelEmailDelete:Delete Email` ariaLabelClose = $localize`:@@side-bar.ariaLabelEmailAndDomainsClose:Close Emails & domains` + ariaLabelCloseOld = $localize`:@@side-bar.ariaLabelEmailClose:Close Emails` ariaLabelEmailAddress = $localize`:@@side-bar.emailAddress:Email address` ariaLabelNewEmailAddress = $localize`:@@side-bar.newEmailAddress:New email address` ariaLabelOtherEmailAddresses = $localize`:@@side-bar.otherEmails:Other email addresses`