@datorama/core 22.8.1-rc.3 → 22.8.2-rc.2

package/fesm2015/datorama-core.js

@@ -10092,7 +10092,7 @@ let GridQuery = class GridQuery extends Query {
         const storeSettings = this.getValue().settings;
         const settings = {
             gridAlignment: storeSettings.gridAlignment,
-            sort: this.getSort(),
+            sort: this.getGridOptions().sortByStore ? this.getSavedSort() : this.getSortModel(),
             hiddenColumns,
             groupedColumns: groupedColumns.map(toColId),
             filter: this.getFilter(),
@@ -10106,30 +10106,31 @@ let GridQuery = class GridQuery extends Query {
         }
         return settings;
     }
-    getSort() {
+    getSortModel() {
         return this.api.grid.getSortModel().pop();
     }
-    getExternalSort() {
-        const { sort, colId } = this.getSort() || {};
-        const column = this.api.columns.getColumn(colId);
-        const allColumns = this.api.columns.getAllGridColumns();
-        if (column) {
-            return { colId, sort, field: getColField(column.getColDef()), sortIndex: allColumns.indexOf(column) };
-        }
-        else {
-            const secondaryColumn = this.getSecondaryColumn(colId);
-            if (secondaryColumn) {
-                return {
-                    colId,
-                    sort,
-                    field: getColField(secondaryColumn.getColDef()),
-                    sortIndex: allColumns.indexOf(secondaryColumn)
-                };
+    getSavedSort() {
+        return this.getValue().settings.sort || this.getSortModel();
+    }
+    getSort(savedSort = this.getSavedSort()) {
+        if (savedSort) {
+            const { colId, sort, sortIndex } = savedSort;
+            const column = this.api.columns.getColumn(colId);
+            const allColumns = this.api.columns.getAllGridColumns();
+            if (column) {
+                const field = getColField(column.getColDef());
+                return { colId, sort, field };
+            }
+            else {
+                const secondaryColumn = this.getSecondaryColumn(colId);
+                if (secondaryColumn) {
+                    const columnIndex = sortIndex || allColumns.indexOf(secondaryColumn);
+                    const field = getColField(secondaryColumn.getColDef());
+                    return { colId, sort, field, sortIndex: columnIndex };
+                }
             }
         }
-    }
-    selectSort() {
-        return this.select(state => state.settings.sort);
+        return { colId: null, sort: null };
     }
     /* @internal */
     _setApi(api, gridRef) {
@@ -11830,6 +11831,7 @@ let DatoGridColumnHeaderComponent = class DatoGridColumnHeaderComponent {
                 const sortingOrder = this.column.getColDef() ? this.column.getColDef().sortingOrder : null;
                 let sort;
                 const currentSort = this.column.getSort();
+                const colId = this.column.getColId();
                 if (sortingOrder && sortingOrder.length > 0) {
                     const currentSortIndex = sortingOrder.indexOf(currentSort);
                     let newSortIndex;
@@ -11846,10 +11848,15 @@ let DatoGridColumnHeaderComponent = class DatoGridColumnHeaderComponent {
                 }
                 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(() => gridQuery.gridRef.sortChanged)
@@ -12715,6 +12722,10 @@ let GridService = class GridService {
             this.notifyFilterUpdate();
         }
     }
+    setSortByColumn(colId, sort) {
+        const sortToSet = this.gridQuery.getSort({ colId, sort });
+        this.setGridSort(sortToSet);
+    }
     setGridSort(gridSort) {
         if (gridSort && this.api && this.api.grid.getDisplayedRowCount() > 0) {
             const { colId, sort, sortIndex } = gridSort;
@@ -12728,11 +12739,11 @@ let GridService = class GridService {
                     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 };
-                        }
+                        // 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 */
@@ -13819,7 +13830,7 @@ let DatoGridControllerComponent = class DatoGridControllerComponent {
             const data = this.getGridData();
             this.onGridChange.emit({
                 filter: this.gridQuery.getExternalFilter(),
-                sort: this.gridQuery.getExternalSort(),
+                sort: this.gridQuery.getSort(),
                 type,
                 data
             });
@@ -22715,7 +22726,7 @@ function fixNgLeaks() {
     };
 }
 
-window.coreVersion = '22.8.1-rc.';
+window.coreVersion = '22.8.2-rc.';
 
 /**
  * @license