@adaptabletools/adaptable 18.0.0-canary.1 → 18.0.0-canary.11

package/src/Utilities/Services/AggregatedScalarLiveValue.js

@@ -8,18 +8,18 @@ const logOnce = (message, loggingFn) => {
     doOnceFlags[message] = true;
 };
 export class AggregatedScalarLiveValue {
-    constructor(source, requestingModule, adaptableApi) {
+    constructor(source, requestingModule, adaptableApi, getRowNodes) {
         this.source = source;
         this.requestingModule = requestingModule;
         this.adaptableApi = adaptableApi;
+        this.getRowNodes = getRowNodes;
         if (source.aggregatedScalarExpression) {
             this.aggregatedScalarExpression = source.aggregatedScalarExpression;
         }
         this.expressionEvaluation = source.aggregatedScalarExpression
             ? this.adaptableApi.internalApi
                 .getQueryLanguageService()
-                .evaluateAggregatedScalarExpression(source.aggregatedScalarExpression, requestingModule)
-                .value
+                .evaluateAggregatedScalarExpression(source.aggregatedScalarExpression, requestingModule, getRowNodes).value
             : source.aggregatedScalarExpressionEvaluation;
         // currently we support only one reducer
         this.aggregationReducerName = Object.keys(this.expressionEvaluation.aggregationParams.reducers)[0];
@@ -29,7 +29,7 @@ export class AggregatedScalarLiveValue {
         if (this.aggregatedScalarExpression) {
             this.expressionEvaluation = this.adaptableApi.internalApi
                 .getQueryLanguageService()
-                .evaluateAggregatedScalarExpression(this.aggregatedScalarExpression, this.requestingModule).value;
+                .evaluateAggregatedScalarExpression(this.aggregatedScalarExpression, this.requestingModule, this.getRowNodes).value;
         }
         // currently we support only one reducer
         this.aggregationReducerName = Object.keys(this.expressionEvaluation.aggregationParams.reducers)[0];
@@ -38,7 +38,9 @@ export class AggregatedScalarLiveValue {
     getAggregatedValueForRow(rowNode) {
         const aggregationValue = this.getAggregationValue(rowNode);
         if (aggregationValue == undefined) {
-            logOnce(`${this.aggregatedScalarExpression} :: aggregation value is NOT available!`, this.adaptableApi.logWarn);
+            logOnce(`${this.aggregatedScalarExpression} :: aggregation value is NOT available!`, (message) => {
+                this.adaptableApi.internalApi.getAdaptableInstance().logger.warn(message);
+            });
             return;
         }
         if (this.expressionEvaluation.rowValueGetter) {
@@ -68,9 +70,11 @@ export class AggregatedScalarLiveValue {
     }
     computeAggregatedValue(expressionEvaluation) {
         var _a;
-        const gridRowNodes = this.adaptableApi.gridApi.getAllRowNodes({
-            filterFn: expressionEvaluation.rowFilterFn,
-        });
+        const gridRowNodes = expressionEvaluation.getRowNodes
+            ? expressionEvaluation.getRowNodes()
+            : this.adaptableApi.gridApi.getAllRowNodes({
+                filterFn: expressionEvaluation.rowFilterFn,
+            });
         // 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) => {
@@ -106,6 +110,7 @@ export class AggregatedScalarLiveValue {
                 return 0;
             });
         }
-        return aggregate(expressionEvaluation.aggregationParams, aggregatedRowNodes);
+        const result = aggregate(expressionEvaluation.aggregationParams, aggregatedRowNodes);
+        return result;
     }
 }

package/src/Utilities/Services/CellPopupService.js

@@ -6,7 +6,6 @@ export class CellPopupService {
     constructor(api) {
         this.api = api;
         this.adaptable = api.internalApi.getAdaptableInstance();
-        this.adaptable = api.internalApi.getAdaptableInstance();
         this.adaptable.api.eventApi.on('AdaptableReady', () => this.handleAdaptableReady());
     }
     getAdaptableState() {

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

@@ -15,7 +15,7 @@ export interface IQueryLanguageService extends IAdaptableService {
     evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: IRowNode): any;
     evaluateObservableExpression(expression: string, module: AdaptableModule): Observable<CellDataChangedInfo | GridDataChangedInfo>;
     evaluateAggregatedBooleanExpression(expression: string, module: AdaptableModule): BooleanAggregationParameter;
-    evaluateAggregatedScalarExpression(expression: string, module: AdaptableModule): ScalarAggregationParameter;
+    evaluateAggregatedScalarExpression(expression: string, module: AdaptableModule, getRowNodes?: () => IRowNode[]): ScalarAggregationParameter;
     validateBoolean(expression: string, module: AdaptableModule, config?: {
         force?: boolean;
     }): {

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

@@ -13,9 +13,12 @@ export declare enum LicenseValidityType {
 }
 export declare class LicenseService implements ILicenseService {
     private adaptable;
+    private licenseKey;
+    private packageDetails;
     constructor(adaptable: IAdaptable, licenseKey: string | undefined, packageDetails: {
         publishedAt: number | Date;
     });
+    init(): void;
     getValidityType(details: LicenseDetails | Error | null, packageDetails: {
         publishedAt: number | Date;
     }): LicenseValidityType;

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

@@ -1,181 +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 origin = typeof window !== 'undefined' ? window.location.origin : '';
-const isInsideSandpack = () => {
-    const [_fullUrl, protocol, sandpackUrl] = Array.from(SANDPACK_REGEX.exec(origin) || []);
-    return protocol === 'https' && sandpackUrl === 'sandpack.codesandbox.io';
-};
-const isInsideSandbox = () => {
-    const [_fullUrl, protocol, sandboxUrl] = Array.from(SANDBOX_REGEX.exec(origin) || []);
-    return protocol === 'https' && sandboxUrl === '.csb.app';
-};
-const isDemoApp = () => {
-    const [_fullUrl, protocol, demoAppUrl] = Array.from(DEMO_REGEX.exec(origin) || []);
-    return protocol === 'https' && demoAppUrl === '.adaptabletools.com';
-};
-export class LicenseService {
-    constructor(adaptable, licenseKey, packageDetails) {
-        this.adaptable = adaptable;
-        this.adaptable = adaptable;
-        let details = null;
-        if (licenseKey) {
-            try {
-                details = decodeLicense(licenseKey);
-            }
-            catch (error) {
-                details = error;
-            }
-        }
-        if (!isInsideSandpack() && !isInsideSandbox() && !isDemoApp()) {
-            this.handleLicenseValidation(details, this.getValidityType(details, 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=/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g,E=/(https):\/\/\S+(\.csb\.app)/g,I=/(https):\/\/\S+(\.adaptabletools\.com)/g,_=()=>"undefined"!=typeof window?window.location.origin:"",O=()=>{const[e,a,t]=Array.from(h.exec(_())||[]);return"https"===a&&"sandpack.codesandbox.io"===t},A=()=>{const[e,a,t]=Array.from(E.exec(_())||[]);return"https"===a&&".csb.app"===t},L=()=>{const[e,a,t]=Array.from(I.exec(_())||[]);return"https"===a&&".adaptabletools.com"===t};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}O()||A()||L()||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/MetamodelService.d.ts

@@ -3,7 +3,7 @@ import { AdaptableOptions } from '../../../types';
 export declare class MetamodelService implements IMetamodelService {
     private gridInfoOptions;
     getAdaptableOptions: () => AdaptableOptions;
-    constructor(getAdaptableOptions: () => AdaptableOptions);
+    constructor(getAdaptableOptions: () => AdaptableOptions, validateOptions?: boolean);
     getGridInfoOptions(): GridInfoOptions;
     getGridInfoNoCodeOptions(): GridInfoOptions;
     validateAdaptableOptionsValues(): void;

package/src/Utilities/Services/MetamodelService.js

@@ -1,15 +1,18 @@
 import { ADAPTABLE_METAMODEL } from '../../metamodel/adaptable.metamodel';
-import { DefaultAdaptableOptions } from '../Defaults/DefaultAdaptableOptions';
 import { AdaptableOptionsDocsLink } from '../Constants/DocumentationLinkConstants';
 import StringExtensions from '../Extensions/StringExtensions';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
+import { getDefaultAdaptableOptions } from '../../agGrid/defaultAdaptableOptions';
 const supportedMetamodelTypes = ['s', 'n', 'b', 'a', 'f', 'R'];
 export class MetamodelService {
-    constructor(getAdaptableOptions) {
+    constructor(getAdaptableOptions, validateOptions) {
         this.gridInfoOptions = new Map();
         this.getAdaptableOptions = () => null;
         this.getAdaptableOptions = getAdaptableOptions;
         this.gridInfoOptions = this.buildGridInfoOptions();
+        if (validateOptions) {
+            this.validateAdaptableOptionsValues();
+        }
     }
     getGridInfoOptions() {
         return this.gridInfoOptions;
@@ -140,7 +143,7 @@ export class MetamodelService {
         });
     }
     getAdaptableOptionsDefaultValues() {
-        return DefaultAdaptableOptions;
+        return getDefaultAdaptableOptions();
     }
     getAdaptableMetamodel() {
         return ADAPTABLE_METAMODEL;

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

@@ -16,7 +16,7 @@ export declare class QueryLanguageService implements IQueryLanguageService {
     constructor(adaptableApi: AdaptableApi);
     evaluateBooleanExpression(expression: string, module: AdaptableModule, rowNode: any): any;
     evaluateScalarExpression(expression: string, module: AdaptableModule, rowNode: IRowNode): any;
-    evaluateAggregatedScalarExpression(expression: string, module: AdaptableModule): ScalarAggregationParameter;
+    evaluateAggregatedScalarExpression(expression: string, module: AdaptableModule, getRowNodes?: () => IRowNode[]): ScalarAggregationParameter;
     evaluateObservableExpression(reactiveExpression: string, module: AdaptableModule): Observable<CellDataChangedInfo | GridDataChangedInfo>;
     evaluateAggregatedBooleanExpression(aggregationExpression: string, module: AdaptableModule): BooleanAggregationParameter;
     validateBoolean(expressionInput: string, module: AdaptableModule, config?: {

package/src/Utilities/Services/QueryLanguageService.js

@@ -32,7 +32,7 @@ export class QueryLanguageService {
         // currently scalar and boolean expressions are evaluated the same
         return this.evaluateBooleanExpression(expression, module, rowNode);
     }
-    evaluateAggregatedScalarExpression(expression, module) {
+    evaluateAggregatedScalarExpression(expression, module, getRowNodes) {
         const aggregatedScalarFunctions = this.getModuleExpressionFunctionsMap(module).aggregatedScalarFunctions;
         return parser.evaluate(expression, {
             node: null,
@@ -41,6 +41,7 @@ export class QueryLanguageService {
             adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
             functions: aggregatedScalarFunctions,
             evaluateCustomQueryVariable: this.evaluateCustomQueryVariable,
+            getRowNodes,
         });
     }
     evaluateObservableExpression(reactiveExpression, module) {

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

@@ -1,7 +1,8 @@
-import { IRowEditService } from './Interface/IRowEditService';
 import { AdaptableApi } from '../../Api/AdaptableApi';
-export declare class RowEditService implements IRowEditService {
+import { IAdaptableService } from './Interface/IAdaptableService';
+export declare class RowEditService implements IAdaptableService {
     private adaptableApi;
     constructor(adaptableApi: AdaptableApi);
     private autoHandleActionRowButtons;
+    destroy(): void;
 }

package/src/Utilities/Services/RowEditService.js

@@ -1,4 +1,3 @@
-// @ts-ignore
 export class RowEditService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
@@ -37,4 +36,7 @@ export class RowEditService {
             adaptableApi.gridApi.addGridData([newRowData], config);
         }
     }
+    destroy() {
+        // nothing yet
+    }
 }

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

@@ -0,0 +1,19 @@
+import { IRowNode } from '@ag-grid-community/core';
+import { AggregatedScalarLiveValue } from './AggregatedScalarLiveValue';
+import { AdaptableApi, AdaptableModule } from '../../types';
+export declare const summarySupportedExpressions: readonly ["SUM", "AVG", "MIN", "MAX", "COUNT", "MEDIAN", "MODE", "DISTINCT", "ONLY", "STD_DEVIATION"];
+export type SummarySupportedExpression = (typeof summarySupportedExpressions)[number];
+export type SumaryConfig = {
+    expression: {
+        function: SummarySupportedExpression;
+    };
+    columnId: string;
+    getRowNodes?: () => IRowNode[];
+};
+export declare class SummaryService {
+    private adaptableApi;
+    constructor(adaptableApi: AdaptableApi);
+    evaluateExpressionValue(config: SumaryConfig, moduleId: AdaptableModule): any;
+    evaluateScalarLiveValue(config: SumaryConfig, moduleId: AdaptableModule): AggregatedScalarLiveValue;
+    destroy(): void;
+}

package/src/Utilities/Services/SummaryService.js

@@ -0,0 +1,29 @@
+import { AggregatedScalarLiveValue } from './AggregatedScalarLiveValue';
+export const summarySupportedExpressions = [
+    'SUM',
+    'AVG',
+    'MIN',
+    'MAX',
+    'COUNT',
+    'MEDIAN',
+    'MODE',
+    'DISTINCT',
+    'ONLY',
+    'STD_DEVIATION',
+];
+export class SummaryService {
+    constructor(adaptableApi) {
+        this.adaptableApi = adaptableApi;
+    }
+    evaluateExpressionValue(config, moduleId) {
+        return this.evaluateScalarLiveValue(config, moduleId).getGlobalAggregatedValue();
+    }
+    evaluateScalarLiveValue(config, moduleId) {
+        return new AggregatedScalarLiveValue({
+            aggregatedScalarExpression: `${config.expression.function}([${config.columnId}])`,
+        }, moduleId, this.adaptableApi, config.getRowNodes);
+    }
+    destroy() {
+        this.adaptableApi = null;
+    }
+}

package/src/Utilities/license/decode.js

@@ -1,65 +1 @@
-import { compute_string } from './hashing';
-const getGenericError = () => new Error('Invalid License');
-export const GENERIC_APP_NAME = 'GenericAdaptableApp';
-export const fieldsToLicenseDetails = (fields) => {
-    var _a;
-    const fieldsMap = fields.reduce((acc, field) => {
-        acc.set(field.name, field.value);
-        return acc;
-    }, new Map());
-    const details = {
-        start: new Date(fieldsMap.get('StartDate')),
-        end: new Date(fieldsMap.get('EndDate')),
-        owner: fieldsMap.get('Owner'),
-        appName: fieldsMap.get('AppName') || GENERIC_APP_NAME,
-        timestamp: fieldsMap.get('TS') ? Number(fieldsMap.get('TS')) : 0,
-        trial: fieldsMap.get('Trial') === 'true' ? true : false,
-        ref: (_a = fieldsMap.get('Ref')) !== null && _a !== void 0 ? _a : '',
-    };
-    if (!details.start ||
-        !details.end ||
-        !details.owner ||
-        typeof details.trial !== 'boolean' ||
-        !details.ref) {
-        throw getGenericError();
-    }
-    return details;
-};
-export const decode = (licenseKey) => {
-    let crc = '';
-    let fields = licenseKey.split('|').map((part) => {
-        let [name, value] = part.split('=');
-        if (name === 'C') {
-            crc = value;
-        }
-        return {
-            name,
-            value,
-        };
-    });
-    if (!crc) {
-        throw getGenericError();
-    }
-    const crcParts = crc.split(',').reverse();
-    const overallCrc = crcParts.pop();
-    crcParts.forEach((fieldCrc, index) => {
-        const field = fields[index];
-        if (compute_string(field.value) !== fieldCrc) {
-            throw getGenericError();
-        }
-    });
-    const fieldsWithoutC = [...fields];
-    fieldsWithoutC.pop();
-    const fieldsWithoutCString = fieldsWithoutC
-        .map((field) => {
-        return `${field.name}=${field.value}`;
-    })
-        .join('|');
-    if (compute_string(fieldsWithoutCString) !== overallCrc) {
-        throw getGenericError();
-    }
-    fields = fields.map((f) => {
-        return Object.assign(Object.assign({}, f), { value: decodeURI(f.value) });
-    });
-    return fieldsToLicenseDetails(fields);
-};
+import{compute_string as e}from"./hashing";const t=()=>new Error("Invalid License");export const GENERIC_APP_NAME="GenericAdaptableApp";export const fieldsToLicenseDetails=e=>{var a;const r=e.reduce(((e,t)=>(e.set(t.name,t.value),e)),new Map),n={start:new Date(r.get("StartDate")),end:new Date(r.get("EndDate")),owner:r.get("Owner"),appName:r.get("AppName")||GENERIC_APP_NAME,timestamp:r.get("TS")?Number(r.get("TS")):0,trial:"true"===r.get("Trial"),ref:null!==(a=r.get("Ref"))&&void 0!==a?a:""};if(!(n.start&&n.end&&n.owner&&"boolean"==typeof n.trial&&n.ref))throw t();return n};export const decode=a=>{let r="",n=a.split("|").map((e=>{let[t,a]=e.split("=");return"C"===t&&(r=a),{name:t,value:a}}));if(!r)throw t();const o=r.split(",").reverse(),s=o.pop();o.forEach(((a,r)=>{const o=n[r];if(e(o.value)!==a)throw t()}));const i=[...n];i.pop();const p=i.map((e=>`${e.name}=${e.value}`)).join("|");if(e(p)!==s)throw t();return n=n.map((e=>Object.assign(Object.assign({},e),{value:decodeURI(e.value)}))),fieldsToLicenseDetails(n)};

package/src/Utilities/license/hashing.js

@@ -1,43 +1 @@
-const DEFAULT_ReversedPolynomial = 0xedb88320;
-/*
- * CRC-32 implementation
- */
-function generate(reversedPolynomial = DEFAULT_ReversedPolynomial) {
-    var table = new Array();
-    var i, j, n;
-    for (i = 0; i < 256; i++) {
-        n = i;
-        for (j = 8; j > 0; j--) {
-            if ((n & 1) == 1) {
-                n = (n >>> 1) ^ reversedPolynomial;
-            }
-            else {
-                n = n >>> 1;
-            }
-        }
-        table[i] = n;
-    }
-    return table;
-}
-function crc32_initial() {
-    return 0xffffffff;
-}
-function crc32_add_byte(table, crc, byte) {
-    crc = (crc >>> 8) ^ table[byte ^ (crc & 0x000000ff)];
-    return crc;
-}
-function crc32_final(crc) {
-    crc = ~crc;
-    crc = crc < 0 ? 0xffffffff + crc + 1 : crc;
-    return crc;
-}
-export function compute_string(str, reversedPolynomial = DEFAULT_ReversedPolynomial) {
-    var table = generate(reversedPolynomial);
-    var crc = 0;
-    var i;
-    crc = crc32_initial();
-    for (i = 0; i < str.length; i++)
-        crc = crc32_add_byte(table, crc, str.charCodeAt(i));
-    crc = crc32_final(crc);
-    return `${crc}`;
-}
+const r=3988292384;function n(n=r){var t,o,u,e=new Array;for(t=0;t<256;t++){for(u=t,o=8;o>0;o--)1&~u?u>>>=1:u=u>>>1^n;e[t]=u}return e}function t(){return 4294967295}function o(r,n,t){return n=n>>>8^r[t^255&n]}function u(r){return r=(r=~r)<0?4294967295+r+1:r}export function compute_string(e,c=r){var f,i=n(c),a=0;for(a=t(),f=0;f<e.length;f++)a=o(i,a,e.charCodeAt(f));return`${a=u(a)}`}

package/src/View/AdaptableView.js

@@ -3,7 +3,6 @@ import { connect } from 'react-redux';
 import { ProgressIndicator } from '../components/ProgressIndicator/ProgressIndicator';
 import { ToastContainer } from '../components/Toastify';
 import * as PopupRedux from '../Redux/ActionsReducers/PopupRedux';
-import { AdaptableLoadingScreen } from './Components/Popups/AdaptableLoadingScreen';
 import { AdaptablePopup } from './Components/Popups/AdaptablePopup';
 import { AdaptablePopupConfirmation } from './Components/Popups/AdaptablePopupConfirmation';
 import { AdaptablePopupPrompt } from './Components/Popups/AdaptablePopupPrompt';
@@ -23,7 +22,6 @@ class AdaptableView extends React.Component {
             React.createElement(GridCellPopup, null),
             React.createElement(QuickSearchDrawer, null),
             this.props.AdaptableApi.internalApi.getModuleService().isModuleAvailable('Dashboard') && (React.createElement(Dashboard, { api: this.props.AdaptableApi })),
-            this.props.AdaptableApi.optionsApi.getUserInterfaceOptions().showLoadingScreen && (React.createElement(AdaptableLoadingScreen, { onClose: this.props.onCloseLoadingPopup, showLoadingScreen: this.props.PopupState.LoadingPopup.ShowLoadingPopup })),
             this.props.PopupState.PromptPopup.ShowPromptPopup && (React.createElement(AdaptablePopupPrompt, { message: this.props.PopupState.PromptPopup.Message, header: this.props.PopupState.PromptPopup.Header, onClose: this.props.onClosePromptPopup, onConfirm: this.props.onConfirmPromptPopup, onConfirmActionCreator: this.props.PopupState.PromptPopup.ConfirmActionCreator, defaultValue: this.props.PopupState.PromptPopup.DefaultValue })),
             Boolean(this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup) && (React.createElement(AdaptablePopupConfirmation, { header: this.props.PopupState.ConfirmationPopup.Header, messsage: this.props.PopupState.ConfirmationPopup.Msg, showPopup: this.props.PopupState.ConfirmationPopup.ShowConfirmationPopup, cancelButtonText: this.props.PopupState.ConfirmationPopup.CancelButtonText, confirmButtonText: this.props.PopupState.ConfirmationPopup.ConfirmButtonText, onCancel: this.props.onCancelConfirmationPopup, onConfirm: this.props.onConfirmConfirmationPopup, showInputBox: this.props.PopupState.ConfirmationPopup.ShowInputBox, messageType: this.props.PopupState.ConfirmationPopup.MessageType, api: this.props.AdaptableApi })),
             Boolean(this.props.PopupState.ScreenPopup.ShowScreenPopup) && (React.createElement(AdaptablePopup, { componentName: this.props.PopupState.ScreenPopup.ComponentName, componentModule: this.props.PopupState.ScreenPopup.ComponentModule, onHide: this.props.onCloseScreenPopup, api: this.props.AdaptableApi, onClearParams: () => this.props.onClearPopupParams(), moduleParams: this.props.PopupState.ScreenPopup.Params, moduleProps: this.props.PopupState.ScreenPopup.PopupProps })),
@@ -33,7 +31,7 @@ class AdaptableView extends React.Component {
             , { 
                 // we NEEEEED!!!! this containerId, otherwise, toastify will have memory leaks when the adaptable
                 // instance is destroyed and re-created many times
-                containerId: adaptableOptions.adaptableId, limit: adaptableOptions.notificationsOptions.maxNotifications, closeButton: false, icon: false, theme: "colored" }),
+                containerId: `Toastify-${adaptableOptions.adaptableId}`, limit: adaptableOptions.notificationsOptions.maxNotifications, closeButton: false, icon: false, theme: "colored" }),
             (watermark === null || watermark === void 0 ? void 0 : watermark.show) && React.createElement(LicenseWatermark, null, watermark === null || watermark === void 0 ? void 0 : watermark.text),
             React.createElement(WindowPopups, null),
             React.createElement(FormPopups, null),

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

@@ -7,7 +7,7 @@ import GridOptionsForm from './GridOptionsForm';
 import EntitlementsForm from './EntitlementsForm';
 import { UIElementsForm } from './UIOptions/UiOptionsForm';
 import { AdaptableOptionsForm } from './AdaptableOptionsForm';
-import AdaptableHelper from '../../../Utilities/Helpers/AdaptableHelper';
+import { applyDefaultAdaptableOptions } from '../../../agGrid/defaultAdaptableOptions';
 export const ConfigurationWizard = (props) => {
     const [isPrimaryKeySelected, setIsValid] = React.useState(true);
     const [adaptableConfig, setAdaptableConfig] = useState(() => {
@@ -17,7 +17,7 @@ export const ConfigurationWizard = (props) => {
             },
         };
         const gridOptions = Object.assign(Object.assign({}, gridOptionDefaults), props.adaptableConfig.gridOptions);
-        const adaptableOptions = AdaptableHelper.assignAdaptableOptions(props.adaptableConfig.adaptableOptions);
+        const adaptableOptions = applyDefaultAdaptableOptions(props.adaptableConfig.adaptableOptions);
         return { gridOptions, adaptableOptions };
     });
     const [selectedColumns, setSelectedColumns] = useState(() => {

package/src/View/BulkUpdate/BulkUpdatePopup.js

@@ -51,7 +51,7 @@ class BulkUpdatePopupComponent extends React.Component {
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All', onClick: () => {
                             this.onApplyClick();
                         }, variant: "raised", tone: "accent" }, "Apply to Grid")))) : (React.createElement(React.Fragment, null,
-                React.createElement(HelpBlock, { marginTop: 2, marginBottom: 2 }, "Select an existing column value from the dropdown, or enter a new value"),
+                React.createElement(HelpBlock, { marginTop: 2, marginBottom: 2 }, "Select an existing Column value from the dropdown, or enter a new value"),
                 React.createElement(Flex, { marginTop: 2, flexDirection: "row", alignItems: "center" },
                     React.createElement(Flex, { alignItems: "center", flexDirection: "row", flex: 1, marginRight: 2 },
                         React.createElement(ColumnValueSelector, { selectedGridCells: this.props.SelectedGridCells, selectedColumnValue: this.props.BulkUpdateValue, selectedColumn: col, api: this.props.api, onColumnValueChange: (columns) => this.onColumnValueSelectedChanged(columns), style: { width: '100%', maxWidth: 'inherit' } })),

package/src/View/CalculatedColumn/Wizard/CalculatedColumnWizard.d.ts

@@ -2,7 +2,7 @@
 import { CalculatedColumn } from '../../../types';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
 export declare const calculatedColumnTypes: readonly ["ScalarExpression", "AggregatedScalarExpression", "CumulativeAggregatedExpression", "QuantileAggregatedExpression"];
-export type ExpressionType = typeof calculatedColumnTypes[number];
+export type ExpressionType = (typeof calculatedColumnTypes)[number];
 export interface CalculatedColumnWizardProps extends AdaptableOnePageWizardProps<CalculatedColumn> {
 }
 export declare const CalculatedColumnWizard: (props: CalculatedColumnWizardProps) => JSX.Element;

package/src/View/CalculatedColumn/Wizard/CalculatedColumnWizard.js

@@ -33,7 +33,7 @@ export const CalculatedColumnWizard = (props) => {
         if ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.column) {
             const calculatedColumn = allCalculatedColumns.find((calculatedColumn) => calculatedColumn.ColumnId === props.popupParams.column.columnId);
             if (calculatedColumn) {
-                return calculatedColumn;
+                return cloneObject(calculatedColumn);
             }
         }
         return ObjectFactory.CreateEmptyCalculatedColumn();
@@ -51,7 +51,7 @@ export const CalculatedColumnWizard = (props) => {
     };
     const [expressionType, setExpressionType] = useState(() => {
         var _a;
-        return (_a = getExpressionType(props.data, adaptable.api)) !== null && _a !== void 0 ? _a : 'ScalarExpression';
+        return (_a = getExpressionType(calculatedColumn, adaptable.api)) !== null && _a !== void 0 ? _a : 'ScalarExpression';
     });
     const handleExpressionTypeChange = (type) => {
         setExpressionType(type);