Skip to content

Commit dc45009

Browse files
cryptalithcryptalith
authored
Merge branch 'main' into lmendoza/ENGAGE-243
2 parents 7469a7e + d0793d1 commit dc45009

7 files changed

Lines changed: 50 additions & 15 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## v2.129.10 - 2026-02-16
2+
3+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.129.9...v2.129.10)
4+
5+
- [#2747](https://github.com/ORCID/orcid-angular/pull/2747): PD-4994
6+
7+
## v2.129.9 - 2026-02-13
8+
9+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.129.8...v2.129.9)
10+
11+
- [#2745](https://github.com/ORCID/orcid-angular/pull/2745): PD-4994,PD-4993
12+
113
## v2.129.8 - 2026-02-12
214

315
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.129.7...v2.129.8)

‎src/app/record/components/top-bar/top-bar.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
></app-top-bar-verification-email>
1414
<ng-container *ngIf="!isPublicRecord && !recordWithIssues">
1515
<orcid-registry-permission-notifications
16-
*ngIf="permissionPanelNotifications?.length"
16+
*ngIf="permissionPanelNotifications?.length && userInfo?.LOCKED !== 'true'"
1717
[title]="permissionPanelTitle"
1818
[subtitle]="permissionPanelSubtitle"
1919
[notifications]="permissionPanelNotifications"

‎src/app/record/components/top-bar/top-bar.component.ts‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,10 @@ export class TopBarComponent implements OnInit, OnDestroy {
178178
}
179179

180180
if (event.actionId === 'connect') {
181-
const target = raw.authorizationUrl?.uri
181+
const integration = this.parseOrcidIntegrationIntro(
182+
raw?.notificationIntro
183+
)
184+
const target = integration?.link || raw.authorizationUrl?.uri
182185
this._inbox
183186
.flagAsRead(raw.putCode)
184187
.pipe(first())
@@ -212,7 +215,14 @@ export class TopBarComponent implements OnInit, OnDestroy {
212215
.subscribe((grouped) => {
213216
this.permissionPanelRaw = grouped
214217
this.permissionPanelNotifications = grouped.map((n) => {
215-
const orgName = n?.sourceDescription || ''
218+
const integration = this.parseOrcidIntegrationIntro(
219+
n?.notificationIntro
220+
)
221+
const orgName =
222+
integration?.memberName ||
223+
n?.source?.sourceName?.content ||
224+
n?.sourceDescription ||
225+
''
216226
const escaped = orgName
217227
.replace(/&/g, '&amp;')
218228
.replace(/</g, '&lt;')
@@ -242,6 +252,19 @@ export class TopBarComponent implements OnInit, OnDestroy {
242252
})
243253
}
244254

255+
private parseOrcidIntegrationIntro(
256+
intro?: string
257+
): { memberName: string; link: string } | null {
258+
if (!intro || !intro.includes('::')) {
259+
return null
260+
}
261+
const [memberName, link] = intro.split('::')
262+
if (!memberName || !link) {
263+
return null
264+
}
265+
return { memberName, link }
266+
}
267+
245268
resendVerificationEmailModal(email: string) {
246269
this._verificationEmailModalService.openVerificationEmailModal(email)
247270
}

‎src/locale/messages.lr.xlf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13966,23 +13966,23 @@
1396613966
<source>wants to add information to your ORCID record</source>
1396713967
<context-group purpose="location">
1396813968
<context context-type="sourcefile">src/app/record/components/top-bar/top-bar.component.ts</context>
13969-
<context context-type="linenumber">221</context>
13969+
<context context-type="linenumber">231</context>
1397013970
</context-group>
1397113971
<target>LR</target>
1397213972
</trans-unit>
1397313973
<trans-unit id="topBar.permissionRead" datatype="html" resname="topBar.permissionRead">
1397413974
<source>Read</source>
1397513975
<context-group purpose="location">
1397613976
<context context-type="sourcefile">src/app/record/components/top-bar/top-bar.component.ts</context>
13977-
<context context-type="linenumber">230</context>
13977+
<context context-type="linenumber">240</context>
1397813978
</context-group>
1397913979
<target>LR</target>
1398013980
</trans-unit>
1398113981
<trans-unit id="topBar.permissionConnectNow" datatype="html" resname="topBar.permissionConnectNow">
1398213982
<source>Connect now</source>
1398313983
<context-group purpose="location">
1398413984
<context context-type="sourcefile">src/app/record/components/top-bar/top-bar.component.ts</context>
13985-
<context context-type="linenumber">236</context>
13985+
<context context-type="linenumber">246</context>
1398613986
</context-group>
1398713987
<target>LR</target>
1398813988
</trans-unit>

‎src/locale/messages.rl.xlf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13966,23 +13966,23 @@
1396613966
<source>wants to add information to your ORCID record</source>
1396713967
<context-group purpose="location">
1396813968
<context context-type="sourcefile">src/app/record/components/top-bar/top-bar.component.ts</context>
13969-
<context context-type="linenumber">221</context>
13969+
<context context-type="linenumber">231</context>
1397013970
</context-group>
1397113971
<target>RL</target>
1397213972
</trans-unit>
1397313973
<trans-unit id="topBar.permissionRead" datatype="html" resname="topBar.permissionRead">
1397413974
<source>Read</source>
1397513975
<context-group purpose="location">
1397613976
<context context-type="sourcefile">src/app/record/components/top-bar/top-bar.component.ts</context>
13977-
<context context-type="linenumber">230</context>
13977+
<context context-type="linenumber">240</context>
1397813978
</context-group>
1397913979
<target>RL</target>
1398013980
</trans-unit>
1398113981
<trans-unit id="topBar.permissionConnectNow" datatype="html" resname="topBar.permissionConnectNow">
1398213982
<source>Connect now</source>
1398313983
<context-group purpose="location">
1398413984
<context context-type="sourcefile">src/app/record/components/top-bar/top-bar.component.ts</context>
13985-
<context context-type="linenumber">236</context>
13985+
<context context-type="linenumber">246</context>
1398613986
</context-group>
1398713987
<target>RL</target>
1398813988
</trans-unit>

‎src/locale/messages.xlf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12550,21 +12550,21 @@
1255012550
<source>wants to add information to your ORCID record</source>
1255112551
<context-group purpose="location">
1255212552
<context context-type="sourcefile">src/app/record/components/top-bar/top-bar.component.ts</context>
12553-
<context context-type="linenumber">221</context>
12553+
<context context-type="linenumber">231</context>
1255412554
</context-group>
1255512555
</trans-unit>
1255612556
<trans-unit id="topBar.permissionRead" datatype="html" resname="topBar.permissionRead">
1255712557
<source>Read</source>
1255812558
<context-group purpose="location">
1255912559
<context context-type="sourcefile">src/app/record/components/top-bar/top-bar.component.ts</context>
12560-
<context context-type="linenumber">230</context>
12560+
<context context-type="linenumber">240</context>
1256112561
</context-group>
1256212562
</trans-unit>
1256312563
<trans-unit id="topBar.permissionConnectNow" datatype="html" resname="topBar.permissionConnectNow">
1256412564
<source>Connect now</source>
1256512565
<context-group purpose="location">
1256612566
<context context-type="sourcefile">src/app/record/components/top-bar/top-bar.component.ts</context>
12567-
<context context-type="linenumber">236</context>
12567+
<context context-type="linenumber">246</context>
1256812568
</context-group>
1256912569
</trans-unit>
1257012570
<trans-unit id="works.yourContributionsToThisWork" datatype="html" resname="works.yourContributionsToThisWork">

‎src/locale/messages.xx.xlf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13966,23 +13966,23 @@
1396613966
<source>wants to add information to your ORCID record</source>
1396713967
<context-group purpose="location">
1396813968
<context context-type="sourcefile">src/app/record/components/top-bar/top-bar.component.ts</context>
13969-
<context context-type="linenumber">221</context>
13969+
<context context-type="linenumber">231</context>
1397013970
</context-group>
1397113971
<target>X</target>
1397213972
</trans-unit>
1397313973
<trans-unit id="topBar.permissionRead" datatype="html" resname="topBar.permissionRead">
1397413974
<source>Read</source>
1397513975
<context-group purpose="location">
1397613976
<context context-type="sourcefile">src/app/record/components/top-bar/top-bar.component.ts</context>
13977-
<context context-type="linenumber">230</context>
13977+
<context context-type="linenumber">240</context>
1397813978
</context-group>
1397913979
<target>X</target>
1398013980
</trans-unit>
1398113981
<trans-unit id="topBar.permissionConnectNow" datatype="html" resname="topBar.permissionConnectNow">
1398213982
<source>Connect now</source>
1398313983
<context-group purpose="location">
1398413984
<context context-type="sourcefile">src/app/record/components/top-bar/top-bar.component.ts</context>
13985-
<context context-type="linenumber">236</context>
13985+
<context context-type="linenumber">246</context>
1398613986
</context-group>
1398713987
<target>X</target>
1398813988
</trans-unit>

0 commit comments

Comments
 (0)