@adaptabletools/adaptable 15.3.1 → 15.3.3-canary.0

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

@@ -78,6 +78,9 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
         includeGroupRows?: boolean;
         filterFn?: (rowNode: IRowNode) => boolean;
     }): IRowNode[];
+    getGroupRowNodes(config?: {
+        filterFn?: (rowNode: IRowNode) => boolean;
+    }): IRowNode[];
     getGridCellFromRowNode(rowNode: IRowNode, columnId: string): GridCell | undefined;
     getRawValueFromRowNode(rowNode: IRowNode, columnId: string): any | undefined;
     getDisplayValueFromRowNode(rowNode: IRowNode, columnId: string): any | undefined;
@@ -124,6 +127,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     refreshRowByPrimaryKey(primaryKey: any): void;
     refreshRowNode(rowNode: IRowNode): void;
     refreshRowNodes(rowNodes: IRowNode[]): void;
+    refreshGroupRowNodes(): void;
     isCellEditable(gridCell: GridCell): boolean;
     areCellsEditable(gridCells: GridCell[]): boolean;
     isEveryCellEditable(gridCells: GridCell[]): boolean;

package/src/Api/Implementation/GridApiImpl.js

@@ -268,6 +268,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     getAllRowNodes(config) {
         return this.adaptable.getAllRowNodes(config);
     }
+    getGroupRowNodes(config) {
+        return this.adaptable.getGroupRowNodes(config);
+    }
     getGridCellFromRowNode(rowNode, columnId) {
         return this.adaptable.getGridCellFromRowNode(rowNode, columnId);
     }
@@ -453,6 +456,11 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     refreshRowNodes(rowNodes) {
         this.adaptable.redrawRows(rowNodes);
     }
+    refreshGroupRowNodes() {
+        // see https://www.ag-grid.com/javascript-data-grid/client-side-row-stages/#refreshing-the-client-side-model
+        this.adaptable.api.internalApi.getAgGridInstance().api.refreshClientSideRowModel('group');
+        this.adaptable.updateRowGroupsExpandedState();
+    }
     isCellEditable(gridCell) {
         if (!gridCell) {
             return false;

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

@@ -32,4 +32,5 @@ export declare class StyledColumnApiImpl extends ApiBase implements StyledColumn
     suspendStyledColumn(styledColumn: StyledColumn): void;
     unSuspendStyledColumn(styledColumn: StyledColumn): void;
     openStyledColumnSettingsPanel(): void;
+    getBadgePredicateDefsForColumn(columnId: string): import("../../types").AdaptablePredicateDef[];
 }

package/src/Api/Implementation/StyledColumnApiImpl.js

@@ -111,5 +111,17 @@ class StyledColumnApiImpl extends ApiBase_1.ApiBase {
     openStyledColumnSettingsPanel() {
         this.showModulePopup(ModuleConstants.StyledColumnModuleId);
     }
+    getBadgePredicateDefsForColumn(columnId) {
+        const column = this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId);
+        if (!column) {
+            return undefined;
+        }
+        const scope = {
+            ColumnIds: [column.columnId],
+        };
+        return this.getAdaptableApi()
+            .predicateApi.internalApi.getFilterPredicateDefs(scope)
+            .filter((predicate) => this.adaptable.api.scopeApi.isColumnInScope(column, predicate.columnScope));
+    }
 }
 exports.StyledColumnApiImpl = StyledColumnApiImpl;

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

@@ -1,7 +1,8 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
-import { CellColorRange, ColumnComparison, NumericStyledColumn, StyledColumn } from '../../PredefinedConfig/StyledColumnState';
+import { BadgeStyleDefinition, CellColorRange, ColumnComparison, NumericStyledColumn, StyledColumn } from '../../PredefinedConfig/StyledColumnState';
 import { IRowNode } from '@ag-grid-community/core';
+import { PredicateDefHandlerParams } from '../../types';
 export declare class StyledColumnInternalApi extends ApiBase {
     getMinValueForNumericColumn(column: AdaptableColumn): number | undefined;
     getMaxValueForNumericColumn(column: AdaptableColumn): number | undefined;
@@ -56,4 +57,5 @@ export declare class StyledColumnInternalApi extends ApiBase {
      * @param styledColumn Styled Column to Add
      */
     hasStyledColumnRelativeCellRange(styledColumn: StyledColumn): boolean;
+    getApplicableBadge(styledColumn: StyledColumn, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>): BadgeStyleDefinition | null;
 }

package/src/Api/Internal/StyledColumnInternalApi.js

@@ -245,5 +245,29 @@ class StyledColumnInternalApi extends ApiBase_1.ApiBase {
                 return cellColorRange.Min == 'Col-Min' || cellColorRange.Max == 'Col-Max';
             })))) !== null && _e !== void 0 ? _e : false);
     }
+    getApplicableBadge(styledColumn, params) {
+        var _a, _b;
+        if (!((_a = styledColumn.BadgeStyle) === null || _a === void 0 ? void 0 : _a.Badges.length)) {
+            return null;
+        }
+        // first that matches, sort last ones without predicate
+        const badgesWithoutAll = [];
+        const badgesWithAll = [];
+        for (let badge of (_b = styledColumn.BadgeStyle) === null || _b === void 0 ? void 0 : _b.Badges) {
+            if (!badge.Predicate) {
+                badgesWithAll.push(badge);
+            }
+            else {
+                badgesWithoutAll.push(badge);
+            }
+        }
+        for (let badge of badgesWithoutAll) {
+            if (this.getPredicateApi().handlePredicate(badge.Predicate, params, false)) {
+                return badge;
+            }
+        }
+        const [firstBadgeWithAll] = badgesWithAll;
+        return firstBadgeWithAll !== null && firstBadgeWithAll !== void 0 ? firstBadgeWithAll : null;
+    }
 }
 exports.StyledColumnInternalApi = StyledColumnInternalApi;

package/src/Api/StyledColumnApi.d.ts

@@ -1,5 +1,6 @@
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { StyledColumn, StyledColumnState } from '../PredefinedConfig/StyledColumnState';
+import { AdaptablePredicateDef } from '../types';
 /**
  * Provides run-time access to Styled Column Module and associated state
  */
@@ -120,4 +121,8 @@ export interface StyledColumnApi {
      * If this AdapTable instance can display Sparklines (e.g. is AG Grid SparklinesModule installed)
      */
     canDisplaySparklines(): boolean;
+    /**
+     * Get all Predicates available for a given column
+     */
+    getBadgePredicateDefsForColumn(columnId: string): AdaptablePredicateDef[];
 }

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

@@ -105,8 +105,7 @@ export interface StringFormatterOptions extends BaseFormatterOptions {
      */
     Suffix?: string;
     /**
-     * Replaces the value. Usefull when in combination with a Condition
-     * e.g. replace null/undefiend with 'N/A'
+     * Replaces cell value; useful when using Condition (e.g. replace null with 'N/A')
      */
     Content?: string;
 }

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

@@ -51,4 +51,4 @@ export interface AdaptableBaseIcon {
 /**
  * All AdapTable internal icon names
  */
-export declare type AdaptableInternalIconName = 'add' | 'add-row' | 'alert' | 'align-justify' | 'analysis' | 'application' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrowexpand' | 'attach-file' | 'blanks' | 'boolean-list' | 'broadcast' | 'brush' | 'build' | 'bulk-update' | 'calculated-column' | 'calendar' | 'call' | 'campaign' | 'cell-summary' | 'cell-validation' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clear' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'column-chooser' | 'column-filter' | 'comment' | 'contains' | 'custom-sort' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'drag' | 'edit' | 'ends-with' | 'equal' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'flashing-cell' | 'folder' | 'folder-open' | 'folder-shared' | 'format-column' | 'freetext-column' | 'function' | 'gradient-column' | 'greater-than' | 'greater-than-or-equal' | 'hide-column' | 'history' | 'home' | 'import-export' | 'info' | 'instrument' | 'invalid' | 'ipushpull' | 'justify' | 'layout' | 'less-than' | 'less-than-or-equal' | 'list' | 'login' | 'logout' | 'menu' | 'minus' | 'multiplication' | 'newpage' | 'news' | 'non-blanks' | 'not-contains' | 'not-equal' | 'ok' | 'open-in-new' | 'pause' | 'percent' | 'percent-bar' | 'person' | 'pie-chart' | 'play' | 'plus' | 'plus-minus' | 'query' | 'quick-search' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'settings' | 'shortcut' | 'show-column' | 'smart-edit' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'starts-with' | 'state-management' | 'statusbar' | 'stop' | 'system-status' | 'tab-unselected' | 'team-share' | 'theme' | 'tool-panel' | 'track-changes' | 'trash' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'updated-row' | 'upload' | 'warning' | 'visibility' | 'visibility-off';
+export declare type AdaptableInternalIconName = 'add' | 'alert' | 'analysis' | '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' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'comment' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | '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' | 'invalid' | 'download' | 'grid' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'menu' | 'minus' | 'multiplication' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | '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';

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -76,7 +76,7 @@ exports.SystemPredicateDefs = [
     {
         id: 'Blanks',
         label: 'Blanks',
-        icon: { name: 'blanks' },
+        icon: { name: 'unfilled-circle' },
         columnScope: { All: true },
         moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Helper_1.default.IsInputNullOrEmpty(value),
@@ -84,7 +84,7 @@ exports.SystemPredicateDefs = [
     {
         id: 'NonBlanks',
         label: 'Non Blanks',
-        icon: { name: 'non-blanks' },
+        icon: { name: 'filled-circle' },
         columnScope: { All: true },
         moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         handler: ({ value }) => Helper_1.default.IsInputNotNullOrEmpty(value),
@@ -147,7 +147,7 @@ exports.SystemPredicateDefs = [
     {
         id: 'Equals',
         label: 'Equals',
-        icon: { name: 'equal' },
+        icon: { name: 'equals' },
         columnScope: { DataTypes: ['Number'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'number' }],
@@ -222,7 +222,7 @@ exports.SystemPredicateDefs = [
     {
         id: 'Is',
         label: 'Equals',
-        icon: { name: 'equal' },
+        icon: { name: 'equals' },
         columnScope: { DataTypes: ['String'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'text' }],
@@ -435,7 +435,7 @@ exports.SystemPredicateDefs = [
     {
         id: 'On',
         label: 'Equals',
-        icon: { name: 'equal' },
+        icon: { name: 'equals' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],

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

@@ -22,10 +22,18 @@ export interface AdaptableStyle {
      * Style of font: `Normal` or `Italic`
      */
     FontStyle?: 'Normal' | 'Italic';
+    /**
+     * Decoration of font: `None`, `Underline`, `Overline` or `LineThrough`
+     */
+    TextDecoration?: 'None' | 'Underline' | 'Overline' | 'LineThrough';
     /**
      * Size of font: `XSmall`, `Small`, `Medium`, `Large` or `XLarge`
      */
     FontSize?: 'XSmall' | 'Small' | 'Medium' | 'Large' | 'XLarge';
+    /**
+     * Rounds the corners of an element's outer border edge; equivalent of CSS border-radius
+     */
+    BorderRadius?: number;
     /**
      * Existing CSS Class; use instead of setting other object properties
      */

package/src/PredefinedConfig/Common/Enums.js

@@ -48,6 +48,7 @@ var FontStyle;
 })(FontStyle = exports.FontStyle || (exports.FontStyle = {}));
 var FontSize;
 (function (FontSize) {
+    //  Default = 'Default',
     FontSize["XSmall"] = "XSmall";
     FontSize["Small"] = "Small";
     FontSize["Medium"] = "Medium";

package/src/PredefinedConfig/StyledColumnState.d.ts

@@ -1,6 +1,8 @@
 import { ConfigState } from './ConfigState';
 import { SuspendableObject } from './Common/SuspendableObject';
 import { SparklineOptions } from '@ag-grid-community/core';
+import { AdaptableExternalIcon, AdaptableInternalIcon, AdaptablePredicate, AdaptableStyle } from '../types';
+import { TypeHint } from './Common/Types';
 /**
  * Predefined Configuration for Styled Column Module
  */
@@ -23,7 +25,7 @@ export interface StyledColumn extends SuspendableObject {
      */
     GradientStyle?: GradientStyle;
     /**
-     * Styles a numeric column so each cell displays a 'bar'
+     * Styles a numeric column so each cell displays a 'Bar'
      */
     PercentBarStyle?: PercentBarStyle;
     /**
@@ -31,11 +33,15 @@ export interface StyledColumn extends SuspendableObject {
      */
     CheckBoxStyle?: boolean;
     /**
-     * Displays a Sparkline Chart in the column
+     * Displays a Sparkline Chart in an array column
      */
     SparkLineStyle?: SparkLineStyle;
     /**
-     * Includes the Styled Column in Grouped Rows
+     * Displays cell values in Column as a Badge
+     */
+    BadgeStyle?: BadgeStyle;
+    /**
+     * Includes Styled Column in Grouped Rows
      * @defaultValue false
      */
     IncludeGroupedRows?: boolean;
@@ -48,19 +54,24 @@ export interface PercentBarStyle extends NumericStyledColumn {
      * Whether Cell shows Cell Value, Percent Value, both or none
      */
     CellText?: CellTextOptions;
+    /**
+     * Position of text in cell relative to Percent Bar
+     * @defaultValue Below
+     */
+    CellTextPosition?: 'Above' | 'Below' | 'Merged';
     /**
      * Whether Tooltip shows Cell Value, Percent Value, both or none
      */
     ToolTipText?: CellTextOptions;
     /**
      * Background colour for 'Percent Bar'; leave unset if none required
-     * @defaultValue Gray
+     * @defaultValue undefined
      */
     BackColor?: string;
 }
 export interface NumericStyledColumn {
     /**
-     * Ranges (e.g. to allow a traffic light effect)
+     * Ranges (e.g. to create traffic light effect)
      */
     CellRanges?: CellColorRange[];
     /**
@@ -137,3 +148,24 @@ export declare type SparkLineStyle = {
      */
     options?: SparklineOptions;
 };
+export declare type SystemBadgeStylePredicateId = 'Values' | 'ExcludeValues' | 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'InRange' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'BooleanToggle';
+/**
+ * The System Predicate Ids available for Badge Style
+ */
+export declare type SystemBadgeStylePredicateIds = SystemBadgeStylePredicateId[];
+/**
+ * The System Predicate definition for Badge Style
+ */
+export interface BadgeStylePredicate extends AdaptablePredicate {
+    PredicateId: TypeHint<string, SystemBadgeStylePredicateId>;
+}
+export interface BadgeStyleDefinition {
+    Predicate?: BadgeStylePredicate;
+    Style: AdaptableStyle;
+    Icon?: AdaptableInternalIcon | AdaptableExternalIcon;
+    HideText?: boolean;
+    IconPosition?: 'Start' | 'End';
+}
+export interface BadgeStyle {
+    Badges?: BadgeStyleDefinition[];
+}

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -87,7 +87,7 @@ function MergeStateFunction(oldState, newState) {
     let state = newState;
     if (!state || typeof state !== 'object') {
         // in case loadState returns something different than an empty object
-        AdaptableLogger_1.AdaptableLogger.consoleWarnBase('State is something different that expected, expected object, received: ', state);
+        AdaptableLogger_1.AdaptableLogger.consoleWarnBase('State is something different than expected; expected an object, but received: ', state);
         state = {};
     }
     // any Module in config that doesn't exist in state will be added

package/src/Strategy/BulkUpdateModule.js

@@ -10,7 +10,7 @@ const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensio
 const ObjectFactory_1 = tslib_1.__importDefault(require("../Utilities/ObjectFactory"));
 class BulkUpdateModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.BulkUpdateModuleId, ModuleConstants.BulkUpdateFriendlyName, 'bulk-update', 'BulkUpdatePopup', 'Update multiple cell simultaneously with a new or existing value', api);
+        super(ModuleConstants.BulkUpdateModuleId, ModuleConstants.BulkUpdateFriendlyName, 'edit-table', 'BulkUpdatePopup', 'Update multiple cell simultaneously with a new or existing value', api);
     }
     getViewAccessLevel() {
         return 'Full';

package/src/Strategy/CalculatedColumnModule.js

@@ -12,7 +12,7 @@ const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const getCalculatedColumnSettingsTags_1 = require("../View/CalculatedColumn/Utilities/getCalculatedColumnSettingsTags");
 class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.CalculatedColumnModuleId, ModuleConstants.CalculatedColumnFriendlyName, 'calculated-column', 'CalculatedColumnPopup', 'Create bespoke columns whose cell value is derived dynamically from an Expression', api);
+        super(ModuleConstants.CalculatedColumnModuleId, ModuleConstants.CalculatedColumnFriendlyName, 'chart-and-grid', 'CalculatedColumnPopup', 'Create bespoke columns whose cell value is derived dynamically from an Expression', api);
     }
     handleConfigReloaded(adaptableStateReloadedInfo) {
         // re-dispatch the CalculatedColumnReady action to recreate all the aggregated scalar columns

package/src/Strategy/CellSummaryModule.js

@@ -9,7 +9,7 @@ const Helper_1 = require("../Utilities/Helpers/Helper");
 const CellSummaryStatusPanel_1 = require("../View/CellSummary/CellSummaryStatusPanel");
 class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.CellSummaryModuleId, ModuleConstants.CellSummaryFriendlyName, 'cell-summary', 'CellSummaryPopup', 'See summary information on a group of cells using multiple summary operations', api);
+        super(ModuleConstants.CellSummaryModuleId, ModuleConstants.CellSummaryFriendlyName, 'cells', 'CellSummaryPopup', 'See summary information on a group of cells using multiple summary operations', api);
     }
     getViewAccessLevel() {
         return 'Full';

package/src/Strategy/CustomSortModule.js

@@ -11,7 +11,7 @@ const getCustomSortSortOrderViewItems_1 = require("./Utilities/CustomSort/getCus
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class CustomSortModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.CustomSortModuleId, ModuleConstants.CustomSortFriendlyName, 'custom-sort', 'CustomSortPopup', 'Provide bespoke sorting information for Columns (in place of alphabetical sorting)', api);
+        super(ModuleConstants.CustomSortModuleId, ModuleConstants.CustomSortFriendlyName, 'import-export', 'CustomSortPopup', 'Provide bespoke sorting information for Columns (in place of alphabetical sorting)', api);
     }
     getModuleAdaptableObjects(config) {
         return this.api.customSortApi.getCustomSorts(config);

package/src/Strategy/DashboardModule.js

@@ -53,10 +53,10 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 menuItems.push(this.createColumnMenuItemReduxAction('Float', 'dock', DashboardRedux.DashboardSetIsFloating(true)));
             }
             if (this.api.dashboardApi.getDashboardState().IsHidden) {
-                menuItems.push(this.createColumnMenuItemReduxAction('Show', 'show-column', DashboardRedux.DashboardSetIsHidden(false)));
+                menuItems.push(this.createColumnMenuItemReduxAction('Show', 'visibility-on-bold', DashboardRedux.DashboardSetIsHidden(false)));
             }
             else {
-                menuItems.push(this.createColumnMenuItemReduxAction('Hide', 'hide-column', DashboardRedux.DashboardSetIsHidden(true)));
+                menuItems.push(this.createColumnMenuItemReduxAction('Hide', 'visibility-off-bold', DashboardRedux.DashboardSetIsHidden(true)));
             }
             return [
                 {

package/src/Strategy/DataChangeHistoryModule.js

@@ -9,7 +9,7 @@ const DataChangeHistoryStatusBarContent_1 = require("../View/DataChangeHistory/D
 const core_1 = require("@ag-grid-community/core");
 class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.DataChangeHistoryModuleId, ModuleConstants.DataChangeHistoryFriendlyName, 'track-changes', 'DataChangeHistoryPopup', 'Provides an overview of all previous changes, giving the possibility to undo specific changes', api);
+        super(ModuleConstants.DataChangeHistoryModuleId, ModuleConstants.DataChangeHistoryFriendlyName, 'target', 'DataChangeHistoryPopup', 'Provides an overview of all previous changes, giving the possibility to undo specific changes', api);
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {

package/src/Strategy/FilterModule.js

@@ -10,7 +10,7 @@ const SystemRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/Syste
 const FilterStatusBarSubPanelPopover_1 = require("../View/Filter/FilterStatusBarSubPanelPopover");
 class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.FilterModuleId, ModuleConstants.FilterFriendlyName, 'column-filter', 'FilterPopup', 'Advanced filtering capability allows users to see precisely the data they want', api);
+        super(ModuleConstants.FilterModuleId, ModuleConstants.FilterFriendlyName, 'filter-list', 'FilterPopup', 'Advanced filtering capability allows users to see precisely the data they want', api);
     }
     getModuleAdaptableObjects() {
         return this.api.filterApi.getColumnFilters();

package/src/Strategy/FlashingCellModule.js

@@ -19,7 +19,7 @@ const Helper_1 = require("../Utilities/Helpers/Helper");
 const updateSingleToMultiplePredicates_1 = require("./Utilities/updateSingleToMultiplePredicates");
 class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.FlashingCellModuleId, ModuleConstants.FlashingCellFriendlyName, 'flashing-cell', 'FlashingAlert', 'Flash cells when they change', api);
+        super(ModuleConstants.FlashingCellModuleId, ModuleConstants.FlashingCellFriendlyName, 'lightning', 'FlashingAlert', 'Flash cells when they change', api);
         this.api.internalApi
             .getDataService()
             .on('CellDataChanged', (cellDataChangedInfo) => {

package/src/Strategy/FormatColumnModule.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const FormatColumnRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/FormatColumnRedux"));
+const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
 const FormatColumnWizard_1 = require("../View/FormatColumn/Wizard/FormatColumnWizard");
 const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
 const FormatColumnFormatWizardSection_1 = require("../View/FormatColumn/Wizard/FormatColumnFormatWizardSection");
@@ -15,9 +16,10 @@ const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
 const MoveFormatColumn_1 = require("../View/FormatColumn/MoveFormatColumn");
 const Helper_1 = require("../Utilities/Helpers/Helper");
 const updateSingleToMultiplePredicates_1 = require("./Utilities/updateSingleToMultiplePredicates");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
 class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'format-column', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
+        super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'color-palette', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
     }
     getModuleAdaptableObjects(config) {
         return this.api.formatColumnApi.getFormatColumns(config);
@@ -115,12 +117,49 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     addColumnMenuItems(column) {
         let returnColumnMenuItems = [];
         if (column && this.isModuleEditable() && !column.isSparkline) {
-            let popupParam = {
+            let createPopupParam = {
                 column: column,
                 action: 'New',
                 source: 'ColumnMenu',
             };
-            returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
+            const createFormatColumnMenuItem = this.createColumnMenuItemShowPopup('Create', this.moduleInfo.Popup, 'plus', createPopupParam);
+            const formatColumnsForColumn = this.api.formatColumnApi.getFormatColumnsForColumnId(column.columnId);
+            //  .filter((fc) => this.api.scopeApi.isSingleColumnScope(fc.Scope));
+            // if no formats then just show Create
+            if (ArrayExtensions_1.default.IsNullOrEmpty(formatColumnsForColumn)) {
+                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, createPopupParam));
+                // if 1 format then show a Create and an Edit
+            }
+            else if (formatColumnsForColumn.length == 1) {
+                let editPopupParam = {
+                    column: column,
+                    action: 'Edit',
+                    value: formatColumnsForColumn[0],
+                    source: 'ColumnMenu',
+                };
+                const editFormatColumnMenuItem = this.createColumnMenuItemShowPopup('Edit', this.moduleInfo.Popup, 'edit', editPopupParam);
+                returnColumnMenuItems.push({
+                    label: 'Format Column',
+                    module: this.moduleInfo.ModuleName,
+                    isVisible: true,
+                    icon: { name: this.moduleInfo.Glyph },
+                    subItems: [createFormatColumnMenuItem, editFormatColumnMenuItem],
+                });
+                // if more than one then display a Create and a Show
+                // we should probably do the Show better - perhaps use Column Info in some way? 
+                // or to filter the format columns ?
+            }
+            else {
+                const moduleInfo = this.api.internalApi.getModuleService().getModuleInfoByModule('FormatColumn');
+                const editFormatColumnMenuItem = this.createColumnMenuItemReduxAction('Show Current', this.moduleInfo.Glyph, PopupRedux.PopupShowScreen('FormatColumn', moduleInfo.Popup));
+                returnColumnMenuItems.push({
+                    label: 'Format Column',
+                    module: this.moduleInfo.ModuleName,
+                    isVisible: true,
+                    icon: { name: this.moduleInfo.Glyph },
+                    subItems: [createFormatColumnMenuItem, editFormatColumnMenuItem],
+                });
+            }
         }
         return returnColumnMenuItems;
     }

package/src/Strategy/FreeTextColumnModule.js

@@ -9,7 +9,7 @@ const FreeTextColumnWizard_1 = require("../View/FreeTextColumn/Wizard/FreeTextCo
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.FreeTextColumnModuleId, ModuleConstants.FreeTextColumnFriendlyName, 'freetext-column', 'FreeTextColumnPopup', 'Dynamic column showing custom content (stored in state and not with grid data)', api);
+        super(ModuleConstants.FreeTextColumnModuleId, ModuleConstants.FreeTextColumnFriendlyName, 'horizontal-lines', 'FreeTextColumnPopup', 'Dynamic column showing custom content (stored in state and not with grid data)', api);
     }
     isModuleAvailable() {
         // FreeTextColumn module doesn't support autogenerated primary keys

package/src/Strategy/GridInfoModule.js

@@ -31,7 +31,7 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 selectMenuItems.push(this.createMainMenuItemShowPopup({
                     Label: 'Column',
                     ComponentName: this.moduleInfo.Popup,
-                    Icon: 'column-chooser',
+                    Icon: 'columns',
                     PopupParams: {
                         column: column,
                         source: 'ColumnMenu',
@@ -82,7 +82,7 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     selectMenuItems.push(this.createMainMenuItemShowPopup({
                         Label: 'Column',
                         ComponentName: this.moduleInfo.Popup,
-                        Icon: 'column-chooser',
+                        Icon: 'columns',
                         PopupParams: columnPopUpParams,
                     }));
                 }

package/src/Strategy/LayoutModule.js

@@ -19,7 +19,7 @@ const windowFactory_1 = require("../View/Components/Popups/WindowPopups/windowFa
 const flattenDeep_1 = tslib_1.__importDefault(require("lodash/flattenDeep"));
 class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'layout', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
+        super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'grid', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
         this.clearUnsuportedFeaturesFromLayout = (layout) => {
             const layoutSupportedFeatures = this.api.layoutApi.internalApi.getLayoutSupportedFeatures();
             let needsUpdate = false;
@@ -150,6 +150,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Edit Layout', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
                     action: 'Edit',
                     source: 'ColumnMenu',
+                    value: this.api.layoutApi.getCurrentLayout(),
                 }));
             }
             if (column) {
@@ -157,7 +158,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Change Caption', 'edit', () => this.api.layoutApi.showChangeColumnCaption(column)));
                 }
                 if (column.hideable) {
-                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Hide Column', 'hide-column', () => {
+                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Hide Column', 'visibility-off-bold', () => {
                         this.api.columnApi.hideColumn(column.columnId);
                     }));
                 }
@@ -169,12 +170,12 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     selectMenuItems.push(this.createColumnMenuItemClickFunction('Column (Preserve Selection)', 'column-add', () => {
                         this.api.columnApi.addColumnToSelection(column.columnId);
                     }));
-                    selectMenuItems.push(this.createColumnMenuItemClickFunction('Column (Reset Selection)', 'column-chooser', () => {
+                    selectMenuItems.push(this.createColumnMenuItemClickFunction('Column (Reset Selection)', 'columns', () => {
                         this.api.columnApi.selectColumn(column.columnId);
                     }));
                 }
                 else {
-                    selectMenuItems.push(this.createColumnMenuItemClickFunction('Column', 'column-chooser', () => {
+                    selectMenuItems.push(this.createColumnMenuItemClickFunction('Column', 'columns', () => {
                         this.api.columnApi.selectColumn(column.columnId);
                     }));
                 }
@@ -215,7 +216,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 let autoSizeFunction = () => {
                     this.api.columnApi.autosizeAllColumns();
                 };
-                gridMenuItems.push(this.createColumnMenuItemClickFunction('Auto Size', 'arrowexpand', autoSizeFunction));
+                gridMenuItems.push(this.createColumnMenuItemClickFunction('Auto Size', 'arrow-expand', autoSizeFunction));
                 let clickFunction = () => {
                     this.api.gridApi.selectAll();
                 };
@@ -303,7 +304,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 });
             },
             icon: {
-                name: 'arrowexpand',
+                name: 'arrow-expand',
             },
         };
     }

package/src/Strategy/PlusMinusModule.js

@@ -14,7 +14,7 @@ const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.PlusMinusModuleId, ModuleConstants.PlusMinusFriendlyName, 'plus-minus', 'PlusMinusPopup', 'Configure how a cell value will edit when the + or - keys are pressed', api);
+        super(ModuleConstants.PlusMinusModuleId, ModuleConstants.PlusMinusFriendlyName, 'add-circle', 'PlusMinusPopup', 'Configure how a cell value will edit when the + or - keys are pressed', api);
         this.shouldHandleKeyDown = false;
         this.adaptable = api.internalApi.getAdaptableInstance();
     }

package/src/Strategy/QueryModule.js

@@ -10,7 +10,7 @@ const EditCurrentQueryButton_1 = require("../View/Query/EditCurrentQueryButton")
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 class QueryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.QueryModuleId, ModuleConstants.QueryFriendlyName, 'query', 'QueryPopup', 'Run real-time text-based queries using a wealth of powerful functions and operators', api);
+        super(ModuleConstants.QueryModuleId, ModuleConstants.QueryFriendlyName, 'search', 'QueryPopup', 'Run real-time text-based queries using a wealth of powerful functions and operators', api);
     }
     getModuleAdaptableObjects() {
         return this.api.queryApi.getNamedQueries();

package/src/Strategy/QuickSearchModule.js

@@ -7,7 +7,7 @@ const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/Mod
 const QuickSearchStatusBarContent_1 = require("../View/QuickSearch/QuickSearchStatusBarContent");
 class QuickSearchModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.QuickSearchModuleId, ModuleConstants.QuickSearchFriendlyName, 'quick-search', 'QuickSearchPopup', 'Quickly highlight all cells in the grid that contain matching query text', api);
+        super(ModuleConstants.QuickSearchModuleId, ModuleConstants.QuickSearchFriendlyName, 'search-table', 'QuickSearchPopup', 'Quickly highlight all cells in the grid that contain matching query text', api);
     }
     getViewProperties() {
         return {