Skip to content

Commit 3ddf5fb

Browse files
aromanovvaromanovv
authored
Merge branch 'main' into aromanovv/COMMS-1502-add-label-to-global-search
2 parents 3adf161 + 1fe5ed2 commit 3ddf5fb

85 files changed

Lines changed: 8309 additions & 4482 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,51 @@
1+
## v2.132.10 - 2026-04-06
2+
3+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.132.9...v2.132.10)
4+
5+
## v2.132.9 - 2026-04-06
6+
7+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.132.8...v2.132.9)
8+
9+
## v2.132.8 - 2026-04-06
10+
11+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.132.7...v2.132.8)
12+
13+
## v2.132.7 - 2026-04-06
14+
15+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.132.6...v2.132.7)
16+
17+
## v2.132.6 - 2026-04-06
18+
19+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.132.5...v2.132.6)
20+
21+
## v2.132.5 - 2026-04-06
22+
23+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.132.4...v2.132.5)
24+
25+
## v2.132.4 - 2026-04-06
26+
27+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.132.3...v2.132.4)
28+
29+
## v2.132.3 - 2026-04-06
30+
31+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.132.2...v2.132.3)
32+
33+
## v2.132.2 - 2026-04-06
34+
35+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.132.1...v2.132.2)
36+
37+
## v2.132.1 - 2026-04-06
38+
39+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.132.0...v2.132.1)
40+
41+
## v2.132.0 - 2026-04-06
42+
43+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.131.25...v2.132.0)
44+
45+
## v2.131.25 - 2026-04-06
46+
47+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.131.24...v2.131.25)
48+
149
## v2.131.24 - 2026-03-26
250

351
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.131.23...v2.131.24)

‎angular.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@
120120
"ignore": ["fonts/**/*", "**/*.scss"],
121121
"output": "/assets/"
122122
},
123+
{
124+
"glob": "**/*",
125+
"input": "src/assets/print-view/",
126+
"output": "/print-view/"
127+
},
123128
{
124129
"glob": "src/favicon.ico",
125130
"input": "src/",

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@angular/animations": "^20.1.6",
4343
"@angular/cdk": "^20.1.5",
4444
"@angular/common": "^20.1.6",
45-
"@angular/compiler": "^20.1.6",
45+
"@angular/compiler": "^20.3.18",
4646
"@angular/core": "^20.3.16",
4747
"@angular/elements": "20.1.6",
4848
"@angular/forms": "^20.1.6",

‎src/app/account-settings/components/settings-security-alternate-sign-in/settings-security-alternate-sign-in.component.html‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@
3838
<div *ngFor="let account of accounts">
3939
<div class="mobile-elements-container">
4040
<div>
41-
<button (click)="delete(account)" mat-icon-button>
41+
<button
42+
(click)="delete(account)"
43+
[attr.aria-label]="labelDeleteButton + ' ' + account?.idpName"
44+
mat-icon-button
45+
>
4246
<mat-icon>delete</mat-icon>
4347
</button>
4448
</div>
@@ -96,7 +100,12 @@
96100
<ng-container matColumnDef="actions" stickyEnd>
97101
<th mat-header-cell *matHeaderCellDef></th>
98102
<td mat-cell *matCellDef="let element">
99-
<button (click)="delete(element)" mat-icon-button>
103+
<button
104+
[matTooltip]="labelDeleteButton"
105+
[attr.aria-label]="labelDeleteButton + ' ' + element?.idpName"
106+
(click)="delete(element)"
107+
mat-icon-button
108+
>
100109
<mat-icon>delete</mat-icon>
101110
</button>
102111
</td>

‎src/app/account-settings/components/settings-security-alternate-sign-in/settings-security-alternate-sign-in.component.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ export class SettingsSecurityAlternateSignInComponent
4343
isMobile: any
4444
refreshAccounts$ = new BehaviorSubject<void>(undefined)
4545
authChallengeLabel = $localize`:@@accountSettings.security.unlinkTheAlternateSignInAccount:unlink the alternate sign in account`
46+
labelDeleteButton = $localize`:@@shared.delete:Delete`
4647

4748
constructor(
4849
private _accountSettingAlternate: AccountSecurityAlternateSignInService,

‎src/app/account-settings/components/settings-security-two-factor-auth/settings-security-two-factor-auth.component.scss-theme.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}
1414

1515
.on {
16-
color: map-get($foreground, 'brand-primary-dark');
16+
color: map-get($foreground, 'brand-primary-darkest');
1717
}
1818
}
1919

‎src/app/app.module.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { TitleService } from './core/title-service/title.service'
1313
import { HttpContentTypeHeaderInterceptor } from './core/http-content-type-header-interceptor/http-content-type-header-interceptor'
1414
import { XsrfFallbackInterceptor } from './core/xsrf/xsrf-fallback.interceptor'
1515
import { FirefoxXsrfPreloadInterceptor } from './core/lang-preload/firefox-xsrf-preload.interceptor'
16+
import { RetryTransientInterceptor } from './core/http/retry-transient.interceptor'
1617
import {
1718
HTTP_INTERCEPTORS,
1819
provideHttpClient,
@@ -52,6 +53,11 @@ import { FormsModule } from '@angular/forms'
5253
useClass: FirefoxXsrfPreloadInterceptor,
5354
multi: true,
5455
},
56+
{
57+
provide: HTTP_INTERCEPTORS,
58+
useClass: RetryTransientInterceptor,
59+
multi: true,
60+
},
5561
{
5662
provide: HTTP_INTERCEPTORS,
5763
useClass: HttpContentTypeHeaderInterceptor,

‎src/app/cdk/account-panel/settings-panels/settings-panels.component.scss-theme.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
}
3434

3535
.on {
36-
color: map-get($foreground, 'brand-primary-dark');
36+
color: map-get($foreground, 'brand-primary-darkest');
3737
}
3838
}
3939
}

‎src/app/cdk/interstitials/interstitials.service.ts‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
import { HttpClient } from '@angular/common/http'
22
import { Inject, Injectable } from '@angular/core'
33
import { Observable, of } from 'rxjs'
4-
import {
5-
catchError,
6-
filter,
7-
map,
8-
retry,
9-
switchMap,
10-
take,
11-
tap,
12-
} from 'rxjs/operators'
4+
import { catchError, filter, map, switchMap, take, tap } from 'rxjs/operators'
135
import { UserService } from 'src/app/core'
146
import { ErrorHandlerService } from 'src/app/core/error-handler/error-handler.service'
157
import { InterstitialType } from './interstitial.type'
@@ -85,7 +77,6 @@ export class InterstitialsService {
8577
`${runtimeEnvironment.API_WEB}account/hasInterstitialFlag/${interstitialName}`
8678
)
8779
.pipe(
88-
retry(3),
8980
switchMap((hasFlag) => {
9081
if (hasFlag) {
9182
return this.setInterstitialsViewed(interstitialName, false).pipe(
@@ -104,10 +95,7 @@ export class InterstitialsService {
10495
`${runtimeEnvironment.API_WEB}account/addInterstitialFlag`,
10596
interstitialName
10697
)
107-
.pipe(
108-
retry(3),
109-
catchError((error) => this._errorHandler.handleError(error))
110-
)
98+
.pipe(catchError((error) => this._errorHandler.handleError(error)))
11199
}
112100

113101
/**

‎src/app/core/account-actions-deactivate/account-actions-deactivate.service.ts‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { HttpClient, HttpHeaders } from '@angular/common/http'
22
import { Injectable } from '@angular/core'
33
import { Observable } from 'rxjs'
4-
import { catchError, retry } from 'rxjs/operators'
4+
import { catchError } from 'rxjs/operators'
55

66
import { ErrorHandlerService } from '../error-handler/error-handler.service'
77
import {
@@ -34,10 +34,7 @@ export class AccountActionsDeactivateService {
3434
.get<ExpiringLinkVerification>(
3535
runtimeEnvironment.API_WEB + `account/deactivate/` + token
3636
)
37-
.pipe(
38-
retry(3),
39-
catchError((error) => this._errorHandler.handleError(error))
40-
)
37+
.pipe(catchError((error) => this._errorHandler.handleError(error)))
4138
}
4239

4340
deactivateAccount(
@@ -49,10 +46,7 @@ export class AccountActionsDeactivateService {
4946
runtimeEnvironment.API_WEB + `account/deactivate/` + token,
5047
data
5148
)
52-
.pipe(
53-
retry(3),
54-
catchError((error) => this._errorHandler.handleError(error))
55-
)
49+
.pipe(catchError((error) => this._errorHandler.handleError(error)))
5650
}
5751

5852
generateDeactivationLink(): Observable<DeactivateResponse> {
@@ -61,9 +55,6 @@ export class AccountActionsDeactivateService {
6155
runtimeEnvironment.API_WEB + `account/send-deactivate-account.json`,
6256
this.options
6357
)
64-
.pipe(
65-
retry(3),
66-
catchError((error) => this._errorHandler.handleError(error))
67-
)
58+
.pipe(catchError((error) => this._errorHandler.handleError(error)))
6859
}
6960
}

0 commit comments

Comments
 (0)