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

package/fesm5/datorama-core.js

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