@adaptabletools/adaptable-cjs 17.0.0-canary.4 → 18.0.0-canary.0

package/src/AdaptableOptions/MenuOptions.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_ADAPTABLE_COLUMN_MENU_ORDER = exports.DEFAULT_ADAPTABLE_CONTEXT_MENU_ORDER = void 0;
+exports.DEFAULT_ADAPTABLE_COLUMN_MENU_ORDER = exports.DEFAULT_ADAPTABLE_CONTEXT_MENU_STRUCTURE = void 0;
 const tslib_1 = require("tslib");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
-exports.DEFAULT_ADAPTABLE_CONTEXT_MENU_ORDER = [
+exports.DEFAULT_ADAPTABLE_CONTEXT_MENU_STRUCTURE = [
     ModuleConstants.SettingsPanelModuleId,
     ModuleConstants.DashboardModuleId,
     ModuleConstants.ToolPanelModuleId,
@@ -21,8 +21,13 @@ exports.DEFAULT_ADAPTABLE_CONTEXT_MENU_ORDER = [
     ModuleConstants.CalculatedColumnModuleId,
     ModuleConstants.ExportModuleId,
     ModuleConstants.ColumnFilterModuleId,
-    ModuleConstants.SmartEditModuleId,
-    ModuleConstants.BulkUpdateModuleId,
+    {
+        title: 'Edit',
+        icon: {
+            name: 'edit',
+        },
+        modules: [ModuleConstants.SmartEditModuleId, ModuleConstants.BulkUpdateModuleId],
+    },
     ModuleConstants.TeamSharingModuleId,
     ModuleConstants.DataChangeHistoryModuleId,
     ModuleConstants.DataSetModuleId,
@@ -47,6 +52,7 @@ exports.DEFAULT_ADAPTABLE_CONTEXT_MENU_ORDER = [
     ModuleConstants.ThemeModuleId,
     ModuleConstants.ChartingModuleId,
     ModuleConstants.NotesModuleId,
+    ModuleConstants.CommentsModuleId,
 ];
 exports.DEFAULT_ADAPTABLE_COLUMN_MENU_ORDER = [
     ModuleConstants.SettingsPanelModuleId,
@@ -66,8 +72,10 @@ exports.DEFAULT_ADAPTABLE_COLUMN_MENU_ORDER = [
     ModuleConstants.CalculatedColumnModuleId,
     ModuleConstants.ExportModuleId,
     ModuleConstants.ColumnFilterModuleId,
-    ModuleConstants.SmartEditModuleId,
-    ModuleConstants.BulkUpdateModuleId,
+    {
+        title: 'Edit',
+        modules: [ModuleConstants.SmartEditModuleId, ModuleConstants.BulkUpdateModuleId],
+    },
     ModuleConstants.TeamSharingModuleId,
     ModuleConstants.DataChangeHistoryModuleId,
     ModuleConstants.DataSetModuleId,

package/src/AdaptableOptions/NotesOptions.d.ts

@@ -1,4 +1,4 @@
-import { BaseContext } from '../../types';
+import { BaseContext, CellAddress } from '../../types';
 /**
  * Options for managing AdapTable Notes
  */
@@ -12,12 +12,5 @@ export interface NotesOptions<TData = any> {
  * Context used when determining if a Note can be added to a Cell
  */
 export interface NotableCellContext extends BaseContext {
-    /**
-     * Value in Primary Key Column
-     */
-    primaryKeyValue: string;
-    /**
-     * Column where Note will be displayed
-     */
-    columnId: string;
+    address: CellAddress;
 }

package/src/Api/AdaptableApi.d.ts

@@ -39,12 +39,13 @@ import { StyledColumnApi } from './StyledColumnApi';
 import { OptionsApi } from './OptionsApi';
 import { ActionColumnApi } from './ActionColumnApi';
 import { ActionRowApi } from './ActionRowApi';
-import { NotesApi } from './NotesAPi';
+import { NotesApi } from './NotesApi';
 import { Fdc3Api } from './Fdc3Api';
 import { DataImportApi } from './DataImportApi';
 import { GridFilterApi } from './GridFilterApi';
 import { NamedQueryApi } from './NamedQueryApi';
 import { ColumnFilterApi } from './ColumnFilterApi';
+import { CommentApi } from './CommentApi';
 /**
  *
  * The `AdaptableApi` provides developers with run-time access to AdapTable.
@@ -228,6 +229,10 @@ export interface AdaptableApi {
      * Provides access to the Notes Module
      */
     notesApi: NotesApi;
+    /**
+     * Provides access to the Comments Module
+     */
+    commentApi: CommentApi;
     /**
      * Provides access to the Data Import Module
      */

package/src/Api/CommentApi.d.ts

@@ -0,0 +1,58 @@
+import { CommentThread } from '../PredefinedConfig/CommentState';
+import { CellAddress } from '../PredefinedConfig/CellAddress';
+import { AdaptableComment } from '../types';
+/**
+ * Provides run-time access to Notes Module and related State
+ */
+export interface CommentApi {
+    /**
+     * Add comment to comment thread
+     *
+     * @param comment comment
+     * @param address where the comment should be added
+     */
+    addComment(commentText: string, address: CellAddress): void;
+    /**
+     * Edit comment
+     *
+     * @param comment Comment to edit
+     * @param cellAddress Location of the comment, if not provided all comments will be traversed to find the comment
+     */
+    editComment(comment: AdaptableComment, cellAddress?: CellAddress): void;
+    /**
+     * Delete a comment
+     * @param address Location of the comment, if not provided all comments will be traversed to find the comment
+     */
+    deleteComment(comment: AdaptableComment, cellAddress: CellAddress): void;
+    /**
+     * Gets comments on a particular cell
+     * @param CellAddress
+     */
+    getComments(cellAddress: CellAddress): AdaptableComment[];
+    /**
+     *  Delete all comments on a particular cell
+     * @param cellAddress
+     */
+    deleteCommentThread(cellAddress: CellAddress): void;
+    /**
+     * Returns cell comments at the given address
+     * @param cellAddress
+     */
+    getCommentThread(cellAddress: CellAddress): CommentThread | undefined;
+    /**
+     * Returns all comment threads
+     */
+    getCommentThreads(): CommentThread[];
+    /**
+     * Called to add a new comment thread
+     *
+     * @param commentThread
+     */
+    addCommentThread(commentThread: CommentThread): void;
+    /**
+     * Called to set all cell comments
+     *
+     * @param commentThreads new cell comments
+     */
+    loadCommentThreads(commentThreads: CommentThread[]): void;
+}

package/src/Api/EventApi.d.ts

@@ -1,4 +1,6 @@
-import { SelectionChangedInfo, LiveDataChangedInfo, DashboardChangedInfo, ThemeChangedInfo, AlertFiredInfo, LayoutChangedInfo, AdaptableReadyInfo, CustomToolbarConfiguredInfo, CellChangedInfo, SystemStatusMessageDisplayedInfo, AdaptableStateChangedInfo, FlashingCellDisplayedInfo, GridDataChangedInfo, TeamSharingEntityChangedInfo, ActionRowSubmittedInfo, DataSetSelectedInfo, AdaptableStateReloadedInfo, GridSortedInfo, ScheduleTriggeredInfo, ChartChangedInfo, ThemeEditedInfo, Fdc3MessageInfo, DataImportedInfo, ColumnFilterAppliedInfo, GridFilterAppliedInfo } from '../types';
+import { ActionRowSubmittedInfo, AdaptableReadyInfo, AdaptableStateChangedInfo, AdaptableStateReloadedInfo, AlertFiredInfo, CellChangedInfo, CellSelectionChangedInfo, ChartChangedInfo, ColumnFilterAppliedInfo, CustomToolbarConfiguredInfo, DashboardChangedInfo, DataImportedInfo, DataSetSelectedInfo, Fdc3MessageInfo, FlashingCellDisplayedInfo, GridDataChangedInfo, GridFilterAppliedInfo, GridSortedInfo, LayoutChangedInfo, LiveDataChangedInfo, RowSelectionChangedInfo, ScheduleTriggeredInfo, SystemStatusMessageDisplayedInfo, TeamSharingEntityChangedInfo, ThemeChangedInfo, ThemeEditedInfo } from '../types';
+import { CalculatedColumnChangedInfo } from './Events/CalculatedColumnChanged';
+import { CommentsChangedInfo } from './Events/CommentsChangedInfo';
 /**
  * Responsible for publishing the many Events that AdapTable fires
  */
@@ -89,16 +91,27 @@ export interface EventApi {
      */
     off(eventName: 'GridDataChanged', callback: (gridDataChangedInfo: GridDataChangedInfo) => void): void;
     /**
-     * Event fired whenever the Cell or Row **Selection in AdapTable changes**.
-     * @param eventName SelectionChanged
-     * @param callback SelectionChangedInfo which contains information of any cells or rows that are selected.
+     * Event fired whenever the Cell **Selection in AdapTable changes**.
+     * @param eventName CellSelectionChanged
+     * @param callback CellSelectionChangedInfo which contains information of any cells that are selected.
      * @returns the unsubscribe function
      */
-    on(eventName: 'SelectionChanged', callback: (selectionChangedInfo: SelectionChangedInfo) => void): VoidFunction;
+    on(eventName: 'CellSelectionChanged', callback: (cellSelectionChangedInfo: CellSelectionChangedInfo) => void): VoidFunction;
     /**
-     * Unsubscribe from SelectionChanged
+     * Unsubscribe from CellSelectionChanged
      */
-    off(eventName: 'SelectionChanged', callback: (selectionChangedInfo: SelectionChangedInfo) => void): void;
+    off(eventName: 'CellSelectionChanged', callback: (cellSelectionChangedInfo: CellSelectionChangedInfo) => void): void;
+    /**
+     * Event fired whenever the Row **Selection in AdapTable changes**.
+     * @param eventName RowSelectionChanged
+     * @param callback RowSelectionChangedInfo which contains information of any rows that are selected.
+     * @returns the unsubscribe function
+     */
+    on(eventName: 'RowSelectionChanged', callback: (rowSelectionChangedInfo: RowSelectionChangedInfo) => void): VoidFunction;
+    /**
+     * Unsubscribe from RowSelectionChanged
+     */
+    off(eventName: 'RowSelectionChanged', callback: (rowSelectionChangedInfo: RowSelectionChangedInfo) => void): void;
     /**
      * Event fired whenever the selected theme of AdapTable is changed
      * @param eventName ThemeChanged
@@ -171,14 +184,25 @@ export interface EventApi {
      * @param callback LayoutChanged which includes just the name of the currently selected Layout.
      * @returns the unsubscribe function
      */
-    on(eventName: 'LayoutChanged', callback: (LayoutChangedInfo: LayoutChangedInfo) => void): VoidFunction;
+    on(eventName: 'LayoutChanged', callback: (layoutChangedInfo: LayoutChangedInfo) => void): VoidFunction;
     /**
      * Unsubscribe from LayoutChanged
      */
-    off(eventName: 'LayoutChanged', callback: (LayoutChangedInfo: LayoutChangedInfo) => void): void;
+    off(eventName: 'LayoutChanged', callback: (layoutChangedInfo: LayoutChangedInfo) => void): void;
+    /**
+     * Event fired whenever a Calculated Columns is created / updated / deleted in AdapTable
+     * @param eventName CalculatedColumnChanged
+     * @param callback CalculatedColumnChanged which includes the action and details of the Calculated Column
+     * @returns the unsubscribe function
+     */
+    on(eventName: 'CalculatedColumnChanged', callback: (calculatedColumnChangedInfo: CalculatedColumnChangedInfo) => void): VoidFunction;
+    /**
+     * Unsubscribe from CalculatedColumnChanged
+     */
+    off(eventName: 'CalculatedColumnChanged', callback: (calculatedColumnChangedInfo: CalculatedColumnChangedInfo) => void): void;
     /**
      * Event fired whenever **Configure Button is clicked in a Custom Toolbar**
-     * @param eventName DashboardChanged
+     * @param eventName CustomToolbarConfigured
      * @param callback CustomToolbarConfiguredInfo which contains the Custom Toolbar
      * @returns the unsubscribe function
      */
@@ -223,7 +247,7 @@ export interface EventApi {
     off(eventName: 'AdaptableStateReloaded', callback: (adaptableStateReloadedInfo: AdaptableStateReloadedInfo) => void): void;
     /**
      * Event fired whenever **a change occurs relating to live reports / data**
-     * Used in conjunction with AdapTable's partners OpenFin, ipushpull or Glue42
+     * Used in conjunction with AdapTable's partners OpenFin or ipushpull
      * @param eventName LiveDataChanged
      * @param callback LiveDataChangedInfo which includes details of what triggered the event and the live report which is affected.
      * @returns the unsubscribe function
@@ -272,6 +296,18 @@ export interface EventApi {
      * @param callbackChartChangedInfo
      */
     off(eventName: 'ChartChanged', callback: (chartChangedInfo: ChartChangedInfo) => void): void;
+    /**
+     * Event fired when Comments are Changed
+     * @param eventName CommentsChanged
+     * @param callback
+     */
+    on(eventName: 'CommentsChanged', callback: (commentsChangedInfo: CommentsChangedInfo) => void): () => void;
+    /**
+     * Unsubscribe from CommentsChanged
+     * @param eventName
+     * @param callback
+     */
+    off(eventName: 'CommentsChanged', callback: (commentsChangedInfo: CommentsChangedInfo) => void): void;
     /**
      * Fired when Adaptable is up and running - has no arguments.
      * @param eventName - AdaptableReady
@@ -316,6 +352,6 @@ export interface EventApi {
     emitSync(eventName: 'DashboardChanged', data?: any): any[];
     emitSync(eventName: 'FlashingCellDisplayed', data?: any): any[];
     emitSync(eventName: 'AdaptableDestroy'): any[];
-    emit(eventName: 'ActionRowSubmitted' | 'AdaptableReady' | 'AlertFired' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'ChartChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataImported' | 'DataSetSelected' | 'ColumnFilterApplied' | 'Fdc3Message' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'LiveDataChanged' | 'ScheduleTriggered' | 'SearchChanged' | 'SelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'ThemeEdited' | 'GridFilterApplied', data?: any): Promise<any>;
+    emit(eventName: 'ActionRowSubmitted' | 'AdaptableReady' | 'AlertFired' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'ChartChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataImported' | 'DataSetSelected' | 'ColumnFilterApplied' | 'Fdc3Message' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'CalculatedColumnChanged' | 'LiveDataChanged' | 'ScheduleTriggered' | 'SearchChanged' | 'CellSelectionChanged' | 'RowSelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'ThemeEdited' | 'GridFilterApplied' | 'CommentsChanged', data?: any): Promise<any>;
     destroy(): void;
 }

package/src/Api/Events/CalculatedColumnChanged.d.ts

@@ -0,0 +1,19 @@
+import { CalculatedColumn } from '../../PredefinedConfig/CalculatedColumnState';
+import { BaseEventInfo } from './BaseEventInfo';
+/**
+ * EventInfo returned by CalculatedColumnChanged event
+ */
+export interface CalculatedColumnChangedInfo extends BaseEventInfo {
+    /**
+     * What caused CalculatedColumn State to change (i.e. Add, Edit, Delete)
+     */
+    actionName: string;
+    /**
+     * Calculated Column that has been added, edited or deleted
+     */
+    calculatedColumn: CalculatedColumn;
+    /**
+     * AST for Current Calculated Column Expression
+     */
+    calculatedColumnExpressionAST: any;
+}

package/src/Api/Events/CellSelectionChanged.d.ts

@@ -0,0 +1,11 @@
+import { SelectedCellInfo } from '../../PredefinedConfig/Selection/SelectedCellInfo';
+import { BaseEventInfo } from './BaseEventInfo';
+/**
+ * Event Info published by CellSelectionChanged event
+ */
+export interface CellSelectionChangedInfo extends BaseEventInfo {
+    /**
+     * Details of Cells currently selected in the Grid
+     */
+    selectedCellInfo: SelectedCellInfo;
+}

package/src/Api/Events/CommentsChangedInfo.d.ts

@@ -0,0 +1,5 @@
+import { CommentThread } from '../../types';
+import { BaseEventInfo } from './BaseEventInfo';
+export interface CommentsChangedInfo extends BaseEventInfo {
+    gridCellComments: CommentThread[];
+}

package/src/Api/Events/LiveDataChanged.d.ts

@@ -7,7 +7,7 @@ export interface LiveDataChangedInfo extends BaseEventInfo {
     /**
      * Which Adaptable partner is the export destination for the live data
      */
-    reportDestination: 'OpenFin' | 'ipushpull' | 'Glue42';
+    reportDestination: 'OpenFin' | 'ipushpull';
     /**
      * What triggered the event to fire
      */
@@ -22,7 +22,7 @@ export interface LiveDataChangedInfo extends BaseEventInfo {
  */
 export interface LiveReport {
     /**
-     * For OpenFin this is the workbook name; for iPushpull the page name; for Glue42 the Spreadsheet name
+     * For OpenFin this is the workbook name; for iPushpull the page name;
      */
     pageName: string;
     /**
@@ -32,5 +32,5 @@ export interface LiveReport {
     /**
      * Where the live data is being sent
      */
-    reportDestination: 'OpenfinExcel' | 'ipushpull' | 'Glue42';
+    reportDestination: 'OpenfinExcel' | 'ipushpull';
 }

package/src/Api/Events/RowSelectionChanged.d.ts

@@ -0,0 +1,11 @@
+import { SelectedRowInfo } from '../../PredefinedConfig/Selection/SelectedRowInfo';
+import { BaseEventInfo } from './BaseEventInfo';
+/**
+ * Event Info published by RowSelectionChanged event
+ */
+export interface RowSelectionChangedInfo extends BaseEventInfo {
+    /**
+     * Details of Rows currently selected in the Grid
+     */
+    selectedRowInfo: SelectedRowInfo;
+}

package/src/Api/GridApi.d.ts

@@ -301,12 +301,6 @@ export interface GridApi {
      * @param displayValue Display Value to use
      */
     getGridCellsForDisplayValue(columnId: string, displayValue: any): GridCell[] | undefined;
-    /**
-     * Gets the count of the cells in a Column that have the given Display Value
-     * @param columnId ColumnId to lookup
-     * @param displayValue Display Value to use
-     */
-    getCellDisplayValueCount(columnId: string, displayValue: any): number;
     /**
      * Retrieves Formatted Value for a given Raw Value in given Column
      * @param columnId ColumnId to lookup

package/src/Api/GridFilterApi.d.ts

@@ -23,11 +23,11 @@ export interface GridFilterApi {
      */
     clearGridFilter(): void;
     /**
-     * Opens the Expression Editor
+     * Opens the AdapTableQL UI Components (Expression Editor & Query Builder)
      *
      * @param expression current Grid Filter expression
      */
-    openExpressionEditorForGridFilter(expression?: string): void;
+    openUIEditorForGridFilter(expression?: string): void;
     /**
      * Suspends the Grid Filter
      */

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

@@ -1,6 +1,6 @@
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableInternalApi } from '../Internal/AdaptableInternalApi';
-import { AdaptableApi, OptionsApi, SettingsPanelApi } from '../../types';
+import { AdaptableApi, DataImportApi, NamedQueryApi, OptionsApi, SettingsPanelApi } from '../../types';
 import { AlertApi } from '../AlertApi';
 import { BulkUpdateApi } from '../BulkUpdateApi';
 import { CalendarApi } from '../CalendarApi';
@@ -40,12 +40,11 @@ import { StatusBarApi } from '../StatusBarApi';
 import { StyledColumnApi } from '../StyledColumnApi';
 import { ActionColumnApi } from '../ActionColumnApi';
 import { ActionRowApi } from '../ActionRowApi';
-import { NotesApi } from '../NotesAPi';
+import { NotesApi } from '../NotesApi';
 import { Fdc3Api } from '../Fdc3Api';
-import { DataImportApiImpl } from './DataImportApiImpl';
 import { GridFilterApi } from '../GridFilterApi';
-import { NamedQueryApiImpl } from './NamedQueryApiImpl';
 import { ColumnFilterApi } from '../ColumnFilterApi';
+import { CommentApi } from '../CommentApi';
 export declare class AdaptableApiImpl implements AdaptableApi {
     protected adaptable: IAdaptable;
     internalApi: AdaptableInternalApi;
@@ -93,9 +92,10 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     statusBarApi: StatusBarApi;
     notesApi: NotesApi;
     fdc3Api: Fdc3Api;
-    dataImportApi: DataImportApiImpl;
+    dataImportApi: DataImportApi;
     gridFilterApi: GridFilterApi;
-    namedQueryApi: NamedQueryApiImpl;
+    namedQueryApi: NamedQueryApi;
+    commentApi: CommentApi;
     private destroyed;
     constructor(adaptable: IAdaptable);
     /**

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -49,6 +49,7 @@ const DataImportApiImpl_1 = require("./DataImportApiImpl");
 const GridFilterApiImpl_1 = require("./GridFilterApiImpl");
 const NamedQueryApiImpl_1 = require("./NamedQueryApiImpl");
 const ColumnFilterApiImpl_1 = require("./ColumnFilterApiImpl");
+const CommentsApiImpl_1 = require("./CommentsApiImpl");
 class AdaptableApiImpl {
     constructor(adaptable) {
         this.adaptable = adaptable;
@@ -101,6 +102,7 @@ class AdaptableApiImpl {
         this.dataImportApi = new DataImportApiImpl_1.DataImportApiImpl(adaptable);
         this.gridFilterApi = new GridFilterApiImpl_1.GridFilterApiImpl(adaptable);
         this.columnFilterApi = new ColumnFilterApiImpl_1.ColumnFilterApiImpl(adaptable);
+        this.commentApi = new CommentsApiImpl_1.CommentsApiImpl(adaptable);
         // adaptable internal api
         this.internalApi = new AdaptableInternalApi_1.AdaptableInternalApi(adaptable);
     }

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

@@ -0,0 +1,15 @@
+import { ApiBase } from './ApiBase';
+import { CellAddress } from '../../PredefinedConfig/CellAddress';
+import { CommentThread, AdaptableComment } from '../../types';
+import { CommentApi } from '../CommentApi';
+export declare class CommentsApiImpl extends ApiBase implements CommentApi {
+    getComments(address: CellAddress): AdaptableComment[];
+    getCommentThread(address: CellAddress): CommentThread | undefined;
+    getCommentThreads(): CommentThread[];
+    editComment(comment: AdaptableComment, address: CellAddress): void;
+    deleteComment(comment: AdaptableComment, address: CellAddress): void;
+    addComment(commentText: AdaptableComment['Value'], address: CellAddress): void;
+    addCommentThread(commentThread: CommentThread): void;
+    deleteCommentThread(cellAddress: CellAddress): void;
+    loadCommentThreads(cellComments: CommentThread[]): void;
+}

package/src/Api/Implementation/CommentsApiImpl.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommentsApiImpl = void 0;
+const tslib_1 = require("tslib");
+const CommentRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CommentsRedux"));
+const ApiBase_1 = require("./ApiBase");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../../Utilities/ObjectFactory"));
+const AdaptableHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/AdaptableHelper"));
+class CommentsApiImpl extends ApiBase_1.ApiBase {
+    getComments(address) {
+        return CommentRedux.GetCommentsSelector(this.getAdaptableState().Comment, address);
+    }
+    getCommentThread(address) {
+        return CommentRedux.GetCellCommentSelector(this.getAdaptableState().Comment, address);
+    }
+    getCommentThreads() {
+        return this.getAdaptableState().Comment.CommentThreads;
+    }
+    editComment(comment, address) {
+        this.dispatchAction(CommentRedux.CommentsEdit({ comment, cellAddress: address }));
+    }
+    deleteComment(comment, address) {
+        this.dispatchAction(CommentRedux.CommentsDelete({ commentUuid: comment.Uuid, cellAddress: address }));
+    }
+    addComment(commentText, address) {
+        this.dispatchAction(CommentRedux.CommentsAdd({
+            comment: commentText
+                ? ObjectFactory_1.default.CreateAdaptableComment(commentText, this.adaptable.api)
+                : null,
+            cellAddress: address,
+        }));
+    }
+    addCommentThread(commentThread) {
+        if (!commentThread.Uuid) {
+            AdaptableHelper_1.default.addUuidAndSource(commentThread);
+        }
+        this.dispatchAction(CommentRedux.CommentsCellAdd({ commentThread: commentThread }));
+    }
+    deleteCommentThread(cellAddress) {
+        this.dispatchAction(CommentRedux.CommentsCellDelete({ cellAddress }));
+    }
+    loadCommentThreads(cellComments) {
+        this.dispatchAction(CommentRedux.CommentsSet({ commentThread: cellComments }));
+    }
+}
+exports.CommentsApiImpl = CommentsApiImpl;

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

@@ -4,7 +4,7 @@ import { ExpressionApi } from '../ExpressionApi';
 import { AdaptableQuery } from '../../PredefinedConfig/Common/AdaptableQuery';
 import { AdaptableColumnBase } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { ExpressionInternalApi } from '../Internal/ExpressionnternalApi';
+import { ExpressionInternalApi } from '../Internal/ExpressionInternalApi';
 export declare class ExpressionApiImpl extends ApiBase implements ExpressionApi {
     internalApi: ExpressionInternalApi;
     constructor(adaptable: IAdaptable);

package/src/Api/Implementation/ExpressionApiImpl.js

@@ -4,11 +4,11 @@ exports.ExpressionApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const parser = tslib_1.__importStar(require("../../parser/src"));
-const ExpressionnternalApi_1 = require("../Internal/ExpressionnternalApi");
+const ExpressionInternalApi_1 = require("../Internal/ExpressionInternalApi");
 class ExpressionApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new ExpressionnternalApi_1.ExpressionInternalApi(adaptable);
+        this.internalApi = new ExpressionInternalApi_1.ExpressionInternalApi(adaptable);
     }
     isValidBooleanExpression(query, module, validationErrorMessage) {
         const { isValid, errorMessage } = this.adaptable.api.internalApi
@@ -93,8 +93,7 @@ class ExpressionApiImpl extends ApiBase_1.ApiBase {
             .getExpressionWithColumnFriendlyNames(this.getAdaptableQueryExpression(query));
     }
     useCaseSensitivity() {
-        return this.adaptable.adaptableOptions.expressionOptions
-            .caseSensitiveExpressions;
+        return this.adaptable.adaptableOptions.expressionOptions.caseSensitiveExpressions;
     }
 }
 exports.ExpressionApiImpl = ExpressionApiImpl;

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

@@ -99,7 +99,6 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getGridCellsForRawValue(columnId: string, rawValue: any): GridCell[] | undefined;
     getCellRawValueCount(columnId: string, rawValue: any): number;
     getGridCellsForDisplayValue(columnId: string, displayValue: any): GridCell[] | undefined;
-    getCellDisplayValueCount(columnId: string, displayValue: any): number;
     jumpToRow(primaryKeyValue: any): void;
     jumpToColumn(columnId: string): void;
     jumpToCell(primaryKeyValue: any, columnId: string): void;

package/src/Api/Implementation/GridApiImpl.js

@@ -385,10 +385,6 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         });
         return returnGridCells;
     }
-    getCellDisplayValueCount(columnId, displayValue) {
-        const gridCells = this.getGridCellsForDisplayValue(columnId, displayValue);
-        return gridCells === null || gridCells === void 0 ? void 0 : gridCells.length;
-    }
     jumpToRow(primaryKeyValue) {
         const node = this.adaptable.getRowNodeForPrimaryKey(primaryKeyValue);
         this.adaptable.jumpToRow(node);

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

@@ -10,7 +10,7 @@ export declare class GridFilterApiImpl extends ApiBase implements GridFilterApi
     getCurrentGridFilterExpression(): string | undefined;
     setGridFilterExpression(filter: string): void;
     clearGridFilter(): void;
-    openExpressionEditorForGridFilter(expression?: string): void;
+    openUIEditorForGridFilter(expression?: string): void;
     suspendGridFilter(): void;
     unSuspendGridFilter(): void;
 }

package/src/Api/Implementation/GridFilterApiImpl.js

@@ -26,7 +26,7 @@ class GridFilterApiImpl extends ApiBase_1.ApiBase {
     clearGridFilter() {
         this.dispatchAction(LayoutRedux.LayoutGridFilterClear());
     }
-    openExpressionEditorForGridFilter(expression) {
+    openUIEditorForGridFilter(expression) {
         const preparedQuery = expression !== null && expression !== void 0 ? expression : this.getCurrentGridFilterExpression();
         this.getAdaptableApi().internalApi.showPopupWindow({
             id: windowFactory_1.WINDOW_GRID_FILTER_EDITOR,

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

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
-import { NotesApi } from '../NotesAPi';
-import { AdaptableNote, AdaptableNotes, NoteGridCell, NotesState } from '../../PredefinedConfig/NotesState';
+import { NotesApi } from '../NotesApi';
+import { AdaptableNote, AdaptableNotes, NotesState } from '../../PredefinedConfig/NotesState';
 export declare class NotesApiImpl extends ApiBase implements NotesApi {
     addNote(noteStr: string, primaryKeyValue: any, columnId: string): void;
     editNote(note: AdaptableNote): void;
@@ -13,8 +13,4 @@ export declare class NotesApiImpl extends ApiBase implements NotesApi {
         ColumnId: string;
     }): AdaptableNotes;
     getNoteByUuid(uuid: string): AdaptableNote | undefined;
-    showNotes(noteGridCell: NoteGridCell, editMode?: boolean): void;
-    hideNote(): void;
-    getOpenNoteGridCell(): NoteGridCell | undefined;
-    getNotePopupEditMode(): boolean;
 }

package/src/Api/Implementation/NotesApiImpl.js

@@ -4,7 +4,6 @@ exports.NotesApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const NotesRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/NotesRedux"));
-const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 class NotesApiImpl extends ApiBase_1.ApiBase {
     addNote(noteStr, primaryKeyValue, columnId) {
         const note = {
@@ -24,8 +23,7 @@ class NotesApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(NotesRedux.NotesEdit(note));
     }
     updateNoteText(noteStr, note) {
-        note.Value = noteStr;
-        this.editNote(note);
+        this.editNote(Object.assign(Object.assign({}, note), { Value: noteStr }));
     }
     deleteNote(note) {
         this.dispatchAction(NotesRedux.NotesDelete(note));
@@ -42,17 +40,5 @@ class NotesApiImpl extends ApiBase_1.ApiBase {
     getNoteByUuid(uuid) {
         return this.getAllNotes().find((note) => note.Uuid === uuid);
     }
-    showNotes(noteGridCell, editMode) {
-        this.dispatchAction(SystemRedux.SystemNotesShow(noteGridCell, editMode));
-    }
-    hideNote() {
-        this.dispatchAction(SystemRedux.SystemNoteHide());
-    }
-    getOpenNoteGridCell() {
-        return SystemRedux.SystemNotesSelector(this.getAdaptableState().System);
-    }
-    getNotePopupEditMode() {
-        return SystemRedux.SystemNotesEditModeSelector(this.getAdaptableState().System);
-    }
 }
 exports.NotesApiImpl = NotesApiImpl;

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

@@ -5,6 +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';
 export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getAdaptableId(): string;
     getAdaptableStateKey(): string;
@@ -19,6 +20,7 @@ export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getCalendarOptions(): CalendarOptions;
     getColumnOptions(): ColumnOptions;
     getNotesOptions(): NotesOptions;
+    getCommentsOptions(): Readonly<CommentsOptions<any>>;
     getCustomSortOptions(): CustomSortOptions;
     getContainerOptions(): ContainerOptions;
     getDataSetOptions(): DataSetOptions;

package/src/Api/Implementation/OptionsApiImpl.js

@@ -42,6 +42,9 @@ class OptionsApiImpl extends ApiBase_1.ApiBase {
     getNotesOptions() {
         return this.getOptions().notesOptions;
     }
+    getCommentsOptions() {
+        return this.getOptions().commentsOptions;
+    }
     getCustomSortOptions() {
         return this.getOptions().customSortOptions;
     }