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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "13.0.0-canary.20",
+  "version": "13.0.0-canary.21",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1664458808904;
+declare const _default: 1664742496151;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1664458808904;
+exports.default = 1664742496151;

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -193,7 +193,7 @@ export interface ObjectTagsContext extends BaseContext {
 /**
  * Provides Custom Display Formats
  */
-export declare type CustomDisplayFormatter = {
+export interface CustomDisplayFormatter {
     /**
      * Id of the Formatted
      */
@@ -210,7 +210,7 @@ export declare type CustomDisplayFormatter = {
      * Where the Custom Display Format can be applied
      */
     scope: AdaptableScope;
-};
+}
 /**
  * Context used in handler of CustomDisplayFormatter
  */

package/src/Api/AdaptableApi.d.ts

@@ -4,7 +4,6 @@ import { BulkUpdateApi } from './BulkUpdateApi';
 import { CalculatedColumnApi } from './CalculatedColumnApi';
 import { CellSummaryApi } from './CellSummaryApi';
 import { ConfigApi } from './ConfigApi';
-import { ConditionalStyleApi } from './ConditionalStyleApi';
 import { CustomSortApi } from './CustomSortApi';
 import { DashboardApi } from './DashboardApi';
 import { ToolPanelApi } from './ToolPanelApi';
@@ -74,10 +73,6 @@ export interface AdaptableApi {
      * Provides a number of column-related methods
      */
     columnApi: ColumnApi;
-    /**
-     * Provides access to the Conditional Style Module
-     */
-    conditionalStyleApi: ConditionalStyleApi;
     /**
      * Methods giving access to Adaptable State
      */

package/src/Api/ConfigApi.d.ts

@@ -6,7 +6,6 @@ import { FormatColumnState } from '../PredefinedConfig/FormatColumnState';
 import { ExportState } from '../PredefinedConfig/ExportState';
 import { DashboardState } from '../PredefinedConfig/DashboardState';
 import { CustomSortState } from '../PredefinedConfig/CustomSortState';
-import { ConditionalStyleState } from '../PredefinedConfig/ConditionalStyleState';
 import { CalculatedColumnState } from '../PredefinedConfig/CalculatedColumnState';
 import { AlertState } from '../PredefinedConfig/AlertState';
 import { ConfigState } from '../PredefinedConfig/ConfigState';
@@ -115,10 +114,6 @@ export interface ConfigApi {
      * @param returnJson return as JSON rather than object
      */
     getCalculatedColumnState(returnJson: boolean): CalculatedColumnState;
-    /**
-     * @deprecated use `getFormatColumnState` instead
-     */
-    getConditionalStyleState(returnJson: boolean): ConditionalStyleState;
     /**
      * Returns Custom Sort section of Adaptable State
      * @param returnJson return as JSON rather than object

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

@@ -4,7 +4,6 @@ import { AlertApi } from '../AlertApi';
 import { BulkUpdateApi } from '../BulkUpdateApi';
 import { CalculatedColumnApi } from '../CalculatedColumnApi';
 import { CellSummaryApi } from '../CellSummaryApi';
-import { ConditionalStyleApi } from '../ConditionalStyleApi';
 import { ConfigApi } from '../ConfigApi';
 import { CustomSortApi } from '../CustomSortApi';
 import { DashboardApi } from '../DashboardApi';
@@ -51,7 +50,6 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     calculatedColumnApi: CalculatedColumnApi;
     cellSummaryApi: CellSummaryApi;
     columnApi: ColumnApi;
-    conditionalStyleApi: ConditionalStyleApi;
     configApi: ConfigApi;
     customSortApi: CustomSortApi;
     dashboardApi: DashboardApi;

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -8,7 +8,6 @@ const PluginsApiImpl_1 = require("./PluginsApiImpl");
 const BulkUpdateApiImpl_1 = require("./BulkUpdateApiImpl");
 const CalculatedColumnApiImpl_1 = require("./CalculatedColumnApiImpl");
 const CellSummaryApiImpl_1 = require("./CellSummaryApiImpl");
-const ConditionalStyleApiImpl_1 = require("./ConditionalStyleApiImpl");
 const ConfigApiImpl_1 = require("./ConfigApiImpl");
 const CustomSortApiImpl_1 = require("./CustomSortApiImpl");
 const DashboardApiImpl_1 = require("./DashboardApiImpl");
@@ -57,7 +56,6 @@ class AdaptableApiImpl {
         this.calculatedColumnApi = new CalculatedColumnApiImpl_1.CalculatedColumnApiImpl(adaptable);
         this.cellSummaryApi = new CellSummaryApiImpl_1.CellSummaryApiImpl(adaptable);
         this.columnApi = new ColumnApiImpl_1.ColumnApiImpl(adaptable);
-        this.conditionalStyleApi = new ConditionalStyleApiImpl_1.ConditionalStyleApiImpl(adaptable);
         this.configApi = new ConfigApiImpl_1.ConfigApiImpl(adaptable);
         this.customSortApi = new CustomSortApiImpl_1.CustomSortApiImpl(adaptable);
         this.dashboardApi = new DashboardApiImpl_1.DashboardApiImpl(adaptable);
@@ -105,7 +103,6 @@ class AdaptableApiImpl {
         this.cellSummaryApi = null;
         this.chartingApi = null;
         this.columnApi = null;
-        this.conditionalStyleApi = null;
         this.configApi = null;
         this.customSortApi = null;
         this.dashboardApi = null;

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

@@ -7,7 +7,6 @@ import { FormatColumnState } from '../../PredefinedConfig/FormatColumnState';
 import { ExportState } from '../../PredefinedConfig/ExportState';
 import { DashboardState } from '../../PredefinedConfig/DashboardState';
 import { CustomSortState } from '../../PredefinedConfig/CustomSortState';
-import { ConditionalStyleState } from '../../PredefinedConfig/ConditionalStyleState';
 import { CalculatedColumnState } from '../../PredefinedConfig/CalculatedColumnState';
 import { AlertState } from '../../PredefinedConfig/AlertState';
 import { ConfigState } from '../../PredefinedConfig/ConfigState';
@@ -48,7 +47,6 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     getApplicationState(returnJson?: boolean): ApplicationState;
     getCalculatedColumnState(returnJson?: boolean): CalculatedColumnState;
     getChartingState(returnJson?: boolean): ChartingState;
-    getConditionalStyleState(returnJson?: boolean): ConditionalStyleState;
     getCustomSortState(returnJson?: boolean): CustomSortState;
     getDashboardState(returnJson?: boolean): DashboardState;
     getExportState(returnJson?: boolean): ExportState;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -12,7 +12,6 @@ const AlertRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/Ale
 const BulkUpdateRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/BulkUpdateRedux"));
 const CalculatedColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CalculatedColumnRedux"));
 const ChartingRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ChartingRedux"));
-const ConditionalStyleRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ConditionalStyleRedux"));
 const CustomSortRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/CustomSortRedux"));
 const ExportRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/ExportRedux"));
 const FormatColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FormatColumnRedux"));
@@ -170,10 +169,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().Charting)
                     : this.getAdaptableState().Charting;
-            case 'ConditionalStyle':
-                return returnJson
-                    ? JSON.stringify(this.getAdaptableState().ConditionalStyle)
-                    : this.getAdaptableState().ConditionalStyle;
             case 'CustomSort':
                 return returnJson
                     ? JSON.stringify(this.getAdaptableState().CustomSort)
@@ -250,9 +245,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     getChartingState(returnJson = false) {
         return this.getUserStateByStateKey('Charting', returnJson);
     }
-    getConditionalStyleState(returnJson = false) {
-        return this.getUserStateByStateKey('ConditionalStyle', returnJson);
-    }
     getCustomSortState(returnJson = false) {
         return this.getUserStateByStateKey('CustomSort', returnJson);
     }
@@ -306,9 +298,6 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
             case 'Charting':
                 this.dispatchAction(ChartingRedux.ChartingReady(this.getChartingState()));
                 break;
-            case 'ConditionalStyle':
-                this.dispatchAction(ConditionalStyleRedux.ConditionalStyleReady(this.getConditionalStyleState()));
-                break;
             case 'CustomSort':
                 this.dispatchAction(CustomSortRedux.CustomSortReady(this.getCustomSortState()));
                 break;

package/src/Api/Implementation/FlashingCellApiImpl.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
 const FlashingCellRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FlashingCellRedux"));
 const ApiBase_1 = require("./ApiBase");
+const Helper_1 = require("../../Utilities/Helpers/Helper");
 class FlashingCellApiImpl extends ApiBase_1.ApiBase {
     getFlashingCellState() {
         return this.getAdaptableState().FlashingCell;
@@ -17,10 +18,12 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
         });
     }
     mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition) {
-        const flashingDefaults = this.adaptable.adaptableOptions.flashingCellOptions;
+        let flashingDefaults = this.adaptable.adaptableOptions.flashingCellOptions;
         if (!flashingDefaults) {
             return flashingCellDefinition;
         }
+        // deep clone it, otherwise we will mutate&share(!!) the global flashingCellOptions object
+        flashingDefaults = (0, Helper_1.cloneObject)(flashingDefaults);
         if (!flashingCellDefinition.DownChangeStyle && flashingDefaults.defaultDownChangeStyle) {
             flashingCellDefinition.DownChangeStyle = flashingDefaults.defaultDownChangeStyle;
         }

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

@@ -142,4 +142,5 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
     getEditLookUpValuesForColumn(editLookUpItem: EditLookUpPermittedValues, column: AdaptableColumn, gridCell?: GridCell): any[] | undefined;
     getAdaptableQueryExpressionText(query: Partial<AdaptableQuery>): string;
+    deleteConditionalStyles(conditionalStyles: any[]): void;
 }

package/src/Api/Implementation/InternalApiImpl.js

@@ -650,5 +650,10 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
             ? this.adaptable.api.queryLanguageApi.getAdaptableQueryExpressionWithColumnFriendlyNames(query)
             : this.adaptable.api.queryLanguageApi.getAdaptableQueryExpression(query);
     }
+    deleteConditionalStyles(conditionalStyles) {
+        conditionalStyles.forEach((cs) => {
+            this.dispatchAction(DeadRedux.ConditionalStyleDelete(cs));
+        });
+    }
 }
 exports.InternalApiImpl = InternalApiImpl;

package/src/Api/InternalApi.d.ts

@@ -144,4 +144,5 @@ export interface InternalApi {
     getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
     getEditLookUpValuesForColumn(editLookUpItem: EditLookUpPermittedValues, column: AdaptableColumn, gridCell?: GridCell): any[] | undefined;
     getAdaptableQueryExpressionText(query: Partial<AdaptableQuery>): string;
+    deleteConditionalStyles(conditionalStyles: any[]): void;
 }

package/src/Redux/DeadRedux.d.ts

@@ -19,3 +19,9 @@ export interface UpdatedRowClearAction extends Redux.Action {
 }
 export declare const UpdatedRowClear: () => UpdatedRowClearAction;
 export declare const UpdatedRowReducer: Redux.Reducer<any>;
+export declare const CONDITIONAL_STYLE_DELETE = "CONDITIONAL_STYLE_DELETE";
+export interface ConditionalStyleDeleteAction extends Redux.Action {
+    conditionalStyle: any;
+}
+export declare const ConditionalStyleDelete: (conditionalStyle: any) => ConditionalStyleDeleteAction;
+export declare const ConditionalStyleReducer: Redux.Reducer<any>;

package/src/Redux/DeadRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UpdatedRowReducer = exports.UpdatedRowClear = exports.UPDATED_ROW_CLEAR = exports.FlashingCellReducer = exports.FlashingCellClear = exports.FLASHING_CELL_CLEAR = exports.PercentBarReducer = exports.PercentBarClear = exports.PERCENT_BAR_CLEAR = exports.GradientColumnReducer = exports.GradientColumnClear = exports.GRADIENT_COLUMN_CLEAR = void 0;
+exports.ConditionalStyleReducer = exports.ConditionalStyleDelete = exports.CONDITIONAL_STYLE_DELETE = exports.UpdatedRowReducer = exports.UpdatedRowClear = exports.UPDATED_ROW_CLEAR = exports.FlashingCellReducer = exports.FlashingCellClear = exports.FLASHING_CELL_CLEAR = exports.PercentBarReducer = exports.PercentBarClear = exports.PERCENT_BAR_CLEAR = exports.GradientColumnReducer = exports.GradientColumnClear = exports.GRADIENT_COLUMN_CLEAR = void 0;
 const initialGradientColumnState = {};
 exports.GRADIENT_COLUMN_CLEAR = 'GRADIENT_COLUMN_CLEAR';
 const GradientColumnClear = () => ({
@@ -65,3 +65,21 @@ const UpdatedRowReducer = (state = initialUpdatedRowState, action) => {
     }
 };
 exports.UpdatedRowReducer = UpdatedRowReducer;
+const initialConditionalStyleState = {};
+exports.CONDITIONAL_STYLE_DELETE = 'CONDITIONAL_STYLE_DELETE';
+const ConditionalStyleDelete = (conditionalStyle) => ({
+    type: exports.CONDITIONAL_STYLE_DELETE,
+    conditionalStyle,
+});
+exports.ConditionalStyleDelete = ConditionalStyleDelete;
+const ConditionalStyleReducer = (state = initialConditionalStyleState, action) => {
+    switch (action.type) {
+        case exports.CONDITIONAL_STYLE_DELETE: {
+            const actionConditionalStyle = action.conditionalStyle;
+            return Object.assign(Object.assign({}, state), { ConditionalStyles: state.ConditionalStyles.filter((abObject) => abObject.Uuid !== actionConditionalStyle.Uuid) });
+        }
+        default:
+            return state;
+    }
+};
+exports.ConditionalStyleReducer = ConditionalStyleReducer;

package/src/Redux/Store/AdaptableStore.js

@@ -20,7 +20,6 @@ const GridRedux = tslib_1.__importStar(require("../ActionsReducers/GridRedux"));
 const SystemRedux = tslib_1.__importStar(require("../ActionsReducers/SystemRedux"));
 const PlusMinusRedux = tslib_1.__importStar(require("../ActionsReducers/PlusMinusRedux"));
 const ExportRedux = tslib_1.__importStar(require("../ActionsReducers/ExportRedux"));
-const ConditionalStyleRedux = tslib_1.__importStar(require("../ActionsReducers/ConditionalStyleRedux"));
 const QuickSearchRedux = tslib_1.__importStar(require("../ActionsReducers/QuickSearchRedux"));
 const ThemeRedux = tslib_1.__importStar(require("../ActionsReducers/ThemeRedux"));
 const FormatColumnRedux = tslib_1.__importStar(require("../ActionsReducers/FormatColumnRedux"));
@@ -132,7 +131,6 @@ class AdaptableStore {
             FlashingCell: FlashingCellRedux.FlashingCellReducer,
             Application: ApplicationRedux.ApplicationReducer,
             CalculatedColumn: CalculatedColumnRedux.CalculatedColumnReducer,
-            ConditionalStyle: ConditionalStyleRedux.ConditionalStyleReducer,
             CustomSort: CustomSortRedux.CustomSortReducer,
             Dashboard: DashboardRedux.DashboardReducer,
             Export: ExportRedux.ExportReducer,
@@ -154,6 +152,7 @@ class AdaptableStore {
             PercentBar: DeadRedux.PercentBarReducer,
             UpdatedRow: DeadRedux.UpdatedRowReducer,
             GradientColumn: DeadRedux.GradientColumnReducer,
+            ConditionalStyle: DeadRedux.ConditionalStyleReducer,
         };
         // allow plugins to participate in the root reducer
         adaptable.forPlugins((plugin) => {
@@ -672,12 +671,7 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 case CustomSortRedux.CUSTOM_SORT_EDIT:
                 case CustomSortRedux.CUSTOM_SORT_DELETE:
                 case CustomSortRedux.CUSTOM_SORT_SUSPEND:
-                case CustomSortRedux.CUSTOM_SORT_UNSUSPEND:
-                case ConditionalStyleRedux.CONDITIONAL_STYLE_ADD:
-                case ConditionalStyleRedux.CONDITIONAL_STYLE_EDIT:
-                case ConditionalStyleRedux.CONDITIONAL_STYLE_SUSPEND:
-                case ConditionalStyleRedux.CONDITIONAL_STYLE_UNSUSPEND:
-                case ConditionalStyleRedux.CONDITIONAL_STYLE_DELETE: {
+                case CustomSortRedux.CUSTOM_SORT_UNSUSPEND: {
                     const returnAction = next(action);
                     // called also for alert actions, see ALERT ACTIONS block
                     adaptable.setupColumns();

package/src/Strategy/ConditionalStyleModule.d.ts

@@ -1,27 +1,6 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
-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';
-export declare class ConditionalStyleModule extends AdaptableModuleBase implements IConditionalStyleModule {
+import { IModule } from './Interface/IModule';
+export declare class ConditionalStyleModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    getModuleAdaptableObjects(config?: {
-        includeLayoutNotAssociatedObjects?: boolean;
-    }): AdaptableObject[];
-    getExplicitlyReferencedColumnIds(conditionalStyle: ConditionalStyle): string[];
-    getReferencedNamedQueryNames(conditionalStyle: ConditionalStyle): string[];
-    updateOldConfig(): void;
-    getTeamSharingAction(): TeamSharingImportInfo<ConditionalStyle>;
-    isConditionalStyleActiveForColumn(conditionalStyleForColumn: ConditionalStyle, column: AdaptableColumn, params: any): boolean;
-    isConditionalStyleActiveForRow(conditionalStyleForRow: ConditionalStyle, params: any): boolean;
-    private evaluatePredicate;
-    private evaluateExpression;
-    private shouldRunStyle;
-    toView(conditionalStyle: ConditionalStyle): AdaptableObjectView;
-    toViewAll(): AdaptableObjectView[];
-    getViewProperties(): AdaptableModuleView;
-    canBeAssociatedWithLayouts(): boolean;
 }

package/src/Strategy/ConditionalStyleModule.js

@@ -2,200 +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 getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
-const getStyleViewItems_1 = require("./Utilities/getStyleViewItems");
-const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
-const ConditionalStylePopupHeader_1 = require("../View/ConditionalStyle/ConditionalStylePopupHeader");
 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);
-    }
-    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 {
-            HeaderComponent: ConditionalStylePopupHeader_1.ConditionalStylePopupHeader,
-            emptyView: '',
-        };
-    }
-    canBeAssociatedWithLayouts() {
-        return true;
-    }
 }
 exports.ConditionalStyleModule = ConditionalStyleModule;

package/src/Strategy/FormatColumnModule.js

@@ -68,9 +68,9 @@ 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);
     }

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/Utilities/Defaults/DefaultSettingsPanel.js

@@ -18,7 +18,6 @@ exports.DEFAULT_NAVIGATION_ITEMS = [
     '-',
     'Alert',
     'CalculatedColumn',
-    'ConditionalStyle',
     'CustomSort',
     'DataSet',
     'Export',

package/src/Utilities/Services/ModuleService.js

@@ -87,8 +87,6 @@ class ModuleService {
                 return learnUrl + 'handbook-calculated-column';
             case 'CellSummary':
                 return learnUrl + 'handbook-summarising#cell-summary-information';
-            case 'ConditionalStyle':
-                return learnUrl + 'handbook-conditional-styling';
             case 'CustomSort':
                 return learnUrl + 'handbook-sorting';
             case 'Dashboard':

package/src/Utilities/Services/QueryLanguageService.js

@@ -185,7 +185,7 @@ class QueryLanguageService {
             if (evaluationResult.type !== 'aggregationBoolean') {
                 const result = {
                     isValid: false,
-                    errorMessage: 'provided AggregatedBBoolean expression does not evaluate to a supported aggregation',
+                    errorMessage: 'provided AggregatedBoolean expression does not evaluate to a supported aggregation',
                 };
                 this.cacheAggregatedBooleanValidation.set(cacheKey, result);
                 return result;

package/src/View/Alert/Wizard/AlertBehaviourWizardSection.js

@@ -38,9 +38,8 @@ const HighlightStyle = (props) => {
                     props.onChange(checked);
                 } }, props.label),
             Boolean(props.highlight) && (React.createElement(DropdownButton_1.default, { items: options, columns: ['label'] }, typeof props.highlight === 'boolean' ? (React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 },
-                "Use Message Type's",
-                ' ',
-                (0, AdaptableContext_1.useAdaptable)().api.internalApi.getCorrectEnglishVariant('Colour'))) : (React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "Create a Custom Style"))))),
+                "Use Message Type's ",
+                adaptable.api.internalApi.getCorrectEnglishVariant('Colour'))) : (React.createElement(rebass_1.Text, { fontSize: 2, mt: 1 }, "Create a Custom Style"))))),
         typeof props.highlight === 'object' && (React.createElement(Panel_1.default, { margin: 2 },
             React.createElement(rebass_1.Box, { paddingLeft: 3 },
                 React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: adaptable.api, Style: props.highlight, UpdateStyle: (style) => {

package/src/View/Alert/Wizard/isValidAlertRules.js

@@ -38,7 +38,7 @@ const isValidAlertRules = (alert, api, context) => {
     if (valid && alert.Rule.AggregatedBooleanExpression) {
         valid = api.queryLanguageApi.isValidAggregatedBooleanExpression(alert.Rule.AggregatedBooleanExpression, ModuleConstants_1.AlertModuleId);
         if (!valid) {
-            return 'The Expression is not a valid Aggregation Expression';
+            return 'The Expression is not a valid AggregatedBoolean Expression';
         }
     }
     return true;

package/src/View/GridInfo/ColumnInfoComponent.js

@@ -6,7 +6,6 @@ const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const CustomSortSummary_1 = require("../CustomSort/CustomSortSummary");
-const ConditionalStyleSummary_1 = require("../ConditionalStyle/ConditionalStyleSummary");
 const FilterSummary_1 = require("../Filter/FilterSummary");
 const PlusMinusSummary_1 = require("../PlusMinus/PlusMinusSummary");
 const FormatColumnSummary_1 = require("../FormatColumn/FormatColumnSummary");
@@ -100,12 +99,6 @@ class ColumnInfoComponent extends React.Component {
                         : '' },
                     React.createElement(CustomSortSummary_1.CustomSortSummary, { key: ModuleConstants.CustomSortModuleId, summarisedColumn: this.state.SelectedColumn, teamSharingActivated: this.props.teamSharingActivated, accessLevel: this.getAccessLevel(ModuleConstants.CustomSortModuleId), api: this.props.api, moduleInfo: moduleService.getModuleInfoByModule(ModuleConstants.CustomSortModuleId) })));
             }
-            if (this.isModuleAvailable(ModuleConstants.ConditionalStyleModuleId)) {
-                summaries.push(React.createElement("div", { key: ModuleConstants.ConditionalStyleModuleId, className: this.isModuleReadOnly(ModuleConstants.ConditionalStyleModuleId)
-                        ? GeneralConstants.READ_ONLY_STYLE
-                        : '' },
-                    React.createElement(ConditionalStyleSummary_1.ConditionalStyleSummary, { key: ModuleConstants.ConditionalStyleModuleId, summarisedColumn: this.state.SelectedColumn, teamSharingActivated: this.props.teamSharingActivated, accessLevel: this.getAccessLevel(ModuleConstants.ConditionalStyleModuleId), api: this.props.api, moduleInfo: moduleService.getModuleInfoByModule(ModuleConstants.ConditionalStyleModuleId) })));
-            }
             if (this.isModuleAvailable(ModuleConstants.FilterModuleId)) {
                 summaries.push(React.createElement("div", { key: ModuleConstants.FilterModuleId, className: this.isModuleReadOnly(ModuleConstants.FilterModuleId)
                         ? GeneralConstants.READ_ONLY_STYLE