@datorama/core 22.8.2-rc.2 → 22.9.1-rc.1

package/fesm2015/datorama-core.js

@@ -12729,35 +12729,29 @@ let GridService = class GridService {
     setGridSort(gridSort) {
         if (gridSort && this.api && this.api.grid.getDisplayedRowCount() > 0) {
             const { colId, sort, sortIndex } = gridSort;
-            let sortToApply = gridSort;
-            if (!isNil(sortIndex)) {
-                const gridColumns = this.api.columns.getAllGridColumns();
-                if (gridColumns) {
+            const gridColumns = this.api.columns.getAllGridColumns();
+            if (gridColumns) {
+                let sortToApply = gridSort;
+                /** Sort by column id */
+                const columnById = gridColumns.find((col) => {
+                    return (col.getColDef().showRowGroup || col.getColId()) === colId;
+                });
+                if (columnById) {
+                    sortToApply = { colId: columnById.getColId(), sort };
+                }
+                else if (!isNil(sortIndex)) {
                     const valueColumns = this.api.columns.getValueColumns();
                     const valueColumn = valueColumns.find((col) => col.getColId() === colId);
                     const isPivotColId = colId.startsWith('pivot');
                     if (isPivotColId || valueColumn) {
                         /** Column is pivot value column, sort by index */
                         const columnByIndex = gridColumns[sortIndex];
-                        // const pivotValueColumn = columnByIndex && columnByIndex.getColDef().pivotValueColumn;
-                        // const pivotValueColumnId = pivotValueColumn && pivotValueColumn.getColId();
-                        // if (pivotValueColumnId === colId) {
                         sortToApply = { colId: columnByIndex.getColId(), sort, sortIndex };
-                        // }
-                    }
-                    else {
-                        /** Sort by column id */
-                        const columnById = gridColumns.find((col) => {
-                            return (col.getColDef().showRowGroup || col.getColId()) === colId;
-                        });
-                        if (columnById) {
-                            sortToApply = { colId: columnById.getColId(), sort };
-                        }
                     }
                 }
+                this.updateSettings({ sort: sortToApply });
+                this.api.grid.setSortModel([sortToApply]);
             }
-            this.updateSettings({ sort: sortToApply });
-            this.api.grid.setSortModel([sortToApply]);
         }
     }
     updateFilter(column, filter) {
@@ -22726,7 +22720,7 @@ function fixNgLeaks() {
     };
 }
 
-window.coreVersion = '22.8.2-rc.';
+window.coreVersion = '22.9.1-rc.';
 
 /**
  * @license