Merge branch 'main' into leo/fix-randomly-failing-unit-tests

ORCID · Oct 3, 2023 · 9c44fd2 · 9c44fd2
2 parents 7b08de7 + 88b8489
commit 9c44fd2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## v2.40.3 - 2023-10-03
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.40.2...v2.40.3)
+
+## v2.40.2 - 2023-10-03
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.40.0...v2.40.2)
+
+### Feature
+
+- Add new source sorting option for affiliations, funding and … (#2064)
+
 ## v2.40.0 - 2023-09-07
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.39.10...v2.40.0)

diff --git a/src/app/core/record-affiliations-sort/record-affiliations-sort.service.ts b/src/app/core/record-affiliations-sort/record-affiliations-sort.service.ts
@@ -206,10 +206,8 @@ export class AffiliationsSortService {
       })
   }
 
-  private static isSelfAsserted(
-    affiliationGroup: AffiliationGroup,
-    orcid: string
-  ): boolean {
-    return affiliationGroup.defaultAffiliation.source === orcid
+  private static isSelfAsserted(affiliationGroup: AffiliationGroup, orcid: string): boolean {
+    const obo = !!(affiliationGroup.defaultAffiliation.assertionOriginName || affiliationGroup.defaultAffiliation.assertionOriginOrcid)
+    return obo ? obo : affiliationGroup.defaultAffiliation.source === orcid
   }
 }