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

package/src/Api/FinsembleApi.d.ts

@@ -0,0 +1,10 @@
+import { FinsemblePluginOptions } from '../AdaptableOptions/FinsemblePluginOptions';
+/**
+ * Provides run-time access to the Finsemble Plugin
+ */
+export interface FinsembleApi {
+    /**
+     * Retrieves the FinsemblePlugOptions provided in Finsemble Plugin
+     */
+    getPluginOptions(): FinsemblePluginOptions;
+}

package/src/Api/FormatColumnApi.d.ts

@@ -1,5 +1,5 @@
-import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison, CellColorRange } from '../PredefinedConfig/FormatColumnState';
-import { AdaptableColumn, AdaptableFormat } from '../types';
+import { FormatColumnState, FormatColumn } from '../PredefinedConfig/FormatColumnState';
+import { AdaptableColumn, AdaptableFormat, AdaptablePredicateDef, AdaptableScope } from '../types';
 import { RowNode } from '@ag-grid-community/core';
 /**
  * Provides run-time access to the Format Column Module and associated state
@@ -38,15 +38,10 @@ export interface FormatColumnApi {
      */
     getAllFormatColumnWithStyle(): FormatColumn[];
     /**
-     * Retrieves the ColumnComparison property, if there, from a Format Column (Column Style)
-     * @param formatColumn Format Column to Add
-     */
-    getColumnComparisonForFormatColumn(formatColumn: FormatColumn): ColumnComparison | undefined;
-    /**
-     * Returns any ColumnIds referenced in a Column Comparison
-     * @param columnComparision Column Comparison to check
+     * Retrieves all Format Columns in Adaptable State with the `Style` or the `CellAlignment` property set
+     * @returns format columns
      */
-    getColumnIdsFromColumnComparison(columnComparision: ColumnComparison): string[];
+    getAllFormatColumnWithStyleAndCellAlignment(): FormatColumn[];
     /**
      * Retrieves all Format Columns in Adaptable State with `DisplayFormat` property set
      * @returns format columns
@@ -105,23 +100,21 @@ export interface FormatColumnApi {
      */
     showFormatColumnPopup(): void;
     /**
-     * Gets an active Format Column, if any, for given Column
-     * @param column The Column for which to retrieve the Format Column
-     * @returns format column
-     */
-    getActiveFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
-    /**
-     * Gets Format Column, if any, for given Column
+     * Gets all FormatColumns which are defined for the given column
      * @param column The Column for which to retrieve the Format Column
      * @returns format column
      */
-    getFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    getFormatColumnsForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
     /**
-     * Gets Format Column, if any, for given ColumnId
+     * Gets all FormatColumns which are defined for the column with the given columnId
      * @param columnId ColumnId for which to retrieve the Format Column
      * @returns format column
      */
-    getFormatColumnForColumnId(columnId: string): FormatColumn | undefined;
+    getFormatColumnsForColumnId(columnId: string, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
     /**
      * Get Format Column which has Scope of Single Column, if any, for given ColumnId
      * @param columnId  ColumnId for which to retrieve the Format Column
@@ -129,57 +122,35 @@ export interface FormatColumnApi {
      */
     getFormatColumnWithSingleColumnScope(columnId: string): FormatColumn | undefined;
     /**
-     * Gets Format Column if any for given Column which includes Style element
-     * @param column The Column for which to retrieve the Format Column
-     * @returns format column
+     * Get all FormatColumns which are defined for this column and have a custom AdaptableStyle
+     * @param column
+     * @param config
+     * @returns list of FormatColumn
      */
-    getFormatColumnWithStyleForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    getFormatColumnsWithStyleForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
     /**
      * Gets Format Column if any for given Column which includes Style element with ClassName
      * @param column The Column for which to retrieve the Format Column
-     * @returns format column
+     * @returns format columns
      */
-    getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
     /**
-     * Will get the most appropriate one i.e. first named Column, then DataType, then All
+     * Get all FormatColumns which are defined for this column and have a custom DisplayFormat
      * @param column
-     * @returns format column
+     * @param config
+     * @returns list of FormatColumn
      */
-    getFormatColumnWithDisplayFormatForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    getFormatColumnsWithDisplayFormatForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
     /**
      * Returns true if Format State includes Format Columns with a Style property
      */
     hasStyleFormatColumns(): boolean;
-    /**
-     * Gets the Minimum Value to display for a Numeric Style
-     * @param numericStyle Numeric Style to check
-     * @param rowNode current Row Node
-     * @param cellValue current Cell Value
-     */
-    getNumericStyleMinValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
-    /**
-     * Gets the Maximum Value to display for a Numeric Style
-     * @param numericStyle Numeric Style to check
-     * @param rowNode current Row Node
-     * @param cellValue current Cell Value
-     */
-    getNumericStyleMaxValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
-    getCellColorRangeMinValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
-    getCellColorRangeMaxValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
-    /**
-     * Returns first Format Column that contains checkbox style
-     * @param columnId column to check
-     */
-    getCheckBoxStyleFormatColumn(column: AdaptableColumn): FormatColumn | undefined;
-    /**
-     * Whether given column is a (boolean) checkbox column
-     * @param columnId column to check
-     */
-    isCheckBoxStyleFormatColumn(column: AdaptableColumn): boolean;
-    /**
-     * Publishes the CheckboxColumnClickedEvent - when the checkbox in an Checkbox Column is clicked
-     */
-    fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
     /**
      * Format value according to format options.
      *
@@ -206,4 +177,50 @@ export interface FormatColumnApi {
      * @param formatColumn Format Column
      */
     hasCustomDisplayFormatter(formatColumn: FormatColumn): boolean;
+    /**
+     * Returns all Predicates usable in Format Columns
+     */
+    getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
+    /**
+     * Returns all Predicates appropriate for the given Scope
+     * @param scope Scope to check
+     */
+    getFormatColumnDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    /**
+     * Checks if format column is relevant for a given cell (intersection of given AdaptableColumn and RowNode)
+     *
+     * @param formatColumn
+     * @param column
+     * @param params
+     */
+    isFormatColumnRelevantForColumn(formatColumn: FormatColumn, column: AdaptableColumn, params: {
+        node: RowNode;
+        value: any;
+    }): boolean;
+    /**
+     * Extract from the given FormatColumns only the ones which are relevant for a given cell (intersection of given AdaptableColumn and RowNode)
+     *
+     * @param formatColumns
+     * @param column
+     * @param params
+     */
+    getFormatColumnsRelevantForColumn(formatColumns: FormatColumn[], column: AdaptableColumn, params: {
+        node: RowNode;
+        value: any;
+    }): FormatColumn[];
+    /**
+     * Retrieves all Format Columns which have an Expression
+     * @returns Format Columns with Expression
+     */
+    getFormatColumnsWithExpression(): FormatColumn[] | undefined;
+    /**
+     * Increment the precedence of the given FormatColumn
+     * @param formatColumn
+     */
+    incrementFormatColumnPrecedence(formatColumn: FormatColumn): void;
+    /**
+     * Decrement the precedence of the given FormatColumn
+     * @param formatColumn
+     */
+    decrementFormatColumnPrecedence(formatColumn: FormatColumn): void;
 }

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';
@@ -39,6 +38,7 @@ import { FlashingCellApi } from '../FlashingCellApi';
 import { ChartingApi } from '../ChartingApi';
 import { StatusBarApi } from '../StatusBarApi';
 import { ActionApi } from '../../../types';
+import { StyledColumnApi } from '../StyledColumnApi';
 export declare class AdaptableApiImpl implements AdaptableApi {
     protected adaptable: IAdaptable;
     actionApi: ActionApi;
@@ -50,7 +50,6 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     calculatedColumnApi: CalculatedColumnApi;
     cellSummaryApi: CellSummaryApi;
     columnApi: ColumnApi;
-    conditionalStyleApi: ConditionalStyleApi;
     configApi: ConfigApi;
     customSortApi: CustomSortApi;
     dashboardApi: DashboardApi;
@@ -75,6 +74,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     queryApi: QueryApi;
     queryLanguageApi: QueryLanguageApi;
     settingsPanelApi: SettingsPanelApi;
+    styledColumnApi: StyledColumnApi;
     toolPanelApi: ToolPanelApi;
     teamSharingApi: TeamSharingApi;
     scopeApi: ScopeApi;

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");
@@ -41,6 +40,7 @@ const FlashingCellApiImpl_1 = require("./FlashingCellApiImpl");
 const ChartingApiImpl_1 = require("./ChartingApiImpl");
 const SettingsPanelApiImpl_1 = require("./SettingsPanelApiImpl");
 const ActionApiImpl_1 = require("./ActionApiImpl");
+const StyledColumnApiImpl_1 = require("./StyledColumnApiImpl");
 class AdaptableApiImpl {
     constructor(adaptable) {
         this.adaptable = adaptable;
@@ -56,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);
@@ -79,6 +78,7 @@ class AdaptableApiImpl {
         this.userInterfaceApi = new UserInterfaceApiImpl_1.UserInterfaceApiImpl(adaptable);
         this.queryApi = new QueryApiImpl_1.QueryApiImpl(adaptable);
         this.queryLanguageApi = new QueryLanguageApiImpl_1.QueryLanguageApiImpl(adaptable);
+        this.styledColumnApi = new StyledColumnApiImpl_1.StyledColumnApiImpl(adaptable);
         this.toolPanelApi = new ToolPanelApiImpl_1.ToolPanelApiImpl(adaptable);
         this.teamSharingApi = new TeamSharingApiImpl_1.TeamSharingApiImpl(adaptable);
         this.scopeApi = new ScopeApiImpl_1.ScopeApiImpl(adaptable);
@@ -103,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/ColumnApiImpl.d.ts

@@ -22,7 +22,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     isCalculatedColumn(columnId: string): boolean;
     isFreeTextColumn(columnId: string): boolean;
     isActionColumn(columnId: string): boolean;
-    isFormatNumericStyleColumn(column: AdaptableColumn): boolean;
+    isStyledNumericColumn(column: AdaptableColumn): boolean;
     isNumericColumn(column: AdaptableColumn): boolean;
     isBooleanColumn(column: AdaptableColumn): boolean;
     isDateColumn(column: AdaptableColumn): boolean;
@@ -61,6 +61,7 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getDistinctBulkUpdateDisplayValuesForColumn(columnId: string, selectedGridCells: GridCell[]): Promise<any[]>;
     getDistinctVisibleDisplayValuesForColumn(columnId: string): any[];
     getDistinctRawValuesForColumn(columnId: string, skipRowNode?: RowNode): any[];
+    getUnsortedDistinctRawValuesForColumn(columnId: string, skipRowNode?: RowNode): any[];
     getDistinctVisibleRawValuesForColumn(columnId: string): any[];
     private sortDistinctValues;
     getPrimaryKeyColumn(): AdaptableColumn;

package/src/Api/Implementation/ColumnApiImpl.js

@@ -79,23 +79,23 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         return (((_a = this.adaptable.api.actionApi.getAllActionColumn()) === null || _a === void 0 ? void 0 : _a.find((cc) => cc.columnId == columnId)) !=
             null);
     }
-    isFormatNumericStyleColumn(column) {
+    isStyledNumericColumn(column) {
         if (column) {
-            return this.adaptable.api.formatColumnApi
-                .getAllFormatColumn()
-                .filter((fc) => { var _a, _b; return ((_a = fc.ColumnStyle) === null || _a === void 0 ? void 0 : _a.GradientStyle) || ((_b = fc.ColumnStyle) === null || _b === void 0 ? void 0 : _b.PercentBarStyle); })
-                .some((formatColumn) => this.adaptable.api.scopeApi.isColumnInScope(column, formatColumn.Scope));
+            const styledColmn = this.adaptable.api.styledColumnApi
+                .getAllActiveStyledColumn()
+                .find((sc) => !sc.CheckBoxStyle && sc.ColumnId == column.columnId);
+            return styledColmn != null;
         }
         return false;
     }
     isNumericColumn(column) {
-        return column.dataType == 'Number';
+        return (column === null || column === void 0 ? void 0 : column.dataType) == 'Number';
     }
     isBooleanColumn(column) {
-        return column.dataType == 'Boolean';
+        return (column === null || column === void 0 ? void 0 : column.dataType) == 'Boolean';
     }
     isDateColumn(column) {
-        return column.dataType == 'Date';
+        return (column === null || column === void 0 ? void 0 : column.dataType) == 'Date';
     }
     getColumnDataTypeFromColumnId(columnId) {
         const column = this.getColumnFromId(columnId); // this.getColumns().find(c => c.ColumnId == columnId);
@@ -343,11 +343,17 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, false, skipRowNode);
-        return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
+        return this.sortDistinctValues(this.getUnsortedDistinctRawValuesForColumn(columnId, skipRowNode), abColumn).map((cv) => {
             return cv.rawValue;
         });
     }
+    getUnsortedDistinctRawValuesForColumn(columnId, skipRowNode) {
+        const abColumn = this.getColumnFromId(columnId);
+        if (abColumn == undefined) {
+            return [];
+        }
+        return this.adaptable.getDistinctValuesForColumn(abColumn, false, skipRowNode);
+    }
     getDistinctVisibleRawValuesForColumn(columnId) {
         const abColumn = this.getColumnFromId(columnId);
         if (abColumn == undefined) {
@@ -424,15 +430,13 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         if (column.dataType !== 'Number') {
             return undefined;
         }
-        // can we cache this in some way?
-        return Math.min(...this.getDistinctRawValuesForColumn(column.columnId));
+        return this.adaptable.getMinMaxCachedValueForColumn(column, 'min');
     }
     getMaxValueForNumericColumn(column) {
         if (column.dataType !== 'Number') {
             return undefined;
         }
-        // can we cache this in some way?
-        return Math.max(...this.getDistinctRawValuesForColumn(column.columnId));
+        return this.adaptable.getMinMaxCachedValueForColumn(column, 'max');
     }
     getTypesForColumn(columnId) {
         var _a;

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/ExportApiImpl.d.ts

@@ -3,7 +3,7 @@ import { ExportState, Report, ReportData, ReportSchedule, SystemReportNames } fr
 import { ApiBase } from './ApiBase';
 import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { CustomDestination, CustomReport, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
+import { CustomDestination, ServerReport, ExportFormContext } from '../../AdaptableOptions/ExportOptions';
 import { ExportDestination } from '../../PredefinedConfig/Common/Enums';
 export declare class ExportApiImpl extends ApiBase implements ExportApi {
     getExportState(): ExportState;
@@ -30,8 +30,8 @@ export declare class ExportApiImpl extends ApiBase implements ExportApi {
     editReports(reports: Report[]): Report[];
     isDataChangeInReport(cellDataChangedInfo: CellDataChangedInfo, report: Report): boolean;
     exportVisualDataToExcel(): void;
-    getAllCustomReports(): CustomReport[] | undefined;
-    isCustomReport(report: Report): boolean;
-    runCustomReport(customReportName: string): ReportData | undefined;
+    getAllServerReports(): ServerReport[] | undefined;
+    isServerReport(report: Report): boolean;
+    runServerReport(serverReportName: string): ReportData | undefined;
     getReportDataForReport(reportName: string): ReportData | undefined;
 }

package/src/Api/Implementation/ExportApiImpl.js

@@ -61,10 +61,10 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
         const reports = this.getAvailableSystemReports()
             .map((s) => this.getReportByName(s))
             .concat(this.getExportState().Reports);
-        const customReports = this.getAllCustomReports();
-        if (ArrayExtensions_1.default.IsNotNullOrEmpty(customReports)) {
-            reports.push(...customReports.map((c) => {
-                return ObjectFactory_1.default.CreateCustomReport(c.name);
+        const serverReports = this.getAllServerReports();
+        if (ArrayExtensions_1.default.IsNotNullOrEmpty(serverReports)) {
+            reports.push(...serverReports.map((c) => {
+                return ObjectFactory_1.default.CreateServerReport(c.name);
             }));
         }
         return reports;
@@ -120,7 +120,7 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
             return true;
         }
         // if its a Custom Report then the User has to run it so we just ignore completely
-        if (this.isCustomReport(report)) {
+        if (this.isServerReport(report)) {
             return false;
         }
         // Start with the DataChanged Column and go through all possibilities
@@ -178,21 +178,21 @@ class ExportApiImpl extends ApiBase_1.ApiBase {
     exportVisualDataToExcel() {
         this.adaptable.exportVisualDataToExcel();
     }
-    getAllCustomReports() {
-        return this.getExportOptions().customReports;
+    getAllServerReports() {
+        return this.getExportOptions().serverReports;
     }
-    isCustomReport(report) {
+    isServerReport(report) {
         var _a;
-        return ((_a = this.getAllCustomReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
+        return ((_a = this.getAllServerReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == report.Name)) != null;
     }
-    runCustomReport(customReportName) {
+    runServerReport(serverReportName) {
         var _a;
-        const customReport = (_a = this.getAllCustomReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == customReportName);
-        if (!customReport) {
-            (0, LoggingHelper_1.LogAdaptableWarning)(`Custom Report '${customReportName}' not found!`);
+        const serverReport = (_a = this.getAllServerReports()) === null || _a === void 0 ? void 0 : _a.find((cr) => cr.name == serverReportName);
+        if (!serverReport) {
+            (0, LoggingHelper_1.LogAdaptableWarning)(`Server Report '${serverReportName}' not found!`);
             return undefined;
         }
-        return customReport.onRunReport();
+        return serverReport.onRunReport();
     }
     getReportDataForReport(reportName) {
         const report = this.getReportByName(reportName);

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/FormatColumnApiImpl.d.ts

@@ -1,10 +1,11 @@
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
 import { ApiBase, LayoutAssociatedObjectLoadConfig } from './ApiBase';
 import { FormatColumnApi } from '../FormatColumnApi';
-import { FormatColumnState, FormatColumn, ColumnStyle, CellColorRange, ColumnComparison } from '../../PredefinedConfig/FormatColumnState';
+import { FormatColumnState, FormatColumn } from '../../PredefinedConfig/FormatColumnState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { RowNode } from '@ag-grid-community/core';
 import { AdaptableFormat } from '../../types';
+import { AdaptablePredicateDef, AdaptableScope } from '../../../types';
 export declare class FormatColumnApiImpl extends ApiBase implements FormatColumnApi {
     getFormatColumnState(): FormatColumnState;
     getAllFormatColumn(config?: LayoutAssociatedObjectLoadConfig): FormatColumn[];
@@ -12,8 +13,7 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     getAllActiveFormatColumn(): FormatColumn[];
     getAllSuspendedFormatColumn(): FormatColumn[];
     getAllFormatColumnWithStyle(): FormatColumn[];
-    getColumnComparisonForFormatColumn(formatColumn: FormatColumn): ColumnComparison | undefined;
-    getColumnIdsFromColumnComparison(columnComparison: ColumnComparison): string[];
+    getAllFormatColumnWithStyleAndCellAlignment(): FormatColumn[];
     getAllFormatColumnWithDisplayFormat(): FormatColumn[];
     getAllFormatColumnWithCellAlignment(): FormatColumn[];
     addFormatColumn(formatColumn: FormatColumn): FormatColumn;
@@ -26,29 +26,48 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     suspendFormatColumn(formatColumn: FormatColumn): FormatColumn;
     unSuspendFormatColumn(formatColumn: FormatColumn): FormatColumn;
     applyFormatColumnDisplayFormats(): void;
-    getActiveFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
-    getFormatColumnForColumn(column: AdaptableColumn): FormatColumn | undefined;
-    getFormatColumnForColumnId(columnId: string): FormatColumn | undefined;
-    getFormatColumnWithStyleForColumn(column: AdaptableColumn): FormatColumn | undefined;
-    getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn): FormatColumn | undefined;
-    getFormatColumnWithDisplayFormatForColumn(column: AdaptableColumn): FormatColumn | undefined;
+    getFormatColumnsForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
+    getFormatColumnsWithStyleForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
+    getFormatColumnsForColumnId(columnId: string, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
+    getFormatColumnWithStyleClassNameForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
+    getFormatColumnsWithDisplayFormatForColumn(column: AdaptableColumn, config?: {
+        includeSuspended?: boolean;
+    }): FormatColumn[];
     getFormatColumnWithSingleColumnScope(columnId: string): FormatColumn | undefined;
-    private getAppropriateFormatColumn;
+    private getFormatColumnInColumnScope;
+    private getFormatColumnWithColumnInScope;
     hasStyleFormatColumns(): boolean;
     showFormatColumnPopup(): void;
     getFormatColumnsWithAllScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
     getFormatColumnsWithDataTypeScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
     getFormatColumnsWithColumnScope(formatColumns: FormatColumn[]): FormatColumn[] | undefined;
-    getNumericStyleMinValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number;
-    getNumericStyleMaxValue(numericStyle: ColumnStyle, column: AdaptableColumn, rowNode: RowNode, cellValue: any): number | undefined;
-    getCellColorRangeMinValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
-    getCellColorRangeMaxValue(range: CellColorRange, column: AdaptableColumn): number | undefined;
-    getCheckBoxStyleFormatColumn(column: AdaptableColumn): FormatColumn | undefined;
-    isCheckBoxStyleFormatColumn(column: AdaptableColumn): boolean;
-    fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
     private applyCustomFormatters;
     getNumberFormattedValue(value: any, node: RowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
     getStringFormattedValue(value: any, node: RowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
     getDateFormattedValue(value: any, node: RowNode, abColumn: AdaptableColumn, options: AdaptableFormat['Options']): string;
     hasCustomDisplayFormatter(formatColumn: FormatColumn): boolean;
+    getFormatColumnPredicateDefs(): AdaptablePredicateDef[];
+    getFormatColumnDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    getFormatColumnsRelevantForColumn(formatColumns: FormatColumn[], column: AdaptableColumn, params: {
+        node: RowNode;
+        value: any;
+    }): FormatColumn[];
+    isFormatColumnRelevantForColumn(formatColumn: FormatColumn, column: AdaptableColumn, params: {
+        node: RowNode;
+        value: any;
+    }): boolean;
+    private evaluatePredicate;
+    private shouldRunStyle;
+    private evaluateExpression;
+    getFormatColumnsWithExpression(): FormatColumn[] | undefined;
+    incrementFormatColumnPrecedence(formatColumn: FormatColumn): void;
+    decrementFormatColumnPrecedence(formatColumn: FormatColumn): void;
 }