diff --git a/CHANGELOG.md b/CHANGELOG.md index 63ddb7f11b..5e2196766a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +## 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) + +- [#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) + +- [#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) 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/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` 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 +

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

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; 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 { } }) } - - }