@adaptabletools/adaptable 18.0.0-canary.9 → 18.0.0

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -68,6 +68,21 @@ export const scalarExpressionFunctions = {
         category: 'special',
         returnType: 'any',
     },
+    FIELD: {
+        handler(args, context) {
+            var _a, _b;
+            const fieldName = args[0];
+            if (StringExtensions.IsNullOrEmpty(fieldName)) {
+                throw new ExpressionEvaluationError('FIELD', 'requires a field name');
+            }
+            return (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.internalApi.getValueUsingField((_b = context.node) === null || _b === void 0 ? void 0 : _b.data, fieldName);
+        },
+        description: 'Returns the value of a row field (not necessarily mapped to a column). If the field is nested, use dot notation (e.g. "nested.fieldName")',
+        signatures: ['FIELD(fieldName:string)'],
+        examples: ['FIELD("fieldName")', 'FIELD("nested.fieldName")'],
+        category: 'special',
+        returnType: 'any',
+    },
     QUERY: {
         handler(args, context) {
             var _a, _b;

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

@@ -8,7 +8,8 @@ export declare function checkValidPrimaryKey(adaptable: IAdaptable): boolean;
 export declare function AdaptableObjectExistsInState(array: AdaptableObject[], itemToCheck: AdaptableObject): boolean;
 export declare function getAppropriateAccessLevel(adaptableObject: AdaptableObject, moduleAccessLevel: AccessLevel): AccessLevel;
 export declare function runAdaptableComparerFunction(columnId: string, columnValues: any[], adaptable: IAdaptable): AdaptableComparerFunction;
-export declare function addUuidAndSource(adaptableObject: AdaptableObject): AdaptableObject;
+export declare function addUuidAndSource<T extends AdaptableObject>(adaptableObject: T): T;
+export declare function removeUuidAndSource<T extends AdaptableObject>(adaptableObject: T): T;
 export declare const AdaptableHelper: {
     initPredefinedConfigWithUuids: typeof initPredefinedConfigWithUuids;
     checkValidPrimaryKey: typeof checkValidPrimaryKey;
@@ -16,5 +17,6 @@ export declare const AdaptableHelper: {
     runAdaptableComparerFunction: typeof runAdaptableComparerFunction;
     getAppropriateAccessLevel: typeof getAppropriateAccessLevel;
     addUuidAndSource: typeof addUuidAndSource;
+    removeUuidAndSource: typeof removeUuidAndSource;
 };
 export default AdaptableHelper;

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -86,6 +86,24 @@ export function addUuidAndSource(adaptableObject) {
     adaptableObject.Source = 'User';
     return adaptableObject;
 }
+export function removeUuidAndSource(adaptableObject) {
+    const clonedObject = structuredClone(adaptableObject);
+    const sanitiseObject = (object) => {
+        for (const key in object) {
+            if (key === 'Source' || key === 'Uuid') {
+                delete object[key];
+            }
+            else if (Array.isArray(object[key])) {
+                object[key].forEach((item) => sanitiseObject(item));
+            }
+            else if (typeof object[key] === 'object') {
+                sanitiseObject(object[key]);
+            }
+        }
+    };
+    sanitiseObject(clonedObject);
+    return clonedObject;
+}
 export const AdaptableHelper = {
     initPredefinedConfigWithUuids,
     checkValidPrimaryKey,
@@ -93,5 +111,6 @@ export const AdaptableHelper = {
     runAdaptableComparerFunction,
     getAppropriateAccessLevel,
     addUuidAndSource,
+    removeUuidAndSource,
 };
 export default AdaptableHelper;

package/src/Utilities/Interface/MessagePopups.d.ts

@@ -32,9 +32,6 @@ export interface ScreenPopup {
         [key: string]: any;
     };
 }
-export interface LoadingPopup {
-    ShowLoadingPopup: boolean;
-}
 export interface ConfirmationPopup {
     ShowConfirmationPopup: boolean;
     Header: string;

package/src/Utilities/MenuItem.d.ts

@@ -1,26 +1,29 @@
 import * as Redux from 'redux';
 import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, AdaptableContextMenuItemName, AdaptableColumnMenuItemName } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { AdaptableIcon, AdaptableSystemIconName } from '../PredefinedConfig/Common/AdaptableIcon';
-export declare class MenuItemDoReduxAction implements AdaptableMenuItem {
-    constructor(label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
+export declare class MenuItemDoReduxAction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> implements AdaptableMenuItem<MENU_TYPE_NAME> {
+    constructor(name: MENU_TYPE_NAME, label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
+    name: MENU_TYPE_NAME;
     reduxAction: Redux.Action;
     label: string;
     module: AdaptableModule;
     isVisible: boolean;
     icon: AdaptableIcon;
 }
-export declare class MenuItemDoClickFunction implements AdaptableMenuItem {
-    constructor(label: string, module: AdaptableModule, clickFunction: () => void, icon: AdaptableSystemIconName, isVisible: boolean);
+export declare class MenuItemDoClickFunction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> implements AdaptableMenuItem<MENU_TYPE_NAME> {
+    constructor(name: MENU_TYPE_NAME, label: string, module: AdaptableModule, clickFunction: () => void, icon: AdaptableSystemIconName, isVisible: boolean);
+    name: MENU_TYPE_NAME;
     onClick: () => void;
     label: string;
     module: AdaptableModule;
     isVisible: boolean;
     icon: AdaptableIcon;
 }
-export declare class MenuItemShowPopup implements AdaptableMenuItem {
-    constructor(label: string, module: AdaptableModule, componentName: string, icon: AdaptableSystemIconName, isVisible: boolean, popupParams?: ModuleParams);
+export declare class MenuItemShowPopup<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> implements AdaptableMenuItem<MENU_TYPE_NAME> {
+    constructor(name: MENU_TYPE_NAME, label: string, module: AdaptableModule, componentName: string, icon: AdaptableSystemIconName, isVisible: boolean, popupParams?: ModuleParams);
+    name: MENU_TYPE_NAME;
     reduxAction: Redux.Action;
     label: string;
     module: AdaptableModule;

package/src/Utilities/MenuItem.js

@@ -1,7 +1,8 @@
 import * as PopupRedux from '../Redux/ActionsReducers/PopupRedux';
 // A menu item which performs a Redux Action when it is clicke
 export class MenuItemDoReduxAction {
-    constructor(label, module, reduxAction, icon, isVisible) {
+    constructor(name, label, module, reduxAction, icon, isVisible) {
+        this.name = name;
         this.label = label;
         this.module = module;
         this.isVisible = isVisible;
@@ -12,7 +13,8 @@ export class MenuItemDoReduxAction {
     }
 }
 export class MenuItemDoClickFunction {
-    constructor(label, module, clickFunction, icon, isVisible) {
+    constructor(name, label, module, clickFunction, icon, isVisible) {
+        this.name = name;
         this.label = label;
         this.module = module;
         this.isVisible = isVisible;
@@ -24,7 +26,8 @@ export class MenuItemDoClickFunction {
 }
 // A menu item which shows a popup screen when it is clieked
 export class MenuItemShowPopup {
-    constructor(label, module, componentName, icon, isVisible, popupParams) {
+    constructor(name, label, module, componentName, icon, isVisible, popupParams) {
+        this.name = name;
         this.label = label;
         this.module = module;
         this.isVisible = isVisible;

package/src/Utilities/ObjectFactory.d.ts

@@ -21,14 +21,14 @@ import { Shortcut } from '../PredefinedConfig/ShortcutState';
 import { IPushPullReport } from '../PredefinedConfig/SystemState';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
-import { AdaptableTheme, BaseContext, ChartDefinition, ColumnFilter, CommentThread, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
+import { AdaptableTheme, BaseContext, ChartDefinition, ColumnFilter, CommentThread, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SpecialColumnSettings, SystemFilterPredicateId } from '../types';
 import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableApi, AdaptableComment, BadgeStyleDefinition, CellAddress, NamedQuery } from '../../types';
 import { ToastOptions } from '../components/Toastify';
 import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 export declare function CreateEmptyCustomSort(): CustomSort;
 export declare function CreateAdaptableComment(text: string, api: AdaptableApi): AdaptableComment;
-export declare function CreateEmptyCalculatedColumn(): CalculatedColumn;
+export declare function CreateEmptyCalculatedColumn(defaultSpecialColumnSettings: Partial<SpecialColumnSettings>): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
 export declare function CreateEmptyPlusMinusNudge(): PlusMinusNudge;
 export declare function CreateGenericAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition): AdaptableGenericAlert;
@@ -51,7 +51,7 @@ export declare function CreateReportSchedule(reportName: string): ReportSchedule
 export declare function CreateEmptySchedule(): Schedule;
 export declare function CreateEmptyShortcut(): Shortcut;
 export declare function CreateEmptyFormatColumn(): FormatColumn;
-export declare function CreateEmptyFreeTextColumn(): FreeTextColumn;
+export declare function CreateEmptyFreeTextColumn(defaultSpecialColumnSettings: Partial<SpecialColumnSettings>): FreeTextColumn;
 export declare function CreateEmptyLayout(layout?: Partial<Layout> & {
     Name: string;
 }, adaptableColumns?: AdaptableColumn[]): Layout;

package/src/Utilities/ObjectFactory.js

@@ -18,7 +18,7 @@ export function CreateAdaptableComment(text, api) {
     };
     return comment;
 }
-export function CreateEmptyCalculatedColumn() {
+export function CreateEmptyCalculatedColumn(defaultSpecialColumnSettings) {
     return {
         Uuid: createUuid(),
         ColumnId: EMPTY_STRING,
@@ -26,17 +26,7 @@ export function CreateEmptyCalculatedColumn() {
             ScalarExpression: EMPTY_STRING,
         },
         // need to create some defaults - which we will change later
-        CalculatedColumnSettings: {
-            DataType: undefined,
-            Filterable: true,
-            Resizable: true,
-            Groupable: false,
-            Sortable: true,
-            Pivotable: false,
-            Aggregatable: false,
-            SuppressMenu: false,
-            SuppressMovable: false,
-        },
+        CalculatedColumnSettings: Object.assign(Object.assign({}, defaultSpecialColumnSettings), { DataType: undefined }),
     };
 }
 export function CreateEmptyNamedQuery(expression) {
@@ -243,26 +233,17 @@ export function CreateEmptyFormatColumn() {
         Style: CreateEmptyStyle(),
         DisplayFormat: undefined,
         CellAlignment: undefined,
+        RowScope: undefined,
     };
 }
-export function CreateEmptyFreeTextColumn() {
+export function CreateEmptyFreeTextColumn(defaultSpecialColumnSettings) {
     return {
         Uuid: createUuid(),
         ColumnId: EMPTY_STRING,
         DefaultValue: EMPTY_STRING,
         FreeTextStoredValues: [],
         TextEditor: 'Inline',
-        FreeTextColumnSettings: {
-            DataType: 'String',
-            Filterable: true,
-            Resizable: true,
-            Groupable: false,
-            Sortable: true,
-            Pivotable: false,
-            Aggregatable: false,
-            SuppressMenu: false,
-            SuppressMovable: false,
-        },
+        FreeTextColumnSettings: Object.assign(Object.assign({}, defaultSpecialColumnSettings), { DataType: 'String' }),
     };
 }
 export function CreateEmptyLayout(layout, adaptableColumns) {
@@ -301,6 +282,8 @@ export function CreateEmptyCellSummmary() {
         Max: undefined,
         Min: undefined,
         Count: undefined,
+        Newest: undefined,
+        Oldest: undefined,
         Std_Deviation: undefined,
         Only: undefined,
     };
@@ -318,7 +301,6 @@ export function CreateEmptyStyledColumn() {
     return {
         Uuid: createUuid(),
         ColumnId: EMPTY_STRING,
-        IncludeGroupedRows: false,
     };
 }
 export function CreateDefaultStyledColumnBadge() {

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

@@ -22,5 +22,6 @@ export declare class AggregatedScalarLiveValue {
     getAllAggregationValues(): number[];
     private getAggregationValue;
     getGlobalAggregatedValue(): any;
+    private getRowNodeValueForColumnId;
     private computeAggregatedValue;
 }

package/src/Utilities/Services/AggregatedScalarLiveValue.js

@@ -60,7 +60,7 @@ export class AggregatedScalarLiveValue {
         var _a, _b;
         if ((_a = this.expressionEvaluation.aggregationParams.groupBy) === null || _a === void 0 ? void 0 : _a.length) {
             const groupColumns = this.expressionEvaluation.aggregationParams.groupBy.map((groupByParam) => groupByParam.field);
-            const groupKeys = groupColumns.map((groupColumnName) => this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, groupColumnName));
+            const groupKeys = groupColumns.map((groupColumnName) => this.getRowNodeValueForColumnId(rowNode, groupColumnName));
             return (_b = this.aggregationResult.deepMap.get(groupKeys)) === null || _b === void 0 ? void 0 : _b.reducerResults[this.aggregationReducerName];
         }
         return this.getGlobalAggregatedValue();
@@ -68,6 +68,11 @@ export class AggregatedScalarLiveValue {
     getGlobalAggregatedValue() {
         return this.aggregationResult.reducerResults[this.aggregationReducerName];
     }
+    getRowNodeValueForColumnId(rowNode, columnId) {
+        const rawValue = this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, columnId);
+        // we need to convert the Date object to a number, otherwise the grouping will not work (each Date instance is unique)
+        return rawValue instanceof Date ? rawValue.getTime() : rawValue;
+    }
     computeAggregatedValue(expressionEvaluation) {
         var _a;
         const gridRowNodes = expressionEvaluation.getRowNodes
@@ -77,18 +82,16 @@ export class AggregatedScalarLiveValue {
             });
         // we iterate over the RowNode list (we need this to handle complex column values (nested values, valueGetters etc)
         // so we will map the fieldNames to RowNode.data
-        const mapReducerValueGetter = (fieldName) => {
-            return (rowNode) => {
-                return this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, fieldName);
-            };
+        const mapReducerValueGetter = (columnId) => {
+            return (rowNode) => this.getRowNodeValueForColumnId(rowNode, columnId);
         };
         Object.values(expressionEvaluation.aggregationParams.reducers).forEach((aggregationReducer) => {
             aggregationReducer.getter = mapReducerValueGetter(aggregationReducer.field);
             // nullify the field to force the fallback on the getter fn
             aggregationReducer.field = null;
         });
-        const mapGroupByToKey = (fieldName) => {
-            return (_unusableProperty, rowNode) => this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, fieldName);
+        const mapGroupByToKey = (columnId) => {
+            return (_unusableProperty, rowNode) => this.getRowNodeValueForColumnId(rowNode, columnId);
         };
         (_a = expressionEvaluation.aggregationParams.groupBy) === null || _a === void 0 ? void 0 : _a.forEach((groupByDef) => {
             groupByDef.toKey = mapGroupByToKey(groupByDef.field);
@@ -96,11 +99,10 @@ export class AggregatedScalarLiveValue {
         let aggregatedRowNodes = gridRowNodes;
         if (expressionEvaluation.sortByColumn) {
             const sortByColumn = expressionEvaluation.sortByColumn;
-            const getRowNodeValue = (rowNode, columnId) => this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, columnId);
             // currently, we support only ascending sorting
             aggregatedRowNodes.sort((first, second) => {
-                const firstValue = getRowNodeValue(first, sortByColumn);
-                const secondValue = getRowNodeValue(second, sortByColumn);
+                const firstValue = this.getRowNodeValueForColumnId(first, sortByColumn);
+                const secondValue = this.getRowNodeValueForColumnId(second, sortByColumn);
                 if (firstValue < secondValue) {
                     return -1;
                 }

package/src/Utilities/Services/CellPopupService.js

@@ -74,9 +74,9 @@ export class CellPopupService {
             this.hidePopup();
             return;
         }
-        const cellNotes = this.adaptable.api.notesApi.getCellNotes(cellPosition);
+        const cellNote = this.adaptable.api.noteApi.getNoteForCell(cellPosition);
         const cellComments = this.adaptable.api.commentApi.getCommentThread(cellPosition);
-        const hasNotesOrComments = (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length) || cellComments;
+        const hasNotesOrComments = cellNote || cellComments;
         // call only if it is different
         if (CellPopupService.isSameAddress(openCellAddress, cellPosition)) {
             return;
@@ -92,9 +92,9 @@ export class CellPopupService {
             return;
         }
         // if open but this has no note, close
-        const cellNotes = this.adaptable.api.notesApi.getCellNotes(cellAddress);
+        const cellNote = this.adaptable.api.noteApi.getNoteForCell(cellAddress);
         const cellComments = this.adaptable.api.commentApi.getCommentThread(cellAddress);
-        const hasNotesOrComments = (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length) || cellComments;
+        const hasNotesOrComments = cellNote || cellComments;
         if (openCellAddress && !hasNotesOrComments) {
             // hide only if in edit mode
             // because if you select a cell and move the mouse fast over another cell

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

@@ -4,11 +4,8 @@ import { IAdaptableService } from './IAdaptableService';
 import { ExcelStyle, IRowNode } from '@ag-grid-community/core';
 import { CustomDestination, SystemExportDestination } from '../../../types';
 export interface IReportService extends IAdaptableService {
-    resetExcelStyleMemoization(): void;
-    registerExcelStyle(excelStyle: Partial<ExcelStyle>, cellClassKey: string): void;
-    getRegisteredExcelStyles(): ExcelStyle[];
+    buildExcelStylesForVisualReports(): ExcelStyle[];
     getExcelStyleIdForCellClassKey(cellClassKey: string): string;
-    registerExcelStyleWithFormattedDate(cellClassId: string, isoFormattedValue: string): void;
     getExcelStyleWithFormattedDate(cellClassId: string): string;
     CreateSystemReport(systemReportName: SystemReportName): Report;
     IsSystemReport(reportName: string): boolean;

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

@@ -1,193 +1 @@
-import { SystemLicenseDisablePersistence, SystemLicenseShowWatermark, } from '../../../Redux/ActionsReducers/SystemRedux';
-import { PopupShowAlert } from '../../../Redux/ActionsReducers/PopupRedux';
-import ObjectFactory from '../../ObjectFactory';
-import clamp from 'lodash/clamp';
-import { LicenseDocsLink } from '../../Constants/DocumentationLinkConstants';
-import { decode as decodeLicense, GENERIC_APP_NAME } from '../../license/decode';
-import { shouldLogThankYouMessage } from './shouldLogThankYouMessage';
-const EMAIL = 'sales@adaptabletools.com';
-const COMMERCIAL_LICENSE_SHOW_INFO_DAYS_BEFORE_EXPIRE = 10;
-const DAY_IN_MS = 1000 * 60 * 60 * 24;
-export var LicenseValidityType;
-(function (LicenseValidityType) {
-    LicenseValidityType["INVALID_LICENSE"] = "INVALID_LICENSE";
-    LicenseValidityType["NO_LICENSE"] = "NO_LICENSE";
-    LicenseValidityType["NON_PRODUCTION_VALID"] = "NON_PRODUCTION_VALID";
-    LicenseValidityType["NON_PRODUCTION_EXPIRED_IN_SCOPE"] = "NON_PRODUCTION_EXPIRED_IN_SCOPE";
-    LicenseValidityType["NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE"] = "NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE";
-    LicenseValidityType["COMMERCIAL_VALID"] = "COMMERCIAL_VALID";
-    LicenseValidityType["COMMERCIAL_EXPIRED_IN_SCOPE"] = "COMMERCIAL_EXPIRED_IN_SCOPE";
-    LicenseValidityType["COMMERCIAL_EXPIRED_OUT_OF_SCOPE"] = "COMMERCIAL_EXPIRED_OUT_OF_SCOPE";
-})(LicenseValidityType || (LicenseValidityType = {}));
-const SANDPACK_REGEX = /(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g;
-const SANDBOX_REGEX = /(https):\/\/\S+(\.csb\.app)/g;
-const DEMO_REGEX = /(https):\/\/\S+(\.adaptabletools\.com)/g;
-const getOrigin = () => {
-    return typeof window !== 'undefined' ? window.location.origin : '';
-};
-const isInsideSandpack = () => {
-    const [_fullUrl, protocol, sandpackUrl] = Array.from(SANDPACK_REGEX.exec(getOrigin()) || []);
-    return protocol === 'https' && sandpackUrl === 'sandpack.codesandbox.io';
-};
-const isInsideSandbox = () => {
-    const [_fullUrl, protocol, sandboxUrl] = Array.from(SANDBOX_REGEX.exec(getOrigin()) || []);
-    return protocol === 'https' && sandboxUrl === '.csb.app';
-};
-const isDemoApp = () => {
-    const [_fullUrl, protocol, demoAppUrl] = Array.from(DEMO_REGEX.exec(getOrigin()) || []);
-    return protocol === 'https' && demoAppUrl === '.adaptabletools.com';
-};
-export class LicenseService {
-    constructor(adaptable, licenseKey, packageDetails) {
-        this.adaptable = adaptable;
-        this.licenseKey = licenseKey;
-        this.packageDetails = packageDetails;
-        this.adaptable = adaptable;
-        this.adaptable.api.eventApi.on('AdaptableReady', () => {
-            requestAnimationFrame(() => {
-                // using a rAF because we want to make sure that the window.location.origin is available (Master/Detail is fidgity sometimes)
-                this.init();
-            });
-        });
-    }
-    init() {
-        let details = null;
-        if (this.licenseKey) {
-            try {
-                details = decodeLicense(this.licenseKey);
-            }
-            catch (error) {
-                details = error;
-            }
-        }
-        if (!isInsideSandpack() && !isInsideSandbox() && !isDemoApp()) {
-            this.handleLicenseValidation(details, this.getValidityType(details, this.packageDetails));
-        }
-    }
-    getValidityType(details, packageDetails) {
-        if (!details) {
-            return LicenseValidityType.NO_LICENSE;
-        }
-        if (details instanceof Error) {
-            return LicenseValidityType.INVALID_LICENSE;
-        }
-        const currentVersionReleaseDate = new Date(packageDetails.publishedAt);
-        const licenseEndDate = new Date(details.end);
-        const currentDate = new Date();
-        const isExpired = licenseEndDate < currentDate;
-        const isTrial = details.trial;
-        const isScope = licenseEndDate > currentVersionReleaseDate;
-        let validityType = null;
-        if (isExpired) {
-            if (isScope) {
-                if (isTrial) {
-                    validityType = LicenseValidityType.NON_PRODUCTION_EXPIRED_IN_SCOPE;
-                }
-                else {
-                    validityType = LicenseValidityType.COMMERCIAL_EXPIRED_IN_SCOPE;
-                }
-            }
-            else {
-                if (isTrial) {
-                    validityType = LicenseValidityType.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE;
-                }
-                else {
-                    validityType = LicenseValidityType.COMMERCIAL_EXPIRED_OUT_OF_SCOPE;
-                }
-            }
-        }
-        else {
-            if (isTrial) {
-                validityType = LicenseValidityType.NON_PRODUCTION_VALID;
-            }
-            else {
-                validityType = LicenseValidityType.COMMERCIAL_VALID;
-            }
-        }
-        return validityType;
-    }
-    handleLicenseValidation(details, validityType) {
-        var _a;
-        const nowAtMidnight = new Date();
-        nowAtMidnight.setHours(0, 0, 0, 0);
-        let daysLeft = 0;
-        if (!(details instanceof Error) && (details === null || details === void 0 ? void 0 : details.end)) {
-            daysLeft = Math.floor((((_a = details === null || details === void 0 ? void 0 : details.end) === null || _a === void 0 ? void 0 : _a.getTime()) - nowAtMidnight.getTime()) / DAY_IN_MS);
-            daysLeft = clamp(daysLeft, 0, Infinity);
-        }
-        let APP_NAME = '';
-        let forApp = '';
-        if (details &&
-            !(details instanceof Error) &&
-            details.appName &&
-            details.appName != GENERIC_APP_NAME) {
-            APP_NAME = details.appName;
-            forApp = ` for application [APP_NAME]`;
-        }
-        const annotateMessage = (message, link = LicenseDocsLink, email = EMAIL, days = daysLeft, appName = APP_NAME) => {
-            return message
-                .replace('[LINK]', link)
-                .replace('[EMAIL]', email)
-                .replace('[APP_NAME]', appName)
-                .replace('[DAYS]', `${days}`);
-        };
-        switch (validityType) {
-            case 'NO_LICENSE':
-            case 'NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE':
-                this.adaptable.logger.consoleLogByMessageType(annotateMessage('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':
-                this.adaptable.logger.consoleLogByMessageType(annotateMessage('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':
-                this.adaptable.logger.consoleLogByMessageType(annotateMessage('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':
-                this.adaptable.logger.consoleLogByMessageType(annotateMessage('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 (daysLeft <= COMMERCIAL_LICENSE_SHOW_INFO_DAYS_BEFORE_EXPIRE) {
-                    this.adaptable.logger.consoleLogByMessageType(annotateMessage(`This AdapTable license${forApp} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`), 'Info');
-                }
-                else {
-                    try {
-                        if (shouldLogThankYouMessage()) {
-                            this.adaptable.logger.consoleLogByMessageType(annotateMessage(`Thank you for using a valid AdapTable license${forApp}. Your license will expire in [DAYS] days.`), 'Info');
-                        }
-                    }
-                    catch (ex) { }
-                }
-                break;
-            case 'COMMERCIAL_EXPIRED_IN_SCOPE':
-                this.adaptable.logger.consoleLogByMessageType(annotateMessage(`This AdapTable license${forApp} 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':
-                this.adaptable.logger.consoleLogByMessageType(annotateMessage(`This AdapTable license${forApp} 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');
-                break;
-        }
-    }
-    showNotification(text) {
-        this.adaptable.api.internalApi.dispatchReduxAction(PopupShowAlert({
-            alertType: 'generic',
-            header: 'License Error',
-            message: text,
-            alertDefinition: ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
-        }));
-    }
-    showWatermark(text) {
-        this.adaptable.api.internalApi.dispatchReduxAction(SystemLicenseShowWatermark(text));
-    }
-    disableStatePersistence() {
-        this.adaptable.api.internalApi.dispatchReduxAction(SystemLicenseDisablePersistence());
-    }
-    destroy() { }
-}
+import{SystemLicenseDisablePersistence as e,SystemLicenseShowWatermark as a}from"../../../Redux/ActionsReducers/SystemRedux";import{PopupShowAlert as t}from"../../../Redux/ActionsReducers/PopupRedux";import i from"../../ObjectFactory";import s from"lodash/clamp";import{LicenseDocsLink as o}from"../../Constants/DocumentationLinkConstants";import{decode as n,GENERIC_APP_NAME as r}from"../../license/decode";import{shouldLogThankYouMessage as l}from"./shouldLogThankYouMessage";const c="sales@adaptabletools.com",d=10,p=864e5;export var LicenseValidityType;!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"}(LicenseValidityType||(LicenseValidityType={}));const h=()=>"undefined"!=typeof window?window.location.origin:"",E=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===i},I=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\S+(\.csb\.app)/g.exec(e)||[]);return"https"===t&&".csb.app"===i},_=()=>{const e=h(),[a,t,i]=Array.from(/(https):\/\/\S+(\.adaptabletools\.com)/g.exec(e)||[]);return"https"===t&&".adaptabletools.com"===i};export class LicenseService{constructor(e,a,t){this.adaptable=e,this.licenseKey=a,this.packageDetails=t,this.adaptable=e,this.adaptable.api.eventApi.on("AdaptableReady",(()=>{requestAnimationFrame((()=>{this.init()}))}))}init(){let e=null;if(this.licenseKey)try{e=n(this.licenseKey)}catch(a){e=a}E()||I()||_()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return LicenseValidityType.NO_LICENSE;if(e instanceof Error)return LicenseValidityType.INVALID_LICENSE;const t=new Date(a.publishedAt),i=new Date(e.end),s=i<new Date,o=e.trial;let n=null;return n=s?i>t?o?LicenseValidityType.NON_PRODUCTION_EXPIRED_IN_SCOPE:LicenseValidityType.COMMERCIAL_EXPIRED_IN_SCOPE:o?LicenseValidityType.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:LicenseValidityType.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:o?LicenseValidityType.NON_PRODUCTION_VALID:LicenseValidityType.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var t;const i=new Date;i.setHours(0,0,0,0);let n=0;e instanceof Error||!(null==e?void 0:e.end)||(n=Math.floor(((null===(t=null==e?void 0:e.end)||void 0===t?void 0:t.getTime())-i.getTime())/p),n=s(n,0,1/0));let h="",E="";!e||e instanceof Error||!e.appName||e.appName==r||(h=e.appName,E=" for application [APP_NAME]");const I=(e,a=o,t=c,i=n,s=h)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",s).replace("[DAYS]",`${i}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(I("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":this.adaptable.logger.consoleLogByMessageType(I("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":this.adaptable.logger.consoleLogByMessageType(I("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":this.adaptable.logger.consoleLogByMessageType(I("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(n<=d)this.adaptable.logger.consoleLogByMessageType(I(`This AdapTable license${E} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{l()&&this.adaptable.logger.consoleLogByMessageType(I(`Thank you for using a valid AdapTable license${E}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(I(`This AdapTable license${E} 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":this.adaptable.logger.consoleLogByMessageType(I(`This AdapTable license${E} 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(t({alertType:"generic",header:"License Error",message:e,alertDefinition:i.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction(a(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction(e())}destroy(){}}

package/src/Utilities/Services/ModuleService.js

@@ -10,13 +10,13 @@ export class ModuleService {
         const settingsPanelMenuItems = [];
         const buttonMenuItems = [];
         this.getModuleCollection().forEach((module) => {
-            const settingsPanelMenuItem = module.addModuleMenuItem('ModuleMenu');
+            const settingsPanelMenuItem = module.createModuleMenuItem('ModuleMenu');
             if (Helper.objectExists(settingsPanelMenuItem)) {
                 if (settingsPanelMenuItems.findIndex((m) => m.module == settingsPanelMenuItem.module) == -1) {
                     settingsPanelMenuItems.push(settingsPanelMenuItem);
                 }
             }
-            const buttonMenuItem = module.addModuleMenuItem('ModuleButton');
+            const buttonMenuItem = module.createModuleMenuItem('ModuleButton');
             if (Helper.objectExists(buttonMenuItem)) {
                 if (buttonMenuItems.findIndex((m) => m.module == buttonMenuItem.module) == -1) {
                     buttonMenuItems.push(buttonMenuItem);
@@ -101,6 +101,8 @@ export class ModuleService {
                 return learnUrl + 'handbook-exporting';
             case 'ColumnFilter':
                 return learnUrl + 'handbook-column-filter';
+            case 'Comment':
+                return learnUrl + 'handbook-comments';
             case 'GridFilter':
                 return learnUrl + 'handbook-grid-filter';
             case 'FlashingCell':
@@ -113,6 +115,8 @@ export class ModuleService {
                 return learnUrl + 'handbook-monitoring-grid-info';
             case 'Layout':
                 return learnUrl + 'handbook-layouts';
+            case 'Note':
+                return learnUrl + 'handbook-notes';
             case 'PlusMinus':
                 return learnUrl + 'handbook-editing-plus-minus';
             case 'NamedQuery':

package/src/Utilities/Services/QueryLanguageService.js

@@ -48,7 +48,7 @@ export class QueryLanguageService {
         const moduleExpressionFunctions = this.getModuleExpressionFunctionsMap(module);
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         const reactiveExpression$ = parser.evaluate(reactiveExpression, {
-            node: reactiveExpression,
+            node: this.adaptableApi.gridApi.getFirstRowNode(),
             adaptableApi: this.adaptableApi,
             userName: this.adaptableApi.optionsApi.getUserName(),
             adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
@@ -62,7 +62,7 @@ export class QueryLanguageService {
         const moduleExpressionFunctionsMap = this.getModuleExpressionFunctionsMap(module);
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctionsMap);
         const aggregationEvaluation = parser.evaluate(aggregationExpression, {
-            node: aggregationExpression,
+            node: this.adaptableApi.gridApi.getFirstRowNode(),
             adaptableApi: this.adaptableApi,
             userName: this.adaptableApi.optionsApi.getUserName(),
             adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),

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

@@ -10,11 +10,8 @@ export declare class ReportService implements IReportService {
     private cellClassKey2excelStyleIdMap;
     private excelStylesWithFormattedDate;
     constructor(adaptableApi: AdaptableApi);
-    resetExcelStyleMemoization(): void;
-    registerExcelStyle(excelStyle: Partial<ExcelStyle>, cellClassKey: string): void;
-    getRegisteredExcelStyles(): ExcelStyle[];
+    destroy(): void;
     getExcelStyleIdForCellClassKey(cellClassKey: string): string;
-    registerExcelStyleWithFormattedDate(cellClassId: string, isoFormattedValue: string): void;
     getExcelStyleWithFormattedDate(cellClassId: string): string;
     CreateSystemReport(systemReportName: SystemReportName): Report;
     IsSystemReport(reportName: string): boolean;
@@ -33,7 +30,12 @@ export declare class ReportService implements IReportService {
     getCellExportValueFromRowNode(rowNode: IRowNode, columnId: string): any;
     getCellExportValueFromRawValue(rowNode: IRowNode, cellRawValue: any, columnId: string): any;
     getReportFileName(reportName: string, destination: SystemExportDestination | CustomDestination): string;
-    destroy(): void;
     private getCustomExportDateFormat;
     private getCellExportValueFromRawValueByType;
+    buildExcelStylesForVisualReports(): ExcelStyle[];
+    createExcelStyleMemoization(): void;
+    private convertCSSToExcelStyle;
+    private resetExcelStyleMemoization;
+    private registerExcelStyle;
+    private registerExcelStyleWithFormattedDate;
 }