@datorama/core 22.2.2 → 22.2.6

package/fesm5/datorama-core.js

@@ -11384,13 +11384,19 @@ var GridQuery = /** @class */ (function (_super) {
         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 allColumns = this.api.columns.getAllGridColumns();
             if (column) {
-                return { colId: colId, sort: sort, colField: getColField(column.getColDef()) };
+                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, colField: getColField(secondaryColumn.getColDef()) };
+                    return {
+                        colId: colId,
+                        sort: sort,
+                        field: getColField(secondaryColumn.getColDef()),
+                        sortIndex: allColumns.indexOf(secondaryColumn)
+                    };
                 }
             }
         }
@@ -11418,16 +11424,18 @@ var GridQuery = /** @class */ (function (_super) {
     GridQuery.prototype.selectFilter = function () {
         return this.select(function (state) { return state.settings.filter; });
     };
-    GridQuery.prototype.filterChanged = function () {
-        return this.selectFilter().pipe(map$1(function (filter) {
-            return Object.keys(filter).reduce(function (filters, field) {
-                var datoFilter = filter[field];
-                if (datoFilter) {
-                    filters.push({ field: field, filter: datoFilter });
+    GridQuery.prototype.getExternalFilter = function () {
+        var gridFilters = this.getFilter();
+        if (gridFilters) {
+            return Object.keys(gridFilters).reduce(function (filters, field) {
+                var filter = gridFilters[field];
+                if (filter) {
+                    filters.push({ field: field, filter: filter });
                 }
                 return filters;
             }, []);
-        }));
+        }
+        return [];
     };
     GridQuery.prototype.getSearchTerm = function () {
         return this.getValue().settings.searchTerm;
@@ -14201,19 +14209,11 @@ var GridService = /** @class */ (function () {
     GridService.prototype.setGridFilters = function (filters) {
         var e_2, _a;
         if (this.api && filters) {
+            var appliedFilter = {};
             try {
                 for (var filters_1 = __values(filters), filters_1_1 = filters_1.next(); !filters_1_1.done; filters_1_1 = filters_1.next()) {
-                    var filter = filters_1_1.value.filter;
-                    var column = this.api.columns.getColumn(filter.colId);
-                    if (column) {
-                        this.setColumnFilter(column, filter, false);
-                    }
-                    else {
-                        var secondaryColumn = this.gridQuery.getSecondaryColumn(filter.colId);
-                        if (secondaryColumn) {
-                            this.setColumnFilter(secondaryColumn, filter, false);
-                        }
-                    }
+                    var _b = filters_1_1.value, filter = _b.filter, field = _b.field;
+                    appliedFilter[field] = filter;
                 }
             }
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -14223,23 +14223,28 @@ var GridService = /** @class */ (function () {
                 }
                 finally { if (e_2) throw e_2.error; }
             }
+            this.updateSettings({ filter: appliedFilter });
             this.api.grid.onFilterChanged();
         }
     };
     GridService.prototype.setGridSort = function (gridSort) {
         if (this.api && gridSort) {
-            var colId = gridSort.colId, sort = gridSort.sort;
-            var column = this.api.columns.getColumn(colId);
-            if (column) {
-                column.setSort(sort);
+            var sort = gridSort.sort, sortIndex = gridSort.sortIndex;
+            if (!isNil(sortIndex)) {
+                var columns = this.api.columns.getAllGridColumns();
+                if (columns) {
+                    var column = columns[sortIndex];
+                    if (column) {
+                        var sortToApply = { colId: column.getColId(), sort: sort };
+                        this.updateSettings({ sort: sortToApply });
+                        this.api.grid.setSortModel([sortToApply]);
+                    }
+                }
             }
             else {
-                var secondaryColumn = this.gridQuery.getSecondaryColumn(colId);
-                if (secondaryColumn) {
-                    secondaryColumn.setSort(sort);
-                }
+                this.updateSettings({ sort: gridSort });
+                this.api.grid.setSortModel([gridSort]);
             }
-            this.api.grid.onSortChanged();
         }
     };
     GridService.prototype.updateFilter = function (column, filter) {
@@ -15357,12 +15362,6 @@ var DatoGridControllerComponent = /** @class */ (function () {
     DatoGridControllerComponent.prototype.setGridSort = function (sort) {
         this.gridService.setGridSort(sort);
     };
-    DatoGridControllerComponent.prototype.onFilterChanged = function () {
-        return this.gridQuery.filterChanged();
-    };
-    DatoGridControllerComponent.prototype.onSortChanged = function () {
-        return this.gridQuery.selectSort();
-    };
     DatoGridControllerComponent.prototype.getGridIcons = function () {
         var moveColumnIcon = "<span class=\"da-grid-icon pointer d-flex column-move\">" + this.iconRegistry.getSvg('move-column') + "</span>";
         return {
@@ -15410,8 +15409,8 @@ var DatoGridControllerComponent = /** @class */ (function () {
     };
     DatoGridControllerComponent.prototype.listenToGridEvents = function (agGrid) {
         var _this = this;
-        var columnVisible = agGrid.columnVisible, sortChanged = agGrid.sortChanged, columnRowGroupChanged = agGrid.columnRowGroupChanged, columnPinned = agGrid.columnPinned, dragStopped = agGrid.dragStopped;
-        merge$1(columnVisible, sortChanged, columnRowGroupChanged, columnPinned, dragStopped)
+        var columnVisible = agGrid.columnVisible, sortChanged = agGrid.sortChanged, columnRowGroupChanged = agGrid.columnRowGroupChanged, columnPinned = agGrid.columnPinned, dragStopped = agGrid.dragStopped, filterChanged = agGrid.filterChanged;
+        merge$1(columnVisible, sortChanged, columnRowGroupChanged, columnPinned, dragStopped, filterChanged)
             .pipe(
         /* Skip the initial sorting event fired by the grid when adding rows */
         skip(1), untilDestroyed(this))
@@ -15421,6 +15420,8 @@ var DatoGridControllerComponent = /** @class */ (function () {
             _this.gridService.updateSettings(settingsDiff);
             var data = _this.getGridData();
             _this.onGridChange.emit({
+                filter: _this.gridQuery.getExternalFilter(),
+                sort: _this.gridQuery.getSort(),
                 type: type,
                 data: data
             });
@@ -25186,7 +25187,7 @@ function fixNgLeaks() {
     };
 }
 
-window.coreVersion = '22.2.2';
+window.coreVersion = '22.2.6';
 
 /**
  * @license