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

package/src/Utilities/ObjectFactory.d.ts

@@ -1,33 +1,33 @@
-import { ScheduleType } from '../PredefinedConfig/Common/Enums';
-import { CustomSort } from '../PredefinedConfig/CustomSortState';
-import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
-import { PlusMinusNudge } from '../PredefinedConfig/PlusMinusState';
 import { AlertDefinition, AlertProperties } from '../PredefinedConfig/AlertState';
-import { Layout } from '../PredefinedConfig/LayoutState';
-import { Report, ReportSchedule } from '../PredefinedConfig/ExportState';
+import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
+import { AdaptableCellChangedAlert, AdaptableGenericAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
+import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
+import { ScheduleType } from '../PredefinedConfig/Common/Enums';
 import { BaseSchedule, Schedule } from '../PredefinedConfig/Common/Schedule';
-import { Shortcut } from '../PredefinedConfig/ShortcutState';
+import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
+import { CustomSort } from '../PredefinedConfig/CustomSortState';
+import { Report, ReportSchedule } from '../PredefinedConfig/ExportState';
 import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
 import { FreeTextColumn } from '../PredefinedConfig/FreeTextColumnState';
-import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
-import { Glue42Report, Glue42Schedule } from '../PredefinedConfig/Glue42State';
-import { IPushPullReport } from '../PredefinedConfig/SystemState';
 import { IPushPullSchedule } from '../PredefinedConfig/IPushPullState';
+import { Layout } from '../PredefinedConfig/LayoutState';
 import { OpenFinReport, OpenFinSchedule } from '../PredefinedConfig/OpenFinState';
+import { PlusMinusNudge } from '../PredefinedConfig/PlusMinusState';
 import { ReminderSchedule } from '../PredefinedConfig/ScheduleState';
-import { AdaptableCellChangedAlert, AdaptableGenericAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
-import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
+import { Shortcut } from '../PredefinedConfig/ShortcutState';
+import { IPushPullReport } from '../PredefinedConfig/SystemState';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
-import { AdaptableTheme, BaseContext, ChartDefinition, ColumnFilter, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
+import { AdaptableTheme, BaseContext, ChartDefinition, ColumnFilter, CommentThread, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
 import { IRowNode } from '@ag-grid-community/core';
-import { AdaptableApi, BadgeStyleDefinition, NamedQuery } from '../../types';
+import { AdaptableApi, AdaptableComment, BadgeStyleDefinition, CellAddress, NamedQuery } from '../../types';
 import { ToastOptions } from '../components/Toastify';
 import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 export declare function CreateEmptyCustomSort(): CustomSort;
+export declare function CreateAdaptableComment(text: string, api: AdaptableApi): AdaptableComment;
 export declare function CreateEmptyCalculatedColumn(): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
 export declare function CreateEmptyPlusMinusNudge(): PlusMinusNudge;
@@ -43,13 +43,10 @@ export declare function CreateEmptyBaseSchedule(scheduleType: ScheduleType): Bas
 export declare function CreateEmptyReminderSchedule(): ReminderSchedule;
 export declare function CreateEmptyReportSchedule(): ReportSchedule;
 export declare function CreateEmptyIPushPullReport(): IPushPullReport;
-export declare function CreateEmptyGlue42Report(): Glue42Report;
 export declare function CreateEmptyOpenFinReport(): OpenFinReport;
 export declare function CreateEmptyIPushPullSchedule(): IPushPullSchedule;
-export declare function CreateEmptyGlue42Schedule(): Glue42Schedule;
 export declare function CreateEmptyOpenFinSchedule(): OpenFinSchedule;
 export declare function CreateIPushPullSchedule(iPushPullReport: IPushPullReport): IPushPullSchedule;
-export declare function CreateGlue42Schedule(glue42Report: Glue42Report): Glue42Schedule;
 export declare function CreateReportSchedule(reportName: string): ReportSchedule;
 export declare function CreateEmptySchedule(): Schedule;
 export declare function CreateEmptyShortcut(): Shortcut;
@@ -68,6 +65,7 @@ export declare function CreateEmptyChartDefinition(chartDefinition?: ChartDefini
 export declare function CreateCustomDisplayFormatterContext(value: any, node: IRowNode, abColumn: AdaptableColumn, api: AdaptableApi): CustomDisplayFormatterContext;
 export declare const createBaseContext: (adaptableApi: AdaptableApi) => BaseContext;
 export declare function CreateEmptyTheme(name?: string): AdaptableTheme;
+export declare function CreateEmptyCommentThread(cellAddress: CellAddress): CommentThread;
 export declare function CreateToastOptions(notificationsOptions: NotificationsOptions, { onClose, containerId }: {
     onClose?: VoidFunction;
     containerId: string;
@@ -93,7 +91,6 @@ export declare const ObjectFactory: {
     CreateEmptyIPushPullSchedule: typeof CreateEmptyIPushPullSchedule;
     CreateEmptyIPushPullReport: typeof CreateEmptyIPushPullReport;
     CreateIPushPullSchedule: typeof CreateIPushPullSchedule;
-    CreateGlue42Schedule: typeof CreateGlue42Schedule;
     CreateReportSchedule: typeof CreateReportSchedule;
     CreateEmptyOpenFinReport: typeof CreateEmptyOpenFinReport;
     CreateEmptyOpenFinSchedule: typeof CreateEmptyOpenFinSchedule;
@@ -105,8 +102,6 @@ export declare const ObjectFactory: {
     CreateColumnFilter: typeof CreateColumnFilter;
     CreateEmptyStyle: typeof CreateEmptyStyle;
     CreateEmptyCellSummmary: typeof CreateEmptyCellSummmary;
-    CreateEmptyGlue42Schedule: typeof CreateEmptyGlue42Schedule;
-    CreateEmptyGlue42Report: typeof CreateEmptyGlue42Report;
     CreateSystemStatusMessageInfo: typeof CreateSystemStatusMessageInfo;
     CreateToastOptions: typeof CreateToastOptions;
     CreateCustomDisplayFormatterContext: typeof CreateCustomDisplayFormatterContext;
@@ -114,5 +109,7 @@ export declare const ObjectFactory: {
     CreateDefaultStyledColumnBadge: typeof CreateDefaultStyledColumnBadge;
     CreateEmptyChartDefinition: typeof CreateEmptyChartDefinition;
     CreateEmptyTheme: typeof CreateEmptyTheme;
+    CreateEmptyCommentThread: typeof CreateEmptyCommentThread;
+    CreateAdaptableComment: typeof CreateAdaptableComment;
 };
 export default ObjectFactory;

package/src/Utilities/ObjectFactory.js

@@ -1,15 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateEmptyTheme = exports.createBaseContext = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyChartDefinition = exports.CreateDefaultStyledColumnBadge = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateExternalReport = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
+exports.ObjectFactory = exports.CreateToastOptions = exports.CreateEmptyCommentThread = exports.CreateEmptyTheme = exports.createBaseContext = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyChartDefinition = exports.CreateDefaultStyledColumnBadge = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateExternalReport = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateAdaptableComment = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
-const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
+const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Toastify_1 = require("../components/Toastify");
 const UIHelper_1 = require("../View/UIHelper");
 function CreateEmptyCustomSort() {
     return { Uuid: (0, Uuid_1.createUuid)(), ColumnId: GeneralConstants_1.EMPTY_STRING, SortedValues: [] };
 }
 exports.CreateEmptyCustomSort = CreateEmptyCustomSort;
+function CreateAdaptableComment(text, api) {
+    const comment = {
+        Value: text,
+        AdaptableId: api.optionsApi.getAdaptableId(),
+        Author: {
+            UserName: api.optionsApi.getUserName(),
+        },
+        Timestamp: Date.now(),
+        Uuid: (0, Uuid_1.createUuid)(),
+    };
+    return comment;
+}
+exports.CreateAdaptableComment = CreateAdaptableComment;
 function CreateEmptyCalculatedColumn() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
@@ -184,13 +197,6 @@ function CreateEmptyIPushPullReport() {
     };
 }
 exports.CreateEmptyIPushPullReport = CreateEmptyIPushPullReport;
-function CreateEmptyGlue42Report() {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        ReportName: GeneralConstants_1.EMPTY_STRING,
-    };
-}
-exports.CreateEmptyGlue42Report = CreateEmptyGlue42Report;
 function CreateEmptyOpenFinReport() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
@@ -208,16 +214,6 @@ function CreateEmptyIPushPullSchedule() {
     };
 }
 exports.CreateEmptyIPushPullSchedule = CreateEmptyIPushPullSchedule;
-function CreateEmptyGlue42Schedule() {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        ScheduleType: Enums_1.ScheduleType.Glue42,
-        Schedule: CreateEmptySchedule(),
-        Glue42Report: CreateEmptyGlue42Report(),
-        Transmission: 'Snapshot',
-    };
-}
-exports.CreateEmptyGlue42Schedule = CreateEmptyGlue42Schedule;
 function CreateEmptyOpenFinSchedule() {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
@@ -238,16 +234,6 @@ function CreateIPushPullSchedule(iPushPullReport) {
     };
 }
 exports.CreateIPushPullSchedule = CreateIPushPullSchedule;
-function CreateGlue42Schedule(glue42Report) {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        ScheduleType: Enums_1.ScheduleType.Glue42,
-        Schedule: CreateEmptySchedule(),
-        Glue42Report: glue42Report,
-        Transmission: 'Snapshot',
-    };
-}
-exports.CreateGlue42Schedule = CreateGlue42Schedule;
 function CreateReportSchedule(reportName) {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
@@ -411,6 +397,40 @@ function CreateEmptyTheme(name) {
     };
 }
 exports.CreateEmptyTheme = CreateEmptyTheme;
+function CreateEmptyCommentThread(cellAddress) {
+    return Object.assign(Object.assign({}, cellAddress), { Comments: [] });
+}
+exports.CreateEmptyCommentThread = CreateEmptyCommentThread;
+function getToastPosition(position) {
+    switch (position) {
+        case 'BottomLeft':
+            return 'bottom-left';
+        case 'BottomCenter':
+            return 'bottom-center';
+        case 'BottomRight':
+            return 'bottom-right';
+        case 'TopLeft':
+            return 'top-left';
+        case 'TopCenter':
+            return 'top-center';
+        case 'TopRight':
+            return 'top-right';
+    }
+}
+function getToastTransition(transition) {
+    switch (transition) {
+        case 'Bounce':
+            return Toastify_1.Bounce;
+        case 'Slide':
+            return Toastify_1.Slide;
+        case 'Zoom':
+            return Toastify_1.Zoom;
+        case 'Flip':
+            return Toastify_1.Flip;
+        default:
+            return Toastify_1.Bounce;
+    }
+}
 function CreateToastOptions(notificationsOptions, { onClose, containerId }, overides) {
     var _a;
     const adaptableToastPosition = notificationsOptions.position;
@@ -437,34 +457,6 @@ function CreateToastOptions(notificationsOptions, { onClose, containerId }, over
     return toastProps;
 }
 exports.CreateToastOptions = CreateToastOptions;
-function getToastPosition(position) {
-    switch (position) {
-        case 'BottomLeft':
-            return Toastify_1.toast.POSITION.BOTTOM_LEFT;
-        case 'BottomCenter':
-            return Toastify_1.toast.POSITION.BOTTOM_CENTER;
-        case 'BottomRight':
-            return Toastify_1.toast.POSITION.BOTTOM_RIGHT;
-        case 'TopLeft':
-            return Toastify_1.toast.POSITION.TOP_LEFT;
-        case 'TopCenter':
-            return Toastify_1.toast.POSITION.TOP_CENTER;
-        case 'TopRight':
-            return Toastify_1.toast.POSITION.TOP_RIGHT;
-    }
-}
-function getToastTransition(transition) {
-    switch (transition) {
-        case 'Bounce':
-            return Toastify_1.Bounce;
-        case 'Slide':
-            return Toastify_1.Slide;
-        case 'Zoom':
-            return Toastify_1.Zoom;
-        case 'Flip':
-            return Toastify_1.Flip;
-    }
-}
 exports.ObjectFactory = {
     CreateEmptyCustomSort,
     CreateEmptyCalculatedColumn,
@@ -484,7 +476,6 @@ exports.ObjectFactory = {
     CreateEmptyIPushPullSchedule,
     CreateEmptyIPushPullReport,
     CreateIPushPullSchedule,
-    CreateGlue42Schedule,
     CreateReportSchedule,
     CreateEmptyOpenFinReport,
     CreateEmptyOpenFinSchedule,
@@ -496,8 +487,6 @@ exports.ObjectFactory = {
     CreateColumnFilter,
     CreateEmptyStyle,
     CreateEmptyCellSummmary,
-    CreateEmptyGlue42Schedule,
-    CreateEmptyGlue42Report,
     CreateSystemStatusMessageInfo,
     CreateToastOptions,
     CreateCustomDisplayFormatterContext,
@@ -505,5 +494,7 @@ exports.ObjectFactory = {
     CreateDefaultStyledColumnBadge,
     CreateEmptyChartDefinition,
     CreateEmptyTheme,
+    CreateEmptyCommentThread,
+    CreateAdaptableComment,
 };
 exports.default = exports.ObjectFactory;

package/src/Utilities/Services/CellPopupService.d.ts

@@ -0,0 +1,23 @@
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { AdaptableApi, CellAddress } from '../../types';
+/**
+ * This service controls the interaction between notes and comments
+ */
+export declare class CellPopupService {
+    private api;
+    adaptable: IAdaptable;
+    constructor(api: AdaptableApi);
+    private getAdaptableState;
+    private dispatchAction;
+    static isSameAddress(a: CellAddress, b: CellAddress): boolean;
+    private handleAdaptableReady;
+    private getCellPositionFromEvent;
+    private handleMouseEnter;
+    private handleCellSelected;
+    getOpenCellAddress(): CellAddress | undefined;
+    getEditMode(): boolean;
+    hidePopup(): void;
+    showPopup(cellAddress: CellAddress, editMode: boolean): void;
+    editFocusedEntity(entity: 'Note' | 'Comment'): void;
+    getNotePopupEditMode(): boolean;
+}

package/src/Utilities/Services/CellPopupService.js

@@ -0,0 +1,138 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CellPopupService = void 0;
+const tslib_1 = require("tslib");
+const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+/**
+ * This service controls the interaction between notes and comments
+ */
+class CellPopupService {
+    constructor(api) {
+        this.api = api;
+        this.adaptable = api.internalApi.getAdaptableInstance();
+        this.adaptable = api.internalApi.getAdaptableInstance();
+        this.adaptable.api.eventApi.on('AdaptableReady', () => this.handleAdaptableReady());
+    }
+    getAdaptableState() {
+        return this.api.internalApi.getAdaptableState();
+    }
+    dispatchAction(action) {
+        this.api.internalApi.dispatchReduxAction(action);
+    }
+    static isSameAddress(a, b) {
+        if (!a || !b) {
+            return false;
+        }
+        if ((a === null || a === void 0 ? void 0 : a.ColumnId) === (b === null || b === void 0 ? void 0 : b.ColumnId) && (a === null || a === void 0 ? void 0 : a.PrimaryKeyValue) === (b === null || b === void 0 ? void 0 : b.PrimaryKeyValue)) {
+            return true;
+        }
+        // Primary keys retreived from the grid dom are always strings, so we must also consider them strings
+        if ((typeof a.PrimaryKeyValue === 'number' && typeof b.PrimaryKeyValue === 'string') ||
+            (typeof b.PrimaryKeyValue === 'string' && typeof a.PrimaryKeyValue === 'number')) {
+            return (a.PrimaryKeyValue.toString() === b.PrimaryKeyValue.toString() && a.ColumnId === b.ColumnId);
+        }
+        return false;
+    }
+    handleAdaptableReady() {
+        this.adaptable._on('MouseEnter', (event) => this.handleMouseEnter(event));
+        this.api.eventApi.on('CellSelectionChanged', (params) => {
+            var _a;
+            const cells = params.selectedCellInfo.gridCells;
+            if ((cells === null || cells === void 0 ? void 0 : cells.length) === 1 && ((_a = cells[0].column) === null || _a === void 0 ? void 0 : _a.columnId) && cells[0].primaryKeyValue) {
+                const selectedCell = cells[0];
+                const cellSelected = {
+                    PrimaryKeyValue: selectedCell.primaryKeyValue,
+                    ColumnId: selectedCell.column.columnId,
+                };
+                this.handleCellSelected(cellSelected);
+            }
+        });
+    }
+    getCellPositionFromEvent(event) {
+        var _a, _b;
+        const target = event.target;
+        if (!((_b = (_a = target === null || target === void 0 ? void 0 : target.classList) === null || _a === void 0 ? void 0 : _a.contains) === null || _b === void 0 ? void 0 : _b.call(_a, 'ag-cell'))) {
+            return null;
+        }
+        try {
+            const PrimaryKeyValue = target.parentElement.getAttribute('row-id');
+            return {
+                PrimaryKeyValue,
+                ColumnId: target.getAttribute('col-id'),
+            };
+        }
+        catch (e) {
+            return null;
+        }
+    }
+    handleMouseEnter(event) {
+        const editMode = this.getEditMode();
+        if (editMode) {
+            // ignore
+            return;
+        }
+        const cellPosition = this.getCellPositionFromEvent(event);
+        const openCellAddress = this.getOpenCellAddress();
+        // Hovering over someting that is not a cell and there is no open note
+        if (!cellPosition && openCellAddress) {
+            // need to close if the new cell does not have a note
+            this.hidePopup();
+            return;
+        }
+        const cellNotes = this.adaptable.api.notesApi.getCellNotes(cellPosition);
+        const cellComments = this.adaptable.api.commentApi.getCommentThread(cellPosition);
+        const hasNotesOrComments = (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length) || cellComments;
+        // call only if it is different
+        if (CellPopupService.isSameAddress(openCellAddress, cellPosition)) {
+            return;
+        }
+        if (hasNotesOrComments) {
+            this.showPopup(cellPosition, false);
+        }
+    }
+    handleCellSelected(cellAddress) {
+        // if already opened - do nothing
+        const openCellAddress = this.getOpenCellAddress();
+        if (CellPopupService.isSameAddress(openCellAddress, cellAddress)) {
+            return;
+        }
+        // if open but this has no note, close
+        const cellNotes = this.adaptable.api.notesApi.getCellNotes(cellAddress);
+        const cellComments = this.adaptable.api.commentApi.getCommentThread(cellAddress);
+        const hasNotesOrComments = (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length) || cellComments;
+        if (openCellAddress && !hasNotesOrComments) {
+            // hide only if in edit mode
+            // because if you select a cell and move the mouse fast over another cell
+            // with a note, you do not want to close that note
+            // the selection is debounced, so the moment goes over the new cell this event is triggered
+            if (this.getEditMode()) {
+                this.hidePopup();
+            }
+            return;
+        }
+        // if open but the new selection has a note open that one in edit mode (because of click)
+        if (openCellAddress && hasNotesOrComments) {
+            this.showPopup(cellAddress, true);
+            return;
+        }
+    }
+    getOpenCellAddress() {
+        return SystemRedux.SystemCommentsAndNotesSelector(this.getAdaptableState().System);
+    }
+    getEditMode() {
+        return SystemRedux.SystemCommentsAndNotesEditModeSelector(this.getAdaptableState().System);
+    }
+    hidePopup() {
+        this.dispatchAction(SystemRedux.SystemCellPopupHide());
+    }
+    showPopup(cellAddress, editMode) {
+        this.dispatchAction(SystemRedux.SystemCellPopupShow(cellAddress, editMode));
+    }
+    editFocusedEntity(entity) {
+        this.dispatchAction(SystemRedux.SystemCellPopupEditFocusedEntity(entity));
+    }
+    getNotePopupEditMode() {
+        return SystemRedux.SystemCommentsAndNotesEditModeSelector(this.getAdaptableState().System);
+    }
+}
+exports.CellPopupService = CellPopupService;

package/src/Utilities/Services/Interface/IReportService.d.ts

@@ -17,7 +17,7 @@ export interface IReportService extends IAdaptableService {
     GetReportColumnScopeShortDescription(report: Report): string[];
     GetReportColumnScopeLongDescription(report: Report): string;
     GetReportExpressionDescription(Report: Report, cols: AdaptableColumn[]): string;
-    PublishLiveLiveDataChangedEvent(reportDestination: 'OpenFin' | 'ipushpull' | 'Glue42', liveDataChangedTrigger: 'Connected' | 'Disconnected' | 'SnapshotSent' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated', liveReport?: any): void;
+    PublishLiveLiveDataChangedEvent(reportDestination: 'OpenFin' | 'ipushpull', liveDataChangedTrigger: 'Connected' | 'Disconnected' | 'SnapshotSent' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated', liveReport?: any): void;
     getReportDataColumns(report: Report, includePrimaryKey?: boolean): AdaptableColumnBase[];
     getReportDataRows(report: Report, columns: AdaptableColumnBase[], includePrimaryKey?: boolean): Record<string, any>[];
     getReportData(report: Report, includePrimaryKey?: boolean): ReportData;

package/src/Utilities/Services/Interface/IThemeService.d.ts

@@ -1,3 +1,11 @@
+import { AdaptableTheme } from '../../../types';
 import { IAdaptableService } from './IAdaptableService';
 export interface IThemeService extends IAdaptableService {
+    getDOMPrefferedColorScheme(): 'dark' | 'light';
+    /**
+     * Maps the theme to the correct theme object or string
+     * This is used to apply the correct theme when the theme is OS
+     * @param theme
+     */
+    mapOsTheme(theme: AdaptableTheme | string): AdaptableTheme | string;
 }

package/src/Utilities/Services/ModuleService.js

@@ -106,7 +106,7 @@ class ModuleService {
             case 'ColumnFilter':
                 return learnUrl + 'handbook-column-filter';
             case 'GridFilter':
-                return learnUrl + 'handbook-column-filter';
+                return learnUrl + 'handbook-grid-filter';
             case 'FlashingCell':
                 return learnUrl + 'handbook-flashing-cell';
             case 'FormatColumn':
@@ -141,8 +141,6 @@ class ModuleService {
                 return learnUrl + 'handbook-theming';
             case 'ToolPanel':
                 return learnUrl + 'ui-tool-panel';
-            case 'Glue42':
-                return learnUrl + 'integrations-glue42';
             case 'IPushPull':
                 return learnUrl + 'integrations-ipushpull';
             case 'OpenFin':

package/src/Utilities/Services/ReportService.d.ts

@@ -29,7 +29,7 @@ export declare class ReportService implements IReportService {
     getReportDataAsArray(report: Report, includePrimaryKey?: boolean): any[][];
     convertReportDataToArray(reportData: ReportData): any[][];
     getRowObjectForColumnIds(rowNode: IRowNode, columnIds: string[]): Record<string, any>;
-    PublishLiveLiveDataChangedEvent(reportDestination: 'ipushpull' | 'Glue42', liveDataTrigger: 'Connected' | 'Disconnected' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated', liveReport?: any): void;
+    PublishLiveLiveDataChangedEvent(reportDestination: 'ipushpull', liveDataTrigger: 'Connected' | 'Disconnected' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated', liveReport?: any): void;
     getCellExportValueFromRowNode(rowNode: IRowNode, columnId: string): any;
     getCellExportValueFromRawValue(rowNode: IRowNode, cellRawValue: any, columnId: string): any;
     getReportFileName(reportName: string, destination: SystemExportDestination | CustomDestination): string;

package/src/Utilities/Services/ThemeService.d.ts

@@ -10,4 +10,7 @@ export declare class ThemeService implements IThemeService {
     applyNewThemeVariables(theme: AdaptableTheme): void;
     destroy(): void;
     showMissingThemeFiles(theme: AdaptableTheme): void;
+    getDOMPrefferedColorScheme(): 'dark' | 'light';
+    mapOsTheme(theme: AdaptableTheme | string): AdaptableTheme;
+    attachPrefferedColorSchemeListener(): () => void;
 }

package/src/Utilities/Services/ThemeService.js

@@ -6,7 +6,8 @@ class ThemeService {
         var _a;
         this.unsubscribe = () => { };
         this.onThemeChanged = () => {
-            const currentTheme = this.api.themeApi.getCurrentThemeObject();
+            let currentTheme = this.api.themeApi.getCurrentThemeObject();
+            currentTheme = this.mapOsTheme(currentTheme);
             this.applyNewThemeVariables(currentTheme);
             // this needs to be called after variables are set
             // as it may show the warning for a custom/runtime theme
@@ -26,9 +27,11 @@ class ThemeService {
     subscribe() {
         const themeChangedUnsubscribe = this.api.eventApi.on('ThemeChanged', this.onThemeChanged);
         const themeEditedUnsubscribe = this.api.eventApi.on('ThemeEdited', this.onThemeChanged);
+        const prefferedColorSchemeUnsubscribe = this.attachPrefferedColorSchemeListener();
         this.unsubscribe = () => {
             themeChangedUnsubscribe();
             themeEditedUnsubscribe();
+            prefferedColorSchemeUnsubscribe();
         };
     }
     applyNewThemeVariables(theme) {
@@ -82,5 +85,34 @@ If it's a default theme, try
 import "@adaptabletools/adaptable/themes/${themeName}.css"`);
         }
     }
+    // prefers-color-scheme
+    getDOMPrefferedColorScheme() {
+        return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+    }
+    mapOsTheme(theme) {
+        theme = typeof theme === 'string' ? this.api.themeApi.getThemeByName(theme) : theme;
+        if ((typeof theme === 'string' && theme === 'os') ||
+            (typeof theme === 'object' && theme.Name === 'os')) {
+            return this.api.themeApi.getThemeByName(this.getDOMPrefferedColorScheme());
+        }
+        return theme;
+    }
+    attachPrefferedColorSchemeListener() {
+        const handlePrefferedColorSchemeChange = () => {
+            // we need to reapply the theme
+            const currentTheme = this.api.themeApi.getCurrentThemeObject();
+            if (currentTheme.Name === 'os') {
+                this.api.themeApi.applyCurrentTheme();
+            }
+        };
+        window
+            .matchMedia('(prefers-color-scheme: dark)')
+            .addEventListener('change', handlePrefferedColorSchemeChange);
+        return () => {
+            window
+                .matchMedia('(prefers-color-scheme: dark)')
+                .removeEventListener('change', handlePrefferedColorSchemeChange);
+        };
+    }
 }
 exports.ThemeService = ThemeService;

package/src/Utilities/Services/ValidationService.js

@@ -99,29 +99,29 @@ class ValidationService {
                 .validateOnServer(serverValidationContext)
                 .then((validationResult) => {
                 var _a, _b;
-                if (validationResult.NewValue === undefined) {
-                    validationResult.NewValue = cellDataChangedInfo.newValue;
+                if (validationResult.newCellValue === undefined) {
+                    validationResult.newCellValue = cellDataChangedInfo.newValue;
                 }
                 // If they have changed the return value then we should update the grid, log the function change
                 // otherwise the value will persist
-                if (validationResult.NewValue !== cellDataChangedInfo.newValue) {
-                    cellDataChangedInfo.newValue = validationResult.NewValue;
+                if (validationResult.newCellValue !== cellDataChangedInfo.newValue) {
+                    cellDataChangedInfo.newValue = validationResult.newCellValue;
                     // this.adaptable.setValue(cellDataChangedInfo, false);
                     const row = (_a = cellDataChangedInfo.rowNode) === null || _a === void 0 ? void 0 : _a.data;
                     if (!row) {
                         return;
                     }
-                    row[(_b = this.adaptableApi.columnApi.internalApi.getAgGridColumnFieldForAdaptableColumn(cellDataChangedInfo.column.columnId)) !== null && _b !== void 0 ? _b : cellDataChangedInfo.column.columnId] = validationResult.NewValue;
+                    row[(_b = this.adaptableApi.columnApi.internalApi.getAgGridColumnFieldForAdaptableColumn(cellDataChangedInfo.column.columnId)) !== null && _b !== void 0 ? _b : cellDataChangedInfo.column.columnId] = validationResult.newCellValue;
                     this.adaptableApi.gridApi.updateGridData([row]);
-                    if (StringExtensions_1.default.IsNotNullOrEmpty(validationResult.ValidationMessage) &&
+                    if (StringExtensions_1.default.IsNotNullOrEmpty(validationResult.validationMessage) &&
                         this.adaptableApi.optionsApi.getEditOptions().displayServerValidationMessages) {
-                        const validationHeader = validationResult.ValidationHeader
-                            ? validationResult.ValidationHeader
+                        const validationHeader = validationResult.validationHeader
+                            ? validationResult.validationHeader
                             : GeneralConstants_1.SERVER_VALIDATION_HEADER;
-                        const messageType = validationResult.MessageType
-                            ? validationResult.MessageType
+                        const messageType = validationResult.messageType
+                            ? validationResult.messageType
                             : GeneralConstants_1.SERVER_VALIDATION_MESSAGE_TYPE;
-                        this.adaptableApi.alertApi.showAlert(validationHeader, validationResult.ValidationMessage, messageType);
+                        this.adaptableApi.alertApi.showAlert(validationHeader, validationResult.validationMessage, messageType);
                     }
                 }
                 config.onServerValidationCompleted();

package/src/View/AdaptableView.js

@@ -12,10 +12,10 @@ const AdaptablePopup_1 = require("./Components/Popups/AdaptablePopup");
 const AdaptablePopupConfirmation_1 = require("./Components/Popups/AdaptablePopupConfirmation");
 const AdaptablePopupPrompt_1 = require("./Components/Popups/AdaptablePopupPrompt");
 const FormPopups_1 = require("./Components/Popups/FormPopups/FormPopups");
+const GridCellPopup_1 = require("./Components/Popups/GridCellPopup");
 const WindowPopups_1 = require("./Components/Popups/WindowPopups/WindowPopups");
 const Dashboard_1 = require("./Dashboard/Dashboard");
 const License_1 = require("./License");
-const NotesPopup_1 = require("./Notes/NotesPopup");
 const FloatingQuickSearch_1 = require("./QuickSearch/FloatingQuickSearch/FloatingQuickSearch");
 const renderWithAdaptableContext_1 = require("./renderWithAdaptableContext");
 class AdaptableView extends React.Component {
@@ -24,7 +24,7 @@ class AdaptableView extends React.Component {
         const watermark = (_d = (_c = (_b = (_a = this.props.AdaptableApi) === null || _a === void 0 ? void 0 : _a.internalApi) === null || _b === void 0 ? void 0 : _b.getSystemState()) === null || _c === void 0 ? void 0 : _c.License) === null || _d === void 0 ? void 0 : _d.watermark;
         const adaptableOptions = this.props.AdaptableApi.optionsApi.getAdaptableOptions();
         return (React.createElement("div", null,
-            React.createElement(NotesPopup_1.NotePopup, null),
+            React.createElement(GridCellPopup_1.GridCellPopup, null),
             React.createElement(FloatingQuickSearch_1.QuickSearchDrawer, null),
             this.props.AdaptableApi.internalApi.getModuleService().isModuleAvailable('Dashboard') && (React.createElement(Dashboard_1.Dashboard, { api: this.props.AdaptableApi })),
             this.props.AdaptableApi.optionsApi.getUserInterfaceOptions().showLoadingScreen && (React.createElement(AdaptableLoadingScreen_1.AdaptableLoadingScreen, { onClose: this.props.onCloseLoadingPopup, showLoadingScreen: this.props.PopupState.LoadingPopup.ShowLoadingPopup })),
@@ -37,7 +37,7 @@ class AdaptableView extends React.Component {
             , { 
                 // we NEEEEED!!!! this containerId, otherwise, toastify will have memory leaks when the adaptable
                 // instance is destroyed and re-created many times
-                containerId: adaptableOptions.adaptableId, enableMultiContainer: true, limit: adaptableOptions.notificationsOptions.maxNotifications, closeButton: false, icon: false, theme: "colored" }),
+                containerId: adaptableOptions.adaptableId, limit: adaptableOptions.notificationsOptions.maxNotifications, closeButton: false, icon: false, theme: "colored" }),
             (watermark === null || watermark === void 0 ? void 0 : watermark.show) && React.createElement(License_1.LicenseWatermark, null, watermark === null || watermark === void 0 ? void 0 : watermark.text),
             React.createElement(WindowPopups_1.WindowPopups, null),
             React.createElement(FormPopups_1.FormPopups, null),

package/src/View/AdaptableViewFactory.js

@@ -33,7 +33,8 @@ const StatusBarPopup_1 = require("./StatusBar/StatusBarPopup");
 const ChartingViewPanel_1 = require("./Charting/ChartingViewPanel");
 const GridFilterPopup_1 = require("./GridFilter/GridFilterPopup");
 const ColumnInfoPopup_1 = require("./ColumnInfo/ColumnInfoPopup");
-const NotesListing_1 = require("./Notes/NotesListing");
+const NotesPopup_1 = require("./Notes/NotesPopup");
+const CommentsPopup_1 = require("./Comments/CommentsPopup");
 const DataImportPopup_1 = require("./DataImport/DataImportPopup");
 exports.AdaptableViewFactory = {
     BulkUpdatePopup: BulkUpdatePopup_1.BulkUpdatePopup,
@@ -49,7 +50,8 @@ exports.AdaptableViewFactory = {
     ToolPanelPopup: ToolPanelPopup_1.ToolPanelPopup,
     SystemStatusPopup: SystemStatusPopup_1.SystemStatusPopup,
     DataChangeHistoryPopup: DataChangeHistoryPopup_1.DataChangeHistoryPopup,
-    NotesPopup: NotesListing_1.NotesListing,
+    NotesPopup: NotesPopup_1.NotesPopup,
+    CommentsPopup: CommentsPopup_1.CommentsPopup,
     DataImportPopup: DataImportPopup_1.DataImportPopup,
     GridFilterPopup: GridFilterPopup_1.GridFilterPopup,
 };