@adaptabletools/adaptable 14.0.0-canary.0 → 14.0.0-canary.1

package/src/Utilities/Helpers/FormatHelper.d.ts

@@ -1,7 +1,7 @@
 import { NumberFormatterOptions, DateFormatterOptions, AdaptableFormat, StringFormatterOptions } from '../../PredefinedConfig/Common/AdaptableFormat';
 export declare function Format(input: any, format: AdaptableFormat): string;
 export declare function NumberFormatter(input: number | string, options?: NumberFormatterOptions): string;
-export declare function DateFormatter(input: number | Date | string, options: DateFormatterOptions): string | undefined;
+export declare function DateFormatter(input: number | Date | string, options: DateFormatterOptions, strictFormatting?: boolean): string | undefined;
 export declare function StringFormatter(input: string, options?: StringFormatterOptions): string;
 declare const _default: {
     NumberFormatter: typeof NumberFormatter;

package/src/Utilities/Helpers/FormatHelper.js

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

package/src/Utilities/ObjectFactory.d.ts

@@ -8,7 +8,6 @@ import { Report, ReportSchedule } from '../PredefinedConfig/ExportState';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { BaseSchedule, Schedule } from '../PredefinedConfig/Common/Schedule';
 import { Shortcut } from '../PredefinedConfig/ShortcutState';
-import { ConditionalStyle } from '../PredefinedConfig/ConditionalStyleState';
 import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
 import { FreeTextColumn } from '../PredefinedConfig/FreeTextColumnState';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
@@ -24,10 +23,11 @@ import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessag
 import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
-import { ColumnFilter, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
+import { ChartDefinition, ColumnFilter, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
 import { RowNode } from '@ag-grid-community/core';
 import { AdaptableApi } from '../../types';
 import { ToastOptions } from '../components/Toastify';
+import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 export declare function CreateEmptyCustomSort(): CustomSort;
 export declare function CreateEmptyCalculatedColumn(): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
@@ -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 CreateCustomReport(reportName: string): Report;
+export declare function CreateServerReport(reportName: string): Report;
 export declare function CreateEmptyBaseSchedule(scheduleType: ScheduleType): BaseSchedule;
 export declare function CreateEmptyReminderSchedule(): ReminderSchedule;
 export declare function CreateEmptyReportSchedule(): ReportSchedule;
@@ -54,7 +54,6 @@ export declare function CreateGlue42Schedule(glue42Report: Glue42Report): Glue42
 export declare function CreateReportSchedule(reportName: string): ReportSchedule;
 export declare function CreateEmptySchedule(): Schedule;
 export declare function CreateEmptyShortcut(): Shortcut;
-export declare function CreateEmptyConditionalStyle(): ConditionalStyle;
 export declare function CreateEmptyFormatColumn(): FormatColumn;
 export declare function CreateEmptyFreeTextColumn(): FreeTextColumn;
 export declare function CreateEmptyLayout(layout?: Partial<Layout> & {
@@ -64,10 +63,14 @@ export declare function CreateEmptyStyle(): AdaptableStyle;
 export declare function CreateSystemStatusMessageInfo(message: string, type: AdaptableMessageType, furtherInfo?: string): SystemStatusMessageInfo;
 export declare function CreateEmptyCellSummmary(): CellSummmary;
 export declare function CreateColumnFilter(ColumnId: string, PredicateId: SystemFilterPredicateId, Inputs: any[]): ColumnFilter;
+export declare function CreateEmptyStyledColumn(): StyledColumn;
+export declare function CreateEmptyChartDefinition(chartDefinition?: ChartDefinition): ChartDefinition;
 export declare function CreateCustomDisplayFormatterContext(value: any, node: RowNode, abColumn: AdaptableColumn, api: AdaptableApi): CustomDisplayFormatterContext;
 export declare function CreateToastOptions(notificationsOptions: NotificationsOptions, { onClose, containerId }: {
     onClose?: VoidFunction;
     containerId: string;
+}, overides?: {
+    duration: number | 'always';
 }): ToastOptions;
 export declare const ObjectFactory: {
     CreateEmptyCustomSort: typeof CreateEmptyCustomSort;
@@ -80,7 +83,7 @@ export declare const ObjectFactory: {
     CreateEmptyAlertDefinition: typeof CreateEmptyAlertDefinition;
     CreateEmptyFlashingCellDefinition: typeof CreateEmptyFlashingCellDefinition;
     CreateInternalAlertDefinitionForMessages: typeof CreateInternalAlertDefinitionForMessages;
-    CreateCustomReport: typeof CreateCustomReport;
+    CreateServerReport: typeof CreateServerReport;
     CreateEmptyReport: typeof CreateEmptyReport;
     CreateEmptyBaseSchedule: typeof CreateEmptyBaseSchedule;
     CreateEmptyReminderSchedule: typeof CreateEmptyReminderSchedule;
@@ -94,7 +97,6 @@ export declare const ObjectFactory: {
     CreateEmptyOpenFinSchedule: typeof CreateEmptyOpenFinSchedule;
     CreateEmptySchedule: typeof CreateEmptySchedule;
     CreateEmptyShortcut: typeof CreateEmptyShortcut;
-    CreateEmptyConditionalStyle: typeof CreateEmptyConditionalStyle;
     CreateEmptyFormatColumn: typeof CreateEmptyFormatColumn;
     CreateEmptyFreeTextColumn: typeof CreateEmptyFreeTextColumn;
     CreateEmptyLayout: typeof CreateEmptyLayout;
@@ -106,5 +108,7 @@ export declare const ObjectFactory: {
     CreateSystemStatusMessageInfo: typeof CreateSystemStatusMessageInfo;
     CreateToastOptions: typeof CreateToastOptions;
     CreateCustomDisplayFormatterContext: typeof CreateCustomDisplayFormatterContext;
+    CreateEmptyStyledColumn: typeof CreateEmptyStyledColumn;
+    CreateEmptyChartDefinition: typeof CreateEmptyChartDefinition;
 };
 export default ObjectFactory;

package/src/Utilities/ObjectFactory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateCustomDisplayFormatterContext = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyConditionalStyle = 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.CreateCustomReport = 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.CreateCustomDisplayFormatterContext = exports.CreateEmptyChartDefinition = 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;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
@@ -85,7 +85,7 @@ function CreateEmptyAlertDefinition() {
         Uuid: (0, Uuid_1.createUuid)(),
         Scope: { All: true },
         Rule: {
-            Predicate: undefined,
+            Predicates: [],
         },
         MessageType: GeneralConstants_1.ALERT_DEFAULT_MESSAGE_TYPE,
         AlertProperties: {},
@@ -97,9 +97,11 @@ function CreateEmptyFlashingCellDefinition() {
         Uuid: (0, Uuid_1.createUuid)(),
         Scope: { ColumnIds: [] },
         Rule: {
-            Predicate: {
-                PredicateId: 'Any',
-            },
+            Predicates: [
+                {
+                    PredicateId: 'Any',
+                },
+            ],
         },
     };
 }
@@ -112,7 +114,7 @@ function CreateInternalAlertDefinitionForMessages(messageType, alertProperties)
         Uuid: (0, Uuid_1.createUuid)(),
         Scope: undefined,
         Rule: {
-            Predicate: undefined,
+            Predicates: [],
         },
         MessageType: messageType,
         AlertProperties: alertProperties,
@@ -130,7 +132,7 @@ function CreateEmptyReport() {
     };
 }
 exports.CreateEmptyReport = CreateEmptyReport;
-function CreateCustomReport(reportName) {
+function CreateServerReport(reportName) {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
         Name: reportName,
@@ -140,7 +142,7 @@ function CreateCustomReport(reportName) {
         Query: undefined,
     };
 }
-exports.CreateCustomReport = CreateCustomReport;
+exports.CreateServerReport = CreateServerReport;
 function CreateEmptyBaseSchedule(scheduleType) {
     return {
         Uuid: (0, Uuid_1.createUuid)(),
@@ -275,23 +277,12 @@ function CreateEmptyShortcut() {
     };
 }
 exports.CreateEmptyShortcut = CreateEmptyShortcut;
-function CreateEmptyConditionalStyle() {
-    return {
-        Uuid: (0, Uuid_1.createUuid)(),
-        Scope: undefined,
-        Rule: undefined,
-        Style: CreateEmptyStyle(),
-        IncludeGroupedRows: false,
-    };
-}
-exports.CreateEmptyConditionalStyle = CreateEmptyConditionalStyle;
 function CreateEmptyFormatColumn() {
     return {
         Scope: undefined,
         Style: CreateEmptyStyle(),
         DisplayFormat: undefined,
         CellAlignment: undefined,
-        HeaderName: undefined,
     };
 }
 exports.CreateEmptyFormatColumn = CreateEmptyFormatColumn;
@@ -328,10 +319,10 @@ function CreateEmptyStyle() {
         BackColor: undefined,
         ForeColor: undefined,
         BorderColor: undefined,
-        FontWeight: Enums_1.FontWeight.Normal,
-        FontStyle: Enums_1.FontStyle.Normal,
+        FontWeight: undefined,
+        FontStyle: undefined,
         FontSize: undefined,
-        ClassName: GeneralConstants_1.EMPTY_STRING,
+        ClassName: undefined,
     };
 }
 exports.CreateEmptyStyle = CreateEmptyStyle;
@@ -368,6 +359,17 @@ function CreateColumnFilter(ColumnId, PredicateId, Inputs) {
     };
 }
 exports.CreateColumnFilter = CreateColumnFilter;
+function CreateEmptyStyledColumn() {
+    return {
+        Uuid: (0, Uuid_1.createUuid)(),
+        ColumnId: GeneralConstants_1.EMPTY_STRING,
+    };
+}
+exports.CreateEmptyStyledColumn = CreateEmptyStyledColumn;
+function CreateEmptyChartDefinition(chartDefinition) {
+    return Object.assign({ Uuid: (0, Uuid_1.createUuid)() }, chartDefinition);
+}
+exports.CreateEmptyChartDefinition = CreateEmptyChartDefinition;
 function CreateCustomDisplayFormatterContext(value, node, abColumn, api) {
     return {
         adaptableColumn: abColumn,
@@ -377,10 +379,11 @@ function CreateCustomDisplayFormatterContext(value, node, abColumn, api) {
     };
 }
 exports.CreateCustomDisplayFormatterContext = CreateCustomDisplayFormatterContext;
-function CreateToastOptions(notificationsOptions, { onClose, containerId }) {
+function CreateToastOptions(notificationsOptions, { onClose, containerId }, overides) {
+    var _a;
     const adaptableToastPosition = notificationsOptions.position;
     const position = getToastPosition(adaptableToastPosition);
-    const duration = notificationsOptions.duration;
+    const duration = (_a = overides.duration) !== null && _a !== void 0 ? _a : notificationsOptions.duration;
     const showProgressBar = notificationsOptions.showProgressBar;
     const closeWhenClicked = notificationsOptions.closeWhenClicked;
     const pauseWhenHovering = notificationsOptions.pauseWhenHovering;
@@ -441,7 +444,7 @@ exports.ObjectFactory = {
     CreateEmptyAlertDefinition,
     CreateEmptyFlashingCellDefinition,
     CreateInternalAlertDefinitionForMessages,
-    CreateCustomReport,
+    CreateServerReport,
     CreateEmptyReport,
     CreateEmptyBaseSchedule,
     CreateEmptyReminderSchedule,
@@ -455,7 +458,6 @@ exports.ObjectFactory = {
     CreateEmptyOpenFinSchedule,
     CreateEmptySchedule,
     CreateEmptyShortcut,
-    CreateEmptyConditionalStyle,
     CreateEmptyFormatColumn,
     CreateEmptyFreeTextColumn,
     CreateEmptyLayout,
@@ -467,5 +469,7 @@ exports.ObjectFactory = {
     CreateSystemStatusMessageInfo,
     CreateToastOptions,
     CreateCustomDisplayFormatterContext,
+    CreateEmptyStyledColumn,
+    CreateEmptyChartDefinition,
 };
 exports.default = exports.ObjectFactory;

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -19,7 +19,7 @@ class CalculatedColumnExpressionService {
             const refreshedCalculatedColumns = [];
             this.aggregatedScalarLiveValuesMap.forEach((aggregatedScalarLiveValue, calculatedColumnId) => {
                 const calculatedColumn = this.adaptableApi.calculatedColumnApi.getCalculatedColumnById(calculatedColumnId);
-                const columnDependencies = this.adaptableApi.calculatedColumnApi.getReferencedColumnIdsForCalculatedColumn(calculatedColumn);
+                const columnDependencies = this.adaptableApi.calculatedColumnApi.internalApi.getReferencedColumnIdsForCalculatedColumn(calculatedColumn);
                 if (columnDependencies.includes(cellDataChangedInfo.column.columnId)) {
                     aggregatedScalarLiveValue.refresh();
                     refreshedCalculatedColumns.push(calculatedColumn.ColumnId);
@@ -133,7 +133,7 @@ class CalculatedColumnExpressionService {
                 this.aggregatedScalarLiveValuesMap.set(calculatedColumn.Uuid, aggregatedScalarLiveValue);
             }
             catch (e) {
-                (0, LoggingHelper_1.LogAdaptableError)(`Creating CalculatedColumn ('${(_c = calculatedColumn.Query) === null || _c === void 0 ? void 0 : _c.AggregatedScalarExpression}') failed!\n${e.message}`);
+                (0, LoggingHelper_1.LogAdaptableError)(`Creating CalculatedColumn ('${(_c = calculatedColumn.Query) === null || _c === void 0 ? void 0 : _c.AggregatedScalarExpression}') failed!`, e.message);
             }
         }
     }

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

@@ -0,0 +1,10 @@
+import { ChartModel } from '@ag-grid-community/core';
+import { AdaptableApi } from '../../types';
+import { IChartingService } from './Interface/IChartingService';
+export declare class ChartingService implements IChartingService {
+    private api;
+    constructor(api: AdaptableApi);
+    onChartModelChange(models: ChartModel[], eventType: string, params: any): void;
+    saveNewChart(chartModel: ChartModel): void;
+    destroy(): void;
+}

package/src/Utilities/Services/ChartingService.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChartingService = void 0;
+const tslib_1 = require("tslib");
+const core_1 = require("@ag-grid-community/core");
+const SystemRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/SystemRedux"));
+const ObjectFactory_1 = tslib_1.__importDefault(require("../ObjectFactory"));
+class ChartingService {
+    constructor(api) {
+        this.api = api;
+    }
+    onChartModelChange(models, eventType, params) {
+        const allChartDefinitions = this.api.chartingApi.getChartDefinitions();
+        const currentChartModel = models.find((model) => model.chartId === params.chartId);
+        const currentChartDefinition = allChartDefinitions.find((chartDefinition) => chartDefinition.Model.chartId === params.chartId);
+        switch (eventType) {
+            case core_1.Events.EVENT_CHART_CREATED:
+                const createParams = params;
+                if (allChartDefinitions.some((chartDefinition) => chartDefinition.Model.chartId === createParams.chartId)) {
+                    // chart already exists
+                }
+                else {
+                    const chartModel = models.find((model) => model.chartId === createParams.chartId);
+                    this.saveNewChart(chartModel);
+                }
+                break;
+            case core_1.Events.EVENT_CHART_OPTIONS_CHANGED:
+            case core_1.Events.EVENT_CHART_RANGE_SELECTION_CHANGED:
+                if (!currentChartDefinition) {
+                    // editing a non-saved chart
+                    break;
+                }
+                const updatedChartDefinition = Object.assign(Object.assign({}, currentChartDefinition), { Model: currentChartModel });
+                this.api.chartingApi.editChartDefinition(updatedChartDefinition);
+                break;
+        }
+        this.api.internalApi.dispatchReduxAction(SystemRedux.SystemChartingSetCurrentChartModels(models));
+    }
+    saveNewChart(chartModel) {
+        var _a, _b;
+        const chartingOptions = (_a = this.api.internalApi.getAdaptableOptions().chartingOptions) !== null && _a !== void 0 ? _a : {};
+        const saveStragegy = (_b = chartingOptions.saveStrategy) !== null && _b !== void 0 ? _b : 'manual';
+        if (saveStragegy === 'none') {
+            return;
+        }
+        if (saveStragegy === 'manual') {
+            const alert = {
+                alertType: 'generic',
+                header: 'Save chart',
+                message: 'Do you want to save this Chart?',
+                alertDefinition: Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyAlertDefinition()), { MessageType: 'Info', AlertProperties: {
+                        DisplayNotification: true,
+                        NotificationDuration: 'always',
+                    }, AlertForm: {
+                        Buttons: [
+                            {
+                                Label: 'Save',
+                                Action: (context) => {
+                                    const chartName = context.formData.name || chartModel.chartId;
+                                    this.api.chartingApi.addChartDefinition(ObjectFactory_1.default.CreateEmptyChartDefinition({
+                                        Name: chartName,
+                                        Model: chartModel,
+                                    }));
+                                },
+                                ButtonStyle: {
+                                    tone: 'info',
+                                    variant: 'raised',
+                                },
+                            },
+                            {
+                                Label: 'Dismiss',
+                                ButtonStyle: {
+                                    tone: 'neutral',
+                                    variant: 'raised',
+                                },
+                            },
+                        ],
+                        fields: [
+                            {
+                                name: 'name',
+                                label: 'Name',
+                                fieldType: 'text',
+                            },
+                        ],
+                    } }),
+            };
+            this.api.alertApi.showAdaptableAlert(alert);
+        }
+        else if (saveStragegy === 'auto') {
+            this.api.chartingApi.addChartDefinition(ObjectFactory_1.default.CreateEmptyChartDefinition({
+                Name: chartModel.chartId,
+                Model: chartModel,
+            }));
+        }
+    }
+    destroy() {
+        this.api = null;
+    }
+}
+exports.ChartingService = ChartingService;

package/src/Utilities/Services/DataService.js

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

package/src/Utilities/Services/EntitlementService.js

@@ -28,7 +28,10 @@ class EntitlementService {
         let entitlementOptions = adaptableOptions.entitlementOptions;
         if (entitlementOptions) {
             const defaultAccessLevel = typeof entitlementOptions.defaultAccessLevel === 'function'
-                ? entitlementOptions.defaultAccessLevel(adaptableOptions.userName, adaptableOptions.adaptableId)
+                ? entitlementOptions.defaultAccessLevel({
+                    userName: adaptableOptions.userName,
+                    adaptableId: adaptableOptions.adaptableId,
+                })
                 : entitlementOptions.defaultAccessLevel;
             const moduleEntitlements = entitlementOptions.moduleEntitlements;
             if (moduleEntitlements) {

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

@@ -0,0 +1,5 @@
+import { ChartModel } from '@ag-grid-community/core';
+import { IAdaptableService } from './IAdaptableService';
+export interface IChartingService extends IAdaptableService {
+    onChartModelChange(models: ChartModel[], eventType: string, params: any): void;
+}

package/src/Utilities/Services/Interface/IChartingService.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

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

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

@@ -11,6 +11,7 @@ export interface GridInfoOption {
     description: string;
     kind: MetamodelItemPropertyKind;
     defaultValue?: any;
+    uiLabel: string;
 }
 export interface IMetamodelService extends IAdaptableService {
     getAdaptableOptions: () => AdaptableOptions;

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

@@ -3,9 +3,12 @@ import { IAdaptableService } from './IAdaptableService';
 import { RowNode } from '@ag-grid-community/core';
 import { CellDataChangedInfo } from '../../../PredefinedConfig/Common/CellDataChangedInfo';
 import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
-import { ScalarAggregationParameter } from '../../ExpressionFunctions/aggregatedScalarExpressionFunctions';
-import { ModuleExpressionFunctions } from '../../../AdaptableOptions/AdaptableQLOptions';
-import { BooleanAggregationParameter } from '../../ExpressionFunctions/aggregatedBooleanExpressionFunctions';
+import { AggregatedScalarFunctionName, ScalarAggregationParameter } from '../../ExpressionFunctions/aggregatedScalarExpressionFunctions';
+import { AggregatedBooleanFunctionName, BooleanAggregationParameter } from '../../ExpressionFunctions/aggregatedBooleanExpressionFunctions';
+import { BooleanFunctionName } from '../../ExpressionFunctions/booleanExpressionFunctions';
+import { ScalarFunctionName } from '../../ExpressionFunctions/scalarExpressionFunctions';
+import { ObservableFunctionName } from '../../ExpressionFunctions/observableExpressionFunctions';
+import { ExpressionFunctionMap } from '../../../parser/src/types';
 export interface IQueryLanguageService extends IAdaptableService {
     evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: RowNode): boolean;
     evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: RowNode): any;
@@ -31,10 +34,17 @@ export interface IQueryLanguageService extends IAdaptableService {
         errorMessage: string;
     };
     computeAggregatedBooleanValue(expression: string, module: AdaptableModule): boolean;
-    getModuleExpressionFunctions(module: AdaptableModule): ModuleExpressionFunctions;
+    getModuleExpressionFunctionsMap(module: AdaptableModule): ModuleExpressionFunctionsMap;
     getColumnsFromExpression(input: string): string[];
     getNamedQueryNamesFromExpression(input: string): string[];
     isCumulativeAggregate(input: string): boolean;
     evaluateCustomQueryVariable(functionName: string, args?: any[]): any;
     getExpressionWithColumnFriendlyNames(expression: string): string;
 }
+export interface ModuleExpressionFunctionsMap {
+    booleanFunctions?: ExpressionFunctionMap<BooleanFunctionName>;
+    scalarFunctions?: ExpressionFunctionMap<ScalarFunctionName>;
+    observableFunctions?: ExpressionFunctionMap<ObservableFunctionName>;
+    aggregatedBooleanFunctions?: ExpressionFunctionMap<AggregatedBooleanFunctionName>;
+    aggregatedScalarFunctions?: ExpressionFunctionMap<AggregatedScalarFunctionName>;
+}

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

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

package/src/Utilities/Services/{LicenseService.d.ts → LicenseService/index.d.ts}

@@ -1,6 +1,6 @@
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { LicenseDetails } from '../license/LicenseDetails';
-import { ILicenseService } from './Interface/ILicenseService';
+import { IAdaptable } from '../../../AdaptableInterfaces/IAdaptable';
+import { LicenseDetails } from '../../license/LicenseDetails';
+import { ILicenseService } from '../Interface/ILicenseService';
 export declare enum LicenseValidityType {
     INVALID_LICENSE = "INVALID_LICENSE",
     NO_LICENSE = "NO_LICENSE",

package/src/Utilities/Services/LicenseService/index.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/SystemRedux"),s=require("../../../Redux/ActionsReducers/PopupRedux"),t=e.__importDefault(require("../../ObjectFactory")),o=require("../../Helpers/LoggingHelper"),i=e.__importDefault(require("lodash/clamp")),n=require("../../Constants/DocumentationLinkConstants"),r=require("../../license/decode"),c=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",d=10,p=864e5;var E;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(E=exports.LicenseValidityType||(exports.LicenseValidityType={}));const _=/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g,I=/(https):\/\/\S+(\.csb\.app)/g,O=/(https):\/\/\S+(\.adaptabletools\.com)/g,u="undefined"!=typeof window?window.location.origin:"",h=()=>{const[e,a,s]=Array.from(_.exec(u)||[]);return"https"===a&&"sandpack.codesandbox.io"===s},A=()=>{const[e,a,s]=Array.from(I.exec(u)||[]);return"https"===a&&".csb.app"===s},N=()=>{const[e,a,s]=Array.from(O.exec(u)||[]);return"https"===a&&".adaptabletools.com"===s};class L{constructor(e,a,s){this.adaptable=e,this.adaptable=e;let t=null;if(a)try{t=(0,r.decode)(a)}catch(e){t=e}h()||A()||N()||this.handleLicenseValidation(t,this.getValidityType(t,s))}getValidityType(e,a){if(!e)return E.NO_LICENSE;if(e instanceof Error)return E.INVALID_LICENSE;const s=new Date(a.publishedAt),t=new Date(e.end),o=t<new Date,i=e.trial;let n=null;return n=o?t>s?i?E.NON_PRODUCTION_EXPIRED_IN_SCOPE:E.COMMERCIAL_EXPIRED_IN_SCOPE:i?E.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:E.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:i?E.NON_PRODUCTION_VALID:E.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var s;const t=new Date;t.setHours(0,0,0,0);let E=0;e instanceof Error||!(null==e?void 0:e.end)||(E=Math.floor(((null===(s=null==e?void 0:e.end)||void 0===s?void 0:s.getTime())-t.getTime())/p),E=(0,i.default)(E,0,1/0));let _="",I="";!e||e instanceof Error||!e.appName||e.appName==r.GENERIC_APP_NAME||(_=e.appName,I=" for application [APP_NAME]");const O=(e,a=n.LicenseDocsLink,s=l,t=E,o=_)=>e.replace("[LINK]",a).replace("[EMAIL]",s).replace("[APP_NAME]",o).replace("[DAYS]",`${t}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":(0,o.ConsoleLogByMessageType)(O("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":(0,o.ConsoleLogByMessageType)(O("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":(0,o.ConsoleLogByMessageType)(O("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":(0,o.ConsoleLogByMessageType)(O("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(E<=d)(0,o.ConsoleLogByMessageType)(O(`This AdapTable license${I} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,c.shouldLogThankYouMessage)()&&(0,o.ConsoleLogByMessageType)(O(`Thank you for using a valid AdapTable license${I}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":(0,o.ConsoleLogByMessageType)(O(`This AdapTable license${I} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":(0,o.ConsoleLogByMessageType)(O(`This AdapTable license${I} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction((0,s.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:t.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseShowWatermark)(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction((0,a.SystemLicenseDisablePersistence)())}destroy(){}}exports.LicenseService=L;

package/src/Utilities/Services/LicenseService/shouldLogThankYouMessage.d.ts

@@ -0,0 +1 @@
+export declare function shouldLogThankYouMessage(): boolean;

package/src/Utilities/Services/LicenseService/shouldLogThankYouMessage.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shouldLogThankYouMessage = void 0;
+function shouldLogThankYouMessage() {
+    try {
+        if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') {
+            return true;
+        }
+        return false;
+    }
+    catch (ex) {
+        return false;
+    }
+}
+exports.shouldLogThankYouMessage = shouldLogThankYouMessage;

package/src/Utilities/Services/MetamodelService.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MetamodelService = void 0;
+const tslib_1 = require("tslib");
 const adaptable_metamodel_1 = require("../../metamodel/adaptable.metamodel");
 const DefaultAdaptableOptions_1 = require("../Defaults/DefaultAdaptableOptions");
 const LoggingHelper_1 = require("../Helpers/LoggingHelper");
 const DocumentationLinkConstants_1 = require("../Constants/DocumentationLinkConstants");
+const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 const supportedMetamodelTypes = [
     'string',
     'number',
@@ -99,7 +101,7 @@ class MetamodelService {
             return gridInfoOptions;
         }
         // root-level properties are grouped in a synthetic 'Base Options' container
-        const baseOptionsItems = this.mapGridInfoContainerItems(adaptableOptionsMetamodel, adaptableOptionsValues, adaptableOptionsDefaultValues);
+        const baseOptionsItems = this.mapGridInfoContainerItems(adaptableOptionsMetamodel, adaptableOptionsValues, adaptableOptionsDefaultValues, filterItemProperty);
         gridInfoOptions.set('baseOptions', {
             containerLabel: 'Base Options',
             items: baseOptionsItems,
@@ -130,14 +132,14 @@ class MetamodelService {
         return gridInfoOptions;
     }
     mapGridInfoContainerItems(optionItemContainer, adaptableOptionsValues, defaultAdaptableOptionsValues, filter = (itemProperty) => itemProperty.gridInfo === 'item') {
-        var _a;
-        return (_a = optionItemContainer.properties) === null || _a === void 0 ? void 0 : _a.filter(filter).map((itemProperty) => {
+        return optionItemContainer.properties.filter(filter).map((itemProperty) => {
             return {
                 name: itemProperty.name,
                 value: adaptableOptionsValues === null || adaptableOptionsValues === void 0 ? void 0 : adaptableOptionsValues[itemProperty.name],
                 defaultValue: defaultAdaptableOptionsValues[itemProperty.name],
                 kind: itemProperty.kind,
-                description: itemProperty.description,
+                description: StringExtensions_1.default.UnescapeHtmlEntities(itemProperty.description),
+                uiLabel: itemProperty.uiLabel,
             };
         });
     }