Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

9149-qa-add-a-record-summaries-toggle #2207

Merged
merged 2 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/app/cdk/platform-info/browserlist.regexp.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
// 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]*)?)/
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
</div>
</section>

<div>
<div *ngIf="newRecordHeaderWithSummaryTogglz">
<button
mat-button
(click)="recordSummaryLinkClick()"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export class RecordHeaderComponent implements OnInit {
@Input() loadingUserRecord = true
@Input() isPublicRecord: string
@Input() affiliations: number
@Input() newRecordHeaderWithSummaryTogglz: boolean
_recordSummaryOpen: boolean

@Input()
Expand Down
1 change: 1 addition & 0 deletions src/app/record/pages/my-orcid/my-orcid.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
[isPublicRecord]="publicOrcid"
[affiliations]="affiliations"
[(recordSummaryOpen)]="recordSummaryOpen"
[newRecordHeaderWithSummaryTogglz]="newRecordHeaderWithSummaryTogglz"
></app-record-header>
<div
class="container no-padding main-content"
Expand Down
4 changes: 4 additions & 0 deletions src/app/record/pages/my-orcid/my-orcid.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export class MyOrcidComponent implements OnInit, OnDestroy {
readyForIndexing: boolean
fragment: string
newRecordHeaderTogglz = false
newRecordHeaderWithSummaryTogglz: boolean

constructor(
_userInfoService: UserInfoService,
Expand Down Expand Up @@ -210,6 +211,9 @@ export class MyOrcidComponent implements OnInit, OnDestroy {
}),
switchMap(() => this._togglz.getTogglz().pipe(first())),
tap((togglz) => {
if (togglz.messages['NEW_RECORD_HEADER_WITH_SUMMARY'] === 'true') {
this.newRecordHeaderWithSummaryTogglz = true
}
if (togglz.messages['ORCID_ANGULAR_HELP_HERO'] === 'true') {
if (
!this.publicOrcid &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
[signInUpdatesV1Togglz]="signInUpdatesV1Togglz"
[printError]="printError"
[badCredentials]="badCredentials"
[attr.aria-live]="'polite'"
></app-my-orcid-alerts>
<div class="input-container">
<mat-label
Expand Down Expand Up @@ -148,7 +149,7 @@
[attr.placeholder]="placeholderPassword"
/>
</mat-form-field>
<div class="info" *ngIf="passwordForm.hasError('maxlength')">
<div class="info" *ngIf="passwordForm.hasError('maxlength')" aria-live="polite">
<div>
<mat-icon class="large-material-icon material-symbols-outlined"
>error</mat-icon
Expand Down Expand Up @@ -190,11 +191,14 @@
[showInvalidUser]="showInvalidUser"
[orcidPrimaryDeprecated]="orcidPrimaryDeprecated"
[email]="email"
[attr.aria-live]="'polite'"

>
</app-print-errors>
<app-deactivated
*ngIf="!signInUpdatesV1Togglz && showDeactivatedError"
[email]="email"
[attr.aria-live]="'polite'"
>
</app-deactivated>
<app-two-factor-authentication-form
Expand Down
1 change: 1 addition & 0 deletions src/app/sign-in/pages/sign-in/sign-in.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*ngIf="!signInUpdatesV1Togglz && (emailVerified || invalidVerifyUrl)"
[emailVerified]="emailVerified"
[invalidVerifyUrl]="invalidVerifyUrl"
[attr.aria-live]="'polite'"
></app-my-orcid-alerts>
<div class="container">
<div class="row space-around">
Expand Down
Loading