@datorama/core 22.7.0 → 22.8.0

package/fesm5/datorama-core.js

@@ -11387,7 +11387,7 @@ var GridQuery = /** @class */ (function (_super) {
         var storeSettings = this.getValue().settings;
         var settings = {
             gridAlignment: storeSettings.gridAlignment,
-            sort: this.getSort(),
+            sort: this.getGridOptions().sortByStore ? this.getSavedSort() : this.getSortModel(),
             hiddenColumns: hiddenColumns,
             groupedColumns: groupedColumns.map(toColId),
             filter: this.getFilter(),
@@ -11401,30 +11401,32 @@ var GridQuery = /** @class */ (function (_super) {
         }
         return settings;
     };
-    GridQuery.prototype.getSort = function () {
+    GridQuery.prototype.getSortModel = function () {
         return this.api.grid.getSortModel().pop();
     };
-    GridQuery.prototype.getExternalSort = function () {
-        var _a = this.getSort() || {}, sort = _a.sort, colId = _a.colId;
-        var column = this.api.columns.getColumn(colId);
-        var allColumns = this.api.columns.getAllGridColumns();
-        if (column) {
-            return { colId: colId, sort: sort, field: getColField(column.getColDef()), sortIndex: allColumns.indexOf(column) };
-        }
-        else {
-            var secondaryColumn = this.getSecondaryColumn(colId);
-            if (secondaryColumn) {
-                return {
-                    colId: colId,
-                    sort: sort,
-                    field: getColField(secondaryColumn.getColDef()),
-                    sortIndex: allColumns.indexOf(secondaryColumn)
-                };
+    GridQuery.prototype.getSavedSort = function () {
+        return this.getValue().settings.sort || this.getSortModel();
+    };
+    GridQuery.prototype.getSort = function (savedSort) {
+        if (savedSort === void 0) { savedSort = this.getSavedSort(); }
+        if (savedSort) {
+            var colId = savedSort.colId, sort = savedSort.sort, sortIndex = savedSort.sortIndex;
+            var column = this.api.columns.getColumn(colId);
+            var allColumns = this.api.columns.getAllGridColumns();
+            if (column) {
+                var field = getColField(column.getColDef());
+                return { colId: colId, sort: sort, field: field };
+            }
+            else {
+                var secondaryColumn = this.getSecondaryColumn(colId);
+                if (secondaryColumn) {
+                    var columnIndex = sortIndex || allColumns.indexOf(secondaryColumn);
+                    var field = getColField(secondaryColumn.getColDef());
+                    return { colId: colId, sort: sort, field: field, sortIndex: columnIndex };
+                }
             }
         }
-    };
-    GridQuery.prototype.selectSort = function () {
-        return this.select(function (state) { return state.settings.sort; });
+        return { colId: null, sort: null };
     };
     /* @internal */
     GridQuery.prototype._setApi = function (api, gridRef) {
@@ -13299,6 +13301,7 @@ var DatoGridColumnHeaderComponent = /** @class */ (function () {
                 var sortingOrder = _this.column.getColDef() ? _this.column.getColDef().sortingOrder : null;
                 var sort;
                 var currentSort = _this.column.getSort();
+                var colId = _this.column.getColId();
                 if (sortingOrder && sortingOrder.length > 0) {
                     var currentSortIndex = sortingOrder.indexOf(currentSort);
                     var newSortIndex = void 0;
@@ -13315,10 +13318,15 @@ var DatoGridColumnHeaderComponent = /** @class */ (function () {
                 }
                 gridService._logEvent("Grids - Column Action" /* GRID_COLUMN_ACTION */, {
                     action: 'Sort',
-                    column: _this.column.getColId()
+                    column: colId
                 });
                 gridQuery.isServerSide && gridService.setLoading(true);
-                _this.params.setSort(sort);
+                if (gridQuery.getGridOptions().sortByStore) {
+                    gridService.setSortByColumn(colId, sort);
+                }
+                else {
+                    _this.params.setSort(sort);
+                }
             });
             this.sortingInfo$ = gridQuery
                 .waitForGrid(function () { return gridQuery.gridRef.sortChanged; })
@@ -14265,21 +14273,24 @@ var GridService = /** @class */ (function () {
             this.notifyFilterUpdate();
         }
     };
+    GridService.prototype.setSortByColumn = function (colId, sort) {
+        var sortToSet = this.gridQuery.getSort({ colId: colId, sort: sort });
+        this.setGridSort(sortToSet);
+    };
     GridService.prototype.setGridSort = function (gridSort) {
-        if (this.api && 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 secondaryColumns = this.api.columns.getSecondaryColumns();
-                    var secondaryColumn = secondaryColumns.find(function (col) { return col.getColId() === colId_1; });
-                    if (secondaryColumn) {
+                    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];
-                        if (columnByIndex) {
-                            sortToApply = { colId: columnByIndex.getColId(), sort: sort };
-                        }
+                        sortToApply = { colId: columnByIndex.getColId(), sort: sort, sortIndex: sortIndex };
                     }
                     else {
                         /** Sort by column id */
@@ -15470,7 +15481,7 @@ var DatoGridControllerComponent = /** @class */ (function () {
             var data = _this.getGridData();
             _this.onGridChange.emit({
                 filter: _this.gridQuery.getExternalFilter(),
-                sort: _this.gridQuery.getExternalSort(),
+                sort: _this.gridQuery.getSort(),
                 type: type,
                 data: data
             });
@@ -25236,7 +25247,7 @@ function fixNgLeaks() {
     };
 }
 
-window.coreVersion = '22.7.0';
+window.coreVersion = '22.8.0';
 
 /**
  * @license