@adaptabletools/adaptable 15.4.3 → 16.0.0-canary.0

package/src/Api/Implementation/SystemStatusApiImpl.js

@@ -11,7 +11,6 @@ const react_1 = require("react");
 const UIHelper_1 = tslib_1.__importDefault(require("../../View/UIHelper"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const SystemStatusInternalApi_1 = require("../Internal/SystemStatusInternalApi");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 class SystemStatusApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -76,17 +75,9 @@ class SystemStatusApiImpl extends ApiBase_1.ApiBase {
     setInfoSystemStatus(statusMessage, statusFurtherInformation) {
         this.setSystemStatus(statusMessage, 'Info', statusFurtherInformation);
     }
-    showSystemStatusPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'SystemStatusApi', 'showSystemStatusPopup', 'openSystemStatusSettingsPanel');
-        this.openSystemStatusSettingsPanel();
-    }
     openSystemStatusSettingsPanel() {
         this.showModulePopup(ModuleConstants.SystemStatusModuleId);
     }
-    fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo) {
-        (0, logDeprecation_1.logDeprecationInternal)(this.adaptable.logger, 'SystemStatusApi', 'fireSystemStatusMessageDisplayedEvent');
-        this.internalApi.fireSystemStatusMessageDisplayedEvent(systemStatusMessageInfo);
-    }
     getCurrentSystemStatusMessageInfo() {
         const messageInfos = this.internalApi.getSystemStatusMessageInfos() || [];
         const orderedArray = messageInfos.sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime());

package/src/Api/Implementation/TeamSharingApiImpl.d.ts

@@ -7,17 +7,13 @@ export declare class TeamSharingApiImpl extends ApiBase implements TeamSharingAp
     internalApi: TeamSharingInternalApi;
     constructor(adaptable: IAdaptable);
     loadSharedEntities(): Promise<SharedEntity[]>;
-    getSharedEntities(): Promise<SharedEntity[]>;
     persistSharedEntities(sharedEntities: SharedEntity[]): Promise<boolean>;
-    setSharedEntities(sharedEntities: SharedEntity[]): Promise<boolean>;
     isTeamSharingAvailable(): boolean;
     hasTeamSharingFullRights(): boolean;
     checkForUpdates(): void;
-    showTeamSharingPopup(): void;
     openTeamSharingSettingsPanel(): void;
     shareAdaptableEntity(adaptableObject: AdaptableObject, module: AdaptableModule, sharedEntityConfig: AdaptableSharedEntityConfig): void;
     shareCustomEntity(customObject: any, sharedEntityConfig: CustomSharedEntityConfig): void;
-    shareEntity(entity: AdaptableObject, module: AdaptableModule, sharedEntityConfig: AdaptableSharedEntityConfig): void;
     unshareEntity(entityId: string): void;
     importSharedEntry(sharedEntity: SharedEntity): void;
     private getTeamSharingState;
@@ -25,5 +21,4 @@ export declare class TeamSharingApiImpl extends ApiBase implements TeamSharingAp
     getLoadedAdaptableSharedEntities(): AdaptableSharedEntity[];
     getLoadedCustomSharedEntities(): CustomSharedEntity[];
     refreshTeamSharing(): void;
-    triggerLoadingTeamSharingEntries(): void;
 }

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -7,7 +7,6 @@ const ApiBase_1 = require("./ApiBase");
 const TeamSharingRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/TeamSharingRedux"));
 const TeamSharingRedux_1 = require("../../Redux/ActionsReducers/TeamSharingRedux");
 const TeamSharingInternalApi_1 = require("../Internal/TeamSharingInternalApi");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const TeamSharingState_1 = require("../../PredefinedConfig/TeamSharingState");
 class TeamSharingApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
@@ -39,10 +38,6 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         const sharedEntities = teamSharingOptions.applySharedEntities(loadedSharedEntities, sharedEntitiesContext);
         return sharedEntities;
     }
-    async getSharedEntities() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'TeamSharingApi', 'getSharedEntities', 'loadSharedEntities');
-        return this.loadSharedEntities();
-    }
     async persistSharedEntities(sharedEntities) {
         if (!this.isTeamSharingAvailable()) {
             this.logWarn('Team Sharing is not Activated so Entities cannot be shared');
@@ -58,10 +53,6 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         await teamSharingOptions.persistSharedEntities(sharedEntitiesAfterCustomisation, sharedEntitiesContext);
         return true;
     }
-    async setSharedEntities(sharedEntities) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'TeamSharingApi', 'setSharedEntities', 'persistSharedEntities');
-        return this.persistSharedEntities(sharedEntities);
-    }
     isTeamSharingAvailable() {
         var _a, _b, _c;
         return (!this.getAdaptableApi()
@@ -79,10 +70,6 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
     checkForUpdates() {
         this.dispatchAction((0, TeamSharingRedux_1.TeamSharingCheckForUpdates)());
     }
-    showTeamSharingPopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'TeamSharingApi', 'showTeamSharingPopup', 'openTeamSharingSettingsPanel');
-        return this.openTeamSharingSettingsPanel();
-    }
     openTeamSharingSettingsPanel() {
         this.showModulePopup(ModuleConstants.TeamSharingModuleId);
     }
@@ -100,10 +87,6 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         }
         this.dispatchAction(TeamSharingRedux.TeamSharingShareCustom(customObject, sharedEntityConfig));
     }
-    shareEntity(entity, module, sharedEntityConfig) {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'TeamSharingApi', 'shareEntity', 'shareAdaptableEntity');
-        return this.shareAdaptableEntity(entity, module, sharedEntityConfig);
-    }
     unshareEntity(entityId) {
         if (!this.isTeamSharingAvailable()) {
             this.logWarn('Team Sharing is not Activated so Entities cannot be unshared');
@@ -143,9 +126,5 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
     refreshTeamSharing() {
         this.dispatchAction(TeamSharingRedux.TeamSharingGet());
     }
-    triggerLoadingTeamSharingEntries() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'TeamSharingApi', 'triggerLoadingTeamSharingEntries', 'refreshTeamSharing');
-        this.refreshTeamSharing();
-    }
 }
 exports.TeamSharingApiImpl = TeamSharingApiImpl;

package/src/Api/Implementation/ThemeApiImpl.d.ts

@@ -14,14 +14,10 @@ export declare class ThemeApiImpl extends ApiBase implements ThemeApi {
     getCurrentThemeObject(): AdaptableTheme;
     setSystemThemes(systemThemes: AdaptableTheme[]): void;
     setUserThemes(userThemes: AdaptableTheme[]): void;
-    getAllSystemTheme(): AdaptableTheme[];
     getSystemThemes(): AdaptableTheme[];
     applyCurrentTheme(): void;
-    getAllUserTheme(): AdaptableTheme[];
     getUserThemes(): AdaptableTheme[];
-    getAllTheme(): AdaptableTheme[];
     getThemes(): AdaptableTheme[];
-    showThemePopup(): void;
     openThemeSettingsPanel(): void;
     getAgGridCurrentThemeName(): string;
     editTheme(theme: AdaptableTheme): void;

package/src/Api/Implementation/ThemeApiImpl.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const ThemeRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ThemeRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ApiBase_1 = require("./ApiBase");
-const logDeprecation_1 = require("../../Utilities/logDeprecation");
 const themes_1 = require("../../themes");
 const ThemeInternalApi_1 = require("../Internal/ThemeInternalApi");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
@@ -39,10 +38,6 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
     setUserThemes(userThemes) {
         this.dispatchAction(ThemeRedux.ThemeSetUserThemes(userThemes));
     }
-    getAllSystemTheme() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ThemeApi', 'getAllSystemTheme', 'getSystemThemes');
-        return this.getSystemThemes();
-    }
     getSystemThemes() {
         var _a;
         const themes = (_a = this.getAdaptableState().Theme.SystemThemes) !== null && _a !== void 0 ? _a : [];
@@ -69,28 +64,18 @@ class ThemeApiImpl extends ApiBase_1.ApiBase {
         let themeChangedInfo = {
             adaptableApi: this.getAdaptableApi(),
             theme: currentTheme,
+            userName: this.adaptable.api.optionsApi.getUserName(),
+            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
         };
         this.adaptable.api.eventApi.emit('ThemeChanged', themeChangedInfo);
     }
-    getAllUserTheme() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ThemeApi', 'getAllUserTheme', 'getUserThemes');
-        return this.getUserThemes();
-    }
     getUserThemes() {
         var _a;
         return (_a = this.getAdaptableState().Theme.UserThemes) !== null && _a !== void 0 ? _a : [];
     }
-    getAllTheme() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ThemeApi', 'getAllTheme', 'getThemes');
-        return this.getThemes();
-    }
     getThemes() {
         return [...this.getSystemThemes(), ...this.getUserThemes()];
     }
-    showThemePopup() {
-        (0, logDeprecation_1.logDeprecation)(this.adaptable.logger, 'ThemeApi', 'showThemePopup', 'openThemeSettingsPanel');
-        return this.openThemeSettingsPanel();
-    }
     openThemeSettingsPanel() {
         this.showModulePopup(ModuleConstants.ThemeModuleId);
     }

package/src/Api/Implementation/ToolPanelApiImpl.js

@@ -14,13 +14,13 @@ class ToolPanelApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.ToolPanelModuleId);
     }
     openAdapTableToolPanel() {
-        let gridOptions = this.getOptions().gridOptions;
+        let gridOptions = this.getGridApi().getAgGridInstance();
         if (gridOptions) {
             gridOptions.api.openToolPanel('adaptable');
         }
     }
     closeAdapTableToolPanel() {
-        let gridOptions = this.getOptions().gridOptions;
+        let gridOptions = this.getGridApi().getAgGridInstance();
         if (gridOptions) {
             gridOptions.api.closeToolPanel();
         }

package/src/Api/Implementation/UserInterfaceApiImpl.d.ts

@@ -8,7 +8,6 @@ import { AdaptableObjectTag, GridCell } from '../../types';
 export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfaceApi {
     getColorPalette(): string[];
     getStyleClassNames(): string[] | undefined;
-    getAllPermittedValuesItems(): PermittedValues[];
     getPermittedValuesItems(): PermittedValues[];
     private getPermittedValuesForScope;
     getPermittedValuesForColumn(column: AdaptableColumn): any[] | undefined;
@@ -18,7 +17,6 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getCustomSortPermittedValuesForColumn(column: AdaptableColumn): CustomSortPermittedValues | undefined;
     getAllBulkUpdatePermittedValuesItems(): BulkUpdatePermittedValues[];
     getBulkUpdatePermittedValuesForColumn(column: AdaptableColumn): BulkUpdatePermittedValues | undefined;
-    getAllEditLookUpItems(): EditLookUpPermittedValues[];
     getEditLookUpItems(): EditLookUpPermittedValues[];
     getEditLookUpItemForColumn(column: AdaptableColumn): EditLookUpPermittedValues | undefined;
     getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, gridCell: GridCell): any[] | undefined;
@@ -27,4 +25,8 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getEditableCellStyle(): AdaptableStyle | undefined;
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
+    getCustomIconDefinition(iconName: string): import("../../types").AdaptableIcon | {
+        name: string;
+        icon: import("../../types").AdaptableIcon;
+    };
 }

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