@adaptabletools/adaptable 18.0.0-canary.27 → 18.0.0-canary.28

package/src/Api/Implementation/ExpressionApiImpl.js

@@ -7,8 +7,8 @@ export class ExpressionApiImpl extends ApiBase {
         this.internalApi = new ExpressionInternalApi(adaptable);
     }
     isValidBooleanExpression(query, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.getAdaptableApi().internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateBoolean(query, module, { force: true });
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -16,8 +16,8 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidObservableExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.getAdaptableApi().internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateObservable(expression, module);
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -25,8 +25,8 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidAggregatedBooleanExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.getAdaptableApi().internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateAggregatedBoolean(expression, module);
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -34,8 +34,8 @@ export class ExpressionApiImpl extends ApiBase {
         return isValid;
     }
     isValidAggregatedScalarExpression(expression, module, validationErrorMessage) {
-        const { isValid, errorMessage } = this.getAdaptableApi().internalApi
-            .getQueryLanguageService()
+        const { isValid, errorMessage } = this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .validateAggregatedScalar(expression, module);
         if (!isValid && validationErrorMessage) {
             this.logWarn(`${validationErrorMessage} :: ${errorMessage}`);
@@ -47,8 +47,8 @@ export class ExpressionApiImpl extends ApiBase {
     }
     getColumnsFromExpression(expression) {
         try {
-            const columnIds = this.getAdaptableApi().internalApi
-                .getQueryLanguageService()
+            const columnIds = this.getAdaptableApi()
+                .internalApi.getQueryLanguageService()
                 .getColumnsFromExpression(expression);
             columnIds.forEach((columnId) => {
                 const calculatedColumn = this.getAdaptableApi().calculatedColumnApi.getCalculatedColumnForColumnId(columnId);
@@ -79,8 +79,8 @@ export class ExpressionApiImpl extends ApiBase {
         return ((_d = (_c = (_b = (_a = query.BooleanExpression) !== null && _a !== void 0 ? _a : query.ScalarExpression) !== null && _b !== void 0 ? _b : query.ObservableExpression) !== null && _c !== void 0 ? _c : query.AggregatedBooleanExpression) !== null && _d !== void 0 ? _d : query.AggregatedScalarExpression);
     }
     getAdaptableQueryExpressionWithColumnFriendlyNames(query) {
-        return this.getAdaptableApi().internalApi
-            .getQueryLanguageService()
+        return this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .getExpressionWithColumnFriendlyNames(this.getAdaptableQueryExpression(query));
     }
     useCaseSensitivity() {

package/src/Api/Implementation/GridApiImpl.js

@@ -215,8 +215,8 @@ export class GridApiImpl extends ApiBase {
     }
     selectCellRangeByQuery(query, gridCellRange, clearSelection) {
         const filteredRowNodes = [];
-        const isRowNodeInQuery = (rowNode) => this.getAdaptableApi().internalApi
-            .getQueryLanguageService()
+        const isRowNodeInQuery = (rowNode) => this.getAdaptableApi()
+            .internalApi.getQueryLanguageService()
             .evaluateBooleanExpression(query, 'GridInfo', rowNode);
         if (gridCellRange) {
             const [startNode, endNode] = this.getSelectionStartEndNodes(gridCellRange);

package/src/Api/Implementation/ScopeApiImpl.js

@@ -53,8 +53,8 @@ export class ScopeApiImpl extends ApiBase {
         if ('ColumnIds' in scope) {
             return ((scope.ColumnIds.length > 1 ? 'Columns' : 'Column') +
                 ': ' +
-                this.getAdaptableApi().columnApi
-                    .getFriendlyNamesForColumnIds(scope.ColumnIds)
+                this.getAdaptableApi()
+                    .columnApi.getFriendlyNamesForColumnIds(scope.ColumnIds)
                     .map((c) => {
                     return '"' + c + '"';
                 })
@@ -135,8 +135,8 @@ export class ScopeApiImpl extends ApiBase {
         if ('ColumnIds' in scope) {
             let text = scope.ColumnIds.length == 1 ? 'Column: ' : 'Columns: ';
             return (text +
-                this.getAdaptableApi().columnApi
-                    .getFriendlyNamesForColumnIds(scope.ColumnIds)
+                this.getAdaptableApi()
+                    .columnApi.getFriendlyNamesForColumnIds(scope.ColumnIds)
                     .map((c) => {
                     return '"' + c + '"';
                 })

package/src/Api/Internal/ColumnFilterInternalApi.js

@@ -124,8 +124,8 @@ export class ColumnFilterInternalApi extends ApiBase {
         const isClearAndPreviousWasActive = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR &&
             this.getAdaptableApi().columnFilterApi.isColumnFilterActive(action.columnFilter);
         const isClearAllAtLeastOneActiveFilter = action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL &&
-            this.getAdaptableApi().columnFilterApi
-                .getColumnFilters()
+            this.getAdaptableApi()
+                .columnFilterApi.getColumnFilters()
                 .some((columnFilter) => this.getAdaptableApi().columnFilterApi.isColumnFilterActive(columnFilter));
         let isEditTrigger = false;
         if (action.type === LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT) {

package/src/Api/Internal/DashboardInternalApi.js

@@ -51,8 +51,8 @@ export class DashboardInternalApi extends ApiBase {
         return false;
     }
     isToolbarCustom(toolbarName) {
-        return this.getAdaptableApi().dashboardApi
-            .getCustomToolbars()
+        return this.getAdaptableApi()
+            .dashboardApi.getCustomToolbars()
             .some((tb) => tb.name === toolbarName);
     }
     getCustomToolbarRenderContainerId(customToolbarName) {

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -184,8 +184,8 @@ export class FormatColumnInternalApi extends ApiBase {
     evaluateExpression(formatColumn, node) {
         const isValidExpression = this.getAdaptableApi().expressionApi.isValidBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, `Invalid format column rule '${formatColumn.Rule.BooleanExpression}'`);
         return (isValidExpression &&
-            this.getAdaptableApi().internalApi
-                .getQueryLanguageService()
+            this.getAdaptableApi()
+                .internalApi.getQueryLanguageService()
                 .evaluateBooleanExpression(formatColumn.Rule.BooleanExpression, ModuleConstants.FormatColumnModuleId, node));
     }
     /**
@@ -235,7 +235,9 @@ export class FormatColumnInternalApi extends ApiBase {
         });
         const columnsThatNeedRefresh = new Set();
         this.getFormatColumnsDependentOnColumns(impactedColumnIds).forEach((formatColumn) => {
-            this.getAdaptableApi().scopeApi.getColumnsForScope(formatColumn.Scope).forEach((col) => {
+            this.getAdaptableApi()
+                .scopeApi.getColumnsForScope(formatColumn.Scope)
+                .forEach((col) => {
                 columnsThatNeedRefresh.add(col.columnId);
             });
         });

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

@@ -3,7 +3,7 @@ import { GridFilter } from '../../types';
 export declare class GridFilterInternalApi extends ApiBase {
     fireGridFilterAppliedEvent(): void;
     /**
-   * Compares to Grid Filters to see if they are identical
-   */
+     * Compares to Grid Filters to see if they are identical
+     */
     isGridFilterDifferent(oldFilter: GridFilter, newFilter: GridFilter): boolean;
 }

package/src/Api/Internal/GridFilterInternalApi.js

@@ -11,8 +11,8 @@ export class GridFilterInternalApi extends ApiBase {
         }
     }
     /**
-   * Compares to Grid Filters to see if they are identical
-   */
+     * Compares to Grid Filters to see if they are identical
+     */
     isGridFilterDifferent(oldFilter, newFilter) {
         return (oldFilter === null || oldFilter === void 0 ? void 0 : oldFilter.Expression) === (newFilter === null || newFilter === void 0 ? void 0 : newFilter.Expression);
     }

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

@@ -54,4 +54,4 @@ export interface AdaptableBaseIcon {
 /**
  * All AdapTable System Icon names
  */
-export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'comment' | 'comments' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter' | 'rows';
+export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'comment' | 'comments' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'filter-off' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'select-all' | 'select-off' | 'select-fwd' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter' | 'grid-info' | 'rows';

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

@@ -74,7 +74,7 @@ export declare const Fdc3StandardIntents: ("StartCall" | "StartChat" | "StartEma
 /**
  * All FDC3 standard intents
  */
-export type Fdc3StandardIntentType = typeof Fdc3StandardIntents[number];
+export type Fdc3StandardIntentType = (typeof Fdc3StandardIntents)[number];
 /**
  * Custom FDC3 intent
  */
@@ -86,4 +86,4 @@ export type Fdc3IntentType = Fdc3StandardIntentType | Fdc3CustomIntentType;
 /**
  * Valid context for a given FDC3 intent
  */
-export type CompatibleContext<F extends Fdc3StandardIntentType> = typeof Fdc3IntentConfiguration[F]['contexts'][number];
+export type CompatibleContext<F extends Fdc3StandardIntentType> = (typeof Fdc3IntentConfiguration)[F]['contexts'][number];

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

@@ -5,16 +5,16 @@ import { SelectedCellInfo } from '../Selection/SelectedCellInfo';
 import { SelectedRowInfo } from '../Selection/SelectedRowInfo';
 import { Column, IRowNode } from '@ag-grid-community/core';
 import { AdaptableIcon, BaseContext } from '../../types';
-export type AdaptableColumnMenuItemName = typeof ADAPTABLE_COLUMN_MENU_ITEMS[number];
-export type AdaptableContextMenuItemName = typeof ADAPTABLE_CONTEXT_MENU_ITEMS[number];
+export type AdaptableColumnMenuItemName = (typeof ADAPTABLE_COLUMN_MENU_ITEMS)[number];
+export type AdaptableContextMenuItemName = (typeof ADAPTABLE_CONTEXT_MENU_ITEMS)[number];
 /**
  * List of Shipped Adaptable Column Menu Items
  */
-export declare const ADAPTABLE_COLUMN_MENU_ITEMS: readonly ["calculated-column-edit", "cell-summary-show", "column-filter-bar-hide", "column-filter-bar-show", "column-filter-clear", "column-filter-on-cell-value", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "custom-sort-add", "custom-sort-edit", "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-info-show", "layout-column-caption-change", "layout-column-hide", "layout-edit", "layout-select-actions", "layout-column-select", "layout-column-select-preserve", "layout-column-select-reset", "layout-select-all", "plus-minus-add", "settings-panel-open", "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"];
+export declare const ADAPTABLE_COLUMN_MENU_ITEMS: readonly ["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-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"];
 /**
  * List of Shipped Adaptable Context Menu Items
  */
-export declare const ADAPTABLE_CONTEXT_MENU_ITEMS: readonly ["menu-group-parent", "alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-filter-on-cell-value", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "comment-add", "comment-remove", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "export-cells-clipboard", "export-cells-csv", "export-cells-excel", "export-cells-json", "export-cells-table", "export-cells-custom-destination", "export-rows-clipboard", "export-rows-csv", "export-rows-excel", "export-rows-json", "export-rows-table", "export-rows-custom-destination", "fdc3-broadcast", "fdc3-raise-intent", "flashing-cell-clear", "flashing-row-clear", "grid-info-show", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-edit", "layout-select-all", "layout-grid-actions", "note-add", "note-remove", "settings-panel-open", "smart-edit-apply", "system-status-show"];
+export declare const ADAPTABLE_CONTEXT_MENU_ITEMS: readonly ["menu-group", "alert-clear", "bulk-update-apply", "calculated-column-edit", "cell-summary-show", "column-group", "column-filter-on-cell-value", "column-filter-clear", "column-filter-suspend", "column-filter-unsuspend", "column-info-show", "comment-add", "comment-remove", "dashboard-collapse", "dashboard-configure", "dashboard-dock", "dashboard-expand", "dashboard-float", "dashboard-hide", "dashboard-show", "data-import", "export-cells-clipboard", "export-cells-csv", "export-cells-excel", "export-cells-json", "export-cells-table", "export-cells-custom-destination", "export-rows-clipboard", "export-rows-csv", "export-rows-excel", "export-rows-json", "export-rows-table", "export-rows-custom-destination", "fdc3-broadcast", "fdc3-raise-intent", "flashing-cell-clear", "flashing-row-clear", "grid-group", "grid-info-show", "layout-aggregated-view", "layout-auto-size", "layout-clear-selection", "layout-edit", "layout-select-all", "note-add", "note-remove", "settings-panel-open", "smart-edit-apply", "system-status-show"];
 /**
  * Menu item used by Adaptable in both Column and Context Menus
  */

package/src/PredefinedConfig/Common/Menu.js

@@ -4,10 +4,11 @@
 export const ADAPTABLE_COLUMN_MENU_ITEMS = [
     'calculated-column-edit',
     'cell-summary-show',
+    'column-group',
+    'column-filter-group',
     'column-filter-bar-hide',
     'column-filter-bar-show',
     'column-filter-clear',
-    'column-filter-on-cell-value',
     'column-filter-suspend',
     'column-filter-unsuspend',
     'column-info-show',
@@ -26,17 +27,18 @@ export const ADAPTABLE_COLUMN_MENU_ITEMS = [
     '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-select-actions',
     'layout-column-select',
     'layout-column-select-preserve',
     'layout-column-select-reset',
-    'layout-select-all',
+    'layout-grid-select',
     'plus-minus-add',
     'settings-panel-open',
+    'styling-group',
     'styled-column-badge-add',
     'styled-column-badge-edit',
     'styled-column-gradient-add',
@@ -52,11 +54,12 @@ export const ADAPTABLE_COLUMN_MENU_ITEMS = [
  * List of Shipped Adaptable Context Menu Items
  */
 export const ADAPTABLE_CONTEXT_MENU_ITEMS = [
-    'menu-group-parent',
+    'menu-group',
     'alert-clear',
     'bulk-update-apply',
     'calculated-column-edit',
     'cell-summary-show',
+    'column-group',
     'column-filter-on-cell-value',
     'column-filter-clear',
     'column-filter-suspend',
@@ -88,13 +91,13 @@ export const ADAPTABLE_CONTEXT_MENU_ITEMS = [
     'fdc3-raise-intent',
     'flashing-cell-clear',
     'flashing-row-clear',
+    'grid-group',
     'grid-info-show',
     'layout-aggregated-view',
     'layout-auto-size',
     'layout-clear-selection',
     'layout-edit',
     'layout-select-all',
-    'layout-grid-actions',
     'note-add',
     'note-remove',
     'settings-panel-open',

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

@@ -18,9 +18,9 @@ export interface TransposeConfig {
      */
     visibleColumns?: boolean;
     /**
-      * Only show curerntly visible Rows
-      * @defaultValue false
-      */
+     * Only show curerntly visible Rows
+     * @defaultValue false
+     */
     visibleRows?: boolean;
     /**
      * Autosize columns in transposed view

package/src/Strategy/ColumnFilterModule.js

@@ -47,7 +47,7 @@ export class ColumnFilterModule extends AdaptableModuleBase {
                 const isFilterVisible = this.api.columnFilterApi.isQuickFilterVisible();
                 if (this.isModuleEditable() &&
                     this.api.optionsApi.getColumnFilterOptions().useAdaptableColumnFiltering) {
-                    columnFilterMenuItems.push(this.createMenuItemReduxAction(isFilterVisible ? 'column-filter-bar-hide' : 'column-filter-bar-show', isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'unchecked' : 'check', isFilterVisible
+                    columnFilterMenuItems.push(this.createMenuItemReduxAction(isFilterVisible ? 'column-filter-bar-hide' : 'column-filter-bar-show', isFilterVisible ? 'Hide Filter Bar' : 'Show Filter Bar', isFilterVisible ? 'filter-off' : 'filter', isFilterVisible
                         ? SystemRedux.SystemQuickFilterBarHide()
                         : SystemRedux.SystemQuickFilterBarShow()));
                 }

package/src/Strategy/ColumnInfoModule.js

@@ -18,7 +18,7 @@ export class ColumnInfoModule extends AdaptableModuleBase {
                     Name: 'column-info-show',
                     Label: 'Column Info',
                     ComponentName: this.moduleInfo.Popup,
-                    Icon: this.moduleInfo.Glyph,
+                    Icon: 'info',
                     PopupParams: columnPopUpParams,
                 }),
             ];
@@ -35,7 +35,7 @@ export class ColumnInfoModule extends AdaptableModuleBase {
                     Name: 'column-info-show',
                     Label: 'Column Info',
                     ComponentName: this.moduleInfo.Popup,
-                    Icon: this.moduleInfo.Glyph,
+                    Icon: 'info',
                     PopupParams: columnPopUpParams,
                 }),
             ];

package/src/Strategy/GridInfoModule.js

@@ -2,7 +2,7 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import * as ModuleConstants from '../Utilities/Constants/ModuleConstants';
 export class GridInfoModule extends AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.GridInfoModuleId, ModuleConstants.GridInfoFriendlyName, 'align-justify', 'GridInfoPopup', 'Display information about the Grid, the Options selected and all columns', api);
+        super(ModuleConstants.GridInfoModuleId, ModuleConstants.GridInfoFriendlyName, 'grid-info', 'GridInfoPopup', 'Display information about the Grid, the Options selected and all columns', api);
     }
     getViewAccessLevel() {
         return 'Full';

package/src/Strategy/LayoutModule.js

@@ -154,7 +154,7 @@ export class LayoutModule extends AdaptableModuleBase {
         let returnColumnMenuItems = [];
         const isReadOnlyLayout = this.api.layoutApi.isCurrentLayoutReadOnly();
         if (!isReadOnlyLayout) {
-            returnColumnMenuItems.push(this.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
+            returnColumnMenuItems.push(this.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, 'edit-table', {
                 action: 'Edit',
                 source: 'ColumnMenu',
                 value: this.api.layoutApi.getCurrentLayout(),
@@ -171,20 +171,20 @@ export class LayoutModule extends AdaptableModuleBase {
             }
             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) {
-                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select-preserve', 'Column (Preserve Selection)', 'column-add', () => {
+                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select-preserve', 'Select Column (Preserve Selection)', 'select-fwd', () => {
                     this.api.columnApi.addColumnToSelection(column.columnId);
                 }));
-                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select-reset', 'Column (Reset Selection)', 'columns', () => {
+                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select-reset', 'Select Column (Reset Selection)', 'tab-unselected', () => {
                     this.api.columnApi.selectColumn(column.columnId);
                 }));
             }
             else {
-                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select', 'Column', 'columns', () => {
+                returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-column-select', 'Select Column', 'tab-unselected', () => {
                     this.api.columnApi.selectColumn(column.columnId);
                 }));
             }
         }
-        returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Whole Grid', this.moduleInfo.Glyph, () => {
+        returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-grid-select', 'Select Grid', 'select-all', () => {
             this.api.gridApi.selectAll();
         }));
         return returnColumnMenuItems;
@@ -192,7 +192,7 @@ export class LayoutModule extends AdaptableModuleBase {
     createContextMenuItems(menuContext) {
         let returnColumnMenuItems = [];
         if (this.isModuleEditable() && !this.api.layoutApi.isCurrentLayoutReadOnly()) {
-            returnColumnMenuItems.push(this.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
+            returnColumnMenuItems.push(this.createMenuItemShowPopup('layout-edit', 'Edit Layout', this.moduleInfo.Popup, 'edit-table', {
                 action: 'Edit',
                 source: 'ColumnMenu',
             }));
@@ -201,11 +201,11 @@ export class LayoutModule extends AdaptableModuleBase {
             ArrayExtensions.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns)) ||
             (menuContext.selectedRowInfo &&
                 ArrayExtensions.IsNotNullOrEmpty(menuContext.selectedRowInfo.gridRows))) {
-            returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-clear-selection', 'Clear Selected Cells', 'undo', () => {
+            returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-clear-selection', 'Clear Selected Cells', 'select-off', () => {
                 this.api.gridApi.deselectAll();
             }));
         }
-        returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Select', 'tab-unselected', () => {
+        returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-select-all', 'Select Grid', 'select-all', () => {
             this.api.gridApi.selectAll();
         }));
         returnColumnMenuItems.push(this.createMenuItemClickFunction('layout-auto-size', 'Auto Size', 'arrow-expand', () => {

package/src/Strategy/StyledColumnModule.js

@@ -80,7 +80,8 @@ export class StyledColumnModule extends AdaptableModuleBase {
                             },
                         };
                         const icon = this.getGlyphForStyledColumn(styledColumn);
-                        const label = `Edit ${this.getTypeLabel(styledColumn)} Style`;
+                        const typeLabel = this.getTypeLabel(styledColumn);
+                        const label = `Edit ${typeLabel}`;
                         const name = this.getTypeName(styledColumn);
                         returnColumnMenuItems.push(this.createMenuItemShowPopup(name, label, this.moduleInfo.Popup, icon, popupParam));
                     }
@@ -93,7 +94,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
                         value: newStyledColumn,
                         config: {},
                     };
-                    const badgeLabel = column.dataType === 'Number' ? 'Badge' : 'Create Badge Style';
+                    const badgeLabel = 'Create Badge Style';
                     const newBadgeButton = this.createMenuItemShowPopup('styled-column-badge-add', badgeLabel, this.moduleInfo.Popup, 'badge', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { BadgeStyle: {
                                 Badges: [ObjectFactory.CreateDefaultStyledColumnBadge()],
                             } }), config: {
@@ -106,12 +107,12 @@ export class StyledColumnModule extends AdaptableModuleBase {
                             const emptyRanges = this.api.scopeApi.createCellColorRangesForScope({
                                 ColumnIds: [column.columnId],
                             });
-                            const newGrandientButton = this.createMenuItemShowPopup('styled-column-gradient-add', 'Gradient', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
+                            const newGrandientButton = this.createMenuItemShowPopup('styled-column-gradient-add', 'Create Gradient Column', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
                                         CellRanges: emptyRanges,
                                     } }), config: {
                                     defaultCurrentSectionName: 'Style',
                                 } }));
-                            const newPrecentBarButton = this.createMenuItemShowPopup('styled-column-percent-bar-add', 'Percent Bar', this.moduleInfo.Popup, 'percent', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { PercentBarStyle: {
+                            const newPercentBarButton = this.createMenuItemShowPopup('styled-column-percent-bar-add', 'Create Percent Bar', this.moduleInfo.Popup, 'percent', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { PercentBarStyle: {
                                         CellRanges: emptyRanges,
                                     } }), config: {
                                     defaultCurrentSectionName: 'Style',
@@ -122,9 +123,9 @@ export class StyledColumnModule extends AdaptableModuleBase {
                             //   module: this.moduleInfo.ModuleName,
                             //   isVisible: true,
                             //   icon: { name: this.moduleInfo.Glyph },
-                            //   subItems: [newGrandientButton, newPrecentBarButton, newBadgeButton],
+                            //   subItems: [newGrandientButton, newPercentBarButton, newBadgeButton],
                             // });
-                            returnColumnMenuItems.push(...[newGrandientButton, newPrecentBarButton, newBadgeButton]);
+                            returnColumnMenuItems.push(...[newGrandientButton, newPercentBarButton, newBadgeButton]);
                             break;
                         case 'String':
                             returnColumnMenuItems.push(newBadgeButton);
@@ -223,7 +224,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
     getTypeLabel(styledColumn) {
         let type = null;
         if (styledColumn.GradientStyle) {
-            type = 'Gradient';
+            type = 'Gradient Column';
         }
         else if (styledColumn.PercentBarStyle) {
             type = 'Percent Bar';
@@ -232,7 +233,7 @@ export class StyledColumnModule extends AdaptableModuleBase {
             type = 'Spark Line';
         }
         else if (styledColumn.BadgeStyle) {
-            type = 'Badge';
+            type = 'Badge Style';
         }
         return type;
     }

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -1100,13 +1100,15 @@ const mapAggregationToCumulation = (aggregationParameter, overColumnParameter, c
                                 if ((_a = aggregationEvaluation.context) === null || _a === void 0 ? void 0 : _a.weightParam) {
                                     // weighted average
                                     const weightValue = (_b = context.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, aggregationEvaluation.context.weightParam.value)) !== null && _b !== void 0 ? _b : 0;
-                                    cumulationBag.currentValue = cumulationBag.currentValue + rowValue * weightValue;
+                                    cumulationBag.currentValue =
+                                        cumulationBag.currentValue + rowValue * weightValue;
                                     cumulationBag.numberOfCumulatedValues =
                                         cumulationBag.numberOfCumulatedValues + weightValue;
                                 }
                                 else {
                                     cumulationBag.currentValue = cumulationBag.currentValue + rowValue;
-                                    cumulationBag.numberOfCumulatedValues = cumulationBag.numberOfCumulatedValues + 1;
+                                    cumulationBag.numberOfCumulatedValues =
+                                        cumulationBag.numberOfCumulatedValues + 1;
                                 }
                             }
                             if (cumulationBag.numberOfCumulatedValues !== 0) {

package/src/View/CalculatedColumn/Wizard/CalculatedColumnWizard.d.ts

@@ -2,7 +2,7 @@
 import { CalculatedColumn } from '../../../types';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
 export declare const calculatedColumnTypes: readonly ["ScalarExpression", "AggregatedScalarExpression", "CumulativeAggregatedExpression", "QuantileAggregatedExpression"];
-export type ExpressionType = typeof calculatedColumnTypes[number];
+export type ExpressionType = (typeof calculatedColumnTypes)[number];
 export interface CalculatedColumnWizardProps extends AdaptableOnePageWizardProps<CalculatedColumn> {
 }
 export declare const CalculatedColumnWizard: (props: CalculatedColumnWizardProps) => JSX.Element;

package/src/agGrid/AdaptableAgGrid.js

@@ -1690,7 +1690,8 @@ export class AdaptableAgGrid {
                 return acc;
             }
             const ColumnGroupId = columnGroup.getGroupId();
-            const AllowGroupSplit = !columnGroup.getProvidedColumnGroup().getColGroupDef().marryChildren;
+            const AllowGroupSplit = !columnGroup.getProvidedColumnGroup().getColGroupDef()
+                .marryChildren;
             const FriendlyName = (_c = columnGroup.getProvidedColumnGroup().getColGroupDef().headerName) !== null && _c !== void 0 ? _c : ColumnGroupId;
             const columnsInGroup = columnGroup.getLeafColumns();
             columnsInGroup.forEach((col) => {

package/src/agGrid/AgGridMenuAdapter.d.ts

@@ -25,6 +25,7 @@ export declare class AgGridMenuAdapter {
     private getLayoutContextMenuStructure;
     private buildMenuGroupParent;
     private buildColumnMenuDefaultStructure;
+    private getColumnFilterColumnMenuStructure;
     private getLayoutColumnMenuStructure;
     private getStyledColumnColumnMenuStructure;
     private mapAdaptableMenuItemToSystemMenuItems;