@adaptabletools/adaptable 18.0.0-canary.9 → 18.0.0

package/src/Api/Implementation/ExpressionApiImpl.js

@@ -7,8 +7,8 @@ export class ExpressionApiImpl extends ApiBase {
         this.internalApi = new ExpressionInternalApi(adaptable);
     }
     isValidBooleanExpression(query, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.adaptable.api.internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateBoolean(query, module, { force: true });
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -16,8 +16,8 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidObservableExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.adaptable.api.internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateObservable(expression, module);
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -25,8 +25,8 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidAggregatedBooleanExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.adaptable.api.internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateAggregatedBoolean(expression, module);
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -34,8 +34,8 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidAggregatedScalarExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.adaptable.api.internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateAggregatedScalar(expression, module);
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -47,11 +47,11 @@ export class ExpressionApiImpl extends ApiBase {
     }
     getColumnsFromExpression(expression) {
         try {
-            const columnIds = this.adaptable.api.internalApi
-                .getQueryLanguageService()
+            const columnIds = this.getAdaptableApi()
+                .internalApi.getQueryLanguageService()
                 .getColumnsFromExpression(expression);
             columnIds.forEach((columnId) => {
-                const calculatedColumn = this.adaptable.api.calculatedColumnApi.getCalculatedColumnForColumnId(columnId);
+                const calculatedColumn = this.getAdaptableApi().calculatedColumnApi.getCalculatedColumnForColumnId(columnId);
                 if (calculatedColumn) {
                     const transitiveColumnIds = this.getColumnsFromExpression(this.getAdaptableQueryExpression(calculatedColumn.Query));
                     columnIds.push(...transitiveColumnIds);
@@ -69,12 +69,7 @@ export class ExpressionApiImpl extends ApiBase {
     isColumnQueryable(adaptableColumnBase) {
         let queryableColumnFn = this.getExpressionOptions().isColumnQueryable;
         if (queryableColumnFn) {
-            const queryableColumnContext = {
-                adaptableColumn: adaptableColumnBase,
-                adaptableApi: this.getAdaptableApi(),
-                userName: this.getOptions().userName,
-                adaptableId: this.getOptions().adaptableId,
-            };
+            const queryableColumnContext = Object.assign({ adaptableColumn: adaptableColumnBase }, this.getAdaptableApi().internalApi.buildBaseContext());
             return queryableColumnFn(queryableColumnContext);
         }
         return true;
@@ -84,8 +79,8 @@ export class ExpressionApiImpl extends ApiBase {
         return ((_d = (_c = (_b = (_a = query.BooleanExpression) !== null && _a !== void 0 ? _a : query.ScalarExpression) !== null && _b !== void 0 ? _b : query.ObservableExpression) !== null && _c !== void 0 ? _c : query.AggregatedBooleanExpression) !== null && _d !== void 0 ? _d : query.AggregatedScalarExpression);
     }
     getAdaptableQueryExpressionWithColumnFriendlyNames(query) {
-        return this.adaptable.api.internalApi
-            .getQueryLanguageService()
+        return this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .getExpressionWithColumnFriendlyNames(this.getAdaptableQueryExpression(query));
     }
     useCaseSensitivity() {

package/src/Api/Implementation/Fdc3ApiImpl.js

@@ -76,6 +76,6 @@ export class Fdc3ApiImpl extends ApiBase {
         return this.internalApi.isStandardIntentType(intentType);
     }
     getFdc3Service() {
-        return this.adaptable.api.internalApi.getFdc3Service();
+        return this.getAdaptableApi().internalApi.getFdc3Service();
     }
 }

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

@@ -3,7 +3,7 @@ import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFl
 import { FlashingCellApi } from '../FlashingCellApi';
 import { FlashingCellDefinition, FlashingCellState } from '../../PredefinedConfig/FlashingCellState';
 import { AdaptablePredicateDef } from '../../PredefinedConfig/Common/AdaptablePredicate';
-import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
+import { ColumnScope } from '../../PredefinedConfig/Common/ColumnScope';
 import { FlashingCellInternalApi } from '../Internal/FlashingCellInternalApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableObjectLookupCriteria } from '../../types';
@@ -23,7 +23,7 @@ export declare class FlashingCellApiImpl extends ApiBase implements FlashingCell
     unSuspendFlashingCellDefinition(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
     addFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
     editFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
-    getFlashingCellPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    getFlashingCellPredicateDefsForScope(scope: ColumnScope): AdaptablePredicateDef[];
     clearAllFlashingCells(): void;
     isAnyFlashingCellActive(): boolean;
     findFlashingCellDefinitions(criteria: AdaptableObjectLookupCriteria): FlashingCellDefinition[];

package/src/Api/Implementation/FlashingCellApiImpl.js

@@ -30,13 +30,8 @@ export class FlashingCellApiImpl extends ApiBase {
     }
     showFlashingCell(flashingCellToShow) {
         this.addUidToAdaptableObject(flashingCellToShow);
-        const flashingCellFiredInfo = {
-            adaptableApi: this.adaptable.api,
-            flashingCell: flashingCellToShow,
-            userName: this.adaptable.api.optionsApi.getUserName(),
-            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-        };
-        const results = this.adaptable.api.eventApi.emitSync('FlashingCellDisplayed', flashingCellFiredInfo);
+        const flashingCellFiredInfo = Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { flashingCell: flashingCellToShow });
+        const results = this.getAdaptableApi().eventApi.emitSync('FlashingCellDisplayed', flashingCellFiredInfo);
         const shouldShow = results.reduce((endResult, aResult) => {
             return endResult && aResult !== false;
         }, true);
@@ -84,7 +79,7 @@ export class FlashingCellApiImpl extends ApiBase {
     getFlashingCellPredicateDefsForScope(scope) {
         return this.getAdaptableApi()
             .predicateApi.internalApi.getFlashingCellPredicateDefs(scope)
-            .filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
+            .filter((predicateDef) => this.getAdaptableApi().columnScopeApi.isScopeInScope(scope, predicateDef.columnScope));
     }
     clearAllFlashingCells() {
         this.dispatchAction(SystemRedux.SystemFlashingCellDeleteAll());

package/src/Api/Implementation/FormatColumnApiImpl.js

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

package/src/Api/Implementation/FreeTextColumnApiImpl.js

@@ -85,7 +85,7 @@ export class FreeTextColumnApiImpl extends ApiBase {
     }
     getFreeTextColumnValueForRowNode(freeTextColumn, rowNode) {
         try {
-            if (this.adaptable.api.gridApi.isGroupRowNode(rowNode)) {
+            if (this.getAdaptableApi().gridApi.isGroupRowNode(rowNode)) {
                 return null;
             }
             if (ArrayExtensions.IsNotNullOrEmpty(freeTextColumn.FreeTextStoredValues)) {

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

@@ -8,12 +8,13 @@ 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 { IRowNode, RowModelType } from '@ag-grid-community/core';
+import { Column, 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';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { GridInternalApi } from '../Internal/GridInternalApi';
+import { TransposeConfig } from '../../PredefinedConfig/Common/TransposeConfig';
 export declare class GridApiImpl extends ApiBase implements GridApi {
     internalApi: GridInternalApi;
     constructor(adaptable: IAdaptable);
@@ -23,6 +24,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     setInitialGridData(data: any): void;
     getGridData(): any[];
     getFilteredData(): any[];
+    getVisibleData(): any[];
     updateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
     addOrUpdateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<{
         addedRows: IRowNode[];
@@ -92,8 +94,12 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     isGridPivotable(): boolean;
     isGridGroupable(): boolean;
     isGridSelectable(): boolean;
+    isGridRowSelectable(): boolean;
+    isGridRangeSelectable(): boolean;
     isGridRowGrouped(): boolean;
+    isGridInPivotMode(): boolean;
     isGroupRowNode(rowNode: IRowNode): boolean;
+    isSummaryNode(rowNode: IRowNode): boolean;
     isQuickFilterAvailable(): boolean;
     redrawGrid(): void;
     getGridCellsForRawValue(columnId: string, rawValue: any): GridCell[] | undefined;
@@ -130,5 +136,6 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     openGridInfoSettingsPanel(): void;
     getAgGridRowModelType(): RowModelType;
     getVisibleRowCount(): number;
-    showTransposedView(transposedColumnId: string, hideTransposedColumn?: boolean): void;
+    showTransposedView(transposeConfig?: TransposeConfig): void;
+    getAllAgGridColumns(): Column<any>[];
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -6,6 +6,7 @@ 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';
+import { ROW_SUMMARY_ROW_ID } from '../../PredefinedConfig/Common/RowSummary';
 export class GridApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -15,6 +16,11 @@ export class GridApiImpl extends ApiBase {
         return this.getAdaptableState().Grid;
     }
     loadGridData(dataSource) {
+        // we intentionally set an initial empty array,
+        // to prevent `cellchanged` events from being triggered for rows that have
+        // the same primary key with existing rows
+        // see #testprevent_cellchanged_event_on_load_grid_data
+        this.adaptable.agGridAdapter.setGridOption('rowData', []);
         this.adaptable.setGridData(dataSource);
         const allRowNodes = this.getAllRowNodes();
         this.internalApi.fireGridDataChangedEvent(dataSource, allRowNodes, 'Load');
@@ -33,6 +39,15 @@ export class GridApiImpl extends ApiBase {
     getFilteredData() {
         return this.adaptable.getFilteredData();
     }
+    getVisibleData() {
+        const data = [];
+        this.adaptable.forAllVisibleRowNodesDo((rowNode) => {
+            if (!this.isGroupRowNode(rowNode)) {
+                data.push(rowNode.data);
+            }
+        });
+        return data;
+    }
     async updateGridData(dataRows, dataUpdateConfig) {
         const rowNodes = await this.adaptable.updateRows(dataRows, dataUpdateConfig);
         this.internalApi.fireGridDataChangedEvent(dataRows, rowNodes, 'Edit');
@@ -58,7 +73,7 @@ export class GridApiImpl extends ApiBase {
     }
     undoCellEdit(cellDataChangedInfo) {
         // for the reason of this hacky solution see the comments in DataService
-        this.adaptable.api.internalApi.getDataService().logUndoChange(cellDataChangedInfo);
+        this.getAdaptableApi().internalApi.getDataService().logUndoChange(cellDataChangedInfo);
         const cellUpdateRequest = {
             columnId: cellDataChangedInfo.column.columnId,
             newValue: cellDataChangedInfo.oldValue,
@@ -78,7 +93,7 @@ export class GridApiImpl extends ApiBase {
     }
     setCellValue(cellUpdateRequest) {
         var _a;
-        const abColumn = this.adaptable.api.columnApi.getColumnWithColumnId(cellUpdateRequest.columnId);
+        const abColumn = this.getAdaptableApi().columnApi.getColumnWithColumnId(cellUpdateRequest.columnId);
         if (!abColumn) {
             this.logWarn(`setCellValue() - column not found for columnId: ${cellUpdateRequest.columnId}`);
             return;
@@ -119,7 +134,7 @@ export class GridApiImpl extends ApiBase {
     }
     clearGridFiltering() {
         // slightly round the houses but we have to call ColumnFilterAPI as it does it properly
-        this.adaptable.api.columnFilterApi.clearColumnFilters();
+        this.getAdaptableApi().columnFilterApi.clearColumnFilters();
     }
     getColumnSorts() {
         return this.getAdaptableState().Grid.ColumnSorts;
@@ -206,8 +221,8 @@ export class GridApiImpl extends ApiBase {
     }
     selectCellRangeByQuery(query, gridCellRange, clearSelection) {
         const filteredRowNodes = [];
-        const isRowNodeInQuery = (rowNode) => this.adaptable.api.internalApi
-            .getQueryLanguageService()
+        const isRowNodeInQuery = (rowNode) => this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .evaluateBooleanExpression(query, 'GridInfo', rowNode);
         if (gridCellRange) {
             const [startNode, endNode] = this.getSelectionStartEndNodes(gridCellRange);
@@ -230,7 +245,7 @@ export class GridApiImpl extends ApiBase {
             /**
              * Select all rows and all columns
              */
-            const currentLayout = this.adaptable.api.layoutApi.getCurrentLayout();
+            const currentLayout = this.getAdaptableApi().layoutApi.getCurrentLayout();
             preapredGridCellRange = {
                 columnIds: currentLayout.Columns,
             };
@@ -266,7 +281,7 @@ export class GridApiImpl extends ApiBase {
         this.selectColumns([columnId]);
     }
     selectColumns(columnIds) {
-        this.adaptable.api.columnApi.selectColumns(columnIds);
+        this.getAdaptableApi().columnApi.selectColumns(columnIds);
     }
     getFirstRowNode() {
         return this.adaptable.getFirstRowNode();
@@ -299,7 +314,7 @@ export class GridApiImpl extends ApiBase {
     }
     getNormalisedValueFromRowNode(rowNode, columnId) {
         const rawValue = this.adaptable.getRawValueFromRowNode(rowNode, columnId);
-        const abColumn = this.adaptable.api.columnApi.getColumnWithColumnId(columnId);
+        const abColumn = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
         return this.adaptable.getNormalisedValueFromRawValue(rawValue, abColumn);
     }
     getRowNodesForPrimaryKeys(primaryKeyValues) {
@@ -342,14 +357,28 @@ export class GridApiImpl extends ApiBase {
         return !this.getAdaptableApi().internalApi.isGridInTreeMode();
     }
     isGridSelectable() {
-        return this.adaptable.isGridSelectable();
+        logDeprecation(this.adaptable.logger, 'GridApi', 'isGridSelectable', 'isGridRowSelectable');
+        return this.isGridRowSelectable();
+    }
+    isGridRowSelectable() {
+        return this.adaptable.isGridRowSelectable();
+    }
+    isGridRangeSelectable() {
+        return this.adaptable.isGridRangeSelectable();
     }
     isGridRowGrouped() {
         return this.adaptable.isGridGroupingActive();
     }
+    isGridInPivotMode() {
+        return this.getLayoutApi().isCurrentLayoutPivot();
+    }
     isGroupRowNode(rowNode) {
         return this.adaptable.isGroupRowNode(rowNode);
     }
+    isSummaryNode(rowNode) {
+        var _a;
+        return (_a = rowNode === null || rowNode === void 0 ? void 0 : rowNode.data) === null || _a === void 0 ? void 0 : _a[ROW_SUMMARY_ROW_ID];
+    }
     isQuickFilterAvailable() {
         return this.adaptable.isQuickFilterAvailable();
     }
@@ -516,8 +545,14 @@ export class GridApiImpl extends ApiBase {
         logDeprecation(this.adaptable.logger, 'GridApi', 'getVisibleRowCount', 'getRowCount');
         return this.getRowCount();
     }
-    showTransposedView(transposedColumnId, hideTransposedColumn) {
-        this.adaptable.api.internalApi.showPopupWindow({
+    showTransposedView(transposeConfig = {}) {
+        var _a, _b, _c, _d, _e;
+        const transposedColumnId = (_a = transposeConfig.transposedColumnId) !== null && _a !== void 0 ? _a : this.getAdaptableApi().optionsApi.getPrimaryKey();
+        const hideTransposedColumn = (_b = transposeConfig.hideTransposedColumn) !== null && _b !== void 0 ? _b : true;
+        const visibleColumns = (_c = transposeConfig.visibleColumns) !== null && _c !== void 0 ? _c : false;
+        const visibleRows = (_d = transposeConfig.visibleRows) !== null && _d !== void 0 ? _d : false;
+        const autosize = (_e = transposeConfig.autosize) !== null && _e !== void 0 ? _e : true;
+        this.getAdaptableApi().internalApi.showPopupWindow({
             id: WINDOW_SHOW_TRANSPOSED_VIEW,
             factoryId: WINDOW_SHOW_TRANSPOSED_VIEW,
             title: 'Transposed View',
@@ -525,7 +560,13 @@ export class GridApiImpl extends ApiBase {
             popupProps: {
                 transposedColumnId,
                 hideTransposedColumn,
+                visibleColumns,
+                visibleRows,
+                autosize,
             },
         });
     }
+    getAllAgGridColumns() {
+        return this.adaptable.getAllGridColumns();
+    }
 }

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

@@ -9,12 +9,14 @@ import { LayoutInternalApi } from '../Internal/LayoutInternalApi';
 export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     internalApi: LayoutInternalApi;
     constructor(adaptable: IAdaptable);
+    isCurrentLayoutPivot(): boolean;
     getLayoutState(): LayoutState;
     shouldAutoSaveLayouts: () => boolean;
     getCurrentVisibleColumnIdsMap(): {
         [key: string]: boolean;
     };
     getCurrentVisibleColumnIds(): string[];
+    getCurrentRowGroupsColumnIds(): string[];
     setLayout(layoutName: string): void;
     getCurrentLayout(): Layout;
     getCurrentLayoutColumnSort(columnId: string): ColumnSort['SortOrder'] | null;
@@ -43,11 +45,4 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     removeColumnFromLayout(columnId: string, layoutName: string): void;
     addColumnToLayout(columnId: string, layoutName: string): void;
     addColumnToCurrentLayout(columnId: string): void;
-    getLayoutSupportedFeatures(): {
-        RowGroupedColumns: boolean;
-        AggregationColumns: boolean;
-        PivotColumns: boolean;
-        ColumnFilters: boolean;
-        ColumnSorts: boolean;
-    };
 }

package/src/Api/Implementation/LayoutApiImpl.js

@@ -18,6 +18,9 @@ export class LayoutApiImpl extends ApiBase {
         };
         this.internalApi = new LayoutInternalApi(adaptable);
     }
+    isCurrentLayoutPivot() {
+        return this.getCurrentLayout().EnablePivot;
+    }
     getLayoutState() {
         return this.getAdaptableState().Layout;
     }
@@ -31,6 +34,9 @@ export class LayoutApiImpl extends ApiBase {
     getCurrentVisibleColumnIds() {
         return this.getCurrentLayout().Columns;
     }
+    getCurrentRowGroupsColumnIds() {
+        return this.getCurrentLayout().RowGroupedColumns;
+    }
     setLayout(layoutName) {
         if (StringExtensions.IsNotNullOrEmpty(layoutName) &&
             layoutName !== this.getCurrentLayoutName()) {
@@ -236,19 +242,4 @@ export class LayoutApiImpl extends ApiBase {
     addColumnToCurrentLayout(columnId) {
         this.addColumnToLayout(columnId, this.getCurrentLayoutName());
     }
-    getLayoutSupportedFeatures() {
-        const layoutSupportedFeatures = {
-            RowGroupedColumns: true,
-            AggregationColumns: true,
-            PivotColumns: true,
-            ColumnFilters: true,
-            ColumnSorts: true,
-        };
-        if (this.getGridApi().getAgGridRowModelType() === 'viewport') {
-            layoutSupportedFeatures.RowGroupedColumns = false;
-            layoutSupportedFeatures.AggregationColumns = false;
-            layoutSupportedFeatures.PivotColumns = false;
-        }
-        return layoutSupportedFeatures;
-    }
 }

package/src/Api/Implementation/{NotesApiImpl.d.ts → NoteApiImpl.d.ts}

@@ -1,18 +1,18 @@
 import { ApiBase } from './ApiBase';
-import { NotesApi } from '../NotesApi';
-import { AdaptableNote, AdaptableNotes, NotesState } from '../../PredefinedConfig/NotesState';
-import { CellAddress } from '../../PredefinedConfig/CellAddress';
+import { NoteApi } from '../NoteApi';
+import { AdaptableNote, AdaptableNotes, NoteState } from '../../PredefinedConfig/NoteState';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { NotesInternalApi } from '../Internal/NotesInternalApi';
-export declare class NotesApiImpl extends ApiBase implements NotesApi {
-    internalApi: NotesInternalApi;
+import { NoteInternalApi } from '../Internal/NoteInternalApi';
+import { CellAddress } from '../../types';
+export declare class NoteApiImpl extends ApiBase implements NoteApi {
+    internalApi: NoteInternalApi;
     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;
+    getNoteState(): NoteState;
     getAllNotes(): AdaptableNotes;
-    getCellNotes(address: CellAddress): AdaptableNote[];
+    getNoteForCell(address: CellAddress): AdaptableNote;
     getNoteByUuid(uuid: string): AdaptableNote | undefined;
 }

package/src/Api/Implementation/{NotesApiImpl.js → NoteApiImpl.js}

@@ -1,10 +1,10 @@
 import { ApiBase } from './ApiBase';
-import * as NotesRedux from '../../Redux/ActionsReducers/NotesRedux';
-import { NotesInternalApi } from '../Internal/NotesInternalApi';
-export class NotesApiImpl extends ApiBase {
+import * as NoteRedux from '../../Redux/ActionsReducers/NoteRedux';
+import { NoteInternalApi } from '../Internal/NoteInternalApi';
+export class NoteApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new NotesInternalApi(adaptable);
+        this.internalApi = new NoteInternalApi(adaptable);
     }
     addNote(noteStr, primaryKeyValue, columnId) {
         const note = {
@@ -13,26 +13,26 @@ export class NotesApiImpl extends ApiBase {
             ColumnId: columnId,
             Timestamp: Date.now(),
         };
-        this.dispatchAction(NotesRedux.NotesAdd(note));
+        this.dispatchAction(NoteRedux.NoteAdd(note));
     }
     editNote(note) {
         note.Timestamp = Date.now();
-        this.dispatchAction(NotesRedux.NotesEdit(note));
+        this.dispatchAction(NoteRedux.NoteEdit(note));
     }
     updateNoteText(noteStr, note) {
         this.editNote(Object.assign(Object.assign({}, note), { Text: noteStr }));
     }
     deleteNote(note) {
-        this.dispatchAction(NotesRedux.NotesDelete(note));
+        this.dispatchAction(NoteRedux.NoteDelete(note));
     }
-    getNotesState() {
-        return this.getAdaptableState().Notes;
+    getNoteState() {
+        return this.getAdaptableState().Note;
     }
     getAllNotes() {
-        return this.getNotesState().Notes;
+        return this.getNoteState().Notes;
     }
-    getCellNotes(address) {
-        return NotesRedux.GetNotesSelector(this.getAdaptableState().Notes, address);
+    getNoteForCell(address) {
+        return NoteRedux.GetNoteSelector(this.getAdaptableState().Note, address);
     }
     getNoteByUuid(uuid) {
         return this.getAllNotes().find((note) => note.Uuid === uuid);

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

@@ -1,11 +1,11 @@
 import { ApiBase } from './ApiBase';
-import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, NotesOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, DataSetOptions, EditOptions, EntitlementOptions, ExportOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotificationsOptions, OptionsApi, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions, GridFilterOptions } from '../../types';
+import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, NoteOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, DataSetOptions, EditOptions, EntitlementOptions, ExportOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, NotificationsOptions, OptionsApi, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions, GridFilterOptions, ColumnMenuOptions, ContextMenuOptions } from '../../types';
 import { GroupingOptions } from '../../AdaptableOptions/GroupingOptions';
 import { CustomSortOptions } from '../../AdaptableOptions/CustomSortOptions';
 import { Fdc3Options } from '../../AdaptableOptions/Fdc3Options';
 import { ExpressionOptions } from '../../AdaptableOptions/ExpressionOptions';
 import { ColumnFilterOptions } from '../../AdaptableOptions/ColumnFilterOptions';
-import { CommentsOptions } from '../../AdaptableOptions/CommentOptions';
+import { CommentOptions } from '../../AdaptableOptions/CommentOptions';
 export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getAdaptableId(): string;
     getAdaptableStateKey(): string;
@@ -19,8 +19,8 @@ export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getCellSummaryOptions(): CellSummaryOptions;
     getCalendarOptions(): CalendarOptions;
     getColumnOptions(): ColumnOptions;
-    getNotesOptions(): NotesOptions;
-    getCommentsOptions(): Readonly<CommentsOptions<any>>;
+    getNoteOptions(): NoteOptions;
+    getCommentOptions(): Readonly<CommentOptions<any>>;
     getCustomSortOptions(): CustomSortOptions;
     getContainerOptions(): ContainerOptions;
     getDataSetOptions(): DataSetOptions;
@@ -31,7 +31,8 @@ export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getExportOptions(): ExportOptions;
     getGroupingOptions(): GroupingOptions;
     getLayoutOptions(): LayoutOptions;
-    getMenuOptions(): MenuOptions;
+    getColumnMenuOptions(): ColumnMenuOptions;
+    getContextMenuOptions(): ContextMenuOptions;
     getColumnFilterOptions(): ColumnFilterOptions;
     getGridFilterOptions(): Readonly<GridFilterOptions<any>>;
     getExpressionOptions(): ExpressionOptions;

package/src/Api/Implementation/OptionsApiImpl.js

@@ -36,10 +36,10 @@ export class OptionsApiImpl extends ApiBase {
     getColumnOptions() {
         return this.getOptions().columnOptions;
     }
-    getNotesOptions() {
+    getNoteOptions() {
         return this.getOptions().noteOptions;
     }
-    getCommentsOptions() {
+    getCommentOptions() {
         return this.getOptions().commentOptions;
     }
     getCustomSortOptions() {
@@ -72,8 +72,11 @@ export class OptionsApiImpl extends ApiBase {
     getLayoutOptions() {
         return this.getOptions().layoutOptions;
     }
-    getMenuOptions() {
-        return this.getOptions().menuOptions;
+    getColumnMenuOptions() {
+        return this.getOptions().columnMenuOptions;
+    }
+    getContextMenuOptions() {
+        return this.getOptions().contextMenuOptions;
     }
     getColumnFilterOptions() {
         return this.getOptions().columnFilterOptions;

package/src/Api/Implementation/PredicateApiImpl.js

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

package/src/Api/Implementation/ScheduleApiImpl.js

@@ -52,7 +52,7 @@ export class ScheduleApiImpl extends ApiBase {
     }
     getReportSchedules(config) {
         var _a;
-        return ((_a = this.handleLayoutAssociatedObjects(this.adaptable.api.exportApi.getReportSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
+        return ((_a = this.handleLayoutAssociatedObjects(this.getAdaptableApi().exportApi.getReportSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getActiveReportSchedules() {
         return this.getReportSchedules().filter((schedule) => !schedule.IsSuspended);
@@ -81,7 +81,7 @@ export class ScheduleApiImpl extends ApiBase {
     }
     getIPushPullSchedules(config) {
         var _a;
-        const ippApi = this.adaptable.api.pluginsApi.getipushpullPluginApi();
+        const ippApi = this.getAdaptableApi().pluginsApi.getipushpullPluginApi();
         return ((_a = this.handleLayoutAssociatedObjects(ippApi === null || ippApi === void 0 ? void 0 : ippApi.getIPushPullSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getActiveIPushPullSchedules() {
@@ -111,7 +111,7 @@ export class ScheduleApiImpl extends ApiBase {
     }
     getOpenFinSchedules(config) {
         var _a;
-        const openFinApi = this.adaptable.api.pluginsApi.getOpenFinPluginApi();
+        const openFinApi = this.getAdaptableApi().pluginsApi.getOpenFinPluginApi();
         return ((_a = this.handleLayoutAssociatedObjects(openFinApi === null || openFinApi === void 0 ? void 0 : openFinApi.getOpenFinSchedules(), 'Schedule', config)) !== null && _a !== void 0 ? _a : []);
     }
     getActiveOpenFinSchedules() {
@@ -163,10 +163,10 @@ export class ScheduleApiImpl extends ApiBase {
         }
         else if (scheduleType == 'Report') {
             const reportSchedule = schedule;
-            this.adaptable.api.exportApi.runReport(reportSchedule.ReportName, reportSchedule.ExportDestination);
+            this.getAdaptableApi().exportApi.runReport(reportSchedule.ReportName, reportSchedule.ExportDestination);
         }
         else if (scheduleType == 'ipushpull') {
-            const ippApi = this.adaptable.api.pluginsApi.getipushpullPluginApi();
+            const ippApi = this.getAdaptableApi().pluginsApi.getipushpullPluginApi();
             const iPushPullSchedule = schedule;
             if (iPushPullSchedule.Transmission == 'Snapshot') {
                 ippApi.sendSnapshot(iPushPullSchedule.IPushPullReport);
@@ -176,7 +176,7 @@ export class ScheduleApiImpl extends ApiBase {
             }
         }
         else if (scheduleType == 'OpenFin') {
-            const openFinApi = this.adaptable.api.pluginsApi.getOpenFinPluginApi();
+            const openFinApi = this.getAdaptableApi().pluginsApi.getOpenFinPluginApi();
             const openFinSchedule = schedule;
             openFinApi.startLiveData(openFinSchedule.OpenFinReport);
         }