@adaptabletools/adaptable-cjs 18.0.12 → 18.1.0-canary.0

package/src/PredefinedConfig/Common/Fdc3Context.js

@@ -1,81 +1,93 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StandardContextTypes = exports.ContextConfiguration = exports.NothingContextKey = exports.ValuationContextKey = exports.TimeRangeContextKey = exports.PositionContextKey = exports.PortfolioContextKey = exports.OrganizationContextKey = exports.InstrumentListContextKey = exports.InstrumentContextKey = exports.EmailContextKey = exports.CurrencyContextKey = exports.CountryContextKey = exports.ContactListContextKey = exports.ContactContextKey = exports.ChatInitSettingsContextKey = exports.ChartContextKey = void 0;
-exports.ChartContextKey = 'fdc3.chart';
-exports.ChatInitSettingsContextKey = 'fdc3.chat.initSettings';
-exports.ContactContextKey = 'fdc3.contact';
-exports.ContactListContextKey = 'fdc3.contactList';
-exports.CountryContextKey = 'fdc3.country';
-exports.CurrencyContextKey = 'fdc3.currency';
-exports.EmailContextKey = 'fdc3.email';
-exports.InstrumentContextKey = 'fdc3.instrument';
-exports.InstrumentListContextKey = 'fdc3.instrumentList';
-exports.OrganizationContextKey = 'fdc3.organization';
-exports.PortfolioContextKey = 'fdc3.portfolio';
-exports.PositionContextKey = 'fdc3.position';
-exports.TimeRangeContextKey = 'fdc3.timerange';
-exports.ValuationContextKey = 'fdc3.valuation';
-exports.NothingContextKey = 'fdc3.nothing';
+exports.ContextConfiguration = void 0;
 exports.ContextConfiguration = {
-    [exports.ChartContextKey]: {
+    'fdc3.action': {
+        label: 'Action',
+        icon: 'fdc3',
+    },
+    'fdc3.chart': {
         label: 'Chart',
         icon: 'pie-chart',
     },
-    [exports.ChatInitSettingsContextKey]: {
+    'fdc3.chat.initSettings': {
         label: 'ChatInitSettings',
         icon: 'chat',
     },
-    [exports.ContactContextKey]: {
+    'fdc3.chat.message': {
+        label: 'ChatMessage',
+        icon: 'chat',
+    },
+    'fdc3.chat.room': {
+        label: 'ChatRoom',
+        icon: 'chat',
+    },
+    'fdc3.chat.searchCriteria': {
+        label: 'ChatSearchCriteria',
+        icon: 'chat',
+    },
+    'fdc3.contact': {
         label: 'Contact',
         icon: 'badge',
     },
-    [exports.ContactListContextKey]: {
+    'fdc3.contactList': {
         label: 'ContactList',
         icon: 'badge',
     },
-    [exports.CountryContextKey]: {
+    'fdc3.country': {
         label: 'Country',
         icon: 'flag',
     },
-    [exports.CurrencyContextKey]: {
+    'fdc3.currency': {
         label: 'Currency',
         icon: 'dollar',
     },
-    [exports.EmailContextKey]: {
+    'fdc3.email': {
         label: 'Email',
         icon: 'mail',
     },
-    [exports.InstrumentContextKey]: {
+    'fdc3.instrument': {
         label: 'Instrument',
         icon: 'money',
     },
-    [exports.InstrumentListContextKey]: {
+    'fdc3.instrumentList': {
         label: 'InstrumentList',
         icon: 'money',
     },
-    [exports.OrganizationContextKey]: {
+    'fdc3.interaction': {
+        label: 'Interaction',
+        icon: 'sync',
+    },
+    'fdc3.message': {
+        label: 'Message',
+        icon: 'mail',
+    },
+    'fdc3.organization': {
         label: 'Organization',
         icon: 'organisation',
     },
-    [exports.PortfolioContextKey]: {
+    'fdc3.portfolio': {
         label: 'Portfolio',
         icon: 'building',
     },
-    [exports.PositionContextKey]: {
+    'fdc3.position': {
         label: 'Position',
         icon: 'building',
     },
-    [exports.TimeRangeContextKey]: {
+    'fdc3.timerange': {
         label: 'TimeRange',
         icon: 'date-range',
     },
-    [exports.ValuationContextKey]: {
+    'fdc3.transactionResult': {
+        label: 'TransactionResult',
+        icon: 'fdc3',
+    },
+    'fdc3.valuation': {
         label: 'Valuation',
         icon: 'equation',
     },
-    [exports.NothingContextKey]: {
+    'fdc3.nothing': {
         label: 'Nothing',
         icon: 'fdc3',
     },
 };
-exports.StandardContextTypes = Object.keys(exports.ContextConfiguration);

package/src/PredefinedConfig/Common/Fdc3Intent.d.ts

@@ -1,89 +1,6 @@
-export declare const StartCallIntent = "StartCall";
-export declare const StartChatIntent = "StartChat";
-export declare const StartEmailIntent = "StartEmail";
-export declare const ViewAnalysisIntent = "ViewAnalysis";
-export declare const ViewChartIntent = "ViewChart";
-export declare const ViewContactIntent = "ViewContact";
-export declare const ViewHoldingsIntent = "ViewHoldings";
-export declare const ViewInstrumentIntent = "ViewInstrument";
-export declare const ViewInteractionsIntent = "ViewInteractions";
-export declare const ViewNewsIntent = "ViewNews";
-export declare const ViewOrdersIntent = "ViewOrders";
-export declare const ViewProfileIntent = "ViewProfile";
-export declare const ViewQuoteIntent = "ViewQuote";
-export declare const ViewResearchIntent = "ViewResearch";
-export declare const Fdc3IntentConfiguration: {
-    readonly StartCall: {
-        readonly contexts: readonly ["fdc3.contact", "fdc3.contactList", "fdc3.nothing"];
-        readonly icon: "call";
-    };
-    readonly StartChat: {
-        readonly contexts: readonly ["fdc3.contact", "fdc3.contactList", "fdc3.chat.initSettings", "fdc3.nothing"];
-        readonly icon: "chat";
-    };
-    readonly StartEmail: {
-        readonly contexts: readonly ["fdc3.email"];
-        readonly icon: "mail";
-    };
-    readonly ViewAnalysis: {
-        readonly contexts: readonly ["fdc3.instrument", "fdc3.organization", "fdc3.portfolio", "fdc3.nothing"];
-        readonly icon: "spark-line";
-    };
-    readonly ViewChart: {
-        readonly contexts: readonly ["fdc3.chart", "fdc3.instrument", "fdc3.instrumentList", "fdc3.portfolio", "fdc3.position", "fdc3.nothing"];
-        readonly icon: "pie-chart";
-    };
-    readonly ViewContact: {
-        readonly contexts: readonly ["fdc3.contact", "fdc3.nothing"];
-        readonly icon: "person";
-    };
-    readonly ViewHoldings: {
-        readonly contexts: readonly ["fdc3.instrument", "fdc3.instrumentList", "fdc3.organization", "fdc3.nothing"];
-        readonly icon: "building";
-    };
-    readonly ViewInstrument: {
-        readonly contexts: readonly ["fdc3.instrument", "fdc3.nothing"];
-        readonly icon: "money";
-    };
-    readonly ViewInteractions: {
-        readonly contexts: readonly ["fdc3.contact", "fdc3.instrument", "fdc3.organization", "fdc3.nothing"];
-        readonly icon: "interactions";
-    };
-    readonly ViewNews: {
-        readonly contexts: readonly ["fdc3.country", "fdc3.instrument", "fdc3.instrumentList", "fdc3.organization", "fdc3.portfolio", "fdc3.nothing"];
-        readonly icon: "news";
-    };
-    readonly ViewOrders: {
-        readonly contexts: readonly ["fdc3.contact", "fdc3.instrument", "fdc3.organization", "fdc3.nothing"];
-        readonly icon: "order";
-    };
-    readonly ViewProfile: {
-        readonly contexts: readonly ["fdc3.contact", "fdc3.organization", "fdc3.nothing"];
-        readonly icon: "badge";
-    };
-    readonly ViewQuote: {
-        readonly contexts: readonly ["fdc3.instrument", "fdc3.nothing"];
-        readonly icon: "quote";
-    };
-    readonly ViewResearch: {
-        readonly contexts: readonly ["fdc3.contact", "fdc3.instrument", "fdc3.organization", "fdc3.nothing"];
-        readonly icon: "science";
-    };
-};
-export declare const Fdc3StandardIntents: ("StartCall" | "StartChat" | "StartEmail" | "ViewAnalysis" | "ViewChart" | "ViewContact" | "ViewHoldings" | "ViewInstrument" | "ViewInteractions" | "ViewNews" | "ViewOrders" | "ViewProfile" | "ViewQuote" | "ViewResearch")[];
-/**
- * All FDC3 standard intents
- */
-export type Fdc3StandardIntentType = (typeof Fdc3StandardIntents)[number];
-/**
- * Custom FDC3 intent
- */
-export type Fdc3CustomIntentType = string;
-/**
- * Generic FDC3 intent (standard or custom)
- */
-export type Fdc3IntentType = Fdc3StandardIntentType | Fdc3CustomIntentType;
-/**
- * Valid context for a given FDC3 intent
- */
-export type CompatibleContext<F extends Fdc3StandardIntentType> = (typeof Fdc3IntentConfiguration)[F]['contexts'][number];
+import { StandardIntent } from '@finos/fdc3';
+interface IntentConfig {
+    icon: string;
+}
+export declare const Fdc3IntentConfiguration: Record<StandardIntent, IntentConfig>;
+export {};

package/src/PredefinedConfig/Common/Fdc3Intent.js

@@ -1,106 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Fdc3StandardIntents = exports.Fdc3IntentConfiguration = exports.ViewResearchIntent = exports.ViewQuoteIntent = exports.ViewProfileIntent = exports.ViewOrdersIntent = exports.ViewNewsIntent = exports.ViewInteractionsIntent = exports.ViewInstrumentIntent = exports.ViewHoldingsIntent = exports.ViewContactIntent = exports.ViewChartIntent = exports.ViewAnalysisIntent = exports.StartEmailIntent = exports.StartChatIntent = exports.StartCallIntent = void 0;
-const Fdc3Context_1 = require("./Fdc3Context");
-exports.StartCallIntent = 'StartCall';
-exports.StartChatIntent = 'StartChat';
-exports.StartEmailIntent = 'StartEmail';
-exports.ViewAnalysisIntent = 'ViewAnalysis';
-exports.ViewChartIntent = 'ViewChart';
-exports.ViewContactIntent = 'ViewContact';
-exports.ViewHoldingsIntent = 'ViewHoldings';
-exports.ViewInstrumentIntent = 'ViewInstrument';
-exports.ViewInteractionsIntent = 'ViewInteractions';
-exports.ViewNewsIntent = 'ViewNews';
-exports.ViewOrdersIntent = 'ViewOrders';
-exports.ViewProfileIntent = 'ViewProfile';
-exports.ViewQuoteIntent = 'ViewQuote';
-exports.ViewResearchIntent = 'ViewResearch';
+exports.Fdc3IntentConfiguration = void 0;
 exports.Fdc3IntentConfiguration = {
-    [exports.StartCallIntent]: {
-        contexts: [Fdc3Context_1.ContactContextKey, Fdc3Context_1.ContactListContextKey, Fdc3Context_1.NothingContextKey],
+    CreateInteraction: {
+        icon: 'sync',
+    },
+    SendChatMessage: {
+        icon: 'chat',
+    },
+    StartCall: {
         icon: 'call',
     },
-    [exports.StartChatIntent]: {
-        contexts: [
-            Fdc3Context_1.ContactContextKey,
-            Fdc3Context_1.ContactListContextKey,
-            Fdc3Context_1.ChatInitSettingsContextKey,
-            Fdc3Context_1.NothingContextKey,
-        ],
+    StartChat: {
         icon: 'chat',
     },
-    [exports.StartEmailIntent]: {
-        contexts: [Fdc3Context_1.EmailContextKey],
+    StartEmail: {
         icon: 'mail',
     },
-    [exports.ViewAnalysisIntent]: {
-        contexts: [
-            Fdc3Context_1.InstrumentContextKey,
-            Fdc3Context_1.OrganizationContextKey,
-            Fdc3Context_1.PortfolioContextKey,
-            Fdc3Context_1.NothingContextKey,
-        ],
+    ViewAnalysis: {
         icon: 'spark-line',
     },
-    [exports.ViewChartIntent]: {
-        contexts: [
-            Fdc3Context_1.ChartContextKey,
-            Fdc3Context_1.InstrumentContextKey,
-            Fdc3Context_1.InstrumentListContextKey,
-            Fdc3Context_1.PortfolioContextKey,
-            Fdc3Context_1.PositionContextKey,
-            Fdc3Context_1.NothingContextKey,
-        ],
+    ViewChat: {
+        icon: 'chat',
+    },
+    ViewChart: {
         icon: 'pie-chart',
     },
-    [exports.ViewContactIntent]: {
-        contexts: [Fdc3Context_1.ContactContextKey, Fdc3Context_1.NothingContextKey],
+    ViewContact: {
         icon: 'person',
     },
-    [exports.ViewHoldingsIntent]: {
-        contexts: [
-            Fdc3Context_1.InstrumentContextKey,
-            Fdc3Context_1.InstrumentListContextKey,
-            Fdc3Context_1.OrganizationContextKey,
-            Fdc3Context_1.NothingContextKey,
-        ],
+    ViewHoldings: {
         icon: 'building',
     },
-    [exports.ViewInstrumentIntent]: {
-        contexts: [Fdc3Context_1.InstrumentContextKey, Fdc3Context_1.NothingContextKey],
+    ViewInstrument: {
         icon: 'money',
     },
-    [exports.ViewInteractionsIntent]: {
-        contexts: [Fdc3Context_1.ContactContextKey, Fdc3Context_1.InstrumentContextKey, Fdc3Context_1.OrganizationContextKey, Fdc3Context_1.NothingContextKey],
+    ViewInteractions: {
         icon: 'interactions',
     },
-    [exports.ViewNewsIntent]: {
-        contexts: [
-            Fdc3Context_1.CountryContextKey,
-            Fdc3Context_1.InstrumentContextKey,
-            Fdc3Context_1.InstrumentListContextKey,
-            Fdc3Context_1.OrganizationContextKey,
-            Fdc3Context_1.PortfolioContextKey,
-            Fdc3Context_1.NothingContextKey,
-        ],
+    ViewMessages: {
+        icon: 'mail',
+    },
+    ViewNews: {
         icon: 'news',
     },
-    [exports.ViewOrdersIntent]: {
-        contexts: [Fdc3Context_1.ContactContextKey, Fdc3Context_1.InstrumentContextKey, Fdc3Context_1.OrganizationContextKey, Fdc3Context_1.NothingContextKey],
+    ViewOrders: {
         icon: 'order',
     },
-    [exports.ViewProfileIntent]: {
-        contexts: [Fdc3Context_1.ContactContextKey, Fdc3Context_1.OrganizationContextKey, Fdc3Context_1.NothingContextKey],
+    ViewProfile: {
         icon: 'badge',
     },
-    [exports.ViewQuoteIntent]: {
-        contexts: [Fdc3Context_1.InstrumentContextKey, Fdc3Context_1.NothingContextKey],
+    ViewQuote: {
         icon: 'quote',
     },
-    [exports.ViewResearchIntent]: {
-        contexts: [Fdc3Context_1.ContactContextKey, Fdc3Context_1.InstrumentContextKey, Fdc3Context_1.OrganizationContextKey, Fdc3Context_1.NothingContextKey],
+    ViewResearch: {
         icon: 'science',
     },
 };
-exports.Fdc3StandardIntents = Object.keys(exports.Fdc3IntentConfiguration);

package/src/PredefinedConfig/Common/RowSummary.d.ts

@@ -1,3 +1,4 @@
+import { SuspendableObject } from './SuspendableObject';
 export declare const ROW_SUMMARY_ROW_ID = "__ROW_SUMMARY_ROW_ID";
 export declare const WEIGHTED_AVERAGE_AGGREATED_FUNCTION = "WEIGHTED_AVERAGE";
 export declare const summarySupportedExpressions: readonly ["MIN", "MAX", "SUM", "AVG", "COUNT", "MEDIAN", "MODE", "DISTINCT", "ONLY", "STD_DEVIATION", "WEIGHTED_AVERAGE"];
@@ -9,7 +10,7 @@ export type RowSummaryPosition = 'Top' | 'Bottom';
 /**
  * Defines a Row Summary used in a Layout
  */
-export interface RowSummary {
+export interface RowSummary extends SuspendableObject {
     /**
      * Where Row Summary appears - 'Top' or 'Bottom'
      */

package/src/PredefinedConfig/StyledColumnState.d.ts

@@ -3,7 +3,7 @@ import { SuspendableObject } from './Common/SuspendableObject';
 import { SparklineOptions } from '@ag-grid-community/core';
 import { AdaptableCustomIcon, AdaptableSystemIcon, AdaptablePredicate, AdaptableStyle } from '../types';
 import { TypeHint } from './Common/Types';
-import { RowScope } from "./Common/RowScope";
+import { RowScope } from './Common/RowScope';
 /**
  * Predefined Configuration for Styled Column Module
  */

package/src/Redux/ActionsReducers/FormatColumnRedux.js

@@ -130,9 +130,6 @@ const FormatColumnReducer = (state = initialState, action) => {
         case exports.FORMAT_COLUMN_UNSUSPEND: {
             return Object.assign(Object.assign({}, state), { FormatColumns: (0, utils_1.changeIsSuspendInList)(action.formatColumn, state.FormatColumns, false) });
         }
-        case exports.FORMAT_COLUMN_SUSPEND_ALL: {
-            return Object.assign(Object.assign({}, state), { FormatColumns: state.FormatColumns.map((formatColumn) => (Object.assign(Object.assign({}, formatColumn), { IsSuspended: true }))) });
-        }
         case exports.FORMAT_COLUMN_SUSPEND_ALL: {
             return Object.assign(Object.assign({}, state), { FormatColumns: (0, utils_1.suspendAllInList)(state.FormatColumns) });
         }

package/src/Strategy/AdaptableModuleBase.js

@@ -21,9 +21,7 @@ class AdaptableModuleBase {
         this.api = api;
         this.api.eventApi.on('AdaptableReady', () => {
             this.onAdaptableReady();
-            setTimeout(() => {
-                this.api.configApi.dispatchStateReadyAction(this.moduleInfo.ModuleName);
-            }, 100);
+            this.api.configApi.dispatchStateReadyAction(this.moduleInfo.ModuleName);
         });
         this.api.eventApi.on('AdaptableStateReloaded', (adaptableStateReloadedInfo) => {
             this.onAdaptableStateReloaded(adaptableStateReloadedInfo);

package/src/Strategy/AlertModule.d.ts

@@ -1,12 +1,12 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AlertDefinition } from '../PredefinedConfig/AlertState';
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
+import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { MenuItemShowPopup } from '../Utilities/MenuItem';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableModuleView, AdaptableObjectCompactView, AdaptableObjectView, IModule } from './Interface/IModule';
-import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 export declare class AlertModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     onAdaptableReady(): void;

package/src/Strategy/AlertModule.js

@@ -6,18 +6,18 @@ const AlertRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/AlertR
 const SystemRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/SystemRedux"));
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = require("../Utilities/Extensions/ArrayExtensions");
-const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
+const ActiveAlertsPanelItemLabel_1 = require("../View/Alert/ActiveAlertsPanelItemLabel");
+const AlertEmptyView_1 = require("../View/Alert/AlertEmptyView");
+const AlertStatusSubPanel_1 = require("../View/Alert/AlertStatusSubPanel");
+const getAlertType_1 = require("../View/Alert/Utilities/getAlertType");
 const AlertWizard_1 = require("../View/Alert/Wizard/AlertWizard");
-const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
-const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
-const getAlertPreviewViewItems_1 = require("./Utilities/Alert/getAlertPreviewViewItems");
+const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 const getAlertBehaviourViewItems_1 = require("./Utilities/Alert/getAlertBehaviourViewItems");
+const getAlertPreviewViewItems_1 = require("./Utilities/Alert/getAlertPreviewViewItems");
 const getAlertTypeViewItems_1 = require("./Utilities/Alert/getAlertTypeViewItems");
-const AlertEmptyView_1 = require("../View/Alert/AlertEmptyView");
-const AlertStatusSubPanel_1 = require("../View/Alert/AlertStatusSubPanel");
-const ActiveAlertsPanelItemLabel_1 = require("../View/Alert/ActiveAlertsPanelItemLabel");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
-const getAlertType_1 = require("../View/Alert/Utilities/getAlertType");
+const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
+const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
 class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.AlertModuleId, ModuleConstants.AlertModuleFriendlyName, 'alert', 'AlertPopup', 'Get notified when things happen in Adaptable that you need to know about', api);

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

@@ -2,6 +2,7 @@ import { IRowNode } from '@ag-grid-community/core';
 import { ExpressionFunction } from '../../parser/src/types';
 import { BaseParameter } from './expressionFunctionUtils';
 import { AggregateParams } from './scalarAggregationHelper';
+import { TypeHint } from '../../PredefinedConfig/Common/Types';
 import { AdaptableColumnDataType } from '../../types';
 /**
  * List of all the AggregatedScalar Functions available in AdaptableQL
@@ -9,7 +10,7 @@ import { AdaptableColumnDataType } from '../../types';
 export type AggregatedScalarFunctionName = ScalarAggregationFunction | OperandFunction;
 export type ScalarAggregationFunction = 'SUM' | 'PERCENTAGE' | 'QUANT' | 'QUARTILE' | 'PERCENTILE' | 'AVG' | 'MIN' | 'MAX' | 'COUNT' | 'CUMUL' | 'MEDIAN' | 'MODE' | 'DISTINCT' | 'ONLY' | 'STD_DEVIATION';
 type OperandFunction = 'COL' | 'OVER' | 'GROUP_BY' | 'WEIGHT';
-export interface ScalarAggregationParameter extends BaseParameter<'aggregationScalar', ScalarAggregationFunction> {
+export interface ScalarAggregationParameter extends BaseParameter<'aggregationScalar', TypeHint<string, ScalarAggregationFunction>> {
     value: AggregatedScalarExpressionEvaluation;
 }
 export interface OverParameter extends BaseParameter<'operand', 'OVER'> {
@@ -43,4 +44,5 @@ export declare const cumulativeAggregatedExpressionFunctions: AggregatedScalarFu
 export declare const quantileAggregatedExpressionFunctions: AggregatedScalarFunctionName[];
 export declare const aggregatedScalarExpressionFunctions: Record<AggregatedScalarFunctionName, ExpressionFunction>;
 export declare const aggregatedScalarExpressionFunctionNames: AggregatedScalarFunctionName[];
+export declare const addGroupByParams: (groupByColumnNames: string[] | undefined, expressionEvaluation: AggregatedScalarExpressionEvaluation) => void;
 export {};

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregatedScalarExpressionFunctionNames = exports.aggregatedScalarExpressionFunctions = exports.quantileAggregatedExpressionFunctions = exports.cumulativeAggregatedExpressionFunctions = exports.aggregatedExpressionFunctions = void 0;
+exports.addGroupByParams = exports.aggregatedScalarExpressionFunctionNames = exports.aggregatedScalarExpressionFunctions = exports.quantileAggregatedExpressionFunctions = exports.cumulativeAggregatedExpressionFunctions = exports.aggregatedExpressionFunctions = void 0;
 const tslib_1 = require("tslib");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const ArrayExtensions_1 = require("../Extensions/ArrayExtensions");
@@ -103,7 +103,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 getRowNodes: context.getRowNodes,
                 columnType,
             };
-            addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
+            (0, exports.addGroupByParams)(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
                 name: 'SUM',
                 type: 'aggregationScalar',
@@ -168,7 +168,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 getRowNodes: context.getRowNodes,
                 columnType,
             };
-            addGroupByParams(groupByColumnNames, aggregationExpressionEvaluation);
+            (0, exports.addGroupByParams)(groupByColumnNames, aggregationExpressionEvaluation);
             const result = {
                 name: 'PERCENTAGE',
                 type: 'aggregationScalar',
@@ -244,7 +244,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 getRowNodes: context.getRowNodes,
                 columnType,
             };
-            addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
+            (0, exports.addGroupByParams)(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             if (weightParameter) {
                 aggregationExpressionEvaluation.context = {
                     weightParam: weightParameter,
@@ -315,7 +315,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 getRowNodes: context.getRowNodes,
                 columnType,
             };
-            addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
+            (0, exports.addGroupByParams)(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
                 name: 'MEDIAN',
                 type: 'aggregationScalar',
@@ -382,7 +382,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 getRowNodes: context.getRowNodes,
                 columnType,
             };
-            addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
+            (0, exports.addGroupByParams)(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
                 name: 'MODE',
                 type: 'aggregationScalar',
@@ -430,7 +430,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 },
                 getRowNodes: context.getRowNodes,
             };
-            addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
+            (0, exports.addGroupByParams)(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
                 name: 'DISTINCT',
                 type: 'aggregationScalar',
@@ -481,7 +481,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 getRowNodes: context.getRowNodes,
                 columnType,
             };
-            addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
+            (0, exports.addGroupByParams)(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
                 name: 'ONLY',
                 type: 'aggregationScalar',
@@ -540,7 +540,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 getRowNodes: context.getRowNodes,
                 columnType,
             };
-            addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
+            (0, exports.addGroupByParams)(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
                 name: 'STD_DEVIATION',
                 type: 'aggregationScalar',
@@ -604,7 +604,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 getRowNodes: context.getRowNodes,
                 columnType,
             };
-            addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
+            (0, exports.addGroupByParams)(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
                 name: 'MIN',
                 type: 'aggregationScalar',
@@ -668,7 +668,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 getRowNodes: context.getRowNodes,
                 columnType,
             };
-            addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
+            (0, exports.addGroupByParams)(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
                 name: 'MAX',
                 type: 'aggregationScalar',
@@ -801,7 +801,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 },
                 columnType,
             };
-            addGroupByParams(groupByOperand === null || groupByOperand === void 0 ? void 0 : groupByOperand.value, aggregationExpressionEvaluation);
+            (0, exports.addGroupByParams)(groupByOperand === null || groupByOperand === void 0 ? void 0 : groupByOperand.value, aggregationExpressionEvaluation);
             const result = {
                 name: 'QUANT',
                 type: 'aggregationScalar',
@@ -868,7 +868,7 @@ exports.aggregatedScalarExpressionFunctions = {
                 rowFilterFn: context.filterFn,
                 getRowNodes: context.getRowNodes,
             };
-            addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
+            (0, exports.addGroupByParams)(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
             const result = {
                 name: 'COUNT',
                 type: 'aggregationScalar',
@@ -1121,6 +1121,7 @@ const addGroupByParams = (groupByColumnNames, expressionEvaluation) => {
         }));
     }
 };
+exports.addGroupByParams = addGroupByParams;
 const isUndefinedValue = (input) => {
     return input == undefined || (typeof input === 'string' && input.trim() === '');
 };

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

@@ -1,7 +1,7 @@
 import { IAdaptableService } from './Interface/IAdaptableService';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 import { Fdc3Options } from '../../AdaptableOptions/Fdc3Options';
-import { DesktopAgent, IntentResolution, AppIdentifier } from '@finos/fdc3';
+import { AppIdentifier, DesktopAgent, IntentResolution } from '@finos/fdc3';
 import { Context } from '@finos/fdc3/dist/context/ContextTypes';
 export declare class Fdc3Service implements IAdaptableService {
     private adaptableApi;

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

@@ -1,11 +1,13 @@
-import { IQueryLanguageService, ModuleExpressionFunctionsMap } from './Interface/IQueryLanguageService';
+import { IRowNode } from '@ag-grid-community/core';
 import { Observable } from 'rxjs';
+import { AdaptableApi, GridDataChangedInfo } from '../../../types';
+import { GlobalExpressionFunctionsContext } from '../../AdaptableOptions/ExpressionOptions';
+import { ExpressionFunction } from '../../parser/src/types';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
-import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
-import { ScalarAggregationParameter } from '../ExpressionFunctions/aggregatedScalarExpressionFunctions';
-import { AdaptableApi, GridDataChangedInfo } from '../../../types';
 import { BooleanAggregationParameter } from '../ExpressionFunctions/aggregatedBooleanExpressionFunctions';
+import { ScalarAggregationParameter } from '../ExpressionFunctions/aggregatedScalarExpressionFunctions';
+import { IQueryLanguageService, ModuleExpressionFunctionsMap } from './Interface/IQueryLanguageService';
 export declare class QueryLanguageService implements IQueryLanguageService {
     private adaptableApi;
     private cacheBooleanValidation;
@@ -42,6 +44,8 @@ export declare class QueryLanguageService implements IQueryLanguageService {
     getNamedQueryNamesFromExpression(input?: string): string[];
     getExpressionWithColumnFriendlyNames(expression?: string): string;
     getModuleExpressionFunctionsMap(module: AdaptableModule): ModuleExpressionFunctionsMap;
+    getCustomAggregatedScalarFunctions(): Record<string, ExpressionFunction> | ((context: GlobalExpressionFunctionsContext<string>) => Record<string, ExpressionFunction>);
+    private mapCustomAggregatedScalarFunctionsToInternal;
     private extractMappedExpressionFunctions;
     evaluateCustomQueryVariable(functionName: string, args?: any[]): any;
     private getBooleanAndScalarFunctions;