-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2144 from ORCID/fix/batch-of-fixes-2-feb
Fix/batch of fixes 2 feb
- Loading branch information
Showing
32 changed files
with
202 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import { TestBed } from '@angular/core/testing'; | ||
|
|
||
| import { RegisterStateService } from './register-state.service'; | ||
|
|
||
| describe('RegisterStateService', () => { | ||
| let service: RegisterStateService; | ||
|
|
||
| beforeEach(() => { | ||
| TestBed.configureTestingModule({ | ||
| providers: [{ | ||
| provide: RegisterStateService, | ||
| useValue: {} | ||
| }] | ||
| }); | ||
| service = TestBed.inject(RegisterStateService); | ||
| }); | ||
|
|
||
| it('should be created', () => { | ||
| expect(service).toBeTruthy(); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| import { Injectable } from '@angular/core' | ||
| import { OrganizationsService } from '../core' | ||
| import { Organization } from 'src/app/types/record-affiliation.endpoint' | ||
| import { Subject } from 'rxjs' | ||
| import { OrgDisambiguated } from '../types' | ||
| @Injectable({ | ||
| providedIn: 'root', | ||
| }) | ||
| export class RegisterStateService { | ||
| rorIdHasBeenMatched: boolean = false | ||
| matchOrganization$ = new Subject<string | Organization>() | ||
| primaryEmailMatched: Organization | ||
| secondaryEmail: Organization | ||
| constructor(private _organizationsService: OrganizationsService) {} | ||
|
|
||
| setRorAffiliationFound(affiliationFound: string, additionalEmail = false) { | ||
| if (!!affiliationFound) { | ||
| this._organizationsService | ||
| .getOrgDisambiguated('ROR', affiliationFound) | ||
| .subscribe((affiliation) => { | ||
| this.rorIdHasBeenMatched = true | ||
| if (!additionalEmail) { | ||
| this.primaryEmailMatched = | ||
| this.affiliationToOrganization(affiliation) | ||
| } else { | ||
| this.secondaryEmail = this.affiliationToOrganization(affiliation) | ||
| } | ||
|
|
||
| this.updateTheAffiliationMatch() | ||
| }) | ||
| } else { | ||
| if (!additionalEmail) { | ||
| this.primaryEmailMatched = null | ||
| } else { | ||
| this.secondaryEmail = null | ||
| } | ||
| this.updateTheAffiliationMatch() | ||
| } | ||
| } | ||
|
|
||
| private affiliationToOrganization( | ||
| affiliation: OrgDisambiguated | ||
| ): Organization { | ||
| return { | ||
| value: affiliation.value, | ||
| city: affiliation.city, | ||
| region: affiliation.region, | ||
| country: affiliation.country, | ||
| disambiguatedAffiliationIdentifier: | ||
| affiliation.disambiguatedAffiliationIdentifier, | ||
| sourceId: affiliation.sourceId, | ||
| } as Organization | ||
| } | ||
|
|
||
| private updateTheAffiliationMatch() { | ||
| if (this.primaryEmailMatched) { | ||
| this.rorIdHasBeenMatched = true | ||
| this.matchOrganization$.next(this.primaryEmailMatched) | ||
| } else if (this.secondaryEmail) { | ||
| this.rorIdHasBeenMatched = true | ||
| this.matchOrganization$.next(this.secondaryEmail) | ||
| } else { | ||
| this.rorIdHasBeenMatched = false | ||
| this.matchOrganization$.next('') | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.