@adaptabletools/adaptable 18.0.0-canary.12 → 18.0.0-canary.13

package/src/AdaptableOptions/MenuOptions.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableMenuItem, ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ColumnMenuContext, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableColumn, AdaptableIcon, AdaptableModule, BaseContext } from '../types';
 /**
  * Options for managing menus in AdapTable – provided using 2 collections
@@ -12,58 +12,6 @@ export interface MenuOptions<TData = any> {
      * Customises Column Menu (default column menu items are available in the provided context)
      */
     customColumnMenu?: (menuContext: CustomColumnMenuContext<TData>) => CustomColumnMenuItem[];
-    /**
-     * Show Adaptable Context Menu (or specific items); can be boolean value or function invoked for each menu item
-     *
-     * @deprecated Use `customContextMenu` instead
-     * @defaultValue true
-     * @gridInfoItem
-     */
-    showAdaptableContextMenu?: boolean | ((menuItem: AdaptableMenuItem, menuContext: ContextMenuContext<TData>) => boolean);
-    /**
-     * Show AdapTable Column Menu (or specific items); can be boolean value or function invoked for each menu item
-     *
-     * @deprecated Use `customColumnMenu` instead
-     * @defaultValue true
-     * @gridInfoItem
-     */
-    showAdaptableColumnMenu?: boolean | ((menuItem: AdaptableMenuItem, menuContext: ColumnMenuContext<TData>) => boolean);
-    /**
-     * Adds 'Ungroup' Column Menu item to a row grouped column menu
-     *
-     * @deprecated Now provided by AG Grid and property is ignored
-     * @defaultValue true
-     * @gridInfoItem
-     */
-    showUngroupColumnMenuItem?: boolean;
-    /**
-     * Order in which AG Grid, AdapTable and User Menu sections will appear in Column Menu (list or function)
-     *
-     * @deprecated Use `customColumnMenu` instead
-     * @defaultValue 'aggrid', 'adaptable', 'user'
-     * @gridInfoItem
-     */
-    columnMenuOrder?: ((context: MenuOrderContext) => ('aggrid' | 'adaptable' | 'user')[]) | ('aggrid' | 'adaptable' | 'user')[];
-    /**
-     * Order in which AG Grid, AdapTable and User Menu sections will appear in Context Menu (list or function)
-     *
-     * @deprecated Use `customContextMenu` instead
-     * @defaultValue 'aggrid', 'adaptable', 'user'
-     * @gridInfoItem
-     */
-    contextMenuOrder?: ((context: MenuOrderContext) => ('aggrid' | 'adaptable' | 'user')[]) | ('aggrid' | 'adaptable' | 'user')[];
-    /**
-     * User-defined Menu Items to add to the Column Menu
-     *
-     * @deprecated Use `customColumnMenu` instead
-     */
-    columnMenuItems?: UserMenuItem<ColumnMenuContext>[];
-    /**
-     * Customised Context Menu. Default context menu items are available in the provided context.
-     *
-     * @deprecated Use `customContextMenu` instead
-     */
-    contextMenuItems?: UserMenuItem<ContextMenuContext>[];
 }
 /**
  * Context info provided when building Custom Context Menus

package/src/AdaptableOptions/MenuOptions.js

@@ -45,8 +45,8 @@ export const DEFAULT_ADAPTABLE_CONTEXT_MENU_STRUCTURE = [
     ModuleConstants.StateManagementModuleId,
     ModuleConstants.ThemeModuleId,
     ModuleConstants.ChartingModuleId,
-    ModuleConstants.NotesModuleId,
-    ModuleConstants.CommentsModuleId,
+    ModuleConstants.NoteModuleId,
+    ModuleConstants.CommentModuleId,
 ];
 export const DEFAULT_ADAPTABLE_COLUMN_MENU_STRUCTURE = [
     ModuleConstants.SettingsPanelModuleId,
@@ -91,5 +91,5 @@ export const DEFAULT_ADAPTABLE_COLUMN_MENU_STRUCTURE = [
     ModuleConstants.StateManagementModuleId,
     ModuleConstants.ThemeModuleId,
     ModuleConstants.ChartingModuleId,
-    ModuleConstants.NotesModuleId,
+    ModuleConstants.NoteModuleId,
 ];

package/src/Api/AdaptableApi.d.ts

@@ -231,11 +231,11 @@ export interface AdaptableApi {
      */
     userInterfaceApi: UserInterfaceApi;
     /**
-     * Provides access to the Notes Module
+     * Provides access to the Note Module
      */
     noteApi: NoteApi;
     /**
-     * Provides access to the Comments Module
+     * Provides access to the Comment Module
      */
     commentApi: CommentApi;
     /**

package/src/Api/ConfigApi.d.ts

@@ -15,8 +15,7 @@ import { AdaptablePersistentState, AdaptableState } from '../PredefinedConfig/Ad
 import { FreeTextColumnState } from '../PredefinedConfig/FreeTextColumnState';
 import { ToolPanelState } from '../PredefinedConfig/ToolPanelState';
 import { AdaptableStateKey, AdaptableModule } from '../PredefinedConfig/Common/Types';
-import { AdaptableSearchState, AdaptableSortState, NamedQueryState, PredefinedConfig, ScheduleState } from '../types';
-import { NoteState } from '../PredefinedConfig/NoteState';
+import { AdaptableSearchState, AdaptableSortState, NamedQueryState, PredefinedConfig, ScheduleState, NoteState } from '../types';
 /**
  * Range of functions to access Predefined Config and Adaptable State
  */
@@ -105,7 +104,7 @@ export interface ConfigApi {
      */
     getCalculatedColumnState(returnJson?: boolean): CalculatedColumnState;
     /**
-     * Returns Notes section of Adaptable State
+     * Returns Note section of Adaptable State
      * @param returnJson return as JSON rather than object
      */
     getNoteState(returnJson?: boolean): NoteState;

package/src/Api/GridApi.d.ts

@@ -10,6 +10,7 @@ import { RowHighlightInfo } from '../PredefinedConfig/Common/RowHighlightInfo';
 import { IRowNode, RowModelType } from '@ag-grid-community/core';
 import { GridCellRange } from '../PredefinedConfig/Selection/GridCellRange';
 import { RowsHighlightInfo } from '../PredefinedConfig/Common/RowsHighlightInfo';
+import { TransposeConfig } from '../PredefinedConfig/Common/TransposeConfig';
 /**
  * Provides access to important properites of AdapTable e.g. sorting, selected cells etc.
  */
@@ -523,5 +524,5 @@ export interface GridApi {
     /**
      * Opens a window with a transposed view of Grid
      */
-    showTransposedView(transposedColumnId: string, hideTransposedColumn?: boolean): void;
+    showTransposedView(transposeConfig: TransposeConfig): void;
 }

package/src/Api/Implementation/ActionColumnApiImpl.js

@@ -10,11 +10,8 @@ export class ActionColumnApiImpl extends ApiBase {
         return (_a = this.getActionColumnOptions().actionColumns) !== null && _a !== void 0 ? _a : [];
     }
     getColDefsForActionColumns() {
-        const defaultActionColumnSettings = {
-            resizable: true,
-            suppressMenu: false,
-            suppressMovable: false,
-        };
+        const defaultSpecialColumnSettings = this.getGridApi().internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef();
+        const defaultActionColumnSettings = Object.assign(Object.assign({}, defaultSpecialColumnSettings), { resizable: true, suppressMenu: false, suppressMovable: false });
         return this.getActionColumnApi()
             .getActionColumns()
             .map((actionColumn) => {
@@ -26,7 +23,7 @@ export class ActionColumnApiImpl extends ApiBase {
                 editable: false,
                 width: actionColumnSettings.width,
                 resizable: actionColumnSettings.resizable,
-                suppressMenu: actionColumnSettings.suppressMenu,
+                suppressHeaderMenuButton: actionColumnSettings.suppressMenu,
                 suppressMovable: actionColumnSettings.suppressMovable,
                 filter: false,
                 sortable: false,

package/src/Api/Implementation/ConfigApiImpl.js

@@ -8,7 +8,7 @@ import * as AlertRedux from '../../Redux/ActionsReducers/AlertRedux';
 import * as BulkUpdateRedux from '../../Redux/ActionsReducers/BulkUpdateRedux';
 import * as CalculatedColumnRedux from '../../Redux/ActionsReducers/CalculatedColumnRedux';
 import * as ChartingRedux from '../../Redux/ActionsReducers/ChartingRedux';
-import * as NotesRedux from '../../Redux/ActionsReducers/NotesRedux';
+import * as NoteRedux from '../../Redux/ActionsReducers/NoteRedux';
 import * as CustomSortRedux from '../../Redux/ActionsReducers/CustomSortRedux';
 import * as ExportRedux from '../../Redux/ActionsReducers/ExportRedux';
 import * as FormatColumnRedux from '../../Redux/ActionsReducers/FormatColumnRedux';
@@ -178,10 +178,10 @@ export class ConfigApiImpl extends ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Charting)
                     : this.getAdaptableState().Charting;
-            case 'Notes':
+            case 'Note':
                 return returnJson
-                    ? JSON.stringify(this.getAdaptableState().Notes)
-                    : this.getAdaptableState().Notes;
+                    ? JSON.stringify(this.getAdaptableState().Note)
+                    : this.getAdaptableState().Note;
             case 'CustomSort':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().CustomSort)
@@ -259,7 +259,7 @@ export class ConfigApiImpl extends ApiBase {
         return this.getUserStateByStateKey('Charting', returnJson);
     }
     getNoteState(returnJson = false) {
-        return this.getUserStateByStateKey('Notes', returnJson);
+        return this.getUserStateByStateKey('Note', returnJson);
     }
     getCustomSortState(returnJson = false) {
         return this.getUserStateByStateKey('CustomSort', returnJson);
@@ -314,8 +314,8 @@ export class ConfigApiImpl extends ApiBase {
             case 'Charting':
                 this.dispatchAction(ChartingRedux.ChartingReady(this.getChartingState()));
                 break;
-            case 'Notes':
-                this.dispatchAction(NotesRedux.NotesReady(this.getNoteState()));
+            case 'Note':
+                this.dispatchAction(NoteRedux.NoteReady(this.getNoteState()));
                 break;
             case 'CustomSort':
                 this.dispatchAction(CustomSortRedux.CustomSortReady(this.getCustomSortState()));

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

@@ -14,6 +14,7 @@ import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChang
 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);
@@ -131,5 +132,5 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     openGridInfoSettingsPanel(): void;
     getAgGridRowModelType(): RowModelType;
     getVisibleRowCount(): number;
-    showTransposedView(transposedColumnId: string, hideTransposedColumn?: boolean): void;
+    showTransposedView(transposeConfig: TransposeConfig): void;
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -525,7 +525,12 @@ export class GridApiImpl extends ApiBase {
         logDeprecation(this.adaptable.logger, 'GridApi', 'getVisibleRowCount', 'getRowCount');
         return this.getRowCount();
     }
-    showTransposedView(transposedColumnId, hideTransposedColumn) {
+    showTransposedView(transposeConfig) {
+        var _a, _b, _c, _d;
+        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;
         this.adaptable.api.internalApi.showPopupWindow({
             id: WINDOW_SHOW_TRANSPOSED_VIEW,
             factoryId: WINDOW_SHOW_TRANSPOSED_VIEW,
@@ -534,6 +539,8 @@ export class GridApiImpl extends ApiBase {
             popupProps: {
                 transposedColumnId,
                 hideTransposedColumn,
+                visibleColumns,
+                visibleRows,
             },
         });
     }

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

@@ -2,7 +2,7 @@ import { ApiBase } from './ApiBase';
 import { NoteApi } from '../NoteApi';
 import { AdaptableNote, AdaptableNotes, NoteState } from '../../PredefinedConfig/NoteState';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { NoteInternalApi } from '../Internal/NotesInternalApi';
+import { NoteInternalApi } from '../Internal/NoteInternalApi';
 import { CellAddress } from '../../types';
 export declare class NoteApiImpl extends ApiBase implements NoteApi {
     internalApi: NoteInternalApi;
@@ -13,6 +13,6 @@ export declare class NoteApiImpl extends ApiBase implements NoteApi {
     deleteNote(note: AdaptableNote): void;
     getNoteState(): NoteState;
     getAllNotes(): AdaptableNotes;
-    getCellNotes(address: CellAddress): AdaptableNote[];
+    getNotesForCell(address: CellAddress): AdaptableNote[];
     getNoteByUuid(uuid: string): AdaptableNote | undefined;
 }

package/src/Api/Implementation/NoteApiImpl.js

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
-import * as NotesRedux from '../../Redux/ActionsReducers/NotesRedux';
-import { NoteInternalApi } from '../Internal/NotesInternalApi';
+import * as NoteRedux from '../../Redux/ActionsReducers/NoteRedux';
+import { NoteInternalApi } from '../Internal/NoteInternalApi';
 export class NoteApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -13,26 +13,26 @@ export class NoteApiImpl 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));
     }
     getNoteState() {
-        return this.getAdaptableState().Notes;
+        return this.getAdaptableState().Note;
     }
     getAllNotes() {
         return this.getNoteState().Notes;
     }
-    getCellNotes(address) {
-        return NotesRedux.GetNotesSelector(this.getAdaptableState().Notes, address);
+    getNotesForCell(address) {
+        return NoteRedux.GetNotesSelector(this.getAdaptableState().Note, address);
     }
     getNoteByUuid(uuid) {
         return this.getAllNotes().find((note) => note.Uuid === uuid);

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

@@ -2,7 +2,6 @@ import { ApiBase } from './ApiBase';
 import { UserInterfaceApi } from '../UserInterfaceApi';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
-import { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../../PredefinedConfig/Common/Menu';
 import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
 import { AdaptableObjectTag, CustomWindowConfig, GridCell } from '../../types';
 import { UserInterfaceInternalApi } from '../Internal/UserInterfaceInternalApi';
@@ -24,8 +23,6 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getEditLookUpItems(): EditLookUpPermittedValues[];
     getEditLookUpItemForColumn(column: AdaptableColumn): EditLookUpPermittedValues | undefined;
     getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, gridCell: GridCell): any[] | undefined;
-    addColumnMenuItem(userMenuItem: UserMenuItem<ColumnMenuContext>): void;
-    addContextMenuItem(userMenuItem: UserMenuItem<ContextMenuContext>): void;
     getEditableCellStyle(): AdaptableStyle | undefined;
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -142,14 +142,6 @@ export class UserInterfaceApiImpl extends ApiBase {
         }
         return this.adaptable.api.gridApi.internalApi.getEditLookUpValuesForColumn(editLookUpItem, gridCell.column, gridCell);
     }
-    addColumnMenuItem(userMenuItem) {
-        var _a;
-        (_a = this.getMenuOptions().columnMenuItems) === null || _a === void 0 ? void 0 : _a.push(userMenuItem);
-    }
-    addContextMenuItem(userMenuItem) {
-        var _a;
-        (_a = this.getMenuOptions().contextMenuItems) === null || _a === void 0 ? void 0 : _a.push(userMenuItem);
-    }
     getEditableCellStyle() {
         return this.getUserInterfaceOptions().editableCellStyle;
     }

package/src/Api/Internal/ActionRowInternalApi.js

@@ -220,7 +220,7 @@ export class ActionRowInternalApi extends ApiBase {
                 lockVisible: true,
                 suppressColumnsToolPanel: true,
                 suppressFiltersToolPanel: true,
-                suppressMenu: true,
+                suppressHeaderMenuButton: true,
                 suppressMovable: true,
                 filter: false,
                 sortable: false,

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

@@ -105,8 +105,8 @@ export declare class AdaptableInternalApi extends ApiBase {
     getPreviousGroupedColumnsIndex(layoutId: string): {
         [key: string]: number;
     };
-    getValueUsingField(rowData: Record<string, any>, columnValueKey: string): any;
-    setValueUsingField(rowData: Record<string, any>, columnValueKey: string, newValue: any): Record<string, any>;
+    getValueUsingField(rowData: Record<string, any>, fieldName: string): any;
+    setValueUsingField(rowData: Record<string, any>, fieldName: string, newValue: any): Record<string, any>;
     findAdaptableObjectsByLookupCriteria<T extends AdaptableObjectWithScope>({ scope, tag, ids }: AdaptableObjectLookupCriteria, specificAdaptableObjects: T[]): T[];
     buildBaseContext(): BaseContext;
     getActionButtonsAndActionColumn(colDef: ColDef): {

package/src/Api/Internal/AdaptableInternalApi.js

@@ -366,17 +366,17 @@ export class AdaptableInternalApi extends ApiBase {
         return (_a = SystemRedux.SystemPreviousGroupedColumnsSelector(this.getAdaptableState().System)) === null || _a === void 0 ? void 0 : _a[layoutId];
     }
     // "borrowed" from https://github.com/ag-grid/ag-grid/blob/v28.2.1/community-modules/core/src/ts/utils/object.ts#L205
-    getValueUsingField(rowData, columnValueKey) {
-        if (!rowData || !(columnValueKey === null || columnValueKey === void 0 ? void 0 : columnValueKey.length)) {
+    getValueUsingField(rowData, fieldName) {
+        if (!rowData || !(fieldName === null || fieldName === void 0 ? void 0 : fieldName.length)) {
             return;
         }
-        const isColumnValueKeyNested = columnValueKey === null || columnValueKey === void 0 ? void 0 : columnValueKey.includes('.');
+        const isColumnValueKeyNested = fieldName === null || fieldName === void 0 ? void 0 : fieldName.includes('.');
         // if no '.', then it's not a deep value
         if (!isColumnValueKeyNested) {
-            return rowData[columnValueKey];
+            return rowData[fieldName];
         }
         // otherwise it is a deep value, so need to dig for it
-        const fields = columnValueKey.split('.');
+        const fields = fieldName.split('.');
         let currentObject = rowData;
         for (let i = 0; i < fields.length; i++) {
             if (currentObject == null) {
@@ -387,22 +387,22 @@ export class AdaptableInternalApi extends ApiBase {
         return currentObject;
     }
     // "borrowed" from https://github.com/ag-grid/ag-grid/blob/v28.2.1/community-modules/core/src/ts/valueService/valueService.ts#L236
-    setValueUsingField(rowData, columnValueKey, newValue) {
-        if (!rowData || !(columnValueKey === null || columnValueKey === void 0 ? void 0 : columnValueKey.length)) {
+    setValueUsingField(rowData, fieldName, newValue) {
+        if (!rowData || !(fieldName === null || fieldName === void 0 ? void 0 : fieldName.length)) {
             return;
         }
-        const isColumnValueKeyContainsDots = columnValueKey === null || columnValueKey === void 0 ? void 0 : columnValueKey.includes('.');
+        const isColumnValueKeyContainsDots = fieldName === null || fieldName === void 0 ? void 0 : fieldName.includes('.');
         let valuesAreSame = false;
         if (!isColumnValueKeyContainsDots) {
             // soft comparison to match strings and numbers
-            valuesAreSame = rowData[columnValueKey] == newValue;
+            valuesAreSame = rowData[fieldName] == newValue;
             if (!valuesAreSame) {
-                rowData[columnValueKey] = newValue;
+                rowData[fieldName] = newValue;
             }
         }
         else {
             // otherwise it is a deep value, so need to dig for it
-            const fieldPieces = columnValueKey.split('.');
+            const fieldPieces = fieldName.split('.');
             let currentObject = rowData;
             while (fieldPieces.length > 0 && currentObject) {
                 const fieldPiece = fieldPieces.shift();

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -92,7 +92,8 @@ export class CalculatedColumnInternalApi extends ApiBase {
         this.adaptable.api.eventApi.emit('CalculatedColumnChanged', calculatedColumnChangedInfo);
     }
     getColDefsForCalculatedColumns() {
-        const defaultCalculatedColumnSettings = CreateEmptyCalculatedColumn().CalculatedColumnSettings;
+        const defaultSpecialColumnSettings = this.getGridApi().internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef();
+        const defaultCalculatedColumnSettings = CreateEmptyCalculatedColumn(defaultSpecialColumnSettings).CalculatedColumnSettings;
         return this.getCalculatedColumnApi()
             .getCalculatedColumns()
             .map((calculatedColumn) => {
@@ -139,7 +140,7 @@ export class CalculatedColumnInternalApi extends ApiBase {
                 enableRowGroup: calculatedColumnSettings.Groupable,
                 sortable: calculatedColumnSettings.Sortable,
                 enablePivot: calculatedColumnSettings.Pivotable,
-                suppressMenu: calculatedColumnSettings.SuppressMenu,
+                suppressHeaderMenuButton: calculatedColumnSettings.SuppressMenu,
                 suppressMovable: calculatedColumnSettings.SuppressMovable,
                 type: columnTypes,
                 valueGetter,

package/src/Api/Internal/Fdc3InternalApi.js

@@ -39,7 +39,7 @@ export class Fdc3InternalApi extends ApiBase {
                 editable: false,
                 width: actionColumnConfig.width,
                 resizable: actionColumnConfig.resizable,
-                suppressMenu: true,
+                suppressHeaderMenuButton: true,
                 suppressMovable: !actionColumnConfig.movable,
                 filter: false,
                 sortable: false,
@@ -59,7 +59,7 @@ export class Fdc3InternalApi extends ApiBase {
                 editable: false,
                 width: actionColumnConfig.defaultWidth,
                 resizable: true,
-                suppressMenu: true,
+                suppressHeaderMenuButton: true,
                 suppressMovable: false,
                 filter: false,
                 sortable: false,

package/src/Api/Internal/FreeTextColumnInternalApi.js

@@ -43,7 +43,8 @@ export class FreeTextColumnInternalApi extends ApiBase {
         return references;
     }
     getColDefsForFreeTextColumns() {
-        const defaultFreeTextColumnSettings = CreateEmptyFreeTextColumn().FreeTextColumnSettings;
+        const defaultSpecialColumnSettings = this.getGridApi().internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef();
+        const defaultFreeTextColumnSettings = CreateEmptyFreeTextColumn(defaultSpecialColumnSettings).FreeTextColumnSettings;
         return this.getFreeTextColumnApi()
             .getFreeTextColumns()
             .map((freeTextColumn) => {
@@ -74,7 +75,7 @@ export class FreeTextColumnInternalApi extends ApiBase {
                 enableRowGroup: freeTextColumnSettings.Groupable,
                 sortable: freeTextColumnSettings.Sortable,
                 enablePivot: freeTextColumnSettings.Pivotable,
-                suppressMenu: freeTextColumnSettings.SuppressMenu,
+                suppressHeaderMenuButton: freeTextColumnSettings.SuppressMenu,
                 suppressMovable: freeTextColumnSettings.SuppressMovable,
                 cellEditor: dataTypeEditor !== null && dataTypeEditor !== void 0 ? dataTypeEditor : (freeTextColumn.TextEditor && freeTextColumn.TextEditor == 'Large'
                     ? 'agLargeTextCellEditor'

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

@@ -10,6 +10,7 @@ import { AdaptableMenuItem } from '../../PredefinedConfig/Common/Menu';
 import { EditLookUpPermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
 import { DistinctValuesParams } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableColumnType } from '../../PredefinedConfig/Common/Types';
+import { SpecialColumnSettings } from '../../PredefinedConfig/Common/SpecialColumnSettings';
 export declare class GridInternalApi extends ApiBase {
     /**
      * Fires Grid Sorted Event
@@ -96,4 +97,5 @@ export declare class GridInternalApi extends ApiBase {
     };
     getAlertRowClass(params: RowClassParams): string | null;
     getRowHighlightClass(params: RowClassParams): string | null;
+    deriveSpecialColumnSettingsFromAgGridDefaultColDef(): Partial<SpecialColumnSettings>;
 }

package/src/Api/Internal/GridInternalApi.js

@@ -404,4 +404,19 @@ export class GridInternalApi extends ApiBase {
             ? highlightRow.highlightStyle.ClassName
             : null;
     }
+    deriveSpecialColumnSettingsFromAgGridDefaultColDef() {
+        const defaultColumnDefinition = this.adaptable.agGridAdapter.getDefaultColumnDefinition();
+        return {
+            Filterable: defaultColumnDefinition.filter,
+            Resizable: defaultColumnDefinition.resizable,
+            Groupable: defaultColumnDefinition.enableRowGroup,
+            Sortable: defaultColumnDefinition.sortable,
+            Pivotable: defaultColumnDefinition.enablePivot,
+            Aggregatable: defaultColumnDefinition.enableValue,
+            SuppressMenu: defaultColumnDefinition.suppressHeaderMenuButton,
+            SuppressMovable: defaultColumnDefinition.suppressMovable,
+            HeaderToolTip: defaultColumnDefinition.headerTooltip,
+            Width: defaultColumnDefinition.width,
+        };
+    }
 }

package/src/Api/NoteApi.d.ts

@@ -6,11 +6,11 @@ import { CellAddress } from '../../types';
 export interface NoteApi {
     /**
      * Adds a new Note
-     * @param note
+     * @param text
      * @param primaryKeyValue
      * @param columnId
      */
-    addNote(note: string, primaryKeyValue: any, columnId: string): void;
+    addNote(text: string, primaryKeyValue: any, columnId: string): void;
     /**
      * Edits a Note
      * @param note
@@ -18,10 +18,10 @@ export interface NoteApi {
     editNote(note: AdaptableNote): void;
     /**
      * Edits text of a Note
-     * @param notetext
+     * @param text
      * @param note
      */
-    updateNoteText(notetext: string, note: AdaptableNote): void;
+    updateNoteText(text: string, note: AdaptableNote): void;
     /**
      * Deletes a Note
      * @param note
@@ -39,7 +39,7 @@ export interface NoteApi {
      * Gets all Notes for a cell
      * @param CellAddress note position
      */
-    getCellNotes(CellAddress: CellAddress): AdaptableNote[];
+    getNotesForCell(CellAddress: CellAddress): AdaptableNote[];
     /**
      * Returns a Note by uuid
      * @param uuid note uuid

package/src/Api/OptionsApi.d.ts

@@ -143,8 +143,8 @@ export interface OptionsApi {
      */
     getFormatColumnOptions(): Readonly<FormatColumnOptions>;
     /**
-    * Returns `AdaptableOptions.noteOptions`
-    */
+     * Returns `AdaptableOptions.noteOptions`
+     */
     getNoteOptions(): Readonly<NoteOptions>;
     /**
      * Returns `AdaptableOptions.settingsPanelOptions`

package/src/Api/UserInterfaceApi.d.ts

@@ -1,6 +1,5 @@
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../PredefinedConfig/Common/Menu';
 import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../AdaptableOptions/UserInterfaceOptions';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
@@ -54,16 +53,6 @@ export interface UserInterfaceApi {
      * @param  gridCell: the currently edited Grid Cell
      */
     getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, gridCell: GridCell): any[] | undefined;
-    /**
-     * Adds menu item to Column Menu
-     * @param userMenuItem Menu Item to add
-     */
-    addColumnMenuItem(userMenuItem: UserMenuItem<ColumnMenuContext>): void;
-    /**
-     * Adds menu item to Context Menu
-     * @param userMenuItem Menu Item to add
-     */
-    addContextMenuItem(userMenuItem: UserMenuItem<ContextMenuContext>): void;
     /**
      * Returns Style set for Editable cells
      */

package/src/PredefinedConfig/AdaptableState.d.ts

@@ -57,7 +57,7 @@ export interface AdaptablePersistentState {
     Theme: ThemeState;
     ToolPanel: ToolPanelState;
     Charting: ChartingState;
-    Notes: NoteState;
+    Note: NoteState;
     /**
      * @deprecated
      */

package/src/PredefinedConfig/CommentState.d.ts

@@ -1,9 +1,10 @@
-import { AdaptableObject } from '../types';
-import { ConfigState } from './ConfigState';
+import { CellAddress } from '../types';
+import { InternalState } from './InternalState';
+import { TypeUuid } from './Uuid';
 /**
- * Predefined Configuration for Comments Module
+ * Internal State used for Comments Module
  */
-export interface CommentState extends ConfigState {
+export interface CommentState extends InternalState {
     /**
      * Collection of AdapTable Comments
      */
@@ -12,7 +13,11 @@ export interface CommentState extends ConfigState {
 /**
  * Comment that can be applied to a Cell in AdapTable
  */
-export interface AdaptableComment extends AdaptableObject {
+export interface AdaptableComment {
+    /**
+     * Unique identifier for the Comment
+     */
+    Uuid?: TypeUuid;
     /**
      * When Comment was made
      */
@@ -32,15 +37,14 @@ export interface AdaptableComment extends AdaptableObject {
      */
     AdaptableId?: string;
 }
-export interface CommentThread extends AdaptableObject {
-    /**
-     * Value in Primary Key Column
-     */
-    PrimaryKeyValue: string | number;
+/**
+ * Thread of Comments for an Adaptable Cell
+ */
+export interface CommentThread extends CellAddress {
     /**
-     * Id of Column containing the Note
+     * Unique identifier for Comment
      */
-    ColumnId: string;
+    Uuid?: TypeUuid;
     /**
      * Collection of Comments for this Cell
      */