fix(preset): Preset with Sort was not working correctly with GraphQL

Author: Ghislain Beaulac

src/app/modules/angular-slickgrid/services/graphql.service.ts

@@ -340,9 +340,7 @@ export class GraphqlService implements BackendService {
         // if user defined some "presets", then we need to find the filters from the column definitions instead
         let columnDef: Column | undefined;
         if (isUpdatedByPreset && Array.isArray(this._columnDefinitions)) {
-          columnDef = this._columnDefinitions.find((column: Column) => {
-            return column.id === columnFilter.columnId;
-          });
+          columnDef = this._columnDefinitions.find((column: Column) => column.id === columnFilter.columnId);
         } else {
           columnDef = columnFilter.columnDef;
         }
@@ -447,8 +445,9 @@ export class GraphqlService implements BackendService {
 
       // display the correct sorting icons on the UI, for that it requires (columnId, sortAsc) properties
       const tmpSorterArray = currentSorters.map((sorter) => {
+        const columnDef = this._columnDefinitions.find((column: Column) => column.id === sorter.columnId);
         graphqlSorters.push({
-          field: sorter.columnId + '',
+          field: (columnDef.queryField || columnDef.queryFieldSorter || columnDef.field || columnDef.id) + '',
           direction: sorter.direction
         });
         return {
@@ -468,7 +467,7 @@ export class GraphqlService implements BackendService {
           for (const column of sortColumns) {
             if (column && column.sortCol) {
               currentSorters.push({
-                columnId: (column.sortCol.field || column.sortCol.id) + '',
+                columnId: column.sortCol.id + '',
                 direction: column.sortAsc ? SortDirection.ASC : SortDirection.DESC
               });