@adaptabletools/adaptable 18.0.0-canary.0 → 18.0.0-canary.10

package/src/Api/Implementation/ActionColumnApiImpl.js

@@ -1,4 +1,6 @@
 import { ApiBase } from './ApiBase';
+import { ActionColumnRenderer, ReactActionColumnRenderer } from '../../agGrid/ActionColumnRenderer';
+import { AB_SPECIAL_COLUMN } from '../../Utilities/Constants/GeneralConstants';
 export class ActionColumnApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -7,4 +9,35 @@ export class ActionColumnApiImpl extends ApiBase {
         var _a;
         return (_a = this.getActionColumnOptions().actionColumns) !== null && _a !== void 0 ? _a : [];
     }
+    getColDefsForActionColumns() {
+        const defaultActionColumnSettings = {
+            resizable: true,
+            suppressMenu: false,
+            suppressMovable: false,
+        };
+        return this.getActionColumnApi()
+            .getActionColumns()
+            .map((actionColumn) => {
+            const actionColumnSettings = Object.assign(Object.assign({}, defaultActionColumnSettings), actionColumn.actionColumnSettings);
+            const newColDef = {
+                headerName: actionColumn.friendlyName ? actionColumn.friendlyName : actionColumn.columnId,
+                colId: actionColumn.columnId,
+                hide: false,
+                editable: false,
+                width: actionColumnSettings.width,
+                resizable: actionColumnSettings.resizable,
+                suppressMenu: actionColumnSettings.suppressMenu,
+                suppressMovable: actionColumnSettings.suppressMovable,
+                filter: false,
+                sortable: false,
+                enableRowGroup: false,
+                cellRenderer: this.getAdaptableApi().internalApi.getAdaptableInstance().variant === 'react'
+                    ? ReactActionColumnRenderer
+                    : ActionColumnRenderer,
+                type: [AB_SPECIAL_COLUMN, 'abColDefObject'],
+            };
+            this.getAdaptableApi().logInfo('Setting up Action Column: ' + actionColumn.columnId);
+            return newColDef;
+        });
+    }
 }

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

@@ -98,6 +98,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     commentApi: CommentApi;
     private destroyed;
     constructor(adaptable: IAdaptable);
+    get agGridApi(): import("@ag-grid-community/core/dist/esm/es6/gridApi").GridApi<any>;
     /**
      * This is only meant to be called by the Adaptable instance.
      */

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -103,6 +103,9 @@ export class AdaptableApiImpl {
         // adaptable internal api
         this.internalApi = new AdaptableInternalApi(adaptable);
     }
+    get agGridApi() {
+        return this.adaptable.agGridAdapter.getAgGridApi();
+    }
     /**
      * This is only meant to be called by the Adaptable instance.
      */

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.d.ts

@@ -2,7 +2,11 @@ import { ApiBase } from './ApiBase';
 import { CellAddress } from '../../PredefinedConfig/CellAddress';
 import { CommentThread, AdaptableComment } from '../../types';
 import { CommentApi } from '../CommentApi';
+import { CommentsInternalApi } from '../Internal/CommentsInternalApi';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 export declare class CommentsApiImpl extends ApiBase implements CommentApi {
+    internalApi: CommentsInternalApi;
+    constructor(adaptable: IAdaptable);
     getComments(address: CellAddress): AdaptableComment[];
     getCommentThread(address: CellAddress): CommentThread | undefined;
     getCommentThreads(): CommentThread[];

package/src/Api/Implementation/CommentsApiImpl.js

@@ -2,7 +2,12 @@ import * as CommentRedux from '../../Redux/ActionsReducers/CommentsRedux';
 import { ApiBase } from './ApiBase';
 import ObjectFactory from '../../Utilities/ObjectFactory';
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
+import { CommentsInternalApi } from '../Internal/CommentsInternalApi';
 export class CommentsApiImpl extends ApiBase {
+    constructor(adaptable) {
+        super(adaptable);
+        this.internalApi = new CommentsInternalApi(adaptable);
+    }
     getComments(address) {
         return CommentRedux.GetCommentsSelector(this.getAdaptableState().Comment, address);
     }
@@ -10,7 +15,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,22 +124,31 @@ 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({ skipColDefsRefresh: true });
+                        this.adaptable.setLayout();
                         this.adaptable.api.userInterfaceApi.hideLoadingScreen();
                     })
                         .then(() => {
                         // resolve main(result) promise
                         resolve();
-                    }, () => {
+                    }, (error) => {
                         // reject main(result) promise
-                        reject();
+                        reject(error);
+                    })
+                        .catch((e) => {
+                        this.logError('Error setting Adaptable State Key', e);
                     });
                 });
             });

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,6 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getGridContainerElement(): HTMLElement | null;
     openGridInfoSettingsPanel(): void;
     getAgGridRowModelType(): RowModelType;
+    getVisibleRowCount(): number;
+    showTransposedView(transposedColumnId: string, hideTransposedColumn?: boolean): void;
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -4,6 +4,8 @@ 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';
+import { WINDOW_SHOW_TRANSPOSED_VIEW } from '../../View/Components/Popups/WindowPopups/windowFactory';
 export class GridApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -12,13 +14,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 +121,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 +275,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 +336,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 +355,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 +458,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 +485,6 @@ export class GridApiImpl extends ApiBase {
     getRowCount() {
         return this.adaptable.getRowCount();
     }
-    getVisibleRowCount() {
-        return this.adaptable.getVisibleRowCount();
-    }
     getRowsInViewport() {
         return this.adaptable.getRowsInViewport();
     }
@@ -509,4 +512,20 @@ export class GridApiImpl extends ApiBase {
     getAgGridRowModelType() {
         return this.adaptable.getAgGridRowModelType();
     }
+    getVisibleRowCount() {
+        logDeprecation(this.adaptable.logger, 'GridApi', 'getVisibleRowCount', 'getRowCount');
+        return this.getRowCount();
+    }
+    showTransposedView(transposedColumnId, hideTransposedColumn) {
+        this.adaptable.api.internalApi.showPopupWindow({
+            id: WINDOW_SHOW_TRANSPOSED_VIEW,
+            factoryId: WINDOW_SHOW_TRANSPOSED_VIEW,
+            title: 'Transposed View',
+            icon: 'grid',
+            popupProps: {
+                transposedColumnId,
+                hideTransposedColumn,
+            },
+        });
+    }
 }

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

@@ -41,6 +41,8 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     removeColumnFromCurrentLayout(columnId: string): void;
     removeColumnFromAllLayouts(columnId: string): void;
     removeColumnFromLayout(columnId: string, layoutName: string): void;
+    addColumnToLayout(columnId: string, layoutName: string): void;
+    addColumnToCurrentLayout(columnId: string): void;
     getLayoutSupportedFeatures(): {
         RowGroupedColumns: boolean;
         AggregationColumns: boolean;

package/src/Api/Implementation/LayoutApiImpl.js

@@ -221,6 +221,21 @@ export class LayoutApiImpl extends ApiBase {
             }
         }
     }
+    addColumnToLayout(columnId, layoutName) {
+        const column = this.getAdaptableApi().columnApi.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);
+                }
+            }
+        }
+    }
+    addColumnToCurrentLayout(columnId) {
+        this.addColumnToLayout(columnId, this.getCurrentLayoutName());
+    }
     getLayoutSupportedFeatures() {
         const layoutSupportedFeatures = {
             RowGroupedColumns: true,

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

@@ -1,16 +1,18 @@
 import { ApiBase } from './ApiBase';
 import { NotesApi } from '../NotesApi';
 import { AdaptableNote, AdaptableNotes, NotesState } from '../../PredefinedConfig/NotesState';
+import { CellAddress } from '../../PredefinedConfig/CellAddress';
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { NotesInternalApi } from '../Internal/NotesInternalApi';
 export declare class NotesApiImpl extends ApiBase implements NotesApi {
+    internalApi: NotesInternalApi;
+    constructor(adaptable: IAdaptable);
     addNote(noteStr: string, primaryKeyValue: any, columnId: string): void;
     editNote(note: AdaptableNote): void;
     updateNoteText(noteStr: string, note: AdaptableNote): void;
     deleteNote(note: AdaptableNote): void;
     getNotesState(): NotesState;
     getAllNotes(): AdaptableNotes;
-    getCellNotes(config: {
-        PrimaryKeyValue: string | number;
-        ColumnId: string;
-    }): AdaptableNotes;
+    getCellNotes(address: CellAddress): AdaptableNote[];
     getNoteByUuid(uuid: string): AdaptableNote | undefined;
 }

package/src/Api/Implementation/NotesApiImpl.js

@@ -1,15 +1,16 @@
 import { ApiBase } from './ApiBase';
 import * as NotesRedux from '../../Redux/ActionsReducers/NotesRedux';
+import { NotesInternalApi } from '../Internal/NotesInternalApi';
 export class NotesApiImpl extends ApiBase {
+    constructor(adaptable) {
+        super(adaptable);
+        this.internalApi = new NotesInternalApi(adaptable);
+    }
     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 +20,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 +31,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;
@@ -15,6 +15,7 @@ export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getUserName(): string;
     getAdaptableOptions(): AdaptableOptions;
     getActionColumnOptions(): ActionColumnOptions;
+    getColumnTypes(): string[];
     getActionRowOptions(): ActionRowOptions;
     getCellSummaryOptions(): CellSummaryOptions;
     getCalendarOptions(): CalendarOptions;

package/src/Api/Implementation/OptionsApiImpl.js

@@ -1,4 +1,5 @@
 import { ApiBase } from './ApiBase';
+import { createBaseContext } from '../../Utilities/ObjectFactory';
 export class OptionsApiImpl extends ApiBase {
     getAdaptableId() {
         return this.adaptable.adaptableOptions.adaptableId;
@@ -24,6 +25,15 @@ export class OptionsApiImpl extends ApiBase {
     getActionColumnOptions() {
         return this.getOptions().actionColumnOptions;
     }
+    getColumnTypes() {
+        const columnTypes = this.getOptions().columnOptions.columnTypes;
+        if (typeof columnTypes === 'function') {
+            return columnTypes(createBaseContext(this.getAdaptableApi()));
+        }
+        else {
+            return columnTypes;
+        }
+    }
     getActionRowOptions() {
         return this.getOptions().actionRowOptions;
     }
@@ -37,10 +47,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/ScopeApiImpl.d.ts

@@ -10,6 +10,7 @@ export declare class ScopeApiImpl extends ApiBase implements ScopeApi {
     scopeIsEmpty(scope: AdaptableScope): boolean;
     scopeIsAll(scope: AdaptableScope): boolean;
     scopeHasDataType(scope: AdaptableScope): boolean;
+    scopeHasColumnType(scope: AdaptableScope): boolean;
     scopeHasOnlyBooleanDataType(scope: AdaptableScope): boolean;
     scopeHasColumns(scope: AdaptableScope): boolean;
     isSingleColumnScope(scope: AdaptableScope): boolean;
@@ -21,6 +22,7 @@ export declare class ScopeApiImpl extends ApiBase implements ScopeApi {
     isPrimaryKeyColumnInScopeColumns(scope: AdaptableScope): boolean;
     getScopeToString(scope: AdaptableScope): string;
     getColumnIdsInScope(scope: AdaptableScope): string[] | undefined;
+    getColumnTypesInScope(scope: AdaptableScope): string[] | undefined;
     getDataTypesInScope(scope: AdaptableScope): ScopeDataType[] | undefined;
     isColumnInNumericScope(column: AdaptableColumn, scope: AdaptableScope): boolean;
     isColumnInStringsScope(column: AdaptableColumn, scope: AdaptableScope): boolean;

package/src/Api/Implementation/ScopeApiImpl.js

@@ -13,6 +13,10 @@ export class ScopeApiImpl extends ApiBase {
         if ('DataTypes' in scope && scope.DataTypes.includes(column.dataType)) {
             return true;
         }
+        if ('ColumnTypes' in scope &&
+            scope.ColumnTypes.some((columnType) => { var _a; return (_a = column.columnTypes) === null || _a === void 0 ? void 0 : _a.includes(columnType); })) {
+            return true;
+        }
         if ('ColumnIds' in scope && scope.ColumnIds.includes(column.columnId)) {
             return true;
         }
@@ -27,13 +31,7 @@ export class ScopeApiImpl extends ApiBase {
             return columns;
         }
         return columns.filter((c) => {
-            if ('DataTypes' in scope && scope.DataTypes.includes(c.dataType)) {
-                return true;
-            }
-            if ('ColumnIds' in scope && scope.ColumnIds.includes(c.columnId)) {
-                return true;
-            }
-            return false;
+            return this.isColumnInScope(c, scope);
         });
     }
     getScopeDescription(scope) {
@@ -44,6 +42,9 @@ export class ScopeApiImpl extends ApiBase {
             // do we need a true check here?
             return 'Columns: All';
         }
+        if ('ColumnTypes' in scope) {
+            return ((scope.ColumnTypes.length > 0 ? 'ColumnTypes' : 'ColumnType') + ': ' + scope.ColumnTypes.join(', '));
+        }
         if ('DataTypes' in scope) {
             return ((scope.DataTypes.length > 0 ? 'DataTypes' : 'DataType') + ': ' + scope.DataTypes.join(', '));
         }
@@ -67,6 +68,9 @@ export class ScopeApiImpl extends ApiBase {
     scopeHasDataType(scope) {
         return scope !== undefined && 'DataTypes' in scope;
     }
+    scopeHasColumnType(scope) {
+        return scope !== undefined && 'ColumnTypes' in scope;
+    }
     scopeHasOnlyBooleanDataType(scope) {
         var _a;
         return 'DataTypes' in scope && ((_a = scope.DataTypes) === null || _a === void 0 ? void 0 : _a.length) == 1 && scope.DataTypes[0] == 'Boolean';
@@ -120,6 +124,9 @@ export class ScopeApiImpl extends ApiBase {
         if ('All' in scope) {
             return 'Columns: All';
         }
+        if ('ColumnTypes' in scope) {
+            return 'ColumnTypes: ' + scope.ColumnTypes.join(',');
+        }
         if ('DataTypes' in scope) {
             return 'DataTypes: ' + scope.DataTypes.join(',');
         }
@@ -140,6 +147,12 @@ export class ScopeApiImpl extends ApiBase {
         }
         return undefined;
     }
+    getColumnTypesInScope(scope) {
+        if (scope !== undefined && 'ColumnTypes' in scope) {
+            return scope.ColumnTypes;
+        }
+        return undefined;
+    }
     getDataTypesInScope(scope) {
         if (scope !== undefined && 'DataTypes' in scope) {
             return scope.DataTypes;

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>>[];
 }