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.

Sign up for GitHub

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

User effective user orcid to store contributors #1708

Merged
merged 10 commits into from
Jul 28, 2022
Merged

User effective user orcid to store contributors #1708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0807bbb
Merge pull request #1003 from ORCID/development
leomendoza123 Aug 18, 2021
cd098a2
Merge pull request #1149 from ORCID/development
DanielPalafox Sep 20, 2021
2ee7f2e
release-2.5.46 (#1390)
amontenegro Nov 18, 2021
1bbc320
release-2.6.9 is live (#1401)
amontenegro Dec 1, 2021
e57c1a3
release-2.6.9 is live (#1402)
amontenegro Dec 1, 2021
e4b0318
Merge branch 'development' into main
amontenegro Dec 1, 2021
b5cc95e
Merge tag 'release-2.13.16'
amontenegro May 23, 2022
a93299e
Merge branch 'development'
amontenegro Jul 27, 2022
f27c6cd
Use EFFECTIVE_USER_ORCID instead of REAL_USER_ORCID to avoid problems…
amontenegro Jul 28, 2022
36bf7f5
🤖 GITHUB ACTIONS
amontenegro Jul 28, 2022
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
2 changes: 1 addition & 1 deletion src/app/record/components/work-contributor-role/work-contributor-roles.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function getContributor(): Contributor[] {
function getUserRecord(): UserRecord {
return {
userInfo: {
REAL_USER_ORCID: '0000-0000-0000-000X',
EFFECTIVE_USER_ORCID: '0000-0000-0000-000X',
},
} as UserRecord
}
3 changes: 2 additions & 1 deletion src/app/record/components/work-contributor-role/work-contributor-roles.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ export class WorkContributorRolesComponent implements OnInit {
private getRecordHolderContribution(): Contributor {
return this.contributors?.find(
(c) =>
c?.contributorOrcid?.path === this.userRecord?.userInfo?.REAL_USER_ORCID
c?.contributorOrcid?.path ===
this.userRecord?.userInfo?.EFFECTIVE_USER_ORCID
)
}
}
4 changes: 3 additions & 1 deletion src/app/record/components/work-contributors/work-contributors.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ export class WorkContributorsComponent implements OnInit, OnDestroy {
}

ngOnInit(): void {
this.id = this.userRecord?.userInfo?.REAL_USER_ORCID
// EFFECTIVE_USER_ORCID keeps the ORCID id of the user you are on.
// REAL_USER_ORCID will contain the orcid id of a delegator when on delegation mode.
this.id = this.userRecord?.userInfo?.EFFECTIVE_USER_ORCID
this.platform
.get()
.pipe(takeUntil(this.$destroy))
Expand Down