@adaptabletools/adaptable 19.1.0-canary.0 → 19.1.1

package/src/Api/Internal/ExportInternalApi.js

@@ -75,7 +75,7 @@ export class ExportInternalApi extends ApiBase {
                 }
                 return false;
             case 'VisibleRows':
-                return this.adaptable.isRowNodeVisible(cellDataChangedInfo.rowNode);
+                return this._adaptable.isRowNodeVisible(cellDataChangedInfo.rowNode);
         }
     }
     getExcelDataType(adaptableColumnType) {
@@ -115,7 +115,7 @@ export class ExportInternalApi extends ApiBase {
         const exportFormatType = exportOptions.exportFormatType;
         // First check if a function was provided and return the result
         if (exportFormatType != null && typeof exportFormatType === 'function') {
-            const context = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { column: column });
+            const context = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { column: column });
             return exportFormatType(context);
         }
         // Next Check if a "hard-coded" value has been provided and return that
@@ -299,7 +299,7 @@ export class ExportInternalApi extends ApiBase {
                 case 'SelectedRows':
                     return '[Selected Rows]';
                 case 'ExpressionRows':
-                    return this.getAdaptableApi().internalApi.getAdaptableQueryExpressionText(report.Query);
+                    return this.getAdaptableInternalApi().getAdaptableQueryExpressionText(report.Query);
             }
         }
     }
@@ -360,17 +360,17 @@ export class ExportInternalApi extends ApiBase {
         const resultRowData = [];
         switch (report.ReportRowScope) {
             case 'AllRows':
-                this.getAdaptableApi().internalApi.forAllRowNodesDo((rowNode) => {
+                this.getAdaptableInternalApi().forAllRowNodesDo((rowNode) => {
                     resultRowData.push(this.getRowObjectForColumnIds(rowNode, columnIds, report.Name));
                 });
                 break;
             case 'VisibleRows':
-                this.getAdaptableApi().internalApi.forAllVisibleRowNodesDo((rowNode) => {
+                this.getAdaptableInternalApi().forAllVisibleRowNodesDo((rowNode) => {
                     resultRowData.push(this.getRowObjectForColumnIds(rowNode, columnIds, report.Name));
                 });
                 break;
             case 'ExpressionRows':
-                this.getAdaptableApi().internalApi.forAllRowNodesDo((rowNode) => {
+                this.getAdaptableInternalApi().forAllRowNodesDo((rowNode) => {
                     var _a;
                     if (this.getAdaptableApi()
                         .internalApi.getQueryLanguageService()
@@ -384,7 +384,7 @@ export class ExportInternalApi extends ApiBase {
                 const { gridCells: GridCells } = selectedCellInfo;
                 let selectedCellsByPrimaryKey = groupBy(GridCells, 'primaryKeyValue');
                 // we iterate over all visibleRowNodes to preserve the current order
-                this.getAdaptableApi().internalApi.forAllVisibleRowNodesDo((rowNode) => {
+                this.getAdaptableInternalApi().forAllVisibleRowNodesDo((rowNode) => {
                     const rowPrimaryKeyValue = this.getAdaptableApi().gridApi.getPrimaryKeyValueForRowNode(rowNode);
                     const selectedRowCells = selectedCellsByPrimaryKey[rowPrimaryKeyValue];
                     if (selectedRowCells) {
@@ -402,7 +402,7 @@ export class ExportInternalApi extends ApiBase {
                 const selectedRowInfo = this.getAdaptableApi().gridApi.getSelectedRowInfo();
                 const selectedGridRowPrimaryKeys = (_b = (_a = selectedRowInfo === null || selectedRowInfo === void 0 ? void 0 : selectedRowInfo.gridRows) === null || _a === void 0 ? void 0 : _a.filter((gr) => gr.rowInfo.isGroup == false).map((gridRow) => gridRow.primaryKeyValue)) !== null && _b !== void 0 ? _b : [];
                 if (selectedGridRowPrimaryKeys.length) {
-                    this.getAdaptableApi().internalApi.forAllRowNodesDo((rowNode) => {
+                    this.getAdaptableInternalApi().forAllRowNodesDo((rowNode) => {
                         const rowPrimaryKeyValue = this.getAdaptableApi().gridApi.getPrimaryKeyValueForRowNode(rowNode);
                         if (selectedGridRowPrimaryKeys.includes(rowPrimaryKeyValue)) {
                             resultRowData.push(this.getRowObjectForColumnIds(rowNode, columnIds, report.Name));
@@ -438,7 +438,7 @@ export class ExportInternalApi extends ApiBase {
         }, {});
     }
     publishLiveLiveDataChangedEvent(reportDestination, liveDataTrigger, liveReport) {
-        const liveDataChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { reportDestination: reportDestination, liveDataTrigger: liveDataTrigger, liveReport: liveReport });
+        const liveDataChangedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { reportDestination: reportDestination, liveDataTrigger: liveDataTrigger, liveReport: liveReport });
         this.getAdaptableApi().eventApi.emit('LiveDataChanged', liveDataChangedInfo);
     }
     getCellExportValueFromRowNode(rowNode, columnId, reportName) {
@@ -525,14 +525,15 @@ export class ExportInternalApi extends ApiBase {
             formatColumnsWithDisplayFormatForColumn[columnId] = formatColumns;
             return formatColumns;
         };
-        const displayedColumns = this.getAdaptableApi().agGridApi.getAllDisplayedColumns();
-        const colDefs = displayedColumns.map((column) => {
+        const agGridDisplayedColumns = this.getAgGridApi().getAllDisplayedColumns();
+        const colDefs = agGridDisplayedColumns.map((column) => {
             return column.getColDef();
         });
         const forAllVisibleRowNodesDoConfig = { includeGroupRows: true };
-        const agGridApi = this.getAdaptableApi().agGridApi;
-        const userExcelStyles = this.adaptable.agGridAdapter.getUserGridOptionsProperty('excelStyles') || [];
-        this.getAdaptableApi().internalApi.forAllVisibleRowNodesDo((node, rowIndex) => {
+        const agGridApi = this.getAgGridApi();
+        const userExcelStyles = this.getAdaptableInternalApi().getAgGridAdapter().getUserGridOptionsProperty('excelStyles') ||
+            [];
+        this.getAdaptableInternalApi().forAllVisibleRowNodesDo((node, rowIndex) => {
             const rowParams = {
                 node,
                 data: node.data,
@@ -542,7 +543,7 @@ export class ExportInternalApi extends ApiBase {
             };
             const getRowStyleFn = agGridApi.getGridOption('getRowStyle');
             const rowStyle = getRowStyleFn ? getRowStyleFn(rowParams) : {};
-            displayedColumns.forEach((column, columnIndex) => {
+            agGridDisplayedColumns.forEach((column, columnIndex) => {
                 var _a, _b, _c;
                 const colDef = colDefs[columnIndex];
                 const columnId = column.getId();
@@ -564,12 +565,10 @@ export class ExportInternalApi extends ApiBase {
                     }
                     return cellClassParams;
                 };
-                const cellStyle = typeof colDef.cellStyle === 'function'
-                    ? colDef.cellStyle(getLazyCellClassParams())
-                    : {};
+                const cellStyle = typeof colDef.cellStyle === 'function' ? colDef.cellStyle(getLazyCellClassParams()) : {};
                 const excelStyles = [];
                 // add user defined excel styles
-                let userColDefCellClass = this.adaptable.agGridColumnAdapter.getUserColDefProperty(column.getColId(), 'cellClass');
+                let userColDefCellClass = this._adaptable.agGridColumnAdapter.getUserColDefProperty(column.getColId(), 'cellClass');
                 const userDefinedCellClass = typeof userColDefCellClass === 'function'
                     ? userColDefCellClass(getLazyCellClassParams())
                     : userColDefCellClass;
@@ -602,7 +601,7 @@ export class ExportInternalApi extends ApiBase {
                     !(excelDataType === 'DateTime' && isDateCellExportedAsFormattedValue)) {
                     return;
                 }
-                const cellClassId = this.adaptable.agGridColumnAdapter.getExcelClassNameForCell(column.getId(), this.adaptable.getPrimaryKeyValueFromRowNode(node), userDefinedCellClass);
+                const cellClassId = this._adaptable.agGridColumnAdapter.getExcelClassNameForCell(column.getId(), this._adaptable.getPrimaryKeyValueFromRowNode(node), userDefinedCellClass);
                 const finalCellExcelStyle = Object.assign({}, ...excelStyles);
                 if (excelDataType === 'DateTime' && isDateCellExportedAsFormattedValue) {
                     let dateFormatPattern = this.getAdaptableApi().optionsApi.getExportOptions().exportDateFormat;
@@ -614,7 +613,7 @@ export class ExportInternalApi extends ApiBase {
                                 ((_c = (_b = mostRelevantFormatColumn === null || mostRelevantFormatColumn === void 0 ? void 0 : mostRelevantFormatColumn.DisplayFormat) === null || _b === void 0 ? void 0 : _b.Options) === null || _c === void 0 ? void 0 : _c.Pattern);
                     }
                     if (dateFormatPattern) {
-                        const normalisedValue = this.adaptable.getNormalisedValueFromRawValue(rawValue, abColumn);
+                        const normalisedValue = this._adaptable.getNormalisedValueFromRawValue(rawValue, abColumn);
                         if (normalisedValue) {
                             // we have to pass the date in the ISO format to Excel
                             // see https://www.ag-grid.com/javascript-data-grid/excel-export-data-types/#dates
@@ -626,7 +625,7 @@ export class ExportInternalApi extends ApiBase {
                                 finalCellExcelStyle.dataType = 'DateTime';
                                 finalCellExcelStyle.numberFormat = { format: dateFormatPattern };
                                 // create a new cell key to ensure any user provided className does not interfere
-                                const cellKey = this.adaptable.agGridColumnAdapter.getExcelClassNameForCell(column.getColId(), this.adaptable.getPrimaryKeyValueFromRowNode(node));
+                                const cellKey = this._adaptable.agGridColumnAdapter.getExcelClassNameForCell(column.getColId(), this._adaptable.getPrimaryKeyValueFromRowNode(node));
                                 // we need to register so that later the cellProcessor will put the isoFormattedValue through (thus giving the formatting responsability to Excel)
                                 this.registerExcelStyleWithFormattedDate(cellKey, isoFormattedValue);
                             }

package/src/Api/Internal/ExpressionInternalApi.js

@@ -16,7 +16,7 @@ export class ExpressionInternalApi extends ApiBase {
         if (typeof evaluateExpressionExternallyFn !== 'function') {
             return true;
         }
-        const context = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { module });
+        const context = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { module });
         if (object) {
             context.object = object;
         }
@@ -34,7 +34,7 @@ export class ExpressionInternalApi extends ApiBase {
         if (typeof evaluateExpressionExternallyFn !== 'function') {
             return true;
         }
-        const context = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { module });
+        const context = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { module });
         if (object) {
             context.object = object;
         }
@@ -78,9 +78,9 @@ export class ExpressionInternalApi extends ApiBase {
     //   return keys;
     // }
     getFieldsFromOptions() {
-        const fields = this.adaptable.api.optionsApi.getExpressionOptions().fields;
+        const fields = this.getExpressionOptions().fields;
         if (fields != null && typeof fields === 'function') {
-            return fields(this.getAdaptableApi().internalApi.buildBaseContext());
+            return fields(this.getAdaptableInternalApi().buildBaseContext());
         }
         else {
             let arr = fields;

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

@@ -33,5 +33,4 @@ export declare class Fdc3InternalApi extends ApiBase {
     private getDefaultFdc3ButtonLabel;
     private getDefaultFdc3ButtonIcon;
     private getDefaultFdc3ButtonStyle;
-    private getFdc3Service;
 }

package/src/Api/Internal/Fdc3InternalApi.js

@@ -15,7 +15,7 @@ export class Fdc3InternalApi extends ApiBase {
         const contextMappedFromGridData = Object.assign({ type: contextType }, mappedContextData);
         const resolveContextDataFn = this.getFdc3Options().resolveContextData;
         if (typeof resolveContextDataFn === 'function') {
-            return resolveContextDataFn(Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { contextType,
+            return resolveContextDataFn(Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { contextType,
                 contextMappedFromGridData,
                 rowNode, rowData: rowNode.data, primaryKeyValue: this.getGridApi().getPrimaryKeyValueForRowNode(rowNode) }));
         }
@@ -42,7 +42,7 @@ export class Fdc3InternalApi extends ApiBase {
                 filter: false,
                 sortable: false,
                 enableRowGroup: false,
-                cellRenderer: this.adaptable.variant === 'react' ? ReactActionColumnRenderer : ActionColumnRenderer,
+                cellRenderer: this.getAdaptableVariant() === 'react' ? ReactActionColumnRenderer : ActionColumnRenderer,
                 type: [AB_SPECIAL_COLUMN, AB_FDC3_COLUMN, 'abColDefObject'],
             });
         }
@@ -62,7 +62,7 @@ export class Fdc3InternalApi extends ApiBase {
                 filter: false,
                 sortable: false,
                 enableRowGroup: false,
-                cellRenderer: this.adaptable.variant === 'react' ? ReactActionColumnRenderer : ActionColumnRenderer,
+                cellRenderer: this.getAdaptableVariant() === 'react' ? ReactActionColumnRenderer : ActionColumnRenderer,
                 type: [AB_SPECIAL_COLUMN, AB_FDC3_COLUMN, 'abColDefObject'],
             };
         };
@@ -144,11 +144,11 @@ export class Fdc3InternalApi extends ApiBase {
         const relevantRaiseIntentConfig = this.getAllRaiseIntentConfigs().find((config) => config.intentType === raisedIntent && config.contextType === context.type);
         if (typeof (relevantRaiseIntentConfig === null || relevantRaiseIntentConfig === void 0 ? void 0 : relevantRaiseIntentConfig.handleIntentResolution) === 'function') {
             // call intent specific resolution handler
-            relevantRaiseIntentConfig.handleIntentResolution(Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { intentResolution }));
+            relevantRaiseIntentConfig.handleIntentResolution(Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { intentResolution }));
         }
         else {
             // call global resolution handler (if any)
-            (_b = (_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.handleIntentResolution) === null || _b === void 0 ? void 0 : _b.call(_a, Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { intentResolution }));
+            (_b = (_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.handleIntentResolution) === null || _b === void 0 ? void 0 : _b.call(_a, Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { intentResolution }));
         }
     }
     isStandardContextType(contextType) {
@@ -197,7 +197,7 @@ export class Fdc3InternalApi extends ApiBase {
     }
     getDefaultIconForIntent(intentType) {
         var _a, _b;
-        const defaultConfig = this.getFdc3Service().getUiControlsDefaultConfiguration();
+        const defaultConfig = this.getAdaptableInternalApi().getFdc3Service().getUiControlsDefaultConfiguration();
         // @ts-ignore
         const intentIcon = (_b = (_a = defaultConfig === null || defaultConfig === void 0 ? void 0 : defaultConfig.intents[intentType]) === null || _a === void 0 ? void 0 : _a.icon) !== null && _b !== void 0 ? _b : {
             name: 'fdc3',
@@ -206,7 +206,7 @@ export class Fdc3InternalApi extends ApiBase {
     }
     getDefaultIconForContext(contextType) {
         var _a, _b;
-        const defaultConfig = this.getFdc3Service().getUiControlsDefaultConfiguration();
+        const defaultConfig = this.getAdaptableInternalApi().getFdc3Service().getUiControlsDefaultConfiguration();
         // @ts-ignore
         const contextIcon = (_b = (_a = defaultConfig === null || defaultConfig === void 0 ? void 0 : defaultConfig.contexts[contextType]) === null || _a === void 0 ? void 0 : _a.icon) !== null && _b !== void 0 ? _b : {
             name: 'fdc3',
@@ -241,7 +241,7 @@ export class Fdc3InternalApi extends ApiBase {
                     // '_field.fieldName'
                     if (valueReference.startsWith(FieldRefTypePrefix)) {
                         const fieldId = valueReference.replace(FieldRefTypePrefix, '');
-                        mappedData[contextKey] = this.getAdaptableApi().internalApi.getValueUsingField(rowNode.data, fieldId);
+                        mappedData[contextKey] = this.getAdaptableInternalApi().getValueUsingField(rowNode.data, fieldId);
                     }
                 }
                 return mappedData;
@@ -261,7 +261,7 @@ export class Fdc3InternalApi extends ApiBase {
     }
     mapFdc3ButtonConfigToAdaptableButton(fdc3AdaptableButton, fdcInfo) {
         const buildFdc3Context = (context) => {
-            return Object.assign({ context: this.mapRowToContextData(fdcInfo.contextType, context.rowNode), intent: fdcInfo.action === 'raiseIntent' ? fdcInfo.intent : null, rowNode: context.rowNode, rowData: context.data, primaryKeyValue: context.primaryKeyValue }, this.getAdaptableApi().internalApi.buildBaseContext());
+            return Object.assign({ context: this.mapRowToContextData(fdcInfo.contextType, context.rowNode), intent: fdcInfo.action === 'raiseIntent' ? fdcInfo.intent : null, rowNode: context.rowNode, rowData: context.data, primaryKeyValue: context.primaryKeyValue }, this.getAdaptableInternalApi().buildBaseContext());
         };
         return {
             onClick: (_button, context) => {
@@ -351,7 +351,4 @@ export class Fdc3InternalApi extends ApiBase {
             tone: 'neutral',
         };
     }
-    getFdc3Service() {
-        return this.adaptable.Fdc3Service;
-    }
 }

package/src/Api/Internal/FlashingCellInternalApi.js

@@ -8,7 +8,7 @@ export class FlashingCellInternalApi extends ApiBase {
      * @param flashingCellDefinition Flashing Cell Definition to Merge
      */
     mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition) {
-        let flashingDefaults = this.adaptable.adaptableOptions.flashingCellOptions;
+        let flashingDefaults = this.getFlashingCellOptions();
         if (!flashingDefaults) {
             return flashingCellDefinition;
         }
@@ -33,7 +33,7 @@ export class FlashingCellInternalApi extends ApiBase {
     }
     getAdaptableFlashingCellFor(primaryKey, columnId) {
         var _a;
-        const flashingCellService = this.getAdaptableApi().internalApi.getFlashingCellService();
+        const flashingCellService = this.getAdaptableInternalApi().getFlashingCellService();
         const AdaptableFlashingAlerts = flashingCellService.gridCellsCurrentlyFlashing;
         const AdaptableFlashingAlertsMap = flashingCellService.flashingCellsMapping;
         const forPrimaryKey = (_a = AdaptableFlashingAlerts[primaryKey]) !== null && _a !== void 0 ? _a : {};

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -125,8 +125,7 @@ export class FormatColumnInternalApi extends ApiBase {
         if (!(columnCustomFormatters === null || columnCustomFormatters === void 0 ? void 0 : columnCustomFormatters.length)) {
             return value;
         }
-        const adaptableOptions = this.adaptable.adaptableOptions;
-        const customFormattersFromOptions = (_c = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.formatColumnOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters) !== null && _c !== void 0 ? _c : [];
+        const customFormattersFromOptions = (_c = (_b = this.getFormatColumnOptions()) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters) !== null && _c !== void 0 ? _c : [];
         // formatters are applied in the order they are defined in the options
         const customFormatters = customFormattersFromOptions.filter((customFormatterOption) => columnCustomFormatters.includes(customFormatterOption.id));
         const customDisplayFormatterContext = ObjectFactory.CreateCustomDisplayFormatterContext(value, node, abColumn, this.getAdaptableApi());
@@ -182,7 +181,7 @@ export class FormatColumnInternalApi extends ApiBase {
         }
         // first run the predicate
         if (formatColumn.Rule.Predicates && ((_e = (_d = formatColumn.Rule) === null || _d === void 0 ? void 0 : _d.Predicates) === null || _e === void 0 ? void 0 : _e.length)) {
-            const predicateDefHandlerContext = Object.assign({ value: cellValue, oldValue: null, displayValue: cellValue, node: rowNode, column: column }, this.getAdaptableApi().internalApi.buildBaseContext());
+            const predicateDefHandlerContext = Object.assign({ value: cellValue, oldValue: null, displayValue: cellValue, node: rowNode, column: column }, this.getAdaptableInternalApi().buildBaseContext());
             return this.evaluatePredicate(formatColumn, predicateDefHandlerContext);
         } // then run the Expression
         else if (formatColumn.Rule.BooleanExpression) {

package/src/Api/Internal/FreeTextColumnInternalApi.js

@@ -24,7 +24,8 @@ export class FreeTextColumnInternalApi extends ApiBase {
             refencedCalcColumns.forEach((calculatedColumn) => {
                 colsToRefresh.push(calculatedColumn.ColumnId);
             });
-            this.adaptable.refreshCells([cellDataChangedInfo.rowNode], colsToRefresh, false);
+            const suppressFlash = false;
+            this.getGridApi().refreshCells([cellDataChangedInfo.rowNode], colsToRefresh, suppressFlash);
         }
     }
     /**
@@ -33,7 +34,9 @@ export class FreeTextColumnInternalApi extends ApiBase {
      */
     getFreeTextColumnModuleReferences(freeTextColumn) {
         const references = [];
-        this.adaptable.adaptableModules.forEach((module) => {
+        this.getAdaptableInternalApi()
+            .getModules()
+            .forEach((module) => {
             if (module
                 .getModuleFreeTextColumnReferences()
                 .some((moduleReference) => moduleReference.Uuid === freeTextColumn.Uuid)) {

package/src/Api/Internal/GridFilterInternalApi.js

@@ -1,12 +1,12 @@
 import { ApiBase } from '../Implementation/ApiBase';
 export class GridFilterInternalApi extends ApiBase {
     fireGridFilterAppliedEvent() {
-        if (this.adaptable.isReady) {
+        if (this.isAdapTableReady()) {
             const currentGridFilter = this.getGridFilterApi().getCurrentGridFilter();
             const adaptableApi = this.getAdaptableApi();
             const gridFilterAppliedInfo = Object.assign({ gridFilter: currentGridFilter, gridFilterExpressionAST: currentGridFilter
                     ? adaptableApi.expressionApi.getASTForExpression(currentGridFilter === null || currentGridFilter === void 0 ? void 0 : currentGridFilter.Expression)
-                    : null }, this.getAdaptableApi().internalApi.buildBaseContext());
+                    : null }, this.getAdaptableInternalApi().buildBaseContext());
             adaptableApi.eventApi.emit('GridFilterApplied', gridFilterAppliedInfo);
         }
     }

package/src/Api/Internal/GridInternalApi.js

@@ -11,10 +11,10 @@ export class GridInternalApi extends ApiBase {
      * Fires Grid Sorted Event
      */
     fireGridSortedEvent() {
-        if (this.adaptable.isReady) {
+        if (this.isAdapTableReady()) {
             const adaptableSortState = this.getAdaptableApi().configApi.getAdaptableSortState();
             const adaptableApi = this.getAdaptableApi();
-            const gridSortedInfo = Object.assign({ adaptableSortState: adaptableSortState }, this.getAdaptableApi().internalApi.buildBaseContext());
+            const gridSortedInfo = Object.assign({ adaptableSortState: adaptableSortState }, this.getAdaptableInternalApi().buildBaseContext());
             adaptableApi.eventApi.emit('GridSorted', gridSortedInfo);
         }
     }
@@ -22,8 +22,8 @@ export class GridInternalApi extends ApiBase {
      * Fires Cell Changed Changed Event - when any data in AG Grid's dataset has changed
      */
     fireCellChangedEvent(cellDataChangedInfo) {
-        if (this.adaptable.isReady) {
-            const cellChangedInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { cellChange: cellDataChangedInfo });
+        if (this.isAdapTableReady()) {
+            const cellChangedInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { cellChange: cellDataChangedInfo });
             this.getAdaptableApi().eventApi.emit('CellChanged', cellChangedInfo);
         }
     }
@@ -31,12 +31,12 @@ export class GridInternalApi extends ApiBase {
      * Fires Grid Data Changed Event - when a row has changed in AG Grid
      */
     fireGridDataChangedEvent(dataRows, rowNodes, rowTrigger) {
-        if (this.adaptable.isReady) {
+        if (this.isAdapTableReady()) {
             const gridDataChangedInfo = Object.assign({ changedAt: Date.now(), rowTrigger,
                 dataRows,
-                rowNodes }, this.getAdaptableApi().internalApi.buildBaseContext());
+                rowNodes }, this.getAdaptableInternalApi().buildBaseContext());
             this.getAdaptableApi().eventApi.emit('GridDataChanged', gridDataChangedInfo);
-            this.adaptable.DataService.CreateGridChangedEvent(gridDataChangedInfo);
+            this.getAdaptableInternalApi().getDataService().CreateGridChangedEvent(gridDataChangedInfo);
         }
     }
     /**
@@ -51,7 +51,7 @@ export class GridInternalApi extends ApiBase {
         const distinctValuesParams = {
             visibleRowsOnly: false,
         };
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
+        const returnValues = this._adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
         return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
             return cv.normalisedValue;
         });
@@ -84,7 +84,7 @@ export class GridInternalApi extends ApiBase {
         const shouldShowValuesCount = this.shouldShowValuesCount(abColumn);
         let valueOptions = [];
         if (shouldShowValuesCount) {
-            const allGridCells = this.adaptable.getGridCellsForColumn(columnId, this.getColumnFilterOptions().valuesFilterOptions.showCurrentlyFilteredValuesCount);
+            const allGridCells = this._adaptable.getGridCellsForColumn(columnId, this.getColumnFilterOptions().valuesFilterOptions.showCurrentlyFilteredValuesCount);
             const allGridValues = allGridCells.map((gc) => gc.displayValue);
             const newsortedDistinctValues = sortedDistinctValues.filter((gc) => gc.displayValue != undefined && gc.displayValue != '' && gc.displayValue != null);
             valueOptions = newsortedDistinctValues.map((cv) => {
@@ -114,7 +114,7 @@ export class GridInternalApi extends ApiBase {
         let returnValue = false;
         if (showValuesCount) {
             if (typeof showValuesCount === 'function') {
-                const columnFilterContext = Object.assign({ column }, this.getAdaptableApi().internalApi.buildBaseContext());
+                const columnFilterContext = Object.assign({ column }, this.getAdaptableInternalApi().buildBaseContext());
                 returnValue = showValuesCount(columnFilterContext);
             }
             else {
@@ -144,12 +144,12 @@ export class GridInternalApi extends ApiBase {
     addPredicateValues(params) {
         var _a, _b, _c, _d;
         const { valueOptions, column, shouldShowValuesCount, visibleRowsOnly } = params;
-        const visibleGridCells = this.adaptable.getGridCellsForColumnTemp(column.columnId, visibleRowsOnly);
+        const visibleGridCells = this._adaptable.getGridCellsForColumnTemp(column.columnId, visibleRowsOnly);
         let allGridCells;
         if (shouldShowValuesCount) {
             allGridCells = visibleRowsOnly
                 ? visibleGridCells
-                : this.adaptable.getGridCellsForColumnTemp(column.columnId, this.getColumnFilterOptions().valuesFilterOptions.showCurrentlyFilteredValuesCount);
+                : this._adaptable.getGridCellsForColumnTemp(column.columnId, this.getColumnFilterOptions().valuesFilterOptions.showCurrentlyFilteredValuesCount);
         }
         const adaptableApi = this.getAdaptableApi();
         const predicateIds = adaptableApi.columnFilterApi.internalApi.getValuesFitlerPredicateIds(column);
@@ -228,12 +228,12 @@ export class GridInternalApi extends ApiBase {
             preparedPermittedValues = await (filterPermittedValues === null || filterPermittedValues === void 0 ? void 0 : filterPermittedValues.values(filterPermittedValuesParams));
         }
         catch (error) {
-            this.adaptable.logger.consoleError(`Failed to load filter permitted values`, column, filter, error);
+            this._adaptable.logger.consoleError(`Failed to load filter permitted values`, column, filter, error);
         }
         distinctValuesParams.permittedValues = preparedPermittedValues;
         return {
             suppressClientSideFilter: filterPermittedValues.suppressFilterSearchBar,
-            gridCells: this.adaptable.getDistinctValuesForColumn(column, distinctValuesParams),
+            gridCells: this._adaptable.getDistinctValuesForColumn(column, distinctValuesParams),
         };
     }
     /**
@@ -261,10 +261,10 @@ export class GridInternalApi extends ApiBase {
             preparedPermittedValues = await (customSortPermittedValues === null || customSortPermittedValues === void 0 ? void 0 : customSortPermittedValues.values(permittedValuesParams));
         }
         catch (error) {
-            this.adaptable.logger.consoleError(`Failed to load custom sort permitted values`, column, error);
+            this._adaptable.logger.consoleError(`Failed to load custom sort permitted values`, column, error);
         }
         distinctValuesParams.permittedValues = preparedPermittedValues;
-        return this.adaptable.getDistinctValuesForColumn(column, distinctValuesParams);
+        return this._adaptable.getDistinctValuesForColumn(column, distinctValuesParams);
     }
     /**
      * Gets all distinct Bulk Update values for the Column with the given ColumnId
@@ -292,10 +292,10 @@ export class GridInternalApi extends ApiBase {
             preparedPermittedValues = await (bulkUpdatePermittedValues === null || bulkUpdatePermittedValues === void 0 ? void 0 : bulkUpdatePermittedValues.values(bulkUpdatePermittedValuesParams));
         }
         catch (error) {
-            this.adaptable.logger.consoleError(`Failed to load bulk permitted values`, error, column, selectedGridCells);
+            this._adaptable.logger.consoleError(`Failed to load bulk permitted values`, error, column, selectedGridCells);
         }
         distinctValuesParams.permittedValues = preparedPermittedValues;
-        return this.adaptable.getDistinctValuesForColumn(column, distinctValuesParams);
+        return this._adaptable.getDistinctValuesForColumn(column, distinctValuesParams);
     }
     /**
      * Gets all distinct visible (after current filters are applied) display values in the Column with the given ColumnId
@@ -309,7 +309,7 @@ export class GridInternalApi extends ApiBase {
         const distinctValuesParams = {
             visibleRowsOnly: true,
         };
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
+        const returnValues = this._adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
         return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
             return cv.normalisedValue;
         });
@@ -342,7 +342,7 @@ export class GridInternalApi extends ApiBase {
             visibleRowsOnly: false,
             skipRowNode: skipRowNode,
         };
-        return this.adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
+        return this._adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
     }
     /**
      * Gets all distinct visible raw values in the Column
@@ -356,7 +356,7 @@ export class GridInternalApi extends ApiBase {
         const distinctValuesParams = {
             visibleRowsOnly: true,
         };
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
+        const returnValues = this._adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
         return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
             return cv.rawValue;
         });
@@ -391,7 +391,7 @@ export class GridInternalApi extends ApiBase {
         this.dispatchAction(GridRedux.GridSetSelectedRows(selectedRowInfo));
     }
     buildStandaloneColumnHeader(column) {
-        return this.adaptable.agGridMenuAdapter.buildStandaloneColumnHeader(column);
+        return this._adaptable.agGridMenuAdapter.buildStandaloneColumnHeader(column);
     }
     getEditLookUpValuesForColumn(editLookUpItem, column, gridCell) {
         if (!editLookUpItem || !column) {
@@ -400,7 +400,7 @@ export class GridInternalApi extends ApiBase {
         let editLookUpValues = editLookUpItem.values;
         // first do the function then get hardcoded items
         if (editLookUpValues != null && typeof editLookUpValues === 'function') {
-            const editLookUpContext = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { column: column, gridCell });
+            const editLookUpContext = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { column: column, gridCell });
             return editLookUpValues(editLookUpContext);
         }
         else {
@@ -440,7 +440,7 @@ export class GridInternalApi extends ApiBase {
     }
     getRowHighlightStyle(params) {
         var _a;
-        const primaryKeyValue = this.adaptable.getPrimaryKeyValueFromRowNode(params.node, params.api);
+        const primaryKeyValue = this._adaptable.getPrimaryKeyValueFromRowNode(params.node, params.api);
         const highlightRow = (_a = this.getAdaptableApi()
             .internalApi.getSystemState()
             .HighlightedRows) === null || _a === void 0 ? void 0 : _a.find((highlightRow) => {
@@ -473,7 +473,7 @@ export class GridInternalApi extends ApiBase {
     }
     getRowHighlightClass(params) {
         var _a;
-        const primaryKeyValue = this.adaptable.getPrimaryKeyValueFromRowNode(params.node, params.api);
+        const primaryKeyValue = this._adaptable.getPrimaryKeyValueFromRowNode(params.node, params.api);
         const highlightRow = (_a = this.getAdaptableApi()
             .internalApi.getSystemState()
             .HighlightedRows) === null || _a === void 0 ? void 0 : _a.find((highlightRow) => {
@@ -484,7 +484,7 @@ export class GridInternalApi extends ApiBase {
             : null;
     }
     deriveSpecialColumnSettingsFromAgGridDefaultColDef() {
-        const defaultColumnDefinition = this.adaptable.agGridAdapter.getDefaultColumnDefinition();
+        const defaultColumnDefinition = this._adaptable.agGridAdapter.getDefaultColumnDefinition();
         return {
             Filterable: defaultColumnDefinition.filter,
             Resizable: defaultColumnDefinition.resizable,

package/src/Api/Internal/LayoutInternalApi.js

@@ -13,7 +13,7 @@ export class LayoutInternalApi extends ApiBase {
      * @param newState Layout State after change
      */
     fireLayoutChangedEvent(trigger, oldSate, newState, skipEqualityCheck) {
-        const layoutChangedInfo = Object.assign({ actionName: trigger, oldLayoutState: oldSate, newLayoutState: newState }, this.getAdaptableApi().internalApi.buildBaseContext());
+        const layoutChangedInfo = Object.assign({ actionName: trigger, oldLayoutState: oldSate, newLayoutState: newState }, this.getAdaptableInternalApi().buildBaseContext());
         if (!skipEqualityCheck && isEqual(oldSate, newState)) {
             return;
         }
@@ -124,7 +124,7 @@ export class LayoutInternalApi extends ApiBase {
         if (this.getEntitlementApi().getEntitlementAccessLevelForModule(GridFilterModuleId) == 'Hidden') {
             layoutSupportedFeatures.GridFilter = false;
         }
-        if (((_b = (_a = this.adaptable) === null || _a === void 0 ? void 0 : _a.getAgGridRowModelType) === null || _b === void 0 ? void 0 : _b.call(_a)) !== 'clientSide') {
+        if (((_b = (_a = this._adaptable) === null || _a === void 0 ? void 0 : _a.getAgGridRowModelType) === null || _b === void 0 ? void 0 : _b.call(_a)) !== 'clientSide') {
             layoutSupportedFeatures.RowSummaries = false;
         }
         return layoutSupportedFeatures;
@@ -153,7 +153,7 @@ export class LayoutInternalApi extends ApiBase {
             return ArrayExtensions.IsNullOrEmpty(object.Tags) ? true : (_a = object.Tags) === null || _a === void 0 ? void 0 : _a.includes(layout.Name);
         }
         const context = Object.assign({ adaptableObject: object, module,
-            layout }, this.getAdaptableApi().internalApi.buildBaseContext());
+            layout }, this.getAdaptableInternalApi().buildBaseContext());
         return layoutTagOptions === null || layoutTagOptions === void 0 ? void 0 : layoutTagOptions.isObjectAvailableInLayout(context);
     }
     showLayoutNotAssociatedObjects() {
@@ -179,7 +179,8 @@ export class LayoutInternalApi extends ApiBase {
             }
             return acc;
         }, { top: [], bottom: [] });
-        this.adaptable.agGridAdapter.setGridOption('pinnedTopRowData', top);
-        this.adaptable.agGridAdapter.setGridOption('pinnedBottomRowData', bottom);
+        const agGridAdapter = this.getAdaptableInternalApi().getAgGridAdapter();
+        agGridAdapter.setGridOption('pinnedTopRowData', top);
+        agGridAdapter.setGridOption('pinnedBottomRowData', bottom);
     }
 }

package/src/Api/Internal/NamedQueryInternalApi.js

@@ -12,7 +12,7 @@ export class NamedQueryInternalApi extends ApiBase {
         }
         catch (error) {
             // defensive programing, this should happen only if someone botched the predefined configs
-            this.adaptable.logger.warn(`QueryApi.getReferencedNamedQueryNames received an invalid expression: ${expression}
+            this.logWarn(`QueryApi.getReferencedNamedQueryNames received an invalid expression: ${expression}
                   Error: ${error}`);
             return [];
         }
@@ -23,7 +23,7 @@ export class NamedQueryInternalApi extends ApiBase {
      */
     getNamedQueryModuleReferences(namedQueryName) {
         const references = [];
-        this.adaptable.adaptableModules.forEach((module) => {
+        this.getAdaptableInternalApi().getModules().forEach((module) => {
             if (module
                 .getModuleNamedQueryReferences()
                 .some((moduleReference) => moduleReference === namedQueryName)) {