@adaptabletools/adaptable 18.0.0-canary.3 → 18.0.0-canary.5

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

@@ -1,5 +1,5 @@
 import { Action } from 'redux';
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { AdaptableVariant, IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableState } from '../../PredefinedConfig/AdaptableState';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
@@ -20,6 +20,7 @@ export declare abstract class ApiBase {
     protected logSuccess(message: string, ...optionalParams: any[]): void;
     protected logWarn(message: string, ...optionalParams: any[]): void;
     protected logError(message: string, ...optionalParams: any[]): void;
+    protected getAdaptableVariant(): AdaptableVariant;
     /**
      * Base api helper method which ensure that Adaptable Object being used in the function is not null or undefined
      *

package/src/Api/Implementation/ApiBase.js

@@ -21,6 +21,9 @@ export class ApiBase {
     logError(message, ...optionalParams) {
         this.adaptable.logger.error(message, ...optionalParams);
     }
+    getAdaptableVariant() {
+        return this.adaptable.variant;
+    }
     /**
      * Base api helper method which ensure that Adaptable Object being used in the function is not null or undefined
      *
@@ -99,7 +102,7 @@ export class ApiBase {
         return this.getOptions().columnOptions;
     }
     getNotesOptions() {
-        return this.getOptions().notesOptions;
+        return this.getOptions().noteOptions;
     }
     getCustomSortOptions() {
         return this.getOptions().customSortOptions;

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

@@ -6,5 +6,4 @@ export declare class BulkUpdateApiImpl extends ApiBase implements BulkUpdateApi
     openBulkUpdateSettingsPanel(): void;
     showBulkUpdatePopup(): void;
     applyBulkUpdate(cellUpdateRequests: CellUpdateRequest[]): void;
-    setBulkUpdateValue(bulkUpdateValue: string): void;
 }

package/src/Api/Implementation/BulkUpdateApiImpl.js

@@ -1,7 +1,6 @@
 import { ApiBase } from './ApiBase';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import * as BulkUpdateRedux from '../../Redux/ActionsReducers/BulkUpdateRedux';
-import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
 export class BulkUpdateApiImpl extends ApiBase {
     getBulkUpdateValue() {
         return this.getAdaptableState().System.BulkUpdateValue;
@@ -15,7 +14,4 @@ export class BulkUpdateApiImpl extends ApiBase {
     applyBulkUpdate(cellUpdateRequests) {
         this.dispatchAction(BulkUpdateRedux.BulkUpdateApply(cellUpdateRequests));
     }
-    setBulkUpdateValue(bulkUpdateValue) {
-        this.dispatchAction(SystemRedux.BulkUpdateChangeValue(bulkUpdateValue));
-    }
 }

package/src/Api/Implementation/CommentsApiImpl.js

@@ -10,7 +10,8 @@ export class CommentsApiImpl extends ApiBase {
         return CommentRedux.GetCellCommentSelector(this.getAdaptableState().Comment, address);
     }
     getCommentThreads() {
-        return this.getAdaptableState().Comment.CommentThreads;
+        var _a;
+        return (_a = this.getAdaptableState().Comment.CommentThreads) !== null && _a !== void 0 ? _a : [];
     }
     editComment(comment, address) {
         this.dispatchAction(CommentRedux.CommentsEdit({ comment, cellAddress: address }));

package/src/Api/Implementation/ConfigApiImpl.js

@@ -117,7 +117,6 @@ export class ConfigApiImpl extends ApiBase {
     setAdaptableStateKey(adaptableStateKey, config) {
         return new Promise((resolve, reject) => {
             this.adaptable.api.internalApi.executeWithProgressIndicator(`Initialising...`, () => {
-                this.adaptable.adaptableOptions.adaptableStateKey = adaptableStateKey;
                 const flushCurrentState = !config || config.flushCurrentState !== false;
                 // make sure we persist any "pending" changes to state - since stateOptions.debounceStateDelay can cause
                 // the state to be persisted with a delay, which we dont want in this case
@@ -125,14 +124,20 @@ export class ConfigApiImpl extends ApiBase {
                     ? this.adaptable.adaptableStore.saveStateNow(this.adaptable)
                     : Promise.resolve(true);
                 flushStatePromise.then(() => {
+                    this.adaptable.adaptableOptions.adaptableStateKey = adaptableStateKey;
                     let predefinedConfig = config === null || config === void 0 ? void 0 : config.predefinedConfig;
                     if (predefinedConfig) {
                         predefinedConfig = initPredefinedConfigWithUuids(predefinedConfig);
                     }
-                    const promise = this.adaptable.adaptableStore.loadStore(this.adaptable, adaptableStateKey, predefinedConfig);
+                    const promise = this.adaptable.adaptableStore.loadStore({
+                        adaptable: this.adaptable,
+                        adaptableStateKey,
+                        predefinedConfig,
+                    });
                     promise
                         .then(() => {
-                        this.adaptable.prepareGrid();
+                        this.adaptable.updateColumnModelAndRefreshGrid();
+                        this.adaptable.setLayout();
                         this.adaptable.api.userInterfaceApi.hideLoadingScreen();
                     })
                         .then(() => {

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

@@ -8,7 +8,7 @@ import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
 import { DataUpdateConfig } from '../../PredefinedConfig/Common/DataUpdateConfig';
 import { CellHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
 import { RowHighlightInfo } from '../../PredefinedConfig/Common/RowHighlightInfo';
-import { GridOptions, IRowNode, RowModelType } from '@ag-grid-community/core';
+import { IRowNode, RowModelType } from '@ag-grid-community/core';
 import { GridCellRange } from '../../PredefinedConfig/Selection/GridCellRange';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowsHighlightInfo } from '../../PredefinedConfig/Common/RowsHighlightInfo';
@@ -18,6 +18,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     internalApi: GridInternalApi;
     constructor(adaptable: IAdaptable);
     getGridState(): GridState;
+    loadGridData(dataSource: any): void;
     resetGridData(dataSource: any[]): void;
     setInitialGridData(data: any): void;
     getGridData(): any[];
@@ -40,7 +41,6 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     hideFilterForm(): void;
     applyGridFiltering(): void;
     clearGridFiltering(): void;
-    getAgGridInstance(): GridOptions;
     getColumnSorts(): ColumnSort[];
     getColumnSortForColumn(columnId: string): ColumnSort | undefined;
     setAdaptableSorting(columnSorts: ColumnSort[]): void;
@@ -120,7 +120,6 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     isCellEditable(gridCell: GridCell): boolean;
     isEveryCellEditable(gridCells: GridCell[]): boolean;
     getRowCount(): number;
-    getVisibleRowCount(): number;
     getRowsInViewport(): IRowNode[];
     getColumnCount(): number;
     getVisibleColumnCount(): number;
@@ -130,4 +129,5 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getGridContainerElement(): HTMLElement | null;
     openGridInfoSettingsPanel(): void;
     getAgGridRowModelType(): RowModelType;
+    getVisibleRowCount(): number;
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -4,6 +4,7 @@ import { SystemHighlightCellAdd, SystemHighlightCellDelete, SystemHighlightCellD
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import { GridInternalApi } from '../Internal/GridInternalApi';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
+import { logDeprecation } from '../../Utilities/logDeprecation';
 export class GridApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -12,13 +13,18 @@ export class GridApiImpl extends ApiBase {
     getGridState() {
         return this.getAdaptableState().Grid;
     }
-    resetGridData(dataSource) {
+    loadGridData(dataSource) {
         this.adaptable.setGridData(dataSource);
         const allRowNodes = this.getAllRowNodes();
-        this.internalApi.fireGridDataChangedEvent(dataSource, allRowNodes, 'Add');
+        this.internalApi.fireGridDataChangedEvent(dataSource, allRowNodes, 'Load');
+    }
+    resetGridData(dataSource) {
+        logDeprecation(this.adaptable.logger, 'GridApi', 'resetGridData', 'loadGridData');
+        this.loadGridData(dataSource);
     }
     setInitialGridData(data) {
-        this.adaptable.setGridData(data);
+        logDeprecation(this.adaptable.logger, 'GridApi', 'setInitialGridData', 'loadGridData');
+        this.loadGridData(data);
     }
     getGridData() {
         return this.adaptable.getGridData();
@@ -114,9 +120,6 @@ export class GridApiImpl extends ApiBase {
         // slightly round the houses but we have to call ColumnFilterAPI as it does it properly
         this.adaptable.api.columnFilterApi.clearColumnFilters();
     }
-    getAgGridInstance() {
-        return this.adaptable.gridOptions;
-    }
     getColumnSorts() {
         return this.getAdaptableState().Grid.ColumnSorts;
     }
@@ -271,7 +274,9 @@ export class GridApiImpl extends ApiBase {
         return this.adaptable.getFirstDisplayedRowNode();
     }
     getVisibleRowNodes(config) {
-        return this.adaptable.getVisibleRowNodes();
+        const rowNodes = [];
+        this.adaptable.forAllVisibleRowNodesDo((rowNode) => rowNodes.push(rowNode), config);
+        return rowNodes;
     }
     getAllRowNodes(config) {
         return this.adaptable.getAllRowNodes(config);
@@ -330,10 +335,10 @@ export class GridApiImpl extends ApiBase {
         this.adaptable.expandRowGroupsForValues(columnValues);
     }
     isGridPivotable() {
-        return this.adaptable.isGridPivotable();
+        return !this.getAdaptableApi().internalApi.isGridInTreeMode();
     }
     isGridGroupable() {
-        return this.adaptable.isGridGroupable();
+        return !this.getAdaptableApi().internalApi.isGridInTreeMode();
     }
     isGridSelectable() {
         return this.adaptable.isGridSelectable();
@@ -349,7 +354,7 @@ export class GridApiImpl extends ApiBase {
     }
     redrawGrid() {
         this.adaptable.redrawBody();
-        this.adaptable.redrawHeader();
+        this.adaptable.refreshHeader();
     }
     getGridCellsForRawValue(columnId, rawValue) {
         const gridCells = this.adaptable.getGridCellsForColumn(columnId);
@@ -452,7 +457,7 @@ export class GridApiImpl extends ApiBase {
     }
     refreshGroupRowNodes() {
         // see https://www.ag-grid.com/javascript-data-grid/client-side-row-stages/#refreshing-the-client-side-model
-        this.getAgGridInstance().api.refreshClientSideRowModel('group');
+        this.getAdaptableApi().agGridApi.refreshClientSideRowModel('group');
         this.adaptable.updateRowGroupsExpandedState();
     }
     isCellEditable(gridCell) {
@@ -479,9 +484,6 @@ export class GridApiImpl extends ApiBase {
     getRowCount() {
         return this.adaptable.getRowCount();
     }
-    getVisibleRowCount() {
-        return this.adaptable.getVisibleRowCount();
-    }
     getRowsInViewport() {
         return this.adaptable.getRowsInViewport();
     }
@@ -509,4 +511,8 @@ export class GridApiImpl extends ApiBase {
     getAgGridRowModelType() {
         return this.adaptable.getAgGridRowModelType();
     }
+    getVisibleRowCount() {
+        logDeprecation(this.adaptable.logger, 'GridApi', 'getVisibleRowCount', 'getRowCount');
+        return this.getRowCount();
+    }
 }

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

@@ -48,4 +48,8 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
         ColumnFilters: boolean;
         ColumnSorts: boolean;
     };
+    showTransposePopup(config: {
+        transposedColumnId: string;
+        hideTransposedColumn?: boolean;
+    }): void;
 }

package/src/Api/Implementation/LayoutApiImpl.js

@@ -9,6 +9,7 @@ import { createUuid } from '../../PredefinedConfig/Uuid';
 import { DEFAULT_LAYOUT } from '../../Utilities/Constants/GeneralConstants';
 import { PopupShowPrompt } from '../../Redux/ActionsReducers/PopupRedux';
 import { LayoutInternalApi } from '../Internal/LayoutInternalApi';
+import { WINDOW_SHOW_TRANSPOSED_VIEW } from '../../View/Components/Popups/WindowPopups/windowFactory';
 export class LayoutApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -236,4 +237,17 @@ export class LayoutApiImpl extends ApiBase {
         }
         return layoutSupportedFeatures;
     }
+    showTransposePopup(config) {
+        const { transposedColumnId, hideTransposedColumn } = config;
+        this.adaptable.api.internalApi.showPopupWindow({
+            id: WINDOW_SHOW_TRANSPOSED_VIEW,
+            factoryId: WINDOW_SHOW_TRANSPOSED_VIEW,
+            title: 'Transpose View',
+            icon: 'grid',
+            popupProps: {
+                transposedColumnId,
+                hideTransposedColumn,
+            },
+        });
+    }
 }

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

@@ -1,6 +1,7 @@
 import { ApiBase } from './ApiBase';
 import { NotesApi } from '../NotesApi';
 import { AdaptableNote, AdaptableNotes, NotesState } from '../../PredefinedConfig/NotesState';
+import { CellAddress } from '../../PredefinedConfig/CellAddress';
 export declare class NotesApiImpl extends ApiBase implements NotesApi {
     addNote(noteStr: string, primaryKeyValue: any, columnId: string): void;
     editNote(note: AdaptableNote): void;
@@ -8,9 +9,6 @@ export declare class NotesApiImpl extends ApiBase implements NotesApi {
     deleteNote(note: AdaptableNote): void;
     getNotesState(): NotesState;
     getAllNotes(): AdaptableNotes;
-    getCellNotes(config: {
-        PrimaryKeyValue: string | number;
-        ColumnId: string;
-    }): AdaptableNote[];
+    getCellNotes(address: CellAddress): AdaptableNote[];
     getNoteByUuid(uuid: string): AdaptableNote | undefined;
 }

package/src/Api/Implementation/NotesApiImpl.js

@@ -3,13 +3,9 @@ import * as NotesRedux from '../../Redux/ActionsReducers/NotesRedux';
 export class NotesApiImpl extends ApiBase {
     addNote(noteStr, primaryKeyValue, columnId) {
         const note = {
-            Value: noteStr,
+            Text: noteStr,
             PrimaryKeyValue: primaryKeyValue,
             ColumnId: columnId,
-            AdaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-            Author: {
-                UserName: this.adaptable.api.optionsApi.getUserName(),
-            },
             Timestamp: Date.now(),
         };
         this.dispatchAction(NotesRedux.NotesAdd(note));
@@ -19,7 +15,7 @@ export class NotesApiImpl extends ApiBase {
         this.dispatchAction(NotesRedux.NotesEdit(note));
     }
     updateNoteText(noteStr, note) {
-        this.editNote(Object.assign(Object.assign({}, note), { Value: noteStr }));
+        this.editNote(Object.assign(Object.assign({}, note), { Text: noteStr }));
     }
     deleteNote(note) {
         this.dispatchAction(NotesRedux.NotesDelete(note));
@@ -30,8 +26,8 @@ export class NotesApiImpl extends ApiBase {
     getAllNotes() {
         return this.getNotesState().Notes;
     }
-    getCellNotes(config) {
-        return NotesRedux.GetNotesSelector(this.getAdaptableState().Notes, config);
+    getCellNotes(address) {
+        return NotesRedux.GetNotesSelector(this.getAdaptableState().Notes, address);
     }
     getNoteByUuid(uuid) {
         return this.getAllNotes().find((note) => note.Uuid === uuid);

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

@@ -5,7 +5,7 @@ import { CustomSortOptions } from '../../AdaptableOptions/CustomSortOptions';
 import { Fdc3Options } from '../../AdaptableOptions/Fdc3Options';
 import { ExpressionOptions } from '../../AdaptableOptions/ExpressionOptions';
 import { ColumnFilterOptions } from '../../AdaptableOptions/ColumnFilterOptions';
-import { CommentsOptions } from '../../AdaptableOptions/CommentsOptions';
+import { CommentsOptions } from '../../AdaptableOptions/CommentOptions';
 export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getAdaptableId(): string;
     getAdaptableStateKey(): string;

package/src/Api/Implementation/OptionsApiImpl.js

@@ -37,10 +37,10 @@ export class OptionsApiImpl extends ApiBase {
         return this.getOptions().columnOptions;
     }
     getNotesOptions() {
-        return this.getOptions().notesOptions;
+        return this.getOptions().noteOptions;
     }
     getCommentsOptions() {
-        return this.getOptions().commentsOptions;
+        return this.getOptions().commentOptions;
     }
     getCustomSortOptions() {
         return this.getOptions().customSortOptions;

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

@@ -5,6 +5,5 @@ import { StatusPanelDef } from '@ag-grid-community/core';
 export declare class StatusBarApiImpl extends ApiBase implements StatusBarApi {
     getAdaptableStatusBars(): AdaptableStatusBar[];
     getAgGridStatusPanels(): StatusPanelDef[];
-    getAgGridStatusBar(): StatusPanelDef[];
     setStatusBarPanels(statusPanels: AdaptableStatusBar[]): void;
 }

package/src/Api/Implementation/StatusBarApiImpl.js

@@ -7,9 +7,6 @@ export class StatusBarApiImpl extends ApiBase {
     getAgGridStatusPanels() {
         return this.adaptable.getAgGridStatusPanels();
     }
-    getAgGridStatusBar() {
-        return this.adaptable.getAgGridStatusPanels();
-    }
     setStatusBarPanels(statusPanels) {
         this.dispatchAction(StatusBarSetPanels(statusPanels));
     }

package/src/Api/Implementation/ToolPanelApiImpl.js

@@ -10,15 +10,15 @@ export class ToolPanelApiImpl extends ApiBase {
         this.showModulePopup(ModuleConstants.ToolPanelModuleId);
     }
     openAdapTableToolPanel() {
-        let gridOptions = this.getGridApi().getAgGridInstance();
-        if (gridOptions) {
-            gridOptions.api.openToolPanel('adaptable');
+        const agGridApi = this.getAdaptableApi().agGridApi;
+        if (agGridApi) {
+            agGridApi.openToolPanel('adaptable');
         }
     }
     closeAdapTableToolPanel() {
-        let gridOptions = this.getGridApi().getAgGridInstance();
-        if (gridOptions) {
-            gridOptions.api.closeToolPanel();
+        const agGridApi = this.getAdaptableApi().agGridApi;
+        if (agGridApi) {
+            agGridApi.closeToolPanel();
         }
     }
     getCustomToolPanels() {

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

@@ -1,7 +1,9 @@
-import { IRowNode } from '@ag-grid-community/core';
+import { ColDef, IRowNode } from '@ag-grid-community/core';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
 import { CreateActionRowFormContext, EditActionRowFormContext } from '../../AdaptableOptions/ActionRowOptions';
+import { AdaptableButton } from '../../PredefinedConfig/Common/AdaptableButton';
 import { ApiBase } from '../Implementation/ApiBase';
+import { ActionColumnContext } from '../../AdaptableOptions/ActionColumnOptions';
 export declare class ActionRowInternalApi extends ApiBase {
     buildRowEditForm(rowNode: IRowNode): AdaptableForm<EditActionRowFormContext>;
     buildRowCreateForm(clonedRowNode?: IRowNode): AdaptableForm<CreateActionRowFormContext>;
@@ -21,4 +23,6 @@ export declare class ActionRowInternalApi extends ApiBase {
     private buildFormFieldLabelContext;
     private getFieldTypeFromColumnType;
     private getFieldValueOptions;
+    getColDefsForActionRowColumns(): ColDef[];
+    getActionRowButtonDefs(): AdaptableButton<ActionColumnContext<any>>[];
 }

package/src/Api/Internal/ActionRowInternalApi.js

@@ -1,4 +1,7 @@
 import { ApiBase } from '../Implementation/ApiBase';
+import { AB_SPECIAL_COLUMN, ADAPTABLE_ROW_ACTION_BUTTONS, } from '../../Utilities/Constants/GeneralConstants';
+import UIHelper from '../../View/UIHelper';
+import { ActionColumnRenderer, ReactActionColumnRenderer } from '../../agGrid/ActionColumnRenderer';
 export class ActionRowInternalApi extends ApiBase {
     buildRowEditForm(rowNode) {
         return this.buildActionRow('rowEdited', rowNode);
@@ -197,4 +200,107 @@ export class ActionRowInternalApi extends ApiBase {
             label: value,
         }));
     }
+    getColDefsForActionRowColumns() {
+        const actionButtons = this.getActionRowButtonDefs();
+        if (!actionButtons.length) {
+            return [];
+        }
+        return [
+            {
+                headerName: '',
+                colId: ADAPTABLE_ROW_ACTION_BUTTONS,
+                hide: false,
+                editable: false,
+                // 15px is the icon width + left&right padding + left&right border
+                width: Math.max(actionButtons.length * (UIHelper.getSimpleButtonPaddingWidth() * 2 + 15) + 2, 
+                // If the width of the column is to small, the width will not be applied
+                // this triggers the setLayout an infinite loop because the width read from the grid is always different
+                40),
+                resizable: false,
+                lockVisible: true,
+                suppressColumnsToolPanel: true,
+                suppressFiltersToolPanel: true,
+                suppressMenu: true,
+                suppressMovable: true,
+                filter: false,
+                sortable: false,
+                enableRowGroup: false,
+                pinned: this.getActionRowOptions().actionRowButtonOptions.position === 'pinnedRight'
+                    ? 'right'
+                    : 'left',
+                cellRenderer: this.getAdaptableVariant() === 'react' ? ReactActionColumnRenderer : ActionColumnRenderer,
+                cellClass: ADAPTABLE_ROW_ACTION_BUTTONS,
+                type: [AB_SPECIAL_COLUMN, 'abColDefObject'],
+            },
+        ];
+    }
+    getActionRowButtonDefs() {
+        const actionRowButtons = this.getActionRowApi().getActionRowButtons();
+        if (!(actionRowButtons === null || actionRowButtons === void 0 ? void 0 : actionRowButtons.length)) {
+            return [];
+        }
+        const defaultActionRowButtonConfiguration = {
+            create: {
+                icon: {
+                    name: 'add',
+                },
+                tooltip: 'Create',
+                onClick: () => {
+                    this.getActionRowApi().displayCreateActionRow();
+                },
+            },
+            edit: {
+                icon: {
+                    name: 'edit',
+                },
+                tooltip: 'Edit',
+                onClick: (button, context) => {
+                    this.getActionRowApi().displayEditActionRow(context.primaryKeyValue);
+                },
+            },
+            clone: {
+                icon: {
+                    name: 'clone',
+                },
+                tooltip: 'Clone',
+                onClick: (button, context) => {
+                    this.getActionRowApi().displayCloneActionRow(context.primaryKeyValue);
+                },
+            },
+            delete: {
+                icon: {
+                    name: 'delete',
+                },
+                tooltip: 'Delete',
+                onClick: (button, context) => {
+                    var _a, _b;
+                    const eventInfo = {
+                        type: 'rowDeleted',
+                        rowNode: context.rowNode,
+                        adaptableApi: context.adaptableApi,
+                        userName: context.userName,
+                        adaptableId: context.adaptableId,
+                    };
+                    this.getEventApi().emit('ActionRowSubmitted', eventInfo);
+                    (_b = (_a = this.getActionRowOptions().actionRowFormOptions).onFormSubmit) === null || _b === void 0 ? void 0 : _b.call(_a, eventInfo);
+                },
+            },
+        };
+        const actionButtons = actionRowButtons
+            .map((actionRowButtonType) => {
+            var _a, _b;
+            const defaultButtonConfig = defaultActionRowButtonConfiguration[actionRowButtonType];
+            if (!defaultButtonConfig) {
+                // should NOT happen unless the user sent some invalid button type in the predefined config
+                return;
+            }
+            const customButtonConfig = (_b = (_a = this.getActionRowOptions().actionRowButtonOptions).customConfiguration) === null || _b === void 0 ? void 0 : _b.call(_a, Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { actionRowButtonType }));
+            if (!customButtonConfig) {
+                return defaultButtonConfig;
+            }
+            return Object.assign(Object.assign({}, defaultButtonConfig), customButtonConfig);
+        })
+            .filter(Boolean);
+        return actionButtons;
+    }
 }

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

@@ -24,9 +24,9 @@ import { AdaptableFrameworkComponent } from '../../AdaptableOptions/AdaptableFra
 import { IMetamodelService } from '../../Utilities/Services/Interface/IMetamodelService';
 import { IModuleCollection } from '../../Strategy/Interface/IModule';
 import { AdaptableObjectTag, AdaptableObjectWithScope } from '../../PredefinedConfig/Common/AdaptableObject';
-import { IRowEditService } from '../../Utilities/Services/Interface/IRowEditService';
 import { Fdc3Service } from '../../Utilities/Services/Fdc3Service';
 import { CellPopupService } from '../../Utilities/Services/CellPopupService';
+import { RowEditService } from '../../Utilities/Services/RowEditService';
 export declare class AdaptableInternalApi extends ApiBase {
     getSystemState(): SystemState;
     showPopupConfirmation(confirmation: UIConfirmation): void;
@@ -46,8 +46,7 @@ export declare class AdaptableInternalApi extends ApiBase {
     setPivotModeOn(): void;
     setPivotModeOff(): void;
     isGridInPivotMode(): boolean;
-    setTreeModeOn(): void;
-    setTreeModeOff(): void;
+    setTreeMode(mode: boolean): void;
     isGridInTreeMode(): boolean;
     getToolbarTitle(): string;
     buildDataChangedInfo(config: Pick<CellDataChangedInfo, 'newValue' | 'oldValue' | 'column' | 'primaryKeyValue' | 'rowNode' | 'trigger'>): CellDataChangedInfo;
@@ -65,7 +64,7 @@ export declare class AdaptableInternalApi extends ApiBase {
     getAlertService(): IAlertService;
     getTeamSharingService(): ITeamSharingService;
     getMetamodelService(): IMetamodelService;
-    getRowEditService(): IRowEditService;
+    getRowEditService(): RowEditService;
     getFdc3Service(): Fdc3Service;
     getModules(): IModuleCollection;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -47,11 +47,13 @@ export class AdaptableInternalApi extends ApiBase {
     isGridInPivotMode() {
         return this.getAdaptableState().Grid.IsGridInPivotMode;
     }
-    setTreeModeOn() {
-        this.dispatchAction(GridRedux.SetTreeModeOn());
-    }
-    setTreeModeOff() {
-        this.dispatchAction(GridRedux.SetTreeModeOff());
+    setTreeMode(mode) {
+        if (!!mode) {
+            this.dispatchAction(GridRedux.SetTreeModeOn());
+        }
+        else {
+            this.dispatchAction(GridRedux.SetTreeModeOff());
+        }
     }
     isGridInTreeMode() {
         return this.getAdaptableState().Grid.IsGridInTreeMode;
@@ -219,13 +221,13 @@ export class AdaptableInternalApi extends ApiBase {
             frameworkComponent,
             componentType,
         });
-        if (this.adaptable.isInitialised) {
+        if (this.adaptable.isReady) {
             createComponentFn();
         }
         else {
             // adaptable may not be initialized yet if the framework component is part of the initial render
             // AFL 2021.10.14 - not really sure if this is necessary anymore?! (see the other changes in this commit)
-            waitForCondition(() => this.adaptable.isInitialised).then(() => {
+            waitForCondition(() => this.adaptable.isReady).then(() => {
                 createComponentFn();
             });
         }
@@ -448,7 +450,7 @@ export class AdaptableInternalApi extends ApiBase {
         var _a;
         let actionColumn;
         if (colDef.colId == ADAPTABLE_ROW_ACTION_BUTTONS) {
-            const actionButtons = this.adaptable.getActionRowButtonDefs();
+            const actionButtons = this.getActionRowApi().internalApi.getActionRowButtonDefs();
             actionColumn = {
                 columnId: ADAPTABLE_ROW_ACTION_BUTTONS,
                 actionColumnButton: actionButtons,

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

@@ -1,6 +1,7 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { CalculatedColumn } from '../../PredefinedConfig/CalculatedColumnState';
 import { AdaptableColumn } from '../../types';
+import { ColDef } from '@ag-grid-community/core';
 export declare class CalculatedColumnInternalApi extends ApiBase {
     /**
      * Returns all the references in the AdaptableState of the given CalculatedColumn
@@ -27,4 +28,5 @@ export declare class CalculatedColumnInternalApi extends ApiBase {
     isQuantileAggregatedExpression(input: string): boolean;
     getExpressionFromCalculatedColumn(calculatedColumn: CalculatedColumn): string;
     fireCalculatedColumnChangedEvent(trigger: string, calculatedColumn: CalculatedColumn): void;
+    getColDefsForCalculatedColumns(): ColDef[];
 }