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

package/src/agGrid/Adaptable.d.ts

@@ -154,7 +154,11 @@ export declare class Adaptable implements IAdaptable {
     updateColumnsIntoStore(): void;
     private createAdaptableColumn;
     private safeSetColDefs;
+    private getFormatColumnSpecialColumnStyle;
+    private getFormatColumnColumnStyle;
     private getFormatColumnCellStyle;
+    private getFormatColumnCellClass;
+    private getFormatColumnRowClass;
     private getActiveAlertWithHighlightCell;
     private getActiveAlertWithHighlightRow;
     private getAlertCellStyle;
@@ -358,6 +362,7 @@ export declare class Adaptable implements IAdaptable {
     private setupColumnHeaderAggregations;
     private getConditionalStyleRowClass;
     private getConditionalStyleRowStyle;
+    private getFormatColumnRowStyle;
     private getGridOptionsApi;
     canGenerateCharts(): boolean;
     canHaveSparklines(): boolean;

package/src/agGrid/Adaptable.js

@@ -898,51 +898,68 @@ class Adaptable {
         this.gridOptions.api.setColumnDefs(colDefs);
         this.updateColumnsIntoStore(); // todo remove this from here!!!
     }
-    getFormatColumnCellStyle(abColumn, formatColumn, params) {
-        if (!formatColumn.IncludeGroupedRows && this.isGroupRowNode(params.node)) {
-            return;
+    getFormatColumnSpecialColumnStyle(formatColumn, abColumn, params) {
+        const columnStyle = formatColumn.ColumnStyle;
+        let style = {};
+        const gradientStyle = columnStyle === null || columnStyle === void 0 ? void 0 : columnStyle.GradientStyle;
+        if (gradientStyle) {
+            const min = this.api.formatColumnApi.getNumericStyleMinValue(columnStyle, abColumn, params.node, params.value);
+            const max = this.api.formatColumnApi.getNumericStyleMaxValue(columnStyle, abColumn, params.node, params.value);
+            const clampedValue = (0, clamp_1.default)(params.value, min, max);
+            let cellBackColor;
+            let reverseGradient = false;
+            if (gradientStyle.ColumnComparison) {
+                cellBackColor = gradientStyle.ColumnComparison.Color;
+            }
+            else {
+                const matchingRange = gradientStyle.CellRanges.find((r) => (r.Min == 'Col-Min' || r.Min <= clampedValue) &&
+                    (r.Max == 'Col-Max' || r.Max >= clampedValue));
+                if (matchingRange) {
+                    cellBackColor = matchingRange.Color;
+                    reverseGradient = matchingRange.ReverseGradient;
+                }
+            }
+            const increase = Math.abs(max - min);
+            const percentage = ((params.value - min) / increase) * 100;
+            let alpha = Number((percentage / 100).toPrecision(2));
+            if (reverseGradient) {
+                alpha = 1 - alpha;
+            }
+            const preparedColor = (0, StyleHelper_1.getVariableColor)(cellBackColor);
+            style.backgroundColor = tinycolor(preparedColor).setAlpha(alpha).toRgbString();
         }
-        if (formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.IsSuspended) {
-            return;
+        if (columnStyle.PercentBarStyle && columnStyle.PercentBarStyle.CellText) {
+            style.paddingTop = 0;
+            style.paddingBottom = 0;
         }
+        return style;
+    }
+    getFormatColumnColumnStyle(formatColumns) {
+        // first has more precedence, then they need to be applied in reverse order
+        return formatColumns.reduceRight((style, formatColumn) => {
+            const formatColumnStyle = this.convertAdaptableStyleToCSS(formatColumn.Style);
+            return Object.assign(Object.assign({}, style), formatColumnStyle);
+        }, {});
+    }
+    getFormatColumnCellStyle(abColumn, formatColumn, formatColumnsWithStyle, params) {
         let style = {};
         // percent bar && do we show text
         const columnStyle = formatColumn.ColumnStyle;
         if (columnStyle) {
-            const gradientStyle = columnStyle === null || columnStyle === void 0 ? void 0 : columnStyle.GradientStyle;
-            if (gradientStyle) {
-                const min = this.api.formatColumnApi.getNumericStyleMinValue(columnStyle, abColumn, params.node, params.value);
-                const max = this.api.formatColumnApi.getNumericStyleMaxValue(columnStyle, abColumn, params.node, params.value);
-                const clampedValue = (0, clamp_1.default)(params.value, min, max);
-                let cellBackColor;
-                let reverseGradient = false;
-                if (gradientStyle.ColumnComparison) {
-                    cellBackColor = gradientStyle.ColumnComparison.Color;
-                }
-                else {
-                    const matchingRange = gradientStyle.CellRanges.find((r) => (r.Min == 'Col-Min' || r.Min <= clampedValue) &&
-                        (r.Max == 'Col-Max' || r.Max >= clampedValue));
-                    if (matchingRange) {
-                        cellBackColor = matchingRange.Color;
-                        reverseGradient = matchingRange.ReverseGradient;
-                    }
-                }
-                const increase = Math.abs(max - min);
-                const percentage = ((params.value - min) / increase) * 100;
-                let alpha = Number((percentage / 100).toPrecision(2));
-                if (reverseGradient) {
-                    alpha = 1 - alpha;
-                }
-                const preparedColor = (0, StyleHelper_1.getVariableColor)(cellBackColor);
-                style.backgroundColor = tinycolor(preparedColor).setAlpha(alpha).toRgbString();
-            }
-            if (columnStyle.PercentBarStyle && columnStyle.PercentBarStyle.CellText) {
-                style.paddingTop = 0;
-                style.paddingBottom = 0;
+            if (columnStyle &&
+                !this.api.formatColumnApi.isFormatColumnActiveForColumn(formatColumn, abColumn, params)) {
+                return style;
             }
+            style = Object.assign(Object.assign({}, style), this.getFormatColumnSpecialColumnStyle(formatColumn, abColumn, params));
         }
         else if (formatColumn.Style) {
-            style = this.convertAdaptableStyleToCSS(formatColumn.Style);
+            const activeFormatColumnsWithStyle = formatColumnsWithStyle.filter((formatColumn) => {
+                return this.api.formatColumnApi.isFormatColumnActiveForColumn(formatColumn, abColumn, params);
+            });
+            if (!activeFormatColumnsWithStyle.length) {
+                return style;
+            }
+            style = Object.assign(Object.assign({}, style), this.getFormatColumnColumnStyle(activeFormatColumnsWithStyle));
         }
         if (formatColumn.CellAlignment) {
             switch (formatColumn.CellAlignment) {
@@ -959,6 +976,30 @@ class Adaptable {
         }
         return style;
     }
+    getFormatColumnCellClass(formatColumns, abColumn, params) {
+        const classNames = formatColumns
+            .map((formatColumn) => {
+            var _a, _b;
+            if (((_a = formatColumn.Style) === null || _a === void 0 ? void 0 : _a.ClassName) &&
+                this.api.formatColumnApi.isFormatColumnActiveForColumn(formatColumn, abColumn, params)) {
+                return (_b = formatColumn.Style) === null || _b === void 0 ? void 0 : _b.ClassName;
+            }
+        })
+            .filter((x) => !!x);
+        return classNames;
+    }
+    getFormatColumnRowClass(formatColumns, params) {
+        const classNames = formatColumns
+            .map((formatColumn) => {
+            var _a, _b;
+            if (((_a = formatColumn.Style) === null || _a === void 0 ? void 0 : _a.ClassName) &&
+                this.api.formatColumnApi.isFormatColumnActiveForRow(formatColumn, params)) {
+                return (_b = formatColumn.Style) === null || _b === void 0 ? void 0 : _b.ClassName;
+            }
+        })
+            .filter((x) => !!x);
+        return classNames;
+    }
     getActiveAlertWithHighlightCell(col, params) {
         return this.api.internalApi.getAdaptableAlertWithHighlightCell(col.columnId, params.node);
     }
@@ -3150,15 +3191,17 @@ class Adaptable {
                 borderColor: null,
             };
             const formatColumn = this.api.formatColumnApi.getActiveFormatColumnForColumn(abColumn);
+            const formatColumnsWithStyle = this.api.formatColumnApi.getColumnFormatColumnsWithStyle(abColumn);
             const conditionalStyles = this.api.conditionalStyleApi.getConditionalStylesForColumn(abColumn);
             const quickSearchStyle = this.getQuickSearchCellStyle();
             const hasQuickSearchStyle = quickSearchStyle != undefined;
             const cellStyle = (params) => {
                 const formatColumnCellStyle = formatColumn
-                    ? this.getFormatColumnCellStyle(abColumn, formatColumn, params)
+                    ? this.getFormatColumnCellStyle(abColumn, formatColumn, formatColumnsWithStyle, params)
                     : undefined;
                 const isQuickSearchActive = hasQuickSearchStyle && this.isQuickSearchActive(abColumn, params);
-                const result = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, defaultCellStyle), this.getReadOnlyCellStyle(abColumn, params)), this.getEditableCellStyle(abColumn, params)), (typeof userCellStyle === 'function' ? userCellStyle(params) : userCellStyle)), formatColumnCellStyle), this.getConditionalStyleCellStyle(conditionalStyles, abColumn, params)), (isQuickSearchActive ? quickSearchStyle : undefined)), this.getAlertCellStyle(abColumn, params)), this.getFlashingCellStyle(abColumn, params)), this.getCellHighlightStyle(abColumn, params));
+                const conditionalStyleObj = this.getConditionalStyleCellStyle(conditionalStyles, abColumn, params);
+                const result = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, defaultCellStyle), this.getReadOnlyCellStyle(abColumn, params)), this.getEditableCellStyle(abColumn, params)), (typeof userCellStyle === 'function' ? userCellStyle(params) : userCellStyle)), formatColumnCellStyle), conditionalStyleObj), (isQuickSearchActive ? quickSearchStyle : undefined)), this.getAlertCellStyle(abColumn, params)), this.getFlashingCellStyle(abColumn, params)), this.getCellHighlightStyle(abColumn, params));
                 return result;
             };
             return cellStyle;
@@ -3166,9 +3209,7 @@ class Adaptable {
     }
     setupColumnCellClass({ col, colId, abColumn }) {
         this.setColDefProperty(col, 'cellClass', (userCellClass) => {
-            var _a;
-            const formatColumn = this.api.formatColumnApi.getFormatColumnWithStyleClassNameForColumn(abColumn);
-            const formatColumnStyleClassName = formatColumn && !formatColumn.IsSuspended ? (_a = formatColumn.Style) === null || _a === void 0 ? void 0 : _a.ClassName : null;
+            const formatColumns = this.api.formatColumnApi.getFormatColumnWithStyleClassNameForColumn(abColumn);
             const conditionalStyles = this.api.conditionalStyleApi
                 .getConditionalStylesForColumn(abColumn)
                 .filter((cs) => StringExtensions_1.StringExtensions.IsNotNullOrEmpty(cs.Style.ClassName));
@@ -3185,7 +3226,9 @@ class Adaptable {
                 const returnValue = [
                     this.getExcelClassNameForCell(colId, primaryKeyValue),
                     typeof userCellClass === 'function' ? userCellClass(params) : userCellClass,
-                    formatColumnStyleClassName,
+                    formatColumns.length
+                        ? this.getFormatColumnCellClass(formatColumns, abColumn, params)
+                        : null,
                     hasConditionalStylesWithClassNames
                         ? this.getConditionalStyleCellClass(conditionalStyles, abColumn, params)
                         : null,
@@ -3407,7 +3450,7 @@ class Adaptable {
         });
     }
     setupColumnValueFormatter({ col, abColumn }) {
-        this.setColDefProperty(col, 'valueFormatter', () => {
+        this.setColDefProperty(col, 'valueFormatter', (params) => {
             const formatColumn = this.api.formatColumnApi.getFormatColumnWithDisplayFormatForColumn(abColumn);
             if (!formatColumn) {
                 return;
@@ -3442,7 +3485,12 @@ class Adaptable {
                         };
                     }
                 }
-                return valueFormatter;
+                if (valueFormatter) {
+                    return (params) => {
+                        const rulePasses = this.api.formatColumnApi.isFormatColumnActiveForColumn(formatColumn, abColumn, params);
+                        return rulePasses ? valueFormatter(params) : params.value;
+                    };
+                }
             }
         });
     }
@@ -4327,10 +4375,11 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
     setupRowStyling() {
         // first get the conditional style state
         const conditionalStyles = this.api.conditionalStyleApi.getRowConditionalStyles();
+        const formatColumnsStyles = this.api.formatColumnApi.getRowFormatColumnsWithStyle();
         // Set any Row Styles (i.e. items without a classname)
         this.setGridOptionsProperty('getRowStyle', (userGetRowStyle) => {
             return (params) => {
-                const result = Object.assign(Object.assign(Object.assign(Object.assign({}, userGetRowStyle === null || userGetRowStyle === void 0 ? void 0 : userGetRowStyle(params)), this.getRowHighlightStyle(params)), this.getAlertRowStyle(params)), this.getConditionalStyleRowStyle(conditionalStyles, params));
+                const result = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, userGetRowStyle === null || userGetRowStyle === void 0 ? void 0 : userGetRowStyle(params)), this.getRowHighlightStyle(params)), this.getAlertRowStyle(params)), this.getConditionalStyleRowStyle(conditionalStyles, params)), this.getFormatColumnRowStyle(formatColumnsStyles, params));
                 return result;
             };
         });
@@ -4344,6 +4393,7 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
                     highlightClassName,
                     alertHighlightClassName,
                     this.getConditionalStyleRowClass(conditionalStyles.filter((cs) => StringExtensions_1.StringExtensions.IsNotNullOrEmpty(cs.Style.ClassName)), params),
+                    this.getFormatColumnRowClass(formatColumnsStyles, params),
                 ]
                     // we flatten it because 'userGetRowClass' might return a string[]
                     .flat()
@@ -4386,6 +4436,14 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
             }
         }
     }
+    getFormatColumnRowStyle(formatColumns, params) {
+        if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(formatColumns)) {
+            const formatColumnWithRowStyle = formatColumns.find((formatColumn) => this.api.formatColumnApi.isFormatColumnActiveForRow(formatColumn, params));
+            if (formatColumnWithRowStyle) {
+                return this.convertAdaptableStyleToCSS(formatColumnWithRowStyle.Style);
+            }
+        }
+    }
     getGridOptionsApi() {
         if (!this.gridOptions.api) {
             (0, LoggingHelper_1.ConsoleLogError)('There is a problem with your instance of AG Grid - it has no gridApi object.  Please contact Support.');

package/src/components/ExpressionEditor/BaseEditorInput.d.ts

@@ -7,7 +7,7 @@ interface BaseEditorInputProps {
     onChange: (value: string) => void;
     disabled?: boolean;
     onSelectedFunctionChange: (expressionFunction: ExpressionFunction | null) => void;
-    expressionFunctions: ExpressionFunctionMap;
+    expressionFunctions: ExpressionFunctionMap<string>;
     editorButtons: OperatorEditorButton[];
     testData: any;
     placeholder?: string;

package/src/components/ExpressionEditor/EditorInput.js

@@ -13,7 +13,7 @@ const editorButtonsCumulativeAggregatedScalar_1 = require("./editorButtonsCumula
 function EditorInput(props) {
     const moduleExpressionFunctions = props.api.internalApi
         .getQueryLanguageService()
-        .getModuleExpressionFunctions(props.module);
+        .getModuleExpressionFunctionsMap(props.module);
     const getFilteredAggregatedExpressionFunctions = (availableAggregatedExpressionFunctions, type) => {
         const sourceExpressionFunctions = type === 'aggregatedScalar'
             ? aggregatedScalarExpressionFunctions_1.aggregatedExpressionFunctions

package/src/components/ExpressionEditor/EditorInputWithWhereClause.js

@@ -15,7 +15,7 @@ const editorButtonsAggregatedBoolean_1 = require("./editorButtonsAggregatedBoole
 function EditorInputWithWhereClause(props) {
     const moduleExpressionFunctions = props.api.internalApi
         .getQueryLanguageService()
-        .getModuleExpressionFunctions(props.module);
+        .getModuleExpressionFunctionsMap(props.module);
     const reactiveExpressionFns = props.type === 'observable'
         ? moduleExpressionFunctions.observableFunctions
         : moduleExpressionFunctions.aggregatedBooleanFunctions;

package/src/metamodel/adaptable.metamodel.d.ts

@@ -888,12 +888,12 @@ export declare const ADAPTABLE_METAMODEL: {
             defaultValue: string;
         })[];
     };
-    AggregatedScalarFunctionName: {
+    AggregatedBooleanFunctionName: {
         name: string;
         kind: string;
         description: string;
     };
-    AggregationFunctionName: {
+    AggregatedScalarFunctionName: {
         name: string;
         kind: string;
         description: string;
@@ -2418,6 +2418,11 @@ export declare const ADAPTABLE_METAMODEL: {
             defaultValue: string;
         }[];
     };
+    DefaultExpressionFunctionsContext: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     DeletedActionRowInfo: {
         name: string;
         kind: string;
@@ -2559,6 +2564,26 @@ export declare const ADAPTABLE_METAMODEL: {
             defaultValue?: undefined;
         })[];
     };
+    EvaluateExpressionExternallyContext: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            reference?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+            isOptional?: undefined;
+        })[];
+    };
     EventApi: {
         name: string;
         kind: string;
@@ -2657,28 +2682,12 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional?: undefined;
-            reference?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            reference?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            reference: string;
-            isOptional?: undefined;
         } | {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
             isOptional: boolean;
-            reference: string;
         })[];
     };
     ExpressionFunction: {
@@ -2701,6 +2710,11 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional?: undefined;
         })[];
     };
+    ExpressionFunctionDefinitions: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     ExpressionFunctionDocBlock: {
         name: string;
         kind: string;
@@ -2711,6 +2725,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    ExpressionFunctionMap: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     ExpressionOptions: {
         name: string;
         kind: string;
@@ -2723,16 +2742,6 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             gridInfo?: undefined;
             defaultValue?: undefined;
-            reference?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            gridInfo: string;
-            defaultValue: string;
-            reference: string;
         } | {
             name: string;
             kind: string;
@@ -2741,7 +2750,6 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             gridInfo: string;
             defaultValue: string;
-            reference?: undefined;
         })[];
     };
     FDC3Column: {
@@ -3758,6 +3766,16 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    ModuleExpressionFunctionsContext: {
+        name: string;
+        kind: string;
+        description: string;
+    };
+    ModuleExpressionFunctionsMap: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     NamedQuery: {
         name: string;
         kind: string;