@adaptabletools/adaptable-cjs 19.1.0-canary.0 → 19.1.1

package/src/Api/Internal/AdaptableInternalApi.js

@@ -18,7 +18,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     }
     getAdaptableJSXElement() {
         var _a;
-        return (_a = this.adaptable._PRIVATE_adaptableJSXElement) !== null && _a !== void 0 ? _a : null;
+        return (_a = this._adaptable._PRIVATE_adaptableJSXElement) !== null && _a !== void 0 ? _a : null;
     }
     // Popup Redux Actions
     showPopupConfirmation(confirmation) {
@@ -66,9 +66,9 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         return this.getAdaptableState().Grid.IsGridInTreeMode;
     }
     getToolbarTitle() {
-        let toolbarTitle = this.adaptable.api.dashboardApi.getDashboardState().DashboardTitle;
+        let toolbarTitle = this._adaptable.api.dashboardApi.getDashboardState().DashboardTitle;
         if (StringExtensions_1.default.IsNullOrEmpty(toolbarTitle)) {
-            toolbarTitle = this.adaptable.adaptableOptions.adaptableId;
+            toolbarTitle = this.getOptions().adaptableId;
             if (toolbarTitle == GeneralConstants_1.ADAPTABLE_ID) {
                 toolbarTitle = 'Adaptable ';
             }
@@ -80,62 +80,65 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         return Object.assign(Object.assign({}, config), { rowData: (_a = config.rowNode) === null || _a === void 0 ? void 0 : _a.data, changedAt: Date.now() });
     }
     getAdaptableInstance() {
-        return this.adaptable;
+        return this._adaptable;
+    }
+    getAgGridAdapter() {
+        return this._adaptable.agGridAdapter;
     }
     getPredefinedConfig() {
-        return this.adaptable.adaptableOptions.predefinedConfig;
+        return this.getOptions().predefinedConfig;
     }
     getState() {
         return this.getAdaptableState();
     }
     getValidationService() {
-        return this.adaptable.ValidationService;
+        return this._adaptable.ValidationService;
     }
     getModuleService() {
-        return this.adaptable.ModuleService;
+        return this._adaptable.ModuleService;
     }
     getDataService() {
-        return this.adaptable.DataService;
+        return this._adaptable.DataService;
     }
     getCellPopupService() {
-        return this.adaptable.CellPopupService;
+        return this._adaptable.CellPopupService;
     }
     getCalculatedColumnExpressionService() {
-        return this.adaptable.CalculatedColumnExpressionService;
+        return this._adaptable.CalculatedColumnExpressionService;
     }
     getQueryLanguageService() {
-        return this.adaptable.QueryLanguageService;
+        return this._adaptable.QueryLanguageService;
     }
     getAlertService() {
-        return this.adaptable.AlertService;
+        return this._adaptable.AlertService;
     }
     getTeamSharingService() {
-        return this.adaptable.TeamSharingService;
+        return this._adaptable.TeamSharingService;
     }
     getMetamodelService() {
-        return this.adaptable.MetamodelService;
+        return this._adaptable.MetamodelService;
     }
     getRowEditService() {
-        return this.adaptable.RowEditService;
+        return this._adaptable.RowEditService;
     }
     getFdc3Service() {
-        return this.adaptable.Fdc3Service;
+        return this._adaptable.Fdc3Service;
     }
     getFlashingCellService() {
-        return this.adaptable.FlashingCellService;
+        return this._adaptable.FlashingCellService;
     }
     getModules() {
-        return this.adaptable.adaptableModules;
+        return this._adaptable.adaptableModules;
     }
     getModuleFriendlyName(adaptableModule) {
         var _a, _b;
-        return ((_b = (_a = this.adaptable.ModuleService.getModuleInfoByModule(adaptableModule)) === null || _a === void 0 ? void 0 : _a.FriendlyName) !== null && _b !== void 0 ? _b : adaptableModule);
+        return ((_b = (_a = this._adaptable.ModuleService.getModuleInfoByModule(adaptableModule)) === null || _a === void 0 ? void 0 : _a.FriendlyName) !== null && _b !== void 0 ? _b : adaptableModule);
     }
     forAllRowNodesDo(func, config) {
-        this.adaptable.forAllRowNodesDo(func, config);
+        this._adaptable.forAllRowNodesDo(func, config);
     }
     forAllVisibleRowNodesDo(func, config) {
-        this.adaptable.forAllVisibleRowNodesDo(func, config);
+        this._adaptable.forAllVisibleRowNodesDo(func, config);
     }
     getLabelForButton(button, context) {
         if (!button.label) {
@@ -194,24 +197,24 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         return buttonIcon;
     }
     isDocumentationLinksDisplayed() {
-        return this.adaptable.adaptableOptions.userInterfaceOptions.showDocumentationLinks;
+        return this.getUserInterfaceOptions().showDocumentationLinks;
     }
     // the row data which is used to preview the expression evaluation (usually the first row data)
     getQueryPreviewData() {
         var _a;
-        const firstRowNode = this.adaptable.api.gridApi.getFirstRowNode();
+        const firstRowNode = this._adaptable.api.gridApi.getFirstRowNode();
         if (firstRowNode == undefined) {
             return {};
         }
         const firstRowData = (_a = Object.assign({}, firstRowNode === null || firstRowNode === void 0 ? void 0 : firstRowNode.data)) !== null && _a !== void 0 ? _a : {};
         // handle CalcCols which are not persisted in the rowModel
-        this.adaptable.api.calculatedColumnApi.getCalculatedColumns().forEach((calculatedColumn) => {
-            const columnRawValue = this.adaptable.api.gridApi.getRawValueFromRowNode(firstRowNode, calculatedColumn.ColumnId);
+        this._adaptable.api.calculatedColumnApi.getCalculatedColumns().forEach((calculatedColumn) => {
+            const columnRawValue = this._adaptable.api.gridApi.getRawValueFromRowNode(firstRowNode, calculatedColumn.ColumnId);
             firstRowData[calculatedColumn.ColumnId] = columnRawValue;
         });
         // handle FreeTextCols which are not persisted in the rowModel
-        this.adaptable.api.freeTextColumnApi.getFreeTextColumns().forEach((freeTextColumn) => {
-            const columnRawValue = this.adaptable.api.gridApi.getRawValueFromRowNode(firstRowNode, freeTextColumn.ColumnId);
+        this._adaptable.api.freeTextColumnApi.getFreeTextColumns().forEach((freeTextColumn) => {
+            const columnRawValue = this._adaptable.api.gridApi.getRawValueFromRowNode(firstRowNode, freeTextColumn.ColumnId);
             firstRowData[freeTextColumn.ColumnId] = columnRawValue;
         });
         return firstRowData;
@@ -219,25 +222,25 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     createFrameworkComponent(containerDomNode, frameworkComponent, componentType) {
         const createComponentFn = () => 
         // delegate the logic to framework wrapper
-        this.adaptable._emitSync('FrameworkComponentChange', {
+        this._adaptable._emitSync('FrameworkComponentChange', {
             command: 'create',
             containerDomNode,
             frameworkComponent,
             componentType,
         });
-        if (this.adaptable.isReady) {
+        if (this.isAdapTableReady()) {
             createComponentFn();
         }
         else {
             // adaptable may not be initialized yet if the framework component is part of the initial render
             // AFL 2021.10.14 - not really sure if this is necessary anymore?! (see the other changes in this commit)
-            (0, waitForCondition_1.waitForCondition)(() => this.adaptable.isReady).then(() => {
+            (0, waitForCondition_1.waitForCondition)(() => this.isAdapTableReady()).then(() => {
                 createComponentFn();
             });
         }
     }
     destroyFrameworkComponent(containerDomNode, frameworkComponent, componentType) {
-        this.adaptable._emitSync('FrameworkComponentChange', {
+        this._adaptable._emitSync('FrameworkComponentChange', {
             command: 'destroy',
             containerDomNode,
             frameworkComponent,
@@ -245,7 +248,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         });
     }
     initializeDataChangeHistory() {
-        if (this.adaptable.adaptableOptions.dataChangeHistoryOptions.activeByDefault) {
+        if (this.getDataChangeHistoryOptions().activeByDefault) {
             this.dispatchAction(SystemRedux.SystemDataChangeHistoryEnable());
         }
         else {
@@ -262,7 +265,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
             catch (error) {
                 errorHandlingFn === null || errorHandlingFn === void 0 ? void 0 : errorHandlingFn();
                 this.getUserInterfaceApi().hideProgressIndicator();
-                this.adaptable.logger.error('Unexpected error while executing a function with a progress indicator', error);
+                this.logError('Unexpected error while executing a function with a progress indicator', error);
             }
         }, 16);
     }
@@ -286,34 +289,36 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         return [...(layoutTags || []), ...(objectTags || [])];
     }
     getObjectTags() {
-        if (!this.adaptable.adaptableOptions.userInterfaceOptions.objectTags) {
+        const userInterfaceOptions = this.getUserInterfaceOptions();
+        if (!this.getUserInterfaceOptions().objectTags) {
             return;
         }
-        if (Array.isArray(this.adaptable.adaptableOptions.userInterfaceOptions.objectTags)) {
-            return this.adaptable.adaptableOptions.userInterfaceOptions.objectTags;
+        if (Array.isArray(userInterfaceOptions.objectTags)) {
+            return userInterfaceOptions.objectTags;
         }
-        if (typeof this.adaptable.adaptableOptions.userInterfaceOptions.objectTags === 'function') {
+        if (typeof userInterfaceOptions.objectTags === 'function') {
             // sanitize the provided tags, just to be sure that the user does NOT break the UI
-            return this.adaptable.adaptableOptions.userInterfaceOptions
+            return userInterfaceOptions
                 .objectTags(this.buildBaseContext())
                 .filter((tag) => typeof tag === 'string');
         }
     }
     getLayoutTags() {
         var _a;
-        if (!((_a = this.adaptable.adaptableOptions.layoutOptions.layoutTagOptions) === null || _a === void 0 ? void 0 : _a.autoGenerateTagsForLayouts)) {
+        const layoutOptions = this.getLayoutOptions();
+        if (!((_a = layoutOptions.layoutTagOptions) === null || _a === void 0 ? void 0 : _a.autoGenerateTagsForLayouts)) {
             return;
         }
-        if (this.adaptable.adaptableOptions.layoutOptions.layoutTagOptions.autoGenerateTagsForLayouts ===
-            true) {
-            return this.adaptable.api.layoutApi.getLayouts().map((layout) => {
+        if (layoutOptions.layoutTagOptions.autoGenerateTagsForLayouts === true) {
+            return this.getLayoutApi()
+                .getLayouts()
+                .map((layout) => {
                 return layout.Name;
             });
         }
-        if (typeof this.adaptable.adaptableOptions.layoutOptions.layoutTagOptions
-            .autoGenerateTagsForLayouts === 'function') {
-            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);
+        if (typeof layoutOptions.layoutTagOptions.autoGenerateTagsForLayouts === 'function') {
+            const autoGenerateTagsForLayoutsContext = Object.assign({ layouts: this._adaptable.api.layoutApi.getLayouts(), objectTags: this.getAdaptableApi().userInterfaceApi.getAdaptableObjectTags() }, this.buildBaseContext());
+            const customGeneratedTags = 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');
         }
@@ -339,10 +344,10 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         if (!query) {
             return '';
         }
-        const displayColumnFriendlyNames = (_a = this.adaptable.adaptableOptions.expressionOptions) === null || _a === void 0 ? void 0 : _a.displayColumnFriendlyNamesForExpressions;
+        const displayColumnFriendlyNames = (_a = this.getExpressionOptions()) === null || _a === void 0 ? void 0 : _a.displayColumnFriendlyNamesForExpressions;
         return displayColumnFriendlyNames
-            ? this.adaptable.api.expressionApi.getAdaptableQueryExpressionWithColumnFriendlyNames(query)
-            : this.adaptable.api.expressionApi.getAdaptableQueryExpression(query);
+            ? this._adaptable.api.expressionApi.getAdaptableQueryExpressionWithColumnFriendlyNames(query)
+            : this._adaptable.api.expressionApi.getAdaptableQueryExpression(query);
     }
     deleteConditionalStyles(conditionalStyles) {
         conditionalStyles.forEach((cs) => {
@@ -475,7 +480,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
             };
         }
         if (!actionColumn) {
-            actionColumn = (_a = this.adaptable.api.actionColumnApi
+            actionColumn = (_a = this._adaptable.api.actionColumnApi
                 .getActionColumns()) === null || _a === void 0 ? void 0 : _a.find((ac) => ac.columnId == colDef.colId);
         }
         if (!(actionColumn === null || actionColumn === void 0 ? void 0 : actionColumn.actionColumnButton)) {

package/src/Api/Internal/AlertInternalApi.js

@@ -84,8 +84,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
      * @param alertToFire Alerts which has just triggered
      */
     publishAlertFiredEvent(alertToFire) {
-        const adaptableApi = this.getAdaptableApi();
-        const alertFiredInfo = Object.assign({ alert: alertToFire }, this.getAdaptableApi().internalApi.buildBaseContext());
+        const alertFiredInfo = Object.assign({ alert: alertToFire }, this.getAdaptableInternalApi().buildBaseContext());
         this.getEventApi().emit('AlertFired', alertFiredInfo);
     }
     /**
@@ -337,7 +336,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
      */
     getCustomAlertDescription(alertDefinition, dataChangedInfo) {
         var _a;
-        const alertMessageFunction = (_a = this.adaptable.adaptableOptions.alertOptions) === null || _a === void 0 ? void 0 : _a.alertMessageText;
+        const alertMessageFunction = (_a = this.getAlertOptions()) === null || _a === void 0 ? void 0 : _a.alertMessageText;
         if (alertMessageFunction) {
             const alertMessageContext = {
                 alertDefinition: alertDefinition,
@@ -358,7 +357,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
      */
     getCustomAlertMessageHeader(alertDefinition, dataChangedInfo) {
         var _a;
-        const alertMessageFunction = (_a = this.adaptable.adaptableOptions.alertOptions) === null || _a === void 0 ? void 0 : _a.alertMessageHeader;
+        const alertMessageFunction = (_a = this.getAlertOptions()) === null || _a === void 0 ? void 0 : _a.alertMessageHeader;
         if (alertMessageFunction) {
             const returnText = alertMessageFunction({
                 alertDefinition,
@@ -382,7 +381,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.getAdaptableApi().internalApi.getAdaptableQueryExpressionText(alertDefinition.Rule);
+            : this.getAdaptableInternalApi().getAdaptableQueryExpressionText(alertDefinition.Rule);
         return ruleDescription;
     }
     /**
@@ -438,14 +437,14 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
             adaptableAlertForm.buttons = (_b = adaptableAlertForm.buttons) === null || _b === void 0 ? void 0 : _b.map((button) => {
                 let buttonStyle = isActionForm
                     ? button.ButtonStyle
-                    : this.getAdaptableApi().internalApi.getStyleForButton(button, context);
+                    : this.getAdaptableInternalApi().getStyleForButton(button, context);
                 if (defaultMessageType && !(buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone)) {
                     // force the button tone to be the alert tone, if the tone is missing from button style (or button style non-existent)
                     buttonStyle = Object.assign(Object.assign({}, buttonStyle), { tone: defaultMessageType.toLowerCase() });
                 }
                 let label = isActionForm
                     ? button.Label
-                    : this.getAdaptableApi().internalApi.getLabelForButton(button, context);
+                    : this.getAdaptableInternalApi().getLabelForButton(button, context);
                 return Object.assign(Object.assign({}, button), { buttonStyle,
                     label });
             });
@@ -561,7 +560,7 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
         var _a;
         const predicateDefHandlerContext = Object.assign({ value: dataChangedEvent.newValue, oldValue: dataChangedEvent.oldValue, 
             // TODO send real display value
-            displayValue: null, node: dataChangedEvent.rowNode, column: dataChangedEvent.column }, this.getAdaptableApi().internalApi.buildBaseContext());
+            displayValue: null, node: dataChangedEvent.rowNode, column: dataChangedEvent.column }, this.getAdaptableInternalApi().buildBaseContext());
         return this.getAdaptableApi().predicateApi.handleColumnPredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, defaultNoPredicateReturn);
     }
     isAlertDefinitionForRowChangeEvent(alertDefinition) {
@@ -680,7 +679,8 @@ class AlertInternalApi extends ApiBase_1.ApiBase {
             }
         }
         if (text.indexOf('[context') !== -1) {
-            const agGridContext = (_c = (_b = this.adaptable.agGridAdapter).getGridOption) === null || _c === void 0 ? void 0 : _c.call(_b, 'context');
+            const agGridContext = (_c = (_b = this.getAdaptableInternalApi()
+                .getAgGridAdapter()).getGridOption) === null || _c === void 0 ? void 0 : _c.call(_b, 'context');
             const agGridContextKeys = Helper_1.default.extractContextKeysFromText(text);
             for (const key of agGridContextKeys) {
                 if (agGridContext[key]) {

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -14,7 +14,9 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
      */
     getCalculatedColumnModuleReferences(calculatedColumn) {
         const references = [];
-        this.adaptable.adaptableModules.forEach((module) => {
+        this.getAdaptableInternalApi()
+            .getModules()
+            .forEach((module) => {
             if (module
                 .getModuleCalculatedColumnReferences()
                 .some((moduleReference) => moduleReference.Uuid === calculatedColumn.Uuid)) {
@@ -85,7 +87,7 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
     }
     fireCalculatedColumnChangedEvent(trigger, calculatedColumn) {
         const adaptableApi = this.getAdaptableApi();
-        const calculatedColumnChangedInfo = Object.assign({ actionName: trigger, calculatedColumn: calculatedColumn, calculatedColumnExpressionAST: adaptableApi.expressionApi.getASTForExpression(this.getExpressionFromCalculatedColumn(calculatedColumn)) }, this.getAdaptableApi().internalApi.buildBaseContext());
+        const calculatedColumnChangedInfo = Object.assign({ actionName: trigger, calculatedColumn: calculatedColumn, calculatedColumnExpressionAST: adaptableApi.expressionApi.getASTForExpression(this.getExpressionFromCalculatedColumn(calculatedColumn)) }, this.getAdaptableInternalApi().buildBaseContext());
         this.getAdaptableApi().eventApi.emit('CalculatedColumnChanged', calculatedColumnChangedInfo);
     }
     getColDefsForCalculatedColumns() {
@@ -96,9 +98,9 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
             .map((calculatedColumn) => {
             const calculatedColumnSettings = Object.assign(Object.assign({}, defaultCalculatedColumnSettings), calculatedColumn.CalculatedColumnSettings);
             if (!calculatedColumnSettings.DataType) {
-                calculatedColumnSettings.DataType = this.getAdaptableApi()
-                    .internalApi.getAdaptableInstance()
-                    .CalculatedColumnExpressionService.getCalculatedColumnDataType(calculatedColumn.Query);
+                calculatedColumnSettings.DataType = this.getAdaptableInternalApi()
+                    .getCalculatedColumnExpressionService()
+                    .getCalculatedColumnDataType(calculatedColumn.Query);
             }
             const columnTypes = [
                 GeneralConstants_1.AB_SPECIAL_COLUMN,
@@ -118,9 +120,9 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
                     StringExtensions_1.default.IsNotNullOrEmpty(calculatedColumn.Query.AggregatedScalarExpression)) {
                     return (_b = params.data) === null || _b === void 0 ? void 0 : _b[calculatedColumn.ColumnId];
                 }
-                return this.getAdaptableApi()
-                    .internalApi.getAdaptableInstance()
-                    .CalculatedColumnExpressionService.evaluateCalculatedColumnQuery(calculatedColumn, params.node);
+                return this.getAdaptableInternalApi()
+                    .getCalculatedColumnExpressionService()
+                    .evaluateCalculatedColumnQuery(calculatedColumn, params.node);
             };
             const newColDef = {
                 headerName: calculatedColumn.FriendlyName
@@ -145,7 +147,7 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
             if (calculatedColumnSettings.ShowToolTip != null &&
                 calculatedColumnSettings.ShowToolTip == true) {
                 newColDef.tooltipValueGetter = () => {
-                    return this.getAdaptableApi().internalApi.getAdaptableQueryExpressionText(calculatedColumn.Query);
+                    return this.getAdaptableInternalApi().getAdaptableQueryExpressionText(calculatedColumn.Query);
                 };
             }
             if (calculatedColumnSettings.HeaderToolTip) {

package/src/Api/Internal/ChartingInternalApi.js

@@ -9,7 +9,7 @@ class ChartingInternalApi extends ApiBase_1.ApiBase {
             ? document.querySelector(chartContainer.element)
             : chartContainer === null || chartContainer === void 0 ? void 0 : chartContainer.element;
         if (!element && typeof (chartContainer === null || chartContainer === void 0 ? void 0 : chartContainer.element) === 'string') {
-            this.adaptable.logger.consoleLogByMessageType(`Chart container element not found: ${chartContainer.element}`, 'Error');
+            this.getAdatableLogger().consoleLogByMessageType(`Chart container element not found: ${chartContainer.element}`, 'Error');
             return null;
         }
         return element;

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -104,7 +104,7 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
         }
         let value = gridCell.normalisedValue;
         const predicateDefHandlerContext = Object.assign({ value: value, oldValue: null, displayValue: gridCell.displayValue, node,
-            column }, this.getAdaptableApi().internalApi.buildBaseContext());
+            column }, this.getAdaptableInternalApi().buildBaseContext());
         return this.getAdaptableApi().predicateApi.handlePredicate(columnFilter.Predicate, predicateDefHandlerContext, true);
     }
     /**
@@ -167,16 +167,14 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
      * Fires Column Filter Applied Event - typically used to enable filtering on the server
      */
     fireColumnFilterAppliedEvent() {
-        if (this.adaptable.isReady) {
-            const adaptableApi = this.getAdaptableApi();
-            const columnFilterAppliedInfo = Object.assign({ columnFilters: this.getColumnFilterApi().getColumnFilters() }, this.getAdaptableApi().internalApi.buildBaseContext());
+        if (this.isAdapTableReady()) {
+            const columnFilterAppliedInfo = Object.assign({ columnFilters: this.getColumnFilterApi().getColumnFilters() }, this.getAdaptableInternalApi().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());
+        if (this.isAdapTableReady()) {
+            const gridFilterAppliedInfo = Object.assign({ columnFilters: this.getColumnFilterApi().getColumnFilters() }, this.getAdaptableInternalApi().buildBaseContext());
             this.getAdaptableApi().eventApi.emit('GridFilterApplied', gridFilterAppliedInfo);
         }
     }
@@ -203,7 +201,7 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
     getFilterValuesMaxNumberOfItems(column) {
         const maxFilterValues = this.getColumnFilterOptions().valuesFilterOptions.maxFilterValuesToDisplay;
         if (typeof maxFilterValues === 'function') {
-            const columnFilterContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { column: column });
+            const columnFilterContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { column: column });
             return maxFilterValues(columnFilterContext);
         }
         else {
@@ -216,7 +214,7 @@ class ColumnFilterInternalApi extends ApiBase_1.ApiBase {
         const availablePredicates = this.getPredicateApi().getPredicateDefsByModuleScope('columnFilter');
         let predicateIds = [];
         if (typeof (valuesFilterPredicateOptions === null || valuesFilterPredicateOptions === void 0 ? void 0 : valuesFilterPredicateOptions.predicates) === 'function') {
-            const columnFilterContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { column: column });
+            const columnFilterContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { column: column });
             predicateIds = valuesFilterPredicateOptions.predicates(columnFilterContext);
         }
         else if (Array.isArray(valuesFilterPredicateOptions === null || valuesFilterPredicateOptions === void 0 ? void 0 : valuesFilterPredicateOptions.predicates)) {

package/src/Api/Internal/ColumnInternalApi.js

@@ -16,7 +16,7 @@ class ColumnInternalApi extends ApiBase_1.ApiBase {
      * @param columnId Column to use
      */
     getAgGridColumnType(columnId) {
-        return this.adaptable.getAgGridColumnType(columnId);
+        return this._adaptable.getAgGridColumnType(columnId);
     }
     /**
      * Retrieves a list providing the Friendly Name / Caption for all columns
@@ -44,12 +44,12 @@ class ColumnInternalApi extends ApiBase_1.ApiBase {
      * @param columnId columnId to look up
      */
     getAgGridColumnForAdaptableColumn(columnId) {
-        return this.adaptable.getAgGridColumnForColumnId(columnId);
+        return this._adaptable.getAgGridColumnForColumnId(columnId);
     }
     getActiveColumnComparator(columnId, customSort, customSortComparer) {
         if ((!customSort || (customSort === null || customSort === void 0 ? void 0 : customSort.IsSuspended)) && !customSortComparer) {
             // defaults to AG-Grid column definition comparator if no CustomSort is defined&active
-            const colDefComparator = this.adaptable.agGridColumnAdapter.getUserColDefProperty(columnId, 'comparator');
+            const colDefComparator = this._adaptable.agGridColumnAdapter.getUserColDefProperty(columnId, 'comparator');
             return colDefComparator;
         }
         // CustomSort Comparer function takes precedence over CustomSort SortedValues

package/src/Api/Internal/CustomSortInternalApi.js

@@ -10,11 +10,11 @@ class CustomSortInternalApi extends ApiBase_1.ApiBase {
     }
     getDefaultCustomSortComparer(columnId, columnValues) {
         // have to return a function that may not have access to this
-        const adaptable = this.adaptable;
+        const gridApi = this.getGridApi();
         return function compareItemsOfCustomSort(valueA, valueB, nodeA, nodeB) {
             var _a, _b;
-            let firstElementValueString = (_a = (nodeA && adaptable.getDisplayValueFromRowNode(nodeA, columnId))) !== null && _a !== void 0 ? _a : valueA;
-            let secondElementValueString = (_b = (nodeB && adaptable.getDisplayValueFromRowNode(nodeB, columnId))) !== null && _b !== void 0 ? _b : valueB;
+            let firstElementValueString = (_a = (nodeA && gridApi.getDisplayValueFromRowNode(nodeA, columnId))) !== null && _a !== void 0 ? _a : valueA;
+            let secondElementValueString = (_b = (nodeB && gridApi.getDisplayValueFromRowNode(nodeB, columnId))) !== null && _b !== void 0 ? _b : valueB;
             let indexFirstElement = columnValues.indexOf(firstElementValueString);
             let containsFirstElement = indexFirstElement >= 0;
             let indexSecondElement = columnValues.indexOf(secondElementValueString);

package/src/Api/Internal/DashboardInternalApi.js

@@ -30,7 +30,7 @@ class DashboardInternalApi extends ApiBase_1.ApiBase {
             }
             return visibleInOldState && !visibleInNewState;
         };
-        const dashboardChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { actionName: trigger, oldDashboardState,
+        const dashboardChangedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { actionName: trigger, oldDashboardState,
             newDashboardState,
             isToolbarStateChangedToVisible,
             isToolbarStateChangedToHidden });
@@ -69,13 +69,14 @@ class DashboardInternalApi extends ApiBase_1.ApiBase {
         return `ab-CustomToolbar__${customToolbarName}__component`;
     }
     getModuleToolbars() {
+        const moduleService = this.getAdaptableInternalApi().getModuleService();
         return Types_1.ALL_TOOLBARS.filter((moduleName) => {
-            return this.adaptable.ModuleService.isModuleAvailable(moduleName);
+            return moduleService.isModuleAvailable(moduleName);
         }).map((moduleName) => {
             var _a, _b;
             return {
                 id: moduleName,
-                friendlyName: (_b = (_a = this.adaptable.ModuleService.getModuleInfoByModule(moduleName)) === null || _a === void 0 ? void 0 : _a.FriendlyName) !== null && _b !== void 0 ? _b : moduleName,
+                friendlyName: (_b = (_a = moduleService.getModuleInfoByModule(moduleName)) === null || _a === void 0 ? void 0 : _a.FriendlyName) !== null && _b !== void 0 ? _b : moduleName,
             };
         });
     }

package/src/Api/Internal/DataImportInternalApi.js

@@ -58,8 +58,8 @@ class DataImportInternalApi extends ApiBase_1.ApiBase {
     publishDataImportedEvent(importData, addedRows, updatedRows) {
         const dataImportedInfo = Object.assign({ importData,
             addedRows,
-            updatedRows }, this.getAdaptableApi().internalApi.buildBaseContext());
-        this.getAdaptableApi().internalApi.dispatchReduxAction(SystemRedux.DataImportCompleted(dataImportedInfo));
+            updatedRows }, this.getAdaptableInternalApi().buildBaseContext());
+        this.getAdaptableInternalApi().dispatchReduxAction(SystemRedux.DataImportCompleted(dataImportedInfo));
         this.getEventApi().emit('DataImported', dataImportedInfo);
     }
 }

package/src/Api/Internal/DataSetInternalApi.js

@@ -8,8 +8,8 @@ class DataSetInternalApi extends ApiBase_1.ApiBase {
      * @param dataSet Data Set which has been selected
      */
     fireDataSetSelectedEvent(dataSet) {
-        if (this.adaptable.isReady) {
-            const dataSetSelectedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { dataSet });
+        if (this.isAdapTableReady()) {
+            const dataSetSelectedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { dataSet });
             this.getAdaptableApi().eventApi.emit('DataSetSelected', dataSetSelectedInfo);
         }
     }