@adaptabletools/adaptable 17.0.6 → 18.0.0-canary.0

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

@@ -1 +1,181 @@
-"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")),o=e.__importDefault(require("lodash/clamp")),i=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 E=/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g,_=/(https):\/\/\S+(\.csb\.app)/g,h=/(https):\/\/\S+(\.adaptabletools\.com)/g,I="undefined"!=typeof window?window.location.origin:"",O=()=>{const[e,a,t]=Array.from(E.exec(I)||[]);return"https"===a&&"sandpack.codesandbox.io"===t},u=()=>{const[e,a,t]=Array.from(_.exec(I)||[]);return"https"===a&&".csb.app"===t},A=()=>{const[e,a,t]=Array.from(h.exec(I)||[]);return"https"===a&&".adaptabletools.com"===t};class N{constructor(e,a,t){this.adaptable=e,this.adaptable=e;let s=null;if(a)try{s=(0,n.decode)(a)}catch(e){s=e}O()||u()||A()||this.handleLicenseValidation(s,this.getValidityType(s,t))}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),o=s<new Date,i=e.trial;let n=null;return n=o?s>t?i?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:i?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:i?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,o.default)(p,0,1/0));let E="",_="";!e||e instanceof Error||!e.appName||e.appName==n.GENERIC_APP_NAME||(E=e.appName,_=" for application [APP_NAME]");const h=(e,a=i.LicenseDocsLink,t=l,s=p,o=E)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",o).replace("[DAYS]",`${s}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(h("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(h("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(h("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(h("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(h(`This AdapTable license${_} 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(h(`Thank you for using a valid AdapTable license${_}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(h(`This AdapTable license${_} 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(h(`This AdapTable license${_} 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=N;
+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() { }
+}

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

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

package/src/Utilities/Services/MetamodelService.js

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MetamodelService = void 0;
-const tslib_1 = require("tslib");
-const adaptable_metamodel_1 = require("../../metamodel/adaptable.metamodel");
-const DefaultAdaptableOptions_1 = require("../Defaults/DefaultAdaptableOptions");
-const DocumentationLinkConstants_1 = require("../Constants/DocumentationLinkConstants");
-const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
-const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
+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';
 const supportedMetamodelTypes = ['s', 'n', 'b', 'a', 'f', 'R'];
-class MetamodelService {
+export class MetamodelService {
     constructor(getAdaptableOptions) {
         this.gridInfoOptions = new Map();
         this.getAdaptableOptions = () => null;
@@ -32,17 +28,17 @@ class MetamodelService {
         const adaptableOptionsMetamodel = this.getAdaptableOptionsMetamodel();
         const adaptableOptionsDefaultValues = this.getAdaptableOptionsDefaultValues();
         if ((_a = adaptableOptionsValues.adaptableId) === null || _a === void 0 ? void 0 : _a.includes('.')) {
-            AdaptableLogger_1.AdaptableLogger.consoleWarnBase("The 'AdaptableOptions.adaptableId' property should NOT include a '.' character.  We strongly recommend to remove it to avoid unexpected AdapTable behavior.");
+            AdaptableLogger.consoleWarnBase("The 'AdaptableOptions.adaptableId' property should NOT include a '.' character.  We strongly recommend to remove it to avoid unexpected AdapTable behavior.");
         }
         const validationErrors = [];
         this.validateOptionsObject(validationErrors, 'AdaptableOptions', adaptableOptionsValues, adaptableOptionsMetamodel, adaptableOptionsDefaultValues);
         if (validationErrors.length) {
-            AdaptableLogger_1.AdaptableLogger.consoleWarnBase([
+            AdaptableLogger.consoleWarnBase([
                 'AdaptableOptions validation errors:',
                 '\n',
                 ...validationErrors,
                 '\n',
-                `See AdaptableOptions documentation at ${DocumentationLinkConstants_1.AdaptableOptionsDocsLink} for details`,
+                `See AdaptableOptions documentation at ${AdaptableOptionsDocsLink} for details`,
             ].join('\n'));
         }
     }
@@ -138,16 +134,16 @@ class MetamodelService {
                 value: adaptableOptionsValues === null || adaptableOptionsValues === void 0 ? void 0 : adaptableOptionsValues[itemProperty.name],
                 defaultValue: defaultAdaptableOptionsValues[itemProperty.name],
                 kind: itemProperty.kind,
-                description: StringExtensions_1.default.UnescapeHtmlEntities(itemProperty.desc),
+                description: StringExtensions.UnescapeHtmlEntities(itemProperty.desc),
                 uiLabel: this.extractUiLabel(itemProperty),
             };
         });
     }
     getAdaptableOptionsDefaultValues() {
-        return DefaultAdaptableOptions_1.DefaultAdaptableOptions;
+        return DefaultAdaptableOptions;
     }
     getAdaptableMetamodel() {
-        return adaptable_metamodel_1.ADAPTABLE_METAMODEL;
+        return ADAPTABLE_METAMODEL;
     }
     getAdaptableOptionsMetamodel() {
         return this.getAdaptableMetamodel()['AdaptableOptions'];
@@ -167,4 +163,3 @@ class MetamodelService {
             .join(' ');
     }
 }
-exports.MetamodelService = MetamodelService;

package/src/Utilities/Services/ModuleService.js

@@ -1,11 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleService = void 0;
-const tslib_1 = require("tslib");
-const Helper_1 = tslib_1.__importDefault(require("../Helpers/Helper"));
-const DocumentationLinkConstants_1 = require("../Constants/DocumentationLinkConstants");
-const Types_1 = require("../../PredefinedConfig/Common/Types");
-class ModuleService {
+import Helper from '../Helpers/Helper';
+import { HOST_URL_DOCS } from '../Constants/DocumentationLinkConstants';
+import { ALL_MODULES } from '../../PredefinedConfig/Common/Types';
+export class ModuleService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
         this.adaptableApi = adaptableApi;
@@ -15,13 +11,13 @@ class ModuleService {
         const buttonMenuItems = [];
         this.getModuleCollection().forEach((module) => {
             const settingsPanelMenuItem = module.addModuleMenuItem('ModuleMenu');
-            if (Helper_1.default.objectExists(settingsPanelMenuItem)) {
+            if (Helper.objectExists(settingsPanelMenuItem)) {
                 if (settingsPanelMenuItems.findIndex((m) => m.module == settingsPanelMenuItem.module) == -1) {
                     settingsPanelMenuItems.push(settingsPanelMenuItem);
                 }
             }
             const buttonMenuItem = module.addModuleMenuItem('ModuleButton');
-            if (Helper_1.default.objectExists(buttonMenuItem)) {
+            if (Helper.objectExists(buttonMenuItem)) {
                 if (buttonMenuItems.findIndex((m) => m.module == buttonMenuItem.module) == -1) {
                     buttonMenuItems.push(buttonMenuItem);
                 }
@@ -39,7 +35,7 @@ class ModuleService {
         return module.isModuleAvailable();
     }
     isModuleName(adaptableModule) {
-        return Types_1.ALL_MODULES.includes(adaptableModule);
+        return ALL_MODULES.includes(adaptableModule);
     }
     isModuleEditable(adaptableModule) {
         let module = this.getModuleCollection().get(adaptableModule);
@@ -80,7 +76,7 @@ class ModuleService {
         return this.adaptableApi.internalApi.getModules();
     }
     getModuleDocumentationPageByModule(adaptableModule) {
-        let url = `${DocumentationLinkConstants_1.HOST_URL_DOCS}/`;
+        let url = `${HOST_URL_DOCS}/`;
         let learnUrl = url + 'guide/';
         switch (adaptableModule) {
             case 'Alert':
@@ -141,8 +137,6 @@ class ModuleService {
                 return learnUrl + 'handbook-theming';
             case 'ToolPanel':
                 return learnUrl + 'ui-tool-panel';
-            case 'Glue42':
-                return learnUrl + 'integrations-glue42';
             case 'IPushPull':
                 return learnUrl + 'integrations-ipushpull';
             case 'OpenFin':
@@ -161,4 +155,3 @@ class ModuleService {
         // TO DO
     }
 }
-exports.ModuleService = ModuleService;

package/src/Utilities/Services/QueryLanguageService.js

@@ -1,17 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryLanguageService = void 0;
-const tslib_1 = require("tslib");
-const parser = tslib_1.__importStar(require("../../parser/src"));
-const rxjs_1 = require("rxjs");
-const aggregatedScalarExpressionFunctions_1 = require("../ExpressionFunctions/aggregatedScalarExpressionFunctions");
-const aggregatedBooleanExpressionFunctions_1 = require("../ExpressionFunctions/aggregatedBooleanExpressionFunctions");
-const AggregatedScalarLiveValue_1 = require("./AggregatedScalarLiveValue");
-const booleanExpressionFunctions_1 = require("../ExpressionFunctions/booleanExpressionFunctions");
-const scalarExpressionFunctions_1 = require("../ExpressionFunctions/scalarExpressionFunctions");
-const observableExpressionFunctions_1 = require("../ExpressionFunctions/observableExpressionFunctions");
-const TypeExtensions_1 = require("../Extensions/TypeExtensions");
-class QueryLanguageService {
+import * as parser from '../../parser/src';
+import { isObservable } from 'rxjs';
+import { aggregatedScalarExpressionFunctions, } from '../ExpressionFunctions/aggregatedScalarExpressionFunctions';
+import { aggregatedBooleanExpressionFunctions, } from '../ExpressionFunctions/aggregatedBooleanExpressionFunctions';
+import { AggregatedScalarLiveValue } from './AggregatedScalarLiveValue';
+import { booleanExpressionFunctions } from '../ExpressionFunctions/booleanExpressionFunctions';
+import { scalarExpressionFunctions } from '../ExpressionFunctions/scalarExpressionFunctions';
+import { observableExpressionFunctions } from '../ExpressionFunctions/observableExpressionFunctions';
+import { getTypedKeys } from '../Extensions/TypeExtensions';
+export class QueryLanguageService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
         this.cacheBooleanValidation = new Map();
@@ -151,7 +147,7 @@ class QueryLanguageService {
         }
         try {
             const observableExpression = this.evaluateObservableExpression(expression, module);
-            if (!(0, rxjs_1.isObservable)(observableExpression)) {
+            if (!isObservable(observableExpression)) {
                 const result = {
                     isValid: false,
                     errorMessage: `provided observable expression does not evaluate to an Observable`,
@@ -251,7 +247,7 @@ class QueryLanguageService {
     computeAggregatedBooleanValue(expression, module) {
         const booleanAggregationParameter = this.evaluateAggregatedBooleanExpression(expression, module);
         const aggregatedScalarExpressionEvaluation = booleanAggregationParameter.scalarAggregation.value;
-        const aggregatedScalarLiveValue = new AggregatedScalarLiveValue_1.AggregatedScalarLiveValue({ aggregatedScalarExpressionEvaluation }, module, this.adaptableApi);
+        const aggregatedScalarLiveValue = new AggregatedScalarLiveValue({ aggregatedScalarExpressionEvaluation }, module, this.adaptableApi);
         const allAggregationValues = aggregatedScalarLiveValue.getAllAggregationValues();
         const numericOperand = booleanAggregationParameter.conditionValue;
         const booleanConditionFn = booleanAggregationParameter.conditionFn;
@@ -285,11 +281,11 @@ class QueryLanguageService {
                 return cachedResult;
             }
         }
-        const generalBooleanExpressionFunctions = this.extractMappedExpressionFunctions(booleanExpressionFunctions_1.booleanExpressionFunctions, expressionOptions.systemBooleanFunctions, expressionOptions.customBooleanFunctions);
-        const generalScalarExpressionFunctions = this.extractMappedExpressionFunctions(scalarExpressionFunctions_1.scalarExpressionFunctions, expressionOptions.systemScalarFunctions, expressionOptions.customScalarFunctions);
-        const generalObservableExpressionFunctions = this.extractMappedExpressionFunctions(observableExpressionFunctions_1.observableExpressionFunctions, expressionOptions.systemObservableFunctions);
-        const generalAggregatedBooleanExpressionFunctions = this.extractMappedExpressionFunctions(aggregatedBooleanExpressionFunctions_1.aggregatedBooleanExpressionFunctions, expressionOptions.systemAggregatedBooleanFunctions);
-        const generalAggregatedScalarExpressionFunctions = this.extractMappedExpressionFunctions(aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions, expressionOptions.systemAggregatedScalarFunctions);
+        const generalBooleanExpressionFunctions = this.extractMappedExpressionFunctions(booleanExpressionFunctions, expressionOptions.systemBooleanFunctions, expressionOptions.customBooleanFunctions);
+        const generalScalarExpressionFunctions = this.extractMappedExpressionFunctions(scalarExpressionFunctions, expressionOptions.systemScalarFunctions, expressionOptions.customScalarFunctions);
+        const generalObservableExpressionFunctions = this.extractMappedExpressionFunctions(observableExpressionFunctions, expressionOptions.systemObservableFunctions);
+        const generalAggregatedBooleanExpressionFunctions = this.extractMappedExpressionFunctions(aggregatedBooleanExpressionFunctions, expressionOptions.systemAggregatedBooleanFunctions);
+        const generalAggregatedScalarExpressionFunctions = this.extractMappedExpressionFunctions(aggregatedScalarExpressionFunctions, expressionOptions.systemAggregatedScalarFunctions);
         if (!module) {
             this.adaptableApi.logWarn(`QueryLanguageService.getModuleExpressionFunctions() was called with an undefined 'module' param, this should never happen`);
             return {
@@ -307,11 +303,11 @@ class QueryLanguageService {
                 userName: this.adaptableApi.optionsApi.getUserName(),
                 adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
                 module,
-                availableBooleanFunctionNames: (0, TypeExtensions_1.getTypedKeys)(generalBooleanExpressionFunctions),
-                availableScalarFunctionNames: (0, TypeExtensions_1.getTypedKeys)(generalScalarExpressionFunctions),
-                availableObservableFunctionNames: (0, TypeExtensions_1.getTypedKeys)(generalObservableExpressionFunctions),
-                availableAggregatedBooleanFunctionNames: (0, TypeExtensions_1.getTypedKeys)(generalAggregatedBooleanExpressionFunctions),
-                availableAggregatedScalarFunctionNames: (0, TypeExtensions_1.getTypedKeys)(generalAggregatedScalarExpressionFunctions),
+                availableBooleanFunctionNames: getTypedKeys(generalBooleanExpressionFunctions),
+                availableScalarFunctionNames: getTypedKeys(generalScalarExpressionFunctions),
+                availableObservableFunctionNames: getTypedKeys(generalObservableExpressionFunctions),
+                availableAggregatedBooleanFunctionNames: getTypedKeys(generalAggregatedBooleanExpressionFunctions),
+                availableAggregatedScalarFunctionNames: getTypedKeys(generalAggregatedScalarExpressionFunctions),
             };
             moduleExpressionFunctions = (_a = expressionOptions.moduleExpressionFunctions(context)) !== null && _a !== void 0 ? _a : {};
         }
@@ -334,7 +330,7 @@ class QueryLanguageService {
                 adaptableApi: this.adaptableApi,
                 userName: this.adaptableApi.optionsApi.getUserName(),
                 adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
-                availableExpressionFunctionNames: (0, TypeExtensions_1.getTypedKeys)(availableExpressionFunctions),
+                availableExpressionFunctionNames: getTypedKeys(availableExpressionFunctions),
             })
             : systemFunctions;
         let generalExpressionFunctions = {};
@@ -355,7 +351,7 @@ class QueryLanguageService {
                 adaptableApi: this.adaptableApi,
                 userName: this.adaptableApi.optionsApi.getUserName(),
                 adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
-                availableExpressionFunctionNames: (0, TypeExtensions_1.getTypedKeys)(generalExpressionFunctions),
+                availableExpressionFunctionNames: getTypedKeys(generalExpressionFunctions),
             })
             : customFunctions;
         if (customFunctionDefinitions) {
@@ -407,4 +403,3 @@ class QueryLanguageService {
         }
     }
 }
-exports.QueryLanguageService = QueryLanguageService;

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

@@ -29,7 +29,7 @@ export declare class ReportService implements IReportService {
     getReportDataAsArray(report: Report, includePrimaryKey?: boolean): any[][];
     convertReportDataToArray(reportData: ReportData): any[][];
     getRowObjectForColumnIds(rowNode: IRowNode, columnIds: string[]): Record<string, any>;
-    PublishLiveLiveDataChangedEvent(reportDestination: 'ipushpull' | 'Glue42', liveDataTrigger: 'Connected' | 'Disconnected' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated', liveReport?: any): void;
+    PublishLiveLiveDataChangedEvent(reportDestination: 'ipushpull', liveDataTrigger: 'Connected' | 'Disconnected' | 'LiveDataStarted' | 'LiveDataStopped' | 'LiveDataUpdated', liveReport?: any): void;
     getCellExportValueFromRowNode(rowNode: IRowNode, columnId: string): any;
     getCellExportValueFromRawValue(rowNode: IRowNode, cellRawValue: any, columnId: string): any;
     getReportFileName(reportName: string, destination: SystemExportDestination | CustomDestination): string;