@datorama/core 21.4.0-rc.9 → 22.0.2

package/bundle.scss

@@ -14333,11 +14333,11 @@ dato-grid-v2 ag-grid-angular.pivot-mode .ag-row.ag-row-group span {
     color: themify(primary-500) !important;
 }
 
-dato-grid-v2 ag-grid-angular.pivot-mode .ag-row.ag-row-group.ag-row-group-contracted:not(.ag-row-level-0) {
+dato-grid-v2 ag-grid-angular.pivot-mode .ag-row.ag-row-group:not(.ag-row-level-0) {
     background-color: themify(primary-50) !important;
 }
 
-dato-grid-v2 ag-grid-angular.pivot-mode .ag-row.ag-row-group.ag-row-group-contracted:not(.ag-row-level-0) span {
+dato-grid-v2 ag-grid-angular.pivot-mode .ag-row.ag-row-group:not(.ag-row-level-0) span {
     font-weight: 400;
 }
 

package/bundles/datorama-core.umd.js

@@ -8629,8 +8629,9 @@
         DatoSelectComponent.prototype.writeValue = function (activeOptions) {
             this._model = activeOptions ? akita.coerceArray(activeOptions) : [];
             if (this.options) {
+                var overTheLimit = this.limitSelectedTo && this.isMulti && this._model.length >= this.limitSelectedTo;
                 this.markAsActive(this._model, { deselectAll: true });
-                this.limitSelectedTo && this.updateDisabledState();
+                overTheLimit && this.updateDisabledState();
             }
             /** For later updates */
             this.cdr.markForCheck();
@@ -8667,7 +8668,7 @@
              */
             if (this.hasValue && this._initialOpen) {
                 this.markAsActive(this._model);
-                if (this.limitSelectedTo) {
+                if (this.limitSelectedTo && this._model.length === this.limitSelectedTo) {
                     this.updateDisabledState();
                 }
                 this._initialOpen = false;
@@ -8756,6 +8757,7 @@
         };
         DatoSelectComponent.prototype.removeOption = function (option) {
             var _this = this;
+            var updateDisabled = this.limitSelectedTo && this._model.length === this.limitSelectedTo;
             this._model = this._model.filter(function (current) { return current[_this.idKey] !== option[_this.idKey]; });
             var optionToRemove = this.options.find(function (datoOption) { return datoOption.option && datoOption.option[_this.idKey] === option[_this.idKey]; });
             /**
@@ -8765,7 +8767,7 @@
             if (optionToRemove) {
                 optionToRemove.active = false;
             }
-            this.limitSelectedTo && this.updateDisabledState();
+            updateDisabled && this.updateDisabledState();
             this.onChange(this._model);
             this.cdr.markForCheck();
             if (this.datoOverlay.attached) {
@@ -9115,6 +9117,9 @@
             if (!datoOption) {
                 return;
             }
+            var modelLength = this._model.length;
+            var updateDisabled = this.limitSelectedTo &&
+                (modelLength === this.limitSelectedTo || (modelLength === this.limitSelectedTo - 1 && !datoOption.active));
             datoOption.active = !datoOption.active;
             var rawOption = datoOption.option;
             if (datoOption.active) {
@@ -9123,7 +9128,7 @@
             else {
                 this._model = this._model.filter(function (current) { return current[_this.idKey] !== rawOption[_this.idKey]; });
             }
-            this.limitSelectedTo && this.updateDisabledState();
+            updateDisabled && this.updateDisabledState();
             this.onChange(this._model);
             this.cdr.markForCheck();
             this.datoOverlay.scheduleUpdate();
@@ -11576,15 +11581,14 @@
         };
         GridQuery.prototype.getSort = function () {
             if (this.gridRef.gridOptions.pivotMode) {
-                var _a = this.api.grid.getSortModel().pop() || {}, sort = _a.sort, colId_1 = _a.colId;
-                var column = this.api.columns.getColumn(colId_1);
-                var secondaryColumns = this.api.columns.getSecondaryColumns();
-                var pivotedColumn_1 = secondaryColumns && secondaryColumns.find(function (col) { return col.getColId() === colId_1; });
-                if (pivotedColumn_1) {
-                    var uniquePivotParents = uniq(secondaryColumns.map(function (column) { return column.getParent(); }));
-                    var secondaryColumn = secondaryColumns.find(function (col) { return col.getColId() === pivotedColumn_1.getColId(); });
+                var _a = this.api.grid.getSortModel().pop() || {}, sort = _a.sort, colId = _a.colId;
+                var column = this.api.columns.getColumn(colId);
+                var pivotedColumn = this.getSecondaryColumn(colId);
+                if (pivotedColumn) {
+                    var uniquePivotParents = uniq(this.api.columns.getSecondaryColumns().map(function (column) { return column.getParent(); }));
+                    var secondaryColumn = this.getSecondaryColumn(pivotedColumn.getColId());
                     var pivotColIndex = uniquePivotParents.indexOf(secondaryColumn.getParent());
-                    return { colId: getColField(pivotedColumn_1.getColDef()), sort: sort, pivotColIndex: pivotColIndex };
+                    return { colId: getColField(pivotedColumn.getColDef()), sort: sort, pivotColIndex: pivotColIndex };
                 }
                 else if (column) {
                     return { colId: getColField(column.getColDef()), sort: sort };
@@ -11619,9 +11623,9 @@
         GridQuery.prototype.filterChanged = function () {
             return this.selectFilter().pipe(operators.map(function (filter) {
                 return Object.keys(filter).reduce(function (filters, field) {
-                    if (filter[field]) {
-                        var _a = filter[field], conditional = _a.conditional, pivotFieldsMap = _a.pivotFieldsMap;
-                        filters.push({ field: field, filter: conditional, pivotFieldsMap: pivotFieldsMap });
+                    var datoFilter = filter[field];
+                    if (datoFilter) {
+                        filters.push({ field: field, filter: datoFilter });
                     }
                     return filters;
                 }, []);
@@ -11687,6 +11691,10 @@
         GridQuery.prototype.selectIsSelectAllRowsEnabled = function () {
             return this.select(function (state) { return state.serverSidePagination.selectAllRowsEnabled; });
         };
+        GridQuery.prototype.getSecondaryColumn = function (colId) {
+            var secondaryColumns = this.api.columns.getSecondaryColumns();
+            return secondaryColumns && secondaryColumns.find(function (col) { return col.getColId() === colId; });
+        };
         GridQuery.prototype.filterCheckboxSelectionColumn = function (columns) {
             return columns.filter(function (column) { return !column.getUserProvidedColDef() || !column.getUserProvidedColDef().checkboxSelection; });
         };
@@ -11799,9 +11807,10 @@
                 return !isEmpty(valueLowerCase);
         }
     }
-    function validateNumberCondition(unparsedRowValue, _a) {
+    function validateNumberCondition(unparsedRowValue, _a, filterKey) {
         var condition = _a.condition, value = _a.value, rangeEnd = _a.rangeEnd;
-        var rowValue = !!unparsedRowValue ? parseFloat(unparsedRowValue) : null;
+        if (filterKey === void 0) { filterKey = ''; }
+        var rowValue = !!unparsedRowValue ? parseFloat(unparsedRowValue[filterKey] || unparsedRowValue) : null;
         var filterValue = parseFloat(value);
         switch (condition) {
             case exports.DatoFilterConditions.EQUALS:
@@ -11849,14 +11858,14 @@
         }
     }
     function validateCondition(_a) {
-        var rowValue = _a.rowValue, filter = _a.filter, type = _a.type;
+        var rowValue = _a.rowValue, condition = _a.condition, type = _a.type, filterKey = _a.filterKey;
         switch (type) {
             case exports.DatoGridFilterTypes.Date:
-                return validateDateCondition(rowValue, filter);
+                return validateDateCondition(rowValue, condition);
             case exports.DatoGridFilterTypes.Number:
-                return validateNumberCondition(rowValue, filter);
+                return validateNumberCondition(rowValue, condition, filterKey);
             default:
-                return validateStringCondition(rowValue, filter);
+                return validateStringCondition(rowValue, condition);
         }
     }
     function validateFilter(_a, activeFilters) {
@@ -11867,7 +11876,7 @@
             var _loop_1 = function (filter) {
                 var filterPasses = true;
                 var _a = activeFilters[filter], byValue = _a.byValue, conditional = _a.conditional, pivotKeys = _a.pivotKeys;
-                var currentRowPivotKeys = row.parent.childrenMapped && getRowPivotKeys(row.parent.childrenMapped);
+                var currentRowPivotKeys = (row.parent && row.parent.childrenMapped && getRowPivotKeys(row.parent.childrenMapped)) || [];
                 var 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)) {
@@ -11876,7 +11885,9 @@
                 if (conditional) {
                     var operator = conditional.operator, conditions = conditional.conditions, type_1 = conditional.type;
                     var conditionsRelation = operator === exports.OperatorTypes.AND ? 'every' : 'some';
-                    filterPasses = conditions[conditionsRelation](function (filter) { return validateCondition({ rowValue: rowValue, filter: filter, type: type_1 }); });
+                    filterPasses = conditions[conditionsRelation](function (condition) {
+                        return validateCondition({ rowValue: rowValue, condition: condition, type: type_1, filterKey: filter });
+                    });
                 }
                 if (filterPasses && byValue) {
                     var includesValue = byValue.values.includes(rowValue);
@@ -12004,7 +12015,7 @@
         return contextActions;
     }
 
-    var DATO_GRID_STORAGE_API = new core.InjectionToken('DATO_GRID_STORAGE_AP');
+    var DATO_GRID_STORAGE_API = new core.InjectionToken('DATO_GRID_STORAGE_API');
 
     var defaultEditableColumnRenderer = function (params) {
         return params && params.value ? "<div class=\"value-wrapper ellipsis\">" + params.value + "</div>" : null;
@@ -12676,12 +12687,12 @@
     var ɵ0$1 = mapToValue;
     var mapToListItem = function (val) { return ({ id: val, label: isNil(val) ? "(Empty)" : ("" + val).trim(), value: val }); };
     var ɵ1$1 = mapToListItem;
-    var mapToListItemWithFormatted = function (_a) {
+    var mapToListItemWithFormatted = function (_a, key) {
         var value = _a.value, formattedValue = _a.formattedValue;
         return ({
-            id: value,
-            label: isNil(formattedValue) ? "(Empty)" : ("" + formattedValue).trim(),
-            value: value
+            id: key && value ? value[key] : value,
+            label: isNil(formattedValue) ? "(Empty)" : ("" + (key ? formattedValue[key] : formattedValue)).trim(),
+            value: key && value ? value[key] : value
         });
     };
     var ɵ2$1 = mapToListItemWithFormatted;
@@ -12820,15 +12831,18 @@
             var _this = this;
             var _b = this.popover.data, gridService = _b.gridService, gridQuery = _b.gridQuery;
             var _c = this.colDef, filter = _c.filter, _d = _c.filtersConfig, filtersConfig = _d === void 0 ? {} : _d, pivotValueColumn = _c.pivotValueColumn, pivotKeys = _c.pivotKeys;
+            var colDefs = gridQuery.api.columns.getAllColumns().map(function (column) { return column.getColDef(); });
             this.colField = getColField(this.colDef);
+            var colDef = colDefs.find(function (colDef) { return colDef.field === _this.colField; });
+            var colFilter = filter || colDef.filter;
+            var filterOptions = DatoGridFilterOptionsMap[colFilter];
             this.pivotColumn = gridQuery.api.columns.getSecondaryPivotColumn(pivotKeys, pivotValueColumn);
             if (filtersConfig.sections) {
                 this.filterSections = (_a = {}, _a[filtersConfig.sections] = true, _a);
             }
             this.keepPredefinedListOriginalOrder =
                 filtersConfig.keepPredefinedListOriginalOrder && !isEmpty(filtersConfig.predefinedListValues);
-            var filterOptions = DatoGridFilterOptionsMap[filter];
-            this.filterType = filterOptions ? filter : exports.DatoGridFilterTypes.String;
+            this.filterType = filterOptions ? colFilter : exports.DatoGridFilterTypes.String;
             this.listLabelType = this.filterType.toLowerCase();
             this.listSortByKey = this.filterType === exports.DatoGridFilterTypes.Number && this.colDef.valueFormatter ? 'id' : 'label';
             this.gridQuery = gridQuery;
@@ -12863,9 +12877,11 @@
                         var columnValues = this.getColumnValues();
                         this.columnValues = columnValues.map(function (_a) {
                             var value = _a.value;
-                            return value;
+                            return !isNil(_this.pivotColumn) && value ? value[_this.colField] : value;
+                        });
+                        this.listOptions = columnValues.map(function (colValue) {
+                            return mapToListItemWithFormatted(colValue, !isNil(_this.pivotColumn) && _this.colField);
                         });
-                        this.listOptions = columnValues.map(mapToListItemWithFormatted);
                     }
                 }
                 else {
@@ -12903,6 +12919,7 @@
                 isEmpty(filter)
                     ? this.gridService.clearColumnFilter(this.colField)
                     : this.gridService.setColumnFilter(column, filter);
+                this.gridService.notifyFilterUpdate();
             }
         };
         DatoGridFilterComponent.prototype.clearFilters = function () {
@@ -12956,19 +12973,25 @@
             var _this = this;
             var _a = this.filterForm.value, byValue = _a.byValue, conditional = _a.conditional;
             var filter = {};
-            filter.pivotKeys = this.pivotKeys;
-            if (this.pivotColumn) {
-                filter.pivotFieldsMap = this.getPivotFields(this.pivotColumn.getParent()).reduce(function (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(function (fieldMap, field, index) {
+                        if (_this.pivotKeys[index]) {
+                            fieldMap[field] = _this.pivotKeys[index];
+                        }
+                        return fieldMap;
+                    }, {});
+                }
+            }
             return filter;
         };
         DatoGridFilterComponent.prototype.initForm = function () {
@@ -14350,12 +14373,45 @@
             });
             this.notifyFilterUpdate();
         };
-        GridService.prototype.setColumnFilter = function (column, filter) {
+        GridService.prototype.setColumnFilter = function (column, filter, notifyGrid) {
+            if (notifyGrid === void 0) { 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();
+            }
+        };
+        GridService.prototype.setGridFilters = function (filters) {
+            var e_2, _a;
+            if (this.api) {
+                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);
+                        }
+                        else {
+                            var pivotColumn = this.gridQuery.getSecondaryColumn(filter.colId);
+                            this.setColumnFilter(pivotColumn, filter);
+                        }
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (filters_1_1 && !filters_1_1.done && (_a = filters_1.return)) _a.call(filters_1);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+                this.notifyFilterUpdate();
+            }
+        };
+        GridService.prototype.updateFilter = function (column, filter) {
             var colField = getColField(column.getColDef());
             this.store.update(function (state) {
                 var _a;
@@ -14363,7 +14419,6 @@
                     settings: __assign(__assign({}, state.settings), { filter: __assign(__assign({}, state.settings.filter), (_a = {}, _a[colField] = filter, _a)) })
                 };
             });
-            this.notifyFilterUpdate();
         };
         GridService.prototype.setSearchTerm = function (searchTerm) {
             this.store.update(function (state) {
@@ -14411,8 +14466,7 @@
             this.updateSettings({ gridAlignment: gridAlignment, columnsSizes: null });
         };
         GridService.prototype.saveSettingsToServer = function (settings) {
-            var isGlobal = this.gridQuery.getGridOptions().isGlobalSettings;
-            this.storageAPI.set(this.gridName, settings, isGlobal);
+            this.storageAPI.set(this.gridName, settings);
         };
         /**
          * @internal used to log grid events to the platform's logging service
@@ -14656,7 +14710,7 @@
             this.api.grid.onFilterChanged();
         };
         GridService.prototype.buildServerRequestFilters = function (filter) {
-            var e_2, _a;
+            var e_3, _a;
             var columnsFilters = {};
             try {
                 for (var _b = __values(Object.entries(filter)), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -14692,12 +14746,12 @@
                     }
                 }
             }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_2) throw e_2.error; }
+                finally { if (e_3) throw e_3.error; }
             }
             return columnsFilters;
         };
@@ -14750,7 +14804,7 @@
             return { operator: exports.OperatorTypes.AND, filters: [columnFilter, searchFilter] };
         };
         GridService.prototype.buildServerColumnFilters_v2_1 = function (filter) {
-            var e_3, _a;
+            var e_4, _a;
             var columnFilters = [];
             try {
                 for (var _b = __values(Object.entries(filter)), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -14775,12 +14829,12 @@
                     columnFilters.push(columnFilter);
                 }
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_3) throw e_3.error; }
+                finally { if (e_4) throw e_4.error; }
             }
             return columnFilters;
         };
@@ -14873,27 +14927,14 @@
         /**
          * When pivoting,
          * we add the field name to the column header class in order to access it through the auto generated pivot column.
-         * @private
          */
         GridService.prototype.initPivotSecondaryColsProcess = function (_a) {
             var _this = this;
             var gridOptions = _a.gridOptions;
             gridOptions.processSecondaryColDef = function (colDef) {
-                var api = colDef.headerComponentParams && colDef.headerComponentParams.gridQuery.api;
-                if (api) {
-                    var valueColumns = colDef.headerComponentParams.gridQuery.api.columns.getValueColumns();
-                    var originalColDef = valueColumns
-                        .map(function (_a) {
-                        var userProvidedColDef = _a.userProvidedColDef;
-                        return userProvidedColDef;
-                    })
-                        .find(function (_a) {
-                        var colId = _a.colId;
-                        return colId === colDef.pivotValueColumn.getColId();
-                    });
-                    if (originalColDef) {
-                        colDef.filter = originalColDef.filter;
-                    }
+                var userProvidedColDef = colDef.pivotValueColumn && colDef.pivotValueColumn.getUserProvidedColDef();
+                if (userProvidedColDef) {
+                    colDef.filter = userProvidedColDef.filter;
                 }
                 if (colDef.pivotKeys) {
                     colDef.pivotKeys = colDef.pivotKeys.map(function (key) {
@@ -14909,7 +14950,7 @@
                         var field = parsedValue.field, value = parsedValue.value;
                         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');
                         }
                     }
@@ -14936,7 +14977,7 @@
         GridService.prototype.setPivotModeRows = function (data) {
             var pivotColumns = this.gridQuery.getAllPivotColumns();
             var convertedData = data.map(function (currentValue, index) {
-                var e_4, _a;
+                var e_5, _a;
                 var mappedValues = __assign({}, currentValue);
                 try {
                     for (var pivotColumns_1 = __values(pivotColumns), pivotColumns_1_1 = pivotColumns_1.next(); !pivotColumns_1_1.done; pivotColumns_1_1 = pivotColumns_1.next()) {
@@ -14946,12 +14987,12 @@
                         mappedValues[field] = JSON.stringify(pivotValue);
                     }
                 }
-                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
                 finally {
                     try {
                         if (pivotColumns_1_1 && !pivotColumns_1_1.done && (_a = pivotColumns_1.return)) _a.call(pivotColumns_1);
                     }
-                    finally { if (e_4) throw e_4.error; }
+                    finally { if (e_5) throw e_5.error; }
                 }
                 return mappedValues;
             });
@@ -15423,10 +15464,7 @@
                 .pipe(operators.switchMap(function () {
                 _this.gridOptions = _this.normalizeOptions();
                 agGrid.gridOptions = _this.gridOptions;
-                var isGlobal = _this.gridOptions.isGlobalSettings;
-                var settingsLoader = _this.gridOptions.saveSettings === false
-                    ? rxjs.of(null)
-                    : _this.storageAPI.get(_this.gridOptions.gridName, isGlobal);
+                var settingsLoader = _this.gridOptions.saveSettings === false ? rxjs.of(null) : _this.storageAPI.get(_this.gridOptions.gridName);
                 return rxjs.combineLatest([agGrid.gridReady, settingsLoader]);
             }), ngxTakeUntilDestroy.untilDestroyed(this))
                 .subscribe(function (_a) {
@@ -15470,6 +15508,9 @@
         DatoGridControllerComponent.prototype.setGridRows = function (data) {
             this.gridService.setRows(data);
         };
+        DatoGridControllerComponent.prototype.setGridFilters = function (filters) {
+            this.gridService.setGridFilters(filters);
+        };
         DatoGridControllerComponent.prototype.onFilterChanged = function () {
             return this.gridQuery.filterChanged();
         };
@@ -16475,7 +16516,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-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: [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}"]
             }),
@@ -16697,18 +16738,6 @@
             this.registerGroupListeners();
             this.subscribeRowsSelectionData();
         };
-        DatoGridV2ToolbarComponent.prototype.getCellValueChangeEvent = function () {
-            var _this = this;
-            return this.gridController.gridQuery.waitForGrid(function () {
-                return _this.gridQuery.gridRef.cellValueChanged.pipe(operators.debounceTime(100), ngxTakeUntilDestroy.untilDestroyed(_this));
-            });
-        };
-        DatoGridV2ToolbarComponent.prototype.getRowDataUpdatedEvent = function () {
-            var _this = this;
-            return this.gridController.gridQuery.waitForGrid(function () {
-                return _this.gridQuery.gridRef.rowDataUpdated.pipe(operators.debounceTime(100), ngxTakeUntilDestroy.untilDestroyed(_this));
-            });
-        };
         DatoGridV2ToolbarComponent.prototype.onActionClick = function (action) {
             if (isFunction(action.onClick)) {
                 var selectedRowsCount = this.gridController.gridQuery.getSelectedRowsCount();
@@ -21180,40 +21209,6 @@
      * found in the LICENSE file at https://github.com/datorama/client-core/blob/master/LICENSE
      */
 
-    var RichTextService = /** @class */ (function () {
-        function RichTextService(http, config) {
-            this.http = http;
-            this.config = config;
-        }
-        RichTextService.prototype.getLib = function (appendScriptFunc, appendStyleFunc) {
-            if (!this.richTextScript$) {
-                this.initLib(appendScriptFunc, appendStyleFunc);
-            }
-            return this.richTextScript$;
-        };
-        RichTextService.prototype.initLib = function (appendScriptFunc, appendStyleFunc) {
-            this.richTextScript$ = rxjs.combineLatest([
-                this.http
-                    .get(this.config.paths.richText + "/index.js", { responseType: 'text' })
-                    .pipe(operators.tap(function (lib) { return appendScriptFunc(lib, 'rich-text-editor'); })),
-                this.http
-                    .get(this.config.paths.richText + "/plugins/autocomplete/plugin.css", { responseType: 'text' })
-                    .pipe(operators.tap(function (style) { return appendStyleFunc(style, 'tinymce-autocomplete'); }))
-            ]).pipe(operators.shareReplay(1));
-        };
-        RichTextService.ctorParameters = function () { return [
-            { type: http.HttpClient },
-            { type: undefined, decorators: [{ type: core.Inject, args: [DATO_CORE_CONFIG,] }] }
-        ]; };
-        RichTextService.ɵprov = core.ɵɵdefineInjectable({ factory: function RichTextService_Factory() { return new RichTextService(core.ɵɵinject(http.HttpClient), core.ɵɵinject(DATO_CORE_CONFIG)); }, token: RichTextService, providedIn: "root" });
-        RichTextService = __decorate([
-            core.Injectable({ providedIn: 'root' }),
-            __param(1, core.Inject(DATO_CORE_CONFIG)),
-            __metadata("design:paramtypes", [http.HttpClient, Object])
-        ], RichTextService);
-        return RichTextService;
-    }());
-
     /**
      * @license
      * Copyright Datorama. All Rights Reserved.
@@ -21227,12 +21222,12 @@
     var ɵ0$3 = getTinymce;
     var DatoRichTextDirective = /** @class */ (function (_super) {
         __extends(DatoRichTextDirective, _super);
-        function DatoRichTextDirective(ngZone, richTextService, config, host) {
+        function DatoRichTextDirective(ngZone, http, host, config) {
             var _this = _super.call(this) || this;
             _this.ngZone = ngZone;
-            _this.richTextService = richTextService;
-            _this.config = config;
+            _this.http = http;
             _this.host = host;
+            _this.config = config;
             _this.autocompleteOptions = {};
             _this.forcePlainTextPasting = false;
             _this.format = 'html';
@@ -21266,11 +21261,28 @@
                 base: this.config.paths.richText,
                 query: ''
             };
-            this.richTextService
-                .getLib(appendScript, appendStyle)
-                .pipe(ngxTakeUntilDestroy.untilDestroyed(this))
-                .subscribe(function () {
-                _this.init.call(_this);
+            /**
+             * We support only one instance in load time
+             */
+            if (window.tinymce) {
+                this.init.call(this);
+            }
+            else {
+                this.loadLib().subscribe(function (lib) {
+                    appendScript(lib, 'rich-text-editor');
+                    _this.init.call(_this);
+                    _this.loadAutoCompleteStyle();
+                });
+            }
+        };
+        DatoRichTextDirective.prototype.loadLib = function () {
+            return this.http.get(this.config.paths.richText + "/index.js", { responseType: 'text' });
+        };
+        DatoRichTextDirective.prototype.loadAutoCompleteStyle = function () {
+            this.http
+                .get(this.config.paths.richText + "/plugins/autocomplete/plugin.css", { responseType: 'text' })
+                .subscribe(function (style) {
+                appendStyle(style, 'tinymce-autocomplete');
             });
         };
         DatoRichTextDirective.prototype.initEditor = function (_, editor) {
@@ -21363,9 +21375,9 @@
         var DatoRichTextDirective_1;
         DatoRichTextDirective.ctorParameters = function () { return [
             { type: core.NgZone },
-            { type: RichTextService },
-            { type: undefined, decorators: [{ type: core.Inject, args: [DATO_CORE_CONFIG,] }] },
-            { type: core.ElementRef }
+            { type: http.HttpClient },
+            { type: core.ElementRef },
+            { type: undefined, decorators: [{ type: core.Inject, args: [DATO_CORE_CONFIG,] }] }
         ]; };
         __decorate([
             core.Input(),
@@ -21431,9 +21443,10 @@
                     }
                 ]
             }),
-            __param(2, core.Inject(DATO_CORE_CONFIG)),
+            __param(3, core.Inject(DATO_CORE_CONFIG)),
             __metadata("design:paramtypes", [core.NgZone,
-                RichTextService, Object, core.ElementRef])
+                http.HttpClient,
+                core.ElementRef, Object])
         ], DatoRichTextDirective);
         return DatoRichTextDirective;
     }(BaseCustomControl));
@@ -23956,9 +23969,7 @@
         };
         DatoBreadcrumbsComponent.prototype.initEditableHeader = function () {
             var _this = this;
-            this.headerControl.valueChanges
-                .pipe(operators.debounceTime(300), ngxTakeUntilDestroy.untilDestroyed(this))
-                .subscribe(function (res) {
+            this.headerControl.valueChanges.pipe(operators.debounceTime(300), ngxTakeUntilDestroy.untilDestroyed(this)).subscribe(function (res) {
                 _this.updateEditableText.emit(res);
                 _this.cdr.detectChanges();
             });
@@ -25301,7 +25312,7 @@
         };
     }
 
-    window.coreVersion = '21.4.0-rc.';
+    window.coreVersion = '22.0.2';
 
     exports.APP_TRANSLATE = APP_TRANSLATE;
     exports.AceService = AceService;
@@ -25743,7 +25754,6 @@
     exports.ɵl = DatoGridItemsCountCellComponent;
     exports.ɵm = DatoGridV2ToolbarMoreMenuComponent;
     exports.ɵn = DatoGridSearchBarComponent;
-    exports.ɵo = RichTextService;
 
     Object.defineProperty(exports, '__esModule', { value: true });