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

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -5,7 +5,7 @@ import { AdaptableScope } from './Common/AdaptableScope';
 import { SuspendableObject } from './Common/SuspendableObject';
 import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { TypeHint } from './Common/Types';
-import { AdaptableBooleanQuery, AdaptablePredicate } from '../types';
+import { AdaptableBooleanQuery, AdaptablePredicate, GradientStyle, PercentBarStyle } from '../types';
 /**
  * Predefined Configuration for Format Column Module
  */
@@ -33,7 +33,7 @@ export interface FormatColumn extends SuspendableObject {
      */
     Style?: AdaptableStyle;
     /**
-     * Applies Gradient, Percent Bar or CheckBox style to a Column
+     * @deprecated now in StyledColumn Module
      */
     ColumnStyle?: ColumnStyle;
     /**
@@ -77,89 +77,4 @@ export interface ColumnStyle {
      */
     CheckBoxStyle?: boolean;
 }
-/**
- * Style used to display Percent Bars in Format Column
- */
-export interface PercentBarStyle {
-    /**
-     * Ranges (e.g. to allow a traffic light effect)
-     */
-    CellRanges?: CellColorRange[];
-    /**
-     * Compares cell values to another Column
-     */
-    ColumnComparison?: ColumnComparison;
-    /**
-     * Whether Cell shows Cell Value, Percent Value, both or none
-     */
-    CellText?: CellTextOptions;
-    /**
-     * Whether Tooltip shows Cell Value, Percent Value, both or none
-     */
-    ToolTipText?: CellTextOptions;
-    /**
-     * Back colour - only used for 'Percent Bar' Numeric style; leave unset if none required
-     * @defaultValue Gray
-     */
-    BackColor?: string;
-}
-/**
- * Used to display Gradient Styles in Format Column
- */
-export interface GradientStyle {
-    /**
-     * Ranges (e.g. to allow a traffic light effect)
-     */
-    CellRanges?: CellColorRange[];
-    /**
-     * Compares cell values to another Column
-     */
-    ColumnComparison?: ColumnComparison;
-}
-/**
- * Defines which Colours to show in Gradient and Percent Bar Styles
- */
-export interface CellColorRange {
-    /**
-     * Start number of Range
-     */
-    Min: number | 'Col-Min';
-    /**
-     * End number of Range
-     */
-    Max: number | 'Col-Max';
-    /**
-     * Cell colour to use for values that fall inside Range
-     */
-    Color: string;
-    /**
-     * Reverses the Gradient so the lower the cell value the darker the colour
-     */
-    ReverseGradient?: boolean;
-}
-/**
- * Enables a Percent Bar or Gradient Style to use another column in its calculations
- */
-export interface ColumnComparison {
-    /**
-     * Start value - either numeric or Column name
-     */
-    MinValue: number | string;
-    /**
-     * End value - either numeric or Column name
-     */
-    MaxValue: number | string;
-    /**
-     * Colour to use for the Comparison
-     */
-    Color: string;
-}
-/**
- * Array of CellTextOption available in Format Columns
- */
-export declare type CellTextOptions = CellTextOption[];
-/**
- * Text optionally to show in a Format Column special style: 'CellValue' or 'PercentageValue'
- */
-export declare type CellTextOption = 'CellValue' | 'PercentageValue';
 export {};

package/src/PredefinedConfig/StyledColumnState.d.ts

@@ -1,7 +1,7 @@
 import { ConfigState } from './ConfigState';
 import { SuspendableObject } from './Common/SuspendableObject';
 /**
- * Predefined Configuration for Special Column Style Module
+ * Predefined Configuration for Styled Column Module
  */
 export interface StyledColumnState extends ConfigState {
     /**
@@ -13,14 +13,20 @@ export interface StyledColumnState extends ConfigState {
  * Object used in Special Column Style function
  */
 export interface StyledColumn extends SuspendableObject {
+    /**
+     * Column being styled
+     */
     ColumnId: string;
+    /**
+     * Styles a numeric column with a Gradient
+     */
     GradientStyle?: GradientStyle;
     /**
-     * Style a numeric column so each cell displays a 'bar'
+     * Styles a numeric column so each cell displays a 'bar'
      */
     PercentBarStyle?: PercentBarStyle;
     /**
-     * Style a boolean column so each cell displays a checkbox
+     * Renders a Checkbox in a boolean column
      */
     CheckBoxStyle?: boolean;
 }
@@ -33,7 +39,7 @@ export interface PercentBarStyle extends NumericStyledColumn {
      */
     CellRanges?: CellColorRange[];
     /**
-     * Compares cell values to another Column
+     * Compares Cell values to another Column
      */
     ColumnComparison?: ColumnComparison;
     /**
@@ -45,7 +51,7 @@ export interface PercentBarStyle extends NumericStyledColumn {
      */
     ToolTipText?: CellTextOptions;
     /**
-     * Back colour - only used for 'Percent Bar' Numeric style; leave unset if none required
+     * Background colour for 'Percent Bar'; leave unset if none required
      * @defaultValue Gray
      */
     BackColor?: string;

package/src/Strategy/ConditionalStyleModule.d.ts

@@ -1,23 +1,19 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
 import { ConditionalStyle } from '../PredefinedConfig/ConditionalStyleState';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IConditionalStyleModule } from './Interface/IConditionalStyleModule';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { AdaptableModuleView, AdaptableObjectView } from './Interface/IModule';
-import { AccessLevel } from '../types';
 export declare class ConditionalStyleModule extends AdaptableModuleBase implements IConditionalStyleModule {
     constructor(api: AdaptableApi);
-    getViewAccessLevel(): AccessLevel;
     getModuleAdaptableObjects(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(conditionalStyle: ConditionalStyle): string[];
     getReferencedNamedQueryNames(conditionalStyle: ConditionalStyle): string[];
     updateOldConfig(): void;
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<ConditionalStyle>;
     isConditionalStyleActiveForColumn(conditionalStyleForColumn: ConditionalStyle, column: AdaptableColumn, params: any): boolean;
     isConditionalStyleActiveForRow(conditionalStyleForRow: ConditionalStyle, params: any): boolean;

package/src/Strategy/ConditionalStyleModule.js

@@ -9,7 +9,6 @@ const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants_1 = require("../Utilities/Constants/ModuleConstants");
 const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
-const ConditionalStyleWizard_1 = require("../View/ConditionalStyle/Wizard/ConditionalStyleWizard");
 const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
 const getStyleViewItems_1 = require("./Utilities/getStyleViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
@@ -18,10 +17,6 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ConditionalStyleModuleId, ModuleConstants.ConditionalStyleFriendlyName, 'conditional-style', 'ConditionalStylePopup', 'Style columns and rows dynamically based on rules and cell values', api);
     }
-    getViewAccessLevel() {
-        const keepDeprecatedConditionalStyles = this.api.internalApi.shouldKeepDeprecatedConditionalStyles();
-        return keepDeprecatedConditionalStyles ? super.getViewAccessLevel() : 'Hidden';
-    }
     getModuleAdaptableObjects(config) {
         return this.api.conditionalStyleApi.getAllConditionalStyle(config);
     }
@@ -83,25 +78,6 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         });
         this.api.conditionalStyleApi.editConditionalStyles(oldConditionalStyles);
     }
-    addColumnMenuItems(column) {
-        if (column && this.isModuleEditable() && !column.isSparkline) {
-            let conditionalStyles = this.api.conditionalStyleApi.getConditionalStylesForColumn(column);
-            let firstConditionalStyle = ArrayExtensions_1.default.IsNotNullOrEmpty(conditionalStyles)
-                ? conditionalStyles.find((cs) => this.api.scopeApi.isColumnInScopeColumns(column, cs.Scope))
-                : undefined;
-            let conditionalStyleExists = firstConditionalStyle != undefined;
-            let label = conditionalStyleExists ? 'Edit ' : 'Create ';
-            let popupParam = {
-                column: column,
-                action: conditionalStyleExists ? 'Edit' : 'New',
-                source: 'ColumnMenu',
-                value: firstConditionalStyle,
-            };
-            return [
-                this.createColumnMenuItemShowPopup(label + this.moduleInfo.FriendlyName, this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
-            ];
-        }
-    }
     getTeamSharingAction() {
         return {
             ModuleEntities: this.api.conditionalStyleApi.getAllConditionalStyle(),
@@ -215,13 +191,7 @@ class ConditionalStyleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewProperties() {
         return {
             HeaderComponent: ConditionalStylePopupHeader_1.ConditionalStylePopupHeader,
-            getDeleteAction: (conditionalStyle) => ConditionalStyleRedux.ConditionalStyleDelete(conditionalStyle),
-            getSuspendAction: (conditionalStyle) => ConditionalStyleRedux.ConditionalStyleSuspend(conditionalStyle),
-            getUnSuspendAction: (conditionalStyle) => ConditionalStyleRedux.ConditionalStyleUnSuspend(conditionalStyle),
-            emptyView: "Click 'New' to create a new Conditional Style Rule.  When this is met, row or cells in the Conditional Style's scope will be styled appropriately.",
-            getEditWizard() {
-                return ConditionalStyleWizard_1.ConditionalStyleWizard;
-            },
+            emptyView: '',
         };
     }
     canBeAssociatedWithLayouts() {

package/src/Strategy/FormatColumnModule.d.ts

@@ -15,8 +15,6 @@ export declare class FormatColumnModule extends AdaptableModuleBase implements I
     hasNamedQueryReferences(): boolean;
     updateOldConfig(): void;
     private updateConditionalStylesColumnsOldConfig;
-    private updateGradientColumnsOldConfig;
-    private getExistingFormatColumn;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<FormatColumn>;
     toView(formatColumn: FormatColumn): AdaptableObjectView;

package/src/Strategy/FormatColumnModule.js

@@ -4,7 +4,6 @@ exports.FormatColumnModule = void 0;
 const tslib_1 = require("tslib");
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
-const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
 const FormatColumnRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/FormatColumnRedux"));
 const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const FormatColumnWizard_1 = require("../View/FormatColumn/Wizard/FormatColumnWizard");
@@ -18,27 +17,6 @@ const MoveFormatColumn_1 = require("../View/FormatColumn/MoveFormatColumn");
 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);
-        /**
-         * Use Case: Data (cell/row) has changed
-         * Action: Any CheckboxFormatColumns need to be updated, as their disabled state may have changed
-         */
-        this.api.internalApi
-            .getDataService()
-            .on('CellDataChanged', (cellDataChangedInfo) => {
-            const activeCheckboxColumnIds = this.api.columnApi
-                .getColumns()
-                .filter((aColumn) => {
-                const checkboxFormatColumn = this.api.formatColumnApi.getCheckBoxStyleFormatColumn(aColumn);
-                return checkboxFormatColumn && !checkboxFormatColumn.IsSuspended;
-            })
-                .map((aColumn) => aColumn.columnId);
-            // no need to refresh the CheckboxColumns if the change was triggered by one of them
-            if (!activeCheckboxColumnIds.includes(cellDataChangedInfo.column.columnId)) {
-                this.api.internalApi
-                    .getAdaptableInstance()
-                    .refreshCells(null, activeCheckboxColumnIds, true, true);
-            }
-        });
     }
     getModuleAdaptableObjects(config) {
         return this.api.formatColumnApi.getAllFormatColumn(config);
@@ -55,44 +33,33 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return false;
     }
     updateOldConfig() {
-        var _a, _b;
-        // warn about FormatColumn.HeaderName deprecation
-        if ((_b = (_a = this.api.internalApi
-            .getState()
-            .FormatColumn) === null || _a === void 0 ? void 0 : _a.FormatColumns) === null || _b === void 0 ? void 0 : _b.some((formatColumn) => !!formatColumn.HeaderName)) {
-            (0, LoggingHelper_1.ConsoleLogWarning)(`The 'FormatColumn.HeaderName' property was removed; use a Layout custom Column Header instead!`);
+        this.updateConditionalStylesColumnsOldConfig();
+        // update ConditionalStyle StatusBarPanel
+        const oldStatusBars = this.api.internalApi.getState().StatusBar.StatusBars;
+        let replaceConditionalStyleStatusBar = false;
+        const newStatusBars = oldStatusBars.map((statusBar) => (Object.assign(Object.assign({}, statusBar), { StatusBarPanels: [
+                ...new Set(statusBar.StatusBarPanels.map((statusBarPanel) => {
+                    if (statusBarPanel === 'ConditionalStyle') {
+                        replaceConditionalStyleStatusBar = true;
+                        return 'FormatColumn';
+                    }
+                    return statusBarPanel;
+                })),
+            ] })));
+        if (replaceConditionalStyleStatusBar) {
+            this.api.statusBarApi.setStatusBarPanels(newStatusBars);
         }
-        this.updateGradientColumnsOldConfig();
-        const keepDeprecatedConditionalStyles = this.api.internalApi.shouldKeepDeprecatedConditionalStyles();
-        if (!keepDeprecatedConditionalStyles) {
-            this.updateConditionalStylesColumnsOldConfig();
-            // update ConditionalStyle StatusBarPanel
-            const oldStatusBars = this.api.internalApi.getState().StatusBar.StatusBars;
-            let replaceConditionalStyleStatusBar = false;
-            const newStatusBars = oldStatusBars.map((statusBar) => (Object.assign(Object.assign({}, statusBar), { StatusBarPanels: [
-                    ...new Set(statusBar.StatusBarPanels.map((statusBarPanel) => {
-                        if (statusBarPanel === 'ConditionalStyle') {
-                            replaceConditionalStyleStatusBar = true;
-                            return 'FormatColumn';
-                        }
-                        return statusBarPanel;
-                    })),
-                ] })));
-            if (replaceConditionalStyleStatusBar) {
-                this.api.statusBarApi.setStatusBarPanels(newStatusBars);
-            }
-            // update ConditionalStyle dashboard buttons
-            const dashboardModuleButtons = this.api.internalApi.getState().Dashboard.ModuleButtons;
-            if (dashboardModuleButtons.includes('ConditionalStyle')) {
-                dashboardModuleButtons[dashboardModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
-                this.api.dashboardApi.setModuleButtons([...new Set(dashboardModuleButtons)]);
-            }
-            // update ConditionalStyle toolPanel buttons
-            const toolPanelModuleButtons = this.api.internalApi.getState().ToolPanel.ModuleButtons;
-            if (toolPanelModuleButtons.includes('ConditionalStyle')) {
-                toolPanelModuleButtons[toolPanelModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
-                this.api.toolPanelApi.setModuleButtons([...new Set(dashboardModuleButtons)]);
-            }
+        // update ConditionalStyle dashboard buttons
+        const dashboardModuleButtons = this.api.internalApi.getState().Dashboard.ModuleButtons;
+        if (dashboardModuleButtons.includes('ConditionalStyle')) {
+            dashboardModuleButtons[dashboardModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
+            this.api.dashboardApi.setModuleButtons([...new Set(dashboardModuleButtons)]);
+        }
+        // update ConditionalStyle toolPanel buttons
+        const toolPanelModuleButtons = this.api.internalApi.getState().ToolPanel.ModuleButtons;
+        if (toolPanelModuleButtons.includes('ConditionalStyle')) {
+            toolPanelModuleButtons[toolPanelModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
+            this.api.toolPanelApi.setModuleButtons([...new Set(dashboardModuleButtons)]);
         }
     }
     updateConditionalStylesColumnsOldConfig() {
@@ -107,121 +74,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         // add as format column
         this.api.formatColumnApi.addFormatColumns(oldConditionalStyles);
     }
-    updateGradientColumnsOldConfig() {
-        let newFormatColumns = [];
-        let existingFormatColumns = [];
-        // 1. Convert Gradient Columns to Format Columns
-        let gradientColumnState = this.api.internalApi.getState().GradientColumn;
-        if (gradientColumnState === null || gradientColumnState === void 0 ? void 0 : gradientColumnState.GradientColumns) {
-            gradientColumnState.GradientColumns.forEach((gradientColumn) => {
-                const columnId = gradientColumn.ColumnId;
-                (0, LoggingHelper_1.LogAdaptableWarning)(`Merging Gradient Style into Format Column for Column: ${columnId}`);
-                let existingFormatColumn = this.getExistingFormatColumn(columnId);
-                let gradientStyle = {
-                    GradientStyle: {
-                        CellRanges: [
-                            {
-                                Min: gradientColumn.BaseValue,
-                                Max: gradientColumn.PositiveValue,
-                                Color: gradientColumn.PositiveColor,
-                            },
-                        ],
-                    },
-                };
-                if (!existingFormatColumn) {
-                    let formatColumn = {
-                        Scope: {
-                            ColumnIds: [gradientColumn.ColumnId],
-                        },
-                        ColumnStyle: gradientStyle,
-                    };
-                    newFormatColumns.push(formatColumn);
-                }
-                else {
-                    existingFormatColumn.ColumnStyle = gradientStyle;
-                    existingFormatColumns.push(existingFormatColumn);
-                }
-            });
-        }
-        // 2. Convert Percent Bars to Format Columns
-        let percentBarState = this.api.internalApi.getState().PercentBar;
-        if (percentBarState === null || percentBarState === void 0 ? void 0 : percentBarState.PercentBars) {
-            percentBarState === null || percentBarState === void 0 ? void 0 : percentBarState.PercentBars.forEach((percentBar) => {
-                const columnId = percentBar.ColumnId;
-                (0, LoggingHelper_1.LogAdaptableWarning)(`Merging Percent Bar Style into Format Column for Column: ${columnId}`);
-                let existingFormatColumn = this.getExistingFormatColumn(columnId);
-                const ranges = percentBar.Ranges;
-                const columnComparison = percentBar.ColumnComparison;
-                let cellText = [];
-                if (percentBar.ShowValue && percentBar.DisplayRawValue) {
-                    cellText.push('CellValue');
-                }
-                if (percentBar.ShowValue && percentBar.DisplayPercentageValue) {
-                    cellText.push('PercentageValue');
-                }
-                const tooltipText = [];
-                if (percentBar.ShowToolTip && percentBar.DisplayRawValue) {
-                    tooltipText.push('CellValue');
-                }
-                if (percentBar.ShowToolTip && percentBar.DisplayPercentageValue) {
-                    tooltipText.push('PercentageValue');
-                }
-                const percentBarStyle = {
-                    PercentBarStyle: {
-                        CellRanges: ranges,
-                        ColumnComparison: columnComparison,
-                        CellText: cellText,
-                        ToolTipText: tooltipText,
-                        BackColor: percentBar.BackColor,
-                    },
-                };
-                if (!existingFormatColumn) {
-                    const formatColumn = {
-                        Scope: {
-                            ColumnIds: [percentBar.ColumnId],
-                        },
-                        ColumnStyle: percentBarStyle,
-                    };
-                    newFormatColumns.push(formatColumn);
-                }
-                else {
-                    existingFormatColumn.ColumnStyle = percentBarStyle;
-                    existingFormatColumns.push(existingFormatColumn);
-                }
-            });
-        }
-        // update Redux
-        this.api.formatColumnApi.addFormatColumns(newFormatColumns);
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(existingFormatColumns)) {
-            existingFormatColumns.forEach((fc) => {
-                this.api.formatColumnApi.editFormatColumn(fc);
-            });
-        }
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(newFormatColumns) ||
-            ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(existingFormatColumns)) {
-            this.api.internalApi.clearGradientColumnState();
-            this.api.internalApi.clearPercentBarState();
-        }
-    }
-    getExistingFormatColumn(columnId) {
-        let formatColumn = this.api.formatColumnApi.getFormatColumnWithSingleColumnScope(columnId);
-        if (formatColumn) {
-            return formatColumn;
-        }
-        // special columns (Calculated, FreeText, Action) are not yet part of AG-GridS colDefs
-        // so we have to check if the given columnId is a special column
-        const isSpecialColumn = !!this.api.calculatedColumnApi.getCalculatedColumnForColumnId(columnId) ||
-            !!this.api.freeTextColumnApi.getFreeTextColumnById(columnId);
-        if (isSpecialColumn) {
-            return this.api.formatColumnApi
-                .getAllFormatColumn()
-                .find((formatColumn) => 'ColumnIds' in formatColumn.Scope &&
-                formatColumn.Scope.ColumnIds.length == 1 &&
-                formatColumn.Scope.ColumnIds.includes(columnId));
-        }
-    }
     addColumnMenuItems(column) {
-        var _a;
         let returnColumnMenuItems = [];
         if (column && this.isModuleEditable() && !column.isSparkline) {
             // not fullproof as might be an All but its generally pretty good
@@ -240,40 +93,6 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 value: formatColumn,
             };
             returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
-            if (column.dataType == 'Boolean' && !this.api.columnApi.isFreeTextColumn(column.columnId)) {
-                let formatColumn = this.api.formatColumnApi.getFormatColumnForColumnId(column.columnId);
-                let hasCheckBox = formatColumn && ((_a = formatColumn.ColumnStyle) === null || _a === void 0 ? void 0 : _a.CheckBoxStyle);
-                if (hasCheckBox) {
-                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Remove Checkbox', 'unchecked', () => {
-                        this.api.formatColumnApi.deleteFormatColumn(formatColumn);
-                    }));
-                }
-                else {
-                    //    const test = this.api.formatColumnApi.getCheckBoxStyleFormatColumn(column);
-                    if (formatColumn) {
-                        returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Show as Checkbox', 'checked', () => {
-                            formatColumn.ColumnStyle = {
-                                CheckBoxStyle: true,
-                            };
-                            formatColumn.Style = undefined;
-                            this.api.formatColumnApi.editFormatColumn(formatColumn);
-                        }));
-                    }
-                    else {
-                        returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Show as Checkbox', 'checked', () => {
-                            let newFormatColumn = {
-                                Scope: {
-                                    ColumnIds: [column.columnId],
-                                },
-                                ColumnStyle: {
-                                    CheckBoxStyle: true,
-                                },
-                            };
-                            this.api.formatColumnApi.addFormatColumn(newFormatColumn);
-                        }));
-                    }
-                }
-            }
         }
         return returnColumnMenuItems;
     }

package/src/Strategy/StyledColumnModule.js

@@ -23,7 +23,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             const activeCheckboxColumnIds = this.api.columnApi
                 .getColumns()
                 .filter((aColumn) => {
-                const checkboxColumn = this.api.formatColumnApi.getCheckBoxStyleFormatColumn(aColumn);
+                const checkboxColumn = this.api.styledColumnApi.getCheckBoxStyleStyledColumn(aColumn);
                 return checkboxColumn && !checkboxColumn.IsSuspended;
             })
                 .map((aColumn) => aColumn.columnId);

package/src/Strategy/Utilities/FormatColumn/getFormatColumnStyleViewItems.js

@@ -6,21 +6,6 @@ const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
 const FormatColumnStyleWizardSection_1 = require("../../../View/FormatColumn/Wizard/FormatColumnStyleWizardSection");
 const getFormatColumnStyleViewItems = (formatColumn, api) => {
-    var _a, _b;
-    let styleType = '';
-    if ((_a = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.ColumnStyle) === null || _a === void 0 ? void 0 : _a.GradientStyle) {
-        styleType = 'Gradient';
-    }
-    else if ((_b = formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.ColumnStyle) === null || _b === void 0 ? void 0 : _b.PercentBarStyle) {
-        styleType = 'Percent Bar';
-    }
-    else {
-        styleType = 'Standard';
-    }
-    return (React.createElement(rebass_1.Box, { mt: 2 },
-        React.createElement(rebass_1.Box, { mb: 1 },
-            "Type: ",
-            styleType),
-        (0, FormatColumnStyleWizardSection_1.renderFormatColumnStyleSummary)(formatColumn, api)));
+    return React.createElement(rebass_1.Box, { mt: 2 }, (0, FormatColumnStyleWizardSection_1.renderFormatColumnStyleSummary)(formatColumn, api));
 };
 exports.getFormatColumnStyleViewItems = getFormatColumnStyleViewItems;

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -146,7 +146,6 @@ exports.DefaultAdaptableOptions = {
         customSortComparers: undefined,
         englishVariant: 'GB',
         unbalancedGroupsKey: undefined,
-        keepDeprecatedConditionalStyles: false,
     },
     layoutOptions: {
         includeExpandedRowGroups: false,

package/src/View/Components/RangesComponent.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { CellColorRange, ColumnComparison } from '../../PredefinedConfig/FormatColumnState';
+import { CellColorRange, ColumnComparison } from '../../PredefinedConfig/StyledColumnState';
 import { AdaptableScope } from '../../PredefinedConfig/Common/AdaptableScope';
 export interface RangesComponentProps extends React.ClassAttributes<RangesComponent> {
     ranges: CellColorRange[];

package/src/View/ConditionalStyle/Wizard/ConditionalStyleWizard.js

@@ -16,7 +16,6 @@ const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
 const EntityRulesEditor_1 = require("../../Components/EntityRulesEditor");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
 const react_redux_1 = require("react-redux");
-const ConditionalStyleRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ConditionalStyleRedux"));
 const ConditionalStyleSettingsWizardSettings_1 = require("./ConditionalStyleSettingsWizardSettings");
 const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 const ConditionalStyleWizard = (props) => {
@@ -43,16 +42,7 @@ const ConditionalStyleWizard = (props) => {
         return conditionalStyle;
     });
     const dispatch = (0, react_redux_1.useDispatch)();
-    const handleFinish = () => {
-        if (data) {
-            dispatch(ConditionalStyleRedux.ConditionalStyleEdit(conditionalStyle));
-        }
-        else {
-            dispatch(ConditionalStyleRedux.ConditionalStyleAdd(conditionalStyle));
-        }
-        props.onCloseWizard();
-    };
-    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: conditionalStyle, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
+    return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: conditionalStyle, onHide: props.onCloseWizard, sections: [
             {
                 title: 'Style',
                 details: 'Specify the Style to be applied conditionally',

package/src/View/FormatColumn/Wizard/FormatColumnRuleWizardSection.js

@@ -7,10 +7,9 @@ const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const EntityRulesEditor_1 = require("../../Components/EntityRulesEditor");
 function FormatColumnRuleWizardSection(props) {
     const { data, api, moduleInfo } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    const hasIncompatibleStyle = Boolean(data.ColumnStyle);
     return (React.createElement(EntityRulesEditor_1.EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: props.defaultPredicateId, 
         // TODO see what is this
-        predicateDefs: api.formatColumnApi.getFormatColumnDefsForScope(data.Scope), showNoRule: true, showBoolean: !hasIncompatibleStyle, showAggregation: false, showObservable: false, showPredicate: !hasIncompatibleStyle && !api.scopeApi.scopeIsAll(data.Scope), data: data, onChange: (formatColumn) => props.onChange(formatColumn), descriptions: {
+        predicateDefs: api.formatColumnApi.getFormatColumnDefsForScope(data.Scope), showNoRule: true, showBoolean: true, showAggregation: false, showObservable: false, showPredicate: !api.scopeApi.scopeIsAll(data.Scope), data: data, onChange: (formatColumn) => props.onChange(formatColumn), descriptions: {
             selectPredicate: 'Select a Format Column Rule - to be applied when data changes',
             useBooleanQuery: (React.createElement(React.Fragment, null,
                 "Use an BooleanQuery if ",

package/src/View/FormatColumn/Wizard/FormatColumnStyleWizardSection.js

@@ -34,8 +34,9 @@ exports.renderFormatColumnStyleSummary = renderFormatColumnStyleSummary;
 function FormatColumnStyleWizardSection(props) {
     var _a;
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    return (React.createElement(React.Fragment, null, !data.ColumnStyle ? (React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: api, Style: (_a = data.Style) !== null && _a !== void 0 ? _a : {}, UpdateStyle: (Style) => {
-            props.onChange(Object.assign(Object.assign({}, data), { Style }));
-        } })) : null));
+    return (React.createElement(React.Fragment, null,
+        React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: api, Style: (_a = data.Style) !== null && _a !== void 0 ? _a : {}, UpdateStyle: (Style) => {
+                props.onChange(Object.assign(Object.assign({}, data), { Style }));
+            } })));
 }
 exports.FormatColumnStyleWizardSection = FormatColumnStyleWizardSection;

package/src/View/FormatColumn/Wizard/FormatColumnWizard.js

@@ -65,13 +65,6 @@ const adjustDisplayFormat = (formatColumn, api) => {
 };
 const adjustFormatColumn = (formatColumn, api) => {
     formatColumn = adjustDisplayFormat(formatColumn, api);
-    if (!api.scopeApi.isSingleNumericColumnScope(formatColumn.Scope) &&
-        !(api.scopeApi.areAllBooleanColumnsInScope(formatColumn.Scope) ||
-            api.scopeApi.scopeHasOnlyBooleanDataType(formatColumn.Scope))) {
-        // when people change the scope and select more than one (numeric) column
-        // we have to discard any column style we might have
-        delete formatColumn.ColumnStyle;
-    }
     return formatColumn;
 };
 function FormatColumnWizard(props) {

package/src/agGrid/ActionColumnRenderer.d.ts

@@ -1,8 +1,10 @@
+/// <reference types="react" />
 import { ICellRendererComp, ICellRendererParams } from '@ag-grid-community/core';
 import { ActionColumn } from '../AdaptableOptions/ActionOptions';
 interface ActionColumnCellRendererParams extends ICellRendererParams {
     actionColumn?: ActionColumn;
 }
+export declare const ReactActionColumnRenderer: (props: ActionColumnCellRendererParams) => JSX.Element;
 export declare class ActionColumnRenderer implements ICellRendererComp {
     private eGui;
     private eventListener;