@adaptabletools/adaptable 13.0.0-canary.9 → 13.0.0

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);
+        }
+        // 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)]);
         }
-        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 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() {
@@ -101,179 +68,21 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!(oldConditionalStyles === null || oldConditionalStyles === void 0 ? void 0 : oldConditionalStyles.length)) {
             return;
         }
-        (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: The 'ConditionalStyle.ConditionalStyles' property is deprecated; use 'FormatColumn' instead!`);
+        (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: Conditional Styles have been merged into 'Format Columns'`);
         // remove conditional styles
-        this.api.conditionalStyleApi.deleteConditionalStyles(oldConditionalStyles);
+        this.api.internalApi.deleteConditionalStyles(oldConditionalStyles);
         // 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
-            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;
     }

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;
+}

package/src/Strategy/StyledColumnModule.js

@@ -0,0 +1,165 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StyledColumnModule = void 0;
+const tslib_1 = require("tslib");
+const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
+const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
+const StyledColumnRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/StyledColumnRedux"));
+const StyledColumnWizard_1 = require("../View/StyledColumn/Wizard/StyledColumnWizard");
+const StyledColumnWizardStyleSection_1 = require("../View/StyledColumn/Wizard/StyledColumnWizardStyleSection");
+const ObjectFactory_1 = tslib_1.__importDefault(require("../Utilities/ObjectFactory"));
+const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
+class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
+    constructor(api) {
+        super(ModuleConstants.StyledColumnModuleId, ModuleConstants.StyledColumnFriendlyName, 'brush', 'StyledColumnPopup', // to change
+        'Create a Special Column Style e.g Gradient or Percent Bar', api);
+        /**
+         * Use Case: Data (cell/row) has changed
+         * Action: Any CheckboxColumns 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 checkboxColumn = this.api.styledColumnApi.getCheckBoxStyleStyledColumn(aColumn);
+                return checkboxColumn && !checkboxColumn.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);
+            }
+        });
+    }
+    updateOldConfig() {
+        const formatColumnsWithColumnStyles = this.api.formatColumnApi
+            .getAllFormatColumn()
+            .filter((formatColumn) => formatColumn.ColumnStyle);
+        if (!formatColumnsWithColumnStyles.length) {
+            return;
+        }
+        (0, LoggingHelper_1.ConsoleLogInfo)(`Converting ${formatColumnsWithColumnStyles.length} FormatColumns Styles to Styled Columns`, formatColumnsWithColumnStyles);
+        formatColumnsWithColumnStyles.forEach((formatColumn) => {
+            this.api.formatColumnApi.deleteFormatColumn(formatColumn);
+        });
+        const styledColumns = formatColumnsWithColumnStyles
+            .map((formatColumn) => {
+            if (!('ColumnIds' in formatColumn.Scope)) {
+                return null;
+            }
+            return Object.assign(Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyStyledColumn()), { ColumnId: formatColumn.Scope.ColumnIds[0] }), formatColumn.ColumnStyle);
+        })
+            .filter(Boolean);
+        styledColumns.forEach((styledColumn) => this.api.styledColumnApi.addStyledColumn(styledColumn));
+    }
+    getModuleAdaptableObjects(config) {
+        return this.api.styledColumnApi.getAllStyledColumn(config);
+    }
+    getExplicitlyReferencedColumnIds(formatColumn) {
+        if (this.api.scopeApi.scopeHasColumns(formatColumn.Scope)) {
+            return this.api.scopeApi
+                .getColumnsForScope(formatColumn.Scope)
+                .map((adaptableColumn) => adaptableColumn.columnId);
+        }
+        return [];
+    }
+    hasNamedQueryReferences() {
+        return false;
+    }
+    addColumnMenuItems(column) {
+        let returnColumnMenuItems = [];
+        if (column && this.isModuleEditable() && !column.isSparkline) {
+            if (column.dataType === 'Number') {
+                let styledColumn = this.api.styledColumnApi.getStyledColumnByColumnId(column.columnId);
+                let styledColumnExists = Boolean(styledColumn);
+                if (styledColumn && styledColumn.IsReadOnly && styledColumn.IsReadOnly == true) {
+                    styledColumnExists = false;
+                }
+                let label = styledColumnExists ? 'Edit ' : 'Create ';
+                let popupParam = {
+                    action: styledColumnExists ? 'Edit' : 'New',
+                    source: 'ColumnMenu',
+                    value: styledColumn,
+                };
+                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Styled Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
+            }
+            if (column.dataType == 'Boolean' && !this.api.columnApi.isFreeTextColumn(column.columnId)) {
+                const styledColumn = this.api.styledColumnApi.getStyledColumnByColumnId(column.columnId);
+                const hasCheckBox = styledColumn && (styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.CheckBoxStyle);
+                if (hasCheckBox) {
+                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Remove Checkbox', 'unchecked', () => {
+                        this.api.styledColumnApi.deleteStyledColumn(styledColumn);
+                    }));
+                }
+                else {
+                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Show as Checkbox', 'checked', () => {
+                        const styledColumn = ObjectFactory_1.default.CreateEmptyStyledColumn();
+                        this.api.styledColumnApi.addStyledColumn(Object.assign(Object.assign({}, styledColumn), { ColumnId: column.columnId, CheckBoxStyle: true }));
+                    }));
+                }
+            }
+        }
+        return returnColumnMenuItems;
+    }
+    getTeamSharingAction() {
+        return {
+            ModuleEntities: this.api.styledColumnApi.getAllStyledColumn(),
+            AddAction: StyledColumnRedux.StyledColumnAdd,
+            EditAction: StyledColumnRedux.StyledColumnEdit,
+        };
+    }
+    toView(styledColumn) {
+        let type = null;
+        if (styledColumn.GradientStyle) {
+            type = 'Gradient';
+        }
+        else if (styledColumn.PercentBarStyle) {
+            type = 'Percent Bar';
+        }
+        else {
+            type = 'Check Box';
+        }
+        return {
+            abObject: styledColumn,
+            items: [
+                {
+                    name: 'Type',
+                    values: [type],
+                },
+                {
+                    name: 'Column',
+                    values: [this.api.columnApi.getFriendlyNameFromColumnId(styledColumn.ColumnId)],
+                },
+                {
+                    name: 'Style',
+                    view: () => {
+                        return (0, StyledColumnWizardStyleSection_1.renderStyledColumnStyleSummary)(styledColumn, this.api);
+                    },
+                },
+            ].filter(Boolean),
+        };
+    }
+    toViewAll() {
+        return this.getModuleAdaptableObjects({
+            includeLayoutNotAssociatedObjects: this.showLayoutNotAssociatedObjects(),
+        }).map((styledColumn) => this.toView(styledColumn));
+    }
+    getViewProperties() {
+        return {
+            getDeleteAction: StyledColumnRedux.StyledColumnDelete,
+            getSuspendAction: StyledColumnRedux.StyledColumnSuspend,
+            getUnSuspendAction: StyledColumnRedux.StyledColumnUnSuspend,
+            getEditWizard() {
+                return StyledColumnWizard_1.StyledColumnWizard;
+            },
+        };
+    }
+    canBeAssociatedWithLayouts() {
+        return true;
+    }
+}
+exports.StyledColumnModule = StyledColumnModule;

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/Strategy/Utilities/getScopeViewItems.js

@@ -11,7 +11,7 @@ const getScopeViewItems = (scope, api) => {
         values = scope.DataTypes;
     }
     if ('All' in scope) {
-        values = ['All'];
+        values = ['All Columns'];
     }
     return {
         label: 'Target',

package/src/Utilities/Constants/ModuleConstants.d.ts

@@ -51,6 +51,8 @@ export declare const ShortcutModuleId: ModuleConstants;
 export declare const ShortcutFriendlyName = "Shortcut";
 export declare const SmartEditModuleId: ModuleConstants;
 export declare const SmartEditFriendlyName = "Smart Edit";
+export declare const StyledColumnModuleId: ModuleConstants;
+export declare const StyledColumnFriendlyName = "Styled Column";
 export declare const StateManagementModuleId: ModuleConstants;
 export declare const StateManagementFriendlyName = "Manage State";
 export declare const SystemStatusModuleId: ModuleConstants;
@@ -92,6 +94,7 @@ export declare const ADAPTABLE_MODULE_MAP: {
     Schedule: string;
     Shortcut: string;
     SmartEdit: string;
+    StyledColumn: string;
     StateManagement: string;
     SystemStatus: string;
     TeamSharing: string;

package/src/Utilities/Constants/ModuleConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShortcutFriendlyName = exports.ShortcutModuleId = exports.ScheduleFriendlyName = exports.ScheduleModuleId = exports.QuickSearchFriendlyName = exports.QuickSearchModuleId = exports.QueryFriendlyName = exports.QueryModuleId = exports.PlusMinusFriendlyName = exports.PlusMinusModuleId = exports.OpenFinFriendlyName = exports.OpenFinModuleId = exports.LayoutFriendlyName = exports.LayoutModuleId = exports.IPushPullFriendlyName = exports.IPushPullModuleId = exports.GridInfoFriendlyName = exports.GridInfoModuleId = exports.Glue42FriendlyName = exports.Glue42ModuleId = exports.FreeTextColumnFriendlyName = exports.FreeTextColumnModuleId = exports.FormatColumnFriendlyName = exports.FormatColumnModuleId = exports.FilterFriendlyName = exports.FilterModuleId = exports.ExportFriendlyName = exports.ExportModuleId = exports.DataSetFriendlyName = exports.DataSetModuleId = exports.DataChangeHistoryFriendlyName = exports.DataChangeHistoryModuleId = exports.DashboardFriendlyName = exports.DashboardModuleId = exports.CustomSortFriendlyName = exports.CustomSortModuleId = exports.ConditionalStyleFriendlyName = exports.ConditionalStyleModuleId = exports.ChartingFriendlyName = exports.ChartingModuleId = exports.CellSummaryFriendlyName = exports.CellSummaryModuleId = exports.CalculatedColumnFriendlyName = exports.CalculatedColumnModuleId = exports.BulkUpdateFriendlyName = exports.BulkUpdateModuleId = exports.FlashingCellFriendlyName = exports.FlashingCellModuleId = exports.AlertModuleFriendlyName = exports.AlertModuleId = void 0;
-exports.ADAPTABLE_MODULE_MAP = exports.StatusBarFriendlyName = exports.StatusBarModuleId = exports.SettingsPanelFriendlyName = exports.SettingsPanelModuleId = exports.ToolPanelFriendlyName = exports.ToolPanelModuleId = exports.ThemeFriendlyName = exports.ThemeModuleId = exports.TeamSharingFriendlyName = exports.TeamSharingModuleId = exports.SystemStatusFriendlyName = exports.SystemStatusModuleId = exports.StateManagementFriendlyName = exports.StateManagementModuleId = exports.SmartEditFriendlyName = exports.SmartEditModuleId = void 0;
+exports.ADAPTABLE_MODULE_MAP = exports.StatusBarFriendlyName = exports.StatusBarModuleId = exports.SettingsPanelFriendlyName = exports.SettingsPanelModuleId = exports.ToolPanelFriendlyName = exports.ToolPanelModuleId = exports.ThemeFriendlyName = exports.ThemeModuleId = exports.TeamSharingFriendlyName = exports.TeamSharingModuleId = exports.SystemStatusFriendlyName = exports.SystemStatusModuleId = exports.StateManagementFriendlyName = exports.StateManagementModuleId = exports.StyledColumnFriendlyName = exports.StyledColumnModuleId = exports.SmartEditFriendlyName = exports.SmartEditModuleId = void 0;
 exports.AlertModuleId = 'Alert';
 exports.AlertModuleFriendlyName = 'Alert';
 exports.FlashingCellModuleId = 'FlashingCell';
@@ -54,6 +54,8 @@ exports.ShortcutModuleId = 'Shortcut';
 exports.ShortcutFriendlyName = 'Shortcut';
 exports.SmartEditModuleId = 'SmartEdit';
 exports.SmartEditFriendlyName = 'Smart Edit';
+exports.StyledColumnModuleId = 'StyledColumn';
+exports.StyledColumnFriendlyName = 'Styled Column';
 exports.StateManagementModuleId = 'StateManagement';
 exports.StateManagementFriendlyName = 'Manage State';
 exports.SystemStatusModuleId = 'SystemStatus';
@@ -95,6 +97,7 @@ exports.ADAPTABLE_MODULE_MAP = {
     [exports.ScheduleModuleId]: exports.ScheduleFriendlyName,
     [exports.ShortcutModuleId]: exports.ShortcutFriendlyName,
     [exports.SmartEditModuleId]: exports.SmartEditFriendlyName,
+    [exports.StyledColumnModuleId]: exports.StyledColumnFriendlyName,
     [exports.StateManagementModuleId]: exports.StateManagementFriendlyName,
     [exports.SystemStatusModuleId]: exports.SystemStatusFriendlyName,
     [exports.TeamSharingModuleId]: exports.TeamSharingFriendlyName,

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -65,7 +65,6 @@ exports.DefaultAdaptableOptions = {
             systemAggregatedBooleanFunctions: undefined,
             systemAggregatedScalarFunctions: undefined,
             moduleExpressionFunctions: undefined,
-            queryableColumns: undefined,
             performExpressionValidation: true,
             maxTimeframeSize: 28800000, // 8 hours
         },
@@ -120,7 +119,7 @@ exports.DefaultAdaptableOptions = {
         exportFormatType: 'rawValue',
         exportDateFormat: undefined,
         customDestinations: undefined,
-        customReports: undefined,
+        serverReports: undefined,
         appendFileTimestamp: false,
         systemExportDestinations: [
             Enums_1.ExportDestination.Excel,
@@ -147,7 +146,6 @@ exports.DefaultAdaptableOptions = {
         customSortComparers: undefined,
         englishVariant: 'GB',
         unbalancedGroupsKey: undefined,
-        keepDeprecatedConditionalStyles: false,
     },
     layoutOptions: {
         includeExpandedRowGroups: false,

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -18,7 +18,6 @@ exports.DEFAULT_NAVIGATION_ITEMS = [
     '-',
     'Alert',
     'CalculatedColumn',
-    'ConditionalStyle',
     'CustomSort',
     'DataSet',
     'Export',
@@ -32,6 +31,7 @@ exports.DEFAULT_NAVIGATION_ITEMS = [
     'QuickSearch',
     'Schedule',
     'Shortcut',
+    'StyledColumn',
     '-',
     'SystemStatus',
     'DataChangeHistory',

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.d.ts

@@ -2,9 +2,6 @@ import { ExpressionFunction } from '../../parser/src/types';
 /**
  * List of all the Observable Functions available in AdaptableQL
  */
-export declare type ObservableFunctionName = 'WHERE' | 'COL' | 'TIMEFRAME' | ObservableFunction | ChangeFunction;
-declare type ObservableFunction = 'ROW_CHANGE' | 'GRID_CHANGE';
-declare type ChangeFunction = 'MAX' | 'MIN' | 'NONE' | 'COUNT';
+export declare type ObservableFunctionName = 'WHERE' | 'COL' | 'TIMEFRAME' | 'ROW_CHANGE' | 'GRID_CHANGE' | 'MAX' | 'MIN' | 'NONE' | 'COUNT';
 export declare const observableExpressionFunctions: Record<ObservableFunctionName, ExpressionFunction>;
 export declare const observableExpressionFunctionNames: ObservableFunctionName[];
-export {};