@datorama/core 21.4.0-rc.9 → 22.1.1-rc.1

package/fesm2015/datorama-core.js

@@ -10094,11 +10094,10 @@ 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 secondaryColumns = this.api.columns.getSecondaryColumns();
-            const pivotedColumn = secondaryColumns && secondaryColumns.find(col => col.getColId() === colId);
+            const pivotedColumn = this.getSecondaryColumn(colId);
             if (pivotedColumn) {
-                const uniquePivotParents = uniq(secondaryColumns.map(column => column.getParent()));
-                const secondaryColumn = secondaryColumns.find(col => col.getColId() === pivotedColumn.getColId());
+                const uniquePivotParents = uniq(this.api.columns.getSecondaryColumns().map(column => column.getParent()));
+                const secondaryColumn = this.getSecondaryColumn(pivotedColumn.getColId());
                 const pivotColIndex = uniquePivotParents.indexOf(secondaryColumn.getParent());
                 return { colId: getColField(pivotedColumn.getColDef()), sort, pivotColIndex };
             }
@@ -10135,9 +10134,9 @@ let GridQuery = class GridQuery extends Query {
     filterChanged() {
         return this.selectFilter().pipe(map$1(filter => {
             return Object.keys(filter).reduce((filters, field) => {
-                if (filter[field]) {
-                    const { conditional, pivotFieldsMap } = filter[field];
-                    filters.push({ field, filter: conditional, pivotFieldsMap });
+                const datoFilter = filter[field];
+                if (datoFilter) {
+                    filters.push({ field, filter: datoFilter });
                 }
                 return filters;
             }, []);
@@ -10203,6 +10202,10 @@ let GridQuery = class GridQuery extends Query {
     selectIsSelectAllRowsEnabled() {
         return this.select(state => state.serverSidePagination.selectAllRowsEnabled);
     }
+    getSecondaryColumn(colId) {
+        const secondaryColumns = this.api.columns.getSecondaryColumns();
+        return secondaryColumns && secondaryColumns.find(col => col.getColId() === colId);
+    }
     filterCheckboxSelectionColumn(columns) {
         return columns.filter((column) => !column.getUserProvidedColDef() || !column.getUserProvidedColDef().checkboxSelection);
     }
@@ -10312,8 +10315,8 @@ function validateStringCondition(rowValue, { condition, value: filterValue }) {
             return !isEmpty(valueLowerCase);
     }
 }
-function validateNumberCondition(unparsedRowValue, { condition, value, rangeEnd }) {
-    const rowValue = !!unparsedRowValue ? parseFloat(unparsedRowValue) : null;
+function validateNumberCondition(unparsedRowValue, { condition, value, rangeEnd }, filterKey = '') {
+    const rowValue = !!unparsedRowValue ? parseFloat(unparsedRowValue[filterKey] || unparsedRowValue) : null;
     const filterValue = parseFloat(value);
     switch (condition) {
         case DatoFilterConditions.EQUALS:
@@ -10359,14 +10362,14 @@ function validateDateCondition(rowValue, { condition, value, rangeEnd }) {
             return !isNil(rowValue);
     }
 }
-function validateCondition({ rowValue, filter, type }) {
+function validateCondition({ rowValue, condition, type, filterKey }) {
     switch (type) {
         case DatoGridFilterTypes.Date:
-            return validateDateCondition(rowValue, filter);
+            return validateDateCondition(rowValue, condition);
         case DatoGridFilterTypes.Number:
-            return validateNumberCondition(rowValue, filter);
+            return validateNumberCondition(rowValue, condition, filterKey);
         default:
-            return validateStringCondition(rowValue, filter);
+            return validateStringCondition(rowValue, condition);
     }
 }
 function validateFilter({ row, api }, activeFilters) {
@@ -10375,7 +10378,7 @@ function validateFilter({ row, api }, activeFilters) {
         for (const filter of orderedFilters) {
             let filterPasses = true;
             const { byValue, conditional, pivotKeys } = activeFilters[filter];
-            const currentRowPivotKeys = row.parent.childrenMapped && getRowPivotKeys(row.parent.childrenMapped);
+            const currentRowPivotKeys = (row.parent && row.parent.childrenMapped && getRowPivotKeys(row.parent.childrenMapped)) || [];
             const rowValue = api.getValue(filter, row);
             /** If value is under a pivoted column but doesn't match the filter pivot */
             if (pivotKeys && pivotKeys.length > 0 && !isArrayValuesEqual(pivotKeys, currentRowPivotKeys)) {
@@ -10384,7 +10387,7 @@ function validateFilter({ row, api }, activeFilters) {
             if (conditional) {
                 const { operator, conditions, type } = conditional;
                 const conditionsRelation = operator === OperatorTypes.AND ? 'every' : 'some';
-                filterPasses = conditions[conditionsRelation](filter => validateCondition({ rowValue, filter, type: type }));
+                filterPasses = conditions[conditionsRelation](condition => validateCondition({ rowValue, condition, type: type, filterKey: filter }));
             }
             if (filterPasses && byValue) {
                 const includesValue = byValue.values.includes(rowValue);
@@ -11120,10 +11123,10 @@ const mapToValue = ({ value }) => value;
 const ɵ0$1 = mapToValue;
 const mapToListItem = val => ({ id: val, label: isNil(val) ? `(Empty)` : `${val}`.trim(), value: val });
 const ɵ1$1 = mapToListItem;
-const mapToListItemWithFormatted = ({ value, formattedValue }) => ({
-    id: value,
-    label: isNil(formattedValue) ? `(Empty)` : `${formattedValue}`.trim(),
-    value
+const mapToListItemWithFormatted = ({ value, formattedValue }, key) => ({
+    id: key && value ? value[key] : value,
+    label: isNil(formattedValue) ? `(Empty)` : `${key ? formattedValue[key] : formattedValue}`.trim(),
+    value: key && value ? value[key] : value
 });
 const ɵ2$1 = mapToListItemWithFormatted;
 let DatoGridFilterComponent = class DatoGridFilterComponent {
@@ -11209,15 +11212,18 @@ let DatoGridFilterComponent = class DatoGridFilterComponent {
     ngOnInit() {
         const { gridService, gridQuery } = this.popover.data;
         const { filter, filtersConfig = {}, pivotValueColumn, pivotKeys } = this.colDef;
+        const colDefs = gridQuery.api.columns.getAllColumns().map(column => column.getColDef());
         this.colField = getColField(this.colDef);
+        const colDef = colDefs.find(colDef => colDef.field === this.colField);
+        const colFilter = filter || colDef.filter;
+        const filterOptions = DatoGridFilterOptionsMap[colFilter];
         this.pivotColumn = gridQuery.api.columns.getSecondaryPivotColumn(pivotKeys, pivotValueColumn);
         if (filtersConfig.sections) {
             this.filterSections = { [filtersConfig.sections]: true };
         }
         this.keepPredefinedListOriginalOrder =
             filtersConfig.keepPredefinedListOriginalOrder && !isEmpty(filtersConfig.predefinedListValues);
-        const filterOptions = DatoGridFilterOptionsMap[filter];
-        this.filterType = filterOptions ? filter : DatoGridFilterTypes.String;
+        this.filterType = filterOptions ? colFilter : DatoGridFilterTypes.String;
         this.listLabelType = this.filterType.toLowerCase();
         this.listSortByKey = this.filterType === DatoGridFilterTypes.Number && this.colDef.valueFormatter ? 'id' : 'label';
         this.gridQuery = gridQuery;
@@ -11250,8 +11256,10 @@ let DatoGridFilterComponent = class DatoGridFilterComponent {
                 }
                 else {
                     const columnValues = this.getColumnValues();
-                    this.columnValues = columnValues.map(({ value }) => value);
-                    this.listOptions = columnValues.map(mapToListItemWithFormatted);
+                    this.columnValues = columnValues.map(({ value }) => {
+                        return !isNil(this.pivotColumn) && value ? value[this.colField] : value;
+                    });
+                    this.listOptions = columnValues.map(colValue => mapToListItemWithFormatted(colValue, !isNil(this.pivotColumn) && this.colField));
                 }
             }
             else {
@@ -11289,6 +11297,7 @@ let DatoGridFilterComponent = class DatoGridFilterComponent {
             isEmpty(filter)
                 ? this.gridService.clearColumnFilter(this.colField)
                 : this.gridService.setColumnFilter(column, filter);
+            this.gridService.notifyFilterUpdate();
         }
     }
     clearFilters() {
@@ -11334,19 +11343,25 @@ let DatoGridFilterComponent = class DatoGridFilterComponent {
     buildFilter() {
         const { byValue, conditional } = this.filterForm.value;
         const filter = {};
-        filter.pivotKeys = this.pivotKeys;
-        if (this.pivotColumn) {
-            filter.pivotFieldsMap = this.getPivotFields(this.pivotColumn.getParent()).reduce((fieldMap, field, index) => {
-                fieldMap[field] = this.pivotKeys[index];
-                return fieldMap;
-            }, {});
-        }
         if (this.filterSections.Conditional) {
             this.setConditionalFilter(filter, conditional);
         }
         if (this.filterSections.By_Value) {
             this.setByValueFilter(filter, byValue);
         }
+        /** If filters applied, add the extra properties to be used by pivot mode */
+        if (filter.byValue || filter.conditional) {
+            filter.colId = this.colDef.colId;
+            filter.pivotKeys = this.pivotKeys;
+            if (this.pivotColumn) {
+                filter.pivotFieldsMap = this.getPivotFields(this.pivotColumn.getParent()).reduce((fieldMap, field, index) => {
+                    if (this.pivotKeys[index]) {
+                        fieldMap[field] = this.pivotKeys[index];
+                    }
+                    return fieldMap;
+                }, {});
+            }
+        }
         return filter;
     }
     initForm() {
@@ -12630,19 +12645,39 @@ let GridService = class GridService {
         });
         this.notifyFilterUpdate();
     }
-    setColumnFilter(column, filter) {
+    setColumnFilter(column, filter, notifyGrid = true) {
         this._logEvent("Grids - Filter Applied" /* GRID_FILTER_APPLIED */, {
             column: column.getColId(),
             numOfConditions: (filter.conditional && filter.conditional.conditions.length) || 0,
             byValue: !!filter.byValue ? 'Yes' : 'No'
         });
+        this.updateFilter(column, filter);
+        if (notifyGrid) {
+            this.notifyFilterUpdate();
+        }
+    }
+    setGridFilters(filters) {
+        if (this.api) {
+            for (const { filter } of filters) {
+                const column = this.api.columns.getColumn(filter.colId);
+                if (column) {
+                    this.setColumnFilter(column, filter);
+                }
+                else {
+                    const pivotColumn = this.gridQuery.getSecondaryColumn(filter.colId);
+                    this.setColumnFilter(pivotColumn, filter);
+                }
+            }
+            this.notifyFilterUpdate();
+        }
+    }
+    updateFilter(column, filter) {
         const colField = getColField(column.getColDef());
         this.store.update(state => {
             return {
                 settings: Object.assign(Object.assign({}, state.settings), { filter: Object.assign(Object.assign({}, state.settings.filter), { [colField]: filter }) })
             };
         });
-        this.notifyFilterUpdate();
     }
     setSearchTerm(searchTerm) {
         this.store.update(state => {
@@ -13097,19 +13132,12 @@ let GridService = class GridService {
     /**
      * When pivoting,
      * we add the field name to the column header class in order to access it through the auto generated pivot column.
-     * @private
      */
     initPivotSecondaryColsProcess({ gridOptions }) {
         gridOptions.processSecondaryColDef = colDef => {
-            const api = colDef.headerComponentParams && colDef.headerComponentParams.gridQuery.api;
-            if (api) {
-                const valueColumns = colDef.headerComponentParams.gridQuery.api.columns.getValueColumns();
-                const originalColDef = valueColumns
-                    .map(({ userProvidedColDef }) => userProvidedColDef)
-                    .find(({ colId }) => colId === colDef.pivotValueColumn.getColId());
-                if (originalColDef) {
-                    colDef.filter = originalColDef.filter;
-                }
+            const userProvidedColDef = colDef.pivotValueColumn && colDef.pivotValueColumn.getUserProvidedColDef();
+            if (userProvidedColDef) {
+                colDef.filter = userProvidedColDef.filter;
             }
             if (colDef.pivotKeys) {
                 colDef.pivotKeys = colDef.pivotKeys.map(key => {
@@ -13125,7 +13153,7 @@ let GridService = class GridService {
                     const { field, value } = parsedValue;
                     colGroupDef.headerClass = [field];
                     colGroupDef.headerName = value;
-                    if (colGroupDef.children && colGroupDef.children.length > 1) {
+                    if (colGroupDef.children && colGroupDef.children.length > 0) {
                         colGroupDef.headerClass.push('group-pivot-cell');
                     }
                 }
@@ -13646,6 +13674,9 @@ let DatoGridControllerComponent = class DatoGridControllerComponent {
     setGridRows(data) {
         this.gridService.setRows(data);
     }
+    setGridFilters(filters) {
+        this.gridService.setGridFilters(filters);
+    }
     onFilterChanged() {
         return this.gridQuery.filterChanged();
     }
@@ -14451,6 +14482,9 @@ let DatoGridPaginationV2Component = class DatoGridPaginationV2Component {
     toggleGroupsState() {
         this.isExpanded ? this.gridApi.collapseAll() : this.gridApi.expandAll();
         this.isExpanded = !this.isExpanded;
+        // this.gridApi.forEachNode((node: RowNode) => {
+        //   node.setExpanded(this.isExpanded);
+        // });
     }
     autoFitGrid(type) {
         this.gridService.fitGrid(type);
@@ -14544,7 +14578,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-next-page\">\n    </dato-icon-button>\n\n    <dato-icon-button class=\"mx-4\" icon=\"maximize-horizontal\" datoType=\"secondary\" datoSize=\"md\"\n                      (click)=\"autoFitGrid('container')\" data-auto-id=\"pagiantion-next-page\">\n    </dato-icon-button>\n\n    <dato-icon-button icon=\"minimize-horizontal\" datoType=\"secondary\" datoSize=\"md\"\n                      (click)=\"autoFitGrid('content')\" data-auto-id=\"pagiantion-next-page\">\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 [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",
         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}"]
     }),
@@ -14651,6 +14685,7 @@ let DatoGridV2ToolbarComponent = class DatoGridV2ToolbarComponent {
         this.gridActions = { mainList: [], moreMenu: [] };
         this.searchPlaceholder = this.translate.transform('core.search');
         this.rowActionsShortLabelThreshold = 1539;
+        this.displayCustomGridActionsSeparator = true;
         this.openMenus = {
             group: false,
             settings: false
@@ -15004,10 +15039,14 @@ __decorate([
     Input(),
     __metadata("design:type", Number)
 ], DatoGridV2ToolbarComponent.prototype, "rowActionsShortLabelThreshold", void 0);
+__decorate([
+    Input(),
+    __metadata("design:type", Object)
+], DatoGridV2ToolbarComponent.prototype, "displayCustomGridActionsSeparator", void 0);
 DatoGridV2ToolbarComponent = __decorate([
     Component({
         selector: 'dato-grid-toolbar-v2',
-        template: "<section *ngIf=\"gridController.gridQuery.gridReady$ | async\" class=\"d-flex mb-20 justify-between items-center main-container\" [class.mx-30]=\"enableBackground\">\n\n    <section [ngClass]=\"{ 'd-flex items-center right-section': enableV2_1 }\">\n        <!--  Dynamic content for the left area -->\n        <div data-auto-id=\"grid-toolbar-dynamic-left\">\n            <ng-content select=\"[toolbarLeftArea]\"></ng-content>\n        </div>\n\n        <div class=\"d-flex items-center\">\n            <dato-grid-search-bar *ngIf=\"enableSearch\" [searchPlaceholder]=\"searchPlaceholder\"></dato-grid-search-bar>\n            <ng-container *ngIf=\"enableV2_1 && selectedRowsCount > 0\">\n                <div class=\"d-flex items-center\">\n                    <div class=\"chip align-center d-flex dato-note px-9 nowrap ml-16\">\n                        <span data-auto-id=\"grid-selected-items-text\">{{ (allPageRowsSelected ? 'core.all-items-in-page-selected' : 'core.selected-items') | translate:{ itemsCount: selectedRowsCount } }}</span>\n                        <dato-icon datoType=\"primary\" datoIcon=\"close\" datoSize=\"md\" class=\"ml-6 pointer\" (click)=\"clearSelectedRows()\"\n                                   data-auto-id=\"grid-clear-selected-rows\"></dato-icon>\n                    </div>\n                    <dato-link *ngIf=\"allPageRowsSelected\" (click)=\"selectAllPages()\" datoSize=\"sm\" class=\"ml-10\"\n                               data-auto-id=\"grid-select-all-pages\">\n                        <span>{{'core.select-all-items' | translate:{ itemsCount: totalRowsCount } }}</span>\n                    </dato-link>\n                </div>\n                <div *ngIf=\"hasRowActions\" class=\"separator\"></div>\n            </ng-container>\n        </div>\n\n        <!--  Row Actions-->\n        <div class=\"d-flex items-center\" *ngIf=\"isRowActionsVisible\">\n\n            <ng-container *ngFor=\"let rowAction of rowActions.mainList; index as i; last as isLast\">\n\n                <div *ngIf=\"!isRowActionHidden(rowAction)\"\n                    [attr.data-auto-id]=\"'grid-toolbar-action-' + rowAction.key\"\n                    [attr.data-action-index]=\"'grid-toolbar-action-' + i\"\n                    [class.disabled-action]=\"isActionDisabled(rowAction)\">\n                    <ng-container [ngTemplateOutlet]=\"rowAction.template || defaultButton\"\n                                  [ngTemplateOutletContext]=\"{disabled: isActionDisabled(rowAction)}\"></ng-container>\n                </div>\n\n                <ng-template #defaultButton>\n                    <div (click)=\"onActionClick(rowAction)\">\n                        <dato-grid-toolbar-button [icon]=\"rowAction.icon\"\n                                                  [disabled]=\"isActionDisabled(rowAction)\"\n                                                  [label]=\"rowAction.label\"\n                                                  [shortLabel]=\"rowAction.shortLabel\"\n                                                  [tooltip]=\"rowAction.tooltip\"\n                                                  [getMenu]=\"rowAction.getMenu\"\n                                                  [enableV2_1]=\"enableV2_1\"\n                                                  [isLast]=\"isLast\"\n                                                  [widthToHideLabel]=\"widthToHideActionsLabels\">\n                        </dato-grid-toolbar-button>\n                    </div>\n                </ng-template>\n            </ng-container>\n\n            <div *ngIf=\"rowActions.moreMenu.length > 0\" class=\"separator\"></div>\n            <dato-grid-toolbar-more-menu [actions]=\"rowActions.moreMenu\" (actionClick)=\"onActionClick($event)\" [isRowActions]=\"true\">\n            </dato-grid-toolbar-more-menu>\n        </div>\n\n    </section>\n\n\n    <!--  General Actions -->\n    <div class=\"d-flex items-center\">\n        <!--  Dynamic content for the right area -->\n        <div #customActions data-auto-id=\"grid-toolbar-dynamic-right\">\n            <ng-content select=\"[toolbarRightArea]\"></ng-content>\n        </div>\n        <div *ngIf=\"customActions.childNodes.length\" class=\"separator\"></div>\n        <!--  Group buttons  -->\n        <div *ngIf=\"groupsAllowed\" class=\"d-flex grouping-section opacity-0 invisible\" [class.open]=\"openMenus.group || hasGroups\">\n            <dato-icon-button [class.active]=\"openMenus.group\" (click)=\"executeTableAction('Group from Toolbar')\"\n                              data-auto-id=\"grid-toolbar-open-groups\"\n                              removeIconPadding datoSize=\"md\" datoType=\"none\" icon=\"group\" iconWidth=\"17px\"\n                              datoTooltip=\"core.row-grouping\" #groupTrigger\n                              class=\"mr-10 pointer\"></dato-icon-button>\n            <dato-icon-button data-auto-id=\"grid-toolbar-toggle-expand\" datoSize=\"md\" datoType=\"none\"\n                              (click)=\"executeTableAction('Collapse Expand')\"\n                              [icon]=\"rowGroupsCollapsed ? 'expand' : 'collapse'\"\n                              [disabled]=\"!hasGroups\"\n                              [datoTooltip]=\"'core.' + (rowGroupsCollapsed ? 'expand' : 'collapse') + '-rows'\"\n                              class=\"pointer\"></dato-icon-button>\n            <div class=\"separator\"></div>\n        </div>\n\n        <!--  Settings and export  -->\n        <ng-container *ngIf=\"createAction\">\n            <dato-button datoSize=\"sm\" class=\"pointer primary-300-color\" (click)=\"onActionClick(createAction)\"\n                         [datoTooltip]=\"createAction.tooltip\" [attr.data-auto-id]=\"'grid-toolbar-action-' + createAction.key\">\n                <dato-icon *ngIf=\"createAction.icon\" [icon]=\"createAction.icon\" class=\"mr-5\"></dato-icon>\n                {{ createAction.label | translate }}\n            </dato-button>\n            <div class=\"separator\"></div>\n        </ng-container>\n        <ng-container *ngFor=\"let gridAction of gridActions.mainList; index as i\">\n            <div *ngIf=\"gridAction.getMenu else button\" [datoMenuTriggerFor]=\"gridAction.getMenu()\">\n                <ng-container [ngTemplateOutlet]=\"button\"></ng-container>\n            </div>\n            <ng-template #button>\n                <dato-icon datoSize=\"sm\" (click)=\"onActionClick(gridAction)\"\n                           [attr.data-auto-id]=\"'grid-toolbar-action-' + gridAction.key\"\n                           [attr.data-action-index]=\"'grid-toolbar-general-action-' + i\"\n                           [icon]=\"gridAction.icon\" class=\"pointer primary-300-color\"\n                           [class.mr-16]=\"!gridAction.separator\"\n                           [datoTooltip]=\"gridAction.tooltip || gridAction.label\">\n                </dato-icon>\n            </ng-template>\n            <div *ngIf=\"gridAction.separator\" class=\"separator\"></div>\n        </ng-container>\n\n        <dato-icon data-auto-id=\"grid-toolbar-export\" datoSize=\"sm\"\n                          (click)=\"executeTableAction('Export')\" *ngIf=\"displayExport && !isTreeMode\"\n                          icon=\"export\" class=\"pointer mr-16 primary-300-color\" datoTooltip=\"core.export-table\"></dato-icon>\n        <dato-icon [class.active]=\"openMenus.settings\" (click)=\"openMenus.settings = true\"\n                          data-auto-id=\"grid-toolbar-settings\" datoSize=\"sm\"\n                          icon=\"account\" class=\"pointer primary-300-color\" datoTooltip=\"core.table-settings\"\n                          #settingsTrigger\n                          [datoMenuTriggerFor]=\"settingsMenu\"></dato-icon>\n\n        <ng-container *ngIf=\"gridActions.moreMenu.length > 0\">\n            <div class=\"separator\"></div>\n            <dato-grid-toolbar-more-menu [actions]=\"gridActions.moreMenu\" (actionClick)=\"onActionClick($event)\" [isRowActions]=\"false\">\n            </dato-grid-toolbar-more-menu>\n        </ng-container>\n\n\n        <dato-menu #settingsMenu=\"datoMenu\" menuClass=\"grid-settings-menu\" placement=\"bottom-end\"\n                   (menuClosed)=\"openMenus.settings = false\">\n            <ng-template datoMenuContent>\n                <button data-auto-id=\"grid-toolbar-settings-autofit-page\" datoMenuItem\n                        (click)=\"executeTableAction('Autofit to Page')\">\n                    <dato-icon datoSize=\"sm\" icon=\"maximize-horizontal\" class=\"mr-8 primary-300-color\"></dato-icon>\n                    {{ 'core.autofitPage' | translate }}</button>\n                <button data-auto-id=\"grid-toolbar-settings-autofit-content\" datoMenuItem\n                        (click)=\"executeTableAction('Autofit to Content')\">\n                    <dato-icon datoSize=\"sm\" icon=\"minimize-horizontal\" class=\"mr-8 primary-300-color\"></dato-icon>\n                    {{ 'core.autofitContent' | translate }}</button>\n                <ng-container *ngIf=\"groupsAllowed\">\n                    <button data-auto-id=\"grid-toolbar-settings-group\" datoMenuItem (click)=\"executeTableAction('Group from Settings')\">\n                        <dato-icon datoSize=\"sm\" icon=\"group\" class=\"mr-4 primary-300-color\"></dato-icon>\n                        {{ 'core.group' | translate }}\n                    </button>\n                </ng-container>\n                <button data-auto-id=\"grid-toolbar-settings-toggle-columns\" datoMenuItem (click)=\"executeTableAction('Show Hide Column')\">\n                    <dato-icon datoSize=\"sm\" icon=\"hide\" class=\"mr-8 primary-300-color\"></dato-icon>\n                    <span>{{ 'core.hideShowColumns' | translate }}<span\n                            class=\"dato-simple-italic ml-5 primary-200-color\">{{hiddenColumns}}</span></span>\n                </button>\n                <button data-auto-id=\"grid-toolbar-settings-reset-settings\" datoMenuItem\n                        (click)=\"executeTableAction('Reset Settings')\">\n                    <dato-icon datoSize=\"sm\" icon=\"reset-table\" class=\"mr-8 primary-300-color\"></dato-icon>\n                    {{ 'core.resetTableSettings' | translate }}\n                </button>\n                <button data-auto-id=\"grid-toolbar-settings-reset-filters\" datoMenuItem\n                        (click)=\"executeTableAction('Reset Filters')\">\n                    <dato-icon datoSize=\"sm\" icon=\"reset-filters\" class=\"mr-8 primary-300-color\"></dato-icon>\n                    {{ 'core.resetAllFilters' | translate }}\n                </button>\n                <button data-auto-id=\"grid-toolbar-export\" datoMenuItem\n                        (click)=\"executeTableAction('Export')\" *ngIf=\"this.displayExport && isTreeMode\">\n                <dato-icon datoSize=\"sm\"\n                           icon=\"export\" class=\"pointer mr-5 primary-300-color\" datoTooltip=\"core.export-table\"></dato-icon>\n                    {{ 'core.export-table' | translate }}\n                </button>\n            </ng-template>\n        </dato-menu>\n    </div>\n</section>\n\n\n",
+        template: "<section *ngIf=\"gridController.gridQuery.gridReady$ | async\" class=\"d-flex mb-20 justify-between items-center main-container\" [class.mx-30]=\"enableBackground\">\n\n    <section [ngClass]=\"{ 'd-flex items-center right-section': enableV2_1 }\">\n        <!--  Dynamic content for the left area -->\n        <div data-auto-id=\"grid-toolbar-dynamic-left\">\n            <ng-content select=\"[toolbarLeftArea]\"></ng-content>\n        </div>\n\n        <div class=\"d-flex items-center\">\n            <dato-grid-search-bar *ngIf=\"enableSearch\" [searchPlaceholder]=\"searchPlaceholder\"></dato-grid-search-bar>\n            <ng-container *ngIf=\"enableV2_1 && selectedRowsCount > 0\">\n                <div class=\"d-flex items-center\">\n                    <div class=\"chip align-center d-flex dato-note px-9 nowrap ml-16\">\n                        <span data-auto-id=\"grid-selected-items-text\">{{ (allPageRowsSelected ? 'core.all-items-in-page-selected' : 'core.selected-items') | translate:{ itemsCount: selectedRowsCount } }}</span>\n                        <dato-icon datoType=\"primary\" datoIcon=\"close\" datoSize=\"md\" class=\"ml-6 pointer\" (click)=\"clearSelectedRows()\"\n                                   data-auto-id=\"grid-clear-selected-rows\"></dato-icon>\n                    </div>\n                    <dato-link *ngIf=\"allPageRowsSelected\" (click)=\"selectAllPages()\" datoSize=\"sm\" class=\"ml-10\"\n                               data-auto-id=\"grid-select-all-pages\">\n                        <span>{{'core.select-all-items' | translate:{ itemsCount: totalRowsCount } }}</span>\n                    </dato-link>\n                </div>\n                <div *ngIf=\"hasRowActions\" class=\"separator\"></div>\n            </ng-container>\n        </div>\n\n        <!--  Row Actions-->\n        <div class=\"d-flex items-center\" *ngIf=\"isRowActionsVisible\">\n\n            <ng-container *ngFor=\"let rowAction of rowActions.mainList; index as i; last as isLast\">\n\n                <div *ngIf=\"!isRowActionHidden(rowAction)\"\n                    [attr.data-auto-id]=\"'grid-toolbar-action-' + rowAction.key\"\n                    [attr.data-action-index]=\"'grid-toolbar-action-' + i\"\n                    [class.disabled-action]=\"isActionDisabled(rowAction)\">\n                    <ng-container [ngTemplateOutlet]=\"rowAction.template || defaultButton\"\n                                  [ngTemplateOutletContext]=\"{disabled: isActionDisabled(rowAction)}\"></ng-container>\n                </div>\n\n                <ng-template #defaultButton>\n                    <div (click)=\"onActionClick(rowAction)\">\n                        <dato-grid-toolbar-button [icon]=\"rowAction.icon\"\n                                                  [disabled]=\"isActionDisabled(rowAction)\"\n                                                  [label]=\"rowAction.label\"\n                                                  [shortLabel]=\"rowAction.shortLabel\"\n                                                  [tooltip]=\"rowAction.tooltip\"\n                                                  [getMenu]=\"rowAction.getMenu\"\n                                                  [enableV2_1]=\"enableV2_1\"\n                                                  [isLast]=\"isLast\"\n                                                  [widthToHideLabel]=\"widthToHideActionsLabels\">\n                        </dato-grid-toolbar-button>\n                    </div>\n                </ng-template>\n            </ng-container>\n\n            <div *ngIf=\"rowActions.moreMenu.length > 0\" class=\"separator\"></div>\n            <dato-grid-toolbar-more-menu [actions]=\"rowActions.moreMenu\" (actionClick)=\"onActionClick($event)\" [isRowActions]=\"true\">\n            </dato-grid-toolbar-more-menu>\n        </div>\n\n    </section>\n\n\n    <!--  General Actions -->\n    <div class=\"d-flex items-center\">\n        <!--  Create action  -->\n        <ng-container *ngIf=\"createAction\">\n            <dato-button datoSize=\"sm\" class=\"pointer primary-300-color\" (click)=\"onActionClick(createAction)\"\n                         [datoTooltip]=\"createAction.tooltip\" [attr.data-auto-id]=\"'grid-toolbar-action-' + createAction.key\">\n                <dato-icon *ngIf=\"createAction.icon\" [icon]=\"createAction.icon\" class=\"mr-5\"></dato-icon>\n                {{ createAction.label | translate }}\n            </dato-button>\n            <div class=\"separator\"></div>\n        </ng-container>\n\n        <!--  Dynamic content for the right area -->\n        <div #customActions data-auto-id=\"grid-toolbar-dynamic-right\">\n            <ng-content select=\"[toolbarRightArea]\"></ng-content>\n        </div>\n        <div *ngIf=\"customActions.childNodes.length && displayCustomGridActionsSeparator\" class=\"separator\"></div>\n\n        <!--  Group buttons  -->\n        <div *ngIf=\"groupsAllowed\" class=\"d-flex grouping-section opacity-0 invisible\" [class.open]=\"openMenus.group || hasGroups\">\n            <dato-icon-button [class.active]=\"openMenus.group\" (click)=\"executeTableAction('Group from Toolbar')\"\n                              data-auto-id=\"grid-toolbar-open-groups\"\n                              removeIconPadding datoSize=\"md\" datoType=\"none\" icon=\"group\" iconWidth=\"17px\"\n                              datoTooltip=\"core.row-grouping\" #groupTrigger\n                              class=\"mr-10 pointer\"></dato-icon-button>\n            <dato-icon-button data-auto-id=\"grid-toolbar-toggle-expand\" datoSize=\"md\" datoType=\"none\"\n                              (click)=\"executeTableAction('Collapse Expand')\"\n                              [icon]=\"rowGroupsCollapsed ? 'expand' : 'collapse'\"\n                              [disabled]=\"!hasGroups\"\n                              [datoTooltip]=\"'core.' + (rowGroupsCollapsed ? 'expand' : 'collapse') + '-rows'\"\n                              class=\"pointer\"></dato-icon-button>\n            <div class=\"separator\"></div>\n        </div>\n\n        <!-- Grid Actions -->\n        <ng-container *ngFor=\"let gridAction of gridActions.mainList; index as i\">\n            <div *ngIf=\"gridAction.getMenu else button\" [datoMenuTriggerFor]=\"gridAction.getMenu()\">\n                <ng-container [ngTemplateOutlet]=\"button\"></ng-container>\n            </div>\n            <ng-template #button>\n                <dato-icon datoSize=\"sm\" (click)=\"onActionClick(gridAction)\"\n                           [attr.data-auto-id]=\"'grid-toolbar-action-' + gridAction.key\"\n                           [attr.data-action-index]=\"'grid-toolbar-general-action-' + i\"\n                           [icon]=\"gridAction.icon\" class=\"pointer primary-300-color\"\n                           [class.mr-16]=\"!gridAction.separator\"\n                           [datoTooltip]=\"gridAction.tooltip || gridAction.label\">\n                </dato-icon>\n            </ng-template>\n            <div *ngIf=\"gridAction.separator\" class=\"separator\"></div>\n        </ng-container>\n\n        <!-- Export -->\n        <dato-icon data-auto-id=\"grid-toolbar-export\" datoSize=\"sm\"\n                          (click)=\"executeTableAction('Export')\" *ngIf=\"displayExport && !isTreeMode\"\n                          icon=\"export\" class=\"pointer mr-16 primary-300-color\" datoTooltip=\"core.export-table\"></dato-icon>\n\n        <!-- Settings -->\n        <dato-icon [class.active]=\"openMenus.settings\" (click)=\"openMenus.settings = true\"\n                          data-auto-id=\"grid-toolbar-settings\" datoSize=\"sm\"\n                          icon=\"account\" class=\"pointer primary-300-color\" datoTooltip=\"core.table-settings\"\n                          #settingsTrigger\n                          [datoMenuTriggerFor]=\"settingsMenu\"></dato-icon>\n\n        <!-- More actions menu -->\n        <ng-container *ngIf=\"gridActions.moreMenu.length > 0\">\n            <div class=\"separator\"></div>\n            <dato-grid-toolbar-more-menu [actions]=\"gridActions.moreMenu\" (actionClick)=\"onActionClick($event)\" [isRowActions]=\"false\">\n            </dato-grid-toolbar-more-menu>\n        </ng-container>\n\n        <dato-menu #settingsMenu=\"datoMenu\" menuClass=\"grid-settings-menu\" placement=\"bottom-end\"\n                   (menuClosed)=\"openMenus.settings = false\">\n            <ng-template datoMenuContent>\n                <button data-auto-id=\"grid-toolbar-settings-autofit-page\" datoMenuItem\n                        (click)=\"executeTableAction('Autofit to Page')\">\n                    <dato-icon datoSize=\"sm\" icon=\"maximize-horizontal\" class=\"mr-8 primary-300-color\"></dato-icon>\n                    {{ 'core.autofitPage' | translate }}</button>\n                <button data-auto-id=\"grid-toolbar-settings-autofit-content\" datoMenuItem\n                        (click)=\"executeTableAction('Autofit to Content')\">\n                    <dato-icon datoSize=\"sm\" icon=\"minimize-horizontal\" class=\"mr-8 primary-300-color\"></dato-icon>\n                    {{ 'core.autofitContent' | translate }}</button>\n                <ng-container *ngIf=\"groupsAllowed\">\n                    <button data-auto-id=\"grid-toolbar-settings-group\" datoMenuItem (click)=\"executeTableAction('Group from Settings')\">\n                        <dato-icon datoSize=\"sm\" icon=\"group\" class=\"mr-4 primary-300-color\"></dato-icon>\n                        {{ 'core.group' | translate }}\n                    </button>\n                </ng-container>\n                <button data-auto-id=\"grid-toolbar-settings-toggle-columns\" datoMenuItem (click)=\"executeTableAction('Show Hide Column')\">\n                    <dato-icon datoSize=\"sm\" icon=\"hide\" class=\"mr-8 primary-300-color\"></dato-icon>\n                    <span>{{ 'core.hideShowColumns' | translate }}<span\n                            class=\"dato-simple-italic ml-5 primary-200-color\">{{hiddenColumns}}</span></span>\n                </button>\n                <button data-auto-id=\"grid-toolbar-settings-reset-settings\" datoMenuItem\n                        (click)=\"executeTableAction('Reset Settings')\">\n                    <dato-icon datoSize=\"sm\" icon=\"reset-table\" class=\"mr-8 primary-300-color\"></dato-icon>\n                    {{ 'core.resetTableSettings' | translate }}\n                </button>\n                <button data-auto-id=\"grid-toolbar-settings-reset-filters\" datoMenuItem\n                        (click)=\"executeTableAction('Reset Filters')\">\n                    <dato-icon datoSize=\"sm\" icon=\"reset-filters\" class=\"mr-8 primary-300-color\"></dato-icon>\n                    {{ 'core.resetAllFilters' | translate }}\n                </button>\n                <button data-auto-id=\"grid-toolbar-export\" datoMenuItem\n                        (click)=\"executeTableAction('Export')\" *ngIf=\"this.displayExport && isTreeMode\">\n                <dato-icon datoSize=\"sm\"\n                           icon=\"export\" class=\"pointer mr-5 primary-300-color\" datoTooltip=\"core.export-table\"></dato-icon>\n                    {{ 'core.export-table' | translate }}\n                </button>\n            </ng-template>\n        </dato-menu>\n    </div>\n</section>\n\n\n",
         changeDetection: ChangeDetectionStrategy.OnPush,
         styles: [".grouping-section{transition:visibility .2s ease-in-out,width .2s ease-in-out,opacity .2s ease-in-out;width:0}.grouping-section.open{width:75px;visibility:visible;opacity:1}:host .main-container{min-height:24px}:host .right-section{margin-right:50px}:host .separator{width:1px;height:24px;margin:0 16px}.disabled-action{pointer-events:none}"]
     }),
@@ -22567,7 +22606,7 @@ function fixNgLeaks() {
     };
 }
 
-window.coreVersion = '21.4.0-rc.';
+window.coreVersion = '22.1.1-rc.';
 
 /**
  * @license