@adaptabletools/adaptable-cjs 19.1.2 → 19.2.1-canary.0

package/package.json

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

package/src/AdaptableOptions/CommentOptions.d.ts

@@ -17,7 +17,7 @@ export interface CommentOptions<TData = any> {
      */
     persistCommentThreads?(commentThreads: CommentThread[]): Promise<void>;
     /**
-     * Format string for Dates in Comments Popup
+     * Date Format string for Comments timestamp
      *
      * @defaultValue 'dd-MM-yyyy HH:mm:ss'
      */

package/src/{agGrid/defaultAdaptableOptions.d.ts → AdaptableOptions/DefaultAdaptableOptions.d.ts}

@@ -1,3 +1,3 @@
-import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
+import { AdaptableOptions } from './AdaptableOptions';
 export declare function applyDefaultAdaptableOptions(adaptableOptions: AdaptableOptions): AdaptableOptions;
 export declare const getDefaultAdaptableOptions: () => AdaptableOptions<any>;

package/src/{agGrid/defaultAdaptableOptions.js → AdaptableOptions/DefaultAdaptableOptions.js}

@@ -126,7 +126,7 @@ const DefaultAdaptableOptions = {
     },
     commentOptions: {
         showPopupCloseButton: true,
-        dateFormat: 'dd-MM-yyyy HH:mm:ss',
+        dateFormat: GeneralConstants_1.DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME,
     },
     customSortOptions: { customSortComparers: undefined },
     notificationsOptions: {
@@ -322,6 +322,7 @@ const DefaultAdaptableOptions = {
         navigation: {},
         alwaysShowInDashboard: false,
         alwaysShowInToolPanel: false,
+        showModuleIcons: true
     },
     fdc3Options: {
         enableLogging: false,
@@ -340,7 +341,7 @@ const DefaultAdaptableOptions = {
     },
     noteOptions: {
         showPopupCloseButton: true,
-        dateFormat: 'dd-MM-yyyy HH:mm:ss',
+        dateFormat: GeneralConstants_1.DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME,
     },
 };
 function applyDefaultAdaptableOptions(adaptableOptions) {

package/src/AdaptableOptions/EditOptions.d.ts

@@ -3,11 +3,11 @@ import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedI
 import { MathOperation } from '../PredefinedConfig/Common/Enums';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 /**
- * Options related to Editing in AdapTable - includes Server Validation, Smart Edit Operations and Row Forms
+ * Options related to Editing in AdapTable - includes Server Validation, Smart Edit Operations and Cell Editabiility
  */
 export interface EditOptions<TData = any> {
     /**
-     * Function to validate AdapTable data edits on Server
+     * Function to validate AdapTable data edits remotely
      */
     validateOnServer?: (serverValidationContext: ServerValidationContext<TData>) => Promise<ServerValidationResult>;
     /**
@@ -97,4 +97,8 @@ export interface CellEditableContext<TData = any> extends BaseContext {
      * Cell being edited
      */
     gridCell: GridCell<TData>;
+    /**
+     * Default editability according to the AG Grid Column Definition (`ColDef.editable`)
+     */
+    defaultColDefEditableValue: boolean;
 }

package/src/AdaptableOptions/NoteOptions.d.ts

@@ -8,7 +8,7 @@ export interface NoteOptions<TData = any> {
      */
     isCellNotable?: (context: NotableCellContext) => boolean;
     /**
-     * Format string for Dates in Notes Popup
+     * Date Format string for Notes timestamp
      *
      * @defaultValue 'dd-MM-yyyy HH:mm:ss'
      */

package/src/AdaptableOptions/SettingsPanelOptions.d.ts

@@ -13,10 +13,11 @@ export interface SettingsPanelOptions {
      */
     title?: string;
     /**
-     * Settings Panel Icon: `ConfigurationIcon`, `ApplicationIcon` or custom Icon
+     * Icon shown in top left of Settings Panel: Can be `ConfigurationIcon`, `ApplicationIcon` or custom Icon
      * @defaultValue `ConfigurationIcon`
      */
     icon?: 'ConfigurationIcon' | 'ApplicationIcon' | AdaptableIcon;
+    showModuleIcons?: boolean;
     /**
      * Whether a Settings Panel button should always be displayed in `ModuleButtons` area of Dashboard
      * @defaultValue false

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -17,13 +17,13 @@ export interface UserInterfaceOptions<TData = any> {
      */
     useCustomMacLikeScrollbars?: boolean;
     /**
-     * The application icon to appear in Dashboard and elsewhere (e.g. OpenFin notifications)
+     * The application icon to appear in Dashboard and elsewhere (e.g. in Notifications)
      *
      * @defaultValue null
      */
     applicationIcon?: AdaptableIcon;
     /**
-     * Bespoke icons that can be used in Adaptable (e.g. Badge Styles and Buttons)
+     * Bespoke icons that can be used in AdapTable (e.g. Badge Styles and Buttons)
      */
     customIcons?: CustomIcon[];
     /**

package/src/Api/GridApi.d.ts

@@ -209,7 +209,7 @@ export interface GridApi {
      */
     getVisibleRowNodes(config?: {
         includeGroupRows?: boolean;
-        filterFn?: (rowNode: IRowNode) => boolean;
+        filterFn?(rowNode: IRowNode): boolean;
     }): IRowNode[];
     /**
      * Retrieves all Row Nodes currently in the Grid (by default excluding the group rows)
@@ -217,14 +217,14 @@ export interface GridApi {
      */
     getAllRowNodes(config?: {
         includeGroupRows?: boolean;
-        filterFn?: (rowNode: IRowNode) => boolean;
+        filterFn?(rowNode: IRowNode): boolean;
     }): IRowNode[];
     /**
      * Retrieves all Grouped Row Nodes currently in the Grid
      * @param config - configuration
      */
     getGroupRowNodes(config?: {
-        filterFn?: (rowNode: IRowNode) => boolean;
+        filterFn?(rowNode: IRowNode): boolean;
     }): IRowNode[];
     /**
      * Retrieves Row Nodes that contain given Primary Keys

package/src/Api/Implementation/ActionRowApiImpl.js

@@ -18,7 +18,7 @@ class ActionRowApiImpl extends ApiBase_1.ApiBase {
         return actionRowButtons !== null && actionRowButtons !== void 0 ? actionRowButtons : [];
     }
     displayEditActionRow(primaryKey) {
-        const rowNode = this.getAdaptableApi().gridApi.getRowNodeForPrimaryKey(primaryKey);
+        const rowNode = this.getGridApi().getRowNodeForPrimaryKey(primaryKey);
         if (!rowNode) {
             this.logWarn(`Can NOT edit row: rowNode not found for primaryKey ${primaryKey}`);
         }
@@ -40,7 +40,7 @@ class ActionRowApiImpl extends ApiBase_1.ApiBase {
         }));
     }
     displayCloneActionRow(primaryKey) {
-        const rowNode = this.getAdaptableApi().gridApi.getRowNodeForPrimaryKey(primaryKey);
+        const rowNode = this.getGridApi().getRowNodeForPrimaryKey(primaryKey);
         if (!rowNode) {
             this.logWarn(`Can NOT clone row: rowNode not found for primaryKey ${primaryKey}`);
         }

package/src/Api/Implementation/AlertApiImpl.js

@@ -48,7 +48,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(SystemRedux.SystemAlertAdd(alertToShow, this.getAlertOptions().maxAlertsInStore));
         // 2. Publish the Alert Fired Event
         const alertFiredInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { alert: alertToShow });
-        const results = await this.getAdaptableApi().eventApi.emit('AlertFired', alertFiredInfo);
+        const results = await this.getEventApi().emit('AlertFired', alertFiredInfo);
         const showPopup = results.reduce((endResult, aResult) => {
             return endResult && aResult !== false;
         }, true);
@@ -105,13 +105,13 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
                 }
                 if (alertNode) {
                     if (alertProperties.HighlightRow) {
-                        this.getAdaptableApi().gridApi.refreshRowNodes([alertNode]);
+                        this.getGridApi().refreshRowNodes([alertNode]);
                         setTimeout(() => {
                             this.dispatchAction(SystemRedux.SystemAlertRemoveRowHighlight(alertToShow));
                         }, this.getAlertOptions().rowHighlightDuration);
                     }
                     if (alertProperties.HighlightCell) {
-                        this.getAdaptableApi().gridApi.refreshCells([alertNode], [alertToShow.cellDataChangedInfo.column.columnId]);
+                        this.getGridApi().refreshCells([alertNode], [alertToShow.cellDataChangedInfo.column.columnId]);
                         setTimeout(() => {
                             this.dispatchAction(SystemRedux.SystemAlertRemoveCellHighlight(alertToShow));
                         }, this.getAlertOptions().cellHighlightDuration);
@@ -122,7 +122,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
             else if (alertProperties.HighlightRow &&
                 (0, AdaptableAlert_1.isAdaptableRowChangedAlert)(alertToShow) &&
                 ((_b = alertToShow.gridDataChangedInfo) === null || _b === void 0 ? void 0 : _b.rowTrigger) === 'Add') {
-                this.getAdaptableApi().gridApi.refreshRowNodes(alertToShow.gridDataChangedInfo.rowNodes);
+                this.getGridApi().refreshRowNodes(alertToShow.gridDataChangedInfo.rowNodes);
                 setTimeout(() => {
                     this.dispatchAction(SystemRedux.SystemAlertRemoveRowHighlight(alertToShow));
                 }, this.getAlertOptions().rowHighlightDuration);
@@ -172,7 +172,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
     }
     evaluateAlertDefinitions(alertDefinitions) {
         const filterScopeAllDefinitions = (alertDefinition) => {
-            if (this.getAdaptableApi().columnScopeApi.scopeIsAll(alertDefinition.Scope) &&
+            if (this.getColumnScopeApi().scopeIsAll(alertDefinition.Scope) &&
                 !this.getAdaptableApi().expressionApi.getAdaptableQueryExpression(alertDefinition.Rule)) {
                 // we don't support scope ALL without an expression
                 // the predicates for scope ALL do NOT make any sense for a programmatic evaluation
@@ -207,7 +207,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         //  if there is an Expression defined, extract only the columns from there (in that case the Scope would be 'All' anyway)
         // columns referenced in rule expression
         const ruleExpression = this.getAdaptableApi().expressionApi.getAdaptableQueryExpression(alertDefinition.Rule);
-        if (this.getAdaptableApi().columnScopeApi.scopeIsAll(alertDefinition.Scope) &&
+        if (this.getColumnScopeApi().scopeIsAll(alertDefinition.Scope) &&
             StringExtensions_1.default.IsNotNullOrEmpty(ruleExpression)) {
             // return only first referenced column (otherwise we would generate multiple alerts for the same row)
             const queryColumns = this.getAdaptableApi()

package/src/Api/Implementation/ChartingApiImpl.js

@@ -95,19 +95,19 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
         };
     }
     getOpenChartContainer(chartDefinition) {
-        var _a, _b, _c;
-        const containerOptions = (_b = (_a = this.getAdaptableApi().optionsApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.chartingOptions) === null || _b === void 0 ? void 0 : _b.chartContainers;
+        var _a;
+        const containerOptions = this.getChartingOptions().chartContainers;
         if (!containerOptions || !containerOptions.length) {
             return null;
         }
-        return ((_c = containerOptions.find((container) => {
+        return ((_a = containerOptions.find((container) => {
             const chartRef = this.getChartRef(chartDefinition.Model.chartId);
             const containerElement = this.internalApi.getContainerElement(container);
             if (!(chartRef === null || chartRef === void 0 ? void 0 : chartRef.chartElement) || !containerElement) {
                 return false;
             }
             return containerElement.contains(chartRef.chartElement);
-        })) !== null && _c !== void 0 ? _c : null);
+        })) !== null && _a !== void 0 ? _a : null);
     }
     setChartReadOnly(chartDefinition) {
         this.dispatchAction(ChartingRedux.ChartingEditChart(Object.assign(Object.assign({}, chartDefinition), { IsReadOnly: true })));

package/src/Api/Implementation/ColumnApiImpl.js

@@ -29,7 +29,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     }
     getColumns() {
         var _a;
-        return (_a = this.getAdaptableApi().gridApi.getGridState().Columns) !== null && _a !== void 0 ? _a : [];
+        return (_a = this.getGridApi().getGridState().Columns) !== null && _a !== void 0 ? _a : [];
     }
     getStandardColumns() {
         var _a;
@@ -42,7 +42,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return cols !== null && cols !== void 0 ? cols : [];
     }
     getVisibleColumns() {
-        const layout = this.getAdaptableApi().layoutApi.getCurrentLayout();
+        const layout = this.getLayoutApi().getCurrentLayout();
         const visibleCols = layout.Columns.reduce((acc, colId) => {
             acc[colId] = true;
             return acc;
@@ -180,7 +180,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         }
         let result = columnId + GeneralConstants.MISSING_COLUMN;
         if (this.isAutoRowGroupColumn(columnId)) {
-            const currentLayout = this.getAdaptableApi().layoutApi.getCurrentLayout();
+            const currentLayout = this.getLayoutApi().getCurrentLayout();
             if (currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.RowGroupedColumns) {
                 result = `[Grouped column: ${currentLayout.RowGroupedColumns.join(', ')}]`;
             }
@@ -385,10 +385,10 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         });
     }
     getDistinctDisplayValuesForColumn(columnId) {
-        return this.getAdaptableApi().gridApi.internalApi.getDistinctDisplayValuesForColumn(columnId);
+        return this.getGridApi().internalApi.getDistinctDisplayValuesForColumn(columnId);
     }
     setColumnCaption(columnId, caption) {
-        return this.getAdaptableApi().layoutApi.setColumnCaption(columnId, caption);
+        return this.getLayoutApi().setColumnCaption(columnId, caption);
     }
     updateColumnConfiguration(columnConfig) {
         (0, logDeprecation_1.logDeprecationExternal)(this.getAdatableLogger(), 'ColumnApi', 'updateColumnConfiguration', 'GridApi', 'updateAgGridColumnState');

package/src/Api/Implementation/ColumnFilterApiImpl.js

@@ -18,10 +18,10 @@ class ColumnFilterApiImpl extends ApiBase_1.ApiBase {
         };
         return this.getAdaptableApi()
             .predicateApi.internalApi.getFilterPredicateDefs(scope)
-            .filter((predicate) => this.getAdaptableApi().columnScopeApi.isColumnInScope(column, predicate.columnScope));
+            .filter((predicate) => this.getColumnScopeApi().isColumnInScope(column, predicate.columnScope));
     }
     getFilterPredicateDefsForColumnId(columnId) {
-        const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
+        const column = this.getColumnApi().getColumnWithColumnId(columnId);
         return column ? this.getFilterPredicateDefsForColumn(column) : undefined;
     }
     showQuickFilterBar() {
@@ -39,7 +39,7 @@ class ColumnFilterApiImpl extends ApiBase_1.ApiBase {
     }
     getColumnFilters() {
         var _a;
-        const currentLayout = this.getAdaptableApi().layoutApi.getCurrentLayout();
+        const currentLayout = this.getLayoutApi().getCurrentLayout();
         return (_a = currentLayout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
     }
     getActiveColumnFilters() {
@@ -48,8 +48,8 @@ class ColumnFilterApiImpl extends ApiBase_1.ApiBase {
     getColumnFilterDefs() {
         const filters = this.getColumnFilters();
         return filters.map((columnFilter) => {
-            const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnFilter.ColumnId);
-            const predicate = this.getAdaptableApi().predicateApi.getPredicateDefById(columnFilter.Predicate.PredicateId);
+            const column = this.getColumnApi().getColumnWithColumnId(columnFilter.ColumnId);
+            const predicate = this.getPredicateApi().getPredicateDefById(columnFilter.Predicate.PredicateId);
             return {
                 predicate,
                 dataType: column === null || column === void 0 ? void 0 : column.dataType,
@@ -59,7 +59,7 @@ class ColumnFilterApiImpl extends ApiBase_1.ApiBase {
     }
     getColumnFiltersForLayout(layoutName) {
         var _a;
-        const layout = this.getAdaptableApi().layoutApi.getLayoutByName(layoutName);
+        const layout = this.getLayoutApi().getLayoutByName(layoutName);
         return (_a = layout.ColumnFilters) !== null && _a !== void 0 ? _a : [];
     }
     setColumnFilters(columnFilters) {
@@ -68,7 +68,7 @@ class ColumnFilterApiImpl extends ApiBase_1.ApiBase {
                 this.logWarn('Column Filter has no Predicate', columnFilter);
             }
             else {
-                const isValidPredicate = this.getAdaptableApi().predicateApi.isValidPredicate(columnFilter.Predicate);
+                const isValidPredicate = this.getPredicateApi().isValidPredicate(columnFilter.Predicate);
                 if (!isValidPredicate) {
                     this.logWarn('Column Filter Predicate is not valid', columnFilter);
                 }
@@ -122,10 +122,10 @@ class ColumnFilterApiImpl extends ApiBase_1.ApiBase {
         if (!filter || !filter.Predicate || !filter.Predicate.PredicateId) {
             return false;
         }
-        const predicateDef = this.getAdaptableApi().predicateApi.getPredicateDefById(filter === null || filter === void 0 ? void 0 : filter.Predicate.PredicateId);
+        const predicateDef = this.getPredicateApi().getPredicateDefById(filter === null || filter === void 0 ? void 0 : filter.Predicate.PredicateId);
         if (ArrayExtensions_1.default.IsNull(predicateDef.inputs) &&
             // values predicates have no inputs in the definition
-            !this.getAdaptableApi().predicateApi.internalApi.hasPredicateValues(filter.Predicate)) {
+            !this.getPredicateApi().internalApi.hasPredicateValues(filter.Predicate)) {
             return true;
         }
         const inputs = filter.Predicate.Inputs;

package/src/Api/Implementation/ColumnScopeApiImpl.js

@@ -30,7 +30,7 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
         if (scope == undefined) {
             return [];
         }
-        const columns = this.getAdaptableApi().columnApi.getColumns();
+        const columns = this.getColumnApi().getColumns();
         if ('All' in scope) {
             return columns;
         }
@@ -100,7 +100,7 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
             !this.scopeIsAll(scope) &&
             'ColumnIds' in scope &&
             scope.ColumnIds.length == 1 &&
-            this.getAdaptableApi().columnApi.hasNumberDataType(scope.ColumnIds[0]));
+            this.getColumnApi().hasNumberDataType(scope.ColumnIds[0]));
     }
     isSingleBooleanColumnScope(scope) {
         return (this.scopeHasColumns(scope) &&
@@ -108,7 +108,7 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
             !this.scopeIsAll(scope) &&
             'ColumnIds' in scope &&
             scope.ColumnIds.length == 1 &&
-            this.getAdaptableApi().columnApi.hasBooleanDataType(scope.ColumnIds[0]));
+            this.getColumnApi().hasBooleanDataType(scope.ColumnIds[0]));
     }
     areAllBooleanColumnsInScope(scope) {
         return (this.scopeHasColumns(scope) &&
@@ -116,7 +116,7 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
             !this.scopeIsAll(scope) &&
             'ColumnIds' in scope &&
             scope.ColumnIds.length &&
-            scope.ColumnIds.every((columnId) => this.getAdaptableApi().columnApi.hasBooleanDataType(columnId)));
+            scope.ColumnIds.every((columnId) => this.getColumnApi().hasBooleanDataType(columnId)));
     }
     isColumnInScopeColumns(column, scope) {
         return this.scopeHasColumns(scope) && this.isColumnInScope(column, scope);
@@ -124,7 +124,7 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
     isPrimaryKeyColumnInScopeColumns(scope) {
         return ('ColumnIds' in scope &&
             scope.ColumnIds.length == 1 &&
-            scope.ColumnIds.find((c) => c == this.getAdaptableApi().optionsApi.getPrimaryKey()) != null);
+            scope.ColumnIds.find((c) => c == this.getOptions().primaryKey) != null);
     }
     getScopeToString(scope) {
         if ('All' in scope) {
@@ -257,7 +257,7 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
             'DataTypes' in b &&
             a.ColumnIds.every((columnId) => {
                 var _a;
-                return b.DataTypes.includes((_a = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId)) === null || _a === void 0 ? void 0 : _a.dataType);
+                return b.DataTypes.includes((_a = this.getColumnApi().getColumnWithColumnId(columnId)) === null || _a === void 0 ? void 0 : _a.dataType);
             })) {
             return true;
         }
@@ -269,7 +269,7 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
         // check if each colum in a has column types in b
         if ('ColumnIds' in a && 'ColumnTypes' in b) {
             const inScope = a.ColumnIds.every((columnId) => {
-                const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
+                const column = this.getColumnApi().getColumnWithColumnId(columnId);
                 // check if at least one column-type is in scope
                 return column.columnTypes.some((columnColumnType) => b.ColumnTypes.includes(columnColumnType));
             });
@@ -280,7 +280,7 @@ class ColumnScopeApiImpl extends ApiBase_1.ApiBase {
         return false;
     }
     createCellColorRangesForScope(scope) {
-        let distinctColumnsValues = this.getAdaptableApi().gridApi.internalApi.getDistinctRawValuesForColumn(this.getAdaptableApi().columnScopeApi.getSingleColumnInScope(scope));
+        let distinctColumnsValues = this.getGridApi().internalApi.getDistinctRawValuesForColumn(this.getSingleColumnInScope(scope));
         let minValue = Math.min(...distinctColumnsValues);
         let maxValue = Math.max(...distinctColumnsValues);
         const ranges = [];

package/src/Api/Implementation/ConfigApiImpl.js

@@ -71,7 +71,7 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                     const newState = this.getPersistedState();
                     const stateReloadedInfo = Object.assign({ oldState,
                         newState, adaptableStateKey: adaptableOptions.adaptableStateKey }, this.getAdaptableInternalApi().buildBaseContext());
-                    this.getAdaptableApi().eventApi.emit('AdaptableStateReloaded', stateReloadedInfo);
+                    this.getEventApi().emit('AdaptableStateReloaded', stateReloadedInfo);
                 });
             });
         });
@@ -106,7 +106,7 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     }
     getAdaptableSortState() {
         const adaptableSortState = {
-            columnSorts: this.getAdaptableApi().gridApi.getColumnSorts(),
+            columnSorts: this.getGridApi().getColumnSorts(),
             customSorts: this.getAdaptableApi().customSortApi.getCustomSorts(),
         };
         return adaptableSortState;

package/src/Api/Implementation/DataChangeHistoryApiImpl.js

@@ -12,7 +12,7 @@ class DataChangeHistoryApiImpl extends ApiBase_1.ApiBase {
             const columnId = dataChangeInfo.column.columnId;
             const primaryKeyValue = dataChangeInfo.primaryKeyValue;
             const changedAt = dataChangeInfo.changedAt;
-            const showLastDataChangeOnly = this.getAdaptableApi().optionsApi.getDataChangeHistoryOptions().showLastDataChangeOnly;
+            const showLastDataChangeOnly = this.getDataChangeHistoryOptions().showLastDataChangeOnly;
             if (showLastDataChangeOnly) {
                 return JSON.stringify({ columnId, primaryKeyValue });
             }

package/src/Api/Implementation/FlashingCellApiImpl.js

@@ -37,7 +37,7 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
     showFlashingCell(flashingCellToShow) {
         this.addUidToAdaptableObject(flashingCellToShow);
         const flashingCellFiredInfo = Object.assign(Object.assign({}, this.getAdaptableInternalApi().buildBaseContext()), { flashingCell: flashingCellToShow });
-        const results = this.getAdaptableApi().eventApi.emitSync('FlashingCellDisplayed', flashingCellFiredInfo);
+        const results = this.getEventApi().emitSync('FlashingCellDisplayed', flashingCellFiredInfo);
         const shouldShow = results.reduce((endResult, aResult) => {
             return endResult && aResult !== false;
         }, true);
@@ -95,7 +95,7 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
     getFlashingCellPredicateDefsForScope(scope) {
         return this.getAdaptableApi()
             .predicateApi.internalApi.getFlashingCellPredicateDefs(scope)
-            .filter((predicateDef) => this.getAdaptableApi().columnScopeApi.isScopeInScope(scope, predicateDef.columnScope));
+            .filter((predicateDef) => this.getColumnScopeApi().isScopeInScope(scope, predicateDef.columnScope));
     }
     clearAllFlashingCells() {
         this.getAdaptableInternalApi().getFlashingCellService().clearAllGridCellFlashes();

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -75,7 +75,7 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         return this.internalApi.getFormatColumnWithColumnInScope(formatColumns, column);
     }
     getFormatColumnsForColumnId(columnId, config) {
-        const abColumn = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
+        const abColumn = this.getColumnApi().getColumnWithColumnId(columnId);
         if (!abColumn) {
             return [];
         }
@@ -85,13 +85,13 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         this.showModulePopup(ModuleConstants.FormatColumnModuleId);
     }
     getFormatColumnsWithAllScope(formatColumns) {
-        return formatColumns.filter((fc) => this.getAdaptableApi().columnScopeApi.scopeIsAll(fc.Scope));
+        return formatColumns.filter((fc) => this.getColumnScopeApi().scopeIsAll(fc.Scope));
     }
     getFormatColumnsWithDataTypeScope(formatColumns) {
-        return formatColumns.filter((fc) => this.getAdaptableApi().columnScopeApi.scopeHasDataType(fc.Scope));
+        return formatColumns.filter((fc) => this.getColumnScopeApi().scopeHasDataType(fc.Scope));
     }
     getFormatColumnsWithColumnScope(formatColumns) {
-        return formatColumns.filter((fc) => this.getAdaptableApi().columnScopeApi.scopeHasColumns(fc.Scope));
+        return formatColumns.filter((fc) => this.getColumnScopeApi().scopeHasColumns(fc.Scope));
     }
     hasCustomDisplayFormatter(formatColumn) {
         var _a;

package/src/Api/Implementation/FreeTextColumnApiImpl.js

@@ -89,7 +89,7 @@ class FreeTextColumnApiImpl extends ApiBase_1.ApiBase {
     }
     getFreeTextColumnValueForRowNode(freeTextColumn, rowNode) {
         try {
-            if (this.getAdaptableApi().gridApi.isGroupRowNode(rowNode)) {
+            if (this.getGridApi().isGroupRowNode(rowNode)) {
                 return null;
             }
             if (ArrayExtensions_1.default.IsNotNullOrEmpty(freeTextColumn.FreeTextStoredValues)) {

package/src/Api/Implementation/GridApiImpl.js

@@ -92,7 +92,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     }
     setCellValue(cellUpdateRequest) {
         var _a;
-        const abColumn = this.getAdaptableApi().columnApi.getColumnWithColumnId(cellUpdateRequest.columnId);
+        const abColumn = this.getColumnApi().getColumnWithColumnId(cellUpdateRequest.columnId);
         if (!abColumn) {
             this.logWarn(`setCellValue() - column not found for columnId: ${cellUpdateRequest.columnId}`);
             return;
@@ -245,7 +245,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
             /**
              * Select all rows and all columns
              */
-            const currentLayout = this.getAdaptableApi().layoutApi.getCurrentLayout();
+            const currentLayout = this.getLayoutApi().getCurrentLayout();
             preapredGridCellRange = {
                 columnIds: currentLayout.Columns,
             };
@@ -281,7 +281,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this.selectColumns([columnId]);
     }
     selectColumns(columnIds) {
-        this.getAdaptableApi().columnApi.selectColumns(columnIds);
+        this.getColumnApi().selectColumns(columnIds);
     }
     getFirstRowNode() {
         return this._adaptable.getFirstRowNode();
@@ -314,7 +314,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     }
     getNormalisedValueFromRowNode(rowNode, columnId) {
         const rawValue = this._adaptable.getRawValueFromRowNode(rowNode, columnId);
-        const abColumn = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
+        const abColumn = this.getColumnApi().getColumnWithColumnId(columnId);
         return this._adaptable.getNormalisedValueFromRawValue(rawValue, abColumn);
     }
     getRowNodesForPrimaryKeys(primaryKeyValues) {
@@ -498,25 +498,20 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         this._adaptable.updateRowGroupsExpandedState();
     }
     isCellEditable(gridCell) {
-        if (!gridCell) {
-            return false;
-        }
-        if (!gridCell.column) {
-            // GridCell.column may be undefined for cells from synthetic columns created by AG Grid (ex. autoGroup columns)
-            return false;
-        }
-        if (gridCell.column.readOnly) {
+        // Note if cell.editable in AG Grid is a function (and nothing is provided in Adaptble) this will return true.
+        // If not Grid Cell or Column then return false - GridCell.column may be undefined for cells from synthetic columns created by AG Grid (ex. autoGroup columns)
+        if (!gridCell || !gridCell.column || !gridCell.rowNode) {
             return false;
         }
         if (gridCell.rowNode && this.isSummaryNode(gridCell.rowNode)) {
             return false;
         }
-        const cellEditableFn = this.getEditOptions().isCellEditable;
-        if (cellEditableFn) {
-            const cellEditableContext = Object.assign({ gridCell }, this.getAdaptableInternalApi().buildBaseContext());
-            return cellEditableFn(cellEditableContext);
-        }
-        return true;
+        // checking `gridCell.column.readOnly` might return misleading results
+        // because cell editability is defined by EditOptions.isCellEditable() as well
+        const agGridColumn = this.getColumnApi().internalApi.getAgGridColumnForAdaptableColumn(gridCell.column.columnId);
+        // this will invoke the colDef.editable callback
+        // there we check both Adaptable and AG Grid editability
+        return agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.isCellEditable(gridCell.rowNode);
     }
     isCellEdited(gridCell) {
         if (!gridCell) {
@@ -649,7 +644,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         });
         const newColumnDefinitions = columnDefinitionsToBeUpdated.filter((c) => !currentColIds.includes(c.colId));
         if (newColumnDefinitions.length) {
-            this.logWarn(`Columns with ids ${newColumnDefinitions.map((c) => c.colId).join(', ')} do not exist, will add them instead!`);
+            this.logWarn(`Columns with ids ${newColumnDefinitions
+                .map((c) => c.colId)
+                .join(', ')} do not exist, will add them instead!`);
         }
         this.setAgGridColumnDefinitions([...updatedColDefs, ...newColumnDefinitions]);
     }

package/src/Api/Implementation/LayoutApiImpl.js

@@ -285,25 +285,25 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         });
     }
     removeColumnFromLayout(columnId, layoutName) {
-        const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
+        const column = this.getColumnApi().getColumnWithColumnId(columnId);
         if (column) {
             const layout = this.getLayoutByName(layoutName);
             if (layout) {
                 if (layout.Columns.includes(columnId)) {
                     this.dispatchAction(LayoutRedux.LayoutRemoveColumn(layoutName, columnId));
-                    this.getAdaptableApi().columnApi.hideColumn(columnId);
+                    this.getColumnApi().hideColumn(columnId);
                 }
             }
         }
     }
     addColumnToLayout(columnId, layoutName) {
-        const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
+        const column = this.getColumnApi().getColumnWithColumnId(columnId);
         if (column) {
             const layout = this.getLayoutByName(layoutName);
             if (layout) {
                 if (!layout.Columns.includes(columnId)) {
                     this.dispatchAction(LayoutRedux.LayoutAddColumn(layoutName, columnId));
-                    this.getAdaptableApi().columnApi.showColumn(columnId);
+                    this.getColumnApi().showColumn(columnId);
                 }
             }
         }

package/src/Api/Implementation/PredicateApiImpl.js

@@ -75,9 +75,9 @@ class PredicateApiImpl extends ApiBase_1.ApiBase {
         if (!predicate.ColumnId) {
             return this.handlePredicate(predicate, context, defaultReturn);
         }
-        const paramsForColumn = Object.assign(Object.assign({}, context), { column: this.getAdaptableApi().columnApi.getColumnWithColumnId(predicate.ColumnId), 
+        const paramsForColumn = Object.assign(Object.assign({}, context), { column: this.getColumnApi().getColumnWithColumnId(predicate.ColumnId), 
             // value: params?.node?.data?.[predicate.ColumnId],
-            value: this.getAdaptableApi().gridApi.getRawValueFromRowNode(context.node, predicate.ColumnId) });
+            value: this.getGridApi().getRawValueFromRowNode(context.node, predicate.ColumnId) });
         if ('oldValue' in paramsForColumn) {
             delete paramsForColumn.oldValue;
         }