@datorama/core 22.2.2 → 22.2.6

package/fesm2015/datorama-core.js

@@ -10099,13 +10099,19 @@ let GridQuery = class GridQuery extends Query {
         if (this.gridRef.gridOptions.pivotMode) {
             const { sort, colId } = this.api.grid.getSortModel().pop() || {};
             const column = this.api.columns.getColumn(colId);
+            const allColumns = this.api.columns.getAllGridColumns();
             if (column) {
-                return { colId, sort, colField: getColField(column.getColDef()) };
+                return { colId, sort, field: getColField(column.getColDef()), sortIndex: allColumns.indexOf(column) };
             }
             else {
                 const secondaryColumn = this.getSecondaryColumn(colId);
                 if (secondaryColumn) {
-                    return { colId, sort, colField: getColField(secondaryColumn.getColDef()) };
+                    return {
+                        colId,
+                        sort,
+                        field: getColField(secondaryColumn.getColDef()),
+                        sortIndex: allColumns.indexOf(secondaryColumn)
+                    };
                 }
             }
         }
@@ -10133,16 +10139,18 @@ let GridQuery = class GridQuery extends Query {
     selectFilter() {
         return this.select(state => state.settings.filter);
     }
-    filterChanged() {
-        return this.selectFilter().pipe(map$1(filter => {
-            return Object.keys(filter).reduce((filters, field) => {
-                const datoFilter = filter[field];
-                if (datoFilter) {
-                    filters.push({ field, filter: datoFilter });
+    getExternalFilter() {
+        const gridFilters = this.getFilter();
+        if (gridFilters) {
+            return Object.keys(gridFilters).reduce((filters, field) => {
+                const filter = gridFilters[field];
+                if (filter) {
+                    filters.push({ field, filter });
                 }
                 return filters;
             }, []);
-        }));
+        }
+        return [];
     }
     getSearchTerm() {
         return this.getValue().settings.searchTerm;
@@ -12675,35 +12683,32 @@ let GridService = class GridService {
     }
     setGridFilters(filters) {
         if (this.api && filters) {
-            for (const { filter } of filters) {
-                const column = this.api.columns.getColumn(filter.colId);
-                if (column) {
-                    this.setColumnFilter(column, filter, false);
-                }
-                else {
-                    const secondaryColumn = this.gridQuery.getSecondaryColumn(filter.colId);
-                    if (secondaryColumn) {
-                        this.setColumnFilter(secondaryColumn, filter, false);
-                    }
-                }
+            let appliedFilter = {};
+            for (const { filter, field } of filters) {
+                appliedFilter[field] = filter;
             }
+            this.updateSettings({ filter: appliedFilter });
             this.api.grid.onFilterChanged();
         }
     }
     setGridSort(gridSort) {
         if (this.api && gridSort) {
-            const { colId, sort } = gridSort;
-            const column = this.api.columns.getColumn(colId);
-            if (column) {
-                column.setSort(sort);
+            const { sort, sortIndex } = gridSort;
+            if (!isNil(sortIndex)) {
+                const columns = this.api.columns.getAllGridColumns();
+                if (columns) {
+                    const column = columns[sortIndex];
+                    if (column) {
+                        const sortToApply = { colId: column.getColId(), sort };
+                        this.updateSettings({ sort: sortToApply });
+                        this.api.grid.setSortModel([sortToApply]);
+                    }
+                }
             }
             else {
-                const secondaryColumn = this.gridQuery.getSecondaryColumn(colId);
-                if (secondaryColumn) {
-                    secondaryColumn.setSort(sort);
-                }
+                this.updateSettings({ sort: gridSort });
+                this.api.grid.setSortModel([gridSort]);
             }
-            this.api.grid.onSortChanged();
         }
     }
     updateFilter(column, filter) {
@@ -13723,12 +13728,6 @@ let DatoGridControllerComponent = class DatoGridControllerComponent {
     setGridSort(sort) {
         this.gridService.setGridSort(sort);
     }
-    onFilterChanged() {
-        return this.gridQuery.filterChanged();
-    }
-    onSortChanged() {
-        return this.gridQuery.selectSort();
-    }
     getGridIcons() {
         const moveColumnIcon = `<span class="da-grid-icon pointer d-flex column-move">${this.iconRegistry.getSvg('move-column')}</span>`;
         return {
@@ -13767,8 +13766,8 @@ let DatoGridControllerComponent = class DatoGridControllerComponent {
         });
     }
     listenToGridEvents(agGrid) {
-        const { columnVisible, sortChanged, columnRowGroupChanged, columnPinned, dragStopped } = agGrid;
-        merge$1(columnVisible, sortChanged, columnRowGroupChanged, columnPinned, dragStopped)
+        const { columnVisible, sortChanged, columnRowGroupChanged, columnPinned, dragStopped, filterChanged } = agGrid;
+        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))
@@ -13777,6 +13776,8 @@ let DatoGridControllerComponent = class DatoGridControllerComponent {
             this.gridService.updateSettings(settingsDiff);
             const data = this.getGridData();
             this.onGridChange.emit({
+                filter: this.gridQuery.getExternalFilter(),
+                sort: this.gridQuery.getSort(),
                 type,
                 data
             });
@@ -22649,7 +22650,7 @@ function fixNgLeaks() {
     };
 }
 
-window.coreVersion = '22.2.2';
+window.coreVersion = '22.2.6';
 
 /**
  * @license