Merge pull request #2071 from ORCID/fix-sort-togglz-for-professional-…

…educational-activities Enable Sort Togglz For Professional & Educational activities
ORCID · Oct 6, 2023 · c0ec9ec · c0ec9ec
2 parents 94d44fd + e509d63
commit c0ec9ec
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html b/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html
@@ -86,7 +86,7 @@
     [(expandedContent)]="expandedContent['EDUCATION_AND_QUALIFICATION']"
     (expandedContentChange)="expandedContentChange.emit(expandedContent)"
     [isPublicRecord]="isPublicRecord"
-    [sortTypes]="['title', 'start', 'end', 'source']"
+    [sortTypes]="educationAndQualificationSortTypes"
     [sortType]="'end'"
     (sort)="sortEvent($event, 'EDUCATION_AND_QUALIFICATION')"
     id="cy-affiliation-education-and-qualification"
@@ -289,7 +289,7 @@
       [(expandedContent)]="expandedContent['PROFESSIONAL_ACTIVITIES']"
       (expandedContentChange)="expandedContentChange.emit(expandedContent)"
       [isPublicRecord]="isPublicRecord"
-      [sortTypes]="['title', 'type', 'start', 'end', 'source']"
+      [sortTypes]="professionalActivitiesSortTypes"
       (sort)="sortEvent($event, 'PROFESSIONAL_ACTIVITIES')"
       [professionalActivitiesTogglz]="professionalActivitiesTogglz"
       id="cy-affiliation-professional-activities"

diff --git a/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.ts b/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.ts
@@ -55,7 +55,17 @@ export class AffiliationStacksGroupsComponent implements OnInit {
   expandedContentChange: EventEmitter<MainPanelsState> = new EventEmitter()
   professionalActivitiesTogglz = false
   sortTypes: SortOrderType[] = ['title', 'start', 'end']
-
+  professionalActivitiesSortTypes: SortOrderType[] = [
+    'title',
+    'type',
+    'start',
+    'end',
+  ]
+  educationAndQualificationSortTypes: SortOrderType[] = [
+    'title',
+    'start',
+    'end',
+  ]
   constructor(
     private _record: RecordService,
     private _recordAffiliationService: RecordAffiliationService,
@@ -73,6 +83,8 @@ export class AffiliationStacksGroupsComponent implements OnInit {
       .subscribe((sourceSortingTogglz: boolean) => {
         if (sourceSortingTogglz) {
           this.sortTypes.push('source')
+          this.professionalActivitiesSortTypes.push('source')
+          this.educationAndQualificationSortTypes.push('source')
         }
       })
     this.$loading = this._recordAffiliationService.$loading