@adaptabletools/adaptable-cjs 18.0.0-canary.25 → 18.0.0-canary.27

package/src/Strategy/NoteModule.js

@@ -14,49 +14,47 @@ class NoteModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         // Note module doesn't support autogenerated primary keys
         return super.isModuleAvailable() && !this.api.optionsApi.getAutogeneratePrimaryKey();
     }
-    addContextMenuItems(menuContext) {
-        var _a, _b;
+    createContextMenuItems(menuContext) {
+        var _a, _b, _c;
         if (!this.isModuleAvailable()) {
-            return undefined;
+            return;
+        }
+        if (!this.api.noteApi.internalApi.areNotesSupported()) {
+            return;
         }
         const isReadOnly = this.adaptable.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName) === 'ReadOnly';
         if (isReadOnly) {
             return undefined;
         }
-        const items = [];
-        const isCellNotable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable;
-        if (!isCellNotable ||
-            isCellNotable(Object.assign({ gridCell: menuContext.gridCell }, (0, ObjectFactory_1.createBaseContext)(this.api))))
-            items.push(...this.getAddRemoveNoteMenuItems(menuContext));
-        return items;
-    }
-    getAddRemoveNoteMenuItems(menuContext) {
-        var _a;
-        const items = [];
-        if (!this.api.noteApi.internalApi.areNotesAvailable()) {
-            return items;
+        const isCellNotable = typeof ((_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNoteOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable) === 'function'
+            ? this.adaptable.api.optionsApi.getNoteOptions().isCellNotable(Object.assign({ gridCell: menuContext.gridCell }, (0, ObjectFactory_1.createBaseContext)(this.api)))
+            : true;
+        if (!isCellNotable) {
+            return;
         }
-        // does not have note
-        const [note] = (_a = this.adaptable.api.noteApi.getNotesForCell({
+        const [note] = (_c = this.adaptable.api.noteApi.getNotesForCell({
             PrimaryKeyValue: menuContext.primaryKeyValue,
             ColumnId: menuContext.adaptableColumn.columnId,
-        })) !== null && _a !== void 0 ? _a : [];
+        })) !== null && _c !== void 0 ? _c : [];
         if (note) {
-            items.push(this.createMenuItemClickFunction('note-remove', 'Remove Note', this.moduleInfo.Glyph, () => {
-                this.api.noteApi.deleteNote(note);
-            }));
+            return [
+                this.createMenuItemClickFunction('note-remove', 'Remove Note', this.moduleInfo.Glyph, () => {
+                    this.api.noteApi.deleteNote(note);
+                }),
+            ];
         }
         else {
-            items.push(this.createMenuItemClickFunction('note-add', 'Add Note', this.moduleInfo.Glyph, () => {
-                // add an empty one
-                this.api.noteApi.addNote('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
-                this.api.internalApi.getCellPopupService().showPopup({
-                    PrimaryKeyValue: menuContext.primaryKeyValue,
-                    ColumnId: menuContext.adaptableColumn.columnId,
-                }, true);
-            }));
+            return [
+                this.createMenuItemClickFunction('note-add', 'Add Note', this.moduleInfo.Glyph, () => {
+                    // add an empty one
+                    this.api.noteApi.addNote('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
+                    this.api.internalApi.getCellPopupService().showPopup({
+                        PrimaryKeyValue: menuContext.primaryKeyValue,
+                        ColumnId: menuContext.adaptableColumn.columnId,
+                    }, true);
+                }),
+            ];
         }
-        return items;
     }
 }
 exports.NoteModule = NoteModule;

package/src/Strategy/PlusMinusModule.d.ts

@@ -19,7 +19,7 @@ export declare class PlusMinusModule extends AdaptableModuleBase implements IPlu
     getReferencedNamedQueryNames(plusMinusNudge: PlusMinusNudge): string[];
     onAdaptableReady(): void;
     checkListenToKeyDown(): void;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     private handleKeyDown;
     applyPlusMinus(plusMinusNudges: PlusMinusNudge[], cellsToUpdate: GridCell[], direction: 'up' | 'down'): boolean;
     isPlusMinusNudgeApplied(plusMinusNudge: PlusMinusNudge, gridCell: GridCell): boolean;

package/src/Strategy/PlusMinusModule.js

@@ -56,7 +56,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         this.shouldHandleKeyDown = newShouldHandleKeyDown;
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (column && this.isModuleEditable() && column.dataType == 'Number') {
             let popupParam = {
                 column: column,

package/src/Strategy/SettingsPanelModule.d.ts

@@ -5,7 +5,7 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
 export declare class SettingsPanelModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
 }

package/src/Strategy/SettingsPanelModule.js

@@ -10,18 +10,18 @@ class SettingsPanelModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const friendlyName = api.optionsApi.getSettingsPanelOptions().title;
         super(ModuleConstants.SettingsPanelModuleId, friendlyName, 'settings', null, 'Manage all Adaptable Settings', api);
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         return [
             // To do : get the icon and name from settings in case they have changed?
             this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
         ];
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         return [
             this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
         ];
     }
-    addModuleMenuItem(source) {
+    createModuleMenuItem(source) {
         if (this.isModuleAvailable()) {
             return this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen());
         }

package/src/Strategy/SmartEditModule.d.ts

@@ -10,7 +10,7 @@ import { SmartEditOperation } from '../AdaptableOptions/EditOptions';
 export declare class SmartEditModule extends AdaptableModuleBase implements ISmartEditModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     ApplySmartEdit(cellUpdateRequests: CellUpdateRequest[]): void;
     CheckCorrectCellSelection(): IModuleActionReturn<boolean>;
     BuildPreviewValues(smartEditValue: number, smartEditOperation: SmartEditOperation): PreviewInfo;

package/src/Strategy/SmartEditModule.js

@@ -15,7 +15,7 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewAccessLevel() {
         return 'Full';
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         // not sure if this is right but logic is that
         // if the context cell is one of a selection taht can have smart edit applied
         // then open the smart edit screen
@@ -31,7 +31,8 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 let popUpParams = {
                     source: 'ContextMenu',
                 };
-                menuItemShowPopup = this.createMainMenuItemShowPopup({ Name: 'smart-edit-apply',
+                menuItemShowPopup = this.createMainMenuItemShowPopup({
+                    Name: 'smart-edit-apply',
                     Label: 'Apply Smart Edit',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/StyledColumnModule.d.ts

@@ -14,7 +14,7 @@ export declare class StyledColumnModule extends AdaptableModuleBase implements I
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(formatColumn: FormatColumn): string[];
     hasNamedQueryReferences(): boolean;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     private getGlyphForStyledColumn;
     getTeamSharingAction(): TeamSharingImportInfo<StyledColumn>;
     toView(styledColumn: StyledColumn): AdaptableObjectView;

package/src/Strategy/StyledColumnModule.js

@@ -29,7 +29,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         let returnColumnMenuItems = [];
         // Need a Column and an editable Module
         if (column && this.isModuleEditable()) {
@@ -120,14 +120,15 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                                     } }), config: {
                                     defaultCurrentSectionName: 'Style',
                                 } }));
-                            returnColumnMenuItems.push({
-                                name: 'styled-column-parent',
-                                label: 'Create Styled Column',
-                                module: this.moduleInfo.ModuleName,
-                                isVisible: true,
-                                icon: { name: this.moduleInfo.Glyph },
-                                subItems: [newGrandientButton, newPrecentBarButton, newBadgeButton],
-                            });
+                            // returnColumnMenuItems.push({
+                            //   name: 'styled-column-parent',
+                            //   label: 'Create Styled Column',
+                            //   module: this.moduleInfo.ModuleName,
+                            //   isVisible: true,
+                            //   icon: { name: this.moduleInfo.Glyph },
+                            //   subItems: [newGrandientButton, newPrecentBarButton, newBadgeButton],
+                            // });
+                            returnColumnMenuItems.push(...[newGrandientButton, newPrecentBarButton, newBadgeButton]);
                             break;
                         case 'String':
                             returnColumnMenuItems.push(newBadgeButton);

package/src/Strategy/SystemStatusModule.d.ts

@@ -5,7 +5,7 @@ import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class SystemStatusModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/SystemStatusModule.js

@@ -9,20 +9,21 @@ class SystemStatusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.SystemStatusModuleId, ModuleConstants.SystemStatusFriendlyName, 'traffic-lights', 'SystemStatusPopup', 'Provide messages about the Status of your application', api);
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (this.isModuleAvailable()) {
             return [
                 this.createMenuItemShowPopup('system-status-show', 'Show System Status', this.moduleInfo.Popup, this.moduleInfo.Glyph),
             ];
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (this.isModuleAvailable()) {
             let popUpParams = {
                 source: 'ContextMenu',
             };
             return [
-                this.createMainMenuItemShowPopup({ Name: 'system-status-show',
+                this.createMainMenuItemShowPopup({
+                    Name: 'system-status-show',
                     Label: 'Show System Status',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.d.ts

@@ -6,7 +6,7 @@ import { AggregateParams } from './scalarAggregationHelper';
  * List of all the AggregatedScalar Functions available in AdaptableQL
  */
 export type AggregatedScalarFunctionName = ScalarAggregationFunction | OperandFunction;
-export type ScalarAggregationFunction = 'SUM' | 'PERCENTAGE' | 'QUANT' | 'QUARTILE' | 'PERCENTILE' | 'AVG' | 'MIN' | 'MAX' | 'COUNT' | 'CUMUL' | 'MEDIAN' | 'MODE' | 'DISTINCT' | 'ONLY' | 'STD_DEVIATION' | 'OLDEST' | 'YOUNGEST';
+export type ScalarAggregationFunction = 'SUM' | 'PERCENTAGE' | 'QUANT' | 'QUARTILE' | 'PERCENTILE' | 'AVG' | 'MIN' | 'MAX' | 'COUNT' | 'CUMUL' | 'MEDIAN' | 'MODE' | 'DISTINCT' | 'ONLY' | 'STD_DEVIATION' | 'OLDEST' | 'NEWEST';
 type OperandFunction = 'COL' | 'OVER' | 'GROUP_BY' | 'WEIGHT';
 export interface ScalarAggregationParameter extends BaseParameter<'aggregationScalar', ScalarAggregationFunction> {
     value: AggregatedScalarExpressionEvaluation;

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -334,7 +334,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const modeColumnParameter = (0, expressionFunctionUtils_1.extractColumnParameter)('mode', args);
             const modeColumnName = modeColumnParameter.value;
-            (0, expressionFunctionUtils_1.validateColumnType)(modeColumnName, ['Number', 'String'], 'mode', context.adaptableApi);
+            (0, expressionFunctionUtils_1.validateColumnType)(modeColumnName, ['Number', 'String', 'Date'], 'mode', context.adaptableApi);
             const groupByParameter = (0, expressionFunctionUtils_1.extractParameter)('MODE', 'operand', ['GROUP_BY'], args, {
                 isOptional: true,
             });
@@ -394,7 +394,7 @@ exports.aggregatedScalarExpressionFunctions = {
         ],
         examples: ['MODE([colA])', 'MODE([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
-        inputs: [['number'], ['text']],
+        inputs: [['number'], ['text'], ['date']],
     },
     DISTINCT: {
         handler(args, context) {
@@ -442,7 +442,7 @@ exports.aggregatedScalarExpressionFunctions = {
         ],
         examples: ['DISTINCT([colA])', 'DISTINCT([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
-        inputs: [['number'], ['text']],
+        inputs: [['number'], ['text'], ['date']],
     },
     ONLY: {
         handler(args, context) {
@@ -492,7 +492,7 @@ exports.aggregatedScalarExpressionFunctions = {
         ],
         examples: ['ONLY([colA])', 'ONLY([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
-        inputs: [['number'], ['text']],
+        inputs: [['number'], ['text'], ['date']],
     },
     STD_DEVIATION: {
         handler(args, context) {
@@ -853,7 +853,7 @@ exports.aggregatedScalarExpressionFunctions = {
         ],
         examples: ['COUNT([colA])', 'COUNT([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
-        inputs: [['number'], ['text']],
+        inputs: [['number'], ['text'], ['date']],
     },
     OVER: {
         handler(args, context) {
@@ -963,7 +963,7 @@ exports.aggregatedScalarExpressionFunctions = {
             };
             return result;
         },
-        description: 'Aggregates a column over multiple rows by computing the minimum of the column values\nOptionally the aggregation may be computed within provided individual groups',
+        description: 'Aggregates a Date column over multiple rows by computing the oldest of the column values\nOptionally the aggregation may be computed within provided individual groups',
         signatures: [
             'OLDEST( [colName] )',
             'OLDEST( COL(name: string))',
@@ -974,19 +974,19 @@ exports.aggregatedScalarExpressionFunctions = {
         category: 'aggregation',
         inputs: ['date'],
     },
-    YOUNGEST: {
+    NEWEST: {
         handler(args, context) {
-            const minColumnParameter = (0, expressionFunctionUtils_1.extractColumnParameter)('YOUNGEST', args);
+            const minColumnParameter = (0, expressionFunctionUtils_1.extractColumnParameter)('NEWEST', args);
             const minColumnName = minColumnParameter.value;
-            (0, expressionFunctionUtils_1.validateColumnType)(minColumnName, ['Date'], 'YOUNGEST', context.adaptableApi);
-            const groupByParameter = (0, expressionFunctionUtils_1.extractParameter)('YOUNGEST', 'operand', ['GROUP_BY'], args, {
+            (0, expressionFunctionUtils_1.validateColumnType)(minColumnName, ['Date'], 'NEWEST', context.adaptableApi);
+            const groupByParameter = (0, expressionFunctionUtils_1.extractParameter)('NEWEST', 'operand', ['GROUP_BY'], args, {
                 isOptional: true,
             });
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
                     reducers: {
-                        YOUNGEST: {
-                            name: 'YOUNGEST',
+                        NEWEST: {
+                            name: 'NEWEST',
                             field: minColumnName,
                             initialValue: null,
                             reducer: (minValue, rowValue) => {
@@ -1016,20 +1016,20 @@ exports.aggregatedScalarExpressionFunctions = {
             };
             addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
-                name: 'YOUNGEST',
+                name: 'NEWEST',
                 type: 'aggregationScalar',
                 value: aggregationExpressionEvaluation,
             };
             return result;
         },
-        description: 'Aggregates a column over multiple rows by computing the minimum of the column values\nOptionally the aggregation may be computed within provided individual groups',
+        description: 'Aggregates a Date column over multiple rows by computing the most recent of the column values\nOptionally the aggregation may be computed within provided individual groups',
         signatures: [
-            'YOUNGEST( [colName] )',
-            'YOUNGEST( COL(name: string))',
-            'YOUNGEST( [colNameA], GROUP_BY( [colNameB] ))',
-            'YOUNGEST( COL(nameA: string), GROUP_BY( COL(nameB: string)))',
+            'NEWEST( [colName] )',
+            'NEWEST( COL(name: string))',
+            'NEWEST( [colNameA], GROUP_BY( [colNameB] ))',
+            'NEWEST( COL(nameA: string), GROUP_BY( COL(nameB: string)))',
         ],
-        examples: ['YOUNGEST([colA])', 'YOUNGEST([colA], GROUP_BY([colB]))'],
+        examples: ['NEWEST([colA])', 'NEWEST([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
         inputs: ['date'],
     },

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -97,6 +97,7 @@ function addUuidAndSource(adaptableObject) {
 }
 exports.addUuidAndSource = addUuidAndSource;
 function removeUuidAndSource(adaptableObject) {
+    const clonedObject = structuredClone(adaptableObject);
     const sanitiseObject = (object) => {
         for (const key in object) {
             if (key === 'Source' || key === 'Uuid') {
@@ -110,8 +111,8 @@ function removeUuidAndSource(adaptableObject) {
             }
         }
     };
-    sanitiseObject(adaptableObject);
-    return adaptableObject;
+    sanitiseObject(clonedObject);
+    return clonedObject;
 }
 exports.removeUuidAndSource = removeUuidAndSource;
 exports.AdaptableHelper = {

package/src/Utilities/ObjectFactory.js

@@ -313,6 +313,8 @@ function CreateEmptyCellSummmary() {
         Max: undefined,
         Min: undefined,
         Count: undefined,
+        Newest: undefined,
+        Oldest: undefined,
         Std_Deviation: undefined,
         Only: undefined,
     };

package/src/Utilities/Services/ModuleService.js

@@ -14,13 +14,13 @@ class ModuleService {
         const settingsPanelMenuItems = [];
         const buttonMenuItems = [];
         this.getModuleCollection().forEach((module) => {
-            const settingsPanelMenuItem = module.addModuleMenuItem('ModuleMenu');
+            const settingsPanelMenuItem = module.createModuleMenuItem('ModuleMenu');
             if (Helper_1.default.objectExists(settingsPanelMenuItem)) {
                 if (settingsPanelMenuItems.findIndex((m) => m.module == settingsPanelMenuItem.module) == -1) {
                     settingsPanelMenuItems.push(settingsPanelMenuItem);
                 }
             }
-            const buttonMenuItem = module.addModuleMenuItem('ModuleButton');
+            const buttonMenuItem = module.createModuleMenuItem('ModuleButton');
             if (Helper_1.default.objectExists(buttonMenuItem)) {
                 if (buttonMenuItems.findIndex((m) => m.module == buttonMenuItem.module) == -1) {
                     buttonMenuItems.push(buttonMenuItem);

package/src/View/Layout/Wizard/LayoutWizard.js

@@ -150,6 +150,7 @@ const LayoutWizard = (props) => {
                 title: 'Row Summaries',
                 details: 'Configure Row Summaries',
                 renderSummary: () => React.createElement(RowGroupingSection_1.RowGroupingSectionSummary, null),
+                isVisible: () => layoutSupportedFeatures.RowSummaries,
                 render: () => (React.createElement(rebass_1.Box, { p: 2, style: { height: '100%' } },
                     React.createElement(RowSummarySection_1.RowSummarySection, { onChange: setLayout }))),
             },

package/src/View/Layout/Wizard/sections/RowGroupingSection.js

@@ -16,7 +16,23 @@ const RowGroupingSectionSummary = () => {
     var _a;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    return (React.createElement(rebass_1.Box, null, ((_a = layout.RowGroupedColumns) === null || _a === void 0 ? void 0 : _a.length) ? (layout.RowGroupedColumns.map((columnId) => (React.createElement(Tag_1.Tag, { mr: 1, key: columnId }, adaptable.api.columnApi.getFriendlyNameForColumnId(columnId))))) : (React.createElement(Tag_1.Tag, null, "No Row Grouping"))));
+    return (React.createElement(rebass_1.Box, null, ((_a = layout.RowSummaries) === null || _a === void 0 ? void 0 : _a.length) ? (layout === null || layout === void 0 ? void 0 : layout.RowSummaries.map((rowSummary, index) => {
+        var _a;
+        const columns = Object.entries((_a = rowSummary.ColumnsMap) !== null && _a !== void 0 ? _a : {})
+            .map(([columnId, expression]) => {
+            if (columnId === 'Source' || columnId === 'Uuid') {
+                return '';
+            }
+            return `${expression}(${adaptable.api.columnApi.getFriendlyNameForColumnId(columnId)})`;
+        })
+            .filter(Boolean)
+            .join(', ');
+        return (React.createElement(rebass_1.Box, { mb: 2 },
+            React.createElement(Tag_1.Tag, { key: index },
+                rowSummary.Position,
+                " ",
+                columns)));
+    })) : (React.createElement(Tag_1.Tag, null, "No Row Summaries"))));
 };
 exports.RowGroupingSectionSummary = RowGroupingSectionSummary;
 const RowGroupingSection = (props) => {

package/src/View/Layout/Wizard/sections/RowSummarySection.js

@@ -37,13 +37,13 @@ const areSummaryRowsValid = (layout) => {
 exports.areSummaryRowsValid = areSummaryRowsValid;
 const getAvailableExpressionsForColumnType = (columnType, availableScalarExpressions) => {
     const inputType = (0, adaptableQlUtils_1.mapColumnDataTypeToExpressionFunctionType)(columnType);
-    return Object.entries(availableScalarExpressions !== null && availableScalarExpressions !== void 0 ? availableScalarExpressions : {})
-        .map(([expression, expressionDef]) => {
+    // Object.entries(availableScalarExpressions ?? {})
+    return RowSummary_1.summarySupportedExpressions
+        .filter((expression) => availableScalarExpressions[expression])
+        .map((expression) => {
         var _a, _b;
+        const expressionDef = availableScalarExpressions[expression];
         let firstArg = null;
-        if (!RowSummary_1.summarySupportedExpressions.includes(expression)) {
-            return null;
-        }
         if (Array.isArray((_a = expressionDef === null || expressionDef === void 0 ? void 0 : expressionDef.inputs) === null || _a === void 0 ? void 0 : _a[0])) {
             // @ts-ignore
             firstArg = (_b = expressionDef.inputs.find((input) => input.includes(inputType))) === null || _b === void 0 ? void 0 : _b[0];

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -287,7 +287,7 @@ export declare class AdaptableAgGrid implements IAdaptable {
     private getAgGridLightThemeName;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;
     setRowGroupColumns(columnIds: string[]): void;
-    getAgGridAllGridColumns(): Column<any>[];
+    getAllGridColumns(): Column<any>[];
     clearRowGroupColumns(): void;
     expandAllRowGroups(): void;
     closeAllRowGroups(): void;

package/src/agGrid/AdaptableAgGrid.js

@@ -2760,7 +2760,7 @@ class AdaptableAgGrid {
     setRowGroupColumns(columnIds) {
         this.agGridAdapter.getAgGridApi().setRowGroupColumns(columnIds);
     }
-    getAgGridAllGridColumns() {
+    getAllGridColumns() {
         return this.agGridAdapter.getAgGridApi().getAllGridColumns();
     }
     clearRowGroupColumns() {

package/src/agGrid/AgGridAdapter.d.ts

@@ -1,9 +1,8 @@
-import { ColDef, Column, GridApi, GridOptions, IRowNode, ManagedGridOptionKey, ManagedGridOptions, Module, ModuleNames } from '@ag-grid-community/core';
+import { ColDef, ColGroupDef, Column, GridApi, GridOptions, IRowNode, ManagedGridOptionKey, ManagedGridOptions, Module, ModuleNames } from '@ag-grid-community/core';
 import { AdaptableAgGrid } from './AdaptableAgGrid';
 import { AdaptableColumn, AdaptableColumnGroup } from '../PredefinedConfig/Common/AdaptableColumn';
 import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
 import { SelectedRowInfo } from '../PredefinedConfig/Selection/SelectedRowInfo';
-import { ColGroupDef } from '@ag-grid-community/core/dist/esm/es6/entities/colDef';
 export declare class AgGridAdapter {
     private adaptableInstance;
     private DANGER_USE_GETTER_gridApi;

package/src/agGrid/AgGridColumnAdapter.js

@@ -574,7 +574,7 @@ class AgGridColumnAdapter {
         if (!this.adaptableApi.internalApi.getModuleService().isModuleAvailable('Note')) {
             return;
         }
-        if (!this.adaptableApi.noteApi.internalApi.areNotesAvailable()) {
+        if (!this.adaptableApi.noteApi.internalApi.areNotesSupported()) {
             return;
         }
         const cellPosition = {
@@ -591,7 +591,7 @@ class AgGridColumnAdapter {
         if (!this.adaptableApi.internalApi.getModuleService().isModuleAvailable('Comment')) {
             return;
         }
-        if (!this.adaptableApi.commentApi.internalApi.areCommentsAvailable()) {
+        if (!this.adaptableApi.commentApi.internalApi.areCommentsSupported()) {
             return;
         }
         const position = {

package/src/agGrid/AgGridMenuAdapter.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableAgGrid } from './AdaptableAgGrid';
-import { Column, GetContextMenuItems, GetContextMenuItemsParams, GetMainMenuItems, GetMainMenuItemsParams, MenuItemDef } from '@ag-grid-community/core';
+import { GetContextMenuItems, GetContextMenuItemsParams, GetMainMenuItems, GetMainMenuItemsParams, MenuItemDef } from '@ag-grid-community/core';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMenuItem, ColumnMenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
 export declare class AgGridMenuAdapter {
     private adaptableInstance;
     constructor(adaptableInstance: AdaptableAgGrid);
@@ -9,20 +9,30 @@ export declare class AgGridMenuAdapter {
     private get adaptableApi();
     destroy(): void;
     buildColumnMenu(params: GetMainMenuItemsParams, originalGetMainMenuItems: GetMainMenuItems): (string | MenuItemDef)[];
-    buildStructuredAdaptableColumnItems(menuContext: ColumnMenuContext): {
-        adaptableMenuItems: AdaptableMenuItem[];
-        structuredAdaptableMenuItems: AdaptableMenuItem[];
-    };
     buildContextMenu(params: GetContextMenuItemsParams, originalGetContextMenuItems: GetContextMenuItems): (string | MenuItemDef)[];
-    createColumnMenuContextObject(adaptableColumn: AdaptableColumn, agGridColumn: Column): ColumnMenuContext;
+    private createColumnMenuContextObject;
     private createAdaptableContextMenuItems;
     private createContextMenuContextObject;
     private mapAdaptableMenuItemToAgGridMenuDefinition;
     private mapCustomMenuItemToAgGridMenuDefinition;
     private mapUserMenuItemToAgGridMenuDefinition;
-    private buildGroupedModuleItems;
+    private buildContextMenuDefaultStructure;
+    /**
+     * Default strategy for menu items: return as is if there is only one item, otherwise group them under a parent item
+     */
+    private getModuleSpecificStructure;
+    private getExportContextMenuStructure;
+    private getLayoutContextMenuStructure;
+    private buildMenuGroupParent;
+    private buildColumnMenuDefaultStructure;
+    private getLayoutColumnMenuStructure;
+    private getStyledColumnColumnMenuStructure;
     private mapAdaptableMenuItemToSystemMenuItems;
     private createAdaptableColumnMenuItems;
     private mapAdaptableIconToAgGridIcon;
+    /**
+     * The output of this function is used to build the column header menu if the AG Grid Menu Module is NOT present
+     * This is controlled by the AdaptableAgGrid.embedColumnMenu property
+     */
     buildStandaloneColumnHeader(adaptableColumn: AdaptableColumn): AdaptableMenuItem[];
 }