@adaptabletools/adaptable 18.0.0-canary.17 → 18.0.0-canary.19

package/src/Strategy/ColumnFilterModule.js

@@ -39,6 +39,43 @@ export class ColumnFilterModule extends AdaptableModuleBase {
             }
         });
     }
+    addColumnMenuItems(column) {
+        let filterSubMenuItems = [];
+        if (column &&
+            column.filterable &&
+            this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
+            if (this.api.gridApi.isQuickFilterAvailable()) {
+                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
+                        ? 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
+                    ? LayoutRedux.LayoutColumnFilterUnSuspend(existingColumnFilter)
+                    : LayoutRedux.LayoutColumnFilterSuspend(existingColumnFilter)));
+            }
+            if (ArrayExtensions.IsNotNullOrEmpty(filterSubMenuItems)) {
+                return [
+                    {
+                        name: 'parent',
+                        label: this.moduleInfo.FriendlyName,
+                        isVisible: true,
+                        module: this.moduleInfo.ModuleName,
+                        icon: {
+                            name: this.moduleInfo.Glyph,
+                        },
+                        subItems: filterSubMenuItems,
+                    },
+                ];
+            }
+        }
+    }
     addContextMenuItems(menuContext) {
         if (!menuContext.isRowGroupColumn && this.isModuleAvailable()) {
             if (menuContext.adaptableColumn &&
@@ -57,13 +94,15 @@ export class ColumnFilterModule extends AdaptableModuleBase {
                             this.api.columnFilterApi.internalApi.createEqualityColumnFilterForCell(menuContext.selectedCellInfo.gridCells[0]);
                         };
                     return [
-                        this.createColumnMenuItemClickFunction('filter-cell-value', isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction),
+                        this.createMenuItemClickFunction('column-filter-on-cell-value', isMultiple ? 'Filter on Cell Values' : 'Filter on Cell Value', this.moduleInfo.Glyph, clickFunction),
                     ];
                 }
                 else {
                     let filterSubMenuItems = [];
-                    filterSubMenuItems.push(this.createColumnMenuItemReduxAction('filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
-                    filterSubMenuItems.push(this.createColumnMenuItemClickFunction('filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
+                    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);
                         }
@@ -71,7 +110,8 @@ export class ColumnFilterModule extends AdaptableModuleBase {
                             this.api.columnFilterApi.suspendColumnFilter(existingColumnFilter);
                         }));
                     return [
-                        { name: 'filter',
+                        {
+                            name: 'parent',
                             label: this.moduleInfo.FriendlyName,
                             isVisible: true,
                             module: this.moduleInfo.ModuleName,
@@ -85,43 +125,6 @@ export class ColumnFilterModule extends AdaptableModuleBase {
             }
         }
     }
-    addColumnMenuItems(column) {
-        let filterSubMenuItems = [];
-        if (column &&
-            column.filterable &&
-            this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
-            if (this.api.gridApi.isQuickFilterAvailable()) {
-                const isFilterVisible = this.api.columnFilterApi.isQuickFilterVisible();
-                if (this.isModuleEditable() &&
-                    this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
-                    filterSubMenuItems.push(this.createColumnMenuItemReduxAction('filter-bar-visbility', 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.createColumnMenuItemReduxAction('filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
-                filterSubMenuItems.push(this.createColumnMenuItemReduxAction('filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
-                    ? LayoutRedux.LayoutColumnFilterUnSuspend(existingColumnFilter)
-                    : LayoutRedux.LayoutColumnFilterSuspend(existingColumnFilter)));
-            }
-            if (ArrayExtensions.IsNotNullOrEmpty(filterSubMenuItems)) {
-                return [
-                    {
-                        name: 'filter',
-                        label: this.moduleInfo.FriendlyName,
-                        isVisible: true,
-                        module: this.moduleInfo.ModuleName,
-                        icon: {
-                            name: this.moduleInfo.Glyph,
-                        },
-                        subItems: filterSubMenuItems,
-                    },
-                ];
-            }
-        }
-    }
     getExistingColumnFilter(column) {
         return this.api.columnFilterApi.getColumnFilters().find((x) => x.ColumnId == column.columnId);
     }

package/src/Strategy/ColumnInfoModule.js

@@ -15,7 +15,7 @@ export class ColumnInfoModule extends AdaptableModuleBase {
             };
             return [
                 this.createMainMenuItemShowPopup({
-                    Name: 'column-info',
+                    Name: 'column-info-show',
                     Label: 'Column Info',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,
@@ -32,7 +32,7 @@ export class ColumnInfoModule extends AdaptableModuleBase {
             };
             return [
                 this.createMainMenuItemShowPopup({
-                    Name: 'column-info',
+                    Name: 'column-info-show',
                     Label: 'Column Info',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/CommentModule.js

@@ -4,13 +4,12 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 export class CommentModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.CommentModuleId, ModuleConstants.CommentFriendlyName, 'comments', 'CommentsPopup', 'comments', api);
-        this.adaptable = api.internalApi.getAdaptableInstance();
     }
     onAdaptableReady() {
         this.loadComments();
     }
     isModuleAvailable() {
-        const options = this.adaptable.api.optionsApi.getCommentOptions();
+        const options = this.api.optionsApi.getCommentOptions();
         if (!options || !options.persistCommentThreads || !options.loadCommentThreads) {
             return false;
         }
@@ -22,7 +21,7 @@ export class CommentModule extends AdaptableModuleBase {
     async loadComments() {
         var _a, _b;
         const commentThreads = await ((_b = (_a = this.api.optionsApi
-            .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.loadCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, createBaseContext(this.adaptable.api)));
+            .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.loadCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, createBaseContext(this.api)));
         this.api.commentApi.loadCommentThreads(commentThreads);
     }
     addContextMenuItems(menuContext) {
@@ -31,17 +30,9 @@ export class CommentModule extends AdaptableModuleBase {
             return undefined;
         }
         const items = [];
-        const isCellCommentable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable;
+        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({
-                adaptableApi: this.adaptable.api,
-                cellAddress: {
-                    PrimaryKeyValue: menuContext.primaryKeyValue,
-                    ColumnId: menuContext.adaptableColumn.columnId,
-                },
-                userName: this.adaptable.api.optionsApi.getUserName(),
-                adaptableId: this.adaptable.adaptableOptions.adaptableId,
-            })) {
+            isCellCommentable(Object.assign({ gridCell: menuContext.gridCell }, createBaseContext(this.api)))) {
             items.push(...this.getAddRemoveCommentsMenuItems(menuContext));
         }
         return items;
@@ -53,17 +44,17 @@ export class CommentModule extends AdaptableModuleBase {
             PrimaryKeyValue: menuContext.primaryKeyValue,
             ColumnId: menuContext.adaptableColumn.columnId,
         };
-        const comments = this.adaptable.api.commentApi.getComments(cellAddress);
+        const comments = this.api.commentApi.getComments(cellAddress);
         if (!this.api.commentApi.internalApi.areCommentsAvailable()) {
             return items;
         }
         if (comments) {
-            items.push(this.createColumnMenuItemClickFunction('comment-remove', 'Remove Comment', this.moduleInfo.Glyph, () => {
+            items.push(this.createMenuItemClickFunction('comment-remove', 'Remove Comment', this.moduleInfo.Glyph, () => {
                 this.api.commentApi.deleteCommentThread(cellAddress);
             }));
         }
         else {
-            items.push(this.createColumnMenuItemClickFunction('comment-add', 'Add Comment', this.moduleInfo.Glyph, () => {
+            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(() => {

package/src/Strategy/CustomSortModule.js

@@ -36,7 +36,7 @@ export class CustomSortModule extends AdaptableModuleBase {
             };
             let name = customSort ? 'custom-sort-edit' : 'custom-sort-add';
             return [
-                this.createColumnMenuItemShowPopup(name, label + 'Custom Sort', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+                this.createMenuItemShowPopup(name, label + 'Custom Sort', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
             ];
         }
     }

package/src/Strategy/DashboardModule.js

@@ -27,29 +27,29 @@ export class DashboardModule extends AdaptableModuleBase {
         if (this.isModuleAvailable()) {
             let menuItems = [];
             if (this.isModuleEditable()) {
-                menuItems.push(this.createColumnMenuItemClickFunction('dashboard-configure', 'Configure', 'settings', () => this.api.dashboardApi.openDashboardSettingsPanel()));
+                menuItems.push(this.createMenuItemClickFunction('dashboard-configure', 'Configure', 'settings', () => this.api.dashboardApi.openDashboardSettingsPanel()));
             }
             if (this.api.dashboardApi.getDashboardState().IsCollapsed) {
-                menuItems.push(this.createColumnMenuItemReduxAction('dashboard-expand', 'Expand', 'expand', DashboardRedux.DashboardSetIsCollapsed(false)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-expand', 'Expand', 'expand', DashboardRedux.DashboardSetIsCollapsed(false)));
             }
             else {
-                menuItems.push(this.createColumnMenuItemReduxAction('dashboard-collapse', 'Collapse', 'collapse', DashboardRedux.DashboardSetIsCollapsed(true)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-collapse', 'Collapse', 'collapse', DashboardRedux.DashboardSetIsCollapsed(true)));
             }
             if (this.api.dashboardApi.getDashboardState().IsFloating) {
-                menuItems.push(this.createColumnMenuItemReduxAction('dashboard-dock', 'Dock', 'dock', DashboardRedux.DashboardSetIsFloating(false)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-dock', 'Dock', 'dock', DashboardRedux.DashboardSetIsFloating(false)));
             }
             else if (this.api.optionsApi.getDashboardOptions().canFloat) {
-                menuItems.push(this.createColumnMenuItemReduxAction('dashboard-float', 'Float', 'dock', DashboardRedux.DashboardSetIsFloating(true)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-float', 'Float', 'dock', DashboardRedux.DashboardSetIsFloating(true)));
             }
             if (this.api.dashboardApi.getDashboardState().IsHidden) {
-                menuItems.push(this.createColumnMenuItemReduxAction('dashboard-show', 'Show', 'visibility-on-bold', DashboardRedux.DashboardSetIsHidden(false)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-show', 'Show', 'visibility-on-bold', DashboardRedux.DashboardSetIsHidden(false)));
             }
             else {
-                menuItems.push(this.createColumnMenuItemReduxAction('dashboard-hide', 'Hide', 'visibility-off-bold', DashboardRedux.DashboardSetIsHidden(true)));
+                menuItems.push(this.createMenuItemReduxAction('dashboard-hide', 'Hide', 'visibility-off-bold', DashboardRedux.DashboardSetIsHidden(true)));
             }
             return [
                 {
-                    name: 'dashboard',
+                    name: 'parent',
                     label: this.moduleInfo.FriendlyName,
                     isVisible: true,
                     module: this.moduleInfo.ModuleName,

package/src/Strategy/DataImportModule.js

@@ -26,6 +26,6 @@ export class DataImportModule extends AdaptableModuleBase {
             source: source,
             maxWidth: this.getPopupMaxWidth(),
         };
-        return this.createColumnMenuItemShowPopup('data-import', 'Import Data', this.moduleInfo.Popup, this.moduleInfo.Glyph, moduleParams);
+        return this.createMenuItemShowPopup('data-import', 'Import Data', this.moduleInfo.Popup, this.moduleInfo.Glyph, moduleParams);
     }
 }

package/src/Strategy/ExportModule.js

@@ -86,16 +86,16 @@ export class ExportModule extends AdaptableModuleBase {
     buildReportMenuItems(report) {
         const menuItems = [];
         for (const destination of this.api.exportApi.getAvailableExportDestinations()) {
-            menuItems.push(this.createColumnMenuItemClickFunction(this.getMenuName(destination), destination, this.moduleInfo.Glyph, () => this.export(report, destination)));
+            menuItems.push(this.createMenuItemClickFunction(this.getMenuName(destination), destination, this.moduleInfo.Glyph, () => this.export(report, destination)));
         }
         for (const customDestination of this.api.exportApi.getCustomDestinations()) {
-            menuItems.push(this.createColumnMenuItemClickFunction('export-custom-destination', customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));
+            menuItems.push(this.createMenuItemClickFunction('export-custom-destination', customDestination.name, this.moduleInfo.Glyph, () => this.export(report, customDestination.name)));
         }
         return menuItems;
     }
     buildExportMenuItem(label, subItems) {
         return {
-            name: 'export',
+            name: 'parent',
             label: label,
             module: this.moduleInfo.ModuleName,
             isVisible: true,

package/src/Strategy/Fdc3Module.js

@@ -27,7 +27,7 @@ export class Fdc3Module extends AdaptableModuleBase {
             contextMenuItems.sort((a, b) => a.label.localeCompare(b.label));
             if (contextMenuItems.length > 1) {
                 const groupMenuItem = {
-                    name: 'fdc3',
+                    name: 'parent',
                     module: this.moduleInfo.ModuleName,
                     label: 'FDC3',
                     icon: {

package/src/Strategy/FlashingCellModule.js

@@ -69,11 +69,11 @@ export class FlashingCellModule extends AdaptableModuleBase {
                 });
                 if (flashingCellForCurrentColumn) {
                     return [
-                        this.createColumnMenuItemReduxAction('flashing-cell-delete', 'Delete Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionDelete(flashingCellForCurrentColumn)),
+                        this.createMenuItemReduxAction('flashing-cell-delete', 'Delete Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionDelete(flashingCellForCurrentColumn)),
                     ];
                 }
                 return [
-                    this.createColumnMenuItemReduxAction('flashing-cell-add', 'Add Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionAdd({
+                    this.createMenuItemReduxAction('flashing-cell-add', 'Add Flashing Cell', this.moduleInfo.Glyph, FlashingCellRedux.FlashingCellDefinitionAdd({
                         Scope: {
                             ColumnIds: [column.columnId],
                         },
@@ -95,11 +95,11 @@ export class FlashingCellModule extends AdaptableModuleBase {
                     if (flashingCellForRow.flashTarget === 'row' ||
                         (Array.isArray(flashingCellForRow === null || flashingCellForRow === void 0 ? void 0 : flashingCellForRow.flashTarget) &&
                             flashingCellForRow.flashTarget.includes('row'))) {
-                        items.push(this.createColumnMenuItemReduxAction('flashing-row-clear', 'Clear Flashing Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForRow)));
+                        items.push(this.createMenuItemReduxAction('flashing-row-clear', 'Clear Flashing Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForRow)));
                     }
                 }
                 else if (flashingCellForCell && flashingCellForCell.flashTarget === 'cell') {
-                    items.push(this.createColumnMenuItemReduxAction('flashing-cell-clear', 'Clear Flashing Cell', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForCell)));
+                    items.push(this.createMenuItemReduxAction('flashing-cell-clear', 'Clear Flashing Cell', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForCell)));
                 }
             }
         }

package/src/Strategy/FormatColumnModule.js

@@ -45,12 +45,12 @@ export class FormatColumnModule extends AdaptableModuleBase {
                 action: 'New',
                 source: 'ColumnMenu',
             };
-            const createFormatColumnMenuItem = this.createColumnMenuItemShowPopup('format-column-add', 'Create', this.moduleInfo.Popup, 'plus', createPopupParam);
+            const createFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-add', 'Create', this.moduleInfo.Popup, 'plus', createPopupParam);
             const formatColumnsForColumn = this.api.formatColumnApi.getFormatColumnsForColumnId(column.columnId);
             //  .filter((fc) => this.api.scopeApi.isSingleColumnScope(fc.Scope));
             // if no formats then just show Create
             if (ArrayExtensions.IsNullOrEmpty(formatColumnsForColumn)) {
-                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('format-column-add', 'Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, createPopupParam));
+                returnColumnMenuItems.push(this.createMenuItemShowPopup('format-column-add', 'Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, createPopupParam));
                 // if 1 format then show a Create and an Edit
             }
             else if (formatColumnsForColumn.length == 1) {
@@ -60,9 +60,9 @@ export class FormatColumnModule extends AdaptableModuleBase {
                     value: formatColumnsForColumn[0],
                     source: 'ColumnMenu',
                 };
-                const editFormatColumnMenuItem = this.createColumnMenuItemShowPopup('format-column-edit', 'Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
+                const editFormatColumnMenuItem = this.createMenuItemShowPopup('format-column-edit', 'Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
                 returnColumnMenuItems.push({
-                    name: 'format-column',
+                    name: 'parent',
                     label: 'Format Column',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,
@@ -77,9 +77,9 @@ export class FormatColumnModule extends AdaptableModuleBase {
                 const moduleInfo = this.api.internalApi
                     .getModuleService()
                     .getModuleInfoByModule('FormatColumn');
-                const editFormatColumnMenuItem = this.createColumnMenuItemReduxAction('format-column-edit', 'Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
+                const editFormatColumnMenuItem = this.createMenuItemReduxAction('format-column-edit', 'Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
                 returnColumnMenuItems.push({
-                    name: 'format-column',
+                    name: 'parent',
                     label: 'Format Column',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,

package/src/Strategy/FreeTextColumnModule.js

@@ -28,7 +28,7 @@ export class FreeTextColumnModule extends AdaptableModuleBase {
                     source: 'ColumnMenu',
                 };
                 return [
-                    this.createColumnMenuItemShowPopup('free-text-column-edit', 'Edit Free Text Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+                    this.createMenuItemShowPopup('free-text-column-edit', 'Edit Free Text Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
                 ];
             }
         }

package/src/Strategy/GridInfoModule.js

@@ -11,7 +11,7 @@ export class GridInfoModule extends AdaptableModuleBase {
         if (this.isModuleAvailable()) {
             return [
                 this.createMainMenuItemShowPopup({
-                    Name: 'grid-info',
+                    Name: 'grid-info-show',
                     Label: 'Grid Info',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,
@@ -23,7 +23,7 @@ export class GridInfoModule extends AdaptableModuleBase {
         if (this.isModuleAvailable()) {
             return [
                 this.createMainMenuItemShowPopup({
-                    Name: 'grid-info',
+                    Name: 'grid-info-show',
                     Label: 'Grid Info',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/LayoutModule.js

@@ -145,7 +145,7 @@ export class LayoutModule extends AdaptableModuleBase {
         if (this.isModuleEditable()) {
             const isReadOnlyLayout = this.api.layoutApi.isCurrentLayoutReadOnly();
             if (!isReadOnlyLayout) {
-                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
+                returnColumnMenuItems.push(this.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
                     action: 'Edit',
                     source: 'ColumnMenu',
                     value: this.api.layoutApi.getCurrentLayout(),
@@ -153,10 +153,10 @@ export class LayoutModule extends AdaptableModuleBase {
             }
             if (column) {
                 if (!isReadOnlyLayout) {
-                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-caption-change', 'Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
+                    returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-caption-change', 'Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
                 }
                 if (column.hideable) {
-                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-hide', 'Hide Column', 'visibility-off-bold', () => {
+                    returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-hide', 'Hide Column', 'visibility-off-bold', () => {
                         this.api.columnApi.hideColumn(column.columnId);
                     }));
                 }
@@ -165,24 +165,24 @@ export class LayoutModule extends AdaptableModuleBase {
             if (column) {
                 const hasExistingSelection = (_b = (_a = this.api.gridApi.getSelectedCellInfo()) === null || _a === void 0 ? void 0 : _a.gridCells) === null || _b === void 0 ? void 0 : _b.length;
                 if (hasExistingSelection) {
-                    selectMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-select-preserve', 'Column (Preserve Selection)', 'column-add', () => {
+                    selectMenuItems.push(this.createMenuItemClickFunction('layout-column-select-preserve', 'Column (Preserve Selection)', 'column-add', () => {
                         this.api.columnApi.addColumnToSelection(column.columnId);
                     }));
-                    selectMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-select-reset', 'Column (Reset Selection)', 'columns', () => {
+                    selectMenuItems.push(this.createMenuItemClickFunction('layout-column-select-reset', 'Column (Reset Selection)', 'columns', () => {
                         this.api.columnApi.selectColumn(column.columnId);
                     }));
                 }
                 else {
-                    selectMenuItems.push(this.createColumnMenuItemClickFunction('layout-column-select', 'Column', 'columns', () => {
+                    selectMenuItems.push(this.createMenuItemClickFunction('layout-column-select', 'Column', 'columns', () => {
                         this.api.columnApi.selectColumn(column.columnId);
                     }));
                 }
             }
-            selectMenuItems.push(this.createColumnMenuItemClickFunction('layout-select-all', 'Whole Grid', this.moduleInfo.Glyph, () => {
+            selectMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Whole Grid', this.moduleInfo.Glyph, () => {
                 this.api.gridApi.selectAll();
             }));
             returnColumnMenuItems.push({
-                name: 'layout-select',
+                name: 'layout-select-parent',
                 label: 'Select',
                 isVisible: true,
                 module: this.moduleInfo.ModuleName,
@@ -197,7 +197,7 @@ export class LayoutModule extends AdaptableModuleBase {
     addContextMenuItems(menuContext) {
         let returnColumnMenuItems = [];
         if (this.isModuleEditable() && !this.api.layoutApi.isCurrentLayoutReadOnly()) {
-            returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
+            returnColumnMenuItems.push(this.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
                 action: 'Edit',
                 source: 'ColumnMenu',
             }));
@@ -209,19 +209,19 @@ export class LayoutModule extends AdaptableModuleBase {
             let clickFunction = () => {
                 this.api.gridApi.deselectAll();
             };
-            returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('layout-clear-selection', 'Clear Selected Cells', 'undo', clickFunction));
+            returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-clear-selection', 'Clear Selected Cells', 'undo', clickFunction));
             if (this.isModuleAvailable()) {
                 let gridMenuItems = [];
                 let autoSizeFunction = () => {
                     this.api.columnApi.autosizeAllColumns();
                 };
-                gridMenuItems.push(this.createColumnMenuItemClickFunction('layout-auto-size', 'Auto Size', 'arrow-expand', autoSizeFunction));
+                gridMenuItems.push(this.createMenuItemClickFunction('layout-auto-size', 'Auto Size', 'arrow-expand', autoSizeFunction));
                 let clickFunction = () => {
                     this.api.gridApi.selectAll();
                 };
-                gridMenuItems.push(this.createColumnMenuItemClickFunction('layout-select-all', 'Select', 'tab-unselected', clickFunction));
+                gridMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Select', 'tab-unselected', clickFunction));
                 returnColumnMenuItems.push({
-                    name: 'layout-grid',
+                    name: 'layout-grid-parent',
                     label: 'Grid',
                     module: this.moduleInfo.ModuleName,
                     isVisible: true,

package/src/Strategy/NoteModule.js

@@ -1,4 +1,5 @@
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
+import { createBaseContext } from '../Utilities/ObjectFactory';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 export class NoteModule extends AdaptableModuleBase {
     constructor(api) {
@@ -14,18 +15,14 @@ export class NoteModule extends AdaptableModuleBase {
         if (!this.isModuleAvailable()) {
             return undefined;
         }
+        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({
-                adaptableApi: this.adaptable.api,
-                address: {
-                    PrimaryKeyValue: menuContext.primaryKeyValue,
-                    ColumnId: menuContext.adaptableColumn.columnId,
-                },
-                userName: this.adaptable.api.optionsApi.getUserName(),
-                adaptableId: this.adaptable.adaptableOptions.adaptableId,
-            }))
+            isCellNotable(Object.assign({ gridCell: menuContext.gridCell }, createBaseContext(this.api))))
             items.push(...this.getAddRemoveNoteMenuItems(menuContext));
         return items;
     }
@@ -41,12 +38,12 @@ export class NoteModule extends AdaptableModuleBase {
             ColumnId: menuContext.adaptableColumn.columnId,
         })) !== null && _a !== void 0 ? _a : [];
         if (note) {
-            items.push(this.createColumnMenuItemClickFunction('note-remove', 'Remove Note', this.moduleInfo.Glyph, () => {
+            items.push(this.createMenuItemClickFunction('note-remove', 'Remove Note', this.moduleInfo.Glyph, () => {
                 this.api.noteApi.deleteNote(note);
             }));
         }
         else {
-            items.push(this.createColumnMenuItemClickFunction('note-add', 'Add Note', this.moduleInfo.Glyph, () => {
+            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({

package/src/Strategy/PlusMinusModule.js

@@ -60,7 +60,7 @@ export class PlusMinusModule extends AdaptableModuleBase {
                 source: 'ColumnMenu',
             };
             return [
-                this.createColumnMenuItemShowPopup('plus-minus-add', 'Create Plus/Minus Rule', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+                this.createMenuItemShowPopup('plus-minus-add', 'Create Plus/Minus Rule', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
             ];
         }
     }

package/src/Strategy/SettingsPanelModule.js

@@ -9,17 +9,17 @@ export class SettingsPanelModule extends AdaptableModuleBase {
     addColumnMenuItems(column) {
         return [
             // To do : get the icon and name from settings in case they have changed?
-            this.createColumnMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
+            this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
         ];
     }
     addContextMenuItems(menuContext) {
         return [
-            this.createColumnMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
+            this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen()),
         ];
     }
     addModuleMenuItem(source) {
         if (this.isModuleAvailable()) {
-            return this.createColumnMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen());
+            return this.createMenuItemReduxAction('settings-panel-open', 'Open ' + this.moduleInfo.FriendlyName, this.moduleInfo.Glyph, PopupRedux.PopupShowScreen());
         }
     }
 }