@adaptabletools/adaptable 16.0.9 → 16.0.10-canary.0

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

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

package/src/Api/Implementation/ApiBase.js

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

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

@@ -2,10 +2,9 @@ import { ChartModel, ChartRef } from '@ag-grid-community/core';
 import { ChartingApi } from '../ChartingApi';
 import { ApiBase } from './ApiBase';
 import { ChartContainer, ChartDefinition } from '../../types';
-import { ChartingInternalApi } from '../Internal/ChartingInternalApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { ExternalChartDefinition } from '../../PredefinedConfig/ChartingState';
 export declare class ChartingApiImpl extends ApiBase implements ChartingApi {
-    internalApi: ChartingInternalApi;
     constructor(adaptable: IAdaptable);
     isChartingEnabled(): boolean;
     getCurrentChartModels(): ChartModel[];
@@ -32,4 +31,11 @@ export declare class ChartingApiImpl extends ApiBase implements ChartingApi {
     getOpenChartContainer(chartDefinition: ChartDefinition): ChartContainer | null;
     setChartReadOnly(chartDefinition: ChartDefinition): void;
     setChartEditable(chartDefinition: ChartDefinition): void;
+    addExternalChartDefinition(chartDefinition: ExternalChartDefinition, options: {
+        saveStrategy: 'auto' | 'manual';
+    }): void;
+    editExternalChartDefinition(chartDefinition: ExternalChartDefinition): void;
+    deleteExternalChartDefinition(chartDefinition: ExternalChartDefinition): void;
+    getExternalChartDefinitions(): ExternalChartDefinition<unknown>[];
+    getExternalChartDefinitionByName(name: string): ExternalChartDefinition | undefined;
 }

package/src/Api/Implementation/ChartingApiImpl.js

@@ -115,5 +115,69 @@ class ChartingApiImpl extends ApiBase_1.ApiBase {
     setChartEditable(chartDefinition) {
         this.dispatchAction(ChartingRedux.ChartingEditChart(Object.assign(Object.assign({}, chartDefinition), { IsReadOnly: false })));
     }
+    addExternalChartDefinition(chartDefinition, options) {
+        var _a, _b, _c;
+        const saveStrategy = (_a = options === null || options === void 0 ? void 0 : options.saveStrategy) !== null && _a !== void 0 ? _a : 'manual';
+        if (saveStrategy === 'auto') {
+            this.dispatchAction(ChartingRedux.ChartingAddExternalChart(Object.assign(Object.assign({}, chartDefinition), { Name: (_b = chartDefinition.Name) !== null && _b !== void 0 ? _b : this.internalApi.getUniqueChartName() })));
+        }
+        else {
+            const alert = {
+                alertType: 'generic',
+                header: 'Save chart',
+                message: 'Do you want to save this Chart?',
+                alertDefinition: Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyAlertDefinition()), { MessageType: 'Info', AlertProperties: {
+                        DisplayNotification: true,
+                        NotificationDuration: 'always',
+                    }, AlertForm: {
+                        Buttons: [
+                            {
+                                Label: 'Save',
+                                Action: (context) => {
+                                    this.dispatchAction(ChartingRedux.ChartingAddExternalChart(Object.assign(Object.assign({}, chartDefinition), { Name: context.formData.name || this.internalApi.getUniqueChartName() })));
+                                },
+                                ButtonStyle: {
+                                    tone: 'info',
+                                    variant: 'raised',
+                                },
+                            },
+                            {
+                                Label: 'Dismiss',
+                                ButtonStyle: {
+                                    tone: 'neutral',
+                                    variant: 'raised',
+                                },
+                            },
+                        ],
+                        fields: [
+                            {
+                                name: 'name',
+                                label: 'Name',
+                                fieldType: 'text',
+                                defaultValue: (_c = chartDefinition.Name) !== null && _c !== void 0 ? _c : '',
+                            },
+                        ],
+                    } }),
+            };
+            this.adaptable.api.alertApi.showAdaptableAlert(alert);
+        }
+    }
+    editExternalChartDefinition(chartDefinition) {
+        this.dispatchAction(ChartingRedux.ChartingEditExternalChart(chartDefinition));
+    }
+    deleteExternalChartDefinition(chartDefinition) {
+        this.dispatchAction(ChartingRedux.ChartingDeleteExternalChart(chartDefinition));
+    }
+    getExternalChartDefinitions() {
+        return this.getAdaptableState().Charting.ExternalChartDefinitions;
+    }
+    getExternalChartDefinitionByName(name) {
+        if (StringExtensions_1.default.IsNotNullOrEmpty(name)) {
+            let chartDefinition = this.getExternalChartDefinitions().find((c) => c.Name == name);
+            if (this.checkItemExists(chartDefinition, name, 'Chart')) {
+                return chartDefinition;
+            }
+        }
+    }
 }
 exports.ChartingApiImpl = ChartingApiImpl;

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

@@ -32,6 +32,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     hasDateDataType(columnId: string): boolean;
     getColumnDataTypeForColumnId(columnId: string): AdaptableColumnDataType | undefined;
     getFriendlyNameForColumnId(columnId: string): string;
+    doesColumnExist(columnId: string): boolean;
     getFriendlyNamesForColumnIds(columnIds: string[]): string[];
     getColumnIdForFriendlyName(friendlyName: string): string;
     getColumnIdsForFriendlyNames(friendlyNames: string[]): string[];

package/src/Api/Implementation/ColumnApiImpl.js

@@ -164,6 +164,10 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         this.logMissingColumnWarning(columnId);
         return result;
     }
+    doesColumnExist(columnId) {
+        const foundColumn = this.getColumns().find((c) => c.columnId == columnId);
+        return foundColumn ? true : false;
+    }
     getFriendlyNamesForColumnIds(columnIds) {
         const friendlyNames = [];
         if (ArrayExtensions_1.default.IsNullOrEmpty(columnIds)) {

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

@@ -17,10 +17,11 @@ import { FreeTextColumnState } from '../../PredefinedConfig/FreeTextColumnState'
 import { ToolPanelState } from '../../PredefinedConfig/ToolPanelState';
 import { ConfigApi } from '../ConfigApi';
 import { AdaptableModule, AdaptableStateKey } from '../../PredefinedConfig/Common/Types';
-import { AdaptableOptions, AdaptableSearchState, AdaptableSortState, CommentsState, ScheduleState } from '../../types';
+import { AdaptableOptions, AdaptableSearchState, AdaptableSortState, ScheduleState } from '../../types';
 import { QueryState } from '../../PredefinedConfig/QueryState';
 import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
 import { ChartingState } from '../../PredefinedConfig/ChartingState';
+import { NotesState } from '../../PredefinedConfig/NotesState';
 export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     configInit(): void;
     copyAllStateToClipboard(): void;
@@ -48,7 +49,7 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     getApplicationState(returnJson?: boolean): ApplicationState;
     getCalculatedColumnState(returnJson?: boolean): CalculatedColumnState;
     getChartingState(returnJson?: boolean): ChartingState;
-    getCommentsState(returnJson?: boolean): CommentsState;
+    getNotesState(returnJson?: boolean): NotesState;
     getCustomSortState(returnJson?: boolean): CustomSortState;
     getDashboardState(returnJson?: boolean): DashboardState;
     getExportState(returnJson?: boolean): ExportState;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -12,7 +12,7 @@ const AlertRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/Ale
 const BulkUpdateRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/BulkUpdateRedux"));
 const CalculatedColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CalculatedColumnRedux"));
 const ChartingRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ChartingRedux"));
-const CommentsRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CommentsRedux"));
+const NotesRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/NotesRedux"));
 const CustomSortRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CustomSortRedux"));
 const ExportRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ExportRedux"));
 const FormatColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FormatColumnRedux"));
@@ -137,7 +137,7 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                     promise
                         .then(() => {
                         this.adaptable.prepareGrid();
-                        this.adaptable.api.internalApi.hideLoadingScreen();
+                        this.adaptable.api.userInterfaceApi.hideLoadingScreen();
                     })
                         .then(() => {
                         // resolve main(result) promise
@@ -174,10 +174,10 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Charting)
                     : this.getAdaptableState().Charting;
-            case 'Comments':
+            case 'Notes':
                 return returnJson
-                    ? JSON.stringify(this.getAdaptableState().Comments)
-                    : this.getAdaptableState().Comments;
+                    ? JSON.stringify(this.getAdaptableState().Notes)
+                    : this.getAdaptableState().Notes;
             case 'CustomSort':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().CustomSort)
@@ -254,8 +254,8 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     getChartingState(returnJson = false) {
         return this.getUserStateByStateKey('Charting', returnJson);
     }
-    getCommentsState(returnJson = false) {
-        return this.getUserStateByStateKey('Comments', returnJson);
+    getNotesState(returnJson = false) {
+        return this.getUserStateByStateKey('Notes', returnJson);
     }
     getCustomSortState(returnJson = false) {
         return this.getUserStateByStateKey('CustomSort', returnJson);
@@ -310,8 +310,8 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
             case 'Charting':
                 this.dispatchAction(ChartingRedux.ChartingReady(this.getChartingState()));
                 break;
-            case 'Comments':
-                this.dispatchAction(CommentsRedux.CommentsReady(this.getCommentsState()));
+            case 'Notes':
+                this.dispatchAction(NotesRedux.NotesReady(this.getNotesState()));
                 break;
             case 'CustomSort':
                 this.dispatchAction(CustomSortRedux.CustomSortReady(this.getCustomSortState()));

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

@@ -0,0 +1,20 @@
+import { ApiBase } from './ApiBase';
+import { NotesApi } from '../NotesAPi';
+import { AdaptableNote, AdaptableNotes, NoteGridCell, NotesState } from '../../PredefinedConfig/NotesState';
+export declare class NotesApiImpl extends ApiBase implements NotesApi {
+    addNote(noteStr: string, primaryKeyValue: any, columnId: string): void;
+    editNote(note: AdaptableNote): void;
+    updateNoteText(noteStr: string, note: AdaptableNote): void;
+    deleteNote(note: AdaptableNote): void;
+    getNotesState(): NotesState;
+    getAllNotes(): AdaptableNotes;
+    getCellNotes(config: {
+        PrimaryKeyValue: string | number;
+        ColumnId: string;
+    }): AdaptableNotes;
+    getNoteByUuid(uuid: string): AdaptableNote | undefined;
+    showNotes(noteGridCell: NoteGridCell, editMode?: boolean): void;
+    hideNote(): void;
+    getOpenNoteGridCell(): NoteGridCell | undefined;
+    getNotePopupEditMode(): boolean;
+}

package/src/Api/Implementation/NotesApiImpl.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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 = {
+            Value: noteStr,
+            PrimaryKeyValue: primaryKeyValue,
+            ColumnId: columnId,
+            AdaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
+            Author: {
+                UserName: this.adaptable.api.optionsApi.getUserName(),
+            },
+            Timestamp: Date.now(),
+        };
+        this.dispatchAction(NotesRedux.NotesAdd(note));
+    }
+    editNote(note) {
+        note.Timestamp = Date.now();
+        this.dispatchAction(NotesRedux.NotesEdit(note));
+    }
+    updateNoteText(noteStr, note) {
+        note.Value = noteStr;
+        this.editNote(note);
+    }
+    deleteNote(note) {
+        this.dispatchAction(NotesRedux.NotesDelete(note));
+    }
+    getNotesState() {
+        return this.getAdaptableState().Notes;
+    }
+    getAllNotes() {
+        return this.getNotesState().Notes;
+    }
+    getCellNotes(config) {
+        return NotesRedux.GetNotesSelector(this.getAdaptableState().Notes, config);
+    }
+    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

@@ -1,5 +1,5 @@
 import { ApiBase } from './ApiBase';
-import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, 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 { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, NotesOptions, 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';
@@ -17,7 +17,7 @@ export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getCellSummaryOptions(): CellSummaryOptions;
     getCalendarOptions(): CalendarOptions;
     getColumnOptions(): ColumnOptions;
-    getCommentOptions(): CommentOptions;
+    getNotesOptions(): NotesOptions;
     getCustomSortOptions(): CustomSortOptions;
     getContainerOptions(): ContainerOptions;
     getDataSetOptions(): DataSetOptions;

package/src/Api/Implementation/OptionsApiImpl.js

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

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

@@ -30,4 +30,6 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
     getCustomIconDefinition(iconName: string): import("../../types").AdaptableIcon | import("../../types").CustomIcon;
+    showLoadingScreen(): void;
+    hideLoadingScreen(): void;
 }

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserInterfaceApiImpl = void 0;
+const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
+const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
 const UserInterfaceInternalApi_1 = require("../Internal/UserInterfaceInternalApi");
 class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
@@ -183,5 +185,11 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         }
         return customIcon;
     }
+    showLoadingScreen() {
+        this.dispatchAction(PopupRedux.PopupShowLoading());
+    }
+    hideLoadingScreen() {
+        this.dispatchAction(PopupRedux.PopupHideLoading());
+    }
 }
 exports.UserInterfaceApiImpl = UserInterfaceApiImpl;

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

@@ -30,8 +30,6 @@ import { ColDef } from '@ag-grid-community/core/dist/esm/es6/entities/colDef';
 export declare class AdaptableInternalApi extends ApiBase {
     getSystemState(): SystemState;
     showPopupConfirmation(confirmation: UIConfirmation): void;
-    showLoadingScreen(): void;
-    hideLoadingScreen(): void;
     showPopupScreen(module: AdaptableModule, componentName: string, popupParams?: ModuleParams, popupProps?: {
         [key: string]: any;
     }): void;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -21,12 +21,6 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     showPopupConfirmation(confirmation) {
         this.dispatchAction(PopupRedux.PopupShowConfirmation(confirmation));
     }
-    showLoadingScreen() {
-        this.dispatchAction(PopupRedux.PopupShowLoading());
-    }
-    hideLoadingScreen() {
-        this.dispatchAction(PopupRedux.PopupHideLoading());
-    }
     showPopupScreen(module, componentName, popupParams, popupProps) {
         this.dispatchAction(PopupRedux.PopupShowScreen(module, componentName, popupParams, popupProps));
     }

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

@@ -23,4 +23,6 @@ export declare class CalculatedColumnInternalApi extends ApiBase {
      */
     getReferencedColumnIdsForCalculatedColumnId(calculatedColumnId: string): string[];
     getCalculatedColumnsDependentOnColumn(column: AdaptableColumn): string[];
+    isCumulativeAggregatedExpression(input: string): boolean;
+    isQuantileAggregatedExpression(input: string): boolean;
 }

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -62,5 +62,17 @@ class CalculatedColumnInternalApi extends ApiBase_1.ApiBase {
         })
             .map((calculatedColumn) => calculatedColumn.ColumnId);
     }
+    isCumulativeAggregatedExpression(input) {
+        var _a;
+        return !!((_a = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
+            .getNodesFromExpression(input, 'CUMUL')) === null || _a === void 0 ? void 0 : _a.length);
+    }
+    isQuantileAggregatedExpression(input) {
+        var _a;
+        return !!((_a = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
+            .getNodesFromExpression(input, 'QUANT')) === null || _a === void 0 ? void 0 : _a.length);
+    }
 }
 exports.CalculatedColumnInternalApi = CalculatedColumnInternalApi;

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

@@ -1,6 +1,13 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { ChartContainer } from '../../types';
+import { ExternalChartDefinition } from '../../PredefinedConfig/ChartingState';
 export declare class ChartingInternalApi extends ApiBase {
     getContainerElement(chartContainer: ChartContainer): HTMLElement | null;
     getContainerElemetnByName(containerName: string): HTMLElement | null;
+    getUniqueChartName(): string;
+    isExternalChartOpened(chartDefinition: ExternalChartDefinition): boolean;
+    onHideExternalChart(chartDefinition: ExternalChartDefinition): void;
+    onShowExternalChart(chartDefinition: ExternalChartDefinition, container: ChartContainer): void;
+    onPreviewExternalChart(chartDefinition: ExternalChartDefinition, container: ChartContainer): ExternalChartDefinition<unknown>;
+    onDeleteExternalChart(chartDefinition: ExternalChartDefinition): void;
 }

package/src/Api/Internal/ChartingInternalApi.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChartingInternalApi = void 0;
 const ApiBase_1 = require("../Implementation/ApiBase");
+const ObjectFactory_1 = require("../../Utilities/ObjectFactory");
 class ChartingInternalApi extends ApiBase_1.ApiBase {
     getContainerElement(chartContainer) {
         const element = typeof (chartContainer === null || chartContainer === void 0 ? void 0 : chartContainer.element) === 'string'
@@ -19,5 +20,49 @@ class ChartingInternalApi extends ApiBase_1.ApiBase {
         const chartContainer = chartContainers.find((container) => container.name === containerName);
         return this.getContainerElement(chartContainer);
     }
+    getUniqueChartName() {
+        const charts = this.adaptable.api.chartingApi.getChartDefinitions();
+        const externalCharts = this.adaptable.api.chartingApi.getExternalChartDefinitions();
+        return `Chart ${charts.length + externalCharts.length + 1}`;
+    }
+    // External lib charting service
+    isExternalChartOpened(chartDefinition) {
+        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions();
+        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.externalCharting.isChartOpened)) {
+            return false;
+        }
+        if (!chartDefinition) {
+            return false;
+        }
+        return externalChartingOptions.externalCharting.isChartOpened(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+    }
+    onHideExternalChart(chartDefinition) {
+        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions();
+        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.externalCharting.onHideChart)) {
+            return;
+        }
+        externalChartingOptions.externalCharting.onHideChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+    }
+    onShowExternalChart(chartDefinition, container) {
+        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions();
+        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.externalCharting.onShowChart)) {
+            return;
+        }
+        externalChartingOptions.externalCharting.onShowChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+    }
+    onPreviewExternalChart(chartDefinition, container) {
+        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions();
+        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.externalCharting.onPreviewChart)) {
+            return;
+        }
+        return externalChartingOptions.externalCharting.onPreviewChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+    }
+    onDeleteExternalChart(chartDefinition) {
+        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions();
+        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.externalCharting.onDeleteChart)) {
+            return;
+        }
+        externalChartingOptions.externalCharting.onDeleteChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+    }
 }
 exports.ChartingInternalApi = ChartingInternalApi;

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

@@ -3,6 +3,9 @@ import { Column } from '@ag-grid-community/core';
 export declare class ColumnInternalApi extends ApiBase {
     /**
      * Retrieves 'ColumnType' property for a given Column
+     *   isCumulativeAggregate(input: string): boolean {
+     *     return !!this.getNodesFromExpression(input, 'CUMUL')?.length;
+     *   }
      * @param columnId Column to use
      */
     getAgGridColumnType(columnId: string): string | string[];

package/src/Api/Internal/ColumnInternalApi.js

@@ -6,6 +6,9 @@ const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants")
 class ColumnInternalApi extends ApiBase_1.ApiBase {
     /**
      * Retrieves 'ColumnType' property for a given Column
+     *   isCumulativeAggregate(input: string): boolean {
+     *     return !!this.getNodesFromExpression(input, 'CUMUL')?.length;
+     *   }
      * @param columnId Column to use
      */
     getAgGridColumnType(columnId) {

package/src/Api/NotesAPi.d.ts

@@ -0,0 +1,50 @@
+import { AdaptableNote, AdaptableNotes, NoteGridCell, NotesState } from '../PredefinedConfig/NotesState';
+/**
+ * Provides run-time access to Notes Module and related State
+ */
+export interface NotesApi {
+    /**
+     *
+     * @param note
+     * @param primaryKeyValue
+     * @param columnId
+     */
+    addNote(note: string, primaryKeyValue: any, columnId: string): void;
+    editNote(note: AdaptableNote): void;
+    updateNoteText(noteStr: string, note: AdaptableNote): void;
+    /**
+     *
+     * @param note
+     */
+    deleteNote(note: AdaptableNote): void;
+    getNotesState(): NotesState;
+    getAllNotes(): AdaptableNotes;
+    /**
+     * Gets all notes for a cell
+     * @param noteGridCell note position
+     */
+    getCellNotes(noteGridCell: NoteGridCell): AdaptableNote[];
+    /**
+     * Returns a note by uuid
+     * @param uuid note uuid
+     */
+    getNoteByUuid(uuid: string): AdaptableNote | undefined;
+    /**
+     * Gets all note for a cell
+     * @param noteGridCell note position
+     * @param editMode whether to show the note in edit mode
+     */
+    showNotes(noteGridCell: NoteGridCell, editMode?: boolean): void;
+    /**
+     * Hides the note popup
+     */
+    hideNote(): void;
+    /**
+     * Gets the note position of the currently open note popup
+     */
+    getOpenNoteGridCell(): NoteGridCell | null;
+    /**
+     * Gets the note edit mode
+     */
+    getNotePopupEditMode(): boolean;
+}

package/src/Api/OptionsApi.d.ts

@@ -1,7 +1,7 @@
 import { CustomSortOptions } from '../AdaptableOptions/CustomSortOptions';
 import { DataSetOptions } from '../AdaptableOptions/DataSetOptions';
 import { GroupingOptions } from '../AdaptableOptions/GroupingOptions';
-import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, CommentOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotificationsOptions, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
+import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotesOptions, NotificationsOptions, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
 import { Fdc3Options } from '../AdaptableOptions/Fdc3Options';
 import { ExpressionOptions } from '../AdaptableOptions/ExpressionOptions';
 /**
@@ -73,9 +73,9 @@ export interface OptionsApi {
      */
     getColumnOptions(): Readonly<ColumnOptions>;
     /**
-     * Returns `AdaptableOptions.commentOptions`
+     * Returns `AdaptableOptions.noteOptions`
      */
-    getCommentOptions(): Readonly<CommentOptions>;
+    getNotesOptions(): Readonly<NotesOptions>;
     /**
      * Returns `AdaptableOptions.customSortOptions`
      */

package/src/Api/UserInterfaceApi.d.ts

@@ -80,4 +80,12 @@ export interface UserInterfaceApi {
      * @param name name of Icon
      */
     getCustomIconDefinition(name: string): AdaptableIcon | undefined;
+    /**
+     * Displays the popup that says getting data and initialising grid
+     */
+    showLoadingScreen(): void;
+    /**
+     * Hides the popup that says getting data and initialising grid
+     */
+    hideLoadingScreen(): void;
 }

package/src/PredefinedConfig/AdaptableState.d.ts

@@ -23,7 +23,7 @@ import { FlashingCellState } from './FlashingCellState';
 import { StatusBarState } from './StatusBarState';
 import { ChartingState } from './ChartingState';
 import { StyledColumnState } from './StyledColumnState';
-import { CommentsState } from './CommentsState';
+import { NotesState } from './NotesState';
 /**
  * The main state object of Adaptable
  */
@@ -55,7 +55,7 @@ export interface AdaptablePersistentState {
     Theme: ThemeState;
     ToolPanel: ToolPanelState;
     Charting: ChartingState;
-    Comments: CommentsState;
+    Notes: NotesState;
 }
 /**
  * The state which is available in the internal Redux store but never persisted