@adaptabletools/adaptable 13.1.1 → 14.0.0-canary.1

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -30,6 +30,39 @@ const sanitizeNumericResult = (value) => {
     return value;
 };
 exports.scalarExpressionFunctions = {
+    COL: {
+        handler(args, context) {
+            var _a, _b;
+            const columnId = args[0];
+            const column = (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.columnApi.getColumnWithColumnId(columnId);
+            if (!column) {
+                throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not found`);
+            }
+            if (!column.queryable) {
+                throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not queryable`);
+            }
+            return (_b = context.adaptableApi) === null || _b === void 0 ? void 0 : _b.gridApi.getNormalisedValueFromRowNode(context.node, columnId);
+        },
+        description: 'Returns the value of a column',
+        signatures: ['[colName]', 'COL(name: string)'],
+        examples: ['[col1]', 'COL("col1")'],
+        category: 'advanced',
+        returnType: 'any',
+    },
+    VAR: {
+        handler(args, context) {
+            const [functionName, ...optionalArgs] = args;
+            if (StringExtensions_1.default.IsNullOrEmpty(functionName)) {
+                throw new ExpressionEvaluationError_1.ExpressionEvaluationError('VAR', 'should have a name');
+            }
+            return context.evaluateCustomQueryVariable(functionName, optionalArgs);
+        },
+        description: 'Returns the variable evaluation',
+        signatures: ['VAR(varName)', 'VAR(varName, arg1, arg2)'],
+        examples: ['VAR(CURRENT_USER)', 'VAR(IS_VALID_VALUE, IS_BLANK([col1]), [col2] < [col3])'],
+        category: 'advanced',
+        returnType: 'any',
+    },
     ADD: {
         handler(args) {
             const sanitizedArguments = sanitizeArguments(args, true);
@@ -43,6 +76,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the sum of 2 numbers',
         signatures: ['number + number', 'ADD(a: number, b: number)'],
         examples: ['[col1] + 5', 'ADD([col1], 5)'],
+        category: 'math',
+        returnType: 'number',
     },
     SUB: {
         handler(args) {
@@ -57,6 +92,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the difference of 2 numbers',
         signatures: ['number - number', 'SUB(a: number, b: number)'],
         examples: ['[col1] - 5', 'SUB([col1], 5)'],
+        category: 'math',
+        returnType: 'number',
     },
     MUL: {
         handler(args) {
@@ -66,6 +103,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the product of 2 numbers',
         signatures: ['number * number', 'mul(a: number, b: number)'],
         examples: ['[col1] * 5', 'mul([col1], 5)'],
+        category: 'math',
+        returnType: 'number',
     },
     DIV: {
         handler(args) {
@@ -75,6 +114,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the division of 2 numbers',
         signatures: ['number / number', 'DIV(a: number, b: number)'],
         examples: ['[col1] / 5', 'DIV([col1], 5)'],
+        category: 'math',
+        returnType: 'number',
     },
     MOD: {
         handler(args) {
@@ -84,6 +125,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the modulo of 2 numbers',
         signatures: ['number % number', 'MOD(a: number, b: number)'],
         examples: ['[col1] % 5', 'MOD([col1], 5)'],
+        category: 'math',
+        returnType: 'number',
     },
     POW: {
         handler(args) {
@@ -93,6 +136,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the pow of 2 numbers',
         signatures: ['number ^ number', 'POW(a: number, b: number)'],
         examples: ['[col1] ^ 5', 'POW([col1], 5)'],
+        category: 'math',
+        returnType: 'number',
     },
     IF: {
         handler(args) {
@@ -102,23 +147,46 @@ exports.scalarExpressionFunctions = {
         description: 'Returns one of two statements based on a condition',
         signatures: ['condition ? true_statement : false_statement'],
         examples: ['[col1] > [col2] ? "BIG" : "SMALL"'],
-    },
-    COL: {
-        handler(args, context) {
-            var _a, _b;
-            const columnId = args[0];
-            const column = (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.columnApi.getColumnFromId(columnId);
-            if (!column) {
-                throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not found`);
+        category: 'logic',
+        returnType: 'any',
+    },
+    CASE: {
+        handler([expressionValueNode, whenThenListNodes, defaultValueNode], context) {
+            const caseExpressionValue = expressionValueNode != undefined
+                ? // CASE matches the first WHEN statement with the provided expression value
+                    (0, expressionFunctionUtils_1.evaluateExpressionNode)(expressionValueNode, context)
+                : // otherwise it returns the first WHEN statement evaluated to TRUE
+                    true;
+            let matchingCase = null;
+            whenThenListNodes.forEach((whenThenStatement) => {
+                const whenValue = (0, expressionFunctionUtils_1.evaluateExpressionNode)(whenThenStatement.WHEN, context);
+                if (whenValue === caseExpressionValue) {
+                    matchingCase = (0, expressionFunctionUtils_1.evaluateExpressionNode)(whenThenStatement.THEN, context);
+                    return;
+                }
+            });
+            if (!matchingCase && defaultValueNode) {
+                // if provided, return the default CASE
+                matchingCase = (0, expressionFunctionUtils_1.evaluateExpressionNode)(defaultValueNode, context);
             }
-            if (!column.queryable) {
-                throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not queryable`);
-            }
-            return (_b = context.adaptableApi) === null || _b === void 0 ? void 0 : _b.gridApi.getNormalisedValueFromRowNode(context.node, columnId);
+            return matchingCase;
         },
-        description: 'Returns the value of a column',
-        signatures: ['[colName]', 'COL(name: string)'],
-        examples: ['[col1]', 'COL("col1")'],
+        isHiddenFromMenu: true,
+        hasEagerEvaluation: true,
+        description: `The syntax of CASE supports 2 variants:
+     1. CASE takes an expression and compares its value with each WHEN clause until one of them is equal, whereupon the corresponding THEN clause is executed.
+     2. Each expression in the WHEN clause is evaluated until one of them is true, whereupon the corresponding THEN clause is executed.
+    If no WHEN clause is satisfied, the ELSE clause is executed if one exists, otherwise NULL is returned`,
+        signatures: [
+            `CASE <expression> [WHEN <expression> THEN <expression>] [ELSE <expression>] END`,
+            `CASE [WHEN <expression> THEN <expression>] [ELSE <expression>] END`,
+        ],
+        examples: [
+            `CASE [day] WHEN 'Saturday' THEN 'weekend' WHEN 'Sunday' THEN 'weekend' ELSE 'workday' END`,
+            `CASE WHEN [price] < 10 THEN 'low price' WHEN [price] < 50 THEN 'medium price' ELSE 'high price' END`,
+        ],
+        category: 'logic',
+        returnType: 'any',
     },
     MIN: {
         handler(args) {
@@ -127,6 +195,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the smallest of inputted numbers',
         signatures: ['MIN(number, number, ...number)'],
         examples: ['MIN([col1], 5)'],
+        category: 'math',
+        returnType: 'number',
     },
     MAX: {
         handler(args) {
@@ -135,6 +205,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the highest of inputted numbers',
         signatures: ['MAX(number, number, ...number)'],
         examples: ['MAX([col1], 5)'],
+        category: 'math',
+        returnType: 'number',
     },
     AVG: {
         handler(args) {
@@ -148,6 +220,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the average of inputted numbers',
         signatures: ['AVG(number, number, ...number)'],
         examples: ['AVG([col1], 5)'],
+        category: 'math',
+        returnType: 'number',
     },
     DATE: {
         handler(args) {
@@ -161,6 +235,8 @@ exports.scalarExpressionFunctions = {
             'DATE("YYYY-MM-DD HH:SS")',
         ],
         examples: ['DATE("20210101")', 'DATE("2021-01-01")', 'DATE("2021-01-01 10:10")'],
+        category: 'dates',
+        returnType: 'date',
     },
     NOW: {
         handler() {
@@ -169,6 +245,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the current date',
         signatures: ['NOW()'],
         examples: ['[col1] > NOW()'],
+        category: 'dates',
+        returnType: 'date',
     },
     TODAY: {
         handler() {
@@ -177,6 +255,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the current day',
         signatures: ['TODAY()'],
         examples: ['[col1] > TODAY()'],
+        category: 'dates',
+        returnType: 'date',
     },
     DAY: {
         handler(args) {
@@ -185,6 +265,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the day from a date',
         signatures: ['DAY(input: date)'],
         examples: ['DAY([col1]) = DAY(NOW())'],
+        category: 'dates',
+        returnType: 'date',
     },
     WEEK: {
         handler(args) {
@@ -193,6 +275,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the week from a date',
         signatures: ['WEEK(input: date)'],
         examples: ['WEEK([col1]) = WEEK(NOW())'],
+        category: 'dates',
+        returnType: 'number',
     },
     MONTH: {
         handler(args) {
@@ -201,6 +285,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the month from a date',
         signatures: ['MONTH(input: date)'],
         examples: ['MONTH([col1]) = MONTH(NOW())'],
+        category: 'dates',
+        returnType: 'number',
     },
     YEAR: {
         handler(args) {
@@ -209,6 +295,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the year from a date',
         signatures: ['YEAR(input: date)'],
         examples: ['YEAR([col1]) = YEAR(NOW())'],
+        category: 'dates',
+        returnType: 'date',
     },
     ADD_DAYS: {
         handler(args) {
@@ -217,6 +305,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns a date based on input data and days to add',
         signatures: ['ADD_DAYS(input: date, days: number)'],
         examples: ['ADD_DAYS(TODAY(), 5)', 'ADD_DAYS([col1], 5)'],
+        category: 'dates',
+        returnType: 'date',
     },
     ADD_WEEKS: {
         handler(args) {
@@ -225,6 +315,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns a date based on input data and weeks to add',
         signatures: ['ADD_WEEKS(input: date, weeks: number)'],
         examples: ['ADD_WEEKS(TODAY(), 5)', 'ADD_WEEKS([col1], 5)'],
+        category: 'dates',
+        returnType: 'date',
     },
     ADD_MONTHS: {
         handler(args) {
@@ -233,6 +325,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns a date based on input data and months to add',
         signatures: ['ADD_MONTHS(input: date, months: number)'],
         examples: ['ADD_MONTHS(TODAY(), 5)', 'ADD_MONTHS([col1], 5)'],
+        category: 'dates',
+        returnType: 'date',
     },
     ADD_YEARS: {
         handler(args) {
@@ -241,6 +335,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns a date based on input data and years to add',
         signatures: ['ADD_YEARS(input: date, years: number)'],
         examples: ['ADD_YEARS(TODAY(), 5)', 'ADD_YEARS([col1], 5)'],
+        category: 'dates',
+        returnType: 'date',
     },
     DIFF_DAYS: {
         handler(args) {
@@ -251,6 +347,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the difference in days between 2 dates',
         signatures: ['DIFF_DAYS(a: date, b: date)'],
         examples: ['DIFF_DAYS([col1], TODAY())'],
+        category: 'dates',
+        returnType: 'number',
     },
     DIFF_WEEKS: {
         handler(args) {
@@ -261,6 +359,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the difference in weeks between 2 dates',
         signatures: ['DIFF_WEEKS(a: date, b: date)'],
         examples: ['DIFF_WEEKS([col1], TODAY())'],
+        category: 'dates',
+        returnType: 'number',
     },
     DIFF_MONTHS: {
         handler(args) {
@@ -271,6 +371,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the difference in months between 2 dates',
         signatures: ['DIFF_MONTHS(a: date, b: date)'],
         examples: ['DIFF_MONTHS([col1], TODAY())'],
+        category: 'dates',
+        returnType: 'number',
     },
     DIFF_YEARS: {
         handler(args) {
@@ -281,6 +383,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the difference in years between 2 dates',
         signatures: ['DIFF_YEARS(a: date, b: date)'],
         examples: ['DIFF_YEARS([col1], TODAY())'],
+        category: 'dates',
+        returnType: 'number',
     },
     LEN: {
         handler(args) {
@@ -289,6 +393,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the length of a string',
         signatures: ['LEN(a: string)'],
         examples: ['LEN([col1])'],
+        category: 'strings',
+        returnType: 'number',
     },
     SUB_STRING: {
         handler(args) {
@@ -297,6 +403,8 @@ exports.scalarExpressionFunctions = {
         description: 'Extracts characters from string, between 2 indices, returning new sub string',
         signatures: ['SUB_STRING(a: string, b: number, c:number)'],
         examples: ['SUB_STRING([col1], 1, 5)'],
+        category: 'strings',
+        returnType: 'string',
     },
     UPPER: {
         handler(args) {
@@ -305,6 +413,8 @@ exports.scalarExpressionFunctions = {
         description: 'Converts a string to Upper Case',
         signatures: ['UPPER(a: string)'],
         examples: ['UPPER([col1])'],
+        category: 'strings',
+        returnType: 'string',
     },
     LOWER: {
         handler(args) {
@@ -313,6 +423,8 @@ exports.scalarExpressionFunctions = {
         description: 'Converts a string to Lower Case',
         signatures: ['LOWER(a: string)'],
         examples: ['LOWER([col1])'],
+        category: 'strings',
+        returnType: 'string',
     },
     REPLACE: {
         handler(args, context) {
@@ -326,6 +438,8 @@ exports.scalarExpressionFunctions = {
         description: 'Searches string for specified value returning new string with replaced values',
         signatures: ['REPLACE(a: string, b: string, c:string)'],
         examples: ['REPLACE([col1], "GBP", "EUR")'],
+        category: 'strings',
+        returnType: 'string',
     },
     COALESCE: {
         handler(args) {
@@ -334,6 +448,8 @@ exports.scalarExpressionFunctions = {
         description: 'Returns the first argument which is not null',
         signatures: ['COALESCE(value, value, ...value)'],
         examples: ['COALESCE([col1], [col2], [col3], 0)'],
+        category: 'strings',
+        returnType: 'string',
     },
     CONCAT: {
         handler(args) {
@@ -342,19 +458,8 @@ exports.scalarExpressionFunctions = {
         description: 'Concatenates multiple strings',
         signatures: ['CONCAT(value1, value2, value3)'],
         examples: ['CONCAT([col1], [col2], [col3]'],
-    },
-    VAR: {
-        handler(args, context) {
-            const [functionName, ...optionalArgs] = args;
-            if (StringExtensions_1.default.IsNullOrEmpty(functionName)) {
-                throw new ExpressionEvaluationError_1.ExpressionEvaluationError('VAR', 'should have a name');
-            }
-            return context.evaluateCustomQueryVariable(functionName, optionalArgs);
-        },
-        isPredicate: true,
-        description: 'Returns the variable evaluation',
-        signatures: ['VAR(varName)', 'VAR(varName, arg1, arg2)'],
-        examples: ['VAR(CURRENT_USER)', 'VAR(IS_VALID_VALUE, IS_BLANK([col1]), [col2] < [col3])'],
+        category: 'strings',
+        returnType: 'string',
     },
 };
 exports.scalarExpressionFunctionNames = (0, TypeExtensions_1.getTypedKeys)(exports.scalarExpressionFunctions);

package/src/Utilities/Extensions/TypeExtensions.d.ts

@@ -74,4 +74,5 @@ export declare type _DeepRequiredObject<T> = {
 };
 export declare type NonUndefined<A> = A extends undefined ? never : A;
 export declare const getTypedKeys: <T extends string>(input: Record<T, any>) => T[];
+export declare type OneOf<T extends any[]> = T extends [infer Only] ? Only : T extends [infer A, infer B, ...infer Rest] ? OneOf<[XOR<A, B>, ...Rest]> : never;
 export {};

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -66,7 +66,7 @@ function initPredefinedConfigWithUuids(predefinedConfig) {
 }
 exports.initPredefinedConfigWithUuids = initPredefinedConfigWithUuids;
 function checkValidPrimaryKey(adaptable) {
-    const pkColumn = adaptable.api.columnApi.getColumnFromId(adaptable.adaptableOptions.primaryKey);
+    const pkColumn = adaptable.api.columnApi.getColumnWithColumnId(adaptable.adaptableOptions.primaryKey);
     if (pkColumn == undefined && !adaptable.adaptableOptions.autogeneratePrimaryKey) {
         const errorMessage = `The Primary Key Column '${adaptable.adaptableOptions.primaryKey}' does not exist.  This will affect many functions in Adaptable.`;
         if (adaptable.adaptableOptions.generalOptions.showMissingPrimaryKeyAlert == true) {

package/src/Utilities/Helpers/FormatHelper.js

@@ -18,15 +18,17 @@ function Format(input, format) {
 }
 exports.Format = Format;
 function NumberFormatter(input, options = {}) {
-    if (input == null || input == undefined) {
+    var _a, _b;
+    let preparedInput = (_a = options.Content) !== null && _a !== void 0 ? _a : input;
+    if (preparedInput == null || preparedInput == undefined) {
         return undefined;
     }
-    if (typeof input === 'string') {
-        return input;
+    if (typeof preparedInput === 'string') {
+        return preparedInput;
     }
-    let n = Number(input);
+    let n = Number(preparedInput);
     if (isNaN(n)) {
-        return input.toString();
+        return preparedInput.toString();
     }
     const fractionsSepatator = options.FractionSeparator ? options.FractionSeparator : '.';
     let multiplier = options.Multiplier ? options.Multiplier : 1;
@@ -34,7 +36,7 @@ function NumberFormatter(input, options = {}) {
         n *= multiplier;
         n = parseFloat(n.toFixed(12));
     }
-    if (options.Parentheses === true && input < 0) {
+    if (options.Parentheses === true && preparedInput < 0) {
         n *= -1;
         n = parseFloat(n.toFixed(12));
     }
@@ -50,7 +52,7 @@ function NumberFormatter(input, options = {}) {
         digitsToUse = options.FractionDigits;
     }
     else {
-        let decimalCount = Math.floor(n) === n ? 0 : n.toString().split(fractionsSepatator)[1].length || 0;
+        let decimalCount = Math.floor(n) === n ? 0 : ((_b = n.toString().split(fractionsSepatator)[1]) === null || _b === void 0 ? void 0 : _b.length) || 0;
         digitsToUse = decimalCount;
     }
     s = n.toLocaleString('en-US', {
@@ -65,7 +67,7 @@ function NumberFormatter(input, options = {}) {
         s = s.replace(/\,/g, options.IntegerSeparator);
     }
     s = (options.Prefix || '') + s + (options.Suffix || '');
-    if (options.Parentheses === true && input < 0) {
+    if (options.Parentheses === true && preparedInput < 0) {
         s = '(' + s + ')';
     }
     return s;
@@ -94,10 +96,11 @@ function DateFormatter(input, options, strictFormatting = false) {
 }
 exports.DateFormatter = DateFormatter;
 function StringFormatter(input, options = {}) {
-    if (input == null || input == undefined) {
+    let preparedInput = options.Content ? options.Content : input;
+    if (preparedInput == null || preparedInput == undefined) {
         return undefined;
     }
-    let s = input;
+    let s = preparedInput;
     if (options.Prefix !== undefined) {
         s = options.Prefix + s;
     }

package/src/Utilities/ObjectFactory.js

@@ -85,7 +85,7 @@ function CreateEmptyAlertDefinition() {
         Uuid: (0, Uuid_1.createUuid)(),
         Scope: { All: true },
         Rule: {
-            Predicate: undefined,
+            Predicates: [],
         },
         MessageType: GeneralConstants_1.ALERT_DEFAULT_MESSAGE_TYPE,
         AlertProperties: {},
@@ -97,9 +97,11 @@ function CreateEmptyFlashingCellDefinition() {
         Uuid: (0, Uuid_1.createUuid)(),
         Scope: { ColumnIds: [] },
         Rule: {
-            Predicate: {
-                PredicateId: 'Any',
-            },
+            Predicates: [
+                {
+                    PredicateId: 'Any',
+                },
+            ],
         },
     };
 }
@@ -112,7 +114,7 @@ function CreateInternalAlertDefinitionForMessages(messageType, alertProperties)
         Uuid: (0, Uuid_1.createUuid)(),
         Scope: undefined,
         Rule: {
-            Predicate: undefined,
+            Predicates: [],
         },
         MessageType: messageType,
         AlertProperties: alertProperties,
@@ -320,7 +322,7 @@ function CreateEmptyStyle() {
         FontWeight: undefined,
         FontStyle: undefined,
         FontSize: undefined,
-        ClassName: GeneralConstants_1.EMPTY_STRING,
+        ClassName: undefined,
     };
 }
 exports.CreateEmptyStyle = CreateEmptyStyle;

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -19,7 +19,7 @@ class CalculatedColumnExpressionService {
             const refreshedCalculatedColumns = [];
             this.aggregatedScalarLiveValuesMap.forEach((aggregatedScalarLiveValue, calculatedColumnId) => {
                 const calculatedColumn = this.adaptableApi.calculatedColumnApi.getCalculatedColumnById(calculatedColumnId);
-                const columnDependencies = this.adaptableApi.calculatedColumnApi.getReferencedColumnIdsForCalculatedColumn(calculatedColumn);
+                const columnDependencies = this.adaptableApi.calculatedColumnApi.internalApi.getReferencedColumnIdsForCalculatedColumn(calculatedColumn);
                 if (columnDependencies.includes(cellDataChangedInfo.column.columnId)) {
                     aggregatedScalarLiveValue.refresh();
                     refreshedCalculatedColumns.push(calculatedColumn.ColumnId);

package/src/Utilities/Services/ChartingService.js

@@ -10,7 +10,7 @@ class ChartingService {
         this.api = api;
     }
     onChartModelChange(models, eventType, params) {
-        const allChartDefinitions = this.api.chartingApi.getAllChartDefinitions();
+        const allChartDefinitions = this.api.chartingApi.getChartDefinitions();
         const currentChartModel = models.find((model) => model.chartId === params.chartId);
         const currentChartDefinition = allChartDefinitions.find((chartDefinition) => chartDefinition.Model.chartId === params.chartId);
         switch (eventType) {
@@ -84,7 +84,7 @@ class ChartingService {
                         ],
                     } }),
             };
-            this.api.alertApi.displayAlert(alert);
+            this.api.alertApi.showAdaptableAlert(alert);
         }
         else if (saveStragegy === 'auto') {
             this.api.chartingApi.addChartDefinition(ObjectFactory_1.default.CreateEmptyChartDefinition({

package/src/Utilities/Services/DataService.js

@@ -34,7 +34,7 @@ class DataService {
     CreateDataChangedEvent(cellDataChangedInfo) {
         if (cellDataChangedInfo.newValue != cellDataChangedInfo.oldValue) {
             this.emitter.emitSync('CellDataChanged', cellDataChangedInfo);
-            this.adaptable.api.gridApi.fireCellChangedEvent(cellDataChangedInfo);
+            this.adaptable.api.gridApi.internalApi.fireCellChangedEvent(cellDataChangedInfo);
             this.logDataChange(cellDataChangedInfo);
         }
     }

package/src/Utilities/Services/Interface/IEntitlementService.d.ts

@@ -1,11 +1,12 @@
 import { IAdaptableService } from './IAdaptableService';
 import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
 import { AccessLevel } from '../../../PredefinedConfig/Common/Entitlement';
+import { GridInfoSection } from '../../../types';
 export interface IEntitlementService extends IAdaptableService {
     setModulesEntitlements(): void;
     isModuleHiddenEntitlement(adaptableModule: AdaptableModule): boolean;
     isModuleFullEntitlement(adaptableModule: AdaptableModule): boolean;
     isModuleReadOnlyEntitlement(adaptableModule: AdaptableModule): boolean;
     getEntitlementAccessLevelForModule(adaptableModule: AdaptableModule): AccessLevel;
-    isGridInfoSectionVisible(section: 'GridSummary' | 'AdaptableOptions' | 'ColumnInfo'): boolean;
+    isGridInfoSectionVisible(section: GridInfoSection): boolean;
 }

package/src/Utilities/Services/Interface/IRowEditService.d.ts

@@ -1,8 +1,3 @@
-import { RowNode } from '@ag-grid-community/core';
 import { IAdaptableService } from './IAdaptableService';
-import { AdaptableForm } from '../../../PredefinedConfig/Common/AdaptableForm';
-import { CreateActionRowFormContext, EditActionRowFormContext } from '../../../AdaptableOptions/ActionOptions';
 export interface IRowEditService extends IAdaptableService {
-    buildRowEditForm(rowNode: RowNode): AdaptableForm<EditActionRowFormContext>;
-    buildRowCreateForm(clonedRowNode?: RowNode): AdaptableForm<CreateActionRowFormContext>;
 }

package/src/Utilities/Services/ModuleService.js

@@ -142,7 +142,7 @@ class ModuleService {
             case 'StyledColumn':
                 return learnUrl + 'handbook-styled-column-overview';
             case 'Charting':
-                return learnUrl + 'reference-config-charting';
+                return learnUrl + 'handbook-charts';
             default:
                 return 'good';
         }

package/src/Utilities/Services/QueryLanguageService.js

@@ -105,7 +105,7 @@ class QueryLanguageService {
                 this.cacheBooleanValidation.set(cacheKey, result);
                 return result;
             }
-            if (!booleanAndScalarFunctions[rootFn.type].isPredicate) {
+            if (booleanAndScalarFunctions[rootFn.type].returnType !== 'boolean') {
                 const result = {
                     isValid: false,
                     errorMessage: `provided function ${rootFn === null || rootFn === void 0 ? void 0 : rootFn.type} is not a predicate`,
@@ -267,7 +267,7 @@ class QueryLanguageService {
         let result = expression;
         const columnIds = this.getColumnsFromExpression(expression);
         columnIds.forEach((columnId) => {
-            const columnFriendlyName = this.adaptableApi.columnApi.getFriendlyNameFromColumnId(columnId);
+            const columnFriendlyName = this.adaptableApi.columnApi.getFriendlyNameForColumnId(columnId);
             result = result.split(columnId).join(columnFriendlyName);
         });
         return result;

package/src/Utilities/Services/ReportService.js

@@ -103,7 +103,7 @@ class ReportService {
                 return ['[Selected Columns]'];
             case 'ScopeColumns':
                 if ('ColumnIds' in (report === null || report === void 0 ? void 0 : report.Scope)) {
-                    return (_b = (_a = report.Scope.ColumnIds).map) === null || _b === void 0 ? void 0 : _b.call(_a, (columnId) => { var _a; return (_a = this.adaptableApi.columnApi.getFriendlyNameFromColumnId(columnId)) !== null && _a !== void 0 ? _a : columnId; });
+                    return (_b = (_a = report.Scope.ColumnIds).map) === null || _b === void 0 ? void 0 : _b.call(_a, (columnId) => { var _a; return (_a = this.adaptableApi.columnApi.getFriendlyNameForColumnId(columnId)) !== null && _a !== void 0 ? _a : columnId; });
                 }
                 return ['[Bespoke Columns]'];
         }
@@ -180,7 +180,7 @@ class ReportService {
                 break;
             case 'ScopeColumns':
                 if ('ColumnIds' in report.Scope) {
-                    reportColumns = report.Scope.ColumnIds.map((columnId) => this.adaptableApi.columnApi.getColumnFromId(columnId)).filter((c) => c);
+                    reportColumns = report.Scope.ColumnIds.map((columnId) => this.adaptableApi.columnApi.getColumnWithColumnId(columnId)).filter((c) => c);
                 }
                 else {
                     reportColumns = this.adaptableApi.scopeApi.getColumnsForScope(report.Scope);
@@ -306,7 +306,7 @@ class ReportService {
         if (StringExtensions_1.default.IsNullOrEmpty(cellRawValue)) {
             return cellRawValue;
         }
-        const columnType = this.adaptableApi.columnApi.getColumnDataTypeFromColumnId(columnId);
+        const columnType = this.adaptableApi.columnApi.getColumnDataTypeForColumnId(columnId);
         // if this is a date column and there is a custom export date format provided, that will take precedence
         if (columnType === 'Date' && !!this.getCustomExportDateFormat()) {
             const exportDateFormat = this.getCustomExportDateFormat();

package/src/Utilities/Services/RowEditService.d.ts

@@ -1,26 +1,7 @@
 import { IRowEditService } from './Interface/IRowEditService';
-import { RowNode } from '@ag-grid-community/core';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-import { AdaptableForm } from '../../PredefinedConfig/Common/AdaptableForm';
-import { CreateActionRowFormContext, EditActionRowFormContext } from '../../AdaptableOptions/ActionOptions';
 export declare class RowEditService implements IRowEditService {
     private adaptableApi;
-    private adaptableInstance;
-    private rowEditFormOptions;
     constructor(adaptableApi: AdaptableApi);
-    buildRowEditForm(rowNode: RowNode): AdaptableForm<EditActionRowFormContext>;
-    buildRowCreateForm(clonedRowNode?: RowNode): AdaptableForm<CreateActionRowFormContext>;
-    private buildActionRow;
-    private getFormTitle;
-    private getFormDescription;
-    private buildFormParamContext;
-    private buildActionRowFields;
-    private buidActionRowButtons;
-    private isColumnEditable;
-    private buildFormField;
-    private getFormFieldLabel;
-    private buildFormFieldLabelContext;
-    private getFieldTypeFromColumnType;
-    private getFieldValueOptions;
     private autoHandleActionRowButtons;
 }