@adaptabletools/adaptable 12.0.4 → 12.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "12.0.4",
+  "version": "12.0.7",
   "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: 1657113089379;
+declare const _default: 1657722189050;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableOptions/ExportOptions.d.ts

@@ -72,15 +72,15 @@ export interface CustomReport {
  */
 export interface CustomDestination {
     /**
-     * Name of Custom Destination
+     * Name of Custom Destination (mandatory)
      */
     name: string;
     /**
-     * Optional Adaptable Form - if provided, it must include Buttons that will execute the export
+     * Optional Adaptable Form; if provided, it must include Buttons that will execute the Export
      */
     form?: AdaptableForm<ExportFormContext>;
     /**
-     * Function invoked when export is applied (used if no form is supplied)
+     * Optional Function invoked when Export is applied (used if no form is supplied)
      */
     onExport?: (reportContext: ReportContext) => void;
 }

package/src/Api/GridApi.d.ts

@@ -261,8 +261,9 @@ export interface GridApi {
      * Retrieves Formatted Value for a given Raw Value in given Column
      * @param columnId ColumnId to lookup
      * @param rawValue Raw Value
+     * @param rowNode Node containig the Column
      */
-    getFormattedValueFromRawValue(rowNode: RowNode, columnId: string, rawValue: any): string | undefined;
+    getDisplayValueFromRawValue(rowNode: RowNode, columnId: string, rawValue: any): string | undefined;
     /**
      * Retrieves Display Value for Cell in given Row and Column
      * @param rowNode Row to use

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

@@ -65,7 +65,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getGridCellFromRowNode(rowNode: RowNode, columnId: string): GridCell | undefined;
     getRawValueFromRowNode(rowNode: RowNode, columnId: string): any | undefined;
     getDisplayValueFromRowNode(rowNode: RowNode, columnId: string): any | undefined;
-    getFormattedValueFromRawValue(rowNode: RowNode, columnId: string, rawValue: any): string | undefined;
+    getDisplayValueFromRawValue(rowNode: RowNode, columnId: string, rawValue: any): string | undefined;
     getNormalisedValueFromRowNode(rowNode: RowNode, columnId: string): any | undefined;
     getRowNodesForPrimaryKeys(primaryKeyValues: any[]): RowNode[];
     getRowNodeForPrimaryKey(primaryKeyValue: any): RowNode;

package/src/Api/Implementation/GridApiImpl.js

@@ -200,7 +200,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     getDisplayValueFromRowNode(rowNode, columnId) {
         return this.adaptable.getDisplayValueFromRowNode(rowNode, columnId);
     }
-    getFormattedValueFromRawValue(rowNode, columnId, rawValue) {
+    getDisplayValueFromRawValue(rowNode, columnId, rawValue) {
         return this.adaptable.getDisplayValueFromRawValue(rowNode, columnId, rawValue);
     }
     getNormalisedValueFromRowNode(rowNode, columnId) {

package/src/Api/Implementation/InternalApiImpl.js

@@ -390,6 +390,9 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     getQueryPreviewData() {
         var _a;
         const firstRowNode = this.adaptable.api.gridApi.getFirstRowNode();
+        if (firstRowNode == undefined) {
+            return {};
+        }
         const firstRowData = (_a = Object.assign({}, firstRowNode === null || firstRowNode === void 0 ? void 0 : firstRowNode.data)) !== null && _a !== void 0 ? _a : {};
         // handle CalcCols which are not persisted in the rowModel
         this.adaptable.api.calculatedColumnApi.getAllCalculatedColumn().forEach((calculatedColumn) => {

package/src/PredefinedConfig/Common/SpecialColumnSettings.d.ts

@@ -3,7 +3,7 @@
  */
 export interface SpecialColumnSettings {
     /**
-     * Preferred width (in pixels) for Column; if unset, calculated dynamically by AG Grid
+     * Preferred (pixel) Column Width; if unset, calculated dynamically by AG Grid
      */
     Width?: number;
     /**

package/src/Strategy/AlertModule.js

@@ -32,8 +32,8 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 'formattedValue') {
                 const { oldValue, newValue, rowNode } = cellDataChangedInfo;
                 const columnId = cellDataChangedInfo.column.columnId;
-                const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(rowNode, columnId, oldValue);
-                const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(rowNode, columnId, newValue);
+                const oldFormattedValue = this.api.gridApi.getDisplayValueFromRawValue(rowNode, columnId, oldValue);
+                const newFormattedValue = this.api.gridApi.getDisplayValueFromRawValue(rowNode, columnId, newValue);
                 if (oldFormattedValue === newFormattedValue) {
                     // if the formattedValues are identical, then no alert is fired
                     return;

package/src/Strategy/FlashingCellModule.js

@@ -31,8 +31,8 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 'formattedValue') {
                 const { oldValue, newValue, rowNode } = cellDataChangedInfo;
                 const columnId = cellDataChangedInfo.column.columnId;
-                const oldFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(rowNode, columnId, oldValue);
-                const newFormattedValue = this.api.gridApi.getFormattedValueFromRawValue(rowNode, columnId, newValue);
+                const oldFormattedValue = this.api.gridApi.getDisplayValueFromRawValue(rowNode, columnId, oldValue);
+                const newFormattedValue = this.api.gridApi.getDisplayValueFromRawValue(rowNode, columnId, newValue);
                 if (oldFormattedValue === newFormattedValue) {
                     // if the formattedValues are identical, then no alert is fired
                     return;

package/src/Utilities/Constants/DocumentationLinkConstants.js

@@ -7,8 +7,8 @@ exports.ExpressionEditorDocsLink = `${exports.HOST_URL_DOCS}/guide/ui-expression
 exports.BooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-boolean`;
 exports.ScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-scalar`;
 exports.ObservableQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-observable`;
-exports.AggregatedBooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation#aggregated-boolean-expressions`;
-exports.AggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation#aggregated-scalar-expressions`;
+exports.AggregatedBooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation-boolean`;
+exports.AggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation-scalar`;
 exports.PredicateDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-predicate`;
 exports.PrimaryKeyDocsLink = `${exports.HOST_URL_DOCS}/guide/dev-guide-tutorial-primary-key`;
 exports.LicenseDocsLink = `${exports.HOST_URL_DOCS}/guide/licensing`;

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.js

@@ -28,7 +28,7 @@ exports.aggregatedBooleanExpressionFunctions = {
     SUM: {
         handler(args, context) {
             const columnParameter = expressionFunctionUtils_1.extractColumnParameter('SUM', args);
-            expressionFunctionUtils_1.validateColumnType(columnParameter.value, ['Number'], 'SUM', context.api);
+            expressionFunctionUtils_1.validateColumnType(columnParameter.value, ['Number'], 'SUM', context.adaptableApi);
             const sumAggregationFn = (dataSource$) => getSumAggregation$(dataSource$, getColumnValueSum(columnParameter.value, context));
             const result = {
                 type: 'aggregation',
@@ -195,15 +195,15 @@ const getSumAggregation$ = (source$, initialSum) => {
 };
 const getColumnValueSum = (column, context) => {
     let sum = 0;
-    context.api.internalApi.forAllRowNodesDo((rowNode) => {
+    context.adaptableApi.internalApi.forAllRowNodesDo((rowNode) => {
         // if there is a WHERE clause defined, check if the current rowNode satisfies the condition
         if (context.filterFn && !context.filterFn(rowNode)) {
             return;
         }
-        if (context.api.gridApi.isGroupRowNode(rowNode)) {
+        if (context.adaptableApi.gridApi.isGroupRowNode(rowNode)) {
             return;
         }
-        const cellValue = context.api.gridApi.getRawValueFromRowNode(rowNode, column);
+        const cellValue = context.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, column);
         if (cellValue != undefined) {
             sum = sum + expressionFunctionUtils_1.getNumericValue(rowNode.data[column]);
         }

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -8,7 +8,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const sumColumnParameter = expressionFunctionUtils_1.extractColumnParameter('SUM', args);
             const sumColumnName = sumColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(sumColumnName, ['Number'], 'SUM', context.api);
+            expressionFunctionUtils_1.validateColumnType(sumColumnName, ['Number'], 'SUM', context.adaptableApi);
             const groupByParameter = expressionFunctionUtils_1.extractParameter('SUM', 'operand', ['GROUP_BY'], args, true);
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
@@ -50,7 +50,7 @@ exports.aggregatedScalarExpressionFunctions = {
             var _a;
             const percentageColumnParameter = expressionFunctionUtils_1.extractColumnParameter('PERCENTAGE', args);
             const percentageColumnName = percentageColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(percentageColumnName, ['Number'], 'PERCENTAGE', context.api);
+            expressionFunctionUtils_1.validateColumnType(percentageColumnName, ['Number'], 'PERCENTAGE', context.adaptableApi);
             const sumOperand = expressionFunctionUtils_1.extractParameter('PERCENTAGE', 'aggregation', ['SUM'], args, true);
             const groupByOperand = expressionFunctionUtils_1.extractParameter('PERCENTAGE', 'operand', ['GROUP_BY'], args, true);
             if (sumOperand && groupByOperand) {
@@ -79,7 +79,7 @@ exports.aggregatedScalarExpressionFunctions = {
                     },
                 },
                 rowValueGetter: (rowNode, aggregationValue) => {
-                    return ((context.api.gridApi.getRawValueFromRowNode(rowNode, percentageColumnName) /
+                    return ((context.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, percentageColumnName) /
                         aggregationValue) *
                         100);
                 },
@@ -118,7 +118,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const avgColumnParameter = expressionFunctionUtils_1.extractColumnParameter('AVG', args);
             const avgColumnName = avgColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(avgColumnName, ['Number'], 'AVG', context.api);
+            expressionFunctionUtils_1.validateColumnType(avgColumnName, ['Number'], 'AVG', context.adaptableApi);
             const groupByParameter = expressionFunctionUtils_1.extractParameter('AVG', 'operand', ['GROUP_BY'], args, true);
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
@@ -162,7 +162,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const minColumnParameter = expressionFunctionUtils_1.extractColumnParameter('MIN', args);
             const minColumnName = minColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(minColumnName, ['Number'], 'MIN', context.api);
+            expressionFunctionUtils_1.validateColumnType(minColumnName, ['Number'], 'MIN', context.adaptableApi);
             const groupByParameter = expressionFunctionUtils_1.extractParameter('MIN', 'operand', ['GROUP_BY'], args, true);
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
@@ -203,7 +203,7 @@ exports.aggregatedScalarExpressionFunctions = {
         handler(args, context) {
             const maxColumnParameter = expressionFunctionUtils_1.extractColumnParameter('MAX', args);
             const maxColumnName = maxColumnParameter.value;
-            expressionFunctionUtils_1.validateColumnType(maxColumnName, ['Number'], 'MAX', context.api);
+            expressionFunctionUtils_1.validateColumnType(maxColumnName, ['Number'], 'MAX', context.adaptableApi);
             const groupByParameter = expressionFunctionUtils_1.extractParameter('MAX', 'operand', ['GROUP_BY'], args, true);
             const aggregationExpressionEvaluation = {
                 aggregationParams: {
@@ -284,7 +284,7 @@ exports.aggregatedScalarExpressionFunctions = {
     OVER: {
         handler(args, context) {
             const columnParameter = expressionFunctionUtils_1.extractColumnParameter('OVER', args);
-            expressionFunctionUtils_1.validateColumnType(columnParameter.value, ['Number', 'Date'], 'OVER', context.api);
+            expressionFunctionUtils_1.validateColumnType(columnParameter.value, ['Number', 'Date'], 'OVER', context.adaptableApi);
             const result = {
                 type: 'operand',
                 name: 'OVER',

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -225,9 +225,9 @@ exports.booleanExpressionFunctions = {
         handler(args, context) {
             var _a;
             const searchTerm = expressionFunctionUtils_1.getStringValue(context, String(args[0]));
-            return (_a = context.api) === null || _a === void 0 ? void 0 : _a.columnApi.getColumns().some((column) => {
+            return (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.columnApi.getColumns().some((column) => {
                 var _a;
-                const value = (_a = context.api) === null || _a === void 0 ? void 0 : _a.gridApi.getDisplayValueFromRowNode(context.node, column.columnId);
+                const value = (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.gridApi.getDisplayValueFromRowNode(context.node, column.columnId);
                 const columnValue = expressionFunctionUtils_1.getStringValue(context, String(value));
                 return columnValue.indexOf(searchTerm) !== -1;
             });
@@ -266,7 +266,7 @@ exports.booleanExpressionFunctions = {
             if (StringExtensions_1.default.IsNullOrEmpty(namedQueryName)) {
                 return false;
             }
-            const namedQuery = (_a = context.api) === null || _a === void 0 ? void 0 : _a.queryApi.getNamedQueryByName(namedQueryName);
+            const namedQuery = (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.queryApi.getNamedQueryByName(namedQueryName);
             if (!namedQuery) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('QUERY', `Named Query with name ${namedQueryName} not found!`);
             }

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.js

@@ -19,12 +19,12 @@ const getStringValue = (context, stringArgument) => {
     return exports.isTextSearchCaseInsensitive(context) ? stringArgument.toLowerCase() : stringArgument;
 };
 exports.getStringValue = getStringValue;
-const isTextSearchCaseInsensitive = (context) => !context.api.internalApi.isTextComparisonCaseSensitive();
+const isTextSearchCaseInsensitive = (context) => !context.adaptableApi.internalApi.isTextComparisonCaseSensitive();
 exports.isTextSearchCaseInsensitive = isTextSearchCaseInsensitive;
 // returns an observable which filters the source$ emissions and emits only if the CellDataChangedInfo relates to the given column
 // optionally, if a filter function (where clause) is provided, it is also evaluated
 const getDataChangeLog$ = (context, columnNameFilter) => {
-    let dataChangeLog$ = context.api.internalApi.getDataService().dataChangeLog$;
+    let dataChangeLog$ = context.adaptableApi.internalApi.getDataService().dataChangeLog$;
     // filter only the given column changes
     dataChangeLog$ = dataChangeLog$.pipe(operators_1.filter((dataChangeLog) => dataChangeLog.column.columnId === columnNameFilter));
     // filter based on the WHERE clause
@@ -41,14 +41,14 @@ const handleWhereFunction = (args, context) => {
         // whereClauseResult
         return evaluator_1.evaluateNode(whereClauseExpressionNode, {
             node: rowNode,
-            api: context.api,
+            adaptableApi: context.adaptableApi,
             functions: context.whereClauseFunctions,
         });
     };
     // observableExpressionResult
     return evaluator_1.evaluateNode(reactiveExpressionNode, {
         node: context.node,
-        api: context.api,
+        adaptableApi: context.adaptableApi,
         functions: context.functions,
         filterFn,
     });
@@ -76,7 +76,7 @@ const handleColumnFunction = (args, context) => {
     if (StringExtensions_1.default.IsNullOrEmpty(args[0])) {
         throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `no column name is provided`);
     }
-    validateColumnId(args[0], context.api);
+    validateColumnId(args[0], context.adaptableApi);
     const result = {
         type: 'config',
         name: 'COL',

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -32,12 +32,12 @@ exports.observableExpressionFunctions = {
                     return getDataChangeCount$(dataChangeLog$, timeframeChange$, operandParameter.value);
                 }
                 case 'MIN': {
-                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MIN', context.api);
+                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MIN', context.adaptableApi);
                     const timeframeChange$ = getTrailingRowValueChange$(dataChangeLog$, timeframeParameter.value);
                     return getDataChangeMin$(dataChangeLog$, timeframeChange$);
                 }
                 case 'MAX': {
-                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MAX', context.api);
+                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MAX', context.adaptableApi);
                     const timeframeChange$ = getTrailingRowValueChange$(dataChangeLog$, timeframeParameter.value);
                     return getDataChangeMax$(dataChangeLog$, timeframeChange$);
                 }
@@ -71,12 +71,12 @@ exports.observableExpressionFunctions = {
                     return getDataChangeCount$(dataChangeLog$, timeframeChange$, operandParameter.value);
                 }
                 case 'MIN': {
-                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MIN', context.api);
+                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MIN', context.adaptableApi);
                     const timeframeChange$ = getTrailingGridValueChange$(dataChangeLog$, timeframeParameter.value);
                     return getDataChangeMin$(dataChangeLog$, timeframeChange$);
                 }
                 case 'MAX': {
-                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MAX', context.api);
+                    expressionFunctionUtils_1.validateColumnType(operandParameter.column, ['Number'], 'MAX', context.adaptableApi);
                     const timeframeChange$ = getTrailingGridValueChange$(dataChangeLog$, timeframeParameter.value);
                     return getDataChangeMax$(dataChangeLog$, timeframeChange$);
                 }
@@ -229,11 +229,11 @@ const getDataChangedInfoStub = (context) => {
     var _a;
     let rowNodeStub;
     if (!context.filterFn) {
-        rowNodeStub = context.api.gridApi.getFirstRowNode();
+        rowNodeStub = context.adaptableApi.gridApi.getFirstRowNode();
     }
     else {
         // if there is a WHERE clause defined, find the first rowNode which satisfies the condition
-        context.api.internalApi.forAllRowNodesDo((rowNode) => {
+        context.adaptableApi.internalApi.forAllRowNodesDo((rowNode) => {
             if (!rowNodeStub) {
                 if (context.filterFn(rowNode)) {
                     rowNodeStub = rowNode;
@@ -243,10 +243,10 @@ const getDataChangedInfoStub = (context) => {
     }
     const rowNode = rowNodeStub;
     if (rowNode) {
-        const primaryKeyValue = context.api.gridApi.getPrimaryKeyValueForRowNode(rowNode);
-        const columnId = (_a = context.api.columnApi.getQueryableColumns()[0]) === null || _a === void 0 ? void 0 : _a.columnId;
-        const oldValue = context.api.gridApi.getCellRawValue(primaryKeyValue, columnId);
-        const column = context.api.columnApi.getColumnFromId(columnId);
+        const primaryKeyValue = context.adaptableApi.gridApi.getPrimaryKeyValueForRowNode(rowNode);
+        const columnId = (_a = context.adaptableApi.columnApi.getQueryableColumns()[0]) === null || _a === void 0 ? void 0 : _a.columnId;
+        const oldValue = context.adaptableApi.gridApi.getCellRawValue(primaryKeyValue, columnId);
+        const column = context.adaptableApi.columnApi.getColumnFromId(columnId);
         const newValue = oldValue;
         return {
             changedAt: Date.now(),
@@ -417,7 +417,7 @@ const getSlidingTimeframe$ = (source$, timeframeDuration, onTimeframeEnter, onTi
     }));
 };
 const getMaxTimeframeSize = (expressionValue, context) => {
-    let maxTimeframeSize = context.api.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
+    let maxTimeframeSize = context.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
         .maxTimeframeSize;
     if (maxTimeframeSize > SYSTEM_MAX_TIMEFRAME_SIZE) {
         maxTimeframeSize = SYSTEM_MAX_TIMEFRAME_SIZE;

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -95,14 +95,14 @@ exports.scalarExpressionFunctions = {
         handler(args, context) {
             var _a, _b;
             const columnId = args[0];
-            const column = (_a = context.api) === null || _a === void 0 ? void 0 : _a.columnApi.getColumnFromId(columnId);
+            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`);
             }
             if (!column.queryable) {
                 throw new ExpressionEvaluationError_1.ExpressionEvaluationError('COL', `Column name "${columnId}" is not queryable`);
             }
-            return (_b = context.api) === null || _b === void 0 ? void 0 : _b.gridApi.getRawValueFromRowNode(context.node, columnId);
+            return (_b = context.adaptableApi) === null || _b === void 0 ? void 0 : _b.gridApi.getRawValueFromRowNode(context.node, columnId);
         },
         description: 'Returns the value of a column',
         signatures: ['[colName]', 'COL(name: string)'],

package/src/Utilities/Services/QueryLanguageService.js

@@ -19,7 +19,7 @@ class QueryLanguageService {
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         return parser.evaluate(expression, {
             node: rowNode,
-            api: this.adaptableApi,
+            adaptableApi: this.adaptableApi,
             functions: booleanAndScalarFunctions,
         });
     }
@@ -31,7 +31,7 @@ class QueryLanguageService {
         const aggregatedScalarFunctions = this.getModuleExpressionFunctions(module).aggregatedScalarFunctions;
         return parser.evaluate(expression, {
             node: null,
-            api: this.adaptableApi,
+            adaptableApi: this.adaptableApi,
             functions: aggregatedScalarFunctions,
         });
     }
@@ -40,7 +40,7 @@ class QueryLanguageService {
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         const reactiveExpression$ = parser.evaluate(reactiveExpression, {
             node: reactiveExpression,
-            api: this.adaptableApi,
+            adaptableApi: this.adaptableApi,
             functions: moduleExpressionFunctions.observableFunctions,
             whereClauseFunctions: booleanAndScalarFunctions,
         });
@@ -51,7 +51,7 @@ class QueryLanguageService {
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         const aggregationExpression$ = parser.evaluate(aggregationExpression, {
             node: aggregationExpression,
-            api: this.adaptableApi,
+            adaptableApi: this.adaptableApi,
             functions: moduleExpressionFunctions.aggregatedBooleanFunctions,
             whereClauseFunctions: booleanAndScalarFunctions,
         });

package/src/Utilities/Services/ReportService.js

@@ -339,7 +339,7 @@ class ReportService {
         return type === 'rawValue'
             ? cellRawValue
             : // type === formattedValue
-                this.adaptableApi.gridApi.getFormattedValueFromRawValue(rowNode, columnId, cellRawValue);
+                this.adaptableApi.gridApi.getDisplayValueFromRawValue(rowNode, columnId, cellRawValue);
     }
     computeCellExportValueFormat(columnDataType) {
         const exportOptions = this.adaptableApi.internalApi.getAdaptableOptions().exportOptions;

package/src/Utilities/Services/RowEditService.js

@@ -189,7 +189,10 @@ class RowEditService {
                     adaptableApi,
                 })
                 : Object.assign({}, formData);
-            adaptableApi.gridApi.addGridData([newRowData], { addIndex: 0 });
+            const config = {
+                addIndex: 0,
+            };
+            adaptableApi.gridApi.addGridData([newRowData], config);
         }
     }
 }

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/AdaptableOptionsForm.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import { AdaptableOptions } from '../../../types';
+interface AdaptableOptionsFormOptions {
+    adaptableOptions: AdaptableOptions;
+    onChangeadaptableOptions: (adaptableOptions: AdaptableOptions) => void;
+}
+declare const AdaptableOptionsForm: (props: AdaptableOptionsFormOptions) => JSX.Element;
+export default AdaptableOptionsForm;

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/{ConfigurationForm.js → AdaptableOptionsForm.js}

@@ -8,17 +8,13 @@ const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlo
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const rebass_1 = require("rebass");
 const DefaultAdaptableOptions_1 = require("../../../Utilities/Defaults/DefaultAdaptableOptions");
-const ConfigurationForm = (props) => {
-    var _a, _b, _c;
+const AdaptableOptionsForm = (props) => {
+    var _a, _b;
     let abOptions = props.adaptableOptions;
     const layoutOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.layoutOptions), abOptions.layoutOptions);
     const generalOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.generalOptions), abOptions.generalOptions);
     const adaptableQLOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions), abOptions.adaptableQLOptions);
-    const userInterfaceOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.userInterfaceOptions), abOptions.userInterfaceOptions);
-    const searchOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.searchOptions), abOptions.searchOptions);
     const filterOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.filterOptions), abOptions.filterOptions);
-    // we are 'hard-coding' this to use AG Grid but so does helper so ok for now and we can refactor when Adaptable Grid is ready
-    const gridOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.gridOptions), abOptions.gridOptions);
     return (React.createElement(React.Fragment, null,
         React.createElement(HelpBlock_1.default, null, "Base Options"),
         React.createElement(FormLayout_1.default, { margin: 2, columns: [{ name: 'label', style: { textAlign: 'start' } }, { name: 'children' }] },
@@ -36,38 +32,6 @@ const ConfigurationForm = (props) => {
                         abOptions.generalOptions.showMissingPrimaryKeyAlert = showMissingPrimaryKeyWarning;
                         props.onChangeadaptableOptions(abOptions);
                     } }))),
-        React.createElement(HelpBlock_1.default, null, "Grid Options"),
-        React.createElement(FormLayout_1.default, { margin: 2, columns: [{ name: 'children' }, { name: 'label', style: { textAlign: 'start' } }] },
-            React.createElement(FormLayout_1.FormRow, { label: "Enable Range Selection" },
-                React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.enableRangeSelection, onChange: (enableRangeSelection) => {
-                        abOptions = Object.assign({}, abOptions);
-                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
-                        abOptions.gridOptions.enableRangeSelection = enableRangeSelection;
-                        props.onChangeadaptableOptions(abOptions);
-                    } })),
-            React.createElement(FormLayout_1.FormRow, { label: "Show Quick Filter" },
-                React.createElement(CheckBox_1.CheckBox, { checked: (_c = gridOptions.defaultColDef) === null || _c === void 0 ? void 0 : _c.floatingFilter, onChange: (floatingFilter) => {
-                        abOptions = Object.assign({}, abOptions);
-                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
-                        abOptions.gridOptions.defaultColDef = {
-                            floatingFilter,
-                        };
-                        props.onChangeadaptableOptions(abOptions);
-                    } })),
-            React.createElement(FormLayout_1.FormRow, { label: "Suppress Column Virtualisation" },
-                React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.suppressColumnVirtualisation, onChange: (suppressColumnVirtualisation) => {
-                        abOptions = Object.assign({}, abOptions);
-                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
-                        abOptions.gridOptions.suppressColumnVirtualisation = suppressColumnVirtualisation;
-                        props.onChangeadaptableOptions(abOptions);
-                    } })),
-            React.createElement(FormLayout_1.FormRow, { label: "Show Column Menu Button" },
-                React.createElement(CheckBox_1.CheckBox, { checked: gridOptions.suppressMenuHide, onChange: (suppressMenuHide) => {
-                        abOptions = Object.assign({}, abOptions);
-                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
-                        abOptions.gridOptions.suppressMenuHide = suppressMenuHide;
-                        props.onChangeadaptableOptions(abOptions);
-                    } }))),
         React.createElement(HelpBlock_1.default, null, "Layout Options"),
         React.createElement(FormLayout_1.default, { margin: 2, columns: [{ name: 'children' }, { name: 'label', style: { textAlign: 'start' } }] },
             React.createElement(FormLayout_1.FormRow, { label: "Auto Save Layouts" },
@@ -134,4 +98,4 @@ const ConfigurationForm = (props) => {
                         props.onChangeadaptableOptions(abOptions);
                     }, value: filterOptions.maxFilterValuesToDisplay, marginRight: 3 })))));
 };
-exports.default = ConfigurationForm;
+exports.default = AdaptableOptionsForm;

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizard.js

@@ -7,7 +7,8 @@ const react_1 = require("react");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/StringExtensions"));
 const OnePageWizards_1 = require("../../Wizard/OnePageWizards");
 const ConfigurationWizardColumnsStep_1 = require("./ConfigurationWizardColumnsStep");
-const ConfigurationForm_1 = tslib_1.__importDefault(require("./ConfigurationForm"));
+const GridOptionsForm_1 = tslib_1.__importDefault(require("./GridOptionsForm"));
+const AdaptableOptionsForm_1 = tslib_1.__importDefault(require("./AdaptableOptionsForm"));
 const ConfigurationWizard = (props) => {
     const [isPrimaryKeySelected, setIsValid] = React.useState(true);
     const [adaptableOptions, setAdaptableOptions] = react_1.useState(props.adaptableOptions);
@@ -50,7 +51,7 @@ const ConfigurationWizard = (props) => {
     let sections = [
         {
             title: 'Columns',
-            details: 'Configure Adaptable',
+            details: 'Configure Columns',
             isValid: () => {
                 if (!isPrimaryKeySelected) {
                     return 'Primary key column must be included';
@@ -65,10 +66,33 @@ const ConfigurationWizard = (props) => {
             title: 'Adaptable Options',
             details: 'Configure Adaptable Options',
             isValid: () => (adaptableOptions.adaptableId ? true : 'Adaptable ID is required'),
-            render: () => (React.createElement(ConfigurationForm_1.default, { adaptableOptions: adaptableOptions, onChangeadaptableOptions: (abOptions) => {
+            render: () => (React.createElement(AdaptableOptionsForm_1.default, { adaptableOptions: adaptableOptions, onChangeadaptableOptions: (abOptions) => {
                     setAdaptableOptions(abOptions);
                 } })),
         },
+        {
+            title: 'Grid Options',
+            details: 'Configure AG Grid Options',
+            render: () => (React.createElement(GridOptionsForm_1.default, { adaptableOptions: adaptableOptions, onChangeadaptableOptions: (abOptions) => {
+                    setAdaptableOptions(abOptions);
+                } })),
+        },
+        // JW - I would like at some point to do a page of Entitlements
+        // to show all the Modules and let users select which are Full, ReadOnly or Hidden
+        /*
+        {
+          title: 'Entitlements',
+          details: 'Configure Entitlements',
+          render: () => (
+            <EntitlementsForm
+              adaptableOptions={adaptableOptions}
+              onChangeadaptableOptions={(abOptions) => {
+                setAdaptableOptions(abOptions);
+              }}
+            />
+          ),
+        },
+        */
     ];
     if (props.startSections) {
         sections = [

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/{ConfigurationForm.d.ts → EntitlementsForm.d.ts}

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import { AdaptableOptions } from '../../../types';
-interface ConfigurationFormOptions {
+interface EntitlementsFormOptions {
     adaptableOptions: AdaptableOptions;
     onChangeadaptableOptions: (adaptableOptions: AdaptableOptions) => void;
 }
-declare const ConfigurationForm: (props: ConfigurationFormOptions) => JSX.Element;
-export default ConfigurationForm;
+declare const EntitlementsForm: (props: EntitlementsFormOptions) => JSX.Element;
+export default EntitlementsForm;

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/EntitlementsForm.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
+const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlock"));
+const DefaultAdaptableOptions_1 = require("../../../Utilities/Defaults/DefaultAdaptableOptions");
+const EntitlementsForm = (props) => {
+    let abOptions = props.adaptableOptions;
+    const entitlementOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.entitlementOptions), abOptions.entitlementOptions);
+    const gridOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.gridOptions), abOptions.gridOptions);
+    return (React.createElement(React.Fragment, null,
+        React.createElement(HelpBlock_1.default, null, "EntitlementOptions Options"),
+        React.createElement(FormLayout_1.default, { margin: 2, columns: [{ name: 'children' }, { name: 'label', style: { textAlign: 'start' } }] },
+            React.createElement(FormLayout_1.FormRow, { label: "Entitlements to be set here" }))));
+};
+exports.default = EntitlementsForm;

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/GridOptionsForm.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import { AdaptableOptions } from '../../../types';
+interface GridOptionsFormOptions {
+    adaptableOptions: AdaptableOptions;
+    onChangeadaptableOptions: (adaptableOptions: AdaptableOptions) => void;
+}
+declare const GridOptionsForm: (props: GridOptionsFormOptions) => JSX.Element;
+export default GridOptionsForm;