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

package/src/View/Notes/NotesPopup.js

@@ -1,65 +1,88 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NotePopup = void 0;
+exports.NotesPopup = void 0;
 const tslib_1 = require("tslib");
-const lodash_1 = require("lodash");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
-const rebass_1 = require("rebass");
-const Textarea_1 = tslib_1.__importDefault(require("../../components/Textarea"));
+const InfiniteTable_1 = require("../../components/InfiniteTable");
 const NotesRedux_1 = require("../../Redux/ActionsReducers/NotesRedux");
-const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const AdaptableContext_1 = require("../AdaptableContext");
-const CellPopup_1 = require("../Components/CellPopup");
-const NoteEditor = ({ note, onNoteChange, onClose, editMode, isReadonly }) => {
-    const textAreaRef = React.useRef(null);
-    const [liveValue, setLiveValue] = React.useState(note || '');
-    const throttledOnChange = React.useMemo(() => {
-        const throttled = (0, lodash_1.throttle)((value) => onNoteChange(value), 300);
-        return (value) => {
-            setLiveValue(value);
-            throttled(value);
+const AdaptableButton_1 = require("../Components/AdaptableButton");
+const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
+const tableDOMProps = {
+    style: {
+        height: '100%',
+        minWidth: '10rem',
+        // minHeight: 600,
+    },
+};
+const NotesPopup = (props) => {
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const primaryKeyHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId);
+    const allNotes = (0, react_redux_1.useSelector)((state) => (0, NotesRedux_1.GetNotesSelector)(state.Notes));
+    const columnsMap = React.useMemo(() => {
+        const columns = {
+            primaryKey: {
+                field: 'PrimaryKeyValue',
+                header: primaryKeyHeader,
+            },
+            column: {
+                field: 'ColumnId',
+                valueGetter: (params) => {
+                    return adaptable.api.columnApi.getFriendlyNameForColumnId(params.data.ColumnId);
+                },
+            },
+            note: {
+                field: 'Value',
+                header: 'Note',
+                defaultEditable: true,
+                defaultFlex: 3,
+            },
+            timestamp: {
+                field: 'Timestamp',
+                valueGetter: (params) => {
+                    return new Date(params.data.Timestamp).toDateString();
+                },
+            },
+            author: {
+                header: 'Author',
+                valueGetter: (params) => params.data.Author.UserName,
+            },
+            delete: {
+                defaultWidth: 50,
+                render: (params) => {
+                    return (React.createElement(AdaptableButton_1.AdaptableButtonComponent, { variant: "text", icon: "delete", onClick: () => {
+                            const note = adaptable.api.notesApi.getNoteByUuid(params.data.Uuid);
+                            adaptable.api.notesApi.deleteNote(note);
+                        } }));
+                },
+            },
         };
+        return columns;
     }, []);
-    React.useEffect(() => {
-        var _a;
-        if (editMode) {
-            (_a = textAreaRef.current) === null || _a === void 0 ? void 0 : _a.focus();
-        }
-    }, [editMode]);
-    return (React.createElement(Textarea_1.default, { readOnly: isReadonly, ref: textAreaRef, width: "100%", minWidth: 180, minHeight: 120, value: liveValue, onBlur: () => onClose(), onKeyDown: (event) => {
-            if (event.key === 'Escape') {
-                onClose();
-            }
-        }, onChange: (event) => throttledOnChange(event.target.value) }));
-};
-const NotePopup = () => {
-    var _a;
-    const { api } = (0, AdaptableContext_1.useAdaptable)();
-    const cellPopupRef = React.useRef(null);
-    const editMode = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemNotesEditModeSelector)(state.System));
-    const noteGridCell = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemNotesSelector)(state.System));
-    const [
-    // Only handle first note for now
-    // Later we can handle multiple notes
-    note,] = (0, react_redux_1.useSelector)((state) => {
-        return noteGridCell ? (0, NotesRedux_1.GetNotesSelector)(state.Notes, noteGridCell) : [];
-    });
-    const handleNoteChange = (value) => {
-        api.notesApi.updateNoteText(value, note);
-    };
-    const isReadonly = api.entitlementApi.isModuleReadOnlyEntitlement('Notes');
-    const enableEditMode = () => {
-        if (!editMode) {
-            api.notesApi.showNotes(noteGridCell, true);
-            cellPopupRef === null || cellPopupRef === void 0 ? void 0 : cellPopupRef.current.refreshContent();
-        }
-    };
-    if (!noteGridCell) {
-        return React.createElement(React.Fragment, null);
-    }
-    return (React.createElement(CellPopup_1.CellPopup, { ref: cellPopupRef, key: `${noteGridCell.PrimaryKeyValue}-${noteGridCell.ColumnId}`, isOpen: true, primaryKeyValue: noteGridCell.PrimaryKeyValue, columnId: noteGridCell.ColumnId },
-        React.createElement(rebass_1.Flex, { onClick: () => enableEditMode(), flexDirection: "column", className: "ab-NotesPopup" },
-            React.createElement(NoteEditor, { isReadonly: isReadonly, editMode: editMode, key: note === null || note === void 0 ? void 0 : note.Uuid, onClose: () => api.notesApi.hideNote(), note: (_a = note === null || note === void 0 ? void 0 : note.Value) !== null && _a !== void 0 ? _a : '', onNoteChange: (value) => handleNoteChange(value) }))));
+    return (React.createElement(PopupPanel_1.PopupPanel, { headerText: 'Notes', glyphicon: 'import', infoLink: props.moduleInfo.HelpPage },
+        React.createElement(InfiniteTable_1.DataSource, { data: allNotes, primaryKey: "Uuid", onDataMutations: (params) => {
+                for (const mutation of params.mutations) {
+                    const [uuid, changes] = mutation;
+                    for (const change of changes) {
+                        if (change.type === 'update') {
+                            const data = change.data;
+                            const prevNote = allNotes.find((x) => x.Uuid === uuid);
+                            if (prevNote.Value !== data.Value) {
+                                adaptable.api.notesApi.updateNoteText(data.Value, prevNote);
+                            }
+                        }
+                    }
+                }
+            } },
+            React.createElement(InfiniteTable_1.InfiniteTable, { columnTypes: {
+                    default: {
+                        align: 'start',
+                        defaultFlex: 1,
+                        defaultSortable: false,
+                    },
+                }, headerOptions: {
+                    alwaysReserveSpaceForSortIcon: false,
+                }, rowHeight: 40, columnHeaderHeight: 65, domProps: tableDOMProps, columns: columnsMap }))));
 };
-exports.NotePopup = NotePopup;
+exports.NotesPopup = NotesPopup;

package/src/View/PlusMinus/MovePlusMinus.d.ts

@@ -0,0 +1,7 @@
+import * as React from 'react';
+import { AccessLevel, PlusMinusNudge } from '../../types';
+export declare const MovePlusMinus: React.FunctionComponent<{
+    data: PlusMinusNudge;
+    id?: string;
+    accessLevel: AccessLevel;
+}>;

package/src/View/PlusMinus/MovePlusMinus.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MovePlusMinus = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const PlusMinusRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PlusMinusRedux"));
+const react_redux_1 = require("react-redux");
+const AdaptableContext_1 = require("../AdaptableContext");
+const MovePlusMinus = (props) => {
+    const dispatch = (0, react_redux_1.useDispatch)();
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const plusMinusNudges = (0, react_redux_1.useSelector)((state) => state.PlusMinus.PlusMinusNudges);
+    const handleMoveUp = React.useCallback(() => {
+        dispatch(PlusMinusRedux.PlusMinusMoveUp(props.data));
+    }, []);
+    const handleMoveDown = React.useCallback(() => {
+        dispatch(PlusMinusRedux.PlusMinusMoveDown(props.data));
+    }, []);
+    if ((plusMinusNudges === null || plusMinusNudges === void 0 ? void 0 : plusMinusNudges.length) <= 1) {
+        return React.createElement(React.Fragment, null);
+    }
+    return (React.createElement(React.Fragment, null,
+        React.createElement(SimpleButton_1.default, { "data-id": "move-up", title: "move up", onClick: handleMoveUp, variant: "text", icon: "arrow-up" }),
+        React.createElement(SimpleButton_1.default, { "data-name": "move-down", title: "move down", onClick: handleMoveDown, variant: "text", icon: "arrow-down" })));
+};
+exports.MovePlusMinus = MovePlusMinus;

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsSummary.js

@@ -66,15 +66,6 @@ const getScheduleSettingsValues = (data) => {
             },
         ];
     }
-    if (data.ScheduleType === Enums_1.ScheduleType.Glue42) {
-        const report = data;
-        return [
-            {
-                label: 'Report',
-                value: (report === null || report === void 0 ? void 0 : report.Glue42Report.ReportName) || 'Not Specified',
-            },
-        ];
-    }
     if (data.ScheduleType === Enums_1.ScheduleType.OpenFin) {
         const report = data;
         return [

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsWizard.js

@@ -9,7 +9,6 @@ const ScheduleSettingsReminder_1 = require("./ScheduleSettingsReminder");
 const ScheduleSettingsReport_1 = require("./ScheduleSettingsReport");
 const ScheduleSettingsIPushPull_1 = require("./ScheduleSettingsIPushPull");
 const ScheduleSettingsOpenFin_1 = require("./ScheduleSettingsOpenFin");
-const ScheduleSettingsGlue42_1 = require("./ScheduleSettingsGlue42");
 const ScheduleSettingsWizard = (props) => {
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const allReports = api.exportApi.getReports();
@@ -30,9 +29,6 @@ const ScheduleSettingsWizard = (props) => {
     if ((data === null || data === void 0 ? void 0 : data.ScheduleType) === Enums_1.ScheduleType.OpenFin) {
         return (React.createElement(ScheduleSettingsOpenFin_1.ScheduleSettingsOpenFin, { allReports: allReports || [], openFin: data, onChange: props.onChange }));
     }
-    if ((data === null || data === void 0 ? void 0 : data.ScheduleType) === Enums_1.ScheduleType.Glue42) {
-        return (React.createElement(ScheduleSettingsGlue42_1.ScheduleSettingsGlue42, { allReports: allReports || [], glue42: data, onChange: props.onChange }));
-    }
     return React.createElement(React.Fragment, null);
 };
 exports.ScheduleSettingsWizard = ScheduleSettingsWizard;

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/isSettingsValid.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const Enums_1 = require("../../../../PredefinedConfig/Common/Enums");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../../Utilities/Extensions/StringExtensions"));
 const isSettingsValid = (schedule) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     if (schedule.ScheduleType === Enums_1.ScheduleType.Reminder) {
         const reminder = schedule;
         if (!reminder.MessageType) {
@@ -39,15 +39,9 @@ const isSettingsValid = (schedule) => {
             return 'Report page not selected';
         }
     }
-    if (schedule.ScheduleType === Enums_1.ScheduleType.Glue42) {
-        const glue43 = schedule;
-        if (StringExtensions_1.default.IsNullOrEmpty((_d = glue43 === null || glue43 === void 0 ? void 0 : glue43.Glue42Report) === null || _d === void 0 ? void 0 : _d.ReportName)) {
-            return 'Report not selected';
-        }
-    }
     if (schedule.ScheduleType === Enums_1.ScheduleType.OpenFin) {
         const openfin = schedule;
-        if (StringExtensions_1.default.IsNullOrEmpty((_e = openfin === null || openfin === void 0 ? void 0 : openfin.OpenFinReport) === null || _e === void 0 ? void 0 : _e.ReportName)) {
+        if (StringExtensions_1.default.IsNullOrEmpty((_d = openfin === null || openfin === void 0 ? void 0 : openfin.OpenFinReport) === null || _d === void 0 ? void 0 : _d.ReportName)) {
             return 'Report not selected';
         }
     }

package/src/View/Schedule/Wizard/ScheduleWizard.js

@@ -33,9 +33,6 @@ const ScheduleWizard = (props) => {
             case Enums_1.ScheduleType.ipushpull:
                 scheduleState = ObjectFactory_1.default.CreateEmptyIPushPullSchedule();
                 break;
-            case Enums_1.ScheduleType.Glue42:
-                scheduleState = ObjectFactory_1.default.CreateEmptyGlue42Schedule();
-                break;
             case Enums_1.ScheduleType.OpenFin:
                 scheduleState = ObjectFactory_1.default.CreateEmptyOpenFinSchedule();
                 break;
@@ -57,8 +54,6 @@ const ScheduleWizard = (props) => {
                 case Enums_1.ScheduleType.ipushpull:
                     action = ScheduleRedux.IPushPullScheduleEdit(schedule);
                     break;
-                case Enums_1.ScheduleType.Glue42:
-                    action = ScheduleRedux.Glue42ScheduleEdit(schedule);
                     break;
                 case Enums_1.ScheduleType.OpenFin:
                     action = ScheduleRedux.OpenFinScheduleEdit(schedule);
@@ -76,9 +71,6 @@ const ScheduleWizard = (props) => {
                 case Enums_1.ScheduleType.ipushpull:
                     action = ScheduleRedux.IPushPullScheduleAdd(schedule);
                     break;
-                case Enums_1.ScheduleType.Glue42:
-                    action = ScheduleRedux.Glue42ScheduleAdd(schedule);
-                    break;
                 case Enums_1.ScheduleType.OpenFin:
                     action = ScheduleRedux.OpenFinScheduleAdd(schedule);
                     break;

package/src/View/StyledColumn/Wizard/StyledColumnBadgeSection.js

@@ -27,7 +27,9 @@ const BadgeEditor = (props) => {
     // badges evaluate predicate per value
     const predicateDefs = api.styledColumnApi.internalApi.getBadgePredicateDefsForColumn(columnId);
     const dataType = api.columnApi.getColumnDataTypeForColumnId(columnId);
-    const previewValue = dataType === 'Number' || dataType == 'NumberArray' ? GeneralConstants_1.DEFAULT_INTEGER_DISPLAY_VALUE : GeneralConstants_1.DEFAULT_STRING_DISPLAY_VALUE;
+    const previewValue = dataType === 'Number' || dataType == 'NumberArray'
+        ? GeneralConstants_1.DEFAULT_INTEGER_DISPLAY_VALUE
+        : GeneralConstants_1.DEFAULT_STRING_DISPLAY_VALUE;
     return (React.createElement(
         rebass_1.Flex,
         { className: "ab-Badge-Definition-Editor", mb: 15, p: 3 },

package/src/View/StyledColumn/Wizard/StyledColumnWizard.js

@@ -72,8 +72,7 @@ const StyledColumnWizard = (props) => {
                 React.createElement(StyledColumnSparklineSettingsSection_1.StyledColumnSparklineSettingsSection, { onChange: setStyledColumn }))),
         });
     }
-    else if (styledColumn.GradientStyle ||
-        styledColumn.PercentBarStyle) {
+    else if (styledColumn.GradientStyle || styledColumn.PercentBarStyle) {
         specificSteps.push({
             details: 'Create the Style to apply',
             renderSummary: StyledColumnWizardStyleSection_1.renderStyledColumnStyleSummary,

package/src/agGrid/Adaptable.d.ts

@@ -40,8 +40,12 @@ import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService
 import { RenderReactRootFn } from '../renderReactRoot';
 import { AdaptableLogger } from './AdaptableLogger';
 import { Fdc3Service } from '../Utilities/Services/Fdc3Service';
+import { CellPopupService } from '../Utilities/Services/CellPopupService';
 type RuntimeConfig = {
     waitForAgGrid?: boolean;
+    /**
+     * @deprecated
+     */
     renderReactRoot?: RenderReactRootFn;
     variant?: AdaptableVariant;
     gridOptions: AgGridConfig['gridOptions'];
@@ -66,6 +70,7 @@ export declare class Adaptable implements IAdaptable {
     MetamodelService: IMetamodelService;
     RowEditService: IRowEditService;
     Fdc3Service: Fdc3Service;
+    CellPopupService: CellPopupService;
     private LicenseService;
     private ChartingService;
     private ThemeService;
@@ -185,6 +190,7 @@ export declare class Adaptable implements IAdaptable {
     private getAlertRowStyle;
     private getFlashingCellStyle;
     private getNoteCellClassName;
+    private getCommentCellClassName;
     private getFlashingCellClass;
     private getCellHighlightStyle;
     private getRowHighlightStyle;
@@ -362,6 +368,7 @@ export declare class Adaptable implements IAdaptable {
     closeAllRowGroups(): void;
     expandRowGroupsForValues(columnValues: any[]): void;
     getAgGridColumnForColumnId(columnId: string): Column;
+    getAgGridAllGridColumns(): Column<any>[];
     setRowGroupColumns(columnIds: string[]): void;
     clearRowGroupColumns(): void;
     getExpandRowGroupsKeys(): any[];

package/src/agGrid/Adaptable.js

@@ -51,7 +51,6 @@ const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
 const AdaptableNumberEditor_1 = require("./editors/AdaptableNumberEditor");
 const AdaptableDateEditor_1 = require("./editors/AdaptableDateEditor");
 const waitForCondition_1 = require("../Utilities/waitForCondition");
-const package_json_1 = require("../../package.json");
 const MetamodelService_1 = require("../Utilities/Services/MetamodelService");
 const DocumentationLinkConstants_1 = require("../Utilities/Constants/DocumentationLinkConstants");
 const DateHelper_1 = require("../Utilities/Helpers/DateHelper");
@@ -68,7 +67,10 @@ const AdaptableLogger_1 = require("./AdaptableLogger");
 const attachAddaptableColumnTypes_1 = require("./attachAddaptableColumnTypes");
 const FormatHelper_1 = require("../Utilities/Helpers/FormatHelper");
 const Fdc3Service_1 = require("../Utilities/Services/Fdc3Service");
+const CellPopupService_1 = require("../Utilities/Services/CellPopupService");
 const tinycolor2_1 = tslib_1.__importDefault(require("tinycolor2"));
+const env_1 = tslib_1.__importDefault(require("../env"));
+const publishTimestamp = Number(env_1.default.PUBLISH_TIMESTAMP);
 const GROUP_PATH_SEPARATOR = '/';
 // IMPORTANT - we need colId to be set in order for safeSetColDefs to work correctly
 const assignColId = (colDef, logger) => {
@@ -361,24 +363,6 @@ class Adaptable {
     async init(adaptableOptions, runtimeConfig, _staticInit) {
         this.logger = new AdaptableLogger_1.AdaptableLogger(adaptableOptions.adaptableId || String(Date.now()));
         const perfAdaptableInit = this.logger.beginPerf(`Adaptable init()`);
-        if (runtimeConfig.renderReactRoot) {
-            this.renderReactRoot = (el, container) => {
-                const unmount = runtimeConfig.renderReactRoot(el, container);
-                return () => {
-                    // we used to capture here because of FloatingFilters/Filters - see FloatingFilterWrapper and FilterWrapper
-                    // as we didn't have a native React implementation for our React wrapper
-                    // but we might need to do this again in the future for some other components that are not native React
-                    // captureReactWarnings();
-                    if (typeof unmount === 'function') {
-                        // rAF is required, otherwise the unmount would be performed during the rendering phase and React doesn't like that
-                        requestAnimationFrame(() => {
-                            unmount();
-                        });
-                    }
-                    // releaseReactWarnings();
-                };
-            };
-        }
         if (runtimeConfig.variant) {
             this.variant = runtimeConfig.variant;
         }
@@ -447,6 +431,7 @@ class Adaptable {
         this.AlertService = new AlertService_1.AlertService(this.api);
         this.TeamSharingService = new TeamSharingService_1.TeamSharingService(this.api);
         this.Fdc3Service = new Fdc3Service_1.Fdc3Service(this.api);
+        this.CellPopupService = new CellPopupService_1.CellPopupService(this.api);
         // @ts-ignore
         this.RowEditService = new RowEditService_1.RowEditService(this.api);
         this.MetamodelService = new MetamodelService_1.MetamodelService(() => this.api.optionsApi.getAdaptableOptions());
@@ -1167,6 +1152,20 @@ class Adaptable {
         }
         return 'ab-Cell-Note';
     }
+    getCommentCellClassName(gridCell, params) {
+        if (!this.api.internalApi.getModuleService().isModuleAvailable('Comments')) {
+            return;
+        }
+        const position = {
+            PrimaryKeyValue: gridCell.primaryKeyValue,
+            ColumnId: gridCell.column.columnId,
+        };
+        const cellComments = this.api.commentApi.getCommentThread(position);
+        if (!cellComments) {
+            return undefined;
+        }
+        return 'ab-Cell-Comment';
+    }
     getFlashingCellClass(gridcell, params) {
         var _a, _b, _c;
         const primaryKey = params.node.aggData ? params.node.id : gridcell.primaryKeyValue;
@@ -1802,7 +1801,7 @@ class Adaptable {
         };
         this.api.gridApi.internalApi.setSelectedCells(selectedCellInfo);
         this._emit('CellsSelected');
-        this.agGridHelper.fireSelectionChangedEvent();
+        this.agGridHelper.fireCellSelectionChangedEvent();
         return selectedCellInfo;
     }
     setSelectedRows() {
@@ -1836,7 +1835,7 @@ class Adaptable {
         }
         const selectedRowInfo = { gridRows: selectedRows };
         this.api.gridApi.internalApi.setSelectedRows(selectedRowInfo);
-        this.agGridHelper.fireSelectionChangedEvent();
+        this.agGridHelper.fireRowSelectionChangedEvent();
         return selectedRowInfo;
     }
     setDataValue(value, column, primaryKeyValue, rowNode) {
@@ -2678,6 +2677,18 @@ class Adaptable {
                 columnTypes.push(...calculatedColumnSettings.ColumnTypes);
             }
             const isExternalEvaluation = !this.api.expressionApi.internalApi.evaluateExpressionInAdaptableQL('CalculatedColumn', calculatedColumn, this.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query));
+            const valueGetter = (params) => {
+                var _a, _b;
+                if (isExternalEvaluation) {
+                    return (_a = params.data) === null || _a === void 0 ? void 0 : _a[calculatedColumn.ColumnId];
+                }
+                // if the grid data is NOT client side, we can aggregate only simple scalar expression (which depend on row data, not on other rows)
+                if (this.api.gridApi.getAgGridRowModelType() !== 'clientSide' &&
+                    StringExtensions_1.StringExtensions.IsNotNullOrEmpty(calculatedColumn.Query.AggregatedScalarExpression)) {
+                    return (_b = params.data) === null || _b === void 0 ? void 0 : _b[calculatedColumn.ColumnId];
+                }
+                return this.CalculatedColumnExpressionService.evaluateCalculatedColumnQuery(calculatedColumn, params.node);
+            };
             const newColDef = {
                 headerName: calculatedColumn.FriendlyName
                     ? calculatedColumn.FriendlyName
@@ -2696,13 +2707,7 @@ class Adaptable {
                 suppressMenu: calculatedColumnSettings.SuppressMenu,
                 suppressMovable: calculatedColumnSettings.SuppressMovable,
                 type: columnTypes,
-                valueGetter: (params) => {
-                    var _a;
-                    if (isExternalEvaluation) {
-                        return (_a = params.data) === null || _a === void 0 ? void 0 : _a[calculatedColumn.ColumnId];
-                    }
-                    return this.CalculatedColumnExpressionService.evaluateCalculatedColumnQuery(calculatedColumn, params.node);
-                },
+                valueGetter,
             };
             if (calculatedColumnSettings.ShowToolTip != null &&
                 calculatedColumnSettings.ShowToolTip == true) {
@@ -3481,6 +3486,7 @@ class Adaptable {
                 const styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(colId);
                 const hasStyledColumn = !!styledColumn && !styledColumn.IsSuspended;
                 const noteClassName = this.getNoteCellClassName(gridCell, params);
+                const commentsClassName = this.getCommentCellClassName(gridCell, params);
                 const returnValue = [
                     typeof userCellClass === 'function' ? userCellClass(params) : userCellClass,
                     !hasStyledColumn && formatColumns.length
@@ -3492,6 +3498,7 @@ class Adaptable {
                     highlightAlertClassName,
                     flashingClassName,
                     noteClassName,
+                    commentsClassName,
                 ]
                     // we flatten the array because some rules ('userCellClass' etc)  might return a string[]
                     .flat()
@@ -3637,20 +3644,23 @@ class Adaptable {
                     return userPropertyValue(params);
                 }
                 const value = params.value;
-                const unbalancedGroupsKey = (_a = adaptableOptions.groupingOptions) === null || _a === void 0 ? void 0 : _a.unbalancedGroupsKey;
-                if (!unbalancedGroupsKey) {
+                if (this.gridOptions.groupAllowUnbalanced) {
                     return value;
                 }
-                let groupUnbalancedGroupsUnderKeyValue = typeof unbalancedGroupsKey === 'function'
-                    ? unbalancedGroupsKey({
+                const balancedGroupsKey = (_a = adaptableOptions.groupingOptions) === null || _a === void 0 ? void 0 : _a.balancedGroupsKey;
+                if (!balancedGroupsKey) {
+                    return value;
+                }
+                let groupBalancedGroupsUnderKeyValue = typeof balancedGroupsKey === 'function'
+                    ? balancedGroupsKey({
                         adaptableApi: adaptableApi,
                         userName: this.adaptableOptions.userName,
                         adaptableId: this.adaptableOptions.adaptableId,
                         adaptableColumn: abColumn,
                         params,
                     })
-                    : unbalancedGroupsKey;
-                return value === null || value === undefined ? groupUnbalancedGroupsUnderKeyValue : value;
+                    : balancedGroupsKey;
+                return value === null || value === undefined ? groupBalancedGroupsUnderKeyValue : value;
             };
         });
     }
@@ -4179,6 +4189,9 @@ class Adaptable {
     getAgGridColumnForColumnId(columnId) {
         return this.gridOptions.columnApi.getColumn(columnId);
     }
+    getAgGridAllGridColumns() {
+        return this.gridOptions.columnApi.getAllGridColumns();
+    }
     setRowGroupColumns(columnIds) {
         this.gridOptions.columnApi.setRowGroupColumns(columnIds);
     }
@@ -4615,6 +4628,7 @@ class Adaptable {
         return this.getAgGridLightThemeName();
     }
     applyAdaptableTheme(theme) {
+        theme = this.ThemeService.mapOsTheme(theme);
         const themeName = typeof theme === 'string' ? theme : theme.Name;
         const isSystemTheme = this.api.themeApi.internalApi.isSystemTheme(themeName);
         const themeClassNamesToRemove = [];
@@ -5114,7 +5128,7 @@ class Adaptable {
         const globalObject = typeof globalThis !== 'undefined' ? globalThis : window;
         const licenseKey = globalObject.ADAPTABLE_LICENSE_KEY || this.api.optionsApi.getLicenseKey();
         return new LicenseService_1.LicenseService(this, licenseKey, {
-            publishedAt: package_json_1.publishTimestamp,
+            publishedAt: publishTimestamp,
         });
     }
     showCharts(chartsDefinitions, chartContainer) {

package/src/agGrid/BadgeRenderer.js

@@ -22,7 +22,7 @@ const getBadgeRendererForColumn = (styledColumn, abColumn, api) => {
             this.eGui.className = 'ab-Badge__wrapper';
             const includeGrouped = Boolean(styledColumn.IncludeGroupedRows);
             const isGrouped = params.node.group;
-            if ((includeGrouped === false && isGrouped)) {
+            if (includeGrouped === false && isGrouped) {
                 const formattedValue = (_c = (_b = (_a = params.formatValue) === null || _a === void 0 ? void 0 : _a.call(params, params.value)) !== null && _b !== void 0 ? _b : params.value) !== null && _c !== void 0 ? _c : '';
                 this.eGui.innerHTML = formattedValue;
                 return;
@@ -88,10 +88,12 @@ const getBadgeRendererForColumn = (styledColumn, abColumn, api) => {
                 this.eGui.innerHTML = formattedValue;
                 return;
             }
-            this.renderBadges([{
+            this.renderBadges([
+                {
                     badge,
                     value: formattedValue,
-                }], api, params);
+                },
+            ], api, params);
         }
         renderBadges(config, api, params) {
             const adaptable = this.getAdaptableInstance(params);
@@ -103,10 +105,12 @@ const getBadgeRendererForColumn = (styledColumn, abColumn, api) => {
                     children: value,
                     icon: badge.Icon,
                     iconPosition: (_a = badge.IconPosition) !== null && _a !== void 0 ? _a : 'start',
-                    gap: 5
+                    gap: 5,
                 });
             });
-            this.unmountReactRoot = api.internalApi.getAdaptableInstance().renderReactRoot((0, renderWithAdaptableContext_1.renderWithAdaptableContext)(React.createElement(React.Fragment, { children: badges }), adaptable), this.eGui);
+            this.unmountReactRoot = api.internalApi
+                .getAdaptableInstance()
+                .renderReactRoot((0, renderWithAdaptableContext_1.renderWithAdaptableContext)(React.createElement(React.Fragment, { children: badges }), adaptable), this.eGui);
         }
         getGui() {
             return this.eGui;

package/src/agGrid/agGridHelper.d.ts

@@ -30,7 +30,8 @@ export declare class agGridHelper {
     isSideBarDefObject(sidebarDef: unknown): sidebarDef is SideBarDef;
     mapToolPanelDefs(toolPanelDefs?: (ToolPanelDef | string)[]): (ToolPanelDef | string)[];
     reselectSelectedCells(): void;
-    fireSelectionChangedEvent(): void;
+    fireCellSelectionChangedEvent(): void;
+    fireRowSelectionChangedEvent(): void;
     private isColumnReadonly;
     private isColumnFieldonly;
     private isColumnSortable;

package/src/agGrid/agGridHelper.js

@@ -47,6 +47,7 @@ const Helper_1 = require("../Utilities/Helpers/Helper");
 const UIHelper_1 = tslib_1.__importDefault(require("../View/UIHelper"));
 const BadgeRenderer_1 = require("./BadgeRenderer");
 const PercentBarRenderer_1 = require("./PercentBarRenderer");
+const CommentsModule_1 = require("../Strategy/CommentsModule");
 const tinycolor2_1 = tslib_1.__importDefault(require("tinycolor2"));
 /**
  * Adaptable AG Grid implementation is getting really big and unwieldy
@@ -113,6 +114,7 @@ class agGridHelper {
         modules.set(ModuleConstants.Fdc3ModuleId, new Fdc3Module_1.Fdc3Module(api));
         modules.set(ModuleConstants.GridFilterModuleId, new GridFilterModule_1.GridFilterModule(api));
         modules.set(ModuleConstants.NamedQueryModuleId, new NamedQueryModule_1.NamedQueryModule(api));
+        modules.set(ModuleConstants.CommentsModuleId, new CommentsModule_1.CommentsModule(api));
         return modules;
     }
     TrySetUpNodeIds(hasAutogeneratedPrimaryKey) {
@@ -300,15 +302,25 @@ class agGridHelper {
             this.gridOptions.api.addCellRange(cellRangeParams);
         }
     }
-    fireSelectionChangedEvent() {
-        let selectionChangedInfo = {
+    fireCellSelectionChangedEvent() {
+        let cellSelectionChangedInfo = {
             adaptableApi: this.adaptable.api,
             selectedCellInfo: this.adaptable.api.gridApi.getGridState().SelectedCellInfo,
+            //   selectedRowInfo: this.adaptable.api.gridApi.getGridState().SelectedRowInfo,
+            userName: this.adaptable.api.optionsApi.getUserName(),
+            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
+        };
+        this.adaptable.api.eventApi.emit('CellSelectionChanged', cellSelectionChangedInfo);
+    }
+    fireRowSelectionChangedEvent() {
+        let rowSelectionChangedInfo = {
+            adaptableApi: this.adaptable.api,
+            //  selectedCellInfo: this.adaptable.api.gridApi.getGridState().SelectedCellInfo,
             selectedRowInfo: this.adaptable.api.gridApi.getGridState().SelectedRowInfo,
             userName: this.adaptable.api.optionsApi.getUserName(),
             adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
         };
-        this.adaptable.api.eventApi.emit('SelectionChanged', selectionChangedInfo);
+        this.adaptable.api.eventApi.emit('RowSelectionChanged', rowSelectionChangedInfo);
     }
     isColumnReadonly(colDef) {
         // if the column has conditional/dynamic editability, we assume some rows may be editable

package/src/agGrid/agGridMenuHelper.d.ts

@@ -7,6 +7,8 @@ export declare class agGridMenuHelper {
     private gridOptions;
     constructor(adaptable: IAdaptable, gridOptions: GridOptions);
     destroy(): void;
+    private buildGroupedModuleItems;
+    private mapAdaptableMenuItemToSystemMenuItems;
     buildColumnMenu(params: GetMainMenuItemsParams, originalGetMainMenuItems: GetMainMenuItems): (string | MenuItemDef)[];
     buildContextMenu(params: GetContextMenuItemsParams, originalGetContextMenuItems: GetContextMenuItems): (string | MenuItemDef)[];
     private createAdaptableColumnMenuItems;