@datorama/core 22.2.0 → 22.2.5

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;
@@ -12674,35 +12682,33 @@ let GridService = class GridService {
         }
     }
     setGridFilters(filters) {
-        if (this.api) {
-            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);
-                    }
-                }
+        if (this.api && filters) {
+            let appliedFilter = {};
+            for (const { filter, field } of filters) {
+                appliedFilter[field] = filter;
             }
+            this.updateSettings({ filter: appliedFilter });
             this.api.grid.onFilterChanged();
         }
     }
-    setGridSort({ colId, sort }) {
-        if (this.api) {
-            const column = this.api.columns.getColumn(colId);
-            if (column) {
-                column.setSort(sort);
+    setGridSort(gridSort) {
+        if (this.api && gridSort) {
+            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) {
@@ -13722,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 {
@@ -13766,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))
@@ -13775,10 +13775,8 @@ let DatoGridControllerComponent = class DatoGridControllerComponent {
             const settingsDiff = this.gridService.getSettingsDiff();
             this.gridService.updateSettings(settingsDiff);
             const data = this.getGridData();
-            this.onGridChange.emit({
-                type,
-                data
-            });
+            this.onGridChange.emit(Object.assign(Object.assign({}, settingsDiff), { filter: this.gridQuery.getExternalFilter(), type,
+                data }));
         });
     }
     listenToStoreSettingsChanges() {
@@ -14371,6 +14369,7 @@ let DatoGridPaginationV2Component = class DatoGridPaginationV2Component {
         // Show fit cell content and collapse/expand row groups controls
         this.showBottomControls = false;
         this.isExpanded = true;
+        this.hasRowGroupColumns = false;
         this.isServerSidePagination = false;
         // The number of pages displayed in the navigation panel for each view as defined by product.
         this.MINI_DISPLAY_LENGTH = 2;
@@ -14406,8 +14405,10 @@ let DatoGridPaginationV2Component = class DatoGridPaginationV2Component {
         });
         this.gridQuery.gridReady$
             .pipe(tap(() => {
+            const rowGroupColumns = this.gridQuery.api.columns.getRowGroupColumns();
             this.gridApi = this.gridQuery.api.grid;
             this.showBottomControls = this.gridQuery.getGridOptions().showBottomControls;
+            this.hasRowGroupColumns = rowGroupColumns && rowGroupColumns.length > 0;
         }), switchMap(() => {
             this.isServerSidePagination = this.gridQuery.isServerSide;
             return this.isServerSidePagination ? this.gridQuery.serverDataLoaded$ : this.gridQuery.rowDataChanged$;
@@ -14620,7 +14621,7 @@ DatoGridPaginationV2Component = __decorate([
     Component({
         selector: 'dato-grid-pagination-v2',
         changeDetection: ChangeDetectionStrategy.OnPush,
-        template: "<div class=\"d-flex-row d-flex-auto d-flex-wrap container\" [class.small]=\"smallVersion\"\n     [attr.data-pages-count]=\"totalPages\"\n     [attr.data-current-page]=\"pageNumbersDisplay.currentPage\"\n     [attr.data-page-size]=\"rowsPerPage\"\n     [attr.data-rows-count]=\"rowCount\">\n  <div *ngIf=\"totalPages > 1\" #navigation\n       class=\"navigation d-flex-row d-flex-0-0-auto align-center\">\n\n    <!-- First Page -->\n    <dato-icon-button *ngIf=\"!disableButtons\"\n                      class=\"mr-4\" data-auto-id=\"pagiantion-first-page\"\n                      icon=\"chevron-left-double\"\n                      datoType=\"secondary\"\n                      datoSize=\"md\"\n                      [disabled]=\"prevPageDisabled\"\n                      (click)=\"navigateFirstPage()\">\n    </dato-icon-button>\n\n    <!-- Previous Page -->\n    <dato-icon-button icon=\"arrow-left\" datoType=\"secondary\" datoSize=\"md\"\n                      [disabled]=\"prevPageDisabled\" data-auto-id=\"pagiantion-previous-page\"\n                      (click)=\"navigatePrevPage()\">\n    </dato-icon-button>\n\n\n    <div class=\"d-flex mx-5 align-center number-container\">\n      <dato-link class=\"page-number mx-5\" datoType=\"secondary\" datoSize=\"sm\" data-auto-id=\"pagiantion-previous-batch\"\n                        *ngIf=\"pageNumbersDisplay.showFirstEllipsis && !smallVersion\"\n                        (click)=\"showPreviousBatch()\">...\n      </dato-link>\n      <dato-link class=\"page-number mx-5\" [datoType]=\"page === pageNumbersDisplay.currentPage ? 'primary' : 'secondary'\" datoSize=\"sm\"\n                 *ngFor=\"let page of pageNumbersDisplay.pages; index as i; trackBy: trackByPage;\" [attr.data-auto-id]=\"'pagiantion-page-' + i\"\n                 (click)=\"navigatePage(page - 1)\">\n        {{page}}\n      </dato-link>\n\n      <div class=\"d-flex\" *ngIf=\"pageNumbersDisplay.showLastPage && !smallVersion\">\n        <dato-link class=\"page-number mx-5\" datoType=\"secondary\" datoSize=\"sm\" data-auto-id=\"pagiantion-next-batch\"\n                          (click)=\"showNextBatch()\">...</dato-link>\n        <dato-link  class=\"page-number mx-5\" datoType=\"secondary\" datoSize=\"sm\"\n                          [attr.data-auto-id]=\"'pagiantion-page-' + totalPages\"\n                          (click)=\"navigatePage(totalPages - 1)\">\n          {{totalPages}}\n        </dato-link>\n      </div>\n\n    </div>\n\n    <!-- Next Page -->\n    <dato-icon-button icon=\"arrow-right\" datoType=\"secondary\" datoSize=\"md\"\n                      (click)=\"navigateNextPage()\" data-auto-id=\"pagiantion-next-page\"\n                      [disabled]=\"nextPageDisabled\">\n    </dato-icon-button>\n\n    <!-- Last Page -->\n    <dato-icon-button *ngIf=\"!disableButtons\"\n                      class=\"ml-4\" icon=\"chevron-right-double\"\n                      datoType=\"secondary\" datoSize=\"md\" data-auto-id=\"pagiantion-last-page\"\n                      [disabled]=\"nextPageDisabled\"\n                      (click)=\"navigatePage(totalPages - 1)\">\n    </dato-icon-button>\n\n  </div>\n\n  <div *ngIf=\"totalPages > 1 && !smallVersion\"\n       class=\"separator mx-10 my-auto primary-100-background-color\">\n  </div>\n\n  <div class=\"total d-flex-0-0-auto d-flex-row align-center\">\n    <span class=\"dato-note primary-300-color\">{{rowsRange}}</span>\n  </div>\n\n  <div *ngIf=\"showBottomControls\" class=\"grid-controls d-flex d-flex-1 justify-end\">\n    <dato-icon-button [icon]=\"isExpanded ? 'collapse' : 'expand'\" datoType=\"secondary\" datoSize=\"md\"\n                      (click)=\"toggleGroupsState()\" data-auto-id=\"pagiantion-expand-collapse\"\n                      [datoTooltipV2]=\"isExpanded ? 'core.collapse-rows' : 'core.expand-rows'\">\n    </dato-icon-button>\n\n    <dato-icon-button class=\"mx-4\" icon=\"maximize-horizontal\" datoType=\"secondary\" datoSize=\"md\"\n                      (click)=\"autoFitGrid('content')\" [datoTooltipV2]=\"'core.fit-to-content'\"\n                      data-auto-id=\"pagiantion-fit-to-content\">\n    </dato-icon-button>\n\n    <dato-icon-button icon=\"minimize-horizontal\" datoType=\"secondary\" datoSize=\"md\"\n                      (click)=\"autoFitGrid('container')\" [datoTooltipV2]=\"'core.fit-to-container'\"\n                      data-auto-id=\"pagiantion-fit-to-container\">\n    </dato-icon-button>\n  </div>\n</div>\n",
+        template: "<div class=\"d-flex-row d-flex-auto d-flex-wrap container\" [class.small]=\"smallVersion\"\n     [attr.data-pages-count]=\"totalPages\"\n     [attr.data-current-page]=\"pageNumbersDisplay.currentPage\"\n     [attr.data-page-size]=\"rowsPerPage\"\n     [attr.data-rows-count]=\"rowCount\">\n  <div *ngIf=\"totalPages > 1\" #navigation\n       class=\"navigation d-flex-row d-flex-0-0-auto align-center\">\n\n    <!-- First Page -->\n    <dato-icon-button *ngIf=\"!disableButtons\"\n                      class=\"mr-4\" data-auto-id=\"pagiantion-first-page\"\n                      icon=\"chevron-left-double\"\n                      datoType=\"secondary\"\n                      datoSize=\"md\"\n                      [disabled]=\"prevPageDisabled\"\n                      (click)=\"navigateFirstPage()\">\n    </dato-icon-button>\n\n    <!-- Previous Page -->\n    <dato-icon-button icon=\"arrow-left\" datoType=\"secondary\" datoSize=\"md\"\n                      [disabled]=\"prevPageDisabled\" data-auto-id=\"pagiantion-previous-page\"\n                      (click)=\"navigatePrevPage()\">\n    </dato-icon-button>\n\n\n    <div class=\"d-flex mx-5 align-center number-container\">\n      <dato-link class=\"page-number mx-5\" datoType=\"secondary\" datoSize=\"sm\" data-auto-id=\"pagiantion-previous-batch\"\n                        *ngIf=\"pageNumbersDisplay.showFirstEllipsis && !smallVersion\"\n                        (click)=\"showPreviousBatch()\">...\n      </dato-link>\n      <dato-link class=\"page-number mx-5\" [datoType]=\"page === pageNumbersDisplay.currentPage ? 'primary' : 'secondary'\" datoSize=\"sm\"\n                 *ngFor=\"let page of pageNumbersDisplay.pages; index as i; trackBy: trackByPage;\" [attr.data-auto-id]=\"'pagiantion-page-' + i\"\n                 (click)=\"navigatePage(page - 1)\">\n        {{page}}\n      </dato-link>\n\n      <div class=\"d-flex\" *ngIf=\"pageNumbersDisplay.showLastPage && !smallVersion\">\n        <dato-link class=\"page-number mx-5\" datoType=\"secondary\" datoSize=\"sm\" data-auto-id=\"pagiantion-next-batch\"\n                          (click)=\"showNextBatch()\">...</dato-link>\n        <dato-link  class=\"page-number mx-5\" datoType=\"secondary\" datoSize=\"sm\"\n                          [attr.data-auto-id]=\"'pagiantion-page-' + totalPages\"\n                          (click)=\"navigatePage(totalPages - 1)\">\n          {{totalPages}}\n        </dato-link>\n      </div>\n\n    </div>\n\n    <!-- Next Page -->\n    <dato-icon-button icon=\"arrow-right\" datoType=\"secondary\" datoSize=\"md\"\n                      (click)=\"navigateNextPage()\" data-auto-id=\"pagiantion-next-page\"\n                      [disabled]=\"nextPageDisabled\">\n    </dato-icon-button>\n\n    <!-- Last Page -->\n    <dato-icon-button *ngIf=\"!disableButtons\"\n                      class=\"ml-4\" icon=\"chevron-right-double\"\n                      datoType=\"secondary\" datoSize=\"md\" data-auto-id=\"pagiantion-last-page\"\n                      [disabled]=\"nextPageDisabled\"\n                      (click)=\"navigatePage(totalPages - 1)\">\n    </dato-icon-button>\n\n  </div>\n\n  <div *ngIf=\"totalPages > 1 && !smallVersion\"\n       class=\"separator mx-10 my-auto primary-100-background-color\">\n  </div>\n\n  <div class=\"total d-flex-0-0-auto d-flex-row align-center\">\n    <span class=\"dato-note primary-300-color\">{{rowsRange}}</span>\n  </div>\n\n  <div *ngIf=\"showBottomControls\" class=\"grid-controls d-flex d-flex-1 justify-end\">\n    <dato-icon-button *ngIf=\"hasRowGroupColumns\" [icon]=\"isExpanded ? 'collapse' : 'expand'\" datoType=\"secondary\"\n                      datoSize=\"md\" (click)=\"toggleGroupsState()\" data-auto-id=\"pagination-expand-collapse\"\n                      [datoTooltipV2]=\"isExpanded ? 'core.collapse-rows' : 'core.expand-rows'\">\n    </dato-icon-button>\n\n    <dato-icon-button class=\"mx-4\" icon=\"maximize-horizontal\" datoType=\"secondary\" datoSize=\"md\"\n                      (click)=\"autoFitGrid('content')\" [datoTooltipV2]=\"'core.fit-to-content'\"\n                      data-auto-id=\"pagination-fit-to-content\">\n    </dato-icon-button>\n\n    <dato-icon-button icon=\"minimize-horizontal\" datoType=\"secondary\" datoSize=\"md\"\n                      (click)=\"autoFitGrid('container')\" [datoTooltipV2]=\"'core.fit-to-container'\"\n                      data-auto-id=\"pagination-fit-to-container\">\n    </dato-icon-button>\n  </div>\n</div>\n",
         providers: [DecimalPipe],
         styles: [":host{padding:12px 0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;min-height:25px}:host .container{height:25px}:host .navigation .page-number{transition:color .3s ease-in-out}:host .navigation .page-number:first-of-type{margin-left:7px}:host .navigation .page-number:last-of-type{margin-right:7px}:host .separator{width:1px;height:25px}:host .container.small .navigation,:host .container.small .total{margin-top:8px;margin-left:auto;margin-right:auto}"]
     }),
@@ -22645,7 +22646,7 @@ function fixNgLeaks() {
     };
 }
 
-window.coreVersion = '22.2.0';
+window.coreVersion = '22.2.5';
 
 /**
  * @license