@adaptabletools/adaptable 13.0.0-canary.2 → 13.0.0-canary.4

package/src/Strategy/FormatColumnModule.js

@@ -13,6 +13,8 @@ const FormatColumnFormatWizardSection_1 = require("../View/FormatColumn/Wizard/F
 const getFormatColumnSettingsViewItems_1 = require("./Utilities/FormatColumn/getFormatColumnSettingsViewItems");
 const getFormatColumnStyleViewItems_1 = require("./Utilities/FormatColumn/getFormatColumnStyleViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
+const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
+const MoveFormatColumn_1 = require("../View/FormatColumn/MoveFormatColumn");
 class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.FormatColumnModuleId, ModuleConstants.FormatColumnFriendlyName, 'format-column', 'FormatColumnPopup', 'Create a column style, display format or cell alignment', api);
@@ -60,6 +62,52 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             .FormatColumn) === null || _a === void 0 ? void 0 : _a.FormatColumns) === null || _b === void 0 ? void 0 : _b.some((formatColumn) => !!formatColumn.HeaderName)) {
             (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: The 'FormatColumn.HeaderName' property is deprecated; use a Layout custom Column Header instead!`);
         }
+        this.updateGradientColumnsOldConfig();
+        const keepDeprecatedConditionalStyles = this.api.internalApi.shouldKeepDeprecatedConditionalStyles();
+        if (!keepDeprecatedConditionalStyles) {
+            this.updateConditionalStylesColumnsOldConfig();
+            // update ConditionalStyle StatusBarPanel
+            const oldStatusBars = this.api.internalApi.getState().StatusBar.StatusBars;
+            let replaceConditionalStyleStatusBar = false;
+            const newStatusBars = oldStatusBars.map((statusBar) => (Object.assign(Object.assign({}, statusBar), { StatusBarPanels: [
+                    ...new Set(statusBar.StatusBarPanels.map((statusBarPanel) => {
+                        if (statusBarPanel === 'ConditionalStyle') {
+                            replaceConditionalStyleStatusBar = true;
+                            return 'FormatColumn';
+                        }
+                        return statusBarPanel;
+                    })),
+                ] })));
+            if (replaceConditionalStyleStatusBar) {
+                this.api.statusBarApi.setStatusBarPanels(newStatusBars);
+            }
+            // update ConditionalStyle dashboard buttons
+            const dashboardModuleButtons = this.api.internalApi.getState().Dashboard.ModuleButtons;
+            if (dashboardModuleButtons.includes('ConditionalStyle')) {
+                dashboardModuleButtons[dashboardModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
+                this.api.dashboardApi.setModuleButtons([...new Set(dashboardModuleButtons)]);
+            }
+            // update ConditionalStyle toolPanel buttons
+            const toolPanelModuleButtons = this.api.internalApi.getState().ToolPanel.ModuleButtons;
+            if (toolPanelModuleButtons.includes('ConditionalStyle')) {
+                toolPanelModuleButtons[toolPanelModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
+                this.api.toolPanelApi.setModuleButtons([...new Set(dashboardModuleButtons)]);
+            }
+        }
+    }
+    updateConditionalStylesColumnsOldConfig() {
+        var _a;
+        const oldConditionalStyles = (_a = this.api.internalApi.getState().ConditionalStyle) === null || _a === void 0 ? void 0 : _a.ConditionalStyles;
+        if (!(oldConditionalStyles === null || oldConditionalStyles === void 0 ? void 0 : oldConditionalStyles.length)) {
+            return;
+        }
+        (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: The 'ConditionalStyle.ConditionalStyles' property is deprecated; use 'FormatColumn' instead!`);
+        // remove conditional styles
+        this.api.conditionalStyleApi.deleteConditionalStyles(oldConditionalStyles);
+        // add as format column
+        this.api.formatColumnApi.addFormatColumns(oldConditionalStyles);
+    }
+    updateGradientColumnsOldConfig() {
         let newFormatColumns = [];
         let existingFormatColumns = [];
         // 1. Convert Gradient Columns to Format Columns
@@ -241,6 +289,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             abObject: formatColumn,
             items: [
                 (0, getScopeViewItems_1.getScopeViewItems)(formatColumn.Scope, this.api),
+                formatColumn.Rule && (0, getRuleViewItems_1.getRuleViewItems)(formatColumn.Rule, this.api),
                 {
                     name: 'Style',
                     view: () => (0, getFormatColumnStyleViewItems_1.getFormatColumnStyleViewItems)(formatColumn, this.api),
@@ -251,7 +300,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
                 (0, getFormatColumnSettingsViewItems_1.getFormatColumnSettingsViewItems)(formatColumn),
                 (0, getObjectTagsViewItems_1.getObjectTagsViewItems)(formatColumn, this.api),
-            ],
+            ].filter(Boolean),
         };
     }
     toViewAll() {
@@ -261,6 +310,7 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getViewProperties() {
         return {
+            actions: [MoveFormatColumn_1.MoveFormatColumn],
             getDeleteAction: FormatColumnRedux.FormatColumnDelete,
             getSuspendAction: FormatColumnRedux.FormatColumnSuspend,
             getUnSuspendAction: FormatColumnRedux.FormatColumnUnSuspend,

package/src/Strategy/Interface/IModule.d.ts

@@ -88,6 +88,7 @@ export interface AdaptableModuleView {
      */
     actions?: AdaptableModuleViewAction[];
     onMount?: () => void;
+    HeaderComponent?: React.FunctionComponent;
     onOpenEditPopup?: (abObject?: AdaptableObject) => void;
     getDeleteAction?: (abObject: AdaptableObject) => Redux.Action;
     getCompactDeleteAction?: (abObject: AdaptableObject) => Redux.Action;

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -64,11 +64,11 @@ exports.DefaultAdaptableOptions = {
         customPredicateDefs: [],
         displayColumnFriendlyNamesForExpressions: true,
         expressionOptions: {
-            defaultBooleanFunctions: booleanExpressionFunctions_1.booleanExpressionFunctions,
-            defaultScalarFunctions: scalarExpressionFunctions_1.scalarExpressionFunctions,
-            defaultObservableFunctions: observableExpressionFunctions_1.observableExpressionFunctions,
-            defaultAggregatedBooleanFunctions: aggregatedBooleanExpressionFunctions_1.aggregatedBooleanExpressionFunctions,
-            defaultAggregatedScalarFunctions: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions,
+            defaultBooleanFunctions: booleanExpressionFunctions_1.booleanExpressionFunctionsList,
+            defaultScalarFunctions: scalarExpressionFunctions_1.scalarExpressionFunctionsList,
+            defaultObservableFunctions: observableExpressionFunctions_1.observableExpressionFunctionsList,
+            defaultAggregatedBooleanFunctions: aggregatedBooleanExpressionFunctions_1.aggregatedBooleanExpressionFunctionsList,
+            defaultAggregatedScalarFunctions: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctionsList,
             moduleExpressionFunctions: undefined,
             queryableColumns: undefined,
             performExpressionValidation: true,
@@ -152,6 +152,7 @@ exports.DefaultAdaptableOptions = {
         customSortComparers: undefined,
         englishVariant: 'GB',
         unbalancedGroupsKey: undefined,
+        keepDeprecatedConditionalStyles: false,
     },
     layoutOptions: {
         includeExpandedRowGroups: false,

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.d.ts

@@ -4,7 +4,7 @@ import { AggregatedScalarExpressionEvaluation } from './aggregatedScalarExpressi
 /**
  * List of all the Aggregation Functions available in AdaptableQL
  */
-export declare type AggregationFunctionName = 'WHERE' | 'COL' | 'GROUP_BY' | AggregationFunction | ComparisonFunction;
+export declare type AggregatedBooleanFunctionName = 'WHERE' | 'COL' | 'GROUP_BY' | AggregationFunction | ComparisonFunction;
 declare type AggregationFunction = 'SUM' | 'MIN' | 'MAX' | 'AVG';
 declare type ComparisonFunction = 'EQ' | 'NEQ' | 'LT' | 'GT' | 'LTE' | 'GTE';
 export interface BooleanAggregationParameter extends BaseParameter<'aggregationBoolean', AggregationFunction> {
@@ -15,5 +15,6 @@ export interface BooleanAggregationParameter extends BaseParameter<'aggregationB
 export interface ScalarAggregationOperand extends BaseParameter<'aggregationScalar', AggregationFunction> {
     value: AggregatedScalarExpressionEvaluation;
 }
-export declare const aggregatedBooleanExpressionFunctions: Record<AggregationFunctionName, ExpressionFunction>;
+export declare const aggregatedBooleanExpressionFunctions: Record<AggregatedBooleanFunctionName, ExpressionFunction>;
+export declare const aggregatedBooleanExpressionFunctionsList: Record<AggregatedBooleanFunctionName, ExpressionFunction>[];
 export {};

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregatedBooleanExpressionFunctions = void 0;
+exports.aggregatedBooleanExpressionFunctionsList = exports.aggregatedBooleanExpressionFunctions = void 0;
 const tslib_1 = require("tslib");
 const parseInt_1 = tslib_1.__importDefault(require("lodash/parseInt"));
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
@@ -174,3 +174,6 @@ const extractScalarOperand = (consumingFunctionName, value, allowedTypes) => {
     // numeric value
     return (0, parseInt_1.default)(numericString) * numberUnitRatios[largeNumberUnit.toLowerCase()];
 };
+exports.aggregatedBooleanExpressionFunctionsList = Object.entries(exports.aggregatedBooleanExpressionFunctions).map(([functionName, expressionImplementation]) => ({
+    [functionName]: expressionImplementation,
+}));

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.d.ts

@@ -42,4 +42,5 @@ export interface CumulatedAggregationValue {
 export declare const cumulativeAggregatedExpressionFunctions: AggregatedScalarFunctionName[];
 export declare const aggregatedExpressionFunctions: AggregatedScalarFunctionName[];
 export declare const aggregatedScalarExpressionFunctions: Record<AggregatedScalarFunctionName, ExpressionFunction>;
+export declare const aggregatedScalarExpressionFunctionsList: Record<AggregatedScalarFunctionName, ExpressionFunction>[];
 export {};

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregatedScalarExpressionFunctions = exports.aggregatedExpressionFunctions = exports.cumulativeAggregatedExpressionFunctions = void 0;
+exports.aggregatedScalarExpressionFunctionsList = exports.aggregatedScalarExpressionFunctions = exports.aggregatedExpressionFunctions = exports.cumulativeAggregatedExpressionFunctions = void 0;
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 exports.cumulativeAggregatedExpressionFunctions = [
@@ -649,6 +649,9 @@ const mapAggregationToCumulation = (aggregationParameter, overColumnParameter, c
     };
     return cumulationExpressionEvaluation;
 };
+exports.aggregatedScalarExpressionFunctionsList = Object.entries(exports.aggregatedScalarExpressionFunctions).map(([functionName, expressionImplementation]) => ({
+    [functionName]: expressionImplementation,
+}));
 // !! mutates expressionEvaluation
 const addGroupByParams = (groupByColumnNames, expressionEvaluation) => {
     if (groupByColumnNames === null || groupByColumnNames === void 0 ? void 0 : groupByColumnNames.length) {

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.d.ts

@@ -4,3 +4,4 @@ import { ExpressionFunction } from '../../parser/src/types';
  */
 export declare type BooleanFunctionName = 'EQ' | 'NEQ' | 'GT' | 'LT' | 'GTE' | 'LTE' | 'AND' | 'OR' | 'NOT' | 'BETWEEN' | 'IN' | 'IS_BLANK' | 'CONTAINS' | 'STARTS_WITH' | 'ENDS_WITH' | 'ANY_CONTAINS' | 'QUERY';
 export declare const booleanExpressionFunctions: Record<BooleanFunctionName, ExpressionFunction>;
+export declare const booleanExpressionFunctionsList: Record<BooleanFunctionName, ExpressionFunction>[];

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.booleanExpressionFunctions = void 0;
+exports.booleanExpressionFunctionsList = exports.booleanExpressionFunctions = void 0;
 const tslib_1 = require("tslib");
 const isAfter_1 = tslib_1.__importDefault(require("date-fns/isAfter"));
 const isBefore_1 = tslib_1.__importDefault(require("date-fns/isBefore"));
@@ -293,3 +293,6 @@ exports.booleanExpressionFunctions = {
         examples: ['QUERY("anyNamedQuery")'],
     },
 };
+exports.booleanExpressionFunctionsList = Object.entries(exports.booleanExpressionFunctions).map(([functionName, expressionImplementation]) => ({
+    [functionName]: expressionImplementation,
+}));

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.d.ts

@@ -6,4 +6,5 @@ export declare type ObservableFunctionName = 'WHERE' | 'COL' | 'TIMEFRAME' | Obs
 declare type ObservableFunction = 'ROW_CHANGE' | 'GRID_CHANGE';
 declare type ChangeFunction = 'MAX' | 'MIN' | 'NONE' | 'COUNT';
 export declare const observableExpressionFunctions: Record<ObservableFunctionName, ExpressionFunction>;
+export declare const observableExpressionFunctionsList: Record<ObservableFunctionName, ExpressionFunction>[];
 export {};

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.observableExpressionFunctions = void 0;
+exports.observableExpressionFunctionsList = exports.observableExpressionFunctions = void 0;
 const tslib_1 = require("tslib");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
@@ -212,6 +212,9 @@ exports.observableExpressionFunctions = {
         examples: ["TIMEFRAME('20s')", "TIMEFRAME('5m')", "TIMEFRAME('1h')"],
     },
 };
+exports.observableExpressionFunctionsList = Object.entries(exports.observableExpressionFunctions).map(([functionName, expressionImplementation]) => ({
+    [functionName]: expressionImplementation,
+}));
 // return TRUE if the last(tail) element has the greatest value
 const isLastElementMaxValue = (values) => {
     const [tailValue] = values.slice(-1);

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.d.ts

@@ -4,3 +4,4 @@ import { ExpressionFunction } from '../../parser/src/types';
  */
 export declare type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'TODAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'COL' | 'VAR';
 export declare const scalarExpressionFunctions: Record<ScalarFunctionName, ExpressionFunction>;
+export declare const scalarExpressionFunctionsList: Record<ScalarFunctionName, ExpressionFunction>[];

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scalarExpressionFunctions = void 0;
+exports.scalarExpressionFunctionsList = exports.scalarExpressionFunctions = void 0;
 const tslib_1 = require("tslib");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const parseISO_1 = tslib_1.__importDefault(require("date-fns/parseISO"));
@@ -356,3 +356,6 @@ exports.scalarExpressionFunctions = {
         examples: ['VAR(CURRENT_USER)', 'VAR(IS_VALID_VALUE, IS_BLANK([col1]), [col2] < [col3])'],
     },
 };
+exports.scalarExpressionFunctionsList = Object.entries(exports.scalarExpressionFunctions).map(([functionName, expressionImplementation]) => ({
+    [functionName]: expressionImplementation,
+}));

package/src/Utilities/Extensions/TypeExtensions.d.ts

@@ -73,4 +73,5 @@ export declare type _DeepRequiredObject<T> = {
     [P in keyof T]-?: DeepRequired<NonUndefined<T[P]>>;
 };
 export declare type NonUndefined<A> = A extends undefined ? never : A;
+export declare const getTypedKeys: <T extends string>(input: Record<T, any>) => T[];
 export {};

package/src/Utilities/Extensions/TypeExtensions.js

@@ -1,2 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTypedKeys = void 0;
+const getTypedKeys = (input) => {
+    return Object.keys(input);
+};
+exports.getTypedKeys = getTypedKeys;

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

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

package/src/Utilities/Services/LicenseService.js

@@ -1 +1 @@
-"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=require("../Helpers/LoggingHelper"),i=e.__importDefault(require("lodash/clamp")),n=require("../Constants/DocumentationLinkConstants"),r=require("../license/decode"),c="sales@adaptabletools.com",l=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,I=/(https):\/\/\S+(\.csb\.app)/g,_=/(https):\/\/\S+(\.adaptabletools\.com)/g,O="undefined"!=typeof window?window.location.origin:"",h=()=>{const[e,a,t]=Array.from(E.exec(O)||[]);return"https"===a&&"sandpack.codesandbox.io"===t},u=()=>{const[e,a,t]=Array.from(I.exec(O)||[]);return"https"===a&&".csb.app"===t},L=()=>{const[e,a,t]=Array.from(_.exec(O)||[]);return"https"===a&&".adaptabletools.com"===t};class A{constructor(e,a,t){this.adaptable=e,this.adaptable=e;let s=null;if(a)try{s=(0,r.decode)(a)}catch(e){s=e}h()||u()||L()||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 r=0;e instanceof Error||!(null==e?void 0:e.end)||(r=Math.floor(((null===(t=null==e?void 0:e.end)||void 0===t?void 0:t.getTime())-s.getTime())/864e5),r=(0,i.default)(r,0,1/0));const l=(e,a=n.LicenseDocsLink,t=c,s=r)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[DAYS]",`${s}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":(0,o.ConsoleLogByMessageType)(l("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":(0,o.ConsoleLogByMessageType)(l("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":(0,o.ConsoleLogByMessageType)(l("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":(0,o.ConsoleLogByMessageType)(l("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":r<=10&&(0,o.ConsoleLogByMessageType)(l("This AdapTable license expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)"),"Info");break;case"COMMERCIAL_EXPIRED_IN_SCOPE":(0,o.ConsoleLogByMessageType)(l("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":(0,o.ConsoleLogByMessageType)(l("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=A;
+"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=require("../Helpers/LoggingHelper"),i=e.__importDefault(require("lodash/clamp")),n=require("../Constants/DocumentationLinkConstants"),r=require("../license/decode"),c="sales@adaptabletools.com",l=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,I=/(https):\/\/\S+(\.adaptabletools\.com)/g,O="undefined"!=typeof window?window.location.origin:"",N=()=>{const[e,a,t]=Array.from(E.exec(O)||[]);return"https"===a&&"sandpack.codesandbox.io"===t},h=()=>{const[e,a,t]=Array.from(_.exec(O)||[]);return"https"===a&&".csb.app"===t},u=()=>{const[e,a,t]=Array.from(I.exec(O)||[]);return"https"===a&&".adaptabletools.com"===t};class A{constructor(e,a,t){this.adaptable=e,this.adaptable=e;let s=null;if(a)try{s=(0,r.decode)(a)}catch(e){s=e}N()||h()||u()||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 l=0;e instanceof Error||!(null==e?void 0:e.end)||(l=Math.floor(((null===(t=null==e?void 0:e.end)||void 0===t?void 0:t.getTime())-s.getTime())/864e5),l=(0,i.default)(l,0,1/0));let d="",p="";!e||e instanceof Error||!e.appName||e.appName==r.GENERIC_APP_NAME||(d=e.appName,p=" for application [APP_NAME]");const E=(e,a=n.LicenseDocsLink,t=c,s=l,o=d)=>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":(0,o.ConsoleLogByMessageType)(E("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":(0,o.ConsoleLogByMessageType)(E("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":(0,o.ConsoleLogByMessageType)(E("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":(0,o.ConsoleLogByMessageType)(E("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(l<=10)(0,o.ConsoleLogByMessageType)(E(`This AdapTable license${p} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{"development"!==process.env.NODE_ENV&&"test"!==process.env.NODE_ENV||(0,o.ConsoleLogByMessageType)(E(`Thank you for using a valid AdapTable license${p}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":(0,o.ConsoleLogByMessageType)(E(`This AdapTable license${p} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":(0,o.ConsoleLogByMessageType)(E(`This AdapTable license${p} 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=A;

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

@@ -1,9 +1,8 @@
-import { IQueryLanguageService } from './Interface/IQueryLanguageService';
+import { IQueryLanguageService, ModuleExpressionFunctionsMap } from './Interface/IQueryLanguageService';
 import { Observable } from 'rxjs';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { RowNode } from '@ag-grid-community/core';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
-import { ModuleExpressionFunctions } from '../../AdaptableOptions/AdaptableQLOptions';
 import { ScalarAggregationParameter } from '../ExpressionFunctions/aggregatedScalarExpressionFunctions';
 import { AdaptableApi } from '../../../types';
 import { BooleanAggregationParameter } from '../ExpressionFunctions/aggregatedBooleanExpressionFunctions';
@@ -43,7 +42,10 @@ export declare class QueryLanguageService implements IQueryLanguageService {
     getNamedQueryNamesFromExpression(input?: string): string[];
     isCumulativeAggregate(input: string): boolean;
     getExpressionWithColumnFriendlyNames(expression?: string): string;
-    getModuleExpressionFunctions(module: AdaptableModule): ModuleExpressionFunctions;
+    getModuleExpressionFunctionsMap(module: AdaptableModule): ModuleExpressionFunctionsMap;
+    private getFunctionNames;
+    private extractDefaultExpressionFunctions;
+    private mapFunctionsDefinitionToMap;
     evaluateCustomQueryVariable(functionName: string, args?: any[]): any;
     private getBooleanAndScalarFunctions;
     private getExpressionCacheKey;

package/src/Utilities/Services/QueryLanguageService.js

@@ -5,7 +5,13 @@ const tslib_1 = require("tslib");
 const parser = tslib_1.__importStar(require("../../parser/src"));
 const rxjs_1 = require("rxjs");
 const LoggingHelper_1 = require("../Helpers/LoggingHelper");
+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 {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
@@ -16,7 +22,7 @@ class QueryLanguageService {
         this.cacheModuleSpecificExpressionFunctions = new Map();
     }
     evaluateBooleanExpression(expression, module, rowNode) {
-        const moduleExpressionFunctions = this.getModuleExpressionFunctions(module);
+        const moduleExpressionFunctions = this.getModuleExpressionFunctionsMap(module);
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         return parser.evaluate(expression, {
             node: rowNode,
@@ -30,7 +36,7 @@ class QueryLanguageService {
         return this.evaluateBooleanExpression(expression, module, rowNode);
     }
     evaluateAggregatedScalarExpression(expression, module) {
-        const aggregatedScalarFunctions = this.getModuleExpressionFunctions(module).aggregatedScalarFunctions;
+        const aggregatedScalarFunctions = this.getModuleExpressionFunctionsMap(module).aggregatedScalarFunctions;
         return parser.evaluate(expression, {
             node: null,
             adaptableApi: this.adaptableApi,
@@ -39,7 +45,7 @@ class QueryLanguageService {
         });
     }
     evaluateObservableExpression(reactiveExpression, module) {
-        const moduleExpressionFunctions = this.getModuleExpressionFunctions(module);
+        const moduleExpressionFunctions = this.getModuleExpressionFunctionsMap(module);
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         const reactiveExpression$ = parser.evaluate(reactiveExpression, {
             node: reactiveExpression,
@@ -51,12 +57,12 @@ class QueryLanguageService {
         return reactiveExpression$;
     }
     evaluateAggregatedBooleanExpression(aggregationExpression, module) {
-        const moduleExpressionFunctions = this.getModuleExpressionFunctions(module);
-        const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
+        const moduleExpressionFunctionsMap = this.getModuleExpressionFunctionsMap(module);
+        const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctionsMap);
         const aggregationEvaluation = parser.evaluate(aggregationExpression, {
             node: aggregationExpression,
             adaptableApi: this.adaptableApi,
-            functions: moduleExpressionFunctions.aggregatedBooleanFunctions,
+            functions: moduleExpressionFunctionsMap.aggregatedBooleanFunctions,
             whereClauseFunctions: booleanAndScalarFunctions,
             evaluateCustomQueryVariable: this.evaluateCustomQueryVariable,
         });
@@ -89,7 +95,7 @@ class QueryLanguageService {
             }
             const { ast } = parser.parse(expression.trim());
             const rootFn = ast[ast.length - 1];
-            const moduleExpressionFunctions = this.getModuleExpressionFunctions(module);
+            const moduleExpressionFunctions = this.getModuleExpressionFunctionsMap(module);
             const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
             if (rootFn.type === undefined || booleanAndScalarFunctions[rootFn.type] === undefined) {
                 const result = {
@@ -268,43 +274,90 @@ class QueryLanguageService {
     }
     // Returns the ExpressionFunctions available for the given Module as specified in the `QueryLanguageOptions.moduleExpressionFunctions`
     // if there are no specific functions defined, it falls back to the default values
-    getModuleExpressionFunctions(module) {
-        var _a, _b, _c, _d, _e, _f, _g;
+    getModuleExpressionFunctionsMap(module) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const expressionOptions = this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions;
+        if (module) {
+            let cachedResult = this.cacheModuleSpecificExpressionFunctions.get(module);
+            if (cachedResult) {
+                return cachedResult;
+            }
+        }
+        const defaultBooleanExpressionFunctions = this.extractDefaultExpressionFunctions(expressionOptions.defaultBooleanFunctions, booleanExpressionFunctions_1.booleanExpressionFunctions);
+        const defaultScalarExpressionFunctions = this.extractDefaultExpressionFunctions(expressionOptions.defaultScalarFunctions, scalarExpressionFunctions_1.scalarExpressionFunctions);
+        const defaultObservableExpressionFunctions = this.extractDefaultExpressionFunctions(expressionOptions.defaultObservableFunctions, observableExpressionFunctions_1.observableExpressionFunctions);
+        const defaultAggregatedBooleanFunctions = this.extractDefaultExpressionFunctions(expressionOptions.defaultAggregatedBooleanFunctions, aggregatedBooleanExpressionFunctions_1.aggregatedBooleanExpressionFunctions);
+        const defaultAggregatedScalarFunctions = this.extractDefaultExpressionFunctions(expressionOptions.defaultAggregatedScalarFunctions, aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions);
         if (!module) {
             (0, LoggingHelper_1.LogAdaptableInfo)(`QueryLanguageService.getModuleExpressionFunctions() was called with an undefined 'module' param, this should never happen`);
             return {
-                booleanFunctions: this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
-                    .defaultBooleanFunctions,
-                scalarFunctions: this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
-                    .defaultScalarFunctions,
-                observableFunctions: this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
-                    .defaultObservableFunctions,
-                aggregatedBooleanFunctions: this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
-                    .defaultAggregatedBooleanFunctions,
-                aggregatedScalarFunctions: this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
-                    .defaultAggregatedScalarFunctions,
+                booleanFunctions: this.mapFunctionsDefinitionToMap(defaultBooleanExpressionFunctions, booleanExpressionFunctions_1.booleanExpressionFunctions),
+                scalarFunctions: this.mapFunctionsDefinitionToMap(defaultScalarExpressionFunctions, scalarExpressionFunctions_1.scalarExpressionFunctions),
+                observableFunctions: this.mapFunctionsDefinitionToMap(defaultObservableExpressionFunctions, observableExpressionFunctions_1.observableExpressionFunctions),
+                aggregatedBooleanFunctions: this.mapFunctionsDefinitionToMap(defaultAggregatedBooleanFunctions, aggregatedBooleanExpressionFunctions_1.aggregatedBooleanExpressionFunctions),
+                aggregatedScalarFunctions: this.mapFunctionsDefinitionToMap(defaultAggregatedScalarFunctions, aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions),
+            };
+        }
+        let moduleExpressionFunctions;
+        if (typeof expressionOptions.moduleExpressionFunctions === 'function') {
+            const context = {
+                adaptableApi: this.adaptableApi,
+                module,
+                defaultBooleanFunctionNames: this.getFunctionNames(defaultBooleanExpressionFunctions),
+                defaultScalarFunctionNames: this.getFunctionNames(defaultScalarExpressionFunctions),
+                defaultObservableFunctionNames: this.getFunctionNames(defaultObservableExpressionFunctions),
+                defaultAggregatedBooleanFunctionNames: this.getFunctionNames(defaultAggregatedBooleanFunctions),
+                defaultAggregatedScalarFunctionNames: this.getFunctionNames(defaultAggregatedScalarFunctions),
             };
+            moduleExpressionFunctions = (_a = expressionOptions.moduleExpressionFunctions(context)) !== null && _a !== void 0 ? _a : {};
         }
-        let cachedResult = this.cacheModuleSpecificExpressionFunctions.get(module);
-        if (cachedResult) {
-            return cachedResult;
+        else {
+            moduleExpressionFunctions = (_c = (_b = expressionOptions.moduleExpressionFunctions) === null || _b === void 0 ? void 0 : _b[module]) !== null && _c !== void 0 ? _c : {};
         }
-        const moduleSpecificOptions = (_b = (_a = this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
-            .moduleExpressionFunctions) === null || _a === void 0 ? void 0 : _a[module]) !== null && _b !== void 0 ? _b : {};
-        const moduleSpecificFunctions = {
-            booleanFunctions: (_c = moduleSpecificOptions.booleanFunctions) !== null && _c !== void 0 ? _c : this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
-                .defaultBooleanFunctions,
-            scalarFunctions: (_d = moduleSpecificOptions.scalarFunctions) !== null && _d !== void 0 ? _d : this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
-                .defaultScalarFunctions,
-            observableFunctions: (_e = moduleSpecificOptions.observableFunctions) !== null && _e !== void 0 ? _e : this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
-                .defaultObservableFunctions,
-            aggregatedBooleanFunctions: (_f = moduleSpecificOptions.aggregatedBooleanFunctions) !== null && _f !== void 0 ? _f : this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
-                .defaultAggregatedBooleanFunctions,
-            aggregatedScalarFunctions: (_g = moduleSpecificOptions.aggregatedScalarFunctions) !== null && _g !== void 0 ? _g : this.adaptableApi.internalApi.getAdaptableOptions().adaptableQLOptions.expressionOptions
-                .defaultAggregatedScalarFunctions,
+        const moduleExpressionFunctionsMap = {
+            booleanFunctions: this.mapFunctionsDefinitionToMap((_d = moduleExpressionFunctions.booleanFunctions) !== null && _d !== void 0 ? _d : defaultBooleanExpressionFunctions, booleanExpressionFunctions_1.booleanExpressionFunctions),
+            scalarFunctions: this.mapFunctionsDefinitionToMap((_e = moduleExpressionFunctions.scalarFunctions) !== null && _e !== void 0 ? _e : defaultScalarExpressionFunctions, scalarExpressionFunctions_1.scalarExpressionFunctions),
+            observableFunctions: this.mapFunctionsDefinitionToMap((_f = moduleExpressionFunctions.observableFunctions) !== null && _f !== void 0 ? _f : defaultObservableExpressionFunctions, observableExpressionFunctions_1.observableExpressionFunctions),
+            aggregatedBooleanFunctions: this.mapFunctionsDefinitionToMap((_g = moduleExpressionFunctions.aggregatedBooleanFunctions) !== null && _g !== void 0 ? _g : defaultAggregatedBooleanFunctions, aggregatedBooleanExpressionFunctions_1.aggregatedBooleanExpressionFunctions),
+            aggregatedScalarFunctions: this.mapFunctionsDefinitionToMap((_h = moduleExpressionFunctions.aggregatedScalarFunctions) !== null && _h !== void 0 ? _h : defaultAggregatedScalarFunctions, aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions),
         };
-        this.cacheModuleSpecificExpressionFunctions.set(module, moduleSpecificFunctions);
-        return moduleSpecificFunctions;
+        this.cacheModuleSpecificExpressionFunctions.set(module, moduleExpressionFunctionsMap);
+        return moduleExpressionFunctionsMap;
+    }
+    getFunctionNames(definitions) {
+        return definitions.flatMap((definition) => {
+            if (typeof definition === 'string') {
+                return definition;
+            }
+            else {
+                return (0, TypeExtensions_1.getTypedKeys)(definition);
+            }
+        });
+    }
+    extractDefaultExpressionFunctions(defaultOptions, availableExpressionFunctions) {
+        if (typeof defaultOptions === 'function') {
+            const context = {
+                adaptableApi: this.adaptableApi,
+                availableExpressionFunctionNames: (0, TypeExtensions_1.getTypedKeys)(availableExpressionFunctions),
+            };
+            return defaultOptions(context);
+        }
+        return defaultOptions;
+    }
+    mapFunctionsDefinitionToMap(functionsDefinition, internalExpressionFunctions) {
+        let resultMap = {};
+        functionsDefinition.forEach((definition) => {
+            if (typeof definition === 'string') {
+                const internalFunction = internalExpressionFunctions[definition];
+                if (internalFunction) {
+                    resultMap[definition] = internalFunction;
+                }
+            }
+            else {
+                resultMap = Object.assign(Object.assign({}, resultMap), definition);
+            }
+        });
+        return resultMap;
     }
     evaluateCustomQueryVariable(functionName, args) {
         var _a, _b, _c;
@@ -317,8 +370,8 @@ class QueryLanguageService {
             ? customQueryVariableDefinition(context)
             : customQueryVariableDefinition;
     }
-    getBooleanAndScalarFunctions(moduleExpressionFunctions) {
-        return Object.assign(Object.assign({}, moduleExpressionFunctions.booleanFunctions), moduleExpressionFunctions.scalarFunctions);
+    getBooleanAndScalarFunctions(moduleExpressionFunctionsMap) {
+        return Object.assign(Object.assign({}, moduleExpressionFunctionsMap.booleanFunctions), moduleExpressionFunctionsMap.scalarFunctions);
     }
     getExpressionCacheKey(expression, module) {
         return `${module}::${expression}`;

package/src/Utilities/license/LicenseDetails.d.ts

@@ -2,9 +2,9 @@ export declare type LicenseDetails = {
     start: Date;
     end: Date;
     owner: string;
+    appName: string;
     trial: boolean;
     skipAirtable?: boolean;
-    count?: number;
     timestamp?: number;
     ref: string;
 };

package/src/Utilities/license/decode.d.ts

@@ -1,4 +1,5 @@
 import { LicenseDetails } from './LicenseDetails';
+export declare const GENERIC_APP_NAME = "GenericAdaptableApp";
 export declare const fieldsToLicenseDetails: (fields: {
     name: string;
     value: string;

package/src/Utilities/license/decode.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.decode=exports.fieldsToLicenseDetails=void 0;const e=require("./hashing"),t=()=>new Error("Invalid License"),r=e=>{var r;const o=e.reduce(((e,t)=>(e.set(t.name,t.value),e)),new Map),s={count:o.get("DeveloperCount")?Number(o.get("DeveloperCount")):0,start:new Date(o.get("StartDate")),end:new Date(o.get("EndDate")),owner:o.get("Owner"),timestamp:o.get("TS")?Number(o.get("TS")):0,trial:"true"===o.get("Trial"),ref:null!==(r=o.get("Ref"))&&void 0!==r?r:""};if(!(s.start&&s.end&&s.owner&&"boolean"==typeof s.trial&&s.ref))throw t();return s};exports.fieldsToLicenseDetails=r;const o=r=>{let o="",s=r.split("|").map((e=>{let[t,r]=e.split("=");return"C"===t&&(o=r),{name:t,value:r}}));if(!o)throw t();const n=o.split(",").reverse(),a=n.pop();n.forEach(((r,o)=>{const n=s[o];if((0,e.compute_string)(n.value)!==r)throw t()}));const i=[...s];i.pop();const l=i.map((e=>`${e.name}=${e.value}`)).join("|");if((0,e.compute_string)(l)!==a)throw t();return s=s.map((e=>Object.assign(Object.assign({},e),{value:decodeURI(e.value)}))),(0,exports.fieldsToLicenseDetails)(s)};exports.decode=o;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.decode=exports.fieldsToLicenseDetails=exports.GENERIC_APP_NAME=void 0;const e=require("./hashing"),t=()=>new Error("Invalid License");exports.GENERIC_APP_NAME="GenericAdaptableApp";const r=e=>{var r;const s=e.reduce(((e,t)=>(e.set(t.name,t.value),e)),new Map),o={start:new Date(s.get("StartDate")),end:new Date(s.get("EndDate")),owner:s.get("Owner"),appName:s.get("AppName")||exports.GENERIC_APP_NAME,timestamp:s.get("TS")?Number(s.get("TS")):0,trial:"true"===s.get("Trial"),ref:null!==(r=s.get("Ref"))&&void 0!==r?r:""};if(!(o.start&&o.end&&o.owner&&"boolean"==typeof o.trial&&o.ref))throw t();return o};exports.fieldsToLicenseDetails=r;const s=r=>{let s="",o=r.split("|").map((e=>{let[t,r]=e.split("=");return"C"===t&&(s=r),{name:t,value:r}}));if(!s)throw t();const a=s.split(",").reverse(),n=a.pop();a.forEach(((r,s)=>{const a=o[s];if((0,e.compute_string)(a.value)!==r)throw t()}));const i=[...o];i.pop();const p=i.map((e=>`${e.name}=${e.value}`)).join("|");if((0,e.compute_string)(p)!==n)throw t();return o=o.map((e=>Object.assign(Object.assign({},e),{value:decodeURI(e.value)}))),(0,exports.fieldsToLicenseDetails)(o)};exports.decode=s;

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopupModuleView.js

@@ -111,6 +111,7 @@ const AdaptablePopupModuleView = (props) => {
                 "s not available in current Layout")));
     };
     return (React.createElement(PopupPanel_1.PopupPanel, { glyphicon: moduleInfo.Glyph, infoLink: moduleInfo.HelpPage, headerText: moduleInfo.FriendlyName, button: newButton, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },
+        moduleViewProperties.HeaderComponent && React.createElement(moduleViewProperties.HeaderComponent, null),
         toggleButtonShowLayoutAssociatedObjects(),
         (items === null || items === void 0 ? void 0 : items.length) ? (React.createElement(AdaptableObjectList_1.AdaptableObjectList, { module: props.module, items: items })) : (React.createElement(EmptyContent_1.default, null, emptyContent !== null && emptyContent !== void 0 ? emptyContent : `Click 'New' to create a new ${moduleInfo.FriendlyName}`)),
         isWizardOpen && EditWizard && (React.createElement(EditWizard, { abObjectType: abObjectType, moduleInfo: moduleInfo, data: null, popupParams: props.popupParams, configEntities: null, onCloseWizard: handleWizardClose, onFinishWizard: handleWizardClose }))));

package/src/View/ConditionalStyle/ConditionalStylePopupHeader.d.ts

@@ -0,0 +1,2 @@
+import * as React from 'react';
+export declare const ConditionalStylePopupHeader: React.FunctionComponent;