@datorama/core 22.0.6 → 22.2.0

package/bundles/datorama-core.umd.js

@@ -11583,20 +11583,17 @@
             if (this.gridRef.gridOptions.pivotMode) {
                 var _a = this.api.grid.getSortModel().pop() || {}, sort = _a.sort, colId = _a.colId;
                 var column = this.api.columns.getColumn(colId);
-                var pivotedColumn = this.getSecondaryColumn(colId);
-                if (pivotedColumn) {
-                    var uniquePivotParents = uniq(this.api.columns.getSecondaryColumns().map(function (column) { return column.getParent(); }));
-                    var secondaryColumn = this.getSecondaryColumn(pivotedColumn.getColId());
-                    var pivotColIndex = uniquePivotParents.indexOf(secondaryColumn.getParent());
-                    return { colId: colId, sort: sort, pivotColIndex: pivotColIndex, colField: getColField(pivotedColumn.getColDef()) };
-                }
-                else if (column) {
+                if (column) {
                     return { colId: colId, sort: sort, colField: getColField(column.getColDef()) };
                 }
+                else {
+                    var secondaryColumn = this.getSecondaryColumn(colId);
+                    if (secondaryColumn) {
+                        return { colId: colId, sort: sort, colField: getColField(secondaryColumn.getColDef()) };
+                    }
+                }
             }
-            else {
-                return this.api.grid.getSortModel().pop();
-            }
+            return this.api.grid.getSortModel().pop();
         };
         GridQuery.prototype.selectSort = function () {
             return this.select(function (state) { return state.settings.sort; });
@@ -11693,7 +11690,10 @@
         };
         GridQuery.prototype.getSecondaryColumn = function (colId) {
             var secondaryColumns = this.api.columns.getSecondaryColumns();
-            return secondaryColumns && secondaryColumns.find(function (col) { return col.getColId() === colId; });
+            if (secondaryColumns) {
+                return secondaryColumns.find(function (col) { return col.getColId() === colId; });
+            }
+            return null;
         };
         GridQuery.prototype.filterCheckboxSelectionColumn = function (columns) {
             return columns.filter(function (column) { return !column.getUserProvidedColDef() || !column.getUserProvidedColDef().checkboxSelection; });
@@ -14405,11 +14405,13 @@
                         var filter = filters_1_1.value.filter;
                         var column = this.api.columns.getColumn(filter.colId);
                         if (column) {
-                            this.setColumnFilter(column, filter);
+                            this.setColumnFilter(column, filter, false);
                         }
                         else {
-                            var pivotColumn = this.gridQuery.getSecondaryColumn(filter.colId);
-                            this.setColumnFilter(pivotColumn, filter);
+                            var secondaryColumn = this.gridQuery.getSecondaryColumn(filter.colId);
+                            if (secondaryColumn) {
+                                this.setColumnFilter(secondaryColumn, filter, false);
+                            }
                         }
                     }
                 }
@@ -14420,7 +14422,23 @@
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
-                this.notifyFilterUpdate();
+                this.api.grid.onFilterChanged();
+            }
+        };
+        GridService.prototype.setGridSort = function (_a) {
+            var colId = _a.colId, sort = _a.sort;
+            if (this.api) {
+                var column = this.api.columns.getColumn(colId);
+                if (column) {
+                    column.setSort(sort);
+                }
+                else {
+                    var secondaryColumn = this.gridQuery.getSecondaryColumn(colId);
+                    if (secondaryColumn) {
+                        secondaryColumn.setSort(sort);
+                    }
+                }
+                this.api.grid.onSortChanged();
             }
         };
         GridService.prototype.updateFilter = function (column, filter) {
@@ -15535,6 +15553,9 @@
         DatoGridControllerComponent.prototype.setGridFilters = function (filters) {
             this.gridService.setGridFilters(filters);
         };
+        DatoGridControllerComponent.prototype.setGridSort = function (sort) {
+            this.gridService.setGridSort(sort);
+        };
         DatoGridControllerComponent.prototype.onFilterChanged = function () {
             return this.gridQuery.filterChanged();
         };
@@ -25361,7 +25382,7 @@
         };
     }
 
-    window.coreVersion = '22.0.6';
+    window.coreVersion = '22.2.0';
 
     exports.APP_TRANSLATE = APP_TRANSLATE;
     exports.AceService = AceService;