Fix sort options for works (#2155)

* Fix sort options for works * Fix source default directional arrow and sorting options for Funding and Works
ORCID · Feb 19, 2024 · d9fbcb4 · d9fbcb4
1 parent ef4981c
commit d9fbcb4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 32 deletions.
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
@@ -54,17 +54,19 @@ export class AffiliationStacksGroupsComponent implements OnInit {
   @Output()
   expandedContentChange: EventEmitter<MainPanelsState> = new EventEmitter()
   professionalActivitiesTogglz = false
-  sortTypes: SortOrderType[] = ['title', 'start', 'end']
+  sortTypes: SortOrderType[] = ['title', 'start', 'end', 'source']
   professionalActivitiesSortTypes: SortOrderType[] = [
     'title',
     'type',
     'start',
     'end',
+	'source'
   ]
   educationAndQualificationSortTypes: SortOrderType[] = [
     'title',
     'start',
     'end',
+	'source'
   ]
   constructor(
     private _record: RecordService,
@@ -76,17 +78,7 @@ export class AffiliationStacksGroupsComponent implements OnInit {
     this._togglz
       .getStateOf('PROFESSIONAL_ACTIVITIES')
       .pipe(take(1))
-      .subscribe((value) => (this.professionalActivitiesTogglz = value))
-    this._togglz
-      .getStateOf('SOURCE_SORTING')
-      .pipe(take(1))
-      .subscribe((sourceSortingTogglz: boolean) => {
-        if (sourceSortingTogglz) {
-          this.sortTypes.push('source')
-          this.professionalActivitiesSortTypes.push('source')
-          this.educationAndQualificationSortTypes.push('source')
-        }
-      })
+      .subscribe((value) => (this.professionalActivitiesTogglz = value))    
     this.$loading = this._recordAffiliationService.$loading
     this._record
       .getRecord({

diff --git a/src/app/record/components/funding-stacks-groups/funding-stacks-groups.component.html b/src/app/record/components/funding-stacks-groups/funding-stacks-groups.component.html
@@ -16,7 +16,7 @@
     [(expandedContent)]="expandedContent['FUNDING']"
     (expandedContentChange)="expandedContentChange.emit(expandedContent)"
     [sortTypes]="sortTypes"
-    [sortType]="'date'"
+    [sortType]="'end'"
     (sort)="sortEvent($event)"
   >
     <ng-container *ngIf="fundings.length > 0">

diff --git a/src/app/record/components/funding-stacks-groups/funding-stacks-groups.component.ts b/src/app/record/components/funding-stacks-groups/funding-stacks-groups.component.ts
@@ -41,7 +41,7 @@ export class FundingStacksGroupsComponent implements OnInit {
   ngOrcidFunding = $localize`:@@shared.funding:Funding`
   countryCodes: { key: string; value: string }[]
   loading = true
-  sortTypes: SortOrderType[] = ['title', 'start', 'end']
+  sortTypes: SortOrderType[] = ['title', 'start', 'end', 'source']
 
   constructor(
     private _userSession: UserService,
@@ -52,14 +52,6 @@ export class FundingStacksGroupsComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this._togglz
-      .getStateOf('SOURCE_SORTING')
-      .pipe(take(1))
-      .subscribe((sourceSortingTogglz: boolean) => {
-        if (sourceSortingTogglz) {
-          this.sortTypes.push('source')
-        }
-      })
     this.getRecord()
   }
 

diff --git a/src/app/record/components/work-stack-group/work-stack-group.component.ts b/src/app/record/components/work-stack-group/work-stack-group.component.ts
@@ -134,7 +134,7 @@ export class WorkStackGroupComponent implements OnInit {
   platform: PlatformInfo
   selectedWorks: string[] = []
   selectAll: false
-  sortTypes: SortOrderType[] = ['title', 'start', 'end']
+  sortTypes: SortOrderType[] = ['title', 'date', 'type','source']
 
   @ViewChildren('selectAllCheckbox') selectAllCheckbox: MatCheckbox
   @ViewChildren('appWorkStacks') appWorkStacks: QueryList<WorkStackComponent>
@@ -150,15 +150,7 @@ export class WorkStackGroupComponent implements OnInit {
     private _togglz: TogglzService
   ) {}
 
-  ngOnInit(): void {
-    this._togglz
-      .getStateOf('SOURCE_SORTING')
-      .pipe(take(1))
-      .subscribe((sourceSortingTogglz: boolean) => {
-        if (sourceSortingTogglz) {
-          this.sortTypes.push('source')
-        }
-      })
+  ngOnInit(): void {    
     this.$loading = this._works.$loading
     this._record
       .getRecord({ publicRecordId: this.isPublicRecord })