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

package/src/Strategy/FormatColumnModule.d.ts

@@ -2,12 +2,10 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import * as FormatColumnRedux from '../Redux/ActionsReducers/FormatColumnRedux';
 import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
-import { AdaptableObjectView, IModule } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
-import { FormatColumnWizard } from '../View/FormatColumn/Wizard/FormatColumnWizard';
 export declare class FormatColumnModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(config?: {
@@ -16,16 +14,13 @@ export declare class FormatColumnModule extends AdaptableModuleBase implements I
     getExplicitlyReferencedColumnIds(formatColumn: FormatColumn): string[];
     hasNamedQueryReferences(): boolean;
     updateOldConfig(): void;
+    private updateConditionalStylesColumnsOldConfig;
+    private updateGradientColumnsOldConfig;
     private getExistingFormatColumn;
     addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
     getTeamSharingAction(): TeamSharingImportInfo<FormatColumn>;
     toView(formatColumn: FormatColumn): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
-    getViewProperties(): {
-        getDeleteAction: (formatColumn: FormatColumn) => FormatColumnRedux.FormatColumnDeleteAction;
-        getSuspendAction: (formatColumn: FormatColumn) => FormatColumnRedux.FormatColumnSuspendAction;
-        getUnSuspendAction: (formatColumn: FormatColumn) => FormatColumnRedux.FormatColumnSuspendAction;
-        getEditWizard(): typeof FormatColumnWizard;
-    };
+    getViewProperties(): AdaptableModuleView;
     canBeAssociatedWithLayouts(): boolean;
 }

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);
@@ -58,8 +60,54 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if ((_b = (_a = this.api.internalApi
             .getState()
             .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!`);
+            (0, LoggingHelper_1.ConsoleLogWarning)(`The 'FormatColumn.HeaderName' property was removed; 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

@@ -34,17 +34,17 @@ export interface AdaptableObjectItemView {
     /**
      * Custom name for the property name
      */
-    label?: string | React.FunctionComponent<{
+    label?: string | React.FunctionComponent<React.PropsWithChildren<{
         data: AdaptableObject | SuspendableObject;
-    }>;
+    }>>;
     /**
      * How the item is rendered.
      * Defaults to tags.
      * Important to be a component so react can detect if it is the same component.
      */
-    view?: React.FunctionComponent<{
+    view?: React.FunctionComponent<React.PropsWithChildren<{
         data: AdaptableObject | SuspendableObject;
-    }>;
+    }>>;
     /**
      * Values used for the component.
      * Could be later extended to include an 'onChange' prop.
@@ -59,7 +59,7 @@ export interface AdaptableObjectView {
     /**
      * Used to render expanded content
      */
-    expand?: React.FunctionComponent;
+    expand?: React.FunctionComponent<React.PropsWithChildren<unknown>>;
     /**
      * Reference to the underling object.
      */
@@ -77,10 +77,10 @@ export interface AdaptableObjectCompactView {
     item: AdaptableObjectItemView;
     abObject: AdaptableObject;
 }
-export declare type AdaptableModuleViewAction = React.FunctionComponent<{
+export declare type AdaptableModuleViewAction = React.FunctionComponent<React.PropsWithChildren<{
     data: AdaptableObject;
     accessLevel: AccessLevel;
-}>;
+}>>;
 export interface AdaptableModuleView {
     /**
      * List of actions.
@@ -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;
@@ -98,9 +99,9 @@ export interface AdaptableModuleView {
     getSuspendAllAction?: () => Redux.Action;
     getUnSuspendAllAction?: () => Redux.Action;
     getDeleteAllAction?: () => Redux.Action;
-    emptyView?: React.FunctionComponent<{
+    emptyView?: React.FunctionComponent<React.PropsWithChildren<{
         module: IModule;
-    }> | string;
+    }>> | string;
     newTooltipText?: string;
     /**
      * Specifieds the types of objects the module manages.
@@ -111,7 +112,7 @@ export interface AdaptableModuleView {
         label?: string;
         accessLevel?: AccessLevel;
     }[];
-    getEditWizard?(abObject?: AdaptableObject): React.FunctionComponent<AdaptableOnePageWizardProps<AdaptableObject>>;
+    getEditWizard?(abObject?: AdaptableObject): React.FunctionComponent<React.PropsWithChildren<AdaptableOnePageWizardProps<AdaptableObject>>>;
     /**
      * Specify status panel props.
      * Can be extended to include custom rendereres.

package/src/Strategy/Utilities/Alert/getAlertBehaviourViewItems.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { AdaptableApi, AlertDefinition } from '../../../types';
 export declare const getAlertBehaviourViewItems: (api: AdaptableApi) => {
     name: string;
-    view: React.FunctionComponent<{
+    view: React.FunctionComponent<React.PropsWithChildren<{
         data: AlertDefinition;
-    }>;
+    }>>;
 };

package/src/Strategy/Utilities/FormatColumn/getFormatColumnSettingsViewItems.d.ts

@@ -1,5 +1,5 @@
 import { FormatColumn } from '../../../../types';
-export declare const getFormatColumnSettingsViewItems: (calculatedColumn: FormatColumn) => {
+export declare const getFormatColumnSettingsViewItems: (formatColumn: FormatColumn) => {
     name: string;
     values: string[];
 };

package/src/Strategy/Utilities/FormatColumn/getFormatColumnSettingsViewItems.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFormatColumnSettingsViewItems = void 0;
-const getFormatColumnSettingsViewItems = (calculatedColumn) => {
+const getFormatColumnSettingsViewItems = (formatColumn) => {
     var _a;
     const values = [
-        `Cell alignment: ${(_a = calculatedColumn.CellAlignment) !== null && _a !== void 0 ? _a : 'default'}`,
-        calculatedColumn.HeaderName && `Header name: ${calculatedColumn.HeaderName}`,
-        `Include grouped rows: ${calculatedColumn.IncludeGroupedRows ? 'Yes' : 'No'}`,
+        `Cell alignment: ${(_a = formatColumn.CellAlignment) !== null && _a !== void 0 ? _a : 'default'}`,
+        `Include grouped rows: ${formatColumn.IncludeGroupedRows ? 'Yes' : 'No'}`,
     ].filter(Boolean);
     return {
         name: 'Settings',

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -5,13 +5,8 @@ const tslib_1 = require("tslib");
 const GeneralConstants = tslib_1.__importStar(require("../Constants/GeneralConstants"));
 const GeneralConstants_1 = require("../Constants/GeneralConstants");
 const UIHelper_1 = tslib_1.__importStar(require("../../View/UIHelper"));
-const booleanExpressionFunctions_1 = require("../ExpressionFunctions/booleanExpressionFunctions");
-const scalarExpressionFunctions_1 = require("../ExpressionFunctions/scalarExpressionFunctions");
-const observableExpressionFunctions_1 = require("../ExpressionFunctions/observableExpressionFunctions");
-const aggregatedBooleanExpressionFunctions_1 = require("../ExpressionFunctions/aggregatedBooleanExpressionFunctions");
 const AdaptablePredicate_1 = require("../../PredefinedConfig/Common/AdaptablePredicate");
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
-const aggregatedScalarExpressionFunctions_1 = require("../ExpressionFunctions/aggregatedScalarExpressionFunctions");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 // change type to DeepRequired<AdaptableOptions> to check which properties have no default values defined
 exports.DefaultAdaptableOptions = {
@@ -64,13 +59,12 @@ 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,
+            systemBooleanFunctions: undefined,
+            systemScalarFunctions: undefined,
+            systemObservableFunctions: undefined,
+            systemAggregatedBooleanFunctions: undefined,
+            systemAggregatedScalarFunctions: undefined,
             moduleExpressionFunctions: undefined,
-            queryableColumns: undefined,
             performExpressionValidation: true,
             maxTimeframeSize: 28800000, // 8 hours
         },
@@ -152,6 +146,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 aggregatedBooleanExpressionFunctionNames: AggregatedBooleanFunctionName[];
 export {};

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregatedBooleanExpressionFunctions = void 0;
+exports.aggregatedBooleanExpressionFunctionNames = 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");
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 const aggregatedScalarExpressionFunctions_1 = require("./aggregatedScalarExpressionFunctions");
+const TypeExtensions_1 = require("../Extensions/TypeExtensions");
 const SUPPORTED_AGGREGATION_FNS = ['SUM', 'MIN', 'MAX', 'AVG'];
 const aggregationScalarOperandMap = {
     SUM: ['string', 'number'],
@@ -174,3 +175,4 @@ const extractScalarOperand = (consumingFunctionName, value, allowedTypes) => {
     // numeric value
     return (0, parseInt_1.default)(numericString) * numberUnitRatios[largeNumberUnit.toLowerCase()];
 };
+exports.aggregatedBooleanExpressionFunctionNames = (0, TypeExtensions_1.getTypedKeys)(exports.aggregatedBooleanExpressionFunctions);

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 aggregatedScalarExpressionFunctionNames: AggregatedScalarFunctionName[];
 export {};

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregatedScalarExpressionFunctions = exports.aggregatedExpressionFunctions = exports.cumulativeAggregatedExpressionFunctions = void 0;
+exports.aggregatedScalarExpressionFunctionNames = exports.aggregatedScalarExpressionFunctions = exports.aggregatedExpressionFunctions = exports.cumulativeAggregatedExpressionFunctions = void 0;
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
+const TypeExtensions_1 = require("../Extensions/TypeExtensions");
 exports.cumulativeAggregatedExpressionFunctions = [
     'CUMUL',
     'OVER',
@@ -649,6 +650,7 @@ const mapAggregationToCumulation = (aggregationParameter, overColumnParameter, c
     };
     return cumulationExpressionEvaluation;
 };
+exports.aggregatedScalarExpressionFunctionNames = (0, TypeExtensions_1.getTypedKeys)(exports.aggregatedScalarExpressionFunctions);
 // !! 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 booleanExpressionFunctionsNames: BooleanFunctionName[];

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.booleanExpressionFunctions = void 0;
+exports.booleanExpressionFunctionsNames = 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"));
@@ -9,6 +9,7 @@ const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/String
 const src_1 = require("../../parser/src");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
+const TypeExtensions_1 = require("../Extensions/TypeExtensions");
 exports.booleanExpressionFunctions = {
     OR: {
         handler(args) {
@@ -293,3 +294,4 @@ exports.booleanExpressionFunctions = {
         examples: ['QUERY("anyNamedQuery")'],
     },
 };
+exports.booleanExpressionFunctionsNames = (0, TypeExtensions_1.getTypedKeys)(exports.booleanExpressionFunctions);

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 observableExpressionFunctionNames: ObservableFunctionName[];
 export {};

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.observableExpressionFunctions = void 0;
+exports.observableExpressionFunctionNames = exports.observableExpressionFunctions = void 0;
 const tslib_1 = require("tslib");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const parseInt_1 = tslib_1.__importDefault(require("lodash/parseInt"));
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
+const TypeExtensions_1 = require("../Extensions/TypeExtensions");
 // numeric value(digits) followed by a single 's', 'm' or 'h' letter (case insensitive)
 const TIMEFRAME_REGEX = /^(\d+)(s|m|h)$/i;
 const SYSTEM_MAX_TIMEFRAME_SIZE = 86400000; // 24h
@@ -212,6 +213,7 @@ exports.observableExpressionFunctions = {
         examples: ["TIMEFRAME('20s')", "TIMEFRAME('5m')", "TIMEFRAME('1h')"],
     },
 };
+exports.observableExpressionFunctionNames = (0, TypeExtensions_1.getTypedKeys)(exports.observableExpressionFunctions);
 // 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 scalarExpressionFunctionNames: ScalarFunctionName[];

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scalarExpressionFunctions = void 0;
+exports.scalarExpressionFunctionNames = 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"));
@@ -19,6 +19,7 @@ const differenceInYears_1 = tslib_1.__importDefault(require("date-fns/difference
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 const dateUtils_1 = require("./dateUtils");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
+const TypeExtensions_1 = require("../Extensions/TypeExtensions");
 const sanitizeArguments = (values, allowNaN) => {
     return values.filter((value) => value != undefined && value != null && value !== '' && (allowNaN || !isNaN(value)));
 };
@@ -356,3 +357,4 @@ exports.scalarExpressionFunctions = {
         examples: ['VAR(CURRENT_USER)', 'VAR(IS_VALID_VALUE, IS_BLANK([col1]), [col2] < [col3])'],
     },
 };
+exports.scalarExpressionFunctionNames = (0, TypeExtensions_1.getTypedKeys)(exports.scalarExpressionFunctions);

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/ObjectFactory.js

@@ -291,7 +291,6 @@ function CreateEmptyFormatColumn() {
         Style: CreateEmptyStyle(),
         DisplayFormat: undefined,
         CellAlignment: undefined,
-        HeaderName: undefined,
     };
 }
 exports.CreateEmptyFormatColumn = CreateEmptyFormatColumn;

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.d.ts → LicenseService/index.d.ts}

@@ -1,6 +1,6 @@
-import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { LicenseDetails } from '../license/LicenseDetails';
-import { ILicenseService } from './Interface/ILicenseService';
+import { IAdaptable } from '../../../AdaptableInterfaces/IAdaptable';
+import { LicenseDetails } from '../../license/LicenseDetails';
+import { ILicenseService } from '../Interface/ILicenseService';
 export declare enum LicenseValidityType {
     INVALID_LICENSE = "INVALID_LICENSE",
     NO_LICENSE = "NO_LICENSE",

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

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

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

@@ -0,0 +1 @@
+export declare function shouldLogThankYouMessage(): boolean;

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

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

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,8 @@ 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 extractMappedExpressionFunctions;
     evaluateCustomQueryVariable(functionName: string, args?: any[]): any;
     private getBooleanAndScalarFunctions;
     private getExpressionCacheKey;