Skip to content

Commit 5e0ea7b

Browse files
authored
Merge branch 'main' into lmendoza/PD-5506-v2
2 parents 9d56fdc + bed9a1e commit 5e0ea7b

8 files changed

Lines changed: 85 additions & 77 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## v2.134.5 - 2026-05-26
2+
3+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.134.4...v2.134.5)
4+
15
## v2.134.4 - 2026-05-25
26

37
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.134.3...v2.134.4)

src/app/record/components/record-header/featured-employment-caption.util.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ export function getFeaturedEmploymentCaption(
1010
return ''
1111
}
1212

13-
const employmentGroup = affiliations.find((group) => group.type === 'EMPLOYMENT')
13+
const employmentGroup = affiliations.find(
14+
(group) => group.type === 'EMPLOYMENT'
15+
)
1416

1517
if (!employmentGroup || !employmentGroup.affiliationGroup) {
1618
return ''
@@ -79,4 +81,4 @@ function formatAffiliationCaption(affiliation: Affiliation): string {
7981
}
8082

8183
return parts.join(' ')
82-
}
84+
}

src/app/record/components/record-header/record-header.component.spec.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ describe('RecordHeaderComponent', () => {
3030
'getRecord',
3131
])
3232
togglzService = {
33-
getStateOf: jasmine.createSpy('getStateOf').and.callFake((flag: string) =>
34-
of(flag === TogglzFlag.FEATURED_AFFILIATIONS)
35-
),
33+
getStateOf: jasmine
34+
.createSpy('getStateOf')
35+
.and.callFake((flag: string) =>
36+
of(flag === TogglzFlag.FEATURED_AFFILIATIONS)
37+
),
3638
}
3739

3840
await TestBed.configureTestingModule({

src/app/record/pages/my-orcid/my-orcid-header-loading.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ describe('MyOrcidComponent header loading state', () => {
1414

1515
beforeEach(() => {
1616
recordHeaderState = new RecordHeaderStateService()
17-
rumEvents = jasmine.createSpyObj<RumJourneyEventService>('RumJourneyEventService', [
18-
'recordSimpleEvent',
19-
])
17+
rumEvents = jasmine.createSpyObj<RumJourneyEventService>(
18+
'RumJourneyEventService',
19+
['recordSimpleEvent']
20+
)
2021
component = new MyOrcidComponent(
2122
{} as any,
2223
{} as any,
@@ -104,14 +105,14 @@ describe('MyOrcidComponent header loading state', () => {
104105
it('should record the featured employment caption event once when enabled', () => {
105106
const record = getUserRecord()
106107
record.affiliations[0].affiliationGroup[0].affiliations[0].featured = true
107-
record.affiliations[0].affiliationGroup[0].affiliations[0].affiliationType = {
108-
value: AffiliationType.employment,
109-
}
108+
record.affiliations[0].affiliationGroup[0].affiliations[0].affiliationType =
109+
{
110+
value: AffiliationType.employment,
111+
}
110112

111113
component.publicOrcid = record.userInfo.REAL_USER_ORCID
112114
;(component as any).featuredAffiliationsEnabled = true
113115
spyOn(performance, 'now').and.returnValue(275)
114-
115116
;(component as any).checkFeaturedEmploymentCaptionState(record)
116117
;(component as any).checkFeaturedEmploymentCaptionState(record)
117118

@@ -134,7 +135,6 @@ describe('MyOrcidComponent header loading state', () => {
134135

135136
component.publicOrcid = record.userInfo.REAL_USER_ORCID
136137
;(component as any).featuredAffiliationsEnabled = false
137-
138138
;(component as any).checkFeaturedEmploymentCaptionState(record)
139139

140140
expect(rumEvents.recordSimpleEvent).not.toHaveBeenCalledWith(

src/locale/messages.lr.xlf

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@
760760
</context-group>
761761
<context-group purpose="location">
762762
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
763-
<context context-type="linenumber">136</context>
763+
<context context-type="linenumber">132</context>
764764
</context-group>
765765
<context-group purpose="location">
766766
<context context-type="sourcefile">src/app/record/components/work-details/work-details.component.ts</context>
@@ -5659,7 +5659,7 @@
56595659
</context-group>
56605660
<context-group purpose="location">
56615661
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
5662-
<context context-type="linenumber">139</context>
5662+
<context context-type="linenumber">135</context>
56635663
</context-group>
56645664
<target>LR</target>
56655665
</trans-unit>
@@ -5671,7 +5671,7 @@
56715671
</context-group>
56725672
<context-group purpose="location">
56735673
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
5674-
<context context-type="linenumber">140</context>
5674+
<context context-type="linenumber">136</context>
56755675
</context-group>
56765676
<target>LR</target>
56775677
</trans-unit>
@@ -5683,7 +5683,7 @@
56835683
</context-group>
56845684
<context-group purpose="location">
56855685
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
5686-
<context context-type="linenumber">138</context>
5686+
<context context-type="linenumber">134</context>
56875687
</context-group>
56885688
<target>LR</target>
56895689
</trans-unit>
@@ -13375,7 +13375,7 @@
1337513375
</context-group>
1337613376
<context-group purpose="location">
1337713377
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13378-
<context context-type="linenumber">276</context>
13378+
<context context-type="linenumber">281</context>
1337913379
</context-group>
1338013380
<target>LR</target>
1338113381
</trans-unit>
@@ -13387,15 +13387,15 @@
1338713387
</context-group>
1338813388
<context-group purpose="location">
1338913389
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13390-
<context context-type="linenumber">280</context>
13390+
<context context-type="linenumber">285</context>
1339113391
</context-group>
1339213392
<target>LR</target>
1339313393
</trans-unit>
1339413394
<trans-unit id="topBar.names" datatype="html" resname="topBar.names">
1339513395
<source>Names</source>
1339613396
<context-group purpose="location">
1339713397
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13398-
<context context-type="linenumber">132</context>
13398+
<context context-type="linenumber">128</context>
1339913399
</context-group>
1340013400
<context-group purpose="location">
1340113401
<context context-type="sourcefile">src/app/record/components/top-bar/modals/modal-name/modal-name.component.html</context>
@@ -13415,47 +13415,47 @@
1341513415
<source>Printable record</source>
1341613416
<context-group purpose="location">
1341713417
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13418-
<context context-type="linenumber">134</context>
13418+
<context context-type="linenumber">130</context>
1341913419
</context-group>
1342013420
<target>LR</target>
1342113421
</trans-unit>
1342213422
<trans-unit id="topBar.copyId" datatype="html" resname="topBar.copyId">
1342313423
<source>Copy iD</source>
1342413424
<context-group purpose="location">
1342513425
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13426-
<context context-type="linenumber">135</context>
13426+
<context context-type="linenumber">131</context>
1342713427
</context-group>
1342813428
<target>LR</target>
1342913429
</trans-unit>
1343013430
<trans-unit id="summary.hideRecordSummary" datatype="html" resname="summary.hideRecordSummary">
1343113431
<source>Hide record summary</source>
1343213432
<context-group purpose="location">
1343313433
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13434-
<context context-type="linenumber">141</context>
13434+
<context context-type="linenumber">137</context>
1343513435
</context-group>
1343613436
<target>LR</target>
1343713437
</trans-unit>
1343813438
<trans-unit id="summary.showRecordSummary" datatype="html" resname="summary.showRecordSummary">
1343913439
<source>Show record summary</source>
1344013440
<context-group purpose="location">
1344113441
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13442-
<context context-type="linenumber">142</context>
13442+
<context context-type="linenumber">138</context>
1344313443
</context-group>
1344413444
<target>LR</target>
1344513445
</trans-unit>
1344613446
<trans-unit id="topBar.ariaLabelCopyOrcidId" datatype="html" resname="topBar.ariaLabelCopyOrcidId">
1344713447
<source>Copy your ORCID iD to the clipboard</source>
1344813448
<context-group purpose="location">
1344913449
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13450-
<context context-type="linenumber">144</context>
13450+
<context context-type="linenumber">140</context>
1345113451
</context-group>
1345213452
<target>LR</target>
1345313453
</trans-unit>
1345413454
<trans-unit id="topBar.ariaLabelViewPrintable" datatype="html" resname="topBar.ariaLabelViewPrintable">
1345513455
<source>View a printable version of your ORCID record (Opens in new tab)</source>
1345613456
<context-group purpose="location">
1345713457
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13458-
<context context-type="linenumber">145</context>
13458+
<context context-type="linenumber">141</context>
1345913459
</context-group>
1346013460
<target>LR</target>
1346113461
</trans-unit>
@@ -16299,7 +16299,7 @@
1629916299
</context-group>
1630016300
<context-group purpose="location">
1630116301
<context context-type="sourcefile">src/app/record/pages/my-orcid/my-orcid.component.ts</context>
16302-
<context context-type="linenumber">89</context>
16302+
<context context-type="linenumber">96</context>
1630316303
</context-group>
1630416304
<target>LR</target>
1630516305
</trans-unit>
@@ -16323,15 +16323,15 @@
1632316323
<source>Collapse all activity sections</source>
1632416324
<context-group purpose="location">
1632516325
<context context-type="sourcefile">src/app/record/pages/my-orcid/my-orcid.component.ts</context>
16326-
<context context-type="linenumber">63</context>
16326+
<context context-type="linenumber">70</context>
1632716327
</context-group>
1632816328
<target>LR</target>
1632916329
</trans-unit>
1633016330
<trans-unit id="shared.expandAllActivitiesArialLabel" datatype="html" resname="shared.expandAllActivitiesArialLabel">
1633116331
<source>Expand all activity sections</source>
1633216332
<context-group purpose="location">
1633316333
<context context-type="sourcefile">src/app/record/pages/my-orcid/my-orcid.component.ts</context>
16334-
<context context-type="linenumber">64</context>
16334+
<context context-type="linenumber">71</context>
1633516335
</context-group>
1633616336
<target>LR</target>
1633716337
</trans-unit>

src/locale/messages.rl.xlf

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@
760760
</context-group>
761761
<context-group purpose="location">
762762
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
763-
<context context-type="linenumber">136</context>
763+
<context context-type="linenumber">132</context>
764764
</context-group>
765765
<context-group purpose="location">
766766
<context context-type="sourcefile">src/app/record/components/work-details/work-details.component.ts</context>
@@ -5659,7 +5659,7 @@
56595659
</context-group>
56605660
<context-group purpose="location">
56615661
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
5662-
<context context-type="linenumber">139</context>
5662+
<context context-type="linenumber">135</context>
56635663
</context-group>
56645664
<target>RL</target>
56655665
</trans-unit>
@@ -5671,7 +5671,7 @@
56715671
</context-group>
56725672
<context-group purpose="location">
56735673
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
5674-
<context context-type="linenumber">140</context>
5674+
<context context-type="linenumber">136</context>
56755675
</context-group>
56765676
<target>RL</target>
56775677
</trans-unit>
@@ -5683,7 +5683,7 @@
56835683
</context-group>
56845684
<context-group purpose="location">
56855685
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
5686-
<context context-type="linenumber">138</context>
5686+
<context context-type="linenumber">134</context>
56875687
</context-group>
56885688
<target>RL</target>
56895689
</trans-unit>
@@ -13375,7 +13375,7 @@
1337513375
</context-group>
1337613376
<context-group purpose="location">
1337713377
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13378-
<context context-type="linenumber">276</context>
13378+
<context context-type="linenumber">281</context>
1337913379
</context-group>
1338013380
<target>RL</target>
1338113381
</trans-unit>
@@ -13387,15 +13387,15 @@
1338713387
</context-group>
1338813388
<context-group purpose="location">
1338913389
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13390-
<context context-type="linenumber">280</context>
13390+
<context context-type="linenumber">285</context>
1339113391
</context-group>
1339213392
<target>RL</target>
1339313393
</trans-unit>
1339413394
<trans-unit id="topBar.names" datatype="html" resname="topBar.names">
1339513395
<source>Names</source>
1339613396
<context-group purpose="location">
1339713397
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13398-
<context context-type="linenumber">132</context>
13398+
<context context-type="linenumber">128</context>
1339913399
</context-group>
1340013400
<context-group purpose="location">
1340113401
<context context-type="sourcefile">src/app/record/components/top-bar/modals/modal-name/modal-name.component.html</context>
@@ -13415,47 +13415,47 @@
1341513415
<source>Printable record</source>
1341613416
<context-group purpose="location">
1341713417
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13418-
<context context-type="linenumber">134</context>
13418+
<context context-type="linenumber">130</context>
1341913419
</context-group>
1342013420
<target>RL</target>
1342113421
</trans-unit>
1342213422
<trans-unit id="topBar.copyId" datatype="html" resname="topBar.copyId">
1342313423
<source>Copy iD</source>
1342413424
<context-group purpose="location">
1342513425
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13426-
<context context-type="linenumber">135</context>
13426+
<context context-type="linenumber">131</context>
1342713427
</context-group>
1342813428
<target>RL</target>
1342913429
</trans-unit>
1343013430
<trans-unit id="summary.hideRecordSummary" datatype="html" resname="summary.hideRecordSummary">
1343113431
<source>Hide record summary</source>
1343213432
<context-group purpose="location">
1343313433
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13434-
<context context-type="linenumber">141</context>
13434+
<context context-type="linenumber">137</context>
1343513435
</context-group>
1343613436
<target>RL</target>
1343713437
</trans-unit>
1343813438
<trans-unit id="summary.showRecordSummary" datatype="html" resname="summary.showRecordSummary">
1343913439
<source>Show record summary</source>
1344013440
<context-group purpose="location">
1344113441
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13442-
<context context-type="linenumber">142</context>
13442+
<context context-type="linenumber">138</context>
1344313443
</context-group>
1344413444
<target>RL</target>
1344513445
</trans-unit>
1344613446
<trans-unit id="topBar.ariaLabelCopyOrcidId" datatype="html" resname="topBar.ariaLabelCopyOrcidId">
1344713447
<source>Copy your ORCID iD to the clipboard</source>
1344813448
<context-group purpose="location">
1344913449
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13450-
<context context-type="linenumber">144</context>
13450+
<context context-type="linenumber">140</context>
1345113451
</context-group>
1345213452
<target>RL</target>
1345313453
</trans-unit>
1345413454
<trans-unit id="topBar.ariaLabelViewPrintable" datatype="html" resname="topBar.ariaLabelViewPrintable">
1345513455
<source>View a printable version of your ORCID record (Opens in new tab)</source>
1345613456
<context-group purpose="location">
1345713457
<context context-type="sourcefile">src/app/record/components/record-header/record-header.component.ts</context>
13458-
<context context-type="linenumber">145</context>
13458+
<context context-type="linenumber">141</context>
1345913459
</context-group>
1346013460
<target>RL</target>
1346113461
</trans-unit>
@@ -16299,7 +16299,7 @@
1629916299
</context-group>
1630016300
<context-group purpose="location">
1630116301
<context context-type="sourcefile">src/app/record/pages/my-orcid/my-orcid.component.ts</context>
16302-
<context context-type="linenumber">89</context>
16302+
<context context-type="linenumber">96</context>
1630316303
</context-group>
1630416304
<target>RL</target>
1630516305
</trans-unit>
@@ -16323,15 +16323,15 @@
1632316323
<source>Collapse all activity sections</source>
1632416324
<context-group purpose="location">
1632516325
<context context-type="sourcefile">src/app/record/pages/my-orcid/my-orcid.component.ts</context>
16326-
<context context-type="linenumber">63</context>
16326+
<context context-type="linenumber">70</context>
1632716327
</context-group>
1632816328
<target>RL</target>
1632916329
</trans-unit>
1633016330
<trans-unit id="shared.expandAllActivitiesArialLabel" datatype="html" resname="shared.expandAllActivitiesArialLabel">
1633116331
<source>Expand all activity sections</source>
1633216332
<context-group purpose="location">
1633316333
<context context-type="sourcefile">src/app/record/pages/my-orcid/my-orcid.component.ts</context>
16334-
<context context-type="linenumber">64</context>
16334+
<context context-type="linenumber">71</context>
1633516335
</context-group>
1633616336
<target>RL</target>
1633716337
</trans-unit>

0 commit comments

Comments
 (0)