feature: Add new source sorting option for affiliations, funding and … (

#2064)

* feature: Add new source sorting option for affiliations, funding and works

* fix: Update sort translations

src/app/cdk/panel/sort-label.pipe.ts

@@ -12,6 +12,7 @@ export class SortLabelPipe implements PipeTransform {
     date: $localize`:@@share.sortDate:Date`,
     type: $localize`:@@share.sortType:Type`,
     order: $localize`:@@share.sortOrderv2:Publication/Grant title`,
+    source: $localize`:@@shared.source:Source`,
   }
   transform(value: SortOrderType): string {
     return this.SortOrderTypeLabel[value]

src/app/cdk/top-bar-verification-email/top-bar-verification-email.component.ts

@@ -1,7 +1,6 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core'
 import { first, takeUntil } from 'rxjs/operators'
 import { Subject } from 'rxjs'
-import { MatDialog } from '@angular/material/dialog'
 import { RecordEmailsService } from 'src/app/core/record-emails/record-emails.service'
 import { RecordService } from 'src/app/core/record/record.service'
 import { PlatformInfoService } from '../platform-info'

src/app/core/record-affiliations-sort/record-affiliations-sort.service.ts

@@ -4,7 +4,6 @@ import {
   AffiliationUIGroup,
   AffiliationGroup,
   AffiliationType,
-  AffiliationTypeValue,
 } from 'src/app/types/record-affiliation.endpoint'
 import { UserRecordOptions } from 'src/app/types/record.local'
 
@@ -21,15 +20,17 @@ export class AffiliationsSortService {
       value,
       userRecordContext?.sortAsc,
       userRecordContext?.sort,
-      type
+      type,
+      userRecordContext?.publicRecordId || userRecordContext?.privateRecordId
     )
   }
 
   sort(
     affiliationGroups: AffiliationUIGroup[],
     ascending = false,
     by = 'end',
-    type = null
+    type = null,
+    orcid: string
   ): AffiliationUIGroup[] {
     if (type === 'PROFESSIONAL_ACTIVITIES' && by === 'type') {
       const affiliations = affiliationGroups.filter(
@@ -85,6 +86,15 @@ export class AffiliationsSortService {
               affiliationGroup.reverse()
             }
           }
+
+          if (by === 'source') {
+            affiliationGroup.sort((a, b) => {
+              return Number(AffiliationsSortService.isSelfAsserted(a, orcid)) - Number(AffiliationsSortService.isSelfAsserted(b, orcid))
+            })
+            if (!ascending) {
+              affiliationGroup.reverse()
+            }
+          }
         }
       })
       return affiliationGroups
@@ -192,4 +202,8 @@ export class AffiliationsSortService {
         return this.sortByDate(a, b, false, 'end')
       })
   }
+
+  private static isSelfAsserted(affiliationGroup: AffiliationGroup, orcid: string): boolean {
+    return affiliationGroup.defaultAffiliation.source === orcid
+  }
 }

src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html

@@ -21,6 +21,7 @@
     [(expandedContent)]="expandedContent['EMPLOYMENT']"
     (expandedContentChange)="expandedContentChange.emit(expandedContent)"
     [isPublicRecord]="isPublicRecord"
+    [sortTypes]="['title', 'start', 'end', 'source']"
     [sortType]="'end'"
     (sort)="sortEvent($event, 'EMPLOYMENT')"
     id="cy-affiliation-employment"
@@ -85,6 +86,7 @@
     [(expandedContent)]="expandedContent['EDUCATION_AND_QUALIFICATION']"
     (expandedContentChange)="expandedContentChange.emit(expandedContent)"
     [isPublicRecord]="isPublicRecord"
+    [sortTypes]="['title', 'start', 'end', 'source']"
     [sortType]="'end'"
     (sort)="sortEvent($event, 'EDUCATION_AND_QUALIFICATION')"
     id="cy-affiliation-education-and-qualification"
@@ -287,7 +289,7 @@
       [(expandedContent)]="expandedContent['PROFESSIONAL_ACTIVITIES']"
       (expandedContentChange)="expandedContentChange.emit(expandedContent)"
       [isPublicRecord]="isPublicRecord"
-      [sortTypes]="['title', 'type', 'start', 'end']"
+      [sortTypes]="['title', 'type', 'start', 'end', 'source']"
       (sort)="sortEvent($event, 'PROFESSIONAL_ACTIVITIES')"
       [professionalActivitiesTogglz]="professionalActivitiesTogglz"
       id="cy-affiliation-professional-activities"

src/app/record/components/funding-stacks-groups/funding-stacks-groups.component.html

@@ -15,7 +15,7 @@
     [isPublicRecord]="isPublicRecord"
     [(expandedContent)]="expandedContent['FUNDING']"
     (expandedContentChange)="expandedContentChange.emit(expandedContent)"
-    [sortTypes]="['date', 'title', 'type']"
+    [sortTypes]="['date', 'title', 'type', 'source']"
     [sortType]="'date'"
     (sort)="sortEvent($event)"
   >

src/app/record/components/work-stack-group/work-stack-group.component.html

@@ -15,7 +15,7 @@
     [isPublicRecord]="isPublicRecord"
     [(expandedContent)]="expandedContent['WORK']"
     (expandedContentChange)="expandedContentChange.emit(expandedContent)"
-    [sortTypes]="['date', 'title', 'type']"
+    [sortTypes]="['date', 'title', 'type', 'source']"
     [sortType]="'date'"
     [addMenuOptions]="addMenuOptions"
     (sort)="sortEvent($event)"

src/app/shared/pipes/app-panels-sort-by-aria-label/app-panels-sort-by-aria-label.pipe.ts

@@ -17,6 +17,8 @@ export class AppPanelsSortByAriaLabelPipe implements PipeTransform {
         return getDateLabelByType(type)
       case 'type':
         return getTypeLabelByType(type)
+      case 'source':
+        return getSourceLabelByType(type)
       case 'order':
         return $localize`:@@shared.peerReviewsSortOrderv2:Sort peer review by Publication/Grant title`
     }
@@ -104,3 +106,19 @@ const getDateLabelByType = (type: string): string => {
       return $localize`:@@shared.researchSortDate:Sort research resources by date`
   }
 }
+
+const getSourceLabelByType = (type: string): string => {
+  switch (type) {
+    case 'employment':
+      return $localize`:@@shared.employmentSortSource:Sort employment by source`
+    case 'education':
+    case 'qualification':
+      return $localize`:@@shared.educationSortSource:Sort education and qualifications by source`
+    case 'professional-activities':
+      return $localize`:@@shared.professionalActivitiesSortSource:Sort professional activities by source`
+    case 'funding':
+      return $localize`:@@shared.fundingSortSource:Sort funding by source`
+    case 'works':
+      return $localize`:@@shared.worksSortSource:Sort works by source`
+  }
+}

src/app/types/sort.ts

@@ -7,6 +7,7 @@ export type SortOrderType =
   | 'date'
   | 'type'
   | 'order'
+  | 'source'
 
 export interface SortData {
   direction: SortOrderDirection

src/environments/environment.local.ts

@@ -8,7 +8,7 @@ export const environment = {
   BASE_URL: '',
   INFO_SITE: 'https://info.orcid.org/',
   GOOGLE_ANALYTICS_TESTING_MODE: true,
-  GOOGLE_TAG_MANAGER: 'GTM-0000000',
+  GOOGLE_TAG_MANAGER: 'GTM-M9Z7DHS',
   GOOGLE_RECAPTCHA: '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI',
   HELP_HERO_ID: 'oYFQMrzFHA',
   ZENDESK: null,

src/locale/properties/shared/shared.en.properties

@@ -628,3 +628,8 @@ shared.researchSortDate=Sort research resources by date
 shared.today=Today
 share.more=more
 shared.orcidHelpCenter=ORCID Help Center
+shared.employmentSortSource=Sort employment by source
+shared.educationSortSource=Sort education and qualifications by source
+shared.fundingSortSource=Sort funding by source
+shared.professionalActivitiesSortSource=Sort professional activities by source
+shared.worksSortSource=Sort works by source