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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "18.0.0-canary.15",
+  "version": "18.0.0-canary.17",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -31,7 +31,6 @@ import { AgGridAdapter } from '../agGrid/AgGridAdapter';
 import { AgGridColumnAdapter } from '../agGrid/AgGridColumnAdapter';
 import { AgGridMenuAdapter } from '../agGrid/AgGridMenuAdapter';
 import { RowEditService } from '../Utilities/Services/RowEditService';
-import { ISummaryService } from '../Utilities/Services/Interface/ISummaryService';
 /**
  * Contains AG Grid Options and Modules - used when instantiating AdapTable vanilla
  */
@@ -91,7 +90,6 @@ export interface IAdaptable {
     RowEditService: RowEditService;
     Fdc3Service: Fdc3Service;
     CellPopupService: CellPopupService;
-    SummaryService: ISummaryService;
     /**
      * INTERNAL ADAPTABLE EVENTS
      * These are not called externally - for that we use eventapi

package/src/AdaptableOptions/ColumnFilterOptions.d.ts

@@ -102,6 +102,13 @@ export interface ColumnFilterOptions<TData = any> {
      * @noCodeItem
      */
     showSuspendFilterButton?: boolean;
+    /**
+     * Show Date Picker (or Date Input) in Filter controls
+     * @gridInfoItem
+     * @noCodeItem
+     * @defaultValue true
+     */
+    showDatePicker?: boolean;
 }
 /**
  * Options for managing the Filter Bar (aka Quick Filter)

package/src/AdaptableOptions/MenuOptions.d.ts

@@ -177,6 +177,10 @@ type ModuleGroup = {
     icon?: AdaptableIcon;
     title: string;
 };
-export declare const DEFAULT_ADAPTABLE_CONTEXT_MENU_STRUCTURE: (AdaptableModule | ModuleGroup)[];
 export declare const DEFAULT_ADAPTABLE_COLUMN_MENU_STRUCTURE: (AdaptableModule | ModuleGroup)[];
+/**
+ * Defines the order of Menu Items in the CONTEXT Menu
+ * The items commented out do not have a Context Menu Option
+ */
+export declare const DEFAULT_ADAPTABLE_CONTEXT_MENU_STRUCTURE: (AdaptableModule | ModuleGroup)[];
 export {};

package/src/AdaptableOptions/MenuOptions.js

@@ -1,95 +1,96 @@
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
-export const DEFAULT_ADAPTABLE_CONTEXT_MENU_STRUCTURE = [
-    ModuleConstants.SettingsPanelModuleId,
+export const DEFAULT_ADAPTABLE_COLUMN_MENU_STRUCTURE = [
+    ModuleConstants.CalculatedColumnModuleId,
+    ModuleConstants.CellSummaryModuleId,
+    ModuleConstants.ColumnFilterModuleId,
+    ModuleConstants.ColumnInfoModuleId,
+    ModuleConstants.CustomSortModuleId,
     ModuleConstants.DashboardModuleId,
-    ModuleConstants.ToolPanelModuleId,
-    ModuleConstants.StatusBarModuleId,
-    ModuleConstants.LayoutModuleId,
-    ModuleConstants.FormatColumnModuleId,
-    ModuleConstants.StyledColumnModuleId,
+    ModuleConstants.DataImportModuleId,
     ModuleConstants.FlashingCellModuleId,
-    ModuleConstants.CustomSortModuleId,
-    ModuleConstants.CellSummaryModuleId,
-    ModuleConstants.Fdc3ModuleId,
+    ModuleConstants.FormatColumnModuleId,
+    ModuleConstants.FreeTextColumnModuleId,
     ModuleConstants.GridInfoModuleId,
-    ModuleConstants.ColumnInfoModuleId,
+    ModuleConstants.LayoutModuleId,
+    ModuleConstants.PlusMinusModuleId,
+    ModuleConstants.SettingsPanelModuleId,
+    ModuleConstants.StyledColumnModuleId,
+    ModuleConstants.SystemStatusModuleId, // Single Item - Always present
+    /*
+    // Modules that dont provide a Column Menu
     ModuleConstants.AlertModuleId,
-    ModuleConstants.CalculatedColumnModuleId,
-    ModuleConstants.ExportModuleId,
-    ModuleConstants.ColumnFilterModuleId,
-    {
-        title: 'Edit',
-        icon: {
-            name: 'edit',
-        },
-        modules: [ModuleConstants.SmartEditModuleId, ModuleConstants.BulkUpdateModuleId],
-    },
-    ModuleConstants.TeamSharingModuleId,
+    ModuleConstants.BulkUpdateModuleId,
+    ModuleConstants.ChartingModuleId,
+    ModuleConstants.CommentModuleId,
     ModuleConstants.DataChangeHistoryModuleId,
     ModuleConstants.DataSetModuleId,
-    ModuleConstants.FreeTextColumnModuleId,
+    ModuleConstants.ExportModuleId,
+    ModuleConstants.Fdc3ModuleId,
+    ModuleConstants.GridFilterModuleId,
     ModuleConstants.NamedQueryModuleId,
+    ModuleConstants.NoteModuleId,
     ModuleConstants.QuickSearchModuleId,
-    ModuleConstants.DataSetModuleId,
-    ModuleConstants.AlertModuleId,
-    ModuleConstants.SystemStatusModuleId,
-    ModuleConstants.CalculatedColumnModuleId,
-    ModuleConstants.FreeTextColumnModuleId,
-    ModuleConstants.ExportModuleId,
-    ModuleConstants.DataImportModuleId,
-    ModuleConstants.DataChangeHistoryModuleId,
-    ModuleConstants.PlusMinusModuleId,
-    ModuleConstants.ShortcutModuleId,
-    ModuleConstants.TeamSharingModuleId,
     ModuleConstants.ScheduleModuleId,
+    ModuleConstants.ShortcutModuleId,
+    ModuleConstants.SmartEditModuleId,
     ModuleConstants.StateManagementModuleId,
+    ModuleConstants.StatusBarModuleId,
+    ModuleConstants.TeamSharingModuleId,
     ModuleConstants.ThemeModuleId,
-    ModuleConstants.ChartingModuleId,
-    ModuleConstants.NoteModuleId,
-    ModuleConstants.CommentModuleId,
-];
-export const DEFAULT_ADAPTABLE_COLUMN_MENU_STRUCTURE = [
-    ModuleConstants.SettingsPanelModuleId,
-    ModuleConstants.DashboardModuleId,
     ModuleConstants.ToolPanelModuleId,
-    ModuleConstants.StatusBarModuleId,
-    ModuleConstants.LayoutModuleId,
-    ModuleConstants.FormatColumnModuleId,
-    ModuleConstants.StyledColumnModuleId,
-    ModuleConstants.FlashingCellModuleId,
-    ModuleConstants.CustomSortModuleId,
-    ModuleConstants.CellSummaryModuleId,
-    ModuleConstants.Fdc3ModuleId,
-    ModuleConstants.GridInfoModuleId,
-    ModuleConstants.ColumnInfoModuleId,
+    */
+];
+/**
+ * Defines the order of Menu Items in the CONTEXT Menu
+ * The items commented out do not have a Context Menu Option
+ */
+export const DEFAULT_ADAPTABLE_CONTEXT_MENU_STRUCTURE = [
     ModuleConstants.AlertModuleId,
+    ModuleConstants.BulkUpdateModuleId,
     ModuleConstants.CalculatedColumnModuleId,
-    ModuleConstants.ExportModuleId,
+    ModuleConstants.CellSummaryModuleId,
     ModuleConstants.ColumnFilterModuleId,
-    {
-        title: 'Edit',
-        modules: [ModuleConstants.SmartEditModuleId, ModuleConstants.BulkUpdateModuleId],
-    },
-    ModuleConstants.TeamSharingModuleId,
+    ModuleConstants.ColumnInfoModuleId,
+    ModuleConstants.CommentModuleId,
+    ModuleConstants.DashboardModuleId,
+    ModuleConstants.DataImportModuleId,
+    ModuleConstants.ExportModuleId,
+    ModuleConstants.Fdc3ModuleId,
+    ModuleConstants.FlashingCellModuleId,
+    ModuleConstants.GridInfoModuleId,
+    ModuleConstants.LayoutModuleId,
+    ModuleConstants.NoteModuleId,
+    ModuleConstants.SettingsPanelModuleId,
+    ModuleConstants.SmartEditModuleId,
+    ModuleConstants.SystemStatusModuleId, // Single Item - Always present
+    // this currently doesnt work
+    //  {
+    //    title: 'Edit',
+    //    icon: {
+    //      name: 'edit',
+    //    },
+    //    modules: [ModuleConstants.SmartEditModuleId, ModuleConstants.BulkUpdateModuleId],
+    //   },
+    /*
+    // Modules that dont provide a Context Menu
+    ModuleConstants.ChartingModuleId,
+    ModuleConstants.CustomSortModuleId,
     ModuleConstants.DataChangeHistoryModuleId,
     ModuleConstants.DataSetModuleId,
+    ModuleConstants.FormatColumnModuleId,
     ModuleConstants.FreeTextColumnModuleId,
+    ModuleConstants.GridFilterModuleId,
     ModuleConstants.NamedQueryModuleId,
-    ModuleConstants.QuickSearchModuleId,
-    ModuleConstants.DataSetModuleId,
-    ModuleConstants.AlertModuleId,
-    ModuleConstants.SystemStatusModuleId,
-    ModuleConstants.CalculatedColumnModuleId,
-    ModuleConstants.FreeTextColumnModuleId,
-    ModuleConstants.ExportModuleId,
-    ModuleConstants.DataImportModuleId,
-    ModuleConstants.DataChangeHistoryModuleId,
     ModuleConstants.PlusMinusModuleId,
-    ModuleConstants.ShortcutModuleId,
-    ModuleConstants.TeamSharingModuleId,
+    ModuleConstants.QuickSearchModuleId,
     ModuleConstants.ScheduleModuleId,
+    ModuleConstants.ShortcutModuleId,
     ModuleConstants.StateManagementModuleId,
+    ModuleConstants.StatusBarModuleId,
+    ModuleConstants.StyledColumnModuleId,
+    ModuleConstants.TeamSharingModuleId,
     ModuleConstants.ThemeModuleId,
-    ModuleConstants.ChartingModuleId,
-    ModuleConstants.NoteModuleId,
+    ModuleConstants.ToolPanelModuleId,
+  
+    */
 ];

package/src/Api/GridApi.d.ts

@@ -524,5 +524,5 @@ export interface GridApi {
     /**
      * Opens a window with a transposed view of Grid
      */
-    showTransposedView(transposeConfig: TransposeConfig): void;
+    showTransposedView(transposeConfig?: TransposeConfig): void;
 }

package/src/Api/Implementation/CellSummaryApiImpl.d.ts

@@ -9,9 +9,4 @@ export declare class CellSummaryApiImpl extends ApiBase implements CellSummaryAp
     setCurrentCellSummaryOperation(operation: SummaryOperation | string): void;
     getCellSummaryOperationValue(operation: SummaryOperation | string): any;
     getCurrentCellSummaryOperationValue(): any;
-    /**
-     * Weighted average is availabe only if the current layout has at leat a Weighted Average aggregation defined.
-     */
-    private isWeightedAverageCellSummaryAvailable;
-    private getWeightedAverageCellSummaryOperation;
 }

package/src/Api/Implementation/CellSummaryApiImpl.js

@@ -2,7 +2,6 @@ import { ApiBase } from './ApiBase';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import * as SystemRedux from '../../Redux/ActionsReducers/SystemRedux';
 import { SummaryOperation } from '../../PredefinedConfig/Common/Enums';
-import { cellSummaryWeightedAverage } from '../../agGrid/weightedAverage';
 export class CellSummaryApiImpl extends ApiBase {
     openCellSummaryPopupSettingsPanel() {
         this.showModulePopup(ModuleConstants.CellSummaryModuleId);
@@ -13,12 +12,6 @@ export class CellSummaryApiImpl extends ApiBase {
     getCellSummaryOperationDefinitions() {
         var _a;
         let cellSummaryOperations = (_a = this.getCellSummaryOptions().cellSummaryOperations) !== null && _a !== void 0 ? _a : [];
-        if (this.isWeightedAverageCellSummaryAvailable()) {
-            cellSummaryOperations = [
-                ...cellSummaryOperations,
-                this.getWeightedAverageCellSummaryOperation(),
-            ];
-        }
         return cellSummaryOperations;
     }
     setCurrentCellSummaryOperation(operation) {
@@ -50,6 +43,8 @@ export class CellSummaryApiImpl extends ApiBase {
                 return cellSummary.Std_Deviation;
             case SummaryOperation.Only:
                 return cellSummary.Only;
+            case SummaryOperation.Weighted_Average:
+                return cellSummary.Weighted_Average;
             default:
                 return cellSummary[operation];
         }
@@ -61,20 +56,4 @@ export class CellSummaryApiImpl extends ApiBase {
             : cellSummaryOperation.operationName;
         return this.getCellSummaryOperationValue(summaryOperation);
     }
-    /**
-     * Weighted average is availabe only if the current layout has at leat a Weighted Average aggregation defined.
-     */
-    isWeightedAverageCellSummaryAvailable() {
-        const currentLayout = this.getAdaptableApi().layoutApi.getCurrentLayout();
-        if (currentLayout.AggregationColumns == undefined) {
-            return false;
-        }
-        return Object.values(currentLayout.AggregationColumns).some((aggCol) => typeof aggCol === 'object' && aggCol.type === 'weightedAverage');
-    }
-    getWeightedAverageCellSummaryOperation() {
-        return {
-            operationName: 'Weighted Avg',
-            operationFunction: cellSummaryWeightedAverage,
-        };
-    }
 }

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -132,5 +132,5 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     openGridInfoSettingsPanel(): void;
     getAgGridRowModelType(): RowModelType;
     getVisibleRowCount(): number;
-    showTransposedView(transposeConfig: TransposeConfig): void;
+    showTransposedView(transposeConfig?: TransposeConfig): void;
 }

package/src/Api/Implementation/GridApiImpl.js

@@ -525,7 +525,7 @@ export class GridApiImpl extends ApiBase {
         logDeprecation(this.adaptable.logger, 'GridApi', 'getVisibleRowCount', 'getRowCount');
         return this.getRowCount();
     }
-    showTransposedView(transposeConfig) {
+    showTransposedView(transposeConfig = {}) {
         var _a, _b, _c, _d;
         const transposedColumnId = (_a = transposeConfig.transposedColumnId) !== null && _a !== void 0 ? _a : this.getAdaptableApi().optionsApi.getPrimaryKey();
         const hideTransposedColumn = (_b = transposeConfig.hideTransposedColumn) !== null && _b !== void 0 ? _b : true;

package/src/Api/Internal/AdaptableInternalApi.d.ts

@@ -27,7 +27,6 @@ import { AdaptableObjectTag, AdaptableObjectWithScope } from '../../PredefinedCo
 import { Fdc3Service } from '../../Utilities/Services/Fdc3Service';
 import { CellPopupService } from '../../Utilities/Services/CellPopupService';
 import { RowEditService } from '../../Utilities/Services/RowEditService';
-import { ISummaryService } from '../../Utilities/Services/Interface/ISummaryService';
 export declare class AdaptableInternalApi extends ApiBase {
     getSystemState(): SystemState;
     showPopupConfirmation(confirmation: UIConfirmation): void;
@@ -61,7 +60,6 @@ export declare class AdaptableInternalApi extends ApiBase {
     getReportService(): IReportService;
     getCalculatedColumnExpressionService(): ICalculatedColumnExpressionService;
     getEntitlementService(): IEntitlementService;
-    getSummaryService(): ISummaryService;
     getQueryLanguageService(): IQueryLanguageService;
     getAlertService(): IAlertService;
     getTeamSharingService(): ITeamSharingService;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -102,9 +102,6 @@ export class AdaptableInternalApi extends ApiBase {
     getEntitlementService() {
         return this.adaptable.EntitlementService;
     }
-    getSummaryService() {
-        return this.adaptable.SummaryService;
-    }
     getQueryLanguageService() {
         return this.adaptable.QueryLanguageService;
     }

package/src/PredefinedConfig/Common/Enums.d.ts

@@ -60,7 +60,8 @@ export declare enum SummaryOperation {
     Min = "Min",
     Count = "Count",
     Std_Deviation = "Std Deviation",
-    Only = "Only"
+    Only = "Only",
+    Weighted_Average = "Weighted Avg"
 }
 export declare enum FilterOnDataChangeOptions {
     Always = "Always",

package/src/PredefinedConfig/Common/Enums.js

@@ -75,6 +75,7 @@ export var SummaryOperation;
     SummaryOperation["Count"] = "Count";
     SummaryOperation["Std_Deviation"] = "Std Deviation";
     SummaryOperation["Only"] = "Only";
+    SummaryOperation["Weighted_Average"] = "Weighted Avg";
 })(SummaryOperation || (SummaryOperation = {}));
 export var FilterOnDataChangeOptions;
 (function (FilterOnDataChangeOptions) {

package/src/PredefinedConfig/Common/Menu.d.ts

@@ -5,12 +5,21 @@ import { SelectedCellInfo } from '../Selection/SelectedCellInfo';
 import { SelectedRowInfo } from '../Selection/SelectedRowInfo';
 import { Column, IRowNode } from '@ag-grid-community/core';
 import { AdaptableIcon, BaseContext } from '../../types';
+/**
+ * List of Shipped Adaptable Menu Items
+ */
+export declare const ADAPTABLE_MENU_ITEMS: readonly ["alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-info", "comment-add", "comment-remove", "custom-sort-add", "custom-sort-edit", "dashboard", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "export", "export-clipboard", "export-csv", "export-excel", "export-json", "export-table", "export-custom-destination", "fdc3", "fdc3-broadcast", "fdc3-raise-intent", "filter", "filter-bar-visbility", "filter-clear", "filter-suspend", "filter-cell-value", "flashing-cell-add", "flashing-cell-clear", "flashing-cell-delete", "flashing-row-clear", "format-column", "format-column-add", "format-column-edit", "free-text-column-edit", "grid-info", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-column-caption-change", "layout-column-hide", "layout-column-select", "layout-column-select-preserve", "layout-column-select-reset", "layout-edit", "layout-grid", "layout-select", "layout-select-all", "note-add", "note-remove", "plus-minus-add", "smart-edit-apply", "settings-panel-open", "styled-column-badge", "styled-column", "styled-column-gradient", "styled-column-percent-bar", "styled-column-sparkline", "system-status-show", "internal"];
+export type AdaptableMenuItemName = typeof ADAPTABLE_MENU_ITEMS[number];
 /**
  * Menu item used by Adaptable in both Column and Context Menus
  */
 export interface AdaptableMenuItem {
     /**
-     * Name that appears in the menu
+     * Unique name for the Menu Item
+     */
+    name: AdaptableMenuItemName;
+    /**
+     * Text that appears in the menu
      */
     label: string;
     /**

package/src/PredefinedConfig/Common/Menu.js

@@ -1 +1,71 @@
-export {};
+/**
+ * List of Shipped Adaptable Menu Items
+ */
+export const ADAPTABLE_MENU_ITEMS = [
+    'alert-clear',
+    'bulk-update-apply',
+    'calculated-column-edit',
+    'cell-summary-show',
+    'column-info',
+    'comment-add',
+    'comment-remove',
+    'custom-sort-add',
+    'custom-sort-edit',
+    'dashboard',
+    'dashboard-collapse',
+    'dashboard-configure',
+    'dashboard-dock',
+    'dashboard-expand',
+    'dashboard-float',
+    'dashboard-hide',
+    'dashboard-show',
+    'data-import',
+    'export',
+    'export-clipboard',
+    'export-csv',
+    'export-excel',
+    'export-json',
+    'export-table',
+    'export-custom-destination',
+    'fdc3',
+    'fdc3-broadcast',
+    'fdc3-raise-intent',
+    'filter',
+    'filter-bar-visbility',
+    'filter-clear',
+    'filter-suspend',
+    'filter-cell-value',
+    'flashing-cell-add',
+    'flashing-cell-clear',
+    'flashing-cell-delete',
+    'flashing-row-clear',
+    'format-column',
+    'format-column-add',
+    'format-column-edit',
+    'free-text-column-edit',
+    'grid-info',
+    'layout-aggregated-view',
+    'layout-auto-size',
+    'layout-clear-selection',
+    'layout-column-caption-change',
+    'layout-column-hide',
+    'layout-column-select',
+    'layout-column-select-preserve',
+    'layout-column-select-reset',
+    'layout-edit',
+    'layout-grid',
+    'layout-select',
+    'layout-select-all',
+    'note-add',
+    'note-remove',
+    'plus-minus-add',
+    'smart-edit-apply',
+    'settings-panel-open',
+    'styled-column-badge',
+    'styled-column',
+    'styled-column-gradient',
+    'styled-column-percent-bar',
+    'styled-column-sparkline',
+    'system-status-show',
+    'internal' // used by AdapTable in Settings Panel
+];

package/src/PredefinedConfig/Common/RowSummary.d.ts

@@ -1,5 +1,7 @@
-import { SummarySupportedExpression } from "../../Utilities/Services/Interface/ISummaryService";
 export declare const ROW_SUMMARY_ROW_ID = "__ROW_SUMMARY_ROW_ID";
+export declare const WEIGHTED_AVERAGE_AGGREATED_FUNCTION = "WEIGHTED_AVERAGE";
+export declare const summarySupportedExpressions: readonly ["SUM", "AVG", "MIN", "MAX", "COUNT", "MEDIAN", "MODE", "DISTINCT", "ONLY", "STD_DEVIATION", "OLDEST", "YOUNGEST", "WEIGHTED_AVERAGE"];
+export type SummarySupportedExpression = (typeof summarySupportedExpressions)[number];
 /**
  * Position of Row Summary - 'Top' or 'Bottom'
  */

package/src/PredefinedConfig/Common/RowSummary.js

@@ -1 +1,17 @@
 export const ROW_SUMMARY_ROW_ID = '__ROW_SUMMARY_ROW_ID';
+export const WEIGHTED_AVERAGE_AGGREATED_FUNCTION = 'WEIGHTED_AVERAGE';
+export const summarySupportedExpressions = [
+    'SUM',
+    'AVG',
+    'MIN',
+    'MAX',
+    'COUNT',
+    'MEDIAN',
+    'MODE',
+    'DISTINCT',
+    'ONLY',
+    'STD_DEVIATION',
+    'OLDEST',
+    'YOUNGEST',
+    WEIGHTED_AVERAGE_AGGREATED_FUNCTION,
+];

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -269,8 +269,10 @@ export const LayoutReducer = (state = initialState, action) => {
             return Object.assign(Object.assign({}, state), { Layouts });
         }
         case LAYOUT_COLUMN_FILTER_ADD: {
-            let columnFilters = [...((_b = currentLayout.ColumnFilters) !== null && _b !== void 0 ? _b : [])];
             const columnFilterAction = action.columnFilter;
+            let columnFilters = ((_b = currentLayout.ColumnFilters) !== null && _b !== void 0 ? _b : []).filter(
+            // make sure we are not adding a filter that already exists
+            (cf) => cf.ColumnId !== columnFilterAction.ColumnId);
             AdaptableHelper.addUuidAndSource(columnFilterAction);
             columnFilters.push(columnFilterAction);
             const Layouts = state.Layouts.map((layout) => {
@@ -283,10 +285,13 @@ export const LayoutReducer = (state = initialState, action) => {
         }
         case LAYOUT_COLUMN_FILTER_EDIT: {
             const columnFilterAction = action.columnFilter;
-            let columnFilters = ((_c = currentLayout.ColumnFilters) !== null && _c !== void 0 ? _c : []).map((abObject) => abObject.Uuid === columnFilterAction.Uuid ? columnFilterAction : abObject);
+            // it is safer to change the col id, we cannot have multiple filter on the same id
+            // first we filter out other filters with the same colId, to ensure we have only one
+            const cleanColumnFilters = ((_c = currentLayout.ColumnFilters) !== null && _c !== void 0 ? _c : []).filter((cf) => cf.ColumnId !== columnFilterAction.ColumnId);
+            cleanColumnFilters.push(columnFilterAction);
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
-                    return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });
+                    return Object.assign(Object.assign({}, layout), { ColumnFilters: cleanColumnFilters });
                 }
                 return layout;
             });
@@ -302,14 +307,11 @@ export const LayoutReducer = (state = initialState, action) => {
             return Object.assign(Object.assign({}, state), { Layouts });
         }
         case LAYOUT_COLUMN_FILTER_CLEAR: {
-            let columnFilters = [...((_d = currentLayout.ColumnFilters) !== null && _d !== void 0 ? _d : [])];
             const actionTypedDelete = action;
-            const index = actionTypedDelete.columnFilter
-                ? columnFilters.findIndex((i) => i.Uuid == actionTypedDelete.columnFilter.Uuid)
-                : -1;
-            if (index != -1) {
-                columnFilters.splice(index, 1);
-            }
+            const columnFilters = ((_d = currentLayout.ColumnFilters) !== null && _d !== void 0 ? _d : []).filter((cf) => {
+                // make sure we are deleting all filters on the same column
+                return cf.ColumnId !== actionTypedDelete.columnFilter.ColumnId;
+            });
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {
                     return Object.assign(Object.assign({}, layout), { ColumnFilters: columnFilters });

package/src/Strategy/AdaptableModuleBase.d.ts

@@ -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, AdaptableMenuItemName, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
@@ -40,15 +40,16 @@ export declare abstract class AdaptableModuleBase implements IModule {
     addModuleButtonMenuItem(): AdaptableMenuItem | undefined;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
-    createMainMenuItemShowPopup({ Label, ComponentName, Icon, PopupParams, }: {
+    createMainMenuItemShowPopup({ Name, Label, ComponentName, Icon, PopupParams, }: {
+        Name: AdaptableMenuItemName;
         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;
+    createColumnMenuItemClickFunction(Name: AdaptableMenuItemName, Label: string, Icon: AdaptableSystemIconName, ClickFunction: () => void): MenuItemDoClickFunction;
+    createColumnMenuItemReduxAction(Name: AdaptableMenuItemName, Label: string, Icon: AdaptableSystemIconName, Action: Action): MenuItemDoReduxAction;
+    createColumnMenuItemShowPopup(Name: AdaptableMenuItemName, Label: string, ComponentName: string, Icon: AdaptableSystemIconName, PopupParams?: ModuleParams): MenuItemShowPopup;
     getTeamSharingAction(): TeamSharingImportInfo<AdaptableObject> | undefined;
     getModuleNamedQueryReferences(): string[];
     getModuleCalculatedColumnReferences(): CalculatedColumn[];

package/src/Strategy/AdaptableModuleBase.js

@@ -78,6 +78,7 @@ export class AdaptableModuleBase {
                 maxWidth: this.getPopupMaxWidth(),
             };
             return this.createMainMenuItemShowPopup({
+                Name: 'internal',
                 Label: this.moduleInfo.FriendlyName,
                 ComponentName: this.moduleInfo.Popup,
                 Icon: this.moduleInfo.Glyph,
@@ -98,20 +99,20 @@ export class AdaptableModuleBase {
         return undefined;
     }
     // creates the menu items in the main dropdown
-    createMainMenuItemShowPopup({ Label, ComponentName, Icon, PopupParams, }) {
-        return new MenuItemShowPopup(Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
+    createMainMenuItemShowPopup({ Name, Label, ComponentName, Icon, PopupParams, }) {
+        return new 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 MenuItemDoClickFunction(Label, this.moduleInfo.ModuleName, ClickFunction, Icon, true);
+    createColumnMenuItemClickFunction(Name, Label, Icon, ClickFunction) {
+        return new 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 MenuItemDoReduxAction(Label, this.moduleInfo.ModuleName, Action, Icon, true);
+    createColumnMenuItemReduxAction(Name, Label, Icon, Action) {
+        return new 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 MenuItemShowPopup(Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
+    createColumnMenuItemShowPopup(Name, Label, ComponentName, Icon, PopupParams) {
+        return new MenuItemShowPopup(Name, Label, this.moduleInfo.ModuleName, ComponentName, Icon, true, PopupParams);
     }
     getTeamSharingAction() {
         return undefined;

package/src/Strategy/AlertModule.js

@@ -83,7 +83,7 @@ export class AlertModule extends 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.createColumnMenuItemReduxAction('alert-clear', 'Clear Alert', this.moduleInfo.Glyph, SystemRedux.SystemAlertDelete(relevantAlert)));
                 }
             }
         }

package/src/Strategy/BulkUpdateModule.js

@@ -22,7 +22,7 @@ export class BulkUpdateModule extends AdaptableModuleBase {
                 let popUpParams = {
                     source: 'ContextMenu',
                 };
-                menuItemShowPopup = this.createMainMenuItemShowPopup({
+                menuItemShowPopup = this.createMainMenuItemShowPopup({ Name: 'bulk-update-apply',
                     Label: 'Apply Bulk Update',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/CalculatedColumnModule.js

@@ -57,7 +57,7 @@ export class CalculatedColumnModule extends AdaptableModuleBase {
             source: 'ColumnMenu',
         };
         return [
-            this.createColumnMenuItemShowPopup('Edit Calculated Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+            this.createColumnMenuItemShowPopup('calculated-column-edit', 'Edit Calculated Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
         ];
     }
     getTeamSharingAction() {