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

Fix contributors component in split names mode doesn't populate correctly on subscribe #1328

Merged
merged 1 commit into from
Jun 8, 2023
Merged

Fix contributors component in split names mode doesn't populate correctly on subscribe #1328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 32 additions & 5 deletions angular/shared/form/field-contributor.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,17 +545,44 @@ export class ContributorComponent extends SimpleComponent {


onSelect(selected: any, emitEvent:boolean=true, updateTitle:boolean=false) {

if (selected) {
if ( (_.isEmpty(selected.title) || _.isUndefined(selected.title)) && (_.isEmpty(selected.text_full_name) || _.isUndefined(selected.text_full_name))) {
console.log(`Same or empty selection, returning...`);
this.lastSelected = null;
return;
if(this.field.splitNames) {
let selectedFamilyName = _.get(selected, 'family_name');
let selectedGivenName = _.get(selected, 'given_name');
if ( (_.isEmpty(selectedFamilyName) || _.isUndefined(selectedFamilyName)) && (_.isEmpty(selectedGivenName) || _.isUndefined(selectedGivenName))) {
console.log(`Same or empty selection for split names, returning...`);
this.lastSelected = null;
return;
} else {
let selectedFamilyName = _.get(selected, 'family_name');
let selectedGivenName = _.get(selected, 'given_name');
let fmFamilyName = _.get(this.field.formModel.value, 'family_name');
let fmGivenName = _.get(this.field.formModel.value, 'given_name');
let selectedEmail = _.get(selected, 'email');
let selectedOrcid = _.get(selected, 'email');
let fmEmail = _.get(this.field.formModel.value, 'email');
let fmOrcid = _.get(this.field.formModel.value, 'orcid');
if (selectedFamilyName && selectedFamilyName == fmFamilyName && selectedGivenName && selectedGivenName == fmGivenName
&& selectedEmail && selectedEmail == fmEmail && selectedOrcid == fmOrcid) {
console.log(`Same or empty selection for split names, returning...`);
return;
}
}

} else {
if (selected.title && selected.title == this.field.formModel.value.text_full_name && selected.email && selected.email == this.field.formModel.value.email && selected.orcid == this.field.formModel.value.orcid) {
if ( (_.isEmpty(selected.title) || _.isUndefined(selected.title)) && (_.isEmpty(selected.text_full_name) || _.isUndefined(selected.text_full_name))) {
console.log(`Same or empty selection, returning...`);
this.lastSelected = null;
return;
} else {
if (selected.title && selected.title == this.field.formModel.value.text_full_name && selected.email && selected.email == this.field.formModel.value.email && selected.orcid == this.field.formModel.value.orcid) {
console.log(`Same or empty selection, returning...`);
return;
}
}
}

this.lastSelected = selected;
let val:any;
if (!this.field.freeText) {
Expand Down