@adaptabletools/adaptable-cjs 18.0.0-canary.9 → 18.0.1

package/src/Utilities/Services/CellPopupService.js

@@ -78,9 +78,9 @@ 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;
@@ -96,9 +96,9 @@ 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,198 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LicenseService = exports.LicenseValidityType = void 0;
-const tslib_1 = require("tslib");
-const SystemRedux_1 = require("../../../Redux/ActionsReducers/SystemRedux");
-const PopupRedux_1 = require("../../../Redux/ActionsReducers/PopupRedux");
-const ObjectFactory_1 = tslib_1.__importDefault(require("../../ObjectFactory"));
-const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
-const DocumentationLinkConstants_1 = require("../../Constants/DocumentationLinkConstants");
-const decode_1 = require("../../license/decode");
-const shouldLogThankYouMessage_1 = require("./shouldLogThankYouMessage");
-const EMAIL = 'sales@adaptabletools.com';
-const COMMERCIAL_LICENSE_SHOW_INFO_DAYS_BEFORE_EXPIRE = 10;
-const DAY_IN_MS = 1000 * 60 * 60 * 24;
-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 = exports.LicenseValidityType || (exports.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';
-};
-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 = (0, decode_1.decode)(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 = (0, clamp_1.default)(daysLeft, 0, Infinity);
-        }
-        let APP_NAME = '';
-        let forApp = '';
-        if (details &&
-            !(details instanceof Error) &&
-            details.appName &&
-            details.appName != decode_1.GENERIC_APP_NAME) {
-            APP_NAME = details.appName;
-            forApp = ` for application [APP_NAME]`;
-        }
-        const annotateMessage = (message, link = DocumentationLinkConstants_1.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 ((0, shouldLogThankYouMessage_1.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((0, PopupRedux_1.PopupShowAlert)({
-            alertType: 'generic',
-            header: 'License Error',
-            message: text,
-            alertDefinition: ObjectFactory_1.default.CreateInternalAlertDefinitionForMessages('Error'),
-        }));
-    }
-    showWatermark(text) {
-        this.adaptable.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemLicenseShowWatermark)(text));
-    }
-    disableStatePersistence() {
-        this.adaptable.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemLicenseDisablePersistence)());
-    }
-    destroy() { }
-}
-exports.LicenseService = LicenseService;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/SystemRedux"),t=require("../../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../../ObjectFactory")),i=e.__importDefault(require("lodash/clamp")),o=require("../../Constants/DocumentationLinkConstants"),n=require("../../license/decode"),r=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",c=10,d=864e5;var p;!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"}(p=exports.LicenseValidityType||(exports.LicenseValidityType={}));const h=()=>"undefined"!=typeof window?window.location.origin:"",E=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===s},_=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.csb\.app)/g.exec(e)||[]);return"https"===t&&".csb.app"===s},I=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.adaptabletools\.com)/g.exec(e)||[]);return"https"===t&&".adaptabletools.com"===s};class O{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=(0,n.decode)(this.licenseKey)}catch(a){e=a}E()||_()||I()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),i=s<new Date,o=e.trial;let n=null;return n=i?s>t?o?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:o?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:o?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){var t;const s=new Date;s.setHours(0,0,0,0);let p=0;e instanceof Error||!(null==e?void 0:e.end)||(p=Math.floor(((null===(t=null==e?void 0:e.end)||void 0===t?void 0:t.getTime())-s.getTime())/d),p=(0,i.default)(p,0,1/0));let h="",E="";!e||e instanceof Error||!e.appName||e.appName==n.GENERIC_APP_NAME||(h=e.appName,E=" for application [APP_NAME]");const _=(e,a=o.LicenseDocsLink,t=l,s=p,i=h)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",i).replace("[DAYS]",`${s}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(_("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(_("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(_("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(_("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(p<=c)this.adaptable.logger.consoleLogByMessageType(_(`This AdapTable license${E} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,r.shouldLogThankYouMessage)()&&this.adaptable.logger.consoleLogByMessageType(_(`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(_(`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(_(`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((0,t.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:s.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=O;

package/src/Utilities/Services/ModuleService.js

@@ -14,13 +14,13 @@ class ModuleService {
         const settingsPanelMenuItems = [];
         const buttonMenuItems = [];
         this.getModuleCollection().forEach((module) => {
-            const settingsPanelMenuItem = module.addModuleMenuItem('ModuleMenu');
+            const settingsPanelMenuItem = module.createModuleMenuItem('ModuleMenu');
             if (Helper_1.default.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_1.default.objectExists(buttonMenuItem)) {
                 if (buttonMenuItems.findIndex((m) => m.module == buttonMenuItem.module) == -1) {
                     buttonMenuItems.push(buttonMenuItem);
@@ -105,6 +105,8 @@ 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':
@@ -117,6 +119,8 @@ 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

@@ -52,7 +52,7 @@ 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(),
@@ -66,7 +66,7 @@ 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;
 }

package/src/Utilities/Services/ReportService.js

@@ -11,6 +11,8 @@ const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/String
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
 const uuid_1 = require("../../components/utils/uuid");
 const ObjectFactory_1 = require("../ObjectFactory");
+const StyleHelper_1 = require("../Helpers/StyleHelper");
+const tinycolor2_1 = tslib_1.__importDefault(require("tinycolor2"));
 class ReportService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
@@ -19,29 +21,12 @@ class ReportService {
         this.excelStylesWithFormattedDate = {};
         this.adaptableApi = adaptableApi;
     }
-    resetExcelStyleMemoization() {
-        this.excelStylesCache = {};
-        this.cellClassKey2excelStyleIdMap = {};
-        this.excelStylesWithFormattedDate = {};
-    }
-    registerExcelStyle(excelStyle, cellClassKey) {
-        const excelStyleKey = JSON.stringify(excelStyle);
-        if (!this.excelStylesCache[excelStyleKey]) {
-            const excelStyleId = (0, uuid_1.createUuid)();
-            const excelStyleWithId = Object.assign(Object.assign({}, excelStyle), { id: excelStyleId });
-            this.excelStylesCache[excelStyleKey] = excelStyleWithId;
-        }
-        this.cellClassKey2excelStyleIdMap[cellClassKey] = this.excelStylesCache[excelStyleKey].id;
-    }
-    getRegisteredExcelStyles() {
-        return Object.values(this.excelStylesCache);
+    destroy() {
+        // TO DO
     }
     getExcelStyleIdForCellClassKey(cellClassKey) {
         return this.cellClassKey2excelStyleIdMap[cellClassKey];
     }
-    registerExcelStyleWithFormattedDate(cellClassId, isoFormattedValue) {
-        this.excelStylesWithFormattedDate[cellClassId] = isoFormattedValue;
-    }
     getExcelStyleWithFormattedDate(cellClassId) {
         return this.excelStylesWithFormattedDate[cellClassId];
     }
@@ -103,8 +88,11 @@ class ReportService {
             reportName == GeneralConstants_1.VISUAL_DATA_REPORT);
     }
     IsSystemReportActive(reportName) {
-        if (reportName == GeneralConstants_1.SELECTED_CELLS_REPORT || reportName == GeneralConstants_1.SELECTED_ROWS_REPORT) {
-            return this.adaptableApi.gridApi.isGridSelectable();
+        if (reportName == GeneralConstants_1.SELECTED_CELLS_REPORT) {
+            return this.adaptableApi.gridApi.isGridRangeSelectable();
+        }
+        if (reportName == GeneralConstants_1.SELECTED_ROWS_REPORT) {
+            return this.adaptableApi.gridApi.isGridRowSelectable();
         }
         if (reportName === GeneralConstants_1.VISUAL_DATA_REPORT) {
             return this.adaptableApi.exportApi
@@ -150,7 +138,7 @@ class ReportService {
             case 'SelectedColumns':
                 return '[Selected Columns]';
             case 'ScopeColumns':
-                return this.adaptableApi.scopeApi.getScopeDescription(report.Scope);
+                return this.adaptableApi.columnScopeApi.getScopeDescription(report.Scope);
         }
     }
     GetReportExpressionDescription(report, cols) {
@@ -213,7 +201,7 @@ class ReportService {
                     reportColumns = report.Scope.ColumnIds.map((columnId) => this.adaptableApi.columnApi.getColumnWithColumnId(columnId)).filter((c) => c);
                 }
                 else {
-                    reportColumns = this.adaptableApi.scopeApi.getColumnsForScope(report.Scope);
+                    reportColumns = this.adaptableApi.columnScopeApi.getColumnsForScope(report.Scope);
                 }
                 break;
         }
@@ -369,9 +357,6 @@ class ReportService {
         }
         return fileName;
     }
-    destroy() {
-        // TO DO
-    }
     getCustomExportDateFormat() {
         return this.adaptableApi.optionsApi.getExportOptions().exportDateFormat;
     }
@@ -383,5 +368,239 @@ class ReportService {
             : // type === formattedValue
                 this.adaptableApi.gridApi.getDisplayValueFromRawValue(rowNode, columnId, cellRawValue);
     }
+    // aggregate and merge all acive Adaptable styles with the user proviided ExcelStyles
+    buildExcelStylesForVisualReports() {
+        // for historical reasons, the styles are merged as class variables
+        // we could/should refactor this to be more functional
+        this.createExcelStyleMemoization();
+        return Object.values(this.excelStylesCache);
+    }
+    createExcelStyleMemoization() {
+        this.resetExcelStyleMemoization();
+        // we memoize as much as possible, as this is called quite A LOT
+        const adaptableColumnMap = {};
+        const getAdaptableColumnWithColumnId = (columnId) => {
+            const memoizedColumn = adaptableColumnMap[columnId];
+            if (memoizedColumn) {
+                return memoizedColumn;
+            }
+            const abColumn = this.adaptableApi.columnApi.getColumnWithColumnId(columnId);
+            adaptableColumnMap[columnId] = abColumn;
+            return abColumn;
+        };
+        const formatColumnsWithDisplayFormatForColumn = {};
+        const getFormatColumnsWithDisplayFormatForColumn = (columnId) => {
+            const memoizedFormatColumns = formatColumnsWithDisplayFormatForColumn[columnId];
+            if (memoizedFormatColumns) {
+                return memoizedFormatColumns;
+            }
+            const abColumn = getAdaptableColumnWithColumnId(columnId);
+            const formatColumns = this.adaptableApi.formatColumnApi.internalApi.getFormatColumnsWithDisplayFormatForColumn(abColumn);
+            formatColumnsWithDisplayFormatForColumn[columnId] = formatColumns;
+            return formatColumns;
+        };
+        const isDateCellExportedAsFormattedValue = this.adaptableApi.exportApi.internalApi.isDateCellExportedAsFormattedValue();
+        const displayedColumns = this.adaptableApi.agGridApi.getAllDisplayedColumns();
+        const colDefs = displayedColumns.map((column) => {
+            return column.getColDef();
+        });
+        const forAllVisibleRowNodesDoConfig = { includeGroupRows: true };
+        const agGridApi = this.adaptableApi.agGridApi;
+        const userExcelStyles = this.adaptableApi.internalApi
+            .getAdaptableInstance()
+            .agGridAdapter.getUserGridOptionsProperty('excelStyles') || [];
+        this.adaptableApi.internalApi.forAllVisibleRowNodesDo((node, rowIndex) => {
+            var _a;
+            const rowParams = {
+                node,
+                data: node.data,
+                rowIndex,
+                api: agGridApi,
+                columnApi: null,
+                context: ((_a = agGridApi.__getContext) === null || _a === void 0 ? void 0 : _a.call(agGridApi)) || {},
+            };
+            const getRowStyleFn = agGridApi.getGridOption('getRowStyle');
+            const rowStyle = getRowStyleFn ? getRowStyleFn(rowParams) : {};
+            displayedColumns.forEach((column, columnIndex) => {
+                var _a, _b, _c;
+                const colDef = colDefs[columnIndex];
+                let cellClassParams;
+                const getLazyCellClassParams = () => {
+                    if (!cellClassParams) {
+                        cellClassParams = {
+                            colDef,
+                            node,
+                            column,
+                            data: node.data,
+                            value: this.adaptableApi.gridApi.getRawValueFromRowNode(node, column.getId()),
+                            rowIndex,
+                            api: agGridApi,
+                            columnApi: null,
+                            context: {},
+                        };
+                    }
+                    return cellClassParams;
+                };
+                const cellStyle = typeof colDef.cellStyle === 'function' ? colDef.cellStyle(getLazyCellClassParams()) : {};
+                const excelStyles = [];
+                // add user defined excel styles
+                let userColDefCellClass = this.adaptableApi.internalApi
+                    .getAdaptableInstance()
+                    .agGridColumnAdapter.getUserColDefProperty(column.getColId(), 'cellClass');
+                const userDefinedCellClass = typeof userColDefCellClass === 'function'
+                    ? userColDefCellClass(getLazyCellClassParams())
+                    : userColDefCellClass;
+                const userDefinedExcelStyle = userDefinedCellClass &&
+                    userExcelStyles.find((excelStyle) => {
+                        var _a;
+                        return typeof userDefinedCellClass === 'string'
+                            ? userDefinedCellClass === excelStyle.id
+                            : (_a = userDefinedCellClass === null || userDefinedCellClass === void 0 ? void 0 : userDefinedCellClass.includes) === null || _a === void 0 ? void 0 : _a.call(userDefinedCellClass, excelStyle.id);
+                    });
+                if (userDefinedExcelStyle) {
+                    excelStyles.push(userDefinedExcelStyle);
+                }
+                // add adaptable derived styles (format column etc.)
+                const adaptableStyle = Object.assign(Object.assign({}, rowStyle), Object.keys(cellStyle).reduce((result, key) => {
+                    if (cellStyle[key] !== null) {
+                        result[key] = cellStyle[key];
+                    }
+                    return result;
+                }, {}));
+                const sanitizedAdaptableStyle = (0, StyleHelper_1.sanitizeStyle)(adaptableStyle);
+                if (Object.values(sanitizedAdaptableStyle).some((style) => style != null)) {
+                    excelStyles.push(this.convertCSSToExcelStyle(sanitizedAdaptableStyle));
+                }
+                const excelDataType = this.adaptableApi.exportApi.internalApi.getExcelDataType(colDef === null || colDef === void 0 ? void 0 : colDef.type);
+                const rawValue = this.adaptableApi.gridApi.getRawValueFromRowNode(node, column.getId());
+                // don't add the cell style if it has no adaptable custom styles
+                if (!excelStyles.length &&
+                    // if this is a formatted Date value, we still need to add the AG GRID specific type & numberFormat below
+                    !(excelDataType === 'DateTime' && isDateCellExportedAsFormattedValue)) {
+                    return;
+                }
+                const cellClassId = this.adaptableApi.internalApi
+                    .getAdaptableInstance()
+                    .agGridColumnAdapter.getExcelClassNameForCell(column.getId(), this.adaptableApi.internalApi
+                    .getAdaptableInstance()
+                    .getPrimaryKeyValueFromRowNode(node), userDefinedCellClass);
+                const finalCellExcelStyle = Object.assign({}, ...excelStyles);
+                if (excelDataType === 'DateTime' && isDateCellExportedAsFormattedValue) {
+                    let dateFormatPattern = this.adaptableApi.optionsApi.getExportOptions().exportDateFormat;
+                    const abColumn = getAdaptableColumnWithColumnId(column.getColId());
+                    if (!dateFormatPattern) {
+                        const mostRelevantFormatColumn = this.adaptableApi.formatColumnApi.internalApi.getMostRelevantFormatColumnForColumn(getFormatColumnsWithDisplayFormatForColumn(column.getColId()), abColumn, { node, value: rawValue });
+                        dateFormatPattern =
+                            ((_a = mostRelevantFormatColumn === null || mostRelevantFormatColumn === void 0 ? void 0 : mostRelevantFormatColumn.DisplayFormat) === null || _a === void 0 ? void 0 : _a.Formatter) === 'DateFormatter' &&
+                                ((_c = (_b = mostRelevantFormatColumn === null || mostRelevantFormatColumn === void 0 ? void 0 : mostRelevantFormatColumn.DisplayFormat) === null || _b === void 0 ? void 0 : _b.Options) === null || _c === void 0 ? void 0 : _c.Pattern);
+                    }
+                    if (dateFormatPattern) {
+                        const normalisedValue = this.adaptableApi.internalApi
+                            .getAdaptableInstance()
+                            .getNormalisedValueFromRawValue(rawValue, abColumn);
+                        if (normalisedValue) {
+                            // we have to pass the date in the ISO format to Excel
+                            // see https://www.ag-grid.com/javascript-data-grid/excel-export-data-types/#dates
+                            // we can NOT use Date.toISOString() because we don't want the timezone corrections to kick in
+                            const isoFormattedValue = (0, FormatHelper_1.DateFormatter)(normalisedValue, {
+                                Pattern: `yyyy-MM-dd'T'HH:mm:ss.SSS`,
+                            });
+                            if (isoFormattedValue) {
+                                finalCellExcelStyle.dataType = 'DateTime';
+                                finalCellExcelStyle.numberFormat = { format: dateFormatPattern };
+                                // create a new cell key to ensure any user provided className does not interfere
+                                const cellKey = this.adaptableApi.internalApi
+                                    .getAdaptableInstance()
+                                    .agGridColumnAdapter.getExcelClassNameForCell(column.getColId(), this.adaptableApi.internalApi
+                                    .getAdaptableInstance()
+                                    .getPrimaryKeyValueFromRowNode(node));
+                                // we need to register so that later the cellProcessor will put the isoFormattedValue through (thus giving the formatting responsability to Excel)
+                                this.registerExcelStyleWithFormattedDate(cellKey, isoFormattedValue);
+                            }
+                        }
+                    }
+                }
+                this.registerExcelStyle(finalCellExcelStyle, cellClassId);
+            });
+        }, forAllVisibleRowNodesDoConfig);
+    }
+    convertCSSToExcelStyle(style) {
+        const getHexColor = (color) => {
+            const preparedColor = (0, StyleHelper_1.getVariableColor)(color);
+            const t = (0, tinycolor2_1.default)(preparedColor);
+            const a = t.getAlpha();
+            return tinycolor2_1.default.mix((0, tinycolor2_1.default)('white'), t, a * 100).toHexString();
+        };
+        let result = {};
+        if (style.backgroundColor != null) {
+            result.interior = {
+                color: getHexColor(style.backgroundColor),
+                pattern: 'Solid',
+            };
+        }
+        if (style.borderColor != null) {
+            const excelBorder = {
+                color: style.borderColor,
+                lineStyle: 'Continuous',
+                weight: 1,
+            };
+            result.borders = {
+                borderBottom: excelBorder,
+                borderLeft: excelBorder,
+                borderRight: excelBorder,
+                borderTop: excelBorder,
+            };
+        }
+        if (style.textAlign) {
+            result.alignment = {
+                horizontal: StringExtensions_1.default.CapitaliseFirstLetter(style.textAlign),
+            };
+        }
+        if (style.color != null) {
+            if (!result.font) {
+                result.font = {};
+            }
+            result.font = {
+                color: getHexColor(style.color),
+            };
+        }
+        if (style.fontStyle === 'italic') {
+            if (!result.font) {
+                result.font = {};
+            }
+            result.font.italic = true;
+        }
+        if (style.fontWeight != null &&
+            (style.fontWeight === 'bold' || Number(style.fontWeight) >= 600)) {
+            if (!result.font) {
+                result.font = {};
+            }
+            result.font.bold = true;
+        }
+        if (style.fontSize != null) {
+            if (!result.font) {
+                result.font = {};
+            }
+            result.font.size = (0, StyleHelper_1.convertCSSAbsoluteFontSizeToPt)(style.fontSize);
+        }
+        return result;
+    }
+    resetExcelStyleMemoization() {
+        this.excelStylesCache = {};
+        this.cellClassKey2excelStyleIdMap = {};
+        this.excelStylesWithFormattedDate = {};
+    }
+    registerExcelStyle(excelStyle, cellClassKey) {
+        const excelStyleKey = JSON.stringify(excelStyle);
+        if (!this.excelStylesCache[excelStyleKey]) {
+            const excelStyleId = (0, uuid_1.createUuid)();
+            const excelStyleWithId = Object.assign(Object.assign({}, excelStyle), { id: excelStyleId });
+            this.excelStylesCache[excelStyleKey] = excelStyleWithId;
+        }
+        this.cellClassKey2excelStyleIdMap[cellClassKey] = this.excelStylesCache[excelStyleKey].id;
+    }
+    registerExcelStyleWithFormattedDate(cellClassId, isoFormattedValue) {
+        this.excelStylesWithFormattedDate[cellClassId] = isoFormattedValue;
+    }
 }
 exports.ReportService = ReportService;