Skip to content

Commit

Permalink
Merge branch 'main' into lmendoza/batch-of-fixes-29-aug
Browse files Browse the repository at this point in the history
  • Loading branch information
leomendoza123 authored Aug 30, 2024
2 parents ec417cb + 26bbb61 commit c0b6610
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 29 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 2 additions & 1 deletion src/app/cdk/platform-info/browserlist.regexp.ts
Original file line number Diff line number Diff line change
@@ -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]*)?)/
21 changes: 18 additions & 3 deletions src/app/cdk/side-bar/modals/modal-email/modal-email.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<app-modal [noSidebar]="true">
<app-modal-header i18n="@@shared.emails" [closeLabel]="ariaLabelClose"
<app-modal-header
*ngIf="emailDomainsTogglz && !loadingTogglz"
i18n="@@shared.emailsAndDomains"
[closeLabel]="ariaLabelClose"
>Emails & domains</app-modal-header
>
<app-modal-header
*ngIf="!emailDomainsTogglz && !loadingTogglz"
i18n="@@shared.emails"
[closeLabel]="ariaLabelCloseOld"
>Emails</app-modal-header
>
<app-modal-footer>
Expand All @@ -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
</button>
Expand All @@ -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
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
4 changes: 3 additions & 1 deletion src/app/cdk/side-bar/side-bar/side-bar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@
!loadingTogglz
"
>
<h4 header i18n="@@side-bar.emailAddresses">Email addresses</h4>
<h4 header i18n="@@side-bar.emailAddressesUppercase">
Email addresses
</h4>
<app-panel-element
*ngFor="let email of userRecord?.emails?.emails; let last = last"
[visibility]="email.verified ? email.visibility : 'PRIVATE'"
Expand Down
5 changes: 5 additions & 0 deletions src/app/cdk/side-bar/side-bar/side-bar.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,22 @@ hr {
.verification-icon {
height: 28px;
width: 28px;
min-width: 28px;
font-size: 28px;
margin-right: 8px;
}

.last-public-email-or-domain {
margin-bottom: -8px;
}

.public-email-or-domain {
::ng-deep hr {
margin: 16px 0 16px 0;
}
div {
flex-wrap: nowrap !important;
}
}

.email-section {
Expand Down
2 changes: 1 addition & 1 deletion src/app/link-account/link-account.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { A11yLinkModule } from '../cdk/a11y-link/a11y-link.module'
MatProgressBarModule,
LinkAccountRoutingModule,
SignInModule,
A11yLinkModule
A11yLinkModule,
],
})
export class LinkAccountModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ <h1 class="orc-font-heading-small">
Link your
</ng-container>
{{ entityDisplayName }}
<ng-container i18n="@@linking.title.2">
account
</ng-container>
<ng-container i18n="@@linking.title.2"> account </ng-container>
</h1>
<p class="mat-body-1">
<ng-container i18n="@@linking.signed">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:host {
width: 100%;

::ng-deep {
.mat-card-header {
width: unset !important;
Expand Down
38 changes: 19 additions & 19 deletions src/app/link-account/pages/link-account/link-account.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ export class LinkAccountComponent implements OnInit {
})
}


register() {
// always send the user with all query parameters
this._platformInfo
Expand All @@ -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,
Expand All @@ -130,6 +132,4 @@ export class LinkAccountComponent implements OnInit {
}
})
}


}

0 comments on commit c0b6610

Please sign in to comment.