@adaptabletools/adaptable-cjs 18.0.0-canary.8 → 18.0.0

package/src/Api/Internal/AdaptableInternalApi.js

@@ -4,7 +4,6 @@ exports.AdaptableInternalApi = void 0;
 const tslib_1 = require("tslib");
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
-const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
 const DeadRedux = tslib_1.__importStar(require("../../Redux/DeadRedux"));
 const ApiBase_1 = require("../Implementation/ApiBase");
@@ -253,7 +252,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         }
     }
     executeWithProgressIndicator(label, executeFn, errorHandlingFn) {
-        this.dispatchReduxAction((0, SystemRedux_1.SystemProgressIndicatorShow)(label));
+        this.getAdaptableApi().userInterfaceApi.showProgressIndicator({ text: label, delay: 300 });
         // setTimeout required to give the ProgressIndicator rendering a head-start (see RAF in ProgressIndicator implementation)
         setTimeout(() => {
             try {
@@ -261,14 +260,11 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
             }
             catch (error) {
                 errorHandlingFn === null || errorHandlingFn === void 0 ? void 0 : errorHandlingFn();
-                this.hideProgressIndicator();
+                this.getUserInterfaceApi().hideProgressIndicator();
                 this.adaptable.logger.error('Unexpected error while executing a function with a progress indicator', error);
             }
         }, 16);
     }
-    hideProgressIndicator() {
-        this.dispatchReduxAction((0, SystemRedux_1.SystemProgressIndicatorHide)());
-    }
     getCorrectEnglishVariant(wordToSpell) {
         if (wordToSpell.includes('our')) {
             return this.getUserInterfaceOptions().englishVariant == 'GB'
@@ -298,11 +294,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         if (typeof this.adaptable.adaptableOptions.userInterfaceOptions.objectTags === 'function') {
             // sanitize the provided tags, just to be sure that the user does NOT break the UI
             return this.adaptable.adaptableOptions.userInterfaceOptions
-                .objectTags({
-                adaptableApi: this.adaptable.api,
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-            })
+                .objectTags(this.buildBaseContext())
                 .filter((tag) => typeof tag === 'string');
         }
     }
@@ -319,13 +311,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         }
         if (typeof this.adaptable.adaptableOptions.layoutOptions.layoutTagOptions
             .autoGenerateTagsForLayouts === 'function') {
-            const autoGenerateTagsForLayoutsContext = {
-                layouts: this.adaptable.api.layoutApi.getLayouts(),
-                objectTags: this.getAdaptableApi().userInterfaceApi.getAdaptableObjectTags(),
-                adaptableApi: this.adaptable.api,
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-            };
+            const autoGenerateTagsForLayoutsContext = Object.assign({ layouts: this.adaptable.api.layoutApi.getLayouts(), objectTags: this.getAdaptableApi().userInterfaceApi.getAdaptableObjectTags() }, this.buildBaseContext());
             const customGeneratedTags = this.adaptable.adaptableOptions.layoutOptions.layoutTagOptions.autoGenerateTagsForLayouts(autoGenerateTagsForLayoutsContext);
             // sanitize the provided tags, just to be sure that the user does NOT break the UI
             return customGeneratedTags.filter((tag) => typeof tag === 'string');
@@ -370,17 +356,17 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         return (_a = SystemRedux.SystemPreviousGroupedColumnsSelector(this.getAdaptableState().System)) === null || _a === void 0 ? void 0 : _a[layoutId];
     }
     // "borrowed" from https://github.com/ag-grid/ag-grid/blob/v28.2.1/community-modules/core/src/ts/utils/object.ts#L205
-    getValueUsingField(rowData, columnValueKey) {
-        if (!rowData || !(columnValueKey === null || columnValueKey === void 0 ? void 0 : columnValueKey.length)) {
+    getValueUsingField(rowData, fieldName) {
+        if (!rowData || !(fieldName === null || fieldName === void 0 ? void 0 : fieldName.length)) {
             return;
         }
-        const isColumnValueKeyNested = columnValueKey === null || columnValueKey === void 0 ? void 0 : columnValueKey.includes('.');
+        const isColumnValueKeyNested = fieldName === null || fieldName === void 0 ? void 0 : fieldName.includes('.');
         // if no '.', then it's not a deep value
         if (!isColumnValueKeyNested) {
-            return rowData[columnValueKey];
+            return rowData[fieldName];
         }
         // otherwise it is a deep value, so need to dig for it
-        const fields = columnValueKey.split('.');
+        const fields = fieldName.split('.');
         let currentObject = rowData;
         for (let i = 0; i < fields.length; i++) {
             if (currentObject == null) {
@@ -391,22 +377,22 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         return currentObject;
     }
     // "borrowed" from https://github.com/ag-grid/ag-grid/blob/v28.2.1/community-modules/core/src/ts/valueService/valueService.ts#L236
-    setValueUsingField(rowData, columnValueKey, newValue) {
-        if (!rowData || !(columnValueKey === null || columnValueKey === void 0 ? void 0 : columnValueKey.length)) {
+    setValueUsingField(rowData, fieldName, newValue) {
+        if (!rowData || !(fieldName === null || fieldName === void 0 ? void 0 : fieldName.length)) {
             return;
         }
-        const isColumnValueKeyContainsDots = columnValueKey === null || columnValueKey === void 0 ? void 0 : columnValueKey.includes('.');
+        const isColumnValueKeyContainsDots = fieldName === null || fieldName === void 0 ? void 0 : fieldName.includes('.');
         let valuesAreSame = false;
         if (!isColumnValueKeyContainsDots) {
             // soft comparison to match strings and numbers
-            valuesAreSame = rowData[columnValueKey] == newValue;
+            valuesAreSame = rowData[fieldName] == newValue;
             if (!valuesAreSame) {
-                rowData[columnValueKey] = newValue;
+                rowData[fieldName] = newValue;
             }
         }
         else {
             // otherwise it is a deep value, so need to dig for it
-            const fieldPieces = columnValueKey.split('.');
+            const fieldPieces = fieldName.split('.');
             let currentObject = rowData;
             while (fieldPieces.length > 0 && currentObject) {
                 const fieldPiece = fieldPieces.shift();
@@ -439,7 +425,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         }
         // lastly filter by scope
         if (scope) {
-            locatedAdaptableObjects = locatedAdaptableObjects.filter((adaptableObject) => this.getAdaptableApi().scopeApi.isScopeInScope(adaptableObject.Scope, scope));
+            locatedAdaptableObjects = locatedAdaptableObjects.filter((adaptableObject) => this.getAdaptableApi().columnScopeApi.isScopeInScope(adaptableObject.Scope, scope));
         }
         return locatedAdaptableObjects;
     }

package/src/Api/Internal/AlertInternalApi.d.ts

@@ -5,7 +5,7 @@ import { AlertFormContext } from '../../AdaptableOptions/AlertOptions';
 import { AdaptableAlert, AdaptableCellChangedAlert, AdaptableRowChangedAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { GridDataChangedInfo } from '../Events/GridDataChanged';
-import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope } from '../../PredefinedConfig/Common/ColumnScope';
 import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
 import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
 import { IRowNode } from '@ag-grid-community/core';
@@ -72,7 +72,7 @@ export declare class AlertInternalApi extends ApiBase {
      * Retrieves all Predicate Defs that match given Scope
      * @param scope the Scope to check
      */
-    getAlertPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    getAlertPredicateDefsForScope(scope: ColumnScope): AdaptablePredicateDef[];
     /**
      * Returns a description of an Alert Definition
      * @param alertDefinition Alert Definition to use

package/src/Api/Internal/AlertInternalApi.js

@@ -84,12 +84,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
      */
     publishAlertFiredEvent(alertToFire) {
         const adaptableApi = this.getAdaptableApi();
-        const alertFiredInfo = {
-            adaptableApi: adaptableApi,
-            alert: alertToFire,
-            userName: adaptableApi.optionsApi.getUserName(),
-            adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-        };
+        const alertFiredInfo = Object.assign({ alert: alertToFire }, this.getAdaptableApi().internalApi.buildBaseContext());
         this.getEventApi().emit('AlertFired', alertFiredInfo);
     }
     /**
@@ -218,7 +213,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
     getAlertPredicateDefsForScope(scope) {
         return this.getPredicateApi()
             .internalApi.getAlertPredicateDefs(scope)
-            .filter((predicateDef) => this.getScopeApi().isScopeInScope(scope, predicateDef.columnScope));
+            .filter((predicateDef) => this.getColumnScopeApi().isScopeInScope(scope, predicateDef.columnScope));
     }
     /**
      * Returns a description of an Alert Definition
@@ -232,7 +227,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
         if (alertDefinition.MessageText != null) {
             return alertDefinition.MessageText;
         }
-        let scopeDescription = this.getScopeApi().getScopeDescription(alertDefinition.Scope);
+        let scopeDescription = this.getColumnScopeApi().getScopeDescription(alertDefinition.Scope);
         let ruleDescription = this.getAlertRuleDescription(alertDefinition);
         return scopeDescription + ' - ' + ruleDescription;
     }
@@ -299,7 +294,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
         var _a, _b, _c, _d;
         let ruleDescription = ((_b = (_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length)
             ? (_d = (_c = alertDefinition.Rule) === null || _c === void 0 ? void 0 : _c.Predicates) === null || _d === void 0 ? void 0 : _d.map((predicate) => this.getPredicateApi().predicateToString(predicate)).join(' AND ')
-            : this.adaptable.api.internalApi.getAdaptableQueryExpressionText(alertDefinition.Rule);
+            : this.getAdaptableApi().internalApi.getAdaptableQueryExpressionText(alertDefinition.Rule);
         return ruleDescription;
     }
     /**
@@ -424,7 +419,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
     getAlertDefinitionsForCellDataChange(dataChangedEvent) {
         const allActiveNonReactiveDefinitions = this.getActiveNonReactiveAlertDefinitions();
         let relatedAlertDefinitions = allActiveNonReactiveDefinitions
-            .filter((v) => this.getAdaptableApi().scopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
+            .filter((v) => this.getAdaptableApi().columnScopeApi.isColumnInScope(dataChangedEvent.column, v.Scope))
             .filter((alertDefinition) => !(0, AdaptableQuery_1.isReactiveQuery)(alertDefinition.Rule));
         let triggeredAlerts = [];
         if (ArrayExtensions_1.default.IsNotNullOrEmpty(relatedAlertDefinitions)) {
@@ -476,17 +471,9 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
     isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
         var _a;
         const adapatableApi = this.getAdaptableApi();
-        const predicateDefHandlerContext = {
-            value: dataChangedEvent.newValue,
-            oldValue: dataChangedEvent.oldValue,
+        const predicateDefHandlerContext = Object.assign({ value: dataChangedEvent.newValue, oldValue: dataChangedEvent.oldValue, 
             // TODO send real display value
-            displayValue: null,
-            node: dataChangedEvent.rowNode,
-            column: dataChangedEvent.column,
-            adaptableApi: adapatableApi,
-            userName: adapatableApi.optionsApi.getUserName(),
-            adaptableId: adapatableApi.optionsApi.getAdaptableId(),
-        };
+            displayValue: null, node: dataChangedEvent.rowNode, column: dataChangedEvent.column }, this.getAdaptableApi().internalApi.buildBaseContext());
         return this.getAdaptableApi().predicateApi.handleColumnPredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, defaultNoPredicateReturn);
     }
     isAlertDefinitionForRowChangeEvent(alertDefinition) {

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -32,7 +32,7 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
         this.getCalculatedColumnApi()
             .getCalculatedColumns()
             .forEach((calculatedColumn) => {
-            if (this.getExpressionApi().internalApi.isColumnReferencedInExpression(columnId, this.adaptable.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query))) {
+            if (this.getExpressionApi().internalApi.isColumnReferencedInExpression(columnId, this.getAdaptableApi().expressionApi.getAdaptableQueryExpression(calculatedColumn.Query))) {
                 calcColumns.push(calculatedColumn);
             }
         });
@@ -43,7 +43,7 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
      * @param calculatedColumn Calculated Column to check
      */
     getReferencedColumnIdsForCalculatedColumn(calculatedColumn) {
-        const columnIds = this.adaptable.api.expressionApi.getColumnsFromExpression(this.adaptable.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query));
+        const columnIds = this.getAdaptableApi().expressionApi.getColumnsFromExpression(this.getAdaptableApi().expressionApi.getAdaptableQueryExpression(calculatedColumn.Query));
         return columnIds;
     }
     /**
@@ -51,15 +51,15 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
      * @param calculatedColumnId CalculatedColumnId to check
      */
     getReferencedColumnIdsForCalculatedColumnId(calculatedColumnId) {
-        const calculatedColumn = this.adaptable.api.calculatedColumnApi
-            .getCalculatedColumns()
+        const calculatedColumn = this.getAdaptableApi()
+            .calculatedColumnApi.getCalculatedColumns()
             .find((cc) => cc.ColumnId == calculatedColumnId);
         if (calculatedColumn) {
             return this.getReferencedColumnIdsForCalculatedColumn(calculatedColumn);
         }
     }
     getCalculatedColumnsDependentOnColumn(column) {
-        const calculatedColumns = this.adaptable.api.calculatedColumnApi.getCalculatedColumns();
+        const calculatedColumns = this.getAdaptableApi().calculatedColumnApi.getCalculatedColumns();
         return calculatedColumns
             .filter((calculatedColumn) => {
             const dependentColumns = this.getReferencedColumnIdsForCalculatedColumnId(calculatedColumn.ColumnId);
@@ -85,18 +85,12 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
     }
     fireCalculatedColumnChangedEvent(trigger, calculatedColumn) {
         const adaptableApi = this.getAdaptableApi();
-        const calculatedColumnChangedInfo = {
-            adaptableApi: adaptableApi,
-            actionName: trigger,
-            calculatedColumn: calculatedColumn,
-            calculatedColumnExpressionAST: adaptableApi.expressionApi.getASTForExpression(this.getExpressionFromCalculatedColumn(calculatedColumn)),
-            userName: adaptableApi.optionsApi.getUserName(),
-            adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-        };
-        this.adaptable.api.eventApi.emit('CalculatedColumnChanged', calculatedColumnChangedInfo);
+        const calculatedColumnChangedInfo = Object.assign({ actionName: trigger, calculatedColumn: calculatedColumn, calculatedColumnExpressionAST: adaptableApi.expressionApi.getASTForExpression(this.getExpressionFromCalculatedColumn(calculatedColumn)) }, this.getAdaptableApi().internalApi.buildBaseContext());
+        this.getAdaptableApi().eventApi.emit('CalculatedColumnChanged', calculatedColumnChangedInfo);
     }
     getColDefsForCalculatedColumns() {
-        const defaultCalculatedColumnSettings = (0, ObjectFactory_1.CreateEmptyCalculatedColumn)().CalculatedColumnSettings;
+        const defaultSpecialColumnSettings = this.getGridApi().internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef();
+        const defaultCalculatedColumnSettings = (0, ObjectFactory_1.CreateEmptyCalculatedColumn)(defaultSpecialColumnSettings).CalculatedColumnSettings;
         return this.getCalculatedColumnApi()
             .getCalculatedColumns()
             .map((calculatedColumn) => {
@@ -133,7 +127,7 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
                     ? calculatedColumn.FriendlyName
                     : calculatedColumn.ColumnId,
                 colId: calculatedColumn.ColumnId,
-                hide: true,
+                hide: false,
                 editable: false,
                 width: calculatedColumnSettings.Width,
                 enableValue: calculatedColumnSettings.Aggregatable,
@@ -143,7 +137,7 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
                 enableRowGroup: calculatedColumnSettings.Groupable,
                 sortable: calculatedColumnSettings.Sortable,
                 enablePivot: calculatedColumnSettings.Pivotable,
-                suppressMenu: calculatedColumnSettings.SuppressMenu,
+                suppressHeaderMenuButton: calculatedColumnSettings.SuppressMenu,
                 suppressMovable: calculatedColumnSettings.SuppressMovable,
                 type: columnTypes,
                 valueGetter,

package/src/Api/Internal/ChartingInternalApi.js

@@ -16,53 +16,53 @@ class ChartingInternalApi extends ApiBase_1.ApiBase {
     }
     getContainerElemetnByName(containerName) {
         var _a, _b, _c;
-        const chartContainers = (_c = (_b = (_a = this.adaptable.api.optionsApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.chartingOptions) === null || _b === void 0 ? void 0 : _b.chartContainers) !== null && _c !== void 0 ? _c : [];
+        const chartContainers = (_c = (_b = (_a = this.getAdaptableApi().optionsApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.chartingOptions) === null || _b === void 0 ? void 0 : _b.chartContainers) !== null && _c !== void 0 ? _c : [];
         const chartContainer = chartContainers.find((container) => container.name === containerName);
         return this.getContainerElement(chartContainer);
     }
     getUniqueChartName() {
-        const charts = this.adaptable.api.chartingApi.getChartDefinitions();
-        const externalCharts = this.adaptable.api.chartingApi.getExternalChartDefinitions();
+        const charts = this.getAdaptableApi().chartingApi.getChartDefinitions();
+        const externalCharts = this.getAdaptableApi().chartingApi.getExternalChartDefinitions();
         return `Chart ${charts.length + externalCharts.length + 1}`;
     }
     // External lib charting service
     isExternalChartOpened(chartDefinition) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.isChartOpened)) {
             return false;
         }
         if (!chartDefinition) {
             return false;
         }
-        return externalChartingOptions.isChartOpened(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        return externalChartingOptions.isChartOpened(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())));
     }
     onHideExternalChart(chartDefinition) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onHideChart)) {
             return;
         }
-        externalChartingOptions.onHideChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        externalChartingOptions.onHideChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())));
     }
     onShowExternalChart(chartDefinition, container) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onShowChart)) {
             return;
         }
-        externalChartingOptions.onShowChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        externalChartingOptions.onShowChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())));
     }
     onPreviewExternalChart(chartDefinition, container) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onPreviewChart)) {
             return;
         }
-        return externalChartingOptions.onPreviewChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        return externalChartingOptions.onPreviewChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())));
     }
     onDeleteExternalChart(chartDefinition) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        const externalChartingOptions = this.getAdaptableApi().optionsApi.getChartingOptions().externalChartingOptions;
         if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onDeleteChart)) {
             return;
         }
-        externalChartingOptions.onDeleteChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        externalChartingOptions.onDeleteChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())));
     }
 }
 exports.ChartingInternalApi = ChartingInternalApi;

package/src/Api/Internal/ColumnFilterInternalApi.d.ts

@@ -49,6 +49,7 @@ export declare class ColumnFilterInternalApi extends ApiBase {
      * Fires Column Filter Applied Event - typically used to enable filtering on the server
      */
     fireColumnFilterAppliedEvent(): void;
+    fireGridFilterAppliedEvent(): void;
     /**
      * Compares to sets of Column Filters to see if they are identical
      * @param filters1

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -47,7 +47,7 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
         const filter = {
             ColumnId: column.columnId,
             Predicate: {
-                PredicateId: this.adaptable.api.predicateApi.internalApi.getEqualityPredicateForDataType(column.dataType),
+                PredicateId: this.getAdaptableApi().predicateApi.internalApi.getEqualityPredicateForDataType(column.dataType),
                 Inputs: [...new Set([gridCell.rawValue])],
             },
         };
@@ -59,11 +59,11 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
      * @param columnFilter Column Filter to use
      */
     columnFilterToString(columnFilter) {
-        const friendlyName = this.adaptable.api.columnApi.getFriendlyNameForColumnId(columnFilter.ColumnId);
+        const friendlyName = this.getAdaptableApi().columnApi.getFriendlyNameForColumnId(columnFilter.ColumnId);
         return ('[' +
             friendlyName +
             '] ' +
-            this.adaptable.api.predicateApi.predicateToString(columnFilter.Predicate));
+            this.getAdaptableApi().predicateApi.predicateToString(columnFilter.Predicate));
     }
     /**
      * Retrieves descriptions of given Column Filters
@@ -103,17 +103,9 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
             return true;
         }
         let value = gridCell.normalisedValue;
-        const predicateDefHandlerContext = {
-            value: value,
-            oldValue: null,
-            displayValue: gridCell.displayValue,
-            node,
-            column,
-            adaptableApi: this.getAdaptableApi(),
-            userName: this.getAdaptableApi().optionsApi.getUserName(),
-            adaptableId: this.getAdaptableApi().optionsApi.getAdaptableId(),
-        };
-        return this.adaptable.api.predicateApi.handlePredicate(columnFilter.Predicate, predicateDefHandlerContext, true);
+        const predicateDefHandlerContext = Object.assign({ value: value, oldValue: null, displayValue: gridCell.displayValue, node,
+            column }, this.getAdaptableApi().internalApi.buildBaseContext());
+        return this.getAdaptableApi().predicateApi.handlePredicate(columnFilter.Predicate, predicateDefHandlerContext, true);
     }
     /**
      * Checks if the filter action should trigger Column Filtering
@@ -132,32 +124,32 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
         // filter -> suspend changes
         var _a, _b;
         const isNewAndActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_ADD &&
-            this.adaptable.api.columnFilterApi.isColumnFilterActive(action.columnFilter);
+            this.getAdaptableApi().columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isClearAndPreviousWasActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR &&
-            this.adaptable.api.columnFilterApi.isColumnFilterActive(action.columnFilter);
+            this.getAdaptableApi().columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isClearAllAtLeastOneActiveFilter = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL &&
-            this.adaptable.api.columnFilterApi
-                .getColumnFilters()
-                .some((columnFilter) => this.adaptable.api.columnFilterApi.isColumnFilterActive(columnFilter));
+            this.getAdaptableApi()
+                .columnFilterApi.getColumnFilters()
+                .some((columnFilter) => this.getAdaptableApi().columnFilterApi.isColumnFilterActive(columnFilter));
         let isEditTrigger = false;
         if (action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT) {
             const newFilter = action.columnFilter;
-            const previous = this.adaptable.api.columnFilterApi.getColumnFilterForColumn(newFilter.ColumnId);
+            const previous = this.getAdaptableApi().columnFilterApi.getColumnFilterForColumn(newFilter.ColumnId);
             // same filter edit, so always trigger
             if (((_a = previous === null || previous === void 0 ? void 0 : previous.Predicate) === null || _a === void 0 ? void 0 : _a.PredicateId) === ((_b = newFilter === null || newFilter === void 0 ? void 0 : newFilter.Predicate) === null || _b === void 0 ? void 0 : _b.PredicateId)) {
                 isEditTrigger = true;
                 // new filter is active
             }
-            else if (this.adaptable.api.columnFilterApi.isColumnFilterActive(newFilter)) {
+            else if (this.getAdaptableApi().columnFilterApi.isColumnFilterActive(newFilter)) {
                 isEditTrigger = true;
             }
-            else if (this.adaptable.api.columnFilterApi.isColumnFilterActive(previous)) {
+            else if (this.getAdaptableApi().columnFilterApi.isColumnFilterActive(previous)) {
                 // previous filter was active
                 isEditTrigger = true;
             }
         }
         const isSetAndActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_SET &&
-            this.adaptable.api.columnFilterApi.isColumnFilterActive(action.columnFilter);
+            this.getAdaptableApi().columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isSuspendChanged = [
             LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND,
             LayoutRedux.LAYOUT_COLUMN_FILTER_SUSPEND_ALL,
@@ -177,13 +169,15 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
     fireColumnFilterAppliedEvent() {
         if (this.adaptable.isReady) {
             const adaptableApi = this.getAdaptableApi();
-            const columnFilterAppliedInfo = {
-                columnFilters: this.getColumnFilterApi().getColumnFilters(),
-                adaptableApi: adaptableApi,
-                userName: adaptableApi.optionsApi.getUserName(),
-                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-            };
-            this.adaptable.api.eventApi.emit('ColumnFilterApplied', columnFilterAppliedInfo);
+            const columnFilterAppliedInfo = Object.assign({ columnFilters: this.getColumnFilterApi().getColumnFilters() }, this.getAdaptableApi().internalApi.buildBaseContext());
+            this.getAdaptableApi().eventApi.emit('ColumnFilterApplied', columnFilterAppliedInfo);
+        }
+    }
+    fireGridFilterAppliedEvent() {
+        if (this.adaptable.isReady) {
+            const adaptableApi = this.getAdaptableApi();
+            const gridFilterAppliedInfo = Object.assign({ columnFilters: this.getColumnFilterApi().getColumnFilters() }, this.getAdaptableApi().internalApi.buildBaseContext());
+            this.getAdaptableApi().eventApi.emit('GridFilterApplied', gridFilterAppliedInfo);
         }
     }
     /**

package/src/Api/Internal/ColumnInternalApi.d.ts

@@ -2,6 +2,7 @@ import { ApiBase } from '../Implementation/ApiBase';
 import { Column, IRowNode } from '@ag-grid-community/core';
 import { CustomSort } from '../../PredefinedConfig/CustomSortState';
 import { ColumnValuesComparer } from '../../AdaptableOptions/CustomSortOptions';
+export declare function getAutoRowGroupColumnIdFor(columnId: string): string;
 export declare class ColumnInternalApi extends ApiBase {
     /**
      * Retrieves 'ColumnType' property for a given Column
@@ -15,6 +16,7 @@ export declare class ColumnInternalApi extends ApiBase {
      * Retrieves a list providing the Friendly Name / Caption for all columns
      */
     getAllColumnFriendlyNames(): string[];
+    getAutoRowGroupColumnIdFor(columnId: string): string;
     /**
      * Retrieves AG Grid's field property for the column
      * @param columnId columnId to look up

package/src/Api/Internal/ColumnInternalApi.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ColumnInternalApi = void 0;
+exports.ColumnInternalApi = exports.getAutoRowGroupColumnIdFor = void 0;
 const ApiBase_1 = require("../Implementation/ApiBase");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
+function getAutoRowGroupColumnIdFor(columnId) {
+    return `${GeneralConstants_1.AG_GRID_GROUPED_COLUMN}-${columnId}`;
+}
+exports.getAutoRowGroupColumnIdFor = getAutoRowGroupColumnIdFor;
 class ColumnInternalApi extends ApiBase_1.ApiBase {
     /**
      * Retrieves 'ColumnType' property for a given Column
@@ -24,6 +28,9 @@ class ColumnInternalApi extends ApiBase_1.ApiBase {
             return c.friendlyName;
         });
     }
+    getAutoRowGroupColumnIdFor(columnId) {
+        return getAutoRowGroupColumnIdFor(columnId);
+    }
     /**
      * Retrieves AG Grid's field property for the column
      * @param columnId columnId to look up

package/src/Api/Internal/CommentsInternalApi.d.ts

@@ -0,0 +1,4 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export declare class CommentsInternalApi extends ApiBase {
+    areCommentsSupported(): boolean;
+}

package/src/Api/Internal/CommentsInternalApi.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommentsInternalApi = void 0;
+const ApiBase_1 = require("../Implementation/ApiBase");
+class CommentsInternalApi extends ApiBase_1.ApiBase {
+    areCommentsSupported() {
+        var _a;
+        const currentLayout = this.getLayoutApi().getCurrentLayout();
+        if (currentLayout.EnablePivot) {
+            return false;
+        }
+        if ((_a = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.RowGroupedColumns) === null || _a === void 0 ? void 0 : _a.length) {
+            return false;
+        }
+        return true;
+    }
+}
+exports.CommentsInternalApi = CommentsInternalApi;

package/src/Api/Internal/CustomSortInternalApi.js

@@ -6,7 +6,7 @@ class CustomSortInternalApi extends ApiBase_1.ApiBase {
     getCustomSortComparer(columnId) {
         var _a;
         const column = this.getColumnApi().getColumnWithColumnId(columnId);
-        return (_a = this.getCustomSortOptions().customSortComparers) === null || _a === void 0 ? void 0 : _a.find((csc) => this.adaptable.api.scopeApi.isColumnInScope(column, csc.scope));
+        return (_a = this.getCustomSortOptions().customSortComparers) === null || _a === void 0 ? void 0 : _a.find((csc) => this.getAdaptableApi().columnScopeApi.isColumnInScope(column, csc.scope));
     }
     getDefaultCustomSortComparer(columnId, columnValues) {
         // have to return a function that may not have access to this

package/src/Api/Internal/DashboardInternalApi.js

@@ -30,18 +30,12 @@ class DashboardInternalApi extends ApiBase_1.ApiBase {
             }
             return visibleInOldState && !visibleInNewState;
         };
-        const dashboardChangedInfo = {
-            adaptableApi: this.adaptable.api,
-            actionName: trigger,
-            oldDashboardState,
+        const dashboardChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { actionName: trigger, oldDashboardState,
             newDashboardState,
             isToolbarStateChangedToVisible,
-            isToolbarStateChangedToHidden,
-            userName: this.adaptable.api.optionsApi.getUserName(),
-            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-        };
+            isToolbarStateChangedToHidden });
         if (!(0, isEqual_1.default)(oldDashboardState, newDashboardState)) {
-            setTimeout(() => this.adaptable.api.eventApi.emit('DashboardChanged', dashboardChangedInfo));
+            setTimeout(() => this.getAdaptableApi().eventApi.emit('DashboardChanged', dashboardChangedInfo));
         }
     }
     isToolbarInActiveTab(toolbarName, dashboardState) {
@@ -61,8 +55,8 @@ class DashboardInternalApi extends ApiBase_1.ApiBase {
         return false;
     }
     isToolbarCustom(toolbarName) {
-        return this.adaptable.api.dashboardApi
-            .getCustomToolbars()
+        return this.getAdaptableApi()
+            .dashboardApi.getCustomToolbars()
             .some((tb) => tb.name === toolbarName);
     }
     getCustomToolbarRenderContainerId(customToolbarName) {

package/src/Api/Internal/DataImportInternalApi.js

@@ -56,16 +56,10 @@ class DataImportInternalApi extends ApiBase_1.ApiBase {
      * @param gridDataRows Rows that were imported
      */
     publishDataImportedEvent(importData, addedRows, updatedRows) {
-        const adaptableApi = this.getAdaptableApi();
-        const dataImportedInfo = {
-            adaptableApi: adaptableApi,
-            importData,
+        const dataImportedInfo = Object.assign({ importData,
             addedRows,
-            updatedRows,
-            userName: adaptableApi.optionsApi.getUserName(),
-            adaptableId: adaptableApi.optionsApi.getAdaptableId(),
-        };
-        this.adaptable.api.internalApi.dispatchReduxAction(SystemRedux.DataImportCompleted(dataImportedInfo));
+            updatedRows }, this.getAdaptableApi().internalApi.buildBaseContext());
+        this.getAdaptableApi().internalApi.dispatchReduxAction(SystemRedux.DataImportCompleted(dataImportedInfo));
         this.getEventApi().emit('DataImported', dataImportedInfo);
     }
 }

package/src/Api/Internal/DataSetInternalApi.js

@@ -9,13 +9,8 @@ class DataSetInternalApi extends ApiBase_1.ApiBase {
      */
     fireDataSetSelectedEvent(dataSet) {
         if (this.adaptable.isReady) {
-            const dataSetSelectedInfo = {
-                adaptableApi: this.adaptable.api,
-                dataSet,
-                userName: this.adaptable.api.optionsApi.getUserName(),
-                adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-            };
-            this.adaptable.api.eventApi.emit('DataSetSelected', dataSetSelectedInfo);
+            const dataSetSelectedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { dataSet });
+            this.getAdaptableApi().eventApi.emit('DataSetSelected', dataSetSelectedInfo);
         }
     }
 }