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

package/src/PredefinedConfig/Common/RowSummary.js

@@ -4,17 +4,17 @@ exports.summarySupportedExpressions = exports.WEIGHTED_AVERAGE_AGGREATED_FUNCTIO
 exports.ROW_SUMMARY_ROW_ID = '__ROW_SUMMARY_ROW_ID';
 exports.WEIGHTED_AVERAGE_AGGREATED_FUNCTION = 'WEIGHTED_AVERAGE';
 exports.summarySupportedExpressions = [
-    'SUM',
-    'AVG',
     'MIN',
     'MAX',
+    'SUM',
+    'AVG',
     'COUNT',
     'MEDIAN',
     'MODE',
     'DISTINCT',
     'ONLY',
-    'STD_DEVIATION',
     'OLDEST',
-    'YOUNGEST',
+    'NEWEST',
+    'STD_DEVIATION',
     exports.WEIGHTED_AVERAGE_AGGREATED_FUNCTION,
 ];

package/src/Strategy/AdaptableModuleBase.d.ts

@@ -36,10 +36,9 @@ export declare abstract class AdaptableModuleBase implements IModule {
     onAdaptableReady(): void;
     onAdaptableStateReloaded(adaptableStateReloadedInfo: AdaptableStateReloadedInfo): void;
     setModuleEntitlement(): void;
-    addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
-    addModuleButtonMenuItem(): AdaptableMenuItem | undefined;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     createMainMenuItemShowPopup({ Name, Label, ComponentName, Icon, PopupParams, }: {
         Name: AdaptableColumnMenuItemName | AdaptableContextMenuItemName;
         Label: string;

package/src/Strategy/AdaptableModuleBase.js

@@ -75,14 +75,14 @@ class AdaptableModuleBase {
             .getEntitlementService()
             .getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
     }
-    addModuleMenuItem(source) {
+    createModuleMenuItem(source) {
         if (this.isModuleAvailable() && this.moduleInfo.Popup) {
             const moduleParams = {
                 source: source,
                 maxWidth: this.getPopupMaxWidth(),
             };
             return this.createMainMenuItemShowPopup({
-                Name: 'internal',
+                Name: '_navbar',
                 Label: this.moduleInfo.FriendlyName,
                 ComponentName: this.moduleInfo.Popup,
                 Icon: this.moduleInfo.Glyph,
@@ -90,19 +90,15 @@ class AdaptableModuleBase {
             });
         }
     }
-    addModuleButtonMenuItem() {
+    createColumnMenuItems(column) {
         // base class implementation which is empty
         return undefined;
     }
-    addColumnMenuItems(column) {
+    createContextMenuItems(menuContext) {
         // base class implementation which is empty
         return undefined;
     }
-    addContextMenuItems(menuContext) {
-        // base class implementation which is empty
-        return undefined;
-    }
-    // creates the menu items in the main dropdown
+    // creates the module menu items in the navbar
     createMainMenuItemShowPopup({ Name, Label, ComponentName, Icon, PopupParams, }) {
         return new MenuItem_1.MenuItemShowPopup(Name, Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
     }

package/src/Strategy/AlertModule.d.ts

@@ -14,7 +14,7 @@ export declare class AlertModule extends AdaptableModuleBase implements IModule
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(alertDefinition: AlertDefinition): string[];
     getReferencedNamedQueryNames(alertDefinition: AlertDefinition): string[];
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private handleCellDataChanged;
     private handleGridDataChanged;
     private handleReactiveAlertTriggered;

package/src/Strategy/AlertModule.js

@@ -75,7 +75,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(queryExpression);
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         const items = [];
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn && menuContext.rowNode) {

package/src/Strategy/BulkUpdateModule.d.ts

@@ -6,7 +6,7 @@ import { AccessLevel, AdaptableApi } from '../types';
 export declare class BulkUpdateModule extends AdaptableModuleBase implements IBulkUpdateModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     checkCorrectCellSelection(): BulkUpdateValidationResult;
     buildPreviewValues(bulkUpdateValue: any): PreviewInfo;
 }

package/src/Strategy/BulkUpdateModule.js

@@ -15,7 +15,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewAccessLevel() {
         return 'Full';
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         let menuItemShowPopup = undefined;
         if (!menuContext.isRowGroupColumn && this.isModuleEditable()) {
             if (menuContext.adaptableColumn &&
@@ -26,7 +26,8 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 let popUpParams = {
                     source: 'ContextMenu',
                 };
-                menuItemShowPopup = this.createMainMenuItemShowPopup({ Name: 'bulk-update-apply',
+                menuItemShowPopup = this.createMainMenuItemShowPopup({
+                    Name: 'bulk-update-apply',
                     Label: 'Apply Bulk Update',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/CalculatedColumnModule.d.ts

@@ -16,8 +16,8 @@ export declare class CalculatedColumnModule extends AdaptableModuleBase implemen
     getExplicitlyReferencedColumnIds(calculatedColumn: CalculatedColumn): string[];
     getReferencedNamedQueryNames(calculatedColumn: CalculatedColumn): string[];
     private isCalculatedColumn;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     createEditCalculatedColumnMenuItem(column: AdaptableColumn): AdaptableMenuItem[];
     getTeamSharingAction(): TeamSharingImportInfo<CalculatedColumn>;
     toView(calculateColumn: CalculatedColumn): {

package/src/Strategy/CalculatedColumnModule.js

@@ -38,12 +38,12 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 .getCalculatedColumns()
                 .find((cc) => cc.ColumnId == column.columnId)));
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (this.isModuleEditable() && this.isCalculatedColumn(column)) {
             return this.createEditCalculatedColumnMenuItem(column);
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (!this.isModuleAvailable()) {
             return;
         }

package/src/Strategy/CellSummaryModule.d.ts

@@ -11,8 +11,8 @@ export declare class CellSummaryModule extends AdaptableModuleBase implements IC
     cachedCellSummary: WeakMap<SelectedCellInfo<any>, CellSummmary>;
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private createCellSummaryMenuItem;
     createCellSummary(selectedCellInfo: SelectedCellInfo): CellSummmary;
     private getWeightedAverageCellSummary;

package/src/Strategy/CellSummaryModule.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const Helper_1 = require("../Utilities/Helpers/Helper");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../Utilities/ObjectFactory"));
 const AggregatedScalarLiveValue_1 = require("../Utilities/Services/AggregatedScalarLiveValue");
 const CellSummaryStatusPanel_1 = require("../View/CellSummary/CellSummaryStatusPanel");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
@@ -16,7 +17,7 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewAccessLevel() {
         return 'Full';
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (!this.isModuleAvailable()) {
             return;
         }
@@ -27,7 +28,7 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }),
         ];
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (!this.isModuleAvailable()) {
             return;
         }
@@ -52,104 +53,63 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (this.cachedCellSummary.has(selectedCellInfo)) {
             return this.cachedCellSummary.get(selectedCellInfo);
         }
-        let selectedCellSummary;
-        if (selectedCellInfo && ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(selectedCellInfo.columns)) {
-            let numericValues = [];
-            let allValues = [];
-            let numericColumns = [];
-            selectedCellInfo.columns.map((c) => {
-                if (c && c.dataType == 'Number') {
-                    numericColumns.push(c.columnId);
-                }
-            });
-            selectedCellInfo.gridCells.forEach((selectedCell) => {
-                let value = selectedCell.rawValue;
-                allValues.push(value);
-                if (!selectedCell.column) {
-                    // GridCell.column may be undefined for cells from synthetic columns created by AG Grid (ex. autoGroup columns)
-                    return;
-                }
-                if (ArrayExtensions_1.ArrayExtensions.ContainsItem(numericColumns, selectedCell.column.columnId)) {
-                    let valueAsNumber = Number(value);
-                    // possible that its not a number despite it being a numeric column
-                    if (!isNaN(Number(valueAsNumber))) {
-                        numericValues.push(valueAsNumber);
+        let selectedCellSummary = ObjectFactory_1.default.CreateEmptyCellSummmary();
+        if (selectedCellInfo && ArrayExtensions_1.ArrayExtensions.GetLength(selectedCellInfo.columns) === 1) {
+            const selectedColumn = selectedCellInfo.columns[0];
+            if (selectedColumn) {
+                const isNumericColumn = selectedColumn.dataType === 'Number';
+                const isDateColumn = selectedColumn.dataType === 'Date';
+                const rowNodes = selectedCellInfo.gridCells.map((gc) => gc.rowNode);
+                const handleExpression = (functionName) => {
+                    const aggScalarValue = new AggregatedScalarLiveValue_1.AggregatedScalarLiveValue({
+                        aggregatedScalarExpression: `${functionName}([${selectedColumn.columnId}])`,
+                    }, ModuleConstants.CellSummaryModuleId, this.api, () => rowNodes);
+                    let value = aggScalarValue.getGlobalAggregatedValue();
+                    if (typeof value === 'number' && !isNaN(value)) {
+                        value = Helper_1.Helper.roundNumber(value, 2);
                     }
-                }
-            });
-            // copying so that we keep the order - needed for others
-            const newNumericValues = [...numericValues];
-            let hasNumericColumns = numericValues.length > 0;
-            if (selectedCellInfo.columns.length > 1) {
-                return {
-                    Sum: null,
-                    Average: null,
-                    Median: null,
-                    Mode: null,
-                    Distinct: null,
-                    Max: null,
-                    Min: null,
-                    Count: null,
-                    Std_Deviation: null,
-                    Only: '',
+                    return value;
                 };
-            }
-            const columnId = selectedCellInfo.columns[0].columnId;
-            const rowNodes = selectedCellInfo.gridCells.map((gc) => gc.rowNode);
-            const handleExpression = (functionName) => {
-                const aggScalarValue = new AggregatedScalarLiveValue_1.AggregatedScalarLiveValue({
-                    aggregatedScalarExpression: `${functionName}([${columnId}])`,
-                }, ModuleConstants.CellSummaryModuleId, this.api, () => rowNodes);
-                let value = aggScalarValue.getGlobalAggregatedValue();
-                if (typeof value === 'number' && !isNaN(value)) {
-                    value = Helper_1.Helper.roundNumber(value, 2);
+                const sumValue = isNumericColumn ? handleExpression('SUM') : null;
+                const avgValue = isNumericColumn ? Helper_1.Helper.roundNumber(handleExpression('AVG'), 2) : null;
+                const modeValue = isNumericColumn ? handleExpression('MODE') : null;
+                const medianValue = isNumericColumn ? handleExpression('MEDIAN') : null;
+                const distinctValue = handleExpression('DISTINCT');
+                const maxValue = isNumericColumn ? handleExpression('MAX') : null;
+                const minValue = isNumericColumn ? handleExpression('MIN') : null;
+                const oldestValue = isDateColumn ? handleExpression('OLDEST') : null;
+                const newestValue = isDateColumn ? handleExpression('NEWEST') : null;
+                const stdDeviation = isNumericColumn
+                    ? Helper_1.Helper.roundNumberTo4dp(handleExpression('STD_DEVIATION'))
+                    : null;
+                selectedCellSummary = {
+                    Sum: sumValue,
+                    Average: avgValue,
+                    Median: medianValue,
+                    Mode: modeValue,
+                    Distinct: distinctValue,
+                    Max: maxValue,
+                    Min: minValue,
+                    Count: selectedCellInfo.gridCells.length,
+                    Oldest: oldestValue,
+                    Newest: newestValue,
+                    Std_Deviation: stdDeviation,
+                    Only: distinctValue == 1 ? JSON.stringify(selectedCellInfo.gridCells[0].rawValue) : '',
+                };
+                const weightedAverage = this.getWeightedAverageCellSummary(selectedColumn.columnId, rowNodes);
+                if (weightedAverage !== null) {
+                    selectedCellSummary.Weighted_Average = weightedAverage;
                 }
-                return value;
-            };
-            const sumValue = hasNumericColumns ? handleExpression('SUM') : null;
-            const avgValue = hasNumericColumns ? Helper_1.Helper.roundNumber(handleExpression('AVG'), 2) : null;
-            const modeValue = hasNumericColumns ? handleExpression('MODE') : null;
-            const medianValue = hasNumericColumns ? handleExpression('MEDIAN') : null;
-            const distinctValue = handleExpression('DISTINCT');
-            const maxValue = hasNumericColumns ? handleExpression('MAX') : null;
-            const minValue = hasNumericColumns ? handleExpression('MIN') : null;
-            const stdDeviation = hasNumericColumns
-                ? Helper_1.Helper.roundNumberTo4dp(handleExpression('STD_DEVIATION'))
-                : null;
-            selectedCellSummary = {
-                Sum: sumValue,
-                Average: avgValue,
-                Median: medianValue,
-                Mode: modeValue,
-                Distinct: distinctValue,
-                Max: maxValue,
-                Min: minValue,
-                Count: allValues.length,
-                Std_Deviation: stdDeviation,
-                Only: distinctValue == 1 ? JSON.stringify(allValues[0]) : '',
-            };
-            numericValues = [...newNumericValues];
-            const weightedAverage = this.getWeightedAverageCellSummary(columnId, rowNodes);
-            if (weightedAverage !== null) {
-                selectedCellSummary.Weighted_Average = weightedAverage;
+                const operationDefinitions = this.api.cellSummaryApi.getCellSummaryOperationDefinitions();
+                operationDefinitions === null || operationDefinitions === void 0 ? void 0 : operationDefinitions.forEach((operation) => {
+                    if (operation.operationFunction) {
+                        const cellSummaryOperationContext = Object.assign({ selectedCellInfo,
+                            selectedColumn }, this.api.internalApi.buildBaseContext());
+                        selectedCellSummary[operation.operationName] = operation.operationFunction(cellSummaryOperationContext);
+                    }
+                });
+                this.cachedCellSummary.set(selectedCellInfo, selectedCellSummary);
             }
-            const operationDefinitions = this.api.cellSummaryApi.getCellSummaryOperationDefinitions();
-            operationDefinitions === null || operationDefinitions === void 0 ? void 0 : operationDefinitions.forEach((operation) => {
-                if (operation.operationFunction) {
-                    const cellSummaryOperationContext = {
-                        selectedCellInfo,
-                        distinctCount: distinctValue,
-                        allValues,
-                        numericValues,
-                        numericColumns,
-                        adaptableApi: this.api,
-                        userName: this.api.optionsApi.getUserName(),
-                        adaptableId: this.api.optionsApi.getAdaptableId(),
-                    };
-                    selectedCellSummary[operation.operationName] = operation.operationFunction(cellSummaryOperationContext);
-                }
-            });
-            this.cachedCellSummary.set(selectedCellInfo, selectedCellSummary);
         }
         return selectedCellSummary;
     }

package/src/Strategy/ColumnFilterModule.d.ts

@@ -13,8 +13,8 @@ export declare class ColumnFilterModule extends AdaptableModuleBase implements I
     getExplicitlyReferencedColumnIds(columnFilter: ColumnFilter): string[];
     hasNamedQueryReferences(): boolean;
     onAdaptableReady(): void;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private getExistingColumnFilter;
     getTeamSharingAction(): TeamSharingImportInfo<ColumnFilter>;
     toViewCompact(filter: ColumnFilter): AdaptableObjectCompactView;

package/src/Strategy/ColumnFilterModule.js

@@ -4,7 +4,6 @@ exports.ColumnFilterModule = void 0;
 const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 const LayoutRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/LayoutRedux"));
 const SystemRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/SystemRedux"));
 const FilterStatusBarSubPanelPopover_1 = require("../View/Filter/FilterStatusBarSubPanelPopover");
@@ -43,8 +42,8 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
         });
     }
-    addColumnMenuItems(column) {
-        let filterSubMenuItems = [];
+    createColumnMenuItems(column) {
+        let columnFilterMenuItems = [];
         if (column &&
             column.filterable &&
             this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
@@ -52,35 +51,22 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 const isFilterVisible = this.api.columnFilterApi.isQuickFilterVisible();
                 if (this.isModuleEditable() &&
                     this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
-                    filterSubMenuItems.push(this.createMenuItemReduxAction(isFilterVisible ? 'column-filter-bar-hide' : 'column-filter-bar-show', isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible
+                    columnFilterMenuItems.push(this.createMenuItemReduxAction(isFilterVisible ? 'column-filter-bar-hide' : 'column-filter-bar-show', isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible
                         ? SystemRedux.SystemQuickFilterBarHide()
                         : SystemRedux.SystemQuickFilterBarShow()));
                 }
             }
             const existingColumnFilter = this.getExistingColumnFilter(column);
             if (existingColumnFilter) {
-                filterSubMenuItems.push(this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
-                filterSubMenuItems.push(this.createMenuItemReduxAction(existingColumnFilter.IsSuspended ? 'column-filter-unsuspend' : 'column-filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
+                columnFilterMenuItems.push(this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
+                columnFilterMenuItems.push(this.createMenuItemReduxAction(existingColumnFilter.IsSuspended ? 'column-filter-unsuspend' : 'column-filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
                     ? LayoutRedux.LayoutColumnFilterUnSuspend(existingColumnFilter)
                     : LayoutRedux.LayoutColumnFilterSuspend(existingColumnFilter)));
             }
-            if (ArrayExtensions_1.default.IsNotNullOrEmpty(filterSubMenuItems)) {
-                return [
-                    {
-                        name: 'column-filter-parent',
-                        label: this.moduleInfo.FriendlyName,
-                        isVisible: true,
-                        module: this.moduleInfo.ModuleName,
-                        icon: {
-                            name: this.moduleInfo.Glyph,
-                        },
-                        subItems: filterSubMenuItems,
-                    },
-                ];
-            }
+            return columnFilterMenuItems;
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn &&
                 menuContext.adaptableColumn.filterable &&
@@ -102,28 +88,17 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     ];
                 }
                 else {
-                    let filterSubMenuItems = [];
-                    filterSubMenuItems.push(this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
-                    filterSubMenuItems.push(this.createMenuItemClickFunction(existingColumnFilter.IsSuspended
-                        ? 'column-filter-unsuspend'
-                        : 'column-filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
-                        ? () => {
-                            this.api.columnFilterApi.unSuspendColumnFilter(existingColumnFilter);
-                        }
-                        : () => {
-                            this.api.columnFilterApi.suspendColumnFilter(existingColumnFilter);
-                        }));
                     return [
-                        {
-                            name: 'column-filter-parent',
-                            label: this.moduleInfo.FriendlyName,
-                            isVisible: true,
-                            module: this.moduleInfo.ModuleName,
-                            icon: {
-                                name: this.moduleInfo.Glyph,
-                            },
-                            subItems: filterSubMenuItems,
-                        },
+                        this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)),
+                        this.createMenuItemClickFunction(existingColumnFilter.IsSuspended
+                            ? 'column-filter-unsuspend'
+                            : 'column-filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
+                            ? () => {
+                                this.api.columnFilterApi.unSuspendColumnFilter(existingColumnFilter);
+                            }
+                            : () => {
+                                this.api.columnFilterApi.suspendColumnFilter(existingColumnFilter);
+                            }),
                     ];
                 }
             }

package/src/Strategy/ColumnInfoModule.d.ts

@@ -6,6 +6,6 @@ import { AdaptableColumn, AdaptableMenuItem, ContextMenuContext } from '../types
 export declare class ColumnInfoModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
 }

package/src/Strategy/ColumnInfoModule.js

@@ -11,7 +11,7 @@ class ColumnInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewAccessLevel() {
         return 'Full';
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (this.isModuleAvailable()) {
             const columnPopUpParams = {
                 source: 'ColumnMenu',
@@ -28,7 +28,7 @@ class ColumnInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             ];
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (this.isModuleAvailable()) {
             const columnPopUpParams = {
                 source: 'ColumnMenu',

package/src/Strategy/CommentModule.d.ts

@@ -7,6 +7,5 @@ export declare class CommentModule extends AdaptableModuleBase implements IModul
     onAdaptableReady(): void;
     isModuleAvailable(): boolean;
     private loadComments;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    private getAddRemoveCommentsMenuItems;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
 }

package/src/Strategy/CommentModule.js

@@ -28,49 +28,48 @@ class CommentModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.loadCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, (0, ObjectFactory_1.createBaseContext)(this.api)));
         this.api.commentApi.setGridComments(commentThreads);
     }
-    addContextMenuItems(menuContext) {
-        var _a, _b;
+    createContextMenuItems(menuContext) {
+        var _a, _b, _c, _d, _e;
         if (!this.isModuleAvailable()) {
-            return undefined;
+            return;
         }
-        const items = [];
-        const isCellCommentable = (_b = (_a = this.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable;
-        if (!isCellCommentable ||
-            isCellCommentable(Object.assign({ gridCell: menuContext.gridCell }, (0, ObjectFactory_1.createBaseContext)(this.api)))) {
-            items.push(...this.getAddRemoveCommentsMenuItems(menuContext));
+        if (!this.api.commentApi.internalApi.areCommentsSupported()) {
+            return;
         }
-        return items;
-    }
-    getAddRemoveCommentsMenuItems(menuContext) {
-        var _a;
         const items = [];
-        if (!this.api.commentApi.internalApi.areCommentsAvailable()) {
-            return items;
+        const isCellCommentable = typeof ((_b = (_a = this.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable) === 'function'
+            ? (_d = (_c = this.api.optionsApi) === null || _c === void 0 ? void 0 : _c.getCommentOptions()) === null || _d === void 0 ? void 0 : _d.isCellCommentable(Object.assign({ gridCell: menuContext.gridCell }, (0, ObjectFactory_1.createBaseContext)(this.api)))
+            : true;
+        if (!isCellCommentable) {
+            return;
         }
         const cellAddress = {
             PrimaryKeyValue: menuContext.primaryKeyValue,
             ColumnId: menuContext.adaptableColumn.columnId,
         };
-        const cellComments = (_a = this.api.commentApi.getCommentThread(cellAddress)) === null || _a === void 0 ? void 0 : _a.Comments;
+        const cellComments = (_e = this.api.commentApi.getCommentThread(cellAddress)) === null || _e === void 0 ? void 0 : _e.Comments;
         if (cellComments) {
-            items.push(this.createMenuItemClickFunction('comment-remove', 'Remove Comment', this.moduleInfo.Glyph, () => {
-                this.api.commentApi.deleteCommentThread(cellAddress);
-            }));
+            return [
+                this.createMenuItemClickFunction('comment-remove', 'Remove Comment', this.moduleInfo.Glyph, () => {
+                    this.api.commentApi.deleteCommentThread(cellAddress);
+                }),
+            ];
         }
         else {
-            items.push(this.createMenuItemClickFunction('comment-add', 'Add Comment', this.moduleInfo.Glyph, () => {
-                // add an empty one
-                this.api.commentApi.addCommentThread(Object.assign(Object.assign({}, cellAddress), { Comments: [] }));
-                requestAnimationFrame(() => {
-                    this.api.internalApi.getCellPopupService().showPopup({
-                        PrimaryKeyValue: menuContext.primaryKeyValue,
-                        ColumnId: menuContext.adaptableColumn.columnId,
-                    }, true);
-                    this.api.internalApi.getCellPopupService().editFocusedEntity('Comment');
-                });
-            }));
+            return [
+                this.createMenuItemClickFunction('comment-add', 'Add Comment', this.moduleInfo.Glyph, () => {
+                    // add an empty one
+                    this.api.commentApi.addCommentThread(Object.assign(Object.assign({}, cellAddress), { Comments: [] }));
+                    requestAnimationFrame(() => {
+                        this.api.internalApi.getCellPopupService().showPopup({
+                            PrimaryKeyValue: menuContext.primaryKeyValue,
+                            ColumnId: menuContext.adaptableColumn.columnId,
+                        }, true);
+                        this.api.internalApi.getCellPopupService().editFocusedEntity('Comment');
+                    });
+                }),
+            ];
         }
-        return items;
     }
 }
 exports.CommentModule = CommentModule;

package/src/Strategy/CustomSortModule.d.ts

@@ -15,7 +15,7 @@ export declare class CustomSortModule extends AdaptableModuleBase implements IMo
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(customSort: CustomSort): string[];
     hasNamedQueryReferences(): boolean;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<CustomSort>;
     toView(customSort: CustomSort): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];

package/src/Strategy/CustomSortModule.js

@@ -22,7 +22,7 @@ class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (column && this.isModuleEditable() && column.sortable) {
             let customSort = this.api.customSortApi
                 .getCustomSorts()

package/src/Strategy/DashboardModule.d.ts

@@ -5,7 +5,7 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class DashboardModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;
-    addColumnMenuItems(): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(): AdaptableMenuItem[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private buildMenuItems;
 }