@adaptabletools/adaptable 15.4.3 → 16.0.0-canary.1

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)(),
@@ -347,6 +347,7 @@ function CreateEmptyCellSummmary() {
         Max: undefined,
         Min: undefined,
         Count: undefined,
+        Only: undefined
     };
 }
 exports.CreateEmptyCellSummmary = CreateEmptyCellSummmary;
@@ -388,6 +389,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 +467,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/MetamodelService.js

@@ -49,6 +49,10 @@ class MetamodelService {
     validateOptionsObject(validationErrors, optionsObjectName, optionsObject, optionsObjectMetamodel, optionsObjectDefaultValues) {
         Object.entries(optionsObject).forEach(([optionKey, optionValue]) => {
             var _a;
+            if (optionKey === 'gridOptions') {
+                // gridOptions is aspecial case as it's NOT a public property, but we set and use it internally
+                return;
+            }
             const optionMetamodel = (_a = optionsObjectMetamodel === null || optionsObjectMetamodel === void 0 ? void 0 : optionsObjectMetamodel.props) === null || _a === void 0 ? void 0 : _a.find((metamodelProperty) => metamodelProperty.name === optionKey);
             if (!optionMetamodel) {
                 validationErrors.push(`${optionsObjectName}.${optionKey} (value=${optionValue}) :: unknown/unsupported property, will be ignored`);

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':

package/src/Utilities/Services/QueryLanguageService.js

@@ -26,6 +26,8 @@ class QueryLanguageService {
         return parser.evaluate(expression, {
             node: rowNode,
             adaptableApi: this.adaptableApi,
+            userName: this.adaptableApi.optionsApi.getUserName(),
+            adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
             functions: booleanAndScalarFunctions,
             evaluateCustomQueryVariable: this.evaluateCustomQueryVariable,
         });
@@ -39,6 +41,8 @@ class QueryLanguageService {
         return parser.evaluate(expression, {
             node: null,
             adaptableApi: this.adaptableApi,
+            userName: this.adaptableApi.optionsApi.getUserName(),
+            adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
             functions: aggregatedScalarFunctions,
             evaluateCustomQueryVariable: this.evaluateCustomQueryVariable,
         });
@@ -49,6 +53,8 @@ class QueryLanguageService {
         const reactiveExpression$ = parser.evaluate(reactiveExpression, {
             node: reactiveExpression,
             adaptableApi: this.adaptableApi,
+            userName: this.adaptableApi.optionsApi.getUserName(),
+            adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
             functions: moduleExpressionFunctions.observableFunctions,
             whereClauseFunctions: booleanAndScalarFunctions,
             evaluateCustomQueryVariable: this.evaluateCustomQueryVariable,
@@ -61,6 +67,8 @@ class QueryLanguageService {
         const aggregationEvaluation = parser.evaluate(aggregationExpression, {
             node: aggregationExpression,
             adaptableApi: this.adaptableApi,
+            userName: this.adaptableApi.optionsApi.getUserName(),
+            adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
             functions: moduleExpressionFunctionsMap.aggregatedBooleanFunctions,
             whereClauseFunctions: booleanAndScalarFunctions,
             evaluateCustomQueryVariable: this.evaluateCustomQueryVariable,
@@ -301,6 +309,8 @@ class QueryLanguageService {
         if (typeof expressionOptions.moduleExpressionFunctions === 'function') {
             const context = {
                 adaptableApi: this.adaptableApi,
+                userName: this.adaptableApi.optionsApi.getUserName(),
+                adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
                 module,
                 availableBooleanFunctionNames: (0, TypeExtensions_1.getTypedKeys)(generalBooleanExpressionFunctions),
                 availableScalarFunctionNames: (0, TypeExtensions_1.getTypedKeys)(generalScalarExpressionFunctions),
@@ -327,6 +337,8 @@ class QueryLanguageService {
         const systemFunctionNames = typeof systemFunctions === 'function'
             ? systemFunctions({
                 adaptableApi: this.adaptableApi,
+                userName: this.adaptableApi.optionsApi.getUserName(),
+                adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
                 availableExpressionFunctionNames: (0, TypeExtensions_1.getTypedKeys)(availableExpressionFunctions),
             })
             : systemFunctions;
@@ -346,6 +358,8 @@ class QueryLanguageService {
         const customFunctionDefinitions = typeof customFunctions === 'function'
             ? customFunctions({
                 adaptableApi: this.adaptableApi,
+                userName: this.adaptableApi.optionsApi.getUserName(),
+                adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
                 availableExpressionFunctionNames: (0, TypeExtensions_1.getTypedKeys)(generalExpressionFunctions),
             })
             : customFunctions;
@@ -358,6 +372,8 @@ class QueryLanguageService {
         var _a, _b, _c;
         const context = {
             adaptableApi: this.adaptableApi,
+            userName: this.adaptableApi.optionsApi.getUserName(),
+            adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
             args,
         };
         const customQueryVariableDefinition = (_c = (_b = (_a = this.adaptableApi.optionsApi.getAdaptableQLOptions()) === null || _a === void 0 ? void 0 : _a.expressionOptions) === null || _b === void 0 ? void 0 : _b.customQueryVariables) === null || _c === void 0 ? void 0 : _c[functionName];

package/src/Utilities/Services/ReportService.js

@@ -120,7 +120,7 @@ class ReportService {
     }
     GetReportColumnScopeShortDescription(report) {
         var _a, _b;
-        if (this.adaptableApi.exportApi.isServerReport(report)) {
+        if (this.adaptableApi.exportApi.isExternalReport(report)) {
             return ['[Custom Columns]'];
         }
         switch (report.ReportColumnScope) {
@@ -138,7 +138,7 @@ class ReportService {
         }
     }
     GetReportColumnScopeLongDescription(report) {
-        if (this.adaptableApi.exportApi.isServerReport(report)) {
+        if (this.adaptableApi.exportApi.isExternalReport(report)) {
             return '[Custom Columns]';
         }
         switch (report.ReportColumnScope) {
@@ -153,7 +153,7 @@ class ReportService {
         }
     }
     GetReportExpressionDescription(report, cols) {
-        if (this.adaptableApi.exportApi.isServerReport(report)) {
+        if (this.adaptableApi.exportApi.isExternalReport(report)) {
             return '[Custom Data]';
         }
         if (this.IsSystemReport(report.Name)) {
@@ -189,7 +189,7 @@ class ReportService {
     getReportDataColumns(report, includePrimaryKey = false) {
         let reportColumns = [];
         let gridColumns = this.adaptableApi.columnApi.getExportableColumns();
-        if (this.adaptableApi.exportApi.isServerReport(report)) {
+        if (this.adaptableApi.exportApi.isExternalReport(report)) {
             return reportColumns;
         }
         // first get the cols depending on the Column Scope
@@ -297,8 +297,8 @@ class ReportService {
         return resultRowData;
     }
     getReportData(report, includePrimaryKey = false) {
-        if (this.adaptableApi.exportApi.isServerReport(report)) {
-            return this.adaptableApi.exportApi.runServerReport(report.Name);
+        if (this.adaptableApi.exportApi.isExternalReport(report)) {
+            return this.adaptableApi.exportApi.runExternalReport(report.Name);
         }
         const columns = this.getReportDataColumns(report, includePrimaryKey);
         const rows = this.getReportDataRows(report, columns, includePrimaryKey);
@@ -326,6 +326,8 @@ class ReportService {
             reportDestination: reportDestination,
             liveDataTrigger: liveDataTrigger,
             liveReport: liveReport,
+            userName: this.adaptableApi.optionsApi.getUserName(),
+            adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
         };
         this.adaptableApi.eventApi.emit('LiveDataChanged', liveDataChangedInfo);
     }

package/src/Utilities/Services/RowEditService.js

@@ -6,7 +6,7 @@ class RowEditService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
         const adaptableInstance = this.adaptableApi.internalApi.getAdaptableInstance();
-        if (adaptableInstance.adaptableOptions.actionOptions.actionRowButtonOptions.autoHandle) {
+        if (adaptableInstance.adaptableOptions.actionRowOptions.autoHandle) {
             adaptableInstance.api.eventApi.on('ActionRowSubmitted', (eventInfo) => this.autoHandleActionRowButtons(eventInfo));
         }
     }
@@ -24,12 +24,14 @@ class RowEditService {
         }
         if (actionRowSubmittedInfo.type === 'rowCreated') {
             const { formData } = actionRowSubmittedInfo;
-            const setPrimaryKeyValueFunction = adaptableApi.internalApi.getAdaptableInstance().adaptableOptions.actionOptions
+            const setPrimaryKeyValueFunction = adaptableApi.internalApi.getAdaptableInstance().adaptableOptions.actionRowOptions
                 .actionRowButtonOptions.setPrimaryKeyValue;
             const newRowData = typeof setPrimaryKeyValueFunction === 'function'
                 ? setPrimaryKeyValueFunction({
                     rowData: formData,
                     adaptableApi,
+                    userName: this.adaptableApi.optionsApi.getUserName(),
+                    adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
                 })
                 : Object.assign({}, formData);
             const config = {

package/src/Utilities/Services/ValidationService.js

@@ -76,6 +76,8 @@ class ValidationService {
         const serverValidationContext = {
             cellDataChangedInfo: cellDataChangedInfo,
             adaptableApi: this.adaptableApi,
+            userName: this.adaptableApi.optionsApi.getUserName(),
+            adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
         };
         return () => {
             this.adaptableApi.optionsApi

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

@@ -23,11 +23,11 @@ const ConfigurationWizard = (props) => {
                 toolPanels: ['columns', 'filters', 'adaptable'],
             },
         };
-        const preparedAdaptableOptions = Object.assign(Object.assign({}, props.adaptableOptions), { gridOptions: Object.assign(Object.assign({}, gridOptionDefaults), (_a = props === null || props === void 0 ? void 0 : props.adaptableOptions) === null || _a === void 0 ? void 0 : _a.gridOptions) });
+        const preparedAdaptableOptions = Object.assign(Object.assign({}, props.adaptableOptions), { gridOptions: Object.assign(Object.assign({}, gridOptionDefaults), (_a = props === null || props === void 0 ? void 0 : props.adaptableOptions) === null || _a === void 0 ? void 0 : _a._gridOptions) });
         return AdaptableHelper_1.default.assignAdaptableOptions(preparedAdaptableOptions);
     });
     const [selectedColumns, setSelectedColumns] = (0, react_1.useState)(() => {
-        return props.adaptableOptions.gridOptions.columnDefs.reduce((acc, col) => {
+        return props.adaptableOptions._gridOptions.columnDefs.reduce((acc, col) => {
             acc[col.field] = true;
             return acc;
         }, {});
@@ -35,9 +35,9 @@ const ConfigurationWizard = (props) => {
     const columnsHandle = React.useRef();
     const handleFinish = () => {
         const newAdaptableOptions = Object.assign({}, adaptableOptions);
-        newAdaptableOptions.gridOptions = Object.assign({}, adaptableOptions.gridOptions);
+        newAdaptableOptions._gridOptions = Object.assign({}, adaptableOptions._gridOptions);
         if (columnsHandle.current) {
-            newAdaptableOptions.gridOptions.columnDefs = columnsHandle
+            newAdaptableOptions._gridOptions.columnDefs = columnsHandle
                 .current.getColumns()
                 .map((column) => {
                 const newColumn = Object.assign(Object.assign({}, column), { headerName: column.caption || StringExtensions_1.default.Humanize(column.field) });
@@ -53,7 +53,7 @@ const ConfigurationWizard = (props) => {
         setIsValid(newIsValid);
     }, []);
     const handleColumnsChange = React.useCallback((columns) => {
-        setAdaptableOptions((adaptableOptions) => (Object.assign(Object.assign({}, adaptableOptions), { gridOptions: Object.assign(Object.assign({}, adaptableOptions.gridOptions), { columnDefs: columns }) })));
+        setAdaptableOptions((adaptableOptions) => (Object.assign(Object.assign({}, adaptableOptions), { _gridOptions: Object.assign(Object.assign({}, adaptableOptions._gridOptions), { columnDefs: columns }) })));
     }, []);
     const handleColumnSelectionChange = React.useCallback((col, flag) => {
         setSelectedColumns((selectedColumns) => {

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

@@ -13,6 +13,6 @@ const ConfigurationWizardColumnsStep = (props) => {
     }
     return (React.createElement(ColumnsList_1.default, { theme: theme, handle: props.columnsHandle, onValidityChange: (valid) => {
             props.setPrimaryKeyIsNotSelected(valid);
-        }, selectedColumns: props.selectedColumns, onChange: props.onColumnChange, onSelectionChange: props.onSelectionChange, columns: (_c = (_b = props.adaptableOptions) === null || _b === void 0 ? void 0 : _b.gridOptions) === null || _c === void 0 ? void 0 : _c.columnDefs }));
+        }, selectedColumns: props.selectedColumns, onChange: props.onColumnChange, onSelectionChange: props.onSelectionChange, columns: (_c = (_b = props.adaptableOptions) === null || _b === void 0 ? void 0 : _b._gridOptions) === null || _c === void 0 ? void 0 : _c.columnDefs }));
 };
 exports.ConfigurationWizardColumnsStep = ConfigurationWizardColumnsStep;

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

@@ -217,7 +217,7 @@ const FinanceFormSectionTitle = (props) => (React.createElement(rebass_1.Box, Ob
     React.createElement(HelpBlock_1.default, null, props.children)));
 const FinanceForm = (props) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    const columnOptions = (_d = (_c = (_b = (_a = props.adaptableOptions) === null || _a === void 0 ? void 0 : _a.gridOptions) === null || _b === void 0 ? void 0 : _b.columnDefs) === null || _c === void 0 ? void 0 : _c.map) === null || _d === void 0 ? void 0 : _d.call(_c, (item) => {
+    const columnOptions = (_d = (_c = (_b = (_a = props.adaptableOptions) === null || _a === void 0 ? void 0 : _a._gridOptions) === null || _b === void 0 ? void 0 : _b.columnDefs) === null || _c === void 0 ? void 0 : _c.map) === null || _d === void 0 ? void 0 : _d.call(_c, (item) => {
         var _a;
         return ({
             label: StringExtensions_1.default.Humanize((_a = item.headerName) !== null && _a !== void 0 ? _a : item.field),

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

@@ -10,22 +10,22 @@ const rebass_1 = require("rebass");
 const GridOptionsForm = (props) => {
     var _a;
     let abOptions = props.adaptableOptions;
-    const gridOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.gridOptions), abOptions.gridOptions);
+    const gridOptions = Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions._gridOptions), abOptions._gridOptions);
     return (React.createElement(rebass_1.Box, { p: 2 },
         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;
+                        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: (_a = gridOptions.defaultColDef) === null || _a === void 0 ? void 0 : _a.floatingFilter, onChange: (floatingFilter) => {
                         abOptions = Object.assign({}, abOptions);
-                        abOptions.gridOptions = Object.assign({}, abOptions.gridOptions);
-                        abOptions.gridOptions.defaultColDef = {
+                        abOptions._gridOptions = Object.assign({}, abOptions._gridOptions);
+                        abOptions._gridOptions.defaultColDef = {
                             floatingFilter,
                         };
                         props.onChangeadAptableOptions(abOptions);
@@ -33,15 +33,15 @@ const GridOptionsForm = (props) => {
             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;
+                        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;
+                        abOptions._gridOptions = Object.assign({}, abOptions._gridOptions);
+                        abOptions._gridOptions.suppressMenuHide = suppressMenuHide;
                         props.onChangeadAptableOptions(abOptions);
                     } })))));
 };

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsActionColumnsForm.js

@@ -14,8 +14,8 @@ const UIOptionsActionColumnsForm = (props) => {
         { value: 'edit', label: 'Edit' },
         { value: 'delete', label: 'Delete' },
     ];
-    const actionRowButtons = Array.isArray((_b = (_a = props.abOptions) === null || _a === void 0 ? void 0 : _a.actionOptions) === null || _b === void 0 ? void 0 : _b.actionRowButtons)
-        ? (_d = (_c = props.abOptions) === null || _c === void 0 ? void 0 : _c.actionOptions) === null || _d === void 0 ? void 0 : _d.actionRowButtons
+    const actionRowButtons = Array.isArray((_b = (_a = props.abOptions) === null || _a === void 0 ? void 0 : _a.actionRowOptions) === null || _b === void 0 ? void 0 : _b.actionRowButtons)
+        ? (_d = (_c = props.abOptions) === null || _c === void 0 ? void 0 : _c.actionRowOptions) === null || _d === void 0 ? void 0 : _d.actionRowButtons
         : (_e = []) !== null && _e !== void 0 ? _e : [];
     const handleCheckChange = (type, checked) => {
         var _a;
@@ -26,7 +26,7 @@ const UIOptionsActionColumnsForm = (props) => {
         else {
             newActionRowButtons = newActionRowButtons.filter((item) => item !== type);
         }
-        props.onChange(Object.assign(Object.assign({}, props.abOptions), { actionOptions: Object.assign(Object.assign({}, (_a = props.abOptions) === null || _a === void 0 ? void 0 : _a.actionOptions), { actionRowButtons: newActionRowButtons }) }));
+        props.onChange(Object.assign(Object.assign({}, props.abOptions), { actionRowOptions: Object.assign(Object.assign({}, (_a = props.abOptions) === null || _a === void 0 ? void 0 : _a.actionRowOptions), { actionRowButtons: newActionRowButtons }) }));
     };
     return (React.createElement(rebass_1.Box, null,
         React.createElement(HelpBlock_1.default, null, "Action Row Buttons"),

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsSidebarForm.js

@@ -39,8 +39,8 @@ const isSidebarChecked = (sideBar, panelName) => {
 const UIOptionsSidebarForm = (props) => {
     var _a;
     const { abOptions, onChange } = props;
-    const { gridOptions } = props.abOptions;
-    const sideBar = prepareSidebarDef(gridOptions.sideBar);
+    const { _gridOptions } = props.abOptions;
+    const sideBar = prepareSidebarDef(_gridOptions.sideBar);
     const renderSidebarCheckbox = (sidebarName) => {
         return (React.createElement(CheckBox_1.CheckBox, { mr: 3, key: sidebarName, checked: isSidebarChecked(sideBar, sidebarName), onChange: (check) => handleToolpanelsChange(sidebarName, check) }, StringExtensions_1.default.Humanize(sidebarName)));
     };
@@ -60,12 +60,12 @@ const UIOptionsSidebarForm = (props) => {
         if (newPanels.length === 0) {
             hiddenByDefault = true;
         }
-        const newAbOptions = Object.assign(Object.assign({}, abOptions), { gridOptions: Object.assign(Object.assign({}, abOptions.gridOptions), { sideBar: Object.assign(Object.assign({}, sideBar), { toolPanels: newPanels, hiddenByDefault }) }) });
+        const newAbOptions = Object.assign(Object.assign({}, abOptions), { _gridOptions: Object.assign(Object.assign({}, abOptions._gridOptions), { sideBar: Object.assign(Object.assign({}, sideBar), { toolPanels: newPanels, hiddenByDefault }) }) });
         props.onChange(newAbOptions);
     };
     let sidebarPosition = (_a = sideBar === null || sideBar === void 0 ? void 0 : sideBar.position) !== null && _a !== void 0 ? _a : 'right';
     const handleSidebarPositionChange = (position) => {
-        const newAbOptions = Object.assign(Object.assign({}, abOptions), { gridOptions: Object.assign(Object.assign({}, abOptions.gridOptions), { sideBar: Object.assign(Object.assign({}, sideBar), { position }) }) });
+        const newAbOptions = Object.assign(Object.assign({}, abOptions), { gridOptions: Object.assign(Object.assign({}, abOptions._gridOptions), { sideBar: Object.assign(Object.assign({}, sideBar), { position }) }) });
         props.onChange(newAbOptions);
     };
     return (React.createElement(rebass_1.Box, null,

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UIOptionsStatusbarForm.js

@@ -13,7 +13,7 @@ const DropdownButton_1 = tslib_1.__importDefault(require("../../../../components
 const FormBox_1 = require("../Components/FormBox");
 const UIOptionsStatusbarForm = (props) => {
     var _a, _b, _c, _d;
-    const allPanels = (_c = (_b = (_a = props.abOptions.gridOptions) === null || _a === void 0 ? void 0 : _a.statusBar) === null || _b === void 0 ? void 0 : _b.statusPanels) !== null && _c !== void 0 ? _c : [];
+    const allPanels = (_c = (_b = (_a = props.abOptions._gridOptions) === null || _a === void 0 ? void 0 : _a.statusBar) === null || _b === void 0 ? void 0 : _b.statusPanels) !== null && _c !== void 0 ? _c : [];
     const panelIdtoPanel = (panelsIds, align) => panelsIds.map((panelId) => {
         const previousItem = allPanels.find((panel) => panel.key === panelId || panel.statusPanel === panelId);
         if (previousItem) {
@@ -35,7 +35,7 @@ const UIOptionsStatusbarForm = (props) => {
         const centerPanels = panelIdtoPanel(tabs[1].Items, 'center');
         const rightPanels = panelIdtoPanel(tabs[2].Items, 'right');
         const newStatusbarPanels = [...leftPanels, ...centerPanels, ...rightPanels];
-        props.onChange(Object.assign(Object.assign({}, props.abOptions), { gridOptions: Object.assign(Object.assign({}, props.abOptions.gridOptions), { statusBar: Object.assign(Object.assign({}, props.abOptions.gridOptions.statusBar), { statusPanels: newStatusbarPanels }) }) }));
+        props.onChange(Object.assign(Object.assign({}, props.abOptions), { _gridOptions: Object.assign(Object.assign({}, props.abOptions._gridOptions), { statusBar: Object.assign(Object.assign({}, props.abOptions._gridOptions.statusBar), { statusPanels: newStatusbarPanels }) }) }));
     };
     const disabled = false;
     const panelToTabItemId = (panel) => { var _a; return (_a = panel.key) !== null && _a !== void 0 ? _a : panel.statusPanel; };
@@ -78,7 +78,7 @@ const UIOptionsStatusbarForm = (props) => {
         const newStatusbarPanels = [...allPanels, newAdaptablePanel];
         setAdaptablePanelTitle('');
         setAdaptablePanelAlign('left');
-        props.onChange(Object.assign(Object.assign({}, props.abOptions), { gridOptions: Object.assign(Object.assign({}, props.abOptions.gridOptions), { statusBar: Object.assign(Object.assign({}, props.abOptions.gridOptions.statusBar), { statusPanels: newStatusbarPanels }) }) }));
+        props.onChange(Object.assign(Object.assign({}, props.abOptions), { _gridOptions: Object.assign(Object.assign({}, props.abOptions._gridOptions), { statusBar: Object.assign(Object.assign({}, props.abOptions._gridOptions.statusBar), { statusPanels: newStatusbarPanels }) }) }));
     };
     return (React.createElement(rebass_1.Box, null,
         React.createElement(HelpBlock_1.default, null, "Status Bar"),

package/src/View/AdaptableWizardView/Wizard.js

@@ -52,10 +52,10 @@ const Wizard = (props) => {
                 payload: `Invalid adaptable configuration - ${err}`,
             });
         }
-        const gridOptions = (0, helper_1.prepareGridOptions)(dataSourceInfo, (_a = props.adaptableOptions) === null || _a === void 0 ? void 0 : _a.gridOptions);
+        const gridOptions = (0, helper_1.prepareGridOptions)(dataSourceInfo, (_a = props.adaptableOptions) === null || _a === void 0 ? void 0 : _a._gridOptions);
         const adaptableOptions = Object.assign({}, props.adaptableOptions);
         adaptableOptions.adaptableId = adaptableOptions.adaptableId || (file ? file.name : '');
-        adaptableOptions.gridOptions = gridOptions;
+        adaptableOptions._gridOptions = gridOptions;
         if (dataSourceInfo.primaryKey) {
             adaptableOptions.primaryKey = dataSourceInfo.primaryKey;
         }