@adaptabletools/adaptable 13.0.0-canary.2 → 13.0.0-canary.21

package/src/Strategy/ConditionalStyleModule.js

@@ -2,224 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConditionalStyleModule = void 0;
 const tslib_1 = require("tslib");
-const ConditionalStyleRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/ConditionalStyleRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/ArrayExtensions"));
-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");
 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);
     }
-    getModuleAdaptableObjects(config) {
-        return this.api.conditionalStyleApi.getAllConditionalStyle(config);
-    }
-    getExplicitlyReferencedColumnIds(conditionalStyle) {
-        if (conditionalStyle.Rule.BooleanExpression) {
-            return this.api.queryLanguageApi.getColumnsFromExpression(conditionalStyle.Rule.BooleanExpression);
-        }
-        else if (this.api.scopeApi.scopeHasColumns(conditionalStyle.Scope)) {
-            return this.api.scopeApi
-                .getColumnsForScope(conditionalStyle.Scope)
-                .map((adaptableColumn) => adaptableColumn.columnId);
-        }
-        return [];
-    }
-    getReferencedNamedQueryNames(conditionalStyle) {
-        if (!conditionalStyle.Rule.BooleanExpression) {
-            return [];
-        }
-        return this.api.queryApi.getReferencedNamedQueryNames(conditionalStyle.Rule.BooleanExpression);
-    }
-    updateOldConfig() {
-        var _a;
-        const conditionalStyles = (_a = this.api.conditionalStyleApi.getConditionalStyleState().ConditionalStyles) !== null && _a !== void 0 ? _a : [];
-        let oldConditionalStyles = [];
-        conditionalStyles.forEach((cs) => {
-            if (cs) {
-                const scopedColumnIds = this.api.scopeApi.getColumnIdsInScope(cs.Scope);
-                if (ArrayExtensions_1.default.IsNotNullOrEmpty(scopedColumnIds)) {
-                    scopedColumnIds.forEach((colId) => {
-                        if (!this.api.columnApi.doesColumnExist(colId)) {
-                            (0, LoggingHelper_1.LogAdaptableError)('Conditional Style contains missing column: ' + colId);
-                        }
-                    });
-                }
-                if (cs.ExcludeGroupedRows === false) {
-                    cs.ExcludeGroupedRows = undefined;
-                    cs.IncludeGroupedRows = true;
-                    oldConditionalStyles.push(cs);
-                    (0, LoggingHelper_1.LogAdaptableWarning)(`Updating incorrect Predefined Config for Conditional Style with "ExcludeGroupedRows" set}`);
-                }
-                if (cs.Predicate) {
-                    cs.Rule = {
-                        Predicate: cs.Predicate,
-                    };
-                    (0, LoggingHelper_1.LogAdaptableWarning)(`Updating incorrect Predefined Config for Conditional Style: ${cs.Predicate}`);
-                    cs.Predicate = undefined;
-                    oldConditionalStyles.push(cs);
-                }
-                if (cs.Expression) {
-                    let rule = {
-                        BooleanExpression: cs.Expression,
-                    };
-                    cs.Rule = rule;
-                    (0, LoggingHelper_1.LogAdaptableWarning)(`Updating incorrect Predefined Config for Conditional Style: ${cs.Expression}`);
-                    cs.Expression = undefined;
-                    oldConditionalStyles.push(cs);
-                }
-            }
-        });
-        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(),
-            AddAction: ConditionalStyleRedux.ConditionalStyleAdd,
-            EditAction: ConditionalStyleRedux.ConditionalStyleEdit,
-        };
-    }
-    isConditionalStyleActiveForColumn(conditionalStyleForColumn, column, params) {
-        if (!conditionalStyleForColumn.Rule) {
-            return false;
-        }
-        if (conditionalStyleForColumn.IsSuspended) {
-            return false;
-        }
-        if (this.shouldRunStyle(conditionalStyleForColumn, params.node)) {
-            // first run the predicate
-            if (conditionalStyleForColumn.Rule.Predicate &&
-                conditionalStyleForColumn.Rule.Predicate.PredicateId) {
-                if (this.evaluatePredicate({
-                    conditionalStyle: conditionalStyleForColumn,
-                    column,
-                    value: params.value,
-                    node: params.node,
-                })) {
-                    return true;
-                }
-            }
-            else if (conditionalStyleForColumn.Rule.BooleanExpression) {
-                if (this.evaluateExpression(conditionalStyleForColumn, params.node)) {
-                    return true;
-                }
-            }
-            // nothing has passed then return false
-            return false;
-        }
-    }
-    isConditionalStyleActiveForRow(conditionalStyleForRow, params) {
-        if (!conditionalStyleForRow.Rule) {
-            return false;
-        }
-        if (conditionalStyleForRow.IsSuspended) {
-            return false;
-        }
-        if (this.shouldRunStyle(conditionalStyleForRow, params.node)) {
-            if (conditionalStyleForRow.Rule.Predicate &&
-                conditionalStyleForRow.Rule.Predicate.PredicateId) {
-                if (this.evaluatePredicate({
-                    conditionalStyle: conditionalStyleForRow,
-                    column: null,
-                    value: params.value,
-                    node: params.node,
-                })) {
-                    return true;
-                }
-            }
-            else if (conditionalStyleForRow.Rule.BooleanExpression) {
-                if (this.evaluateExpression(conditionalStyleForRow, params.node)) {
-                    return true;
-                }
-            }
-            // nothing has passed then return false
-            return false;
-        }
-    }
-    evaluatePredicate({ conditionalStyle, column, value, node, }) {
-        const params = {
-            value: value,
-            oldValue: null,
-            displayValue: column
-                ? this.api.gridApi.getDisplayValueFromRowNode(node, column.columnId)
-                : value,
-            node: node,
-            column: column,
-        };
-        const result = this.api.predicateApi.handlePredicate(conditionalStyle.Rule.Predicate, params, false);
-        return result;
-    }
-    evaluateExpression(conditionalStyle, node) {
-        const isValidExpression = this.api.queryLanguageApi.isValidBooleanExpression(conditionalStyle.Rule.BooleanExpression, ModuleConstants_1.ConditionalStyleModuleId, `Invalid conditional style rule '${conditionalStyle.Rule.BooleanExpression}'`);
-        return (isValidExpression &&
-            this.api.internalApi
-                .getQueryLanguageService()
-                .evaluateBooleanExpression(conditionalStyle.Rule.BooleanExpression, ModuleConstants_1.ConditionalStyleModuleId, node));
-    }
-    shouldRunStyle(conditionalStyle, node) {
-        if (!conditionalStyle.IncludeGroupedRows && this.api.gridApi.isGroupRowNode(node)) {
-            return false;
-        }
-        return true;
-    }
-    toView(conditionalStyle) {
-        return {
-            items: [
-                (0, getScopeViewItems_1.getScopeViewItems)(conditionalStyle.Scope, this.api),
-                (0, getStyleViewItems_1.getStyleViewItems)(),
-                (0, getRuleViewItems_1.getRuleViewItems)(conditionalStyle.Rule, this.api),
-                {
-                    name: 'Settings',
-                    values: [`Include grouped rows: ${conditionalStyle.IncludeGroupedRows ? 'Yes' : 'No'}`],
-                },
-                (0, getObjectTagsViewItems_1.getObjectTagsViewItems)(conditionalStyle, this.api),
-            ],
-            abObject: conditionalStyle,
-        };
-    }
-    toViewAll() {
-        return this.getModuleAdaptableObjects({
-            includeLayoutNotAssociatedObjects: this.showLayoutNotAssociatedObjects(),
-        }).map((conditionalStyle) => this.toView(conditionalStyle));
-    }
-    getViewProperties() {
-        return {
-            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;
-            },
-        };
-    }
-    canBeAssociatedWithLayouts() {
-        return true;
-    }
 }
 exports.ConditionalStyleModule = ConditionalStyleModule;

package/src/Strategy/DataChangeHistoryModule.d.ts

@@ -3,6 +3,7 @@ import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class DataChangeHistoryModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
+    isModuleAvailable(): boolean;
     getPopupMaxWidth(): number;
     hasNamedQueryReferences(): boolean;
     private shouldLogDataChange;

package/src/Strategy/DataChangeHistoryModule.js

@@ -6,6 +6,8 @@ const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const SystemRedux_1 = require("../Redux/ActionsReducers/SystemRedux");
 const DataChangeHistoryStatusBarContent_1 = require("../View/DataChangeHistory/DataChangeHistoryStatusBarContent");
+const core_1 = require("@ag-grid-community/core");
+const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 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);
@@ -19,6 +21,16 @@ class DataChangeHistoryModule extends AdaptableModuleBase_1.AdaptableModuleBase
             }
         });
     }
+    isModuleAvailable() {
+        const isAdaptableModuleAvailable = super.isModuleAvailable();
+        const isAgGridModuleAvailable = this.api.internalApi
+            .getAdaptableInstance()
+            .isAgGridModulePresent(core_1.ModuleNames.ClientSideRowModelModule);
+        if (isAdaptableModuleAvailable && !isAgGridModuleAvailable) {
+            (0, LoggingHelper_1.LogAdaptableWarning)(`Data Change History is NOT available due to missing required AG Grid module: ${core_1.ModuleNames.ClientSideRowModelModule}`);
+        }
+        return isAdaptableModuleAvailable && isAgGridModuleAvailable;
+    }
     getPopupMaxWidth() {
         return 1000;
     }

package/src/Strategy/FormatColumnModule.d.ts

@@ -2,12 +2,10 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import * as FormatColumnRedux from '../Redux/ActionsReducers/FormatColumnRedux';
 import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
-import { AdaptableObjectView, IModule } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
-import { FormatColumnWizard } from '../View/FormatColumn/Wizard/FormatColumnWizard';
 export declare class FormatColumnModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(config?: {
@@ -16,16 +14,11 @@ export declare class FormatColumnModule extends AdaptableModuleBase implements I
     getExplicitlyReferencedColumnIds(formatColumn: FormatColumn): string[];
     hasNamedQueryReferences(): boolean;
     updateOldConfig(): void;
-    private getExistingFormatColumn;
+    private updateConditionalStylesColumnsOldConfig;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<FormatColumn>;
     toView(formatColumn: FormatColumn): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
-    getViewProperties(): {
-        getDeleteAction: (formatColumn: FormatColumn) => FormatColumnRedux.FormatColumnDeleteAction;
-        getSuspendAction: (formatColumn: FormatColumn) => FormatColumnRedux.FormatColumnSuspendAction;
-        getUnSuspendAction: (formatColumn: FormatColumn) => FormatColumnRedux.FormatColumnSuspendAction;
-        getEditWizard(): typeof FormatColumnWizard;
-    };
+    getViewProperties(): AdaptableModuleView;
     canBeAssociatedWithLayouts(): boolean;
 }

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");
@@ -13,30 +12,11 @@ const FormatColumnFormatWizardSection_1 = require("../View/FormatColumn/Wizard/F
 const getFormatColumnSettingsViewItems_1 = require("./Utilities/FormatColumn/getFormatColumnSettingsViewItems");
 const getFormatColumnStyleViewItems_1 = require("./Utilities/FormatColumn/getFormatColumnStyleViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
+const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
+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);
@@ -53,179 +33,56 @@ 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)(`DEPRECATED: The 'FormatColumn.HeaderName' property is deprecated; use a Layout custom Column Header instead!`);
-        }
-        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);
-                }
-            });
+        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 Redux
-        this.api.formatColumnApi.addFormatColumns(newFormatColumns);
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(existingFormatColumns)) {
-            existingFormatColumns.forEach((fc) => {
-                this.api.formatColumnApi.editFormatColumn(fc);
-            });
+        // 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)]);
         }
-        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(newFormatColumns) ||
-            ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(existingFormatColumns)) {
-            this.api.internalApi.clearGradientColumnState();
-            this.api.internalApi.clearPercentBarState();
+        // 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)]);
         }
     }
-    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));
+    updateConditionalStylesColumnsOldConfig() {
+        var _a;
+        const oldConditionalStyles = (_a = this.api.internalApi.getState().ConditionalStyle) === null || _a === void 0 ? void 0 : _a.ConditionalStyles;
+        if (!(oldConditionalStyles === null || oldConditionalStyles === void 0 ? void 0 : oldConditionalStyles.length)) {
+            return;
         }
+        (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: Conditional Styles have been merged into 'Format Columns'`);
+        // remove conditional styles
+        this.api.internalApi.deleteConditionalStyles(oldConditionalStyles);
+        // add as format column
+        this.api.formatColumnApi.addFormatColumns(oldConditionalStyles);
     }
     addColumnMenuItems(column) {
-        var _a;
         let returnColumnMenuItems = [];
         if (column && this.isModuleEditable() && !column.isSparkline) {
-            // not fullproof as might be an All but its generally pretty good
-            let formatColumn = this.api.formatColumnApi.getFormatColumnForColumn(column);
-            let formatExists = formatColumn
-                ? this.api.scopeApi.isColumnInScopeColumns(column, formatColumn.Scope)
-                : false;
-            if (formatColumn && formatColumn.IsReadOnly && formatColumn.IsReadOnly == true) {
-                formatExists = false;
-            }
-            let label = formatExists ? 'Edit ' : 'Create ';
             let popupParam = {
                 column: column,
-                action: formatExists ? 'Edit' : 'New',
+                action: 'New',
                 source: 'ColumnMenu',
-                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);
-                        }));
-                    }
-                }
-            }
+            returnColumnMenuItems.push(this.createColumnMenuItemShowPopup('Create Format Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
         }
         return returnColumnMenuItems;
     }
@@ -241,6 +98,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             abObject: formatColumn,
             items: [
                 (0, getScopeViewItems_1.getScopeViewItems)(formatColumn.Scope, this.api),
+                formatColumn.Rule && (0, getRuleViewItems_1.getRuleViewItems)(formatColumn.Rule, this.api),
                 {
                     name: 'Style',
                     view: () => (0, getFormatColumnStyleViewItems_1.getFormatColumnStyleViewItems)(formatColumn, this.api),
@@ -251,7 +109,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 (0, getFormatColumnSettingsViewItems_1.getFormatColumnSettingsViewItems)(formatColumn),
                 (0, getObjectTagsViewItems_1.getObjectTagsViewItems)(formatColumn, this.api),
-            ],
+            ].filter(Boolean),
         };
     }
     toViewAll() {
@@ -261,6 +119,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getViewProperties() {
         return {
+            actions: [MoveFormatColumn_1.MoveFormatColumn],
             getDeleteAction: FormatColumnRedux.FormatColumnDelete,
             getSuspendAction: FormatColumnRedux.FormatColumnSuspend,
             getUnSuspendAction: FormatColumnRedux.FormatColumnUnSuspend,

package/src/Strategy/Interface/IModule.d.ts

@@ -88,6 +88,7 @@ export interface AdaptableModuleView {
      */
     actions?: AdaptableModuleViewAction[];
     onMount?: () => void;
+    HeaderComponent?: React.FunctionComponent;
     onOpenEditPopup?: (abObject?: AdaptableObject) => void;
     getDeleteAction?: (abObject: AdaptableObject) => Redux.Action;
     getCompactDeleteAction?: (abObject: AdaptableObject) => Redux.Action;

package/src/Strategy/LayoutModule.js

@@ -57,10 +57,6 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 Reference: alertDefinition,
                 Module: 'Alert',
             }));
-            this.api.conditionalStyleApi.getAllConditionalStyle(loadConfig).forEach((conditionalStyle) => layoutAssociatedObjectReferences.push({
-                Reference: conditionalStyle,
-                Module: 'ConditionalStyle',
-            }));
             this.api.customSortApi.getAllCustomSort(loadConfig).forEach((customSort) => layoutAssociatedObjectReferences.push({
                 Reference: customSort,
                 Module: 'CustomSort',

package/src/Strategy/StyledColumnModule.d.ts

@@ -0,0 +1,24 @@
+import { AdaptableModuleBase } from './AdaptableModuleBase';
+import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
+import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
+import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
+import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
+import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
+import { AdaptableApi } from '../Api/AdaptableApi';
+import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
+import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
+export declare class StyledColumnModule extends AdaptableModuleBase implements IModule {
+    constructor(api: AdaptableApi);
+    updateOldConfig(): void;
+    getModuleAdaptableObjects(config?: {
+        includeLayoutNotAssociatedObjects?: boolean;
+    }): AdaptableObject[];
+    getExplicitlyReferencedColumnIds(formatColumn: FormatColumn): string[];
+    hasNamedQueryReferences(): boolean;
+    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
+    getTeamSharingAction(): TeamSharingImportInfo<StyledColumn>;
+    toView(styledColumn: StyledColumn): AdaptableObjectView;
+    toViewAll(): AdaptableObjectView[];
+    getViewProperties(): AdaptableModuleView;
+    canBeAssociatedWithLayouts(): boolean;
+}