@adaptabletools/adaptable 15.4.2 → 16.0.0-canary.0

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserInterfaceApiImpl = void 0;
 const ApiBase_1 = require("./ApiBase");
 const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
     getColorPalette() {
         let colorPalette = this.getUserInterfaceOptions().colorPalette;
@@ -24,10 +23,6 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
     getStyleClassNames() {
         return this.getUserInterfaceOptions().styleClassNames;
     }
-    getAllPermittedValuesItems() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'UserInterfaceApi', 'getAllPermittedValuesItems', 'getPermittedValuesItems');
-        return this.getPermittedValuesItems();
-    }
     getPermittedValuesItems() {
         var _a, _b;
         return (_b = (_a = this.getUserInterfaceOptions()) === null || _a === void 0 ? void 0 : _a.permittedValues) !== null && _b !== void 0 ? _b : [];
@@ -76,6 +71,8 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
             if (column) {
                 const permittedValuesParams = {
                     adaptableApi: this.getAdaptableApi(),
+                    userName: this.getOptions().userName,
+                    adaptableId: this.getOptions().adaptableId,
                     column: column,
                 };
                 return permittedValues(permittedValuesParams);
@@ -122,10 +119,6 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         }
         return this.getPermittedValuesForScope(column, allFilterPermittedValuesItems);
     }
-    getAllEditLookUpItems() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'UserInterfaceApi', 'getAllEditLookUpItems', 'getEditLookUpItems');
-        return this.getEditLookUpItems();
-    }
     getEditLookUpItems() {
         return this.getUserInterfaceOptions().editLookUpItems || [];
     }
@@ -162,7 +155,11 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
     getAdaptableObjectTags() {
         const objectTags = this.getUserInterfaceOptions().objectTags;
         if (objectTags != null && typeof objectTags === 'function') {
-            return objectTags({ adaptableApi: this.adaptable.api });
+            return objectTags({
+                adaptableApi: this.adaptable.api,
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
+            });
         }
         else {
             let arr = objectTags;
@@ -171,5 +168,15 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
             }
         }
     }
+    getCustomIconDefinition(iconName) {
+        var _a, _b;
+        let customIcon = undefined;
+        const customIcons = (_b = (_a = this.getAdaptableApi().optionsApi.getAdaptableOptions().userInterfaceOptions) === null || _a === void 0 ? void 0 : _a.customIcons) !== null && _b !== void 0 ? _b : [];
+        customIcon = customIcons.find((icon) => icon.name === iconName);
+        if (customIcon) {
+            return customIcon.icon;
+        }
+        return customIcon;
+    }
 }
 exports.UserInterfaceApiImpl = UserInterfaceApiImpl;

package/src/Api/Internal/{ActionInternalApi.d.ts → ActionRowInternalApi.d.ts}

@@ -1,8 +1,8 @@
 import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
-import { CreateActionRowFormContext, EditActionRowFormContext } from '../../AdaptableOptions/ActionOptions';
+import { CreateActionRowFormContext, EditActionRowFormContext } from '../../AdaptableOptions/ActionRowOptions';
 import { ApiBase } from '../Implementation/ApiBase';
-export declare class ActionInternalApi extends ApiBase {
+export declare class ActionRowInternalApi extends ApiBase {
     buildRowEditForm(rowNode: IRowNode): AdaptableForm<EditActionRowFormContext>;
     buildRowCreateForm(clonedRowNode?: IRowNode): AdaptableForm<CreateActionRowFormContext>;
     private get actionRowFormOptions();

package/src/Api/Internal/{ActionInternalApi.js → ActionRowInternalApi.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionInternalApi = void 0;
+exports.ActionRowInternalApi = void 0;
 const ApiBase_1 = require("../Implementation/ApiBase");
-class ActionInternalApi extends ApiBase_1.ApiBase {
+class ActionRowInternalApi extends ApiBase_1.ApiBase {
     buildRowEditForm(rowNode) {
         return this.buildActionRow('rowEdited', rowNode);
     }
@@ -10,8 +10,7 @@ class ActionInternalApi extends ApiBase_1.ApiBase {
         return this.buildActionRow('rowCreated', clonedRowNode);
     }
     get actionRowFormOptions() {
-        var _a;
-        return (_a = this.getActionOptions().actionRowButtonOptions) === null || _a === void 0 ? void 0 : _a.actionRowFormOptions;
+        return this.getActionRowOptions().actionRowFormOptions;
     }
     get adaptableInstance() {
         return this.getAdaptableApi().internalApi.getAdaptableInstance();
@@ -46,6 +45,8 @@ class ActionInternalApi extends ApiBase_1.ApiBase {
         return {
             rowNode,
             adaptableApi: this.getAdaptableApi(),
+            userName: this.getOptions().userName,
+            adaptableId: this.getOptions().adaptableId,
             type: type,
         };
     }
@@ -85,6 +86,8 @@ class ActionInternalApi extends ApiBase_1.ApiBase {
                         type: 'rowCreated',
                         formData: context.formData,
                         adaptableApi: context.adaptableApi,
+                        userName: this.getOptions().userName,
+                        adaptableId: this.getOptions().adaptableId,
                         clonedRowNode: rowNode,
                     }
                     : {
@@ -92,6 +95,8 @@ class ActionInternalApi extends ApiBase_1.ApiBase {
                         formData: context.formData,
                         rowNode: rowNode,
                         adaptableApi: context.adaptableApi,
+                        userName: this.getOptions().userName,
+                        adaptableId: this.getOptions().adaptableId,
                     };
                 this.getAdaptableApi().eventApi.emit('ActionRowSubmitted', eventInfo);
                 (_b = (_a = this.actionRowFormOptions) === null || _a === void 0 ? void 0 : _a.onFormSubmit) === null || _b === void 0 ? void 0 : _b.call(_a, eventInfo);
@@ -136,6 +141,8 @@ class ActionInternalApi extends ApiBase_1.ApiBase {
             rowNode,
             column,
             adaptableApi: this.getAdaptableApi(),
+            userName: this.getOptions().userName,
+            adaptableId: this.getOptions().adaptableId,
             type: type,
         };
     }
@@ -167,4 +174,4 @@ class ActionInternalApi extends ApiBase_1.ApiBase {
         }));
     }
 }
-exports.ActionInternalApi = ActionInternalApi;
+exports.ActionRowInternalApi = ActionRowInternalApi;

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

@@ -7,7 +7,7 @@ import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableMenuItem } from '../../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { AdaptableIcon, AdaptableObjectLookupCriteria, AdaptableOptions, AdaptableQuery, AdaptableState, BaseContext } from '../../types';
+import { AdaptableIcon, AdaptableObjectLookupCriteria, AdaptableQuery, AdaptableState, BaseContext } from '../../types';
 import { IValidationService } from '../../Utilities/Services/Interface/IValidationService';
 import { IModuleService } from '../../Utilities/Services/Interface/IModuleService';
 import { IReportService } from '../../Utilities/Services/Interface/IReportService';
@@ -52,18 +52,9 @@ export declare class AdaptableInternalApi extends ApiBase {
     isGridInTreeMode(): boolean;
     getToolbarTitle(): string;
     buildDataChangedInfo(config: Pick<CellDataChangedInfo, 'newValue' | 'oldValue' | 'column' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): CellDataChangedInfo;
-    /**
-     * @deprecated use `OptionsApi.getPrimaryKey()`
-     */
-    getPrimaryKey(): any;
     getAdaptableInstance(): IAdaptable;
-    getAgGridInstance(): any;
     getPredefinedConfig(): any;
     getState(): AdaptableState;
-    /**
-     * @deprecated use OptionsApi.getAdaptableOptions()
-     */
-    getAdaptableOptions(): AdaptableOptions;
     getValidationService(): IValidationService;
     getModuleService(): IModuleService;
     getDataService(): IDataService;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -79,30 +79,15 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         var _a;
         return Object.assign(Object.assign({}, config), { rowData: (_a = config.rowNode) === null || _a === void 0 ? void 0 : _a.data, changedAt: Date.now() });
     }
-    /**
-     * @deprecated use `OptionsApi.getPrimaryKey()`
-     */
-    getPrimaryKey() {
-        return this.adaptable.adaptableOptions.primaryKey;
-    }
     getAdaptableInstance() {
         return this.adaptable;
     }
-    getAgGridInstance() {
-        return this.adaptable.adaptableOptions.gridOptions;
-    }
     getPredefinedConfig() {
         return this.adaptable.adaptableOptions.predefinedConfig;
     }
     getState() {
         return this.getAdaptableState();
     }
-    /**
-     * @deprecated use OptionsApi.getAdaptableOptions()
-     */
-    getAdaptableOptions() {
-        return this.getOptions();
-    }
     getValidationService() {
         return this.adaptable.ValidationService;
     }
@@ -286,7 +271,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     }
     getCorrectEnglishVariant(wordToSpell) {
         if (wordToSpell.includes('our')) {
-            return this.getGeneralOptions().englishVariant == 'GB'
+            return this.getUserInterfaceOptions().englishVariant == 'GB'
                 ? wordToSpell
                 : wordToSpell.replace('our', 'or');
         }
@@ -315,6 +300,8 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
             return this.adaptable.adaptableOptions.userInterfaceOptions
                 .objectTags({
                 adaptableApi: this.adaptable.api,
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
             })
                 .filter((tag) => typeof tag === 'string');
         }
@@ -336,6 +323,8 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
                 layouts: this.adaptable.api.layoutApi.getLayouts(),
                 objectTags: this.getAdaptableApi().userInterfaceApi.getAdaptableObjectTags(),
                 adaptableApi: this.adaptable.api,
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
             };
             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
@@ -359,14 +348,14 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         return adaptableObjectTag;
     }
     getAdaptableQueryExpressionText(query) {
-        var _a;
+        var _a, _b;
         if (!query) {
             return '';
         }
-        const displayColumnFriendlyNames = (_a = this.adaptable.adaptableOptions.adaptableQLOptions) === null || _a === void 0 ? void 0 : _a.displayColumnFriendlyNamesForExpressions;
+        const displayColumnFriendlyNames = (_b = (_a = this.adaptable.adaptableOptions.adaptableQLOptions) === null || _a === void 0 ? void 0 : _a.expressionOptions) === null || _b === void 0 ? void 0 : _b.displayColumnFriendlyNamesForExpressions;
         return displayColumnFriendlyNames
-            ? this.adaptable.api.queryLanguageApi.getAdaptableQueryExpressionWithColumnFriendlyNames(query)
-            : this.adaptable.api.queryLanguageApi.getAdaptableQueryExpression(query);
+            ? this.adaptable.api.expressionApi.getAdaptableQueryExpressionWithColumnFriendlyNames(query)
+            : this.adaptable.api.expressionApi.getAdaptableQueryExpression(query);
     }
     deleteConditionalStyles(conditionalStyles) {
         conditionalStyles.forEach((cs) => {

package/src/Api/Internal/AlertInternalApi.js

@@ -82,9 +82,12 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
      * @param alertToFire Alerts which has just triggered
      */
     publishAlertFiredEvent(alertToFire) {
+        const adaptableApi = this.getAdaptableApi();
         const alertFiredInfo = {
-            adaptableApi: this.getAdaptableApi(),
+            adaptableApi: adaptableApi,
             alert: alertToFire,
+            userName: adaptableApi.optionsApi.getUserName(),
+            adaptableId: adaptableApi.optionsApi.getAdaptableId(),
         };
         this.getEventApi().emit('AlertFired', alertFiredInfo);
     }
@@ -431,7 +434,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
                     if (!rowNode) {
                         rowNode = this.getAdaptableApi().gridApi.getRowNodeForPrimaryKey(dataChangedEvent.primaryKeyValue);
                     }
-                    const isValidExpression = this.getAdaptableApi().queryLanguageApi.isValidBooleanExpression(expression, 'Alert', `Invalid Alert boolean expression '${expression}'`);
+                    const isValidExpression = this.getAdaptableApi().expressionApi.isValidBooleanExpression(expression, 'Alert', `Invalid Alert boolean expression '${expression}'`);
                     const isSatisfiedExpression = isValidExpression &&
                         this.getAdaptableApi()
                             .internalApi.getQueryLanguageService()
@@ -441,7 +444,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
                     }
                 }
                 else if (alertDefinition.Rule.AggregatedBooleanExpression) {
-                    const isValidExpression = this.getAdaptableApi().queryLanguageApi.isValidAggregatedBooleanExpression(alertDefinition.Rule.AggregatedBooleanExpression, 'Alert', `Invalid Alert boolean expression '${alertDefinition.Rule.AggregatedBooleanExpression}'`);
+                    const isValidExpression = this.getAdaptableApi().expressionApi.isValidAggregatedBooleanExpression(alertDefinition.Rule.AggregatedBooleanExpression, 'Alert', `Invalid Alert boolean expression '${alertDefinition.Rule.AggregatedBooleanExpression}'`);
                     const isSatisfiedExpression = isValidExpression &&
                         this.isAggregationAlertTriggered(alertDefinition, dataChangedEvent);
                     if (isSatisfiedExpression) {
@@ -460,7 +463,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
     }
     isAggregationAlertTriggered(alertDefinition, dataChangedEvent) {
         const changedColumn = dataChangedEvent.column.columnId;
-        const aggregationColumns = this.getAdaptableApi().queryLanguageApi.getColumnsFromExpression(alertDefinition.Rule.AggregatedBooleanExpression);
+        const aggregationColumns = this.getAdaptableApi().expressionApi.getColumnsFromExpression(alertDefinition.Rule.AggregatedBooleanExpression);
         if (!aggregationColumns.includes(changedColumn)) {
             return false;
         }
@@ -496,11 +499,11 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
         const rule = alertDefinition.Rule;
         if (rule) {
             if (rule.Predicates) {
-                return this.getAdaptableApi().queryLanguageApi.internalApi.evaluatePredicatesInAdaptableQL('Alert', alertDefinition, alertDefinition.Rule.Predicates);
+                return this.getAdaptableApi().expressionApi.internalApi.evaluatePredicatesInAdaptableQL('Alert', alertDefinition, alertDefinition.Rule.Predicates);
             }
             else {
                 var expression = this.getExpressionForAlertRule(rule);
-                return this.getAdaptableApi().queryLanguageApi.internalApi.evaluateExpressionInAdaptableQL('Alert', alertDefinition, expression);
+                return this.getAdaptableApi().expressionApi.internalApi.evaluateExpressionInAdaptableQL('Alert', alertDefinition, expression);
             }
         }
         return true;

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -27,7 +27,7 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
         this.getCalculatedColumnApi()
             .getCalculatedColumns()
             .forEach((calculatedColumn) => {
-            if (this.getQueryLanguageApi().internalApi.isColumnReferencedInExpression(columnId, this.adaptable.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query))) {
+            if (this.getExpressionApi().internalApi.isColumnReferencedInExpression(columnId, this.adaptable.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query))) {
                 calcColumns.push(calculatedColumn);
             }
         });
@@ -38,7 +38,7 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
      * @param calculatedColumn Calculated Column to check
      */
     getReferencedColumnIdsForCalculatedColumn(calculatedColumn) {
-        const columnIds = this.adaptable.api.queryLanguageApi.getColumnsFromExpression(this.adaptable.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query));
+        const columnIds = this.adaptable.api.expressionApi.getColumnsFromExpression(this.adaptable.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query));
         return columnIds;
     }
     /**

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

@@ -1,6 +1,6 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { ColumnValuesComparer } from '../../AdaptableOptions/GeneralOptions';
+import { ColumnValuesComparer } from '../../AdaptableOptions/CustomSortOptions';
 export declare class CustomSortInternalApi extends ApiBase {
     getCustomSortComparer(column: AdaptableColumn): ColumnValuesComparer | undefined;
 }

package/src/Api/Internal/CustomSortInternalApi.js

@@ -5,7 +5,7 @@ const ApiBase_1 = require("../Implementation/ApiBase");
 class CustomSortInternalApi extends ApiBase_1.ApiBase {
     getCustomSortComparer(column) {
         var _a;
-        return (_a = this.getGeneralOptions().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.adaptable.api.scopeApi.isColumnInScope(column, csc.scope));
     }
 }
 exports.CustomSortInternalApi = CustomSortInternalApi;

package/src/Api/Internal/DashboardInternalApi.js

@@ -26,6 +26,8 @@ class DashboardInternalApi extends ApiBase_1.ApiBase {
             newDashboardState,
             isToolbarStateChangedToVisible,
             isToolbarStateChangedToHidden,
+            userName: this.adaptable.api.optionsApi.getUserName(),
+            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
         };
         if (!(0, isEqual_1.default)(oldDashboardState, newDashboardState)) {
             this.adaptable.api.eventApi.emitSync('DashboardChanged', dashboardChangedInfo);

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

@@ -1,5 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-import { DataSet } from '../../AdaptableOptions/GeneralOptions';
+import { DataSet } from '../../AdaptableOptions/DataSetOptions';
 export declare class DataSetInternalApi extends ApiBase {
     /**
      * Fires the DataSet Selected Event

package/src/Api/Internal/DataSetInternalApi.js

@@ -11,7 +11,8 @@ class DataSetInternalApi extends ApiBase_1.ApiBase {
         if (this.adaptable.isLive) {
             const dataSetSelectedInfo = {
                 adaptableApi: this.adaptable.api,
-                dataSet,
+                dataSet, userName: this.adaptable.api.optionsApi.getUserName(),
+                adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
             };
             this.adaptable.api.eventApi.emit('DataSetSelected', dataSetSelectedInfo);
         }

package/src/Api/Internal/ExportInternalApi.js

@@ -14,7 +14,7 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
             return true;
         }
         // if its a Custom Report then the User has to run it so we just ignore completely
-        if (this.getExportApi().isServerReport(report)) {
+        if (this.getExportApi().isExternalReport(report)) {
             return false;
         }
         // Start with the DataChanged Column and go through all possibilities

package/src/Api/Internal/{QueryLanguageInternalApi.d.ts → ExpressionnternalApi.d.ts}

@@ -1,7 +1,7 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { AdaptableQLModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableObject, AdaptablePredicate } from '../../types';
-export declare class QueryLanguageInternalApi extends ApiBase {
+export declare class ExpressionInternalApi extends ApiBase {
     /**
      * Checks if a column is referenced in a given Expression
      * @param columnId Column to Check

package/src/Api/Internal/{QueryLanguageInternalApi.js → ExpressionnternalApi.js}

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryLanguageInternalApi = void 0;
+exports.ExpressionInternalApi = void 0;
 const ApiBase_1 = require("../Implementation/ApiBase");
-class QueryLanguageInternalApi extends ApiBase_1.ApiBase {
+class ExpressionInternalApi extends ApiBase_1.ApiBase {
     /**
      * Checks if a column is referenced in a given Expression
      * @param columnId Column to Check
      * @param expression Expression to Lookup
      */
     isColumnReferencedInExpression(columnId, expression) {
-        const colIds = this.getQueryLanguageApi().getColumnsFromExpression(expression);
+        const colIds = this.getExpressionApi().getColumnsFromExpression(expression);
         return colIds.some((c) => c === columnId);
     }
     evaluateExpressionInAdaptableQL(module, object, expression) {
@@ -20,6 +20,8 @@ class QueryLanguageInternalApi extends ApiBase_1.ApiBase {
         }
         const context = {
             adaptableApi: this.getAdaptableApi(),
+            userName: this.getOptions().userName,
+            adaptableId: this.getOptions().adaptableId,
             module,
         };
         if (object) {
@@ -28,7 +30,7 @@ class QueryLanguageInternalApi extends ApiBase_1.ApiBase {
         if (expression) {
             context.expression = expression;
             context.referencedColumns = this.getAdaptableApi()
-                .queryLanguageApi.getColumnsFromExpression(expression)
+                .expressionApi.getColumnsFromExpression(expression)
                 .map((columnId) => this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId));
         }
         return !evaluateExpressionExternallyFn(context);
@@ -41,6 +43,8 @@ class QueryLanguageInternalApi extends ApiBase_1.ApiBase {
         }
         const context = {
             adaptableApi: this.getAdaptableApi(),
+            userName: this.getAdaptableApi().optionsApi.getUserName(),
+            adaptableId: this.getAdaptableApi().optionsApi.getAdaptableId(),
             module,
         };
         if (object) {
@@ -55,4 +59,4 @@ class QueryLanguageInternalApi extends ApiBase_1.ApiBase {
         return !evaluateExpressionExternallyFn(context);
     }
 }
-exports.QueryLanguageInternalApi = QueryLanguageInternalApi;
+exports.ExpressionInternalApi = ExpressionInternalApi;

package/src/Api/Internal/FilterInternalApi.js

@@ -172,9 +172,12 @@ class FilterInternalApi extends ApiBase_1.ApiBase {
      */
     fireFilterAppliedEvent() {
         if (this.adaptable.isLive) {
+            const adaptableApi = this.getAdaptableApi();
             const filterAppliedInfo = {
                 columnFilters: this.getFilterApi().getColumnFilters(),
-                adaptableApi: this.getAdaptableApi(),
+                adaptableApi: adaptableApi,
+                userName: adaptableApi.optionsApi.getUserName(),
+                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
             };
             this.adaptable.api.eventApi.emit('FilterApplied', filterAppliedInfo);
         }

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -196,7 +196,7 @@ class FormatColumnInternalApi extends ApiBase_1.ApiBase {
         return this.adaptable.api.predicateApi.handleColumnPredicates((_a = formatColumn.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, params, false);
     }
     evaluateExpression(formatColumn, node) {
-        const isValidExpression = this.adaptable.api.queryLanguageApi.isValidBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, `Invalid format column rule '${formatColumn.Rule.BooleanExpression}'`);
+        const isValidExpression = this.adaptable.api.expressionApi.isValidBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, `Invalid format column rule '${formatColumn.Rule.BooleanExpression}'`);
         return (isValidExpression &&
             this.adaptable.api.internalApi
                 .getQueryLanguageService()

package/src/Api/Internal/GridInternalApi.js

@@ -18,6 +18,8 @@ class GridInternalApi extends ApiBase_1.ApiBase {
             const gridSortedInfo = {
                 adaptableSortState: adaptableSortState,
                 adaptableApi: adaptableApi,
+                userName: adaptableApi.optionsApi.getUserName(),
+                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
             };
             adaptableApi.eventApi.emit('GridSorted', gridSortedInfo);
         }
@@ -30,6 +32,8 @@ class GridInternalApi extends ApiBase_1.ApiBase {
             const cellChangedInfo = {
                 adaptableApi: this.adaptable.api,
                 cellChange: cellDataChangedInfo,
+                userName: this.adaptable.api.optionsApi.getUserName(),
+                adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
             };
             this.adaptable.api.eventApi.emit('CellChanged', cellChangedInfo);
         }
@@ -45,6 +49,8 @@ class GridInternalApi extends ApiBase_1.ApiBase {
                 rowTrigger,
                 dataRows,
                 rowNodes,
+                userName: this.adaptable.api.optionsApi.getUserName(),
+                adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
             };
             this.adaptable.api.eventApi.emit('GridDataChanged', gridDataChangedInfo);
         }
@@ -220,6 +226,8 @@ class GridInternalApi extends ApiBase_1.ApiBase {
         if (editLookUpValues != null && typeof editLookUpValues === 'function') {
             const editLookUpContext = {
                 adaptableApi: this.adaptable.api,
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
                 column: column,
                 gridCell,
             };

package/src/Api/Internal/LayoutInternalApi.js

@@ -16,11 +16,14 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
      * @param newState Layout State after change
      */
     fireLayoutChangedEvent(trigger, oldSate, newState, skipEqualityCheck) {
+        const adaptableApi = this.getAdaptableApi();
         const layoutChangedInfo = {
-            adaptableApi: this.getAdaptableApi(),
+            adaptableApi: adaptableApi,
             actionName: trigger,
             oldLayoutState: oldSate,
             newLayoutState: newState,
+            userName: adaptableApi.optionsApi.getUserName(),
+            adaptableId: adaptableApi.optionsApi.getAdaptableId(),
         };
         if (!skipEqualityCheck && (0, isEqual_1.default)(oldSate, newState)) {
             return;
@@ -152,6 +155,8 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
             module,
             layout,
             adaptableApi: this.getAdaptableApi(),
+            userName: this.getOptions().userName,
+            adaptableId: this.getOptions().adaptableId,
         };
         return layoutTagOptions === null || layoutTagOptions === void 0 ? void 0 : layoutTagOptions.isObjectAvailableInLayout(context);
     }

package/src/Api/Internal/PredicateInternalApi.js

@@ -26,6 +26,8 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
         if (typeof systemFilterPredicates === 'function') {
             const systemPredicateContext = {
                 adaptableApi: this.adaptable.api,
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
                 systemPredicateDefs: this.getPredicateApi()
                     .getSystemPredicateDefs()
                     .filter((p) => p.moduleScope.includes('filter')),
@@ -51,6 +53,8 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
         if (typeof systemAlertPredicates === 'function') {
             const systemPredicateContext = {
                 adaptableApi: this.adaptable.api,
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
                 systemPredicateDefs: this.getPredicateApi()
                     .getSystemPredicateDefs()
                     .filter((p) => p.moduleScope.includes('alert')),
@@ -66,6 +70,8 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
         if (typeof systemBadgeStylePredicates === 'function') {
             const systemPredicateContext = {
                 adaptableApi: this.adaptable.api,
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
                 systemPredicateDefs: this.getPredicateApi()
                     .getSystemPredicateDefs()
                     .filter((p) => p.moduleScope.includes('badgeStyle')),
@@ -91,6 +97,8 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
         if (typeof systemFormatColumnPredicates === 'function') {
             const systemPredicateContext = {
                 adaptableApi: this.adaptable.api,
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
                 systemPredicateDefs: this.getPredicateApi()
                     .getSystemPredicateDefs()
                     .filter((p) => p.moduleScope.includes('formatColumn')),
@@ -116,6 +124,8 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
         if (typeof systemFlashingCellPredicates === 'function') {
             const systemPredicateContext = {
                 adaptableApi: this.adaptable.api,
+                userName: this.getOptions().userName,
+                adaptableId: this.getOptions().adaptableId,
                 systemPredicateDefs: this.getPredicateApi()
                     .getSystemPredicateDefs()
                     .filter((p) => p.moduleScope.includes('flashingcell')),

package/src/Api/Internal/QueryInternalApi.js

@@ -45,9 +45,11 @@ class QueryInternalApi extends ApiBase_1.ApiBase {
             const queryRunInfo = {
                 currentQuery,
                 queryAST: currentQuery
-                    ? adaptableApi.queryLanguageApi.getASTForExpression(currentQuery)
+                    ? adaptableApi.expressionApi.getASTForExpression(currentQuery)
                     : null,
                 adaptableApi: adaptableApi,
+                userName: adaptableApi.optionsApi.getUserName(),
+                adaptableId: adaptableApi.optionsApi.getAdaptableId(),
             };
             adaptableApi.eventApi.emit('QueryRun', queryRunInfo);
         }

package/src/Api/Internal/SystemStatusInternalApi.js

@@ -10,9 +10,12 @@ class SystemStatusInternalApi extends ApiBase_1.ApiBase {
      * @param systemStatusMessageInfo Info about new System Status Message
      */
     fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo) {
+        const adaptableApi = this.getAdaptableApi();
         const systemStatusMessageDisplayedInfo = {
-            adaptableApi: this.getAdaptableApi(),
+            adaptableApi,
             systemStatusMessageInfo: systemStatusMessageInfo,
+            userName: adaptableApi.optionsApi.getUserName(),
+            adaptableId: adaptableApi.optionsApi.getAdaptableId(),
         };
         this.getAdaptableApi().eventApi.emit('SystemStatusMessageDisplayed', systemStatusMessageDisplayedInfo);
     }

package/src/Api/Internal/TeamSharingInternalApi.js

@@ -12,6 +12,8 @@ class TeamSharingInternalApi extends ApiBase_1.ApiBase {
             const teamSharingEntityChangedInfo = {
                 adaptableApi: this.adaptable.api,
                 sharedEntity: sharedEntity,
+                userName: this.adaptable.api.optionsApi.getUserName(),
+                adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
             };
             this.getAdaptableApi().eventApi.emit('TeamSharingEntityChanged', teamSharingEntityChangedInfo);
         }