Suggested Changes

CHANGELOG.md

@@ -7,10 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-- Add sorting to job queue table
-
 ### Added
 
+- Added support for column sorting to the queue jobs table in the admin control panel
 - Added the symbol to the benchmark component
 - Added an option to configure the account column of the activities table component
 

apps/client/src/app/components/admin-jobs/admin-jobs.component.ts

@@ -46,6 +46,7 @@ import {
   removeCircleOutline,
   timeOutline
 } from 'ionicons/icons';
+import { get } from 'lodash';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
@@ -59,8 +60,8 @@ import { takeUntil } from 'rxjs/operators';
     MatButtonModule,
     MatMenuModule,
     MatSelectModule,
-    MatTableModule,
     MatSortModule,
+    MatTableModule,
     NgxSkeletonLoaderModule,
     ReactiveFormsModule
   ],
@@ -202,12 +203,8 @@ export class GfAdminJobsComponent implements OnDestroy, OnInit {
       .subscribe(({ jobs }) => {
         this.dataSource = new MatTableDataSource(jobs);
         this.dataSource.sort = this.sort;
-
-        if (this.sort) {
-          this.sort.active = 'created';
-          this.sort.direction = 'desc';
-        }
-
+        this.dataSource.sortingDataAccessor = get;
+       
         this.isLoading = false;
 
         this.changeDetectorRef.markForCheck();

apps/client/src/app/components/admin-jobs/admin-jobs.html

@@ -16,7 +16,7 @@
           </mat-select>
         </mat-form-field>
       </form>
-      <table class="gf-table w-100" mat-table matSort [dataSource]="dataSource">
+      <table class="gf-table w-100" mat-table matSort matSortActive="created" matSortDirection="desc" [dataSource]="dataSource">
         <ng-container matColumnDef="index">
           <th
             *matHeaderCellDef