@adaptabletools/adaptable-cjs 19.1.0 → 19.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "19.1.0",
+  "version": "19.1.1",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/Api/GridApi.d.ts

@@ -456,7 +456,8 @@ export interface GridApi {
      * @param rowNodes agGrid RowNodes which contain cells to refresh
      * @param columnIds ColumnIds which contain cells to refresh
      */
-    refreshCells(rowNodes: IRowNode[], columnIds: string[]): void;
+    refreshCells(rowNodes: IRowNode[], columnIds: string[], suppressFlash?: boolean): void;
+    refreshAllCells(forceUpdate?: boolean): void;
     /**
      * Refreshes a single Grid Cell
      * @param gridCell GridCell to refresh

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

@@ -1,9 +1,7 @@
 import { ActionColumn, ActionColumnApi } from '../../../types';
 import { ApiBase } from './ApiBase';
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ColDef } from '@ag-grid-community/core';
 export declare class ActionColumnApiImpl extends ApiBase implements ActionColumnApi {
-    constructor(adaptable: IAdaptable);
     getActionColumns(): ActionColumn[];
     getColDefsForActionColumns(): ColDef[];
 }

package/src/Api/Implementation/ActionColumnApiImpl.js

@@ -5,9 +5,6 @@ const ApiBase_1 = require("./ApiBase");
 const ActionColumnRenderer_1 = require("../../agGrid/ActionColumnRenderer");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 class ActionColumnApiImpl extends ApiBase_1.ApiBase {
-    constructor(adaptable) {
-        super(adaptable);
-    }
     getActionColumns() {
         var _a;
         return (_a = this.getActionColumnOptions().actionColumns) !== null && _a !== void 0 ? _a : [];
@@ -31,7 +28,7 @@ class ActionColumnApiImpl extends ApiBase_1.ApiBase {
                 filter: false,
                 sortable: false,
                 enableRowGroup: false,
-                cellRenderer: this.getAdaptableApi().internalApi.getAdaptableInstance().variant === 'react'
+                cellRenderer: this.getGridApi().getVariant() === 'react'
                     ? ActionColumnRenderer_1.ReactActionColumnRenderer
                     : ActionColumnRenderer_1.ActionColumnRenderer,
                 type: [GeneralConstants_1.AB_SPECIAL_COLUMN, 'abColDefObject'],

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

@@ -4,7 +4,7 @@ import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ActionRowInternalApi } from '../Internal/ActionRowInternalApi';
 export declare class ActionRowApiImpl extends ApiBase implements ActionRowApi {
     internalApi: ActionRowInternalApi;
-    constructor(adaptable: IAdaptable);
+    constructor(_adaptable: IAdaptable);
     getActionRowButtons(): ActionRowButtonType[];
     displayEditActionRow(primaryKey: any): void;
     displayCreateActionRow(): void;

package/src/Api/Implementation/ActionRowApiImpl.js

@@ -5,14 +5,14 @@ const PopupRedux_1 = require("../../Redux/ActionsReducers/PopupRedux");
 const ApiBase_1 = require("./ApiBase");
 const ActionRowInternalApi_1 = require("../Internal/ActionRowInternalApi");
 class ActionRowApiImpl extends ApiBase_1.ApiBase {
-    constructor(adaptable) {
-        super(adaptable);
-        this.internalApi = new ActionRowInternalApi_1.ActionRowInternalApi(adaptable);
+    constructor(_adaptable) {
+        super(_adaptable);
+        this.internalApi = new ActionRowInternalApi_1.ActionRowInternalApi(_adaptable);
     }
     getActionRowButtons() {
         var actionRowButtons = this.getActionRowOptions().actionRowButtons;
         if (typeof actionRowButtons === 'function') {
-            const context = this.getAdaptableApi().internalApi.buildBaseContext();
+            const context = this.getAdaptableInternalApi().buildBaseContext();
             actionRowButtons = actionRowButtons(context);
         }
         return actionRowButtons !== null && actionRowButtons !== void 0 ? actionRowButtons : [];

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

@@ -110,10 +110,12 @@ export declare class AdaptableApiImpl implements AdaptableApi {
         destroyApi?: boolean;
     }): void;
     isDestroyed(): boolean;
+    logConsoleMessage(message: string, ...optionalParams: any[]): void;
     logInfo(message: string, ...optionalParams: any[]): void;
     logSuccess(message: string, ...optionalParams: any[]): void;
     logWarn(message: string, ...optionalParams: any[]): void;
     logError(message: string, ...optionalParams: any[]): void;
+    consoleLog(message: string, ...optionalParams: any[]): void;
     consoleError(message: string, ...optionalParams: any[]): void;
     consoleWarn(message: string, ...optionalParams: any[]): void;
 }

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -169,6 +169,9 @@ class AdaptableApiImpl {
     isDestroyed() {
         return this.destroyed;
     }
+    logConsoleMessage(message, ...optionalParams) {
+        this.adaptable.logger.consoleLog(message, optionalParams);
+    }
     logInfo(message, ...optionalParams) {
         this.adaptable.logger.info(message, optionalParams);
     }
@@ -181,6 +184,9 @@ class AdaptableApiImpl {
     logError(message, ...optionalParams) {
         this.adaptable.logger.error(message, optionalParams);
     }
+    consoleLog(message, ...optionalParams) {
+        this.adaptable.logger.consoleLog(message, optionalParams);
+    }
     consoleError(message, ...optionalParams) {
         this.adaptable.logger.consoleError(message, optionalParams);
     }

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

@@ -8,7 +8,7 @@ import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AlertInternalApi } from '../Internal/AlertInternalApi';
 export declare class AlertApiImpl extends ApiBase implements AlertApi {
     internalApi: AlertInternalApi;
-    constructor(adaptable: IAdaptable);
+    constructor(_adaptable: IAdaptable);
     getAlertState(): AlertState;
     getAlertDefinitions(config?: LayoutAssociatedObjectLoadConfig): AlertDefinition[];
     getSuspendedAlertDefinitions(config?: {

package/src/Api/Implementation/AlertApiImpl.js

@@ -12,9 +12,9 @@ const AdaptableAlert_1 = require("../../PredefinedConfig/Common/AdaptableAlert")
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const AlertInternalApi_1 = require("../Internal/AlertInternalApi");
 class AlertApiImpl extends ApiBase_1.ApiBase {
-    constructor(adaptable) {
-        super(adaptable);
-        this.internalApi = new AlertInternalApi_1.AlertInternalApi(adaptable);
+    constructor(_adaptable) {
+        super(_adaptable);
+        this.internalApi = new AlertInternalApi_1.AlertInternalApi(_adaptable);
     }
     getAlertState() {
         return this.getAdaptableState().Alert;
@@ -47,7 +47,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         this.addUidToAdaptableObject(alertToShow);
         this.dispatchAction(SystemRedux.SystemAlertAdd(alertToShow, this.getAlertOptions().maxAlertsInStore));
         // 2. Publish the Alert Fired Event
-        const alertFiredInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { alert: alertToShow });
+        const alertFiredInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { alert: alertToShow });
         const results = await this.getAdaptableApi().eventApi.emit('AlertFired', alertFiredInfo);
         const showPopup = results.reduce((endResult, aResult) => {
             return endResult && aResult !== false;
@@ -63,7 +63,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             }
             // 2. Log to console
             if (alertProperties.LogToConsole) {
-                this.adaptable.logger.consoleLogByMessageType(alertToShow.header + ': ' + alertToShow.message, alertDefinition.MessageType);
+                this.getAdatableLogger().consoleLogByMessageType(alertToShow.header + ': ' + alertToShow.message, alertDefinition.MessageType);
             }
             // 3. Show it in a Div (if one has been set)
             if (alertProperties.ShowInDiv) {
@@ -83,7 +83,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             if (alertProperties.JumpToCell &&
                 (0, AdaptableAlert_1.isAdaptableCellChangedAlert)(alertToShow) &&
                 alertToShow.cellDataChangedInfo) {
-                this.adaptable.jumpToCell(alertToShow.cellDataChangedInfo.column.columnId, alertToShow.cellDataChangedInfo.rowNode);
+                this._adaptable.jumpToCell(alertToShow.cellDataChangedInfo.column.columnId, alertToShow.cellDataChangedInfo.rowNode);
             }
             // 5: Jump to the Row
             else if (alertProperties.JumpToRow &&
@@ -91,7 +91,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                 ((_a = alertToShow.gridDataChangedInfo) === null || _a === void 0 ? void 0 : _a.rowTrigger) === 'Add') {
                 const [firstRowNode] = alertToShow.gridDataChangedInfo.rowNodes;
                 if (firstRowNode) {
-                    this.adaptable.jumpToRow(firstRowNode);
+                    this._adaptable.jumpToRow(firstRowNode);
                 }
             }
             // 6: For CellChanged Alerts either Highlight the cell or row
@@ -101,20 +101,20 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                 (alertProperties.HighlightCell || alertProperties.HighlightRow)) {
                 let alertNode = alertToShow.cellDataChangedInfo.rowNode;
                 if (!alertNode) {
-                    alertNode = this.adaptable.getRowNodeForPrimaryKey(alertToShow.cellDataChangedInfo.primaryKeyValue);
+                    alertNode = this.getGridApi().getRowNodeForPrimaryKey(alertToShow.cellDataChangedInfo.primaryKeyValue);
                 }
                 if (alertNode) {
                     if (alertProperties.HighlightRow) {
                         this.getAdaptableApi().gridApi.refreshRowNodes([alertNode]);
                         setTimeout(() => {
                             this.dispatchAction(SystemRedux.SystemAlertRemoveRowHighlight(alertToShow));
-                        }, this.adaptable.adaptableOptions.alertOptions.rowHighlightDuration);
+                        }, this.getAlertOptions().rowHighlightDuration);
                     }
                     if (alertProperties.HighlightCell) {
                         this.getAdaptableApi().gridApi.refreshCells([alertNode], [alertToShow.cellDataChangedInfo.column.columnId]);
                         setTimeout(() => {
                             this.dispatchAction(SystemRedux.SystemAlertRemoveCellHighlight(alertToShow));
-                        }, this.adaptable.adaptableOptions.alertOptions.cellHighlightDuration);
+                        }, this.getAlertOptions().cellHighlightDuration);
                     }
                 }
             }
@@ -125,7 +125,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                 this.getAdaptableApi().gridApi.refreshRowNodes(alertToShow.gridDataChangedInfo.rowNodes);
                 setTimeout(() => {
                     this.dispatchAction(SystemRedux.SystemAlertRemoveRowHighlight(alertToShow));
-                }, this.adaptable.adaptableOptions.alertOptions.rowHighlightDuration);
+                }, this.getAlertOptions().rowHighlightDuration);
             }
         }
     }
@@ -199,7 +199,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         });
     }
     findAlertDefinitions(criteria) {
-        return this.getAdaptableApi().internalApi.findAdaptableObjectsByLookupCriteria(criteria, this.getAlertDefinitions({
+        return this.getAdaptableInternalApi().findAdaptableObjectsByLookupCriteria(criteria, this.getAlertDefinitions({
             includeLayoutNotAssociatedObjects: true,
         }));
     }
@@ -224,11 +224,12 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
     }
     createCellDataChangeInfoStubs(relevantColumnIds) {
         const cellDataChangeInfos = [];
+        //const adaptable: IAdaptable = this.getAdaptableInternalApi().getAdaptableInstance();
         const relevantColumns = this.getAdaptableApi()
             .columnApi.getColumnsWithColumnIds(relevantColumnIds)
             .filter(Boolean);
         const changedAt = Date.now();
-        this.adaptable.forAllRowNodesDo((rowNode) => {
+        this.getAdaptableInternalApi().forAllRowNodesDo((rowNode) => {
             relevantColumns.forEach((column) => {
                 const cellDataChangeInfoStub = {
                     changedAt,
@@ -236,8 +237,8 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                     column,
                     rowData: rowNode.data,
                     oldValue: null,
-                    newValue: this.adaptable.getRawValueFromRowNode(rowNode, column.columnId),
-                    primaryKeyValue: this.adaptable.getPrimaryKeyValueFromRowNode(rowNode),
+                    newValue: this.getGridApi().getRawValueFromRowNode(rowNode, column.columnId),
+                    primaryKeyValue: this.getGridApi().getPrimaryKeyValueForRowNode(rowNode),
                 };
                 cellDataChangeInfos.push(cellDataChangeInfoStub);
             });

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

@@ -6,21 +6,27 @@ import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
 import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';
+import { GridApi as AgGridApi } from '@ag-grid-community/core';
 import { ExportOptions } from '../../AdaptableOptions/ExportOptions';
 import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ColumnFilterApi, ColumnFilterOptions, ColumnOptions, CommentOptions, ConfigApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, GroupingOptions, LayoutApi, LayoutAssociatedObject, LayoutOptions, NamedQueryApi, NoteOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ColumnScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions, ColumnMenuOptions, ContextMenuOptions } from '../../types';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
+import { AdaptableInternalApi } from '../Internal/AdaptableInternalApi';
+import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
+import { IAdaptableStore } from '../../Redux/Store/Interface/IAdaptableStore';
 export declare abstract class ApiBase {
-    protected adaptable: IAdaptable;
+    protected _adaptable: IAdaptable;
     /**
      * Constructor for all the api classes which simply takes and assigns an instance of Adaptable
-     * @param adaptable the core IAdaptable object
+     * @param _adaptable the core IAdaptable object
      */
-    constructor(adaptable: IAdaptable);
+    constructor(_adaptable: IAdaptable);
+    protected getAdatableLogger(): AdaptableLogger;
     protected logInfo(message: string, ...optionalParams: any[]): void;
     protected logSuccess(message: string, ...optionalParams: any[]): void;
     protected logWarn(message: string, ...optionalParams: any[]): void;
     protected logError(message: string, ...optionalParams: any[]): void;
     protected getAdaptableVariant(): AdaptableVariant;
+    protected isAdapTableReady(): boolean;
     /**
      * Base api helper method which ensure that Adaptable Object being used in the function is not null or undefined
      *
@@ -46,6 +52,7 @@ export declare abstract class ApiBase {
      * This is a simple *getState()* call
      */
     getAdaptableState(): AdaptableState;
+    protected getAdaptableSore(): IAdaptableStore;
     protected addUidToAdaptableObject(adaptableObject: AdaptableObject): void;
     protected getModuleInfoByModuleId(module: AdaptableModule): ModuleInfo;
     protected showModulePopup(module: AdaptableModule, moduleParams?: ModuleParams): void;
@@ -85,6 +92,8 @@ export declare abstract class ApiBase {
     protected getSettingsPanelOptions(): SettingsPanelOptions;
     protected getFdc3Options(): Fdc3Options;
     protected getAdaptableApi(): AdaptableApi;
+    protected getAgGridApi(): AgGridApi;
+    protected getAdaptableInternalApi(): AdaptableInternalApi;
     protected getActionColumnApi(): ActionColumnApi;
     protected getActionRowApi(): ActionRowApi;
     protected getApplicationApi(): ApplicationApi;

package/src/Api/Implementation/ApiBase.js

@@ -8,25 +8,31 @@ const Uuid_1 = require("../../PredefinedConfig/Uuid");
 class ApiBase {
     /**
      * Constructor for all the api classes which simply takes and assigns an instance of Adaptable
-     * @param adaptable the core IAdaptable object
+     * @param _adaptable the core IAdaptable object
      */
-    constructor(adaptable) {
-        this.adaptable = adaptable;
+    constructor(_adaptable) {
+        this._adaptable = _adaptable;
+    }
+    getAdatableLogger() {
+        return this._adaptable.logger;
     }
     logInfo(message, ...optionalParams) {
-        this.adaptable.logger.info(message, ...optionalParams);
+        this._adaptable.logger.info(message, ...optionalParams);
     }
     logSuccess(message, ...optionalParams) {
-        this.adaptable.logger.success(message, ...optionalParams);
+        this._adaptable.logger.success(message, ...optionalParams);
     }
     logWarn(message, ...optionalParams) {
-        this.adaptable.logger.warn(message, ...optionalParams);
+        this._adaptable.logger.warn(message, ...optionalParams);
     }
     logError(message, ...optionalParams) {
-        this.adaptable.logger.error(message, ...optionalParams);
+        this._adaptable.logger.error(message, ...optionalParams);
     }
     getAdaptableVariant() {
-        return this.adaptable.variant;
+        return this._adaptable.variant;
+    }
+    isAdapTableReady() {
+        return this._adaptable.isReady;
     }
     /**
      * Base api helper method which ensure that Adaptable Object being used in the function is not null or undefined
@@ -55,19 +61,19 @@ class ApiBase {
             return objectList;
         }
         const associatedLayout = (config === null || config === void 0 ? void 0 : config.associatedWithLayout)
-            ? this.adaptable.api.layoutApi.getLayoutByName(config.associatedWithLayout)
+            ? this._adaptable.api.layoutApi.getLayoutByName(config.associatedWithLayout)
             : this.getAdaptableApi().layoutApi.getCurrentLayout();
-        return objectList.filter((objectItem) => this.adaptable.api.layoutApi.internalApi.isObjectAvailableInLayout(objectItem, module, associatedLayout));
+        return objectList.filter((objectItem) => this._adaptable.api.layoutApi.internalApi.isObjectAvailableInLayout(objectItem, module, associatedLayout));
     }
     /**
      * Base api Helper method that dispatches a *Redux Action* to the Store
      * @param action the Redux Action to be dispatched
      */
     dispatchAction(action) {
-        if (this.adaptable.isDestroyed) {
+        if (this._adaptable.isDestroyed) {
             return;
         }
-        this.adaptable.adaptableStore.TheStore.dispatch(action);
+        this._adaptable.adaptableStore.TheStore.dispatch(action);
     }
     /**
      * Returns the entire State from the Store
@@ -75,7 +81,10 @@ class ApiBase {
      * This is a simple *getState()* call
      */
     getAdaptableState() {
-        return this.adaptable.adaptableStore.TheStore.getState();
+        return this.getAdaptableSore().TheStore.getState();
+    }
+    getAdaptableSore() {
+        return this._adaptable.adaptableStore;
     }
     // Add the Uuid to the object if not present;
     // It's generally done in Redux also but no harm checking in Api also in case we missed it.
@@ -85,16 +94,16 @@ class ApiBase {
         }
     }
     getModuleInfoByModuleId(module) {
-        return this.adaptable.ModuleService.getModuleInfoByModule(module);
+        return this._adaptable.ModuleService.getModuleInfoByModule(module);
     }
     showModulePopup(module, moduleParams) {
         let moduleInfo = this.getModuleInfoByModuleId(module);
         if (moduleInfo) {
-            this.adaptable.api.internalApi.showPopupScreen(moduleInfo.ModuleName, moduleInfo.Popup, moduleParams);
+            this._adaptable.api.internalApi.showPopupScreen(moduleInfo.ModuleName, moduleInfo.Popup, moduleParams);
         }
     }
     getOptions() {
-        return this.adaptable.adaptableOptions;
+        return this._adaptable.adaptableOptions;
     }
     getActionColumnOptions() {
         return this.getOptions().actionColumnOptions;
@@ -181,25 +190,31 @@ class ApiBase {
         return this.getOptions().toolPanelOptions;
     }
     getChartingOptions() {
-        return this.adaptable.adaptableOptions.chartingOptions;
+        return this.getOptions().chartingOptions;
     }
     getDataChangeHistoryOptions() {
-        return this.adaptable.adaptableOptions.dataChangeHistoryOptions;
+        return this.getOptions().dataChangeHistoryOptions;
     }
     getEntitlementOptions() {
-        return this.adaptable.adaptableOptions.entitlementOptions;
+        return this.getOptions().entitlementOptions;
     }
     getFlashingCellOptions() {
-        return this.adaptable.adaptableOptions.flashingCellOptions;
+        return this.getOptions().flashingCellOptions;
     }
     getSettingsPanelOptions() {
-        return this.adaptable.adaptableOptions.settingsPanelOptions;
+        return this.getOptions().settingsPanelOptions;
     }
     getFdc3Options() {
-        return this.adaptable.adaptableOptions.fdc3Options;
+        return this.getOptions().fdc3Options;
     }
     getAdaptableApi() {
-        return this.adaptable.api;
+        return this._adaptable.api;
+    }
+    getAgGridApi() {
+        return this.getAdaptableApi().agGridApi;
+    }
+    getAdaptableInternalApi() {
+        return this.getAdaptableApi().internalApi;
     }
     getActionColumnApi() {
         return this.getAdaptableApi().actionColumnApi;
@@ -334,7 +349,7 @@ class ApiBase {
         return this.getAdaptableApi().fdc3Api;
     }
     destroy() {
-        delete this.adaptable;
+        delete this._adaptable;
     }
 }
 exports.ApiBase = ApiBase;

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

@@ -5,7 +5,7 @@ import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { CalculatedColumnInternalApi } from '../Internal/CalculatedColumnInternalApi';
 export declare class CalculatedColumnApiImpl extends ApiBase implements CalculatedColumnApi {
     internalApi: CalculatedColumnInternalApi;
-    constructor(adaptable: IAdaptable);
+    constructor(_adaptable: IAdaptable);
     getCalculatedColumnState(): CalculatedColumnState;
     getCalculatedColumns(): CalculatedColumn[];
     getCalculatedColumnById(id: CalculatedColumn['Uuid']): CalculatedColumn;

package/src/Api/Implementation/CalculatedColumnApiImpl.js

@@ -7,9 +7,9 @@ const ApiBase_1 = require("./ApiBase");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const CalculatedColumnInternalApi_1 = require("../Internal/CalculatedColumnInternalApi");
 class CalculatedColumnApiImpl extends ApiBase_1.ApiBase {
-    constructor(adaptable) {
-        super(adaptable);
-        this.internalApi = new CalculatedColumnInternalApi_1.CalculatedColumnInternalApi(adaptable);
+    constructor(_adaptable) {
+        super(_adaptable);
+        this.internalApi = new CalculatedColumnInternalApi_1.CalculatedColumnInternalApi(_adaptable);
     }
     getCalculatedColumnState() {
         return this.getAdaptableState().CalculatedColumn;

package/src/Api/Implementation/CalendarApiImpl.js

@@ -45,7 +45,7 @@ class CalendarApiImpl extends ApiBase_1.ApiBase {
         const holidays = this.getCalendarOptions().holidays;
         if (holidays) {
             if (typeof holidays === 'function') {
-                return holidays(this.getAdaptableApi().internalApi.buildBaseContext());
+                return holidays(this.getAdaptableInternalApi().buildBaseContext());
             }
             else {
                 return holidays;

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

@@ -5,7 +5,7 @@ import { ChartContainer, ChartDefinition } from '../../types';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { ExternalChartDefinition } from '../../PredefinedConfig/ChartingState';
 export declare class ChartingApiImpl extends ApiBase implements ChartingApi {
-    constructor(adaptable: IAdaptable);
+    constructor(_adaptable: IAdaptable);
     isChartingEnabled(): boolean;
     getCurrentChartModels(): ChartModel[];
     getChartRef(chartId: string): ChartRef;

package/src/Api/Implementation/ChartingApiImpl.js

@@ -9,18 +9,18 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectF
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const ChartingInternalApi_1 = require("../Internal/ChartingInternalApi");
 class ChartingApiImpl extends ApiBase_1.ApiBase {
-    constructor(adaptable) {
-        super(adaptable);
-        this.internalApi = new ChartingInternalApi_1.ChartingInternalApi(adaptable);
+    constructor(_adaptable) {
+        super(_adaptable);
+        this.internalApi = new ChartingInternalApi_1.ChartingInternalApi(_adaptable);
     }
     isChartingEnabled() {
-        return this.adaptable.canGenerateCharts();
+        return this._adaptable.canGenerateCharts();
     }
     getCurrentChartModels() {
-        return this.adaptable.getChartModels();
+        return this._adaptable.getChartModels();
     }
     getChartRef(chartId) {
-        return this.adaptable.getChartRef(chartId);
+        return this._adaptable.getChartRef(chartId);
     }
     saveCurrentCharts() {
         const currentCharts = this.getCurrentChartModels();
@@ -49,14 +49,14 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         }
     }
     showPersistedCharts() {
-        return this.adaptable.showCharts(this.getChartDefinitions());
+        return this._adaptable.showCharts(this.getChartDefinitions());
     }
     showChartDefinition(chartDefiniton, container) {
         let containerElement = container;
         if (typeof containerElement === 'string') {
             containerElement = this.internalApi.getContainerElemetnByName(containerElement);
         }
-        return this.adaptable.showChart(chartDefiniton, containerElement);
+        return this._adaptable.showChart(chartDefiniton, containerElement);
     }
     showChartDefinitionOnce(chartDefinition, container) {
         var _a;
@@ -77,7 +77,7 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         this.updateAgChart(editedChartDefinition);
     }
     updateAgChart(chartDefinition) {
-        this.adaptable.updateChart(chartDefinition);
+        this._adaptable.updateChart(chartDefinition);
     }
     addChartDefinition(chart) {
         this.dispatchAction(ChartingRedux.ChartingAddChart(chart));

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

@@ -8,7 +8,7 @@ export declare function isAutoRowGroupColumn(columnId: string): boolean;
 export declare function isAutoPivotColumn(columnId: string): boolean;
 export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     internalApi: ColumnInternalApi;
-    constructor(adaptable: IAdaptable);
+    constructor(_adaptable: IAdaptable);
     getColumns(): AdaptableColumn[];
     getStandardColumns(): AdaptableColumn[];
     getNonSpecialColumns(): AdaptableColumn[];

package/src/Api/Implementation/ColumnApiImpl.js

@@ -23,9 +23,9 @@ function isAutoPivotColumn(columnId) {
 }
 exports.isAutoPivotColumn = isAutoPivotColumn;
 class ColumnApiImpl extends ApiBase_1.ApiBase {
-    constructor(adaptable) {
-        super(adaptable);
-        this.internalApi = new ColumnInternalApi_1.ColumnInternalApi(adaptable);
+    constructor(_adaptable) {
+        super(_adaptable);
+        this.internalApi = new ColumnInternalApi_1.ColumnInternalApi(_adaptable);
     }
     getColumns() {
         var _a;
@@ -50,34 +50,34 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getColumns().filter((c) => visibleCols[c.columnId]);
     }
     selectColumn(columnId) {
-        this.adaptable.selectColumn(columnId);
+        this._adaptable.selectColumn(columnId);
     }
     selectColumns(columnIds) {
-        this.adaptable.selectColumns(columnIds);
+        this._adaptable.selectColumns(columnIds);
     }
     addColumnToSelection(columnId) {
-        this.adaptable.selectColumn(columnId, { keepExistingSelection: true });
+        this._adaptable.selectColumn(columnId, { keepExistingSelection: true });
     }
     addColumnsToSelection(columnIds) {
-        this.adaptable.selectColumns(columnIds, { keepExistingSelection: true });
+        this._adaptable.selectColumns(columnIds, { keepExistingSelection: true });
     }
     selectAllColumns() {
-        this.adaptable.selectAll();
+        this._adaptable.selectAll();
     }
     autosizeColumn(columnId) {
-        this.adaptable.autoSizeColumn(columnId);
+        this._adaptable.autoSizeColumn(columnId);
     }
     autosizeColumns(columnIds) {
-        this.adaptable.autoSizeColumns(columnIds);
+        this._adaptable.autoSizeColumns(columnIds);
     }
     autosizeAllColumns() {
-        this.adaptable.autoSizeAllColumns();
+        this._adaptable.autoSizeAllColumns();
     }
     hideColumn(columnId) {
-        this.adaptable.hideColumn(columnId);
+        this._adaptable.hideColumn(columnId);
     }
     showColumn(columnId) {
-        this.adaptable.showColumn(columnId);
+        this._adaptable.showColumn(columnId);
     }
     isAutoRowGroupColumn(columnId) {
         return isAutoRowGroupColumn(columnId);
@@ -334,7 +334,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getColumns().filter((c) => c.exportable);
     }
     logMissingColumnWarning(columnId) {
-        if (this.adaptable.adaptableOptions.columnOptions.showMissingColumnsWarning === true) {
+        if (this.getColumnOptions().showMissingColumnsWarning === true) {
             if (!this.isAutoRowGroupColumn(columnId) &&
                 !this.isCalculatedColumn(columnId) &&
                 !this.isFreeTextColumn(columnId) &&
@@ -344,7 +344,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
     }
     getPrimaryKeyColumn() {
-        return this.getColumnWithColumnId(this.adaptable.adaptableOptions.primaryKey);
+        return this.getColumnWithColumnId(this.getOptions().primaryKey);
     }
     getDefaultAggFunc(columnId) {
         var _a, _b, _c;
@@ -391,15 +391,15 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableApi().layoutApi.setColumnCaption(columnId, caption);
     }
     updateColumnConfiguration(columnConfig) {
-        (0, logDeprecation_1.logDeprecationExternal)(this.adaptable.logger, 'ColumnApi', 'updateColumnConfiguration', 'GridApi', 'updateAgGridColumnState');
+        (0, logDeprecation_1.logDeprecationExternal)(this.getAdatableLogger(), 'ColumnApi', 'updateColumnConfiguration', 'GridApi', 'updateAgGridColumnState');
         this.getGridApi().updateAgGridColumnState(columnConfig);
     }
     updateColumnConfigurations(columnConfigs) {
-        (0, logDeprecation_1.logDeprecationExternal)(this.adaptable.logger, 'ColumnApi', 'updateColumnConfigurations', 'GridApi', 'updateAgGridColumnStates');
+        (0, logDeprecation_1.logDeprecationExternal)(this.getAdatableLogger(), 'ColumnApi', 'updateColumnConfigurations', 'GridApi', 'updateAgGridColumnStates');
         this.getGridApi().updateAgGridColumnStates(columnConfigs);
     }
     setColumnDefinitions(columnDefinitions) {
-        (0, logDeprecation_1.logDeprecationExternal)(this.adaptable.logger, 'ColumnApi', 'setColumnDefinitions', 'GridApi', 'setAgGridColumnDefinitions');
+        (0, logDeprecation_1.logDeprecationExternal)(this.getAdatableLogger(), 'ColumnApi', 'setColumnDefinitions', 'GridApi', 'setAgGridColumnDefinitions');
         this.getGridApi().setAgGridColumnDefinitions(columnDefinitions);
     }
 }

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

@@ -7,7 +7,7 @@ import { ColumnFilterInternalApi } from '../Internal/ColumnFilterInternalApi';
 import { ColumnFilterApi } from '../ColumnFilterApi';
 export declare class ColumnFilterApiImpl extends ApiBase implements ColumnFilterApi {
     internalApi: ColumnFilterInternalApi;
-    constructor(adaptable: IAdaptable);
+    constructor(_adaptable: IAdaptable);
     getFilterPredicateDefsForColumn(column: AdaptableColumn): AdaptablePredicateDef[];
     getFilterPredicateDefsForColumnId(columnId: string): AdaptablePredicateDef[] | undefined;
     showQuickFilterBar(): void;