@adaptabletools/adaptable 16.0.1-canary.0 → 16.0.1

package/src/AdaptableOptions/FinancePluginOptions.d.ts

@@ -1,310 +1,6 @@
-import { AdaptableApi, AdaptableIcon, ContextMenuContext, FDC3Context_DEPR, GridCell } from '../../types';
-import { CustomFDC3Context } from '../PredefinedConfig/Common/FDC3Context_DEPR';
 /**
- * Options required for when using the Finance plugin
+ * Removed in Version 16
+ * @deprecated - now provided in FDC3 Options
  */
 export interface FinancePluginOptions {
-    /**
-     * Columns to be defined as FDC3-related
-     */
-    fdc3Columns?: {
-        /**
-         * FDC3 Instruments
-         */
-        instrumentColumns?: InstrumentColumn[];
-        /**
-         * FDC3 Positions
-         */
-        positionColumns?: PositionColumn[];
-        /**
-         * FDC3 Contacts
-         */
-        contactColumns?: ContactColumn[];
-        /**
-         * FDC3 Countries
-         */
-        countryColumns?: CountryColumn[];
-        /**
-         * FDC3 Organizations
-         */
-        organizationColumns?: OrganizationColumn[];
-        /**
-         * Custom FDC3 Columns
-         */
-        customFDC3Columns?: CustomFDC3Column[];
-        /**
-         * Custom FDC3 Intents
-         */
-        customFDC3Intents?: CustomFDC3Intent_Depr[];
-    };
-    /**
-     * Intents to which to subscribe.
-     */
-    availableFDC3Intents?: (FDC3Intent_Depr | CustomFDC3Intent_Depr)[];
-    /**
-     * Whether `FDC3MessageSent` Adaptable events should be automatically delegated to the FDC3 API (either via `fdc3.raiseIntent(...)` or `fdc3.broadcast(...)` )
-     *
-     * @defaultValue TRUE
-     */
-    autoHandleFDC3AdaptableMessages?: boolean;
-    /**
-     * Called when an intent from `availableIntents` is raised.
-     */
-    onFDC3Intent?: (intent: FDC3Intent_Depr | CustomFDC3Intent_Depr, context: FDC3Context_DEPR, adaptableApi: AdaptableApi) => void;
-    /**
-     * Called when a context changes.
-     */
-    onFDC3Context?: (context: FDC3Context_DEPR, adaptableApi: AdaptableApi) => void;
-}
-/**
- * An FDC3 Column - will raise FDC3 intents and broadcast FDC3 messages
- */
-export interface FDC3Column_Depr {
-    /**
-     * Id of Column defined as FDC3
-     */
-    columnId: string;
-    /**
-     * If provided, will supply `name` property in FDC3 message
-     */
-    nameColumnId?: string;
-    /**
-     * Should Column display a 'Broadcast' context menu item
-     */
-    showBroadcastContextMenu?: boolean;
-    /**
-     * Should Column display a 'Raise Intent for Context' context menu item
-     */
-    showRaiseIntentForContextMenu?: boolean;
-    /**
-     * Label to display in Broadcast Context Menu Item
-     */
-    broadcastContextMenuLabel?: string | ((broadcastFDC3MessageContext: ContextMenuContext) => string);
-    /**
-     * Label to display in RaiseIntentForContext Context Menu Item
-     */
-    raiseIntentForContextMenuLabel?: string | ((raiseFDC3IntentForContext: ContextMenuContext) => string);
-    /**
-     * FDC3 intents which the Column can raise
-     */
-    intents?: any[];
-    /**
-     * Label to display in Intent Context Menu Item
-     */
-    intentContextMenuLabel?: string | ((raiseFDC3IntentContext: RaiseFDC3IntentContext) => string);
-    /**
-     * Returns a custom icon to display in the Raise Intent Context Menu Item;
-     */
-    intentIcon?: (intent: FDC3Intent_Depr | CustomFDC3Intent_Depr) => AdaptableIcon;
-}
-/**
- * A Column which will be defined as an FDC3 Instrument
- */
-export interface InstrumentColumn extends FDC3Column_Depr {
-    /**
-     * Column which holds a ticker value as instrument data
-     */
-    tickerColumnId?: string;
-    /**
-     * Column which holds an ISIN value as instrument data
-     */
-    isinColumnId?: string;
-    /**
-     * Column which holds a CUSIP value as instrument data
-     */
-    cusipColumnId?: string;
-    /**
-     * Column which holds a SEDOL value as instrument data
-     */
-    sedolColumnId?: string;
-    /**
-     * Column which holds a Reuters Instrument Code value as instrument data
-     */
-    ricColumnId?: string;
-    /**
-     * Column which holds a Bloomberg Ticker value as instrument data
-     */
-    bbgColumnId?: string;
-    /**
-     * Column which holds a PERMID value as instrument data
-     */
-    permidColumnId?: string;
-    /**
-     * Column which holds a [FIGI](https://www.openfigi.com/about/figi) value as instrument data
-     */
-    figiColumnId?: string;
-    /**
-     * Instrument-related FDC3 Intents; can be: `ViewChart` `ViewQuote` `ViewNews` `ViewAnalysis` `ViewInstrument`
-     */
-    intents?: InstrumentIntents;
-}
-/**
- * All available Instrument Intents
- */
-export declare type InstrumentIntents = InstrumentIntent[];
-/**
- * FDC3 Intents available to an Instrument Column
- */
-export declare type InstrumentIntent = 'ViewChart' | 'ViewQuote' | 'ViewNews' | 'ViewAnalysis' | 'ViewInstrument';
-/**
- *  A (Numeric) Column which will be defined as an FDC3 Position
- */
-export interface PositionColumn extends FDC3Column_Depr {
-    /**
-     * Column which contains the Instrument information of the FDC3 Message
-     */
-    instrumentColumnId: string;
-    /**
-     * Position-related FDC3 Intents; can be: `ViewChart` `ViewNews` `ViewAnalysis`
-     */
-    intents?: PositionIntents;
-}
-/**
- * All available Position Intents
- */
-export declare type PositionIntents = PositionIntent[];
-/**
- * FDC3 Intents available to a Position Column
- */
-export declare type PositionIntent = 'ViewChart' | 'ViewNews' | 'ViewAnalysis';
-/**
- *  A (String) Column which will be defined as an FDC3 Contact
- *  columnId and at least one other property is required
- */
-export interface ContactColumn extends FDC3Column_Depr {
-    /**
-     * Column which holds the email address of a Contact
-     */
-    emailColumnId?: string;
-    /**
-     * Column which holds an FDS_ID value a Contact
-     */
-    fds_idColumnId?: string;
-    /**
-     * Contact-related FDC3 Intents; can be: `StartCall` `StartChat` `ViewContact`
-     */
-    intents?: ContactIntents;
-}
-/**
- * All available Contact Intents
- */
-export declare type ContactIntents = ContactIntent[];
-/**
- * FDC3 Intents available to a Contact Column
- */
-export declare type ContactIntent = 'StartCall' | 'StartChat' | 'ViewContact';
-/**
- *  A (String) Column which will be defined as an FDC3 Organization
- */
-export interface OrganizationColumn extends FDC3Column_Depr {
-    /**
-     * Column which contains the LEI
-     */
-    leiColumnId?: string;
-    /**
-     * Column which contains a PermId
-     */
-    permidColumnId?: string;
-    /**
-     * Column which contains an FDS_ID
-     */
-    fds_idColumnId?: string;
-    /**
-     * Organization-related FDC3 Intents; can be: `ViewNews` `ViewAnalysis`
-     */
-    intents?: OrganizationIntents;
-}
-/**
- * All available Organization Intents
- */
-export declare type OrganizationIntents = OrganizationIntent[];
-/**
- * FDC3 Intents available to an Organization Column
- */
-export declare type OrganizationIntent = 'ViewNews' | 'ViewAnalysis';
-/**
- *  A (String) Column which will be defined as an FDC3 Country
- */
-export interface CountryColumn extends FDC3Column_Depr {
-    /**
-     * Column which contains the ISOALPHA2 Standard
-     */
-    isoalpha2ColumnId?: string;
-    /**
-     * Column which contains the ISOALPHA3 Standard
-     */
-    isoalpha3ColumnId?: string;
-    /**
-     * Country-related FDC3 Intents; can only be: `ViewChart`
-     */
-    intents?: CountryIntents;
-}
-/**
- * All available Country Intents
- */
-export declare type CountryIntents = CountryIntent[];
-/**
- * FDC3 Intents available to a Country Column
- */
-export declare type CountryIntent = 'ViewChart';
-/**
- *  A Column which will be defined as Custom FDC3 (can be any datatype)
- */
-export interface CustomFDC3Column extends FDC3Column_Depr {
-    /**
-     * Custom FDC3 Intents available to the column
-     */
-    intents: CustomFDC3Intent_Depr[];
-    /**
-     * Function which creates FDC3 context for the current column and row
-     */
-    createContext: (gridCell: GridCell) => CustomFDC3Context;
-}
-/**
- * Full list of FDC3 Intents available - each FDC3 Column can use a subset
- */
-export declare type FDC3Intent_Depr = 'StartCall' | 'StartChat' | 'ViewAnalysis' | 'ViewChart' | 'ViewContact' | 'ViewInstrument' | 'ViewNews' | 'ViewQuote';
-/**
- * Custom FDC3 Intent - just a string value
- */
-export declare type CustomFDC3Intent_Depr = string;
-/**
- * Context passed into Raise FDC3 Intent functions (e.g. get label)
- */
-export interface RaiseFDC3IntentContext extends ContextMenuContext {
-    /**
-     * FDC3 Intent that was raised
-     */
-    intent: FDC3Intent_Depr | CustomFDC3Intent_Depr;
-}
-/**
- * Function that handles FDC3 Context
- */
-export declare type FDC3ContextHandler = (context: FDC3Context_DEPR) => void;
-/**
- * Defines a Desktop Agent which supports FDC3
- */
-export interface FDC3DesktopAgent {
-    /**
-     * Raises an Intent
-     */
-    raiseIntent: (intent: FDC3Intent_Depr, context: FDC3Context_DEPR) => void;
-    /**
-     * Broadcasts an FDC3 Message
-     */
-    broadcast: (context: FDC3Context_DEPR) => void;
-    /**
-     * Raises an FDC3 Intent for a given Context
-     */
-    raiseIntentForContext: (context: FDC3Context_DEPR) => void;
-    /**
-     * Adds an FDC3 Intent Listener
-     */
-    addIntentListener: (intent: FDC3Intent_Depr | CustomFDC3Intent_Depr, listener: (context: FDC3Context_DEPR) => void) => void;
-    /**
-     * Adds an FDC3 Context Listener
-     */
-    addContextListener: (contextType: string | null, handler: FDC3ContextHandler) => {
-        unsubscribe: () => void;
-    };
 }

package/src/AdaptableOptions/OpenFinPluginOptions.d.ts

@@ -1,5 +1,4 @@
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableFDC3EventInfo } from '../PredefinedConfig/Common/FDC3Context_DEPR';
 /**
  * Options required for when using the OpenFin plugin
  */
@@ -44,9 +43,4 @@ export interface OpenFinPluginOptions {
      * Action to perform when a data change in Live Excel report triggers Prevent Edit Alert failure
      */
     onValidationFailureInExcel?: 'override' | 'show-notification' | 'show-undo-notification';
-    /**
-     * Useful when you also use the finance plugin configured with fdc3 related columns - values in cells such columns can be broadcasted to fdc3, and this function
-     * will be called for broadcasting. It's your job to broadcast to the desired fdc3 channel
-     */
-    onFDC3MessageSent?: (eventInfo: AdaptableFDC3EventInfo) => void;
 }

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -110,10 +110,6 @@ export interface UserInterfaceOptions<TData = any> {
      * @defaultValue null
      */
     alternativeModuleNames?: AlternativeModuleName[];
-    /**
-     * Whether a cell can be commented on
-     */
-    isCellCommentable?: (context: CommmentableCellContext) => boolean;
 }
 /**
  * Base class for all Permitted Values related objects
@@ -210,19 +206,6 @@ export interface BulkUpdatePermittedValuesContext<TData = any> extends Permitted
      */
     gridCells: GridCell<TData>[];
 }
-/**
- * Context used when determining if a Comment can be added to a Cell
- */
-export interface CommmentableCellContext extends BaseContext {
-    /**
-     * Value in Primary Key Column
-     */
-    primaryKeyValue: string;
-    /**
-     * Column where Comment will be displayed
-     */
-    columnId: string;
-}
 /**
  * Sets of Tabs avilable in Grid Info Settings Panel
  */

package/src/Api/CommentsApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableComment, AdaptableComments, CommentPosition, CommentsState } from '../PredefinedConfig/CommentsState';
+import { AdaptableComment, AdaptableComments, CommentGridCell, CommentsState } from '../PredefinedConfig/CommentsState';
 /**
  * Provides run-time access to Comments Module and related State
  */
@@ -21,9 +21,9 @@ export interface CommentsApi {
     getAllComments(): AdaptableComments;
     /**
      * Gets all comments for a cell
-     * @param commentPosition comment position
+     * @param commentGridCell comment position
      */
-    getCellComments(commentPosition: CommentPosition): AdaptableComment[];
+    getCellComments(commentGridCell: CommentGridCell): AdaptableComment[];
     /**
      * Returns a comment by uuid
      * @param uuid comment uuid
@@ -31,10 +31,10 @@ export interface CommentsApi {
     getCommentByUuid(uuid: string): AdaptableComment | undefined;
     /**
      * Gets all comments for a cell
-     * @param commentPosition comment position
+     * @param commentGridCell comment position
      * @param editMode whether to show the comment in edit mode
      */
-    showComment(commentPosition: CommentPosition, editMode?: boolean): void;
+    showComment(commentGridCell: CommentGridCell, editMode?: boolean): void;
     /**
      * Hides the comment popup
      */
@@ -42,7 +42,7 @@ export interface CommentsApi {
     /**
      * Gets the comment position of the currently open comment popup
      */
-    getOpenCommentPosition(): CommentPosition | null;
+    getOpenCommentGridCell(): CommentGridCell | null;
     /**
      * Gets the comment edit mode
      */

package/src/Api/EventApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableFDC3EventInfo, SelectionChangedInfo, LiveDataChangedInfo, DashboardChangedInfo, ThemeChangedInfo, AlertFiredInfo, LayoutChangedInfo, AdaptableReadyInfo, CustomToolbarConfiguredInfo, CellChangedInfo, SystemStatusMessageDisplayedInfo, CheckboxColumnClickedInfo, AdaptableStateChangedInfo, FlashingCellDisplayedInfo, GridDataChangedInfo, TeamSharingEntityChangedInfo, ActionRowSubmittedInfo, DataSetSelectedInfo, AdaptableStateReloadedInfo, GridSortedInfo, QueryRunInfo, ScheduleTriggeredInfo, ChartChangedInfo, ThemeEditedInfo, FilterAppliedInfo } from '../types';
+import { SelectionChangedInfo, LiveDataChangedInfo, DashboardChangedInfo, ThemeChangedInfo, AlertFiredInfo, LayoutChangedInfo, AdaptableReadyInfo, CustomToolbarConfiguredInfo, CellChangedInfo, SystemStatusMessageDisplayedInfo, CheckboxColumnClickedInfo, AdaptableStateChangedInfo, FlashingCellDisplayedInfo, GridDataChangedInfo, TeamSharingEntityChangedInfo, ActionRowSubmittedInfo, DataSetSelectedInfo, AdaptableStateReloadedInfo, GridSortedInfo, QueryRunInfo, ScheduleTriggeredInfo, ChartChangedInfo, ThemeEditedInfo, FilterAppliedInfo } from '../types';
 /**
  * Responsible for publishing the many Events that AdapTable fires
  */
@@ -308,21 +308,9 @@ export interface EventApi {
      * Unsubscribe from AdaptableReady
      */
     off(eventName: 'AdaptableReady', callback: (adaptableReadyInfo: AdaptableReadyInfo) => void): void;
-    /**
-     * Fired when an FDC3Message is sent
-     * @param eventName - FDC3MessageSent
-     * @param callback - A callback for listening to `FDC3MessageSent`
-     * @returns the unsubscribe function
-     *
-     */
-    on(eventName: 'FDC3MessageSent', callback: (eventInfo: AdaptableFDC3EventInfo) => void): VoidFunction;
-    /**
-     * Unsubscribe from FDC3MessageSent
-     */
-    off(eventName: 'FDC3MessageSent', callback: (eventInfo: AdaptableFDC3EventInfo) => void): void;
     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' | 'DataSetSelected' | 'FDC3MessageSent' | 'FilterApplied' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'LiveDataChanged' | 'QueryRun' | 'ScheduleTriggered' | 'SearchChanged' | 'SelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'ThemeEdited', data?: any): Promise<any>;
+    emit(eventName: 'ActionRowSubmitted' | 'AdaptableReady' | 'AlertFired' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'ChartChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataSetSelected' | 'FilterApplied' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'LiveDataChanged' | 'QueryRun' | 'ScheduleTriggered' | 'SearchChanged' | 'SelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'ThemeEdited', data?: any): Promise<any>;
     destroy(): void;
 }

package/src/Api/GridApi.d.ts

@@ -15,7 +15,7 @@ import { RowsHighlightInfo } from '../PredefinedConfig/Common/RowsHighlightInfo'
  */
 export interface GridApi {
     /**
-     * Returns Grid section from Adaptable State
+     * Returns Grid section from AdapTable State
      */
     getGridState(): GridState;
     /**
@@ -27,41 +27,41 @@ export interface GridApi {
      */
     getFilteredData(): any[];
     /**
-     * Repopulates grid with given data and fires a 'GridDataChanged' event
-     * @param data any data from any datasource that is suitable for AG Grid
+     * Repopulates EXISTING grid with given data; fires GridDataChanged' Event
+     * @param data any data suitable as AG Grid data source
      */
     setGridData(data: any[]): void;
     /**
-     * Sets grid with given data; does NOT fire a 'GridDataChanged' event
-     * @param data any data from any datasource that is suitable for AG Grid
+     * Sets grid with given data for FIRST use; doesn't fire 'GridDataChanged' Event
+     * @param dataany data suitable as AG Grid data source
      */
     setInitialGridData(data: any): void;
     /**
-     * Updates Adaptable (and AG Grid) with rows that have changed
-     * @param dataRows rows which have been updated - send whole row and Adaptable will take care of the rest
+     * Updates AdapTable (and AG Grid) with rows that have changed
+     * @param dataRows rows which have been updated - send whole row and AdapTable take cares of the rest
      * @param config batch option and callback function to run post update
      */
     updateGridData(dataRows: any[], config?: DataUpdateConfig): Promise<IRowNode[]>;
     /**
-   * Adds or Updates Adaptable (and AG Grid) with new and changed rows
+   * Adds or Updates AdapTable (and AG Grid) with new and changed rows
    * @param dataRows rows to add or update
    * @param config batch option and callback function to run post change
    */
     addOrUpdateGridData(dataRows: any[], config?: DataUpdateConfig): Promise<IRowNode[]>;
     /**
-     * Adds rows to Adaptable (and AG Grid)
+     * Adds rows to AdapTable (and AG Grid)
      * @param dataRows rows to add; ensure all 'mandatory' fields are included and Primary Key is unique
      * @param config batch option and callback function to run post addition
      */
     addGridData(dataRows: any[], config?: DataUpdateConfig): Promise<IRowNode[]>;
     /**
-     * Deletes rows from Adaptable (and AG Grid)
+     * Deletes rows from AdapTable (and AG Grid)
      * @param dataRows rows which should be deleted
      * @param config batch option and callback function to run post deletion
      */
     deleteGridData(dataRows: any[], config?: DataUpdateConfig): Promise<IRowNode[]>;
     /**
-     * Updates cell in Adaptable (first performs Cell & Server Validation)
+     * Updates cell in AdapTable (first performs Cell & Server Validation)
      * @param cellUpdateRequest (contains columnId, newValue and primaryKeyValue
      *
      */
@@ -88,7 +88,7 @@ export interface GridApi {
      */
     getAgGridInstance(): GridOptions;
     /**
-     * Returns Column Sort information in Adaptable
+     * Returns Column Sort information in AdapTable
      */
     getColumnSorts(): ColumnSort[];
     /**
@@ -497,7 +497,7 @@ export interface GridApi {
      */
     deselectAll(): void;
     /**
-     * Returns the Grid Container in which the Adaptable Instance is present
+     * Returns the Grid Container in which the AdapTable Instance is present
      */
     getGridContainerElement(): HTMLElement | null;
     /**

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

@@ -21,6 +21,7 @@ import { ExpressionApi } from '../ExpressionApi';
 import { CalendarOptions } from '../../AdaptableOptions/CalendarOptions';
 import { Fdc3Api } from '../Fdc3Api';
 import { Fdc3Options } from '../../AdaptableOptions/Fdc3Options';
+import { CommentOptions } from '../../AdaptableOptions/CommentsOptions';
 export declare abstract class ApiBase {
     protected adaptable: IAdaptable;
     /**
@@ -64,6 +65,7 @@ export declare abstract class ApiBase {
     protected getActionColumnOptions(): ActionColumnOptions;
     protected getActionRowOptions(): ActionRowOptions;
     protected getColumnOptions(): ColumnOptions;
+    protected getCommentOptions(): CommentOptions;
     protected getCustomSortOptions(): CustomSortOptions;
     protected getDataSetOptions(): DataSetOptions;
     protected getCalendarOptions(): CalendarOptions;

package/src/Api/Implementation/ApiBase.js

@@ -102,6 +102,9 @@ class ApiBase {
     getColumnOptions() {
         return this.getOptions().columnOptions;
     }
+    getCommentOptions() {
+        return this.getOptions().commentOptions;
+    }
     getCustomSortOptions() {
         return this.getOptions().customSortOptions;
     }

package/src/Api/Implementation/CalendarApiImpl.js

@@ -27,8 +27,7 @@ class CalendarApiImpl extends ApiBase_1.ApiBase {
             return dateToCheck.getDay() != 0 && dateToCheck.getDay() != 6;
         }
         for (let holiday of holidays) {
-            let holidayDate = new Date(holiday);
-            if (holidayDate.setHours(0, 0, 0, 0) == dateToCheck.setHours(0, 0, 0, 0)) {
+            if (holiday.setHours(0, 0, 0, 0) == dateToCheck.setHours(0, 0, 0, 0)) {
                 return false;
             }
         }

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

@@ -1,6 +1,6 @@
 import { ApiBase } from './ApiBase';
 import { CommentsApi } from '../CommentsApi';
-import { AdaptableComment, AdaptableComments, CommentPosition, CommentsState } from '../../PredefinedConfig/CommentsState';
+import { AdaptableComment, AdaptableComments, CommentGridCell, CommentsState } from '../../PredefinedConfig/CommentsState';
 export declare class CommentsApiImpl extends ApiBase implements CommentsApi {
     addComment(comment: string, primaryKeyValue: any, columnId: string): void;
     editComment(adaptableComment: AdaptableComment): void;
@@ -13,8 +13,8 @@ export declare class CommentsApiImpl extends ApiBase implements CommentsApi {
         ColumnId: string;
     }): AdaptableComments;
     getCommentByUuid(uuid: string): AdaptableComment | undefined;
-    showComment(commentPosition: CommentPosition, editMode?: boolean): void;
+    showComment(commentGridCell: CommentGridCell, editMode?: boolean): void;
     hideComment(): void;
-    getOpenCommentPosition(): CommentPosition | undefined;
+    getOpenCommentGridCell(): CommentGridCell | undefined;
     getCommentPopupEditMode(): boolean;
 }

package/src/Api/Implementation/CommentsApiImpl.js

@@ -43,13 +43,13 @@ class CommentsApiImpl extends ApiBase_1.ApiBase {
     getCommentByUuid(uuid) {
         return this.getAllComments().find((comment) => comment.Uuid === uuid);
     }
-    showComment(commentPosition, editMode) {
-        this.dispatchAction(SystemRedux.SystemCommentsShow(commentPosition, editMode));
+    showComment(commentGridCell, editMode) {
+        this.dispatchAction(SystemRedux.SystemCommentsShow(commentGridCell, editMode));
     }
     hideComment() {
         this.dispatchAction(SystemRedux.SystemCommentsHide());
     }
-    getOpenCommentPosition() {
+    getOpenCommentGridCell() {
         return SystemRedux.SystemCommentsSelector(this.getAdaptableState().System);
     }
     getCommentPopupEditMode() {

package/src/Api/Implementation/GridApiImpl.js

@@ -17,12 +17,12 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().Grid;
     }
     setGridData(dataSource) {
-        this.adaptable.setDataSource(dataSource);
+        this.adaptable.setGridData(dataSource);
         const allRowNodes = this.getAllRowNodes();
         this.internalApi.fireGridDataChangedEvent(dataSource, allRowNodes, 'Add');
     }
     setInitialGridData(data) {
-        this.adaptable.setDataSource(data);
+        this.adaptable.setInitialGridData(data);
     }
     getGridData() {
         return this.adaptable.getGridData();

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

@@ -1,5 +1,5 @@
 import { ApiBase } from './ApiBase';
-import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AdaptableQLOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, DataSetOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotificationsOptions, OptionsApi, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../../types';
+import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AdaptableQLOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, CommentOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, DataSetOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotificationsOptions, OptionsApi, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../../types';
 import { GroupingOptions } from '../../AdaptableOptions/GroupingOptions';
 import { CustomSortOptions } from '../../AdaptableOptions/CustomSortOptions';
 import { Fdc3Options } from '../../AdaptableOptions/Fdc3Options';
@@ -16,6 +16,7 @@ export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getCellSummaryOptions(): CellSummaryOptions;
     getCalendarOptions(): CalendarOptions;
     getColumnOptions(): ColumnOptions;
+    getCommentOptions(): CommentOptions;
     getCustomSortOptions(): CustomSortOptions;
     getContainerOptions(): ContainerOptions;
     getDataSetOptions(): DataSetOptions;

package/src/Api/Implementation/OptionsApiImpl.js

@@ -39,6 +39,9 @@ class OptionsApiImpl extends ApiBase_1.ApiBase {
     getColumnOptions() {
         return this.getOptions().columnOptions;
     }
+    getCommentOptions() {
+        return this.getOptions().commentOptions;
+    }
     getCustomSortOptions() {
         return this.getOptions().customSortOptions;
     }

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

@@ -4,7 +4,6 @@ import { ApiBase } from './ApiBase';
 import { IPushPullApi } from '../IPushPullApi';
 import { Glue42Api } from '../Glue42Api';
 import { OpenFinApi } from '../OpenFinApi';
-import { FinanceApi } from '../FinanceApi';
 import { FinsembleApi } from '../FinsembleApi';
 import { Glue42WebApi } from '../Glue42WebApi';
 export declare class PluginsApiImpl extends ApiBase implements PluginsApi {
@@ -17,6 +16,5 @@ export declare class PluginsApiImpl extends ApiBase implements PluginsApi {
     getGlue42PluginApi(): Glue42Api;
     getGlue42WebPluginApi(): Glue42WebApi;
     getOpenFinPluginApi(): OpenFinApi;
-    getFinancePluginApi(): FinanceApi;
     getFinsemblePluginApi(): FinsembleApi;
 }

package/src/Api/Implementation/PluginsApiImpl.js

@@ -23,9 +23,6 @@ class PluginsApiImpl extends ApiBase_1.ApiBase {
             if (pluginId === 'ipushpull') {
                 return api;
             }
-            if (pluginId === 'finance') {
-                return api;
-            }
             if (pluginId === 'glue42') {
                 return api;
             }
@@ -56,9 +53,6 @@ class PluginsApiImpl extends ApiBase_1.ApiBase {
     getOpenFinPluginApi() {
         return this.getPluginApi('openfin');
     }
-    getFinancePluginApi() {
-        return this.getPluginApi('finance');
-    }
     getFinsemblePluginApi() {
         return this.getPluginApi('finsemble');
     }