@adaptabletools/adaptable 15.4.2 → 16.0.0-canary.0

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

@@ -1,4 +1,7 @@
 import { AdaptableModule } from './Types';
+/**
+ * Defines a Permission in AdapTable - Module and Access Level
+ */
 export interface Entitlement {
     /**
      * Name of Adaptable Module that has the Entitlement applied
@@ -10,6 +13,6 @@ export interface Entitlement {
     accessLevel: AccessLevel;
 }
 /**
- * Defines Access Level for an Entitlement - can be `ReadOnly`, `Hidden` or `Full`
+ * Defines Access Level for an Entitlement: `ReadOnly`, `Hidden` or `Full`
  */
 export declare type AccessLevel = 'ReadOnly' | 'Hidden' | 'Full';

package/src/PredefinedConfig/LayoutState.d.ts

@@ -68,12 +68,6 @@ export interface Layout extends AdaptableObject {
     PinnedColumnsMap?: {
         [columnId: string]: 'left' | 'right';
     };
-    /**
-     * Whether Layout should automatically save or not - overrides `autoSaveLayouts` property in LayoutOptions
-     *
-     * @deprecated - use `autoSaveLayouts` property in LayoutOptions instead, will be removed in next major version
-     */
-    AutoSave?: boolean;
     /**
      * Set of custom header names for some (or all columns)
      */

package/src/PredefinedConfig/StyledColumnState.d.ts

@@ -69,6 +69,9 @@ export interface PercentBarStyle extends NumericStyledColumn {
      */
     BackColor?: string;
 }
+/**
+ * Base type for Numeric Styled Columns (i.e. Gradient and Percent Bar)
+ */
 export interface NumericStyledColumn {
     /**
      * Ranges (e.g. to create traffic light effect)

package/src/PredefinedConfig/SystemState.d.ts

@@ -87,7 +87,7 @@ export interface SystemState extends InternalState, IPushPullState, Glue42State,
         previousGroupedColumns: Record<string, Record<string, number>>;
     };
     /**
-     * Equivalent of `GeneralOptions.disableDeleteConfirmation`
+     * Equivalent of `UserInterfaceOptions.disableDeleteConfirmation`
      * It will suppress the deletion confirmation dialog in the current session.
      */
     DisableDeleteConfirmation: boolean;

package/src/PredefinedConfig/TeamSharingState.d.ts

@@ -78,7 +78,7 @@ export interface AdaptableSharedEntity extends AdaptableObject {
     Type: SharedEntityType;
 }
 /**
- *
+ * Defines a Custom object that will be shared using Team Sharing
  */
 export interface CustomSharedEntity<T = any> {
     /**

package/src/PredefinedConfig/ThemeState.d.ts

@@ -38,5 +38,8 @@ export interface AdaptableTheme extends AdaptableObject {
      * Variables to be applied at runtime
      */
     CSSVariables?: Record<string, string>;
+    /**
+     * Whether theme is based on system Light or Dark Themes
+     */
     Variant?: 'light' | 'dark';
 }

package/src/Strategy/AdaptableModuleBase.js

@@ -244,9 +244,9 @@ class AdaptableModuleBase {
     }
     getFriendlyName(module, friendlyName) {
         let returnValue = friendlyName;
-        let generalOptions = this.api.optionsApi.getGeneralOptions();
-        if (generalOptions && ArrayExtensions_1.default.IsNotNullOrEmpty(generalOptions.alternativeModuleNames)) {
-            generalOptions.alternativeModuleNames.forEach((af) => {
+        let userInterfaceOptions = this.api.optionsApi.getUserInterfaceOptions();
+        if (userInterfaceOptions && ArrayExtensions_1.default.IsNotNullOrEmpty(userInterfaceOptions.alternativeModuleNames)) {
+            userInterfaceOptions.alternativeModuleNames.forEach((af) => {
                 if (module == af.adaptableModule) {
                     returnValue = af.newName;
                 }

package/src/Strategy/AlertModule.js

@@ -58,9 +58,9 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.alertApi.getAlertDefinitions(config);
     }
     getExplicitlyReferencedColumnIds(alertDefinition) {
-        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.expressionApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (queryExpression) {
-            return this.api.queryLanguageApi.getColumnsFromExpression(queryExpression);
+            return this.api.expressionApi.getColumnsFromExpression(queryExpression);
         }
         else if (this.api.scopeApi.scopeHasColumns(alertDefinition.Scope)) {
             return this.api.scopeApi
@@ -70,7 +70,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return [];
     }
     getReferencedNamedQueryNames(alertDefinition) {
-        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.expressionApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (!queryExpression) {
             return [];
         }

package/src/Strategy/CalculatedColumnModule.js

@@ -46,11 +46,11 @@ class CalculatedColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getExplicitlyReferencedColumnIds(calculatedColumn) {
         var _a;
-        return ((_a = this.api.queryLanguageApi.getColumnsFromExpression(this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
+        return ((_a = this.api.expressionApi.getColumnsFromExpression(this.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
     }
     getReferencedNamedQueryNames(calculatedColumn) {
         var _a;
-        return ((_a = this.api.queryApi.internalApi.getReferencedNamedQueryNames(this.api.queryLanguageApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
+        return ((_a = this.api.queryApi.internalApi.getReferencedNamedQueryNames(this.api.expressionApi.getAdaptableQueryExpression(calculatedColumn.Query))) !== null && _a !== void 0 ? _a : []);
     }
     isCalculatedColumn(column) {
         return (column &&

package/src/Strategy/CellSummaryModule.js

@@ -105,6 +105,8 @@ class CellSummaryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         numericValues,
                         numericColumns,
                         adaptableApi: this.api,
+                        userName: this.api.optionsApi.getUserName(),
+                        adaptableId: this.api.optionsApi.getAdaptableId(),
                     };
                     selectedCellSummary[operation.operationName] = operation.operationFunction(cellSummaryOperationContext);
                 }

package/src/Strategy/DataSetModule.d.ts

@@ -2,7 +2,7 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
-import { DataSet } from '../AdaptableOptions/GeneralOptions';
+import { DataSet } from '../AdaptableOptions/DataSetOptions';
 export declare class DataSetModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     handleAdaptableReady(): void;

package/src/Strategy/DataSetModule.js

@@ -21,7 +21,7 @@ class DataSetModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getModuleAdaptableObjects() {
         var _a, _b;
-        return (_b = (_a = this.api.optionsApi.getGeneralOptions()) === null || _a === void 0 ? void 0 : _a.dataSets) !== null && _b !== void 0 ? _b : [];
+        return (_b = (_a = this.api.optionsApi.getDataSetOptions()) === null || _a === void 0 ? void 0 : _a.dataSets) !== null && _b !== void 0 ? _b : [];
     }
     hasNamedQueryReferences() {
         return false;

package/src/Strategy/ExportModule.js

@@ -178,6 +178,8 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         report: report,
                         reportData,
                         adaptableApi: this.api,
+                        userName: this.api.optionsApi.getUserName(),
+                        adaptableId: this.api.optionsApi.getAdaptableId(),
                     };
                     customDestination.onExport(reportContext);
                 }
@@ -215,6 +217,8 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return preProcessExportFn({
                 report,
                 adaptableApi: this.api,
+                userName: this.api.optionsApi.getUserName(),
+                adaptableId: this.api.optionsApi.getAdaptableId(),
                 getReportColumns: (includePrimaryKey) => {
                     return this.api.internalApi
                         .getReportService()

package/src/Strategy/FlashingCellModule.js

@@ -59,9 +59,9 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.flashingCellApi.getFlashingCellDefinitions(config);
     }
     getExplicitlyReferencedColumnIds(alertDefinition) {
-        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.expressionApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (queryExpression) {
-            return this.api.queryLanguageApi.getColumnsFromExpression(queryExpression);
+            return this.api.expressionApi.getColumnsFromExpression(queryExpression);
         }
         else if (this.api.scopeApi.scopeHasColumns(alertDefinition.Scope)) {
             return this.api.scopeApi
@@ -71,7 +71,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return [];
     }
     getReferencedNamedQueryNames(alertDefinition) {
-        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule);
+        const queryExpression = this.api.expressionApi.getAdaptableQueryExpression(alertDefinition.Rule);
         if (!queryExpression) {
             return [];
         }
@@ -198,7 +198,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     if (!rowNode) {
                         rowNode = this.api.gridApi.getRowNodeForPrimaryKey(dataChangedEvent.primaryKeyValue);
                     }
-                    const isValidExpression = this.api.queryLanguageApi.isValidBooleanExpression(expression, this.moduleInfo.ModuleName, `Invalid Alert boolean expression '${expression}'`);
+                    const isValidExpression = this.api.expressionApi.isValidBooleanExpression(expression, this.moduleInfo.ModuleName, `Invalid Alert boolean expression '${expression}'`);
                     const isSatisfiedExpression = isValidExpression &&
                         this.api.internalApi
                             .getQueryLanguageService()

package/src/Strategy/FormatColumnModule.js

@@ -25,9 +25,9 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.formatColumnApi.getFormatColumns(config);
     }
     getExplicitlyReferencedColumnIds(formatColumn) {
-        const queryExpression = formatColumn.Rule && this.api.queryLanguageApi.getAdaptableQueryExpression(formatColumn.Rule);
+        const queryExpression = formatColumn.Rule && this.api.expressionApi.getAdaptableQueryExpression(formatColumn.Rule);
         if (queryExpression) {
-            return this.api.queryLanguageApi.getColumnsFromExpression(queryExpression);
+            return this.api.expressionApi.getColumnsFromExpression(queryExpression);
         }
         else if (this.api.scopeApi.scopeHasColumns(formatColumn.Scope)) {
             return this.api.scopeApi
@@ -37,7 +37,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return [];
     }
     getReferencedNamedQueryNames(formatColumn) {
-        const queryExpression = formatColumn.Rule && this.api.queryLanguageApi.getAdaptableQueryExpression(formatColumn.Rule);
+        const queryExpression = formatColumn.Rule && this.api.expressionApi.getAdaptableQueryExpression(formatColumn.Rule);
         if (!queryExpression) {
             return [];
         }

package/src/Strategy/QueryModule.js

@@ -23,7 +23,7 @@ class QueryModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         };
     }
     getExplicitlyReferencedColumnIds(namedQuery) {
-        return this.api.queryLanguageApi.getColumnsFromExpression(namedQuery.BooleanExpression);
+        return this.api.expressionApi.getColumnsFromExpression(namedQuery.BooleanExpression);
     }
     getReferencedNamedQueryNames(namedQuery) {
         return this.api.queryApi.internalApi.getReferencedNamedQueryNames(namedQuery.BooleanExpression);

package/src/Strategy/SmartEditModule.js

@@ -127,6 +127,8 @@ class SmartEditModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                                 smartEditValue: smartEditValue,
                                 currentCell: selectedCell,
                                 adaptableApi: this.api,
+                                userName: this.api.optionsApi.getUserName(),
+                                adaptableId: this.api.optionsApi.getAdaptableId(),
                             };
                             newValue = smartEditOperation.operation(context);
                         }

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -26,6 +26,7 @@ exports.DefaultAdaptableOptions = {
         dataChangeDetectionPolicy: 'rawValue',
         actionHandlers: undefined,
         alertMessageText: undefined,
+        showMissingPrimaryKeyAlert: false,
     },
     notificationsOptions: {
         maxNotifications: 3,
@@ -56,9 +57,8 @@ exports.DefaultAdaptableOptions = {
     adaptableQLOptions: {
         caseSensitiveTextComparisons: false,
         evaluateAdaptableQLExternally: undefined,
-        customPredicateDefs: [],
-        displayColumnFriendlyNamesForExpressions: true,
         expressionOptions: {
+            displayColumnFriendlyNamesForExpressions: true,
             systemBooleanFunctions: undefined,
             systemScalarFunctions: undefined,
             systemObservableFunctions: undefined,
@@ -69,6 +69,7 @@ exports.DefaultAdaptableOptions = {
             maxTimeframeSize: 28800000, // 8 hours
         },
         predicateOptions: {
+            customPredicateDefs: [],
             systemFilterPredicates: AdaptablePredicate_1.SystemFilterPredicateIds,
             systemAlertPredicates: AdaptablePredicate_1.SystemAlertPredicateIds,
             systemFormatColumnPredicates: AdaptablePredicate_1.SystemFormatColumnPredicateIds,
@@ -76,6 +77,8 @@ exports.DefaultAdaptableOptions = {
             systemBadgeStylePredicates: AdaptablePredicate_1.SystemBadgeStylePredicateIds,
         },
     },
+    calendarOptions: { holidays: undefined },
+    cellSummaryOptions: { cellSummaryOperations: undefined },
     containerOptions: {
         adaptableContainer: 'adaptable',
         agGridContainer: 'grid',
@@ -89,7 +92,6 @@ exports.DefaultAdaptableOptions = {
         columnTypes: GeneralConstants_1.EMPTY_ARRAY,
         showMissingColumnsWarning: true,
         autoOrderGroupedColumns: true,
-        hideColumnWhenGrouped: false,
     },
     dashboardOptions: {
         canFloat: true,
@@ -98,22 +100,24 @@ exports.DefaultAdaptableOptions = {
         customToolbars: undefined,
         buttonsLocation: 'right',
     },
-    actionOptions: {
+    actionColumnOptions: {
         actionColumns: undefined,
+    },
+    actionRowOptions: {
         actionRowButtons: undefined,
+        autoHandle: true,
+        disableInlineEditing: false,
         actionRowButtonOptions: {
             customConfiguration: undefined,
             position: 'pinnedLeft',
-            autoHandle: true,
             setPrimaryKeyValue: undefined,
-            disableInlineEditing: false,
-            actionRowFormOptions: {
-                formTitle: undefined,
-                formDescription: undefined,
-                formFieldLabel: undefined,
-                formButtons: undefined,
-                onFormSubmit: undefined,
-            },
+        },
+        actionRowFormOptions: {
+            formTitle: undefined,
+            formDescription: undefined,
+            formFieldLabel: undefined,
+            formButtons: undefined,
+            onFormSubmit: undefined,
         },
     },
     editOptions: {
@@ -130,7 +134,7 @@ exports.DefaultAdaptableOptions = {
         exportFormatType: 'rawValue',
         exportDateFormat: undefined,
         customDestinations: undefined,
-        serverReports: undefined,
+        externalReports: undefined,
         appendFileTimestamp: false,
         systemExportDestinations: [
             Enums_1.ExportDestination.Excel,
@@ -147,17 +151,12 @@ exports.DefaultAdaptableOptions = {
             GeneralConstants.SELECTED_ROWS_REPORT,
         ],
     },
-    generalOptions: {
-        showMissingPrimaryKeyAlert: false,
-        dataSets: GeneralConstants_1.EMPTY_ARRAY,
+    customSortOptions: { customSortComparers: undefined },
+    dataSetOptions: { dataSets: GeneralConstants_1.EMPTY_ARRAY },
+    groupingOptions: {
         showGroupingTotalsAsHeader: false,
-        alternativeModuleNames: undefined,
-        cellSummaryOperations: undefined,
-        customSortComparers: undefined,
-        englishVariant: 'GB',
         unbalancedGroupsKey: undefined,
         restoreUngroupedColumns: false,
-        disableDeleteConfirmation: false,
     },
     layoutOptions: {
         displayRowGroups: 'closed',
@@ -245,8 +244,11 @@ exports.DefaultAdaptableOptions = {
         suppressOverrideConfigWarning: false,
     },
     userInterfaceOptions: {
+        alternativeModuleNames: undefined,
         applicationIcon: undefined,
         useCustomMacLikeScrollbars: false,
+        englishVariant: 'GB',
+        disableDeleteConfirmation: false,
         dateInputOptions: {
             useNativeInput: false,
             dateFormat: 'yyyy-MM-dd',

package/src/Utilities/ExpressionFunctions/expressionFunctionUtils.js

@@ -41,6 +41,8 @@ const handleWhereFunction = (args, context) => {
         // whereClauseResult
         return (0, evaluator_1.evaluateNode)(whereClauseExpressionNode, {
             node: rowNode,
+            userName: context.adaptableApi.optionsApi.getUserName(),
+            adaptableId: context.adaptableApi.optionsApi.getAdaptableId(),
             adaptableApi: context.adaptableApi,
             functions: context.whereClauseFunctions,
             evaluateCustomQueryVariable: context.adaptableApi.internalApi.getQueryLanguageService().evaluateCustomQueryVariable,
@@ -54,6 +56,8 @@ const evaluateExpressionNode = (expressionNode, context, filterFn = context.filt
     return (0, evaluator_1.evaluateNode)(expressionNode, {
         node: context.node,
         adaptableApi: context.adaptableApi,
+        userName: context.adaptableApi.optionsApi.getUserName(),
+        adaptableId: context.adaptableApi.optionsApi.getAdaptableId(),
         functions: context.functions,
         filterFn,
         evaluateCustomQueryVariable: context.adaptableApi.internalApi.getQueryLanguageService().evaluateCustomQueryVariable,

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -12,7 +12,11 @@ function assignAdaptableOptions(adaptableOptions) {
     returnedAdaptableOptions.adaptableStateKey =
         (_a = returnedAdaptableOptions.adaptableStateKey) !== null && _a !== void 0 ? _a : returnedAdaptableOptions.adaptableId;
     returnedAdaptableOptions.adaptableQLOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions, adaptableOptions.adaptableQLOptions);
+    returnedAdaptableOptions.calendarOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.calendarOptions, adaptableOptions.calendarOptions);
     returnedAdaptableOptions.columnOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.columnOptions, adaptableOptions.columnOptions);
+    returnedAdaptableOptions.customSortOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.customSortOptions, adaptableOptions.customSortOptions);
+    returnedAdaptableOptions.dataSetOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dataSetOptions, adaptableOptions.dataSetOptions);
+    returnedAdaptableOptions.cellSummaryOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.cellSummaryOptions, adaptableOptions.cellSummaryOptions);
     returnedAdaptableOptions.adaptableQLOptions.expressionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions.expressionOptions, returnedAdaptableOptions.adaptableQLOptions.expressionOptions);
     returnedAdaptableOptions.adaptableQLOptions.predicateOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions.predicateOptions, returnedAdaptableOptions.adaptableQLOptions.predicateOptions);
     returnedAdaptableOptions.layoutOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.layoutOptions, adaptableOptions.layoutOptions);
@@ -22,12 +26,14 @@ function assignAdaptableOptions(adaptableOptions) {
     returnedAdaptableOptions.entitlementOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.entitlementOptions, adaptableOptions.entitlementOptions);
     returnedAdaptableOptions.dashboardOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dashboardOptions, adaptableOptions.dashboardOptions);
     returnedAdaptableOptions.editOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.editOptions, adaptableOptions.editOptions);
-    returnedAdaptableOptions.actionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.actionOptions, adaptableOptions.actionOptions);
-    returnedAdaptableOptions.actionOptions.actionRowButtonOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.actionOptions.actionRowButtonOptions, returnedAdaptableOptions.actionOptions.actionRowButtonOptions);
-    returnedAdaptableOptions.actionOptions.actionRowButtonOptions.actionRowFormOptions =
-        Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.actionOptions.actionRowButtonOptions.actionRowFormOptions, returnedAdaptableOptions.actionOptions.actionRowButtonOptions.actionRowFormOptions);
+    returnedAdaptableOptions.actionColumnOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.actionColumnOptions, adaptableOptions.actionColumnOptions);
+    // to do
+    returnedAdaptableOptions.actionRowOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.actionRowOptions, adaptableOptions.actionRowOptions);
+    returnedAdaptableOptions.actionRowOptions.actionRowButtonOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.actionRowOptions.actionRowButtonOptions, returnedAdaptableOptions.actionRowOptions.actionRowButtonOptions);
+    returnedAdaptableOptions.actionRowOptions.actionRowFormOptions =
+        Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.actionRowOptions.actionRowFormOptions, returnedAdaptableOptions.actionRowOptions.actionRowFormOptions);
     returnedAdaptableOptions.containerOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.containerOptions, adaptableOptions.containerOptions);
-    returnedAdaptableOptions.generalOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.generalOptions, adaptableOptions.generalOptions);
+    returnedAdaptableOptions.groupingOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.groupingOptions, adaptableOptions.groupingOptions);
     returnedAdaptableOptions.searchOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.searchOptions, adaptableOptions.searchOptions);
     returnedAdaptableOptions.filterOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.filterOptions, adaptableOptions.filterOptions);
     returnedAdaptableOptions.userInterfaceOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.userInterfaceOptions, adaptableOptions.userInterfaceOptions);
@@ -68,7 +74,7 @@ function checkValidPrimaryKey(adaptable) {
     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) {
+        if (adaptable.adaptableOptions.alertOptions.showMissingPrimaryKeyAlert == true) {
             // show an alert if that is the option
             adaptable.api.alertApi.showAlertError('No Primary Key', errorMessage);
         }

package/src/Utilities/Helpers/FormatHelper.js

@@ -36,6 +36,13 @@ function NumberFormatter(input, options = {}) {
         n *= multiplier;
         n = parseFloat(n.toFixed(12));
     }
+    // Set Integer and Fraction Digits to a max of 20
+    if (options.IntegerDigits > 20) {
+        options.IntegerDigits = 20;
+    }
+    if (options.FractionDigits > 20) {
+        options.FractionDigits = 20;
+    }
     if (options.Parentheses === true && preparedInput < 0) {
         n *= -1;
         n = parseFloat(n.toFixed(12));

package/src/Utilities/ObjectFactory.d.ts

@@ -39,7 +39,7 @@ export declare function CreateEmptyAlertDefinition(): AlertDefinition;
 export declare function CreateEmptyFlashingCellDefinition(): FlashingCellDefinition;
 export declare function CreateInternalAlertDefinitionForMessages(messageType: AdaptableMessageType, alertProperties?: AlertProperties): AlertDefinition;
 export declare function CreateEmptyReport(): Report;
-export declare function CreateServerReport(reportName: string): Report;
+export declare function CreateExternalReport(reportName: string): Report;
 export declare function CreateEmptyBaseSchedule(scheduleType: ScheduleType): BaseSchedule;
 export declare function CreateEmptyReminderSchedule(): ReminderSchedule;
 export declare function CreateEmptyReportSchedule(): ReportSchedule;
@@ -85,7 +85,7 @@ export declare const ObjectFactory: {
     CreateEmptyAlertDefinition: typeof CreateEmptyAlertDefinition;
     CreateEmptyFlashingCellDefinition: typeof CreateEmptyFlashingCellDefinition;
     CreateInternalAlertDefinitionForMessages: typeof CreateInternalAlertDefinitionForMessages;
-    CreateServerReport: typeof CreateServerReport;
+    CreateExternalReport: typeof CreateExternalReport;
     CreateEmptyReport: typeof CreateEmptyReport;
     CreateEmptyBaseSchedule: typeof CreateEmptyBaseSchedule;
     CreateEmptyReminderSchedule: typeof CreateEmptyReminderSchedule;

package/src/Utilities/ObjectFactory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateEmptyTheme = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyChartDefinition = exports.CreateDefaultStyledColumnBadge = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateServerReport = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
+exports.ObjectFactory = exports.CreateToastOptions = exports.CreateEmptyTheme = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyChartDefinition = exports.CreateDefaultStyledColumnBadge = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateExternalReport = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
@@ -133,7 +133,7 @@ function CreateEmptyReport() {
     };
 }
 exports.CreateEmptyReport = CreateEmptyReport;
-function CreateServerReport(reportName) {
+function CreateExternalReport(reportName) {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
         Name: reportName,
@@ -143,7 +143,7 @@ function CreateServerReport(reportName) {
         Query: undefined,
     };
 }
-exports.CreateServerReport = CreateServerReport;
+exports.CreateExternalReport = CreateExternalReport;
 function CreateEmptyBaseSchedule(scheduleType) {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
@@ -388,6 +388,8 @@ function CreateCustomDisplayFormatterContext(value, node, abColumn, api) {
         cellValue: value,
         rowNode: node,
         adaptableApi: api,
+        userName: api.optionsApi.getUserName(),
+        adaptableId: api.optionsApi.getAdaptableId(),
     };
 }
 exports.CreateCustomDisplayFormatterContext = CreateCustomDisplayFormatterContext;
@@ -464,7 +466,7 @@ exports.ObjectFactory = {
     CreateEmptyAlertDefinition,
     CreateEmptyFlashingCellDefinition,
     CreateInternalAlertDefinitionForMessages,
-    CreateServerReport,
+    CreateExternalReport,
     CreateEmptyReport,
     CreateEmptyBaseSchedule,
     CreateEmptyReminderSchedule,

package/src/Utilities/Services/AlertService.js

@@ -27,7 +27,7 @@ class AlertService {
         if (!alertDefinition.Rule.ObservableExpression) {
             return;
         }
-        const isValidExpression = this.adaptableApi.queryLanguageApi.isValidObservableExpression(alertDefinition.Rule.ObservableExpression, ModuleConstants_1.AlertModuleId, `Invalid Alert rule with observable expression `);
+        const isValidExpression = this.adaptableApi.expressionApi.isValidObservableExpression(alertDefinition.Rule.ObservableExpression, ModuleConstants_1.AlertModuleId, `Invalid Alert rule with observable expression `);
         if (!isValidExpression) {
             this.adaptableApi.logWarn(`Could NOT create reactive alert due to invalid Rule definition!`, alertDefinition.Rule);
             return;

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -73,7 +73,7 @@ class CalculatedColumnExpressionService {
             }
         }
         catch (e) {
-            this.adaptableApi.logError(`Invalid CalculatedColumn expression ${this.adaptableApi.queryLanguageApi.getAdaptableQueryExpression(calculatedColumnQuery)} :: ${e}`);
+            this.adaptableApi.logError(`Invalid CalculatedColumn expression ${this.adaptableApi.expressionApi.getAdaptableQueryExpression(calculatedColumnQuery)} :: ${e}`);
             return 'Number';
         }
     }
@@ -93,7 +93,7 @@ class CalculatedColumnExpressionService {
             }
         }
         if (calculatedColumnQuery.AggregatedScalarExpression) {
-            const validationResult = this.adaptableApi.queryLanguageApi.isValidAggregatedScalarExpression(calculatedColumnQuery.AggregatedScalarExpression, ModuleConstants_1.CalculatedColumnModuleId);
+            const validationResult = this.adaptableApi.expressionApi.isValidAggregatedScalarExpression(calculatedColumnQuery.AggregatedScalarExpression, ModuleConstants_1.CalculatedColumnModuleId);
             return validationResult;
         }
         // if query has neither a ScalarExpression nor an AggregatedScalarExpression => it can only be false

package/src/Utilities/Services/ChartingService.js

@@ -49,6 +49,8 @@ class ChartingService {
         const chartChangedInfo = {
             chartingOpenState: chartingOpenState,
             adaptableApi: this.api,
+            userName: this.api.optionsApi.getUserName(),
+            adaptableId: this.api.optionsApi.getAdaptableId(),
         };
         this.api.eventApi.emit('ChartChanged', chartChangedInfo);
     }

package/src/Utilities/Services/EntitlementService.js

@@ -30,7 +30,7 @@ class EntitlementService {
             const defaultAccessLevelContext = {
                 userName: adaptableOptions.userName,
                 adaptableId: adaptableOptions.adaptableId,
-                adaptableApi: this.adaptableApi
+                adaptableApi: this.adaptableApi,
             };
             const defaultAccessLevel = typeof entitlementOptions.defaultAccessLevel === 'function'
                 ? entitlementOptions.defaultAccessLevel(defaultAccessLevelContext)
@@ -43,7 +43,7 @@ class EntitlementService {
                         userName: adaptableOptions.userName,
                         adaptableId: adaptableOptions.adaptableId,
                         defaultAccessLevel,
-                        adaptableApi: this.adaptableApi
+                        adaptableApi: this.adaptableApi,
                     };
                     const dynamicModuleEntitlement = moduleEntitlements(entitlementContext);
                     return dynamicModuleEntitlement !== null && dynamicModuleEntitlement !== void 0 ? dynamicModuleEntitlement : defaultAccessLevel;

package/src/Utilities/Services/ModuleService.js

@@ -82,11 +82,11 @@ class ModuleService {
             case 'Alert':
                 return learnUrl + 'handbook-alerting';
             case 'BulkUpdate':
-                return url + 'handbook-editing#bulk-update';
+                return url + 'handbook-editing-bulk-update';
             case 'CalculatedColumn':
                 return learnUrl + 'handbook-calculated-column';
             case 'CellSummary':
-                return learnUrl + 'handbook-summarising#cell-summary-information';
+                return learnUrl + 'handbook-summarising';
             case 'CustomSort':
                 return learnUrl + 'handbook-sorting';
             case 'Dashboard':
@@ -94,7 +94,7 @@ class ModuleService {
             case 'DataSet':
                 return learnUrl + 'handbook-data-sets';
             case 'DataChangeHistory':
-                return learnUrl + 'handbook-monitoring#data-change-history';
+                return learnUrl + 'handbook-monitoring-data-change-history';
             case 'Export':
                 return learnUrl + 'handbook-exporting';
             case 'Filter':
@@ -106,29 +106,29 @@ class ModuleService {
             case 'FreeTextColumn':
                 return learnUrl + 'handbook-freetext-column';
             case 'GridInfo':
-                return learnUrl + 'handbook-monitoring#grid-info-panel';
+                return learnUrl + 'handbook-monitoring-grid-info';
             case 'Layout':
                 return learnUrl + 'handbook-layouts';
             case 'PlusMinus':
-                return learnUrl + 'handbook-editing#plus-minus';
+                return learnUrl + 'handbook-editing-plus-minus';
             case 'Query':
                 return learnUrl + 'handbook-querying';
             case 'QuickSearch':
-                return learnUrl + 'handbook-searching';
+                return learnUrl + 'handbook-quick-search';
             case 'Schedule':
                 return learnUrl + 'handbook-scheduling';
             case 'Shortcut':
-                return learnUrl + 'handbook-editing#shortcuts';
+                return learnUrl + 'handbook-editing-shortcut';
             case 'SmartEdit':
-                return learnUrl + 'handbook-editing#smart-edit';
+                return learnUrl + 'handbook-editing-smart-edit';
             case 'StateManagement':
                 return learnUrl + 'dev-guide-adaptable-state';
             case 'StatusBar':
                 return learnUrl + 'ui-status-bar';
             case 'SystemStatus':
-                return learnUrl + 'handbook-notifying';
+                return learnUrl + 'handbook-system-status-message';
             case 'TeamSharing':
-                return learnUrl + 'handbook-collaborating';
+                return learnUrl + 'handbook-team-sharing';
             case 'Theme':
                 return learnUrl + 'handbook-theming';
             case 'ToolPanel':