@datorama/core 22.2.0 → 22.2.5

package/bundle.scss

@@ -14364,6 +14364,7 @@ dato-grid-v2 ag-grid-angular.pivot-mode .ag-cell {
 
 dato-grid-v2 ag-grid-angular.pivot-mode .ag-header-row .ag-header-cell {
     border: none;
+    border-top: 1px solid themify(primary-200);
 }
 
 dato-grid-v2 ag-grid-angular.pivot-mode .ag-header-row .ag-header-cell dato-grid-column-header {
@@ -14394,11 +14395,9 @@ dato-grid-v2 ag-grid-angular.pivot-mode .ag-header-row .ag-header-group-cell .ag
 }
 
 dato-grid-v2 ag-grid-angular.pivot-mode .ag-header-row .ag-header-group-cell.ag-header-group-cell-with-group {
-    border-bottom: 1px solid themify(primary-200);
-}
-
-dato-grid-v2 ag-grid-angular.pivot-mode .ag-header-row .ag-header-group-cell.ag-header-group-cell-with-group:not(:last-child) {
+    border-top: 1px solid themify(primary-200);
     border-right: 1px solid themify(primary-200);
+    background-color: themify(primary-100);
 }
 
 dato-grid-v2 ag-grid-angular.pivot-mode .ag-header-row .ag-header-group-cell.ag-header-group-cell-with-group.empty-pivot-header {

package/bundles/datorama-core.umd.js

@@ -11583,13 +11583,19 @@
             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)
+                        };
                     }
                 }
             }
@@ -11617,16 +11623,18 @@
         GridQuery.prototype.selectFilter = function () {
             return this.select(function (state) { return state.settings.filter; });
         };
-        GridQuery.prototype.filterChanged = function () {
-            return this.selectFilter().pipe(operators.map(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;
@@ -14399,20 +14407,12 @@
         };
         GridService.prototype.setGridFilters = function (filters) {
             var e_2, _a;
-            if (this.api) {
+            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 }; }
@@ -14422,23 +14422,28 @@
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
+                this.updateSettings({ filter: appliedFilter });
                 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);
+        GridService.prototype.setGridSort = function (gridSort) {
+            if (this.api && gridSort) {
+                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) {
@@ -15556,12 +15561,6 @@
         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 {
@@ -15609,8 +15608,8 @@
         };
         DatoGridControllerComponent.prototype.listenToGridEvents = function (agGrid) {
             var _this = this;
-            var columnVisible = agGrid.columnVisible, sortChanged = agGrid.sortChanged, columnRowGroupChanged = agGrid.columnRowGroupChanged, columnPinned = agGrid.columnPinned, dragStopped = agGrid.dragStopped;
-            rxjs.merge(columnVisible, sortChanged, columnRowGroupChanged, columnPinned, dragStopped)
+            var columnVisible = agGrid.columnVisible, sortChanged = agGrid.sortChanged, columnRowGroupChanged = agGrid.columnRowGroupChanged, columnPinned = agGrid.columnPinned, dragStopped = agGrid.dragStopped, filterChanged = agGrid.filterChanged;
+            rxjs.merge(columnVisible, sortChanged, columnRowGroupChanged, columnPinned, dragStopped, filterChanged)
                 .pipe(
             /* Skip the initial sorting event fired by the grid when adding rows */
             operators.skip(1), ngxTakeUntilDestroy.untilDestroyed(this))
@@ -15619,10 +15618,8 @@
                 var settingsDiff = _this.gridService.getSettingsDiff();
                 _this.gridService.updateSettings(settingsDiff);
                 var data = _this.getGridData();
-                _this.onGridChange.emit({
-                    type: type,
-                    data: data
-                });
+                _this.onGridChange.emit(__assign(__assign({}, settingsDiff), { filter: _this.gridQuery.getExternalFilter(), type: type,
+                    data: data }));
             });
         };
         DatoGridControllerComponent.prototype.listenToStoreSettingsChanges = function () {
@@ -16294,6 +16291,7 @@
             // 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;
@@ -16342,8 +16340,10 @@
             });
             this.gridQuery.gridReady$
                 .pipe(operators.tap(function () {
+                var rowGroupColumns = _this.gridQuery.api.columns.getRowGroupColumns();
                 _this.gridApi = _this.gridQuery.api.grid;
                 _this.showBottomControls = _this.gridQuery.getGridOptions().showBottomControls;
+                _this.hasRowGroupColumns = rowGroupColumns && rowGroupColumns.length > 0;
             }), operators.switchMap(function () {
                 _this.isServerSidePagination = _this.gridQuery.isServerSide;
                 return _this.isServerSidePagination ? _this.gridQuery.serverDataLoaded$ : _this.gridQuery.rowDataChanged$;
@@ -16561,7 +16561,7 @@
             core.Component({
                 selector: 'dato-grid-pagination-v2',
                 changeDetection: core.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: [common.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}"]
             }),
@@ -25382,7 +25382,7 @@
         };
     }
 
-    window.coreVersion = '22.2.0';
+    window.coreVersion = '22.2.5';
 
     exports.APP_TRANSLATE = APP_TRANSLATE;
     exports.AceService = AceService;