npm - @adaptabletools/adaptable-cjs - Versions diffs - 18.0.0-canary.9 → 18.0.0 - Mend

@adaptabletools/adaptable-cjs 18.0.0-canary.9 → 18.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (422) hide show

package/src/Redux/Store/AdaptableStore.js CHANGED Viewed

@@ -33,7 +33,7 @@ const FreeTextColumnRedux = tslib_1.__importStar(require("../ActionsReducers/Fre
 const GridRedux = tslib_1.__importStar(require("../ActionsReducers/GridRedux"));
 const LayoutRedux = tslib_1.__importStar(require("../ActionsReducers/LayoutRedux"));
 const NamedQueryRedux = tslib_1.__importStar(require("../ActionsReducers/NamedQueryRedux"));
-const NotesRedux = tslib_1.__importStar(require("../ActionsReducers/NotesRedux"));
+const NoteRedux = tslib_1.__importStar(require("../ActionsReducers/NoteRedux"));
 const PlusMinusRedux = tslib_1.__importStar(require("../ActionsReducers/PlusMinusRedux"));
 const QueryRedux = tslib_1.__importStar(require("../ActionsReducers/QueryRedux"));
 const QuickSearchRedux = tslib_1.__importStar(require("../ActionsReducers/QuickSearchRedux"));
@@ -127,6 +127,7 @@ class AdaptableStore {
             Popup: PopupRedux.PopupReducer,
             System: SystemRedux.SystemReducer,
             Plugins: PluginsRedux.PluginsReducer,
+            Comment: CommentsRedux.CommentsReducer,
             // Reducers for Persisted State
             Alert: AlertRedux.AlertReducer,
             FlashingCell: FlashingCellRedux.FlashingCellReducer,
@@ -148,8 +149,7 @@ class AdaptableStore {
             ToolPanel: ToolPanelRedux.ToolPanelReducer,
             Charting: ChartingRedux.ChartingReducer,
             StyledColumn: StyledColumnRedux.StyledColumnReducer,
-            Notes: NotesRedux.NotesReducer,
-            Comment: CommentsRedux.CommentsReducer,
+            Note: NoteRedux.NoteReducer,
             Query: QueryRedux.QueryReducer,
             NamedQuery: NamedQueryRedux.NamedQueryReducer,
         };
@@ -269,7 +269,7 @@ exports.AdaptableStore = AdaptableStore;
 const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
     return function (next) {
         return function (action) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
             switch (action.type) {
                 /*******************
                  * NAMED QUERY ACTIONS
@@ -322,9 +322,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  *******************/
                 case SystemRedux.SYSTEM_SUMMARY_ROW_SET: {
                     let nextAction = next(action);
-                    setTimeout(() => {
-                        adaptable.setupRowSummaries();
-                    }, 0);
+                    adaptable.api.layoutApi.internalApi.setupRowSummaries();
                     return nextAction;
                 }
                 /*******************
@@ -777,7 +775,6 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                                 draftLayoutAction = GridRedux.LayoutDraftColumnFilterUnsuspendAll();
                                 break;
                         }
-                        //  GRID FILTER
                         returnAction = next(draftLayoutAction);
                     }
                     setTimeout(() => {
@@ -797,17 +794,27 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case LayoutRedux.LAYOUT_GRID_FILTER_CLEAR:
                 case LayoutRedux.LAYOUT_GRID_FILTER_SUSPEND:
                 case LayoutRedux.LAYOUT_GRID_FILTER_UNSUSPEND: {
-                    setTimeout(() => adaptable.applyGridFiltering(), 5);
-                    adaptable.api.gridFilterApi.internalApi.fireGridFilterAppliedEvent();
-                    adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, null, middlewareAPI.getState().Layout);
                     const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
                     let returnAction;
+                    // - calls GridFilterApplied - examples
+                    adaptable.api.gridFilterApi.internalApi.fireGridFilterAppliedEvent();
+                    // - layout change event, row summary is triggered
+                    adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, null, middlewareAPI.getState().Layout);
+                    setTimeout(() => {
+                        // - agGridApi.onFilterChanged
+                        // - internal 'AdapTableFiltersApplied' event - evaluates row summary
+                        // - refresh selected cells and rows
+                        adaptable.applyGridFiltering();
+                    }, 5);
                     if (((_h = adaptable.adaptableOptions.layoutOptions) === null || _h === void 0 ? void 0 : _h.autoSaveLayouts) &&
                         !currentLayout.IsReadOnly) {
-                        returnAction = action;
+                        return next(action);
                     }
                     else {
-                        // save in draft
+                        if (!middlewareAPI.getState().Grid.CurrentLayout) {
+                            const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
+                            middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
+                        }
                         switch (action.type) {
                             case LayoutRedux.LAYOUT_GRID_FILTER_SET:
                                 returnAction = GridRedux.LayoutDraftGridFilterSet(Object.assign(Object.assign({}, currentLayout.GridFilter), { Expression: action.gridFilter }));
@@ -868,12 +875,12 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                  * Note ACTIONS
                  *******************/
                 /**
-                 * Use Case: Notes has been edited/deleted/added
+                 * Use Case: Note has been edited/deleted/added
                  * Action: Triangle can be removed/added
                  */
-                case NotesRedux.NOTES_ADD:
-                case NotesRedux.NOTES_EDIT:
-                case NotesRedux.NOTES_DELETE: {
+                case NoteRedux.NOTE_ADD:
+                case NoteRedux.NOTE_EDIT:
+                case NoteRedux.NOTE_DELETE: {
                     let returnAction = next(action);
                     const node = adaptable.api.gridApi.getRowNodeForPrimaryKey(returnAction.adaptableNote.PrimaryKeyValue);
                     adaptable.refreshCells([node], [returnAction.adaptableNote.ColumnId], true);
@@ -906,18 +913,18 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         adaptable.refreshCells([node], [columnId], true);
                         requestAnimationFrame(() => {
                             var _a, _b;
-                            const commentThreads = adaptable.api.commentApi.getCommentThreads();
-                            adaptable.api.eventApi.emit('CommentsChanged', adaptable.api.commentApi.getCommentThreads());
+                            const commentThreads = adaptable.api.commentApi.getGridComments();
+                            adaptable.api.eventApi.emit('CommentChanged', adaptable.api.commentApi.getGridComments());
                             (_b = (_a = adaptable.api.optionsApi
-                                .getCommentsOptions()) === null || _a === void 0 ? void 0 : _a.persistCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, commentThreads);
+                                .getCommentOptions()) === null || _a === void 0 ? void 0 : _a.persistCommentThreads) === null || _b === void 0 ? void 0 : _b.call(_a, commentThreads);
                         });
                     }
                     return returnAction;
                 }
                 case CommentsRedux.COMMENTS_LOAD: {
-                    const previousCommentThreads = adaptable.api.commentApi.getCommentThreads();
+                    const previousCommentThreads = adaptable.api.commentApi.getGridComments();
                     let returnAction = next(action);
-                    const newCommentThreads = (_j = adaptable.api.commentApi.getCommentThreads()) !== null && _j !== void 0 ? _j : [];
+                    const newCommentThreads = (_j = adaptable.api.commentApi.getGridComments()) !== null && _j !== void 0 ? _j : [];
                     requestAnimationFrame(() => {
                         let addedCommentThreads = [];
                         let deletedCommentThreads = [];
@@ -934,7 +941,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             }
                         }
                         // This cannot be called because it would trigger an infinite loop
-                        // adaptable.api.eventApi.emit('CommentsChanged', commentThreads);
+                        // adaptable.api.eventApi.emit('CommentChanged', commentThreads);
                         // refresh all comments cells to show or hide the triangle
                         [...addedCommentThreads, ...deletedCommentThreads].forEach((commentThread) => {
                             const node = adaptable.api.gridApi.getRowNodeForPrimaryKey(commentThread.PrimaryKeyValue);
@@ -1018,12 +1025,18 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     let returnAction = next(action);
                     const newLayoutState = middlewareAPI.getState().Layout;
                     adaptable.api.layoutApi.internalApi.fireLayoutChangedEvent(action.type, oldLayoutState, newLayoutState);
+                    // Tell Grid to apply column filtering if filters have been changed in a loaded Layout
                     const oldFilters = (_k = oldLayoutState.Layouts.find((l) => l.Name == oldLayoutState.CurrentLayout)) === null || _k === void 0 ? void 0 : _k.ColumnFilters;
                     const newFilters = (_l = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout)) === null || _l === void 0 ? void 0 : _l.ColumnFilters;
-                    // Tell Grid to apply filtering if filters have been changed in a loaded Layout
                     if (adaptable.api.columnFilterApi.internalApi.areColumnFiltersDifferent(oldFilters, newFilters)) {
                         adaptable.applyColumnFiltering();
                     }
+                    // Tell Grid to apply filtering if filters have been changed in a loaded Layout
+                    const oldGridFilter = (_m = oldLayoutState.Layouts.find((l) => l.Name == oldLayoutState.CurrentLayout)) === null || _m === void 0 ? void 0 : _m.GridFilter;
+                    const newGridFilter = (_o = newLayoutState.Layouts.find((l) => l.Name == newLayoutState.CurrentLayout)) === null || _o === void 0 ? void 0 : _o.GridFilter;
+                    if (adaptable.api.gridFilterApi.internalApi.isGridFilterDifferent(oldGridFilter, newGridFilter)) {
+                        adaptable.applyGridFiltering();
+                    }
                     if (returnAction.type == LayoutRedux.LAYOUT_SELECT ||
                         returnAction.type == LayoutRedux.LAYOUT_DELETE ||
                         returnAction.type == LayoutRedux.LAYOUT_SET_COLUMN_CAPTION) {
@@ -1036,7 +1049,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                             // tell grid the layout has been selected
                             adaptable.setLayout(currentLayout);
                         }
-                        if (!((_m = adaptable.adaptableOptions.layoutOptions) === null || _m === void 0 ? void 0 : _m.autoSaveLayouts)) {
+                        if (!((_p = adaptable.adaptableOptions.layoutOptions) === null || _p === void 0 ? void 0 : _p.autoSaveLayouts)) {
                             middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(currentLayout));
                         }
                     }
@@ -1044,7 +1057,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         returnAction.type == LayoutRedux.LAYOUT_SAVE) {
                         const actionTyped = action;
                         // if autosave is false
-                        if (!((_o = adaptable.adaptableOptions.layoutOptions) === null || _o === void 0 ? void 0 : _o.autoSaveLayouts)) {
+                        if (!((_q = adaptable.adaptableOptions.layoutOptions) === null || _q === void 0 ? void 0 : _q.autoSaveLayouts)) {
                             // and the current layout is saved, make sure we also update the draft
                             if (actionTyped.layout.Name === newLayoutState.CurrentLayout) {
                                 middlewareAPI.dispatch(GridRedux.LayoutUpdateCurrentDraft(actionTyped.layout));
@@ -1273,12 +1286,6 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     }
                     return next(action);
                 }
-                case SystemRedux_1.SYSTEM_VISUAL_EXPORT_BEGIN:
-                case SystemRedux_1.SYSTEM_VISUAL_EXPORT_END: {
-                    let returnAction = next(action);
-                    adaptable.ReportService.resetExcelStyleMemoization();
-                    return returnAction;
-                }
                 /*******************
                  * CHARTING ACTIONS
                  *******************/

package/src/Strategy/AdaptableModuleBase.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { Action } from 'redux';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
 import { MenuItemShowPopup, MenuItemDoReduxAction, MenuItemDoClickFunction } from '../Utilities/MenuItem';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, AdaptableContextMenuItemName, ContextMenuContext, AdaptableColumnMenuItemName } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
@@ -36,19 +36,19 @@ 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;
-    createMainMenuItemShowPopup({ Label, ComponentName, Icon, PopupParams, }: {
+    createModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
+    createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<AdaptableColumnMenuItemName>[] | undefined;
+    createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<AdaptableContextMenuItemName>[] | undefined;
+    createMainMenuItemShowPopup<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>({ Name, Label, ComponentName, Icon, PopupParams, }: {
+        Name: MENU_TYPE_NAME;
         Label: string;
         ComponentName: string;
         Icon: AdaptableSystemIconName;
         PopupParams?: ModuleParams;
-    }): MenuItemShowPopup;
-    createColumnMenuItemClickFunction(Label: string, Icon: AdaptableSystemIconName, ClickFunction: () => void): MenuItemDoClickFunction;
-    createColumnMenuItemReduxAction(Label: string, Icon: AdaptableSystemIconName, Action: Action): MenuItemDoReduxAction;
-    createColumnMenuItemShowPopup(Label: string, ComponentName: string, Icon: AdaptableSystemIconName, PopupParams?: ModuleParams): MenuItemShowPopup;
+    }): MenuItemShowPopup<MENU_TYPE_NAME>;
+    createMenuItemClickFunction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>(Name: MENU_TYPE_NAME, Label: string, Icon: AdaptableSystemIconName, ClickFunction: () => void): MenuItemDoClickFunction<MENU_TYPE_NAME>;
+    createMenuItemReduxAction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>(Name: MENU_TYPE_NAME, Label: string, Icon: AdaptableSystemIconName, Action: Action): MenuItemDoReduxAction<MENU_TYPE_NAME>;
+    createMenuItemShowPopup<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>(Name: MENU_TYPE_NAME, Label: string, ComponentName: string, Icon: AdaptableSystemIconName, PopupParams?: ModuleParams): MenuItemShowPopup<MENU_TYPE_NAME>;
     getTeamSharingAction(): TeamSharingImportInfo<AdaptableObject> | undefined;
     getModuleNamedQueryReferences(): string[];
     getModuleCalculatedColumnReferences(): CalculatedColumn[];

package/src/Strategy/AdaptableModuleBase.js CHANGED Viewed

@@ -75,13 +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: '_navbar',
                 Label: this.moduleInfo.FriendlyName,
                 ComponentName: this.moduleInfo.Popup,
                 Icon: this.moduleInfo.Glyph,
@@ -89,33 +90,29 @@ 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
-    createMainMenuItemShowPopup({ Label, ComponentName, Icon, PopupParams, }) {
-        return new MenuItem_1.MenuItemShowPopup(Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
+    // 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);
     }
     // creates a menu item for the column menu to perform a function
-    createColumnMenuItemClickFunction(Label, Icon, ClickFunction) {
-        return new MenuItem_1.MenuItemDoClickFunction(Label, this.moduleInfo.ModuleName, ClickFunction, Icon, true);
+    createMenuItemClickFunction(Name, Label, Icon, ClickFunction) {
+        return new MenuItem_1.MenuItemDoClickFunction(Name, Label, this.moduleInfo.ModuleName, ClickFunction, Icon, true);
     }
     // creates a menu item for the column menu to enact a Redux action
-    createColumnMenuItemReduxAction(Label, Icon, Action) {
-        return new MenuItem_1.MenuItemDoReduxAction(Label, this.moduleInfo.ModuleName, Action, Icon, true);
+    createMenuItemReduxAction(Name, Label, Icon, Action) {
+        return new MenuItem_1.MenuItemDoReduxAction(Name, Label, this.moduleInfo.ModuleName, Action, Icon, true);
     }
     // popups called by the column menu - invisible if module is hidden or readonly
-    createColumnMenuItemShowPopup(Label, ComponentName, Icon, PopupParams) {
-        return new MenuItem_1.MenuItemShowPopup(Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
+    createMenuItemShowPopup(Name, Label, ComponentName, Icon, PopupParams) {
+        return new MenuItem_1.MenuItemShowPopup(Name, Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
     }
     getTeamSharingAction() {
         return undefined;

package/src/Strategy/AlertModule.d.ts CHANGED Viewed

@@ -1,8 +1,9 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AlertDefinition } from '../PredefinedConfig/AlertState';
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
+import { MenuItemShowPopup } from '../Utilities/MenuItem';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableModuleView, AdaptableObjectCompactView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
@@ -14,7 +15,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): MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
     private handleCellDataChanged;
     private handleGridDataChanged;
     private handleReactiveAlertTriggered;

package/src/Strategy/AlertModule.js CHANGED Viewed

@@ -61,8 +61,8 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (queryExpression) {
             return this.api.expressionApi.getColumnsFromExpression(queryExpression);
         }
-        else if (this.api.scopeApi.scopeHasColumns(alertDefinition.Scope)) {
-            return this.api.scopeApi
+        else if (this.api.columnScopeApi.scopeHasColumns(alertDefinition.Scope)) {
+            return this.api.columnScopeApi
                 .getColumnsForScope(alertDefinition.Scope)
                 .map((adaptableColumn) => adaptableColumn.columnId);
         }
@@ -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) {
@@ -87,7 +87,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     relevantAlert = this.api.alertApi.internalApi.getAdaptableAlertWithHighlightRow(menuContext.rowNode);
                 }
                 if (relevantAlert) {
-                    items.push(this.createColumnMenuItemReduxAction('Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
+                    items.push(this.createMenuItemReduxAction('alert-clear', 'Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
                 }
             }
         }

package/src/Strategy/BulkUpdateModule.d.ts CHANGED Viewed

@@ -1,12 +1,13 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { BulkUpdateValidationResult, IBulkUpdateModule } from './Interface/IBulkUpdateModule';
 import { PreviewInfo } from '../Utilities/Interface/Preview';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { MenuItemShowPopup } from '../Utilities/MenuItem';
+import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 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): MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
     checkCorrectCellSelection(): BulkUpdateValidationResult;
     buildPreviewValues(bulkUpdateValue: any): PreviewInfo;
 }

package/src/Strategy/BulkUpdateModule.js CHANGED Viewed

@@ -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 &&
@@ -27,6 +27,7 @@ class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     source: 'ContextMenu',
                 };
                 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 CHANGED Viewed

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import * as CalculatedColumnRedux from '../Redux/ActionsReducers/CalculatedColumnRedux';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { CalculatedColumn } from '../PredefinedConfig/CalculatedColumnState';
@@ -16,9 +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;
-    createEditCalculatedColumnMenuItem(column: AdaptableColumn): AdaptableMenuItem[];
+    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
     getTeamSharingAction(): TeamSharingImportInfo<CalculatedColumn>;
     toView(calculateColumn: CalculatedColumn): {
         items: AdaptableObjectItemView[];

package/src/Strategy/CalculatedColumnModule.js CHANGED Viewed

@@ -38,12 +38,19 @@ 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);
+            const popupParam = {
+                column: column,
+                action: 'Edit',
+                source: 'ColumnMenu',
+            };
+            return [
+                this.createMenuItemShowPopup('calculated-column-edit', 'Edit Calculated Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+            ];
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (!this.isModuleAvailable()) {
             return;
         }
@@ -51,19 +58,16 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             this.isCalculatedColumn(menuContext.adaptableColumn) &&
             !menuContext.isRowGroupColumn &&
             menuContext.isSingleSelectedCell) {
-            return this.createEditCalculatedColumnMenuItem(menuContext.adaptableColumn);
+            const popupParam = {
+                column: menuContext.adaptableColumn,
+                action: 'Edit',
+                source: 'ContextMenu',
+            };
+            return [
+                this.createMenuItemShowPopup('calculated-column-edit', 'Edit Calculated Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+            ];
         }
     }
-    createEditCalculatedColumnMenuItem(column) {
-        let popupParam = {
-            column: column,
-            action: 'Edit',
-            source: 'ColumnMenu',
-        };
-        return [
-            this.createColumnMenuItemShowPopup('Edit Calculated Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
-        ];
-    }
     getTeamSharingAction() {
         return {
             ModuleEntities: this.api.calculatedColumnApi.getCalculatedColumns(),

package/src/Strategy/CellSummaryModule.d.ts CHANGED Viewed

@@ -1,20 +1,20 @@
 /// <reference types="react" />
-import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { ICellSummaryModule } from './Interface/ICellSummaryModule';
-import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
-import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
+import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
+import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { SelectedCellInfo } from '../PredefinedConfig/Selection/SelectedCellInfo';
+import { AdaptableModuleBase } from './AdaptableModuleBase';
+import { ICellSummaryModule } from './Interface/ICellSummaryModule';
 export declare class CellSummaryModule extends AdaptableModuleBase implements ICellSummaryModule {
     cachedCellSummary: WeakMap<SelectedCellInfo<any>, CellSummmary>;
     constructor(api: AdaptableApi);
     getViewAccessLevel(): AccessLevel;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    private createCellSummaryMenuItem;
+    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
     createCellSummary(selectedCellInfo: SelectedCellInfo): CellSummmary;
+    private getWeightedAverageCellSummary;
     getViewProperties(): {
         getStatusBarPanelProps(): {
             view: () => JSX.Element;