@adaptabletools/adaptable 16.0.2 → 16.0.3-canary.1

package/src/Api/Internal/Fdc3InternalApi.js

@@ -2,16 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Fdc3InternalApi = void 0;
 const ApiBase_1 = require("../Implementation/ApiBase");
+const Fdc3Context_1 = require("../../PredefinedConfig/Common/Fdc3Context");
 const fdc3_1 = require("@finos/fdc3");
 const Fdc3Options_1 = require("../../AdaptableOptions/Fdc3Options");
+const Fdc3Intent_1 = require("../../PredefinedConfig/Common/Fdc3Intent");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const ActionColumnRenderer_1 = require("../../agGrid/ActionColumnRenderer");
 class Fdc3InternalApi extends ApiBase_1.ApiBase {
     mapRowToContextData(contextType, rowNode) {
-        const contextMappedFromGridData = this.getFdc3Api().isStandardContextType(contextType)
-            ? // @ts-ignore
-                this.getMappedContextData(contextType, rowNode)
-            : { type: contextType };
+        var _a, _b, _c;
+        if (contextType === fdc3_1.ContextTypes.Nothing) {
+            return { type: fdc3_1.ContextTypes.Nothing };
+        }
+        const mappedContextData = this.mapRowValueToContextData(rowNode, this.isStandardContextType(contextType) && contextType !== fdc3_1.ContextTypes.Nothing
+            ? (_a = this.getFdc3Options().gridDataContextMapping) === null || _a === void 0 ? void 0 : _a[contextType]
+            : (_c = (_b = this.getFdc3Options().gridDataContextMapping) === null || _b === void 0 ? void 0 : _b.custom) === null || _c === void 0 ? void 0 : _c[contextType]);
+        const contextMappedFromGridData = Object.assign({ type: contextType }, mappedContextData);
         const resolveContextDataFn = this.getFdc3Options().resolveContextData;
         if (typeof resolveContextDataFn === 'function') {
             return resolveContextDataFn(Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { contextType,
@@ -22,23 +28,7 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
             return contextMappedFromGridData;
         }
     }
-    /**
-     * Computes the context based on the given `Fdc3Options.gridDataContextMapping` and the given `IRowNode`.
-     */
-    getMappedContextData(contextType, rowNode) {
-        var _a;
-        if (contextType === fdc3_1.ContextTypes.Nothing) {
-            return { type: fdc3_1.ContextTypes.Nothing };
-        }
-        const contextMapping = (_a = this.getFdc3Options().gridDataContextMapping) === null || _a === void 0 ? void 0 : _a[contextType];
-        if (!contextMapping) {
-            return { type: contextType };
-        }
-        const mappedData = this.mapRowValueToContextData(rowNode, contextMapping);
-        return Object.assign({ type: contextType }, mappedData);
-    }
     getFdc3ActionColDefs() {
-        var _a, _b, _c, _d;
         const actionColDefs = [];
         if (this.isAtLeastOneActionButtonConfigured()) {
             const actionColumnConfig = this.getFdc3Options().actionColumnDefaultConfiguration;
@@ -81,40 +71,14 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
                 type: [GeneralConstants_1.AB_SPECIAL_COLUMN, GeneralConstants_1.AB_FDC3_COLUMN, 'abColDefObject'],
             };
         };
-        const raiseIntents = ((_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.raises) || {};
-        Object.keys(raiseIntents).forEach((intent) => {
-            const intentConfigs = raiseIntents[intent];
-            intentConfigs.forEach((intentConfig) => {
-                if (!intentConfig.actionColumn) {
-                    return;
-                }
-                const intendActionColumnConfig = intentConfig.actionColumn;
-                actionColDefs.push(buildColDef(intendActionColumnConfig));
-            });
-        });
-        const raiseCustomIntents = ((_b = this.getFdc3Options().customIntents) === null || _b === void 0 ? void 0 : _b.raises) || {};
-        Object.keys(raiseCustomIntents).forEach((intent) => {
-            const intentConfigs = raiseCustomIntents[intent];
-            intentConfigs.forEach((intentConfig) => {
-                if (!intentConfig.actionColumn) {
-                    return;
-                }
-                const intendActionColumnConfig = intentConfig.actionColumn;
-                actionColDefs.push(buildColDef(intendActionColumnConfig));
-            });
-        });
-        const broadcastContexts = ((_c = this.getFdc3Options().contexts) === null || _c === void 0 ? void 0 : _c.broadcasts) || {};
-        Object.keys(broadcastContexts).forEach((contextType) => {
-            const contextConfig = broadcastContexts[contextType];
-            if (!contextConfig.actionColumn) {
+        this.getAllRaiseIntentConfigs().forEach((intentConfig) => {
+            if (!intentConfig.actionColumn) {
                 return;
             }
-            const contextActionColumnConfig = contextConfig.actionColumn;
-            actionColDefs.push(buildColDef(contextActionColumnConfig));
+            const intendActionColumnConfig = intentConfig.actionColumn;
+            actionColDefs.push(buildColDef(intendActionColumnConfig));
         });
-        const broadcastCustomContexts = ((_d = this.getFdc3Options().customContexts) === null || _d === void 0 ? void 0 : _d.broadcasts) || {};
-        Object.keys(broadcastCustomContexts).forEach((contextType) => {
-            const contextConfig = broadcastCustomContexts[contextType];
+        this.getAllBroadcastContextConfigs().forEach((contextConfig) => {
             if (!contextConfig.actionColumn) {
                 return;
             }
@@ -126,115 +90,48 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
     getButtonsForFdc3MainActionColumn() {
         const buttons = [];
         const intentButtonConfigs = this.getIntentConfigsWithActionButtons();
-        Object.keys(intentButtonConfigs).forEach((intent) => {
-            const intentConfigs = intentButtonConfigs[intent];
-            intentConfigs.forEach((intentConfig) => {
-                if (!intentConfig.actionButton) {
-                    return;
-                }
-                const intendActionButtonConfig = intentConfig.actionButton;
-                buttons.push(this.mapFdc3ButtonConfigToAdaptableButton(intendActionButtonConfig, {
-                    action: 'raiseIntent',
-                    intent,
-                    contextType: intentConfig.contextType,
-                }));
-            });
-        });
-        const intentCustomButtonConfigs = this.getCustomIntentConfigsWithActionButtons();
-        Object.keys(intentCustomButtonConfigs).forEach((intent) => {
-            const intentConfigs = intentCustomButtonConfigs[intent];
-            intentConfigs.forEach((intentConfig) => {
-                if (!intentConfig.actionButton) {
-                    return;
-                }
-                const intendActionButtonConfig = intentConfig.actionButton;
-                buttons.push(this.mapFdc3ButtonConfigToAdaptableButton(intendActionButtonConfig, {
-                    action: 'raiseIntent',
-                    intent,
-                    contextType: intentConfig.contextType,
-                }));
-            });
-        });
-        const broadcastButtonConfigs = this.getContextConfigsWithActionButtons();
-        Object.keys(broadcastButtonConfigs).forEach((contextType) => {
-            const contextConfig = broadcastButtonConfigs[contextType];
-            if (!contextConfig.actionButton) {
+        intentButtonConfigs.forEach((intentConfig) => {
+            if (!intentConfig.actionButton) {
                 return;
             }
-            const contextActionButtonConfig = contextConfig.actionButton;
-            buttons.push(this.mapFdc3ButtonConfigToAdaptableButton(contextActionButtonConfig, {
-                action: 'broadcastContext',
-                contextType,
+            const intendActionButtonConfig = intentConfig.actionButton;
+            buttons.push(this.mapFdc3ButtonConfigToAdaptableButton(intendActionButtonConfig, {
+                action: 'raiseIntent',
+                intent: intentConfig.intentType,
+                contextType: intentConfig.contextType,
             }));
         });
-        const broadcastCustomButtonConfigs = this.getCustomContextConfigsWithActionButtons();
-        Object.keys(broadcastCustomButtonConfigs).forEach((contextType) => {
-            const contextConfig = broadcastCustomButtonConfigs[contextType];
+        const broadcastButtonConfigs = this.getContextConfigsWithActionButtons();
+        broadcastButtonConfigs.forEach((contextConfig) => {
             if (!contextConfig.actionButton) {
                 return;
             }
             const contextActionButtonConfig = contextConfig.actionButton;
             buttons.push(this.mapFdc3ButtonConfigToAdaptableButton(contextActionButtonConfig, {
                 action: 'broadcastContext',
-                contextType,
+                contextType: contextConfig.contextType,
             }));
         });
         return buttons;
     }
     getButtonsForFdc3StandaloneActionColumn(columnId) {
-        var _a, _b, _c, _d;
         const buttons = [];
-        // standard intents
-        const intentButtonConfigs = ((_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.raises) || {};
-        Object.keys(intentButtonConfigs).forEach((intent) => {
-            const intentConfigs = intentButtonConfigs[intent];
-            intentConfigs.forEach((intentConfig) => {
-                var _a;
-                if (((_a = intentConfig.actionColumn) === null || _a === void 0 ? void 0 : _a.columnId) === columnId) {
-                    buttons.push(this.mapFdc3ButtonConfigToAdaptableButton(intentConfig.actionColumn.button, {
-                        action: 'raiseIntent',
-                        intent,
-                        contextType: intentConfig.contextType,
-                    }));
-                }
-            });
-        });
-        // standard contexts
-        const broadcastButtonConfigs = ((_b = this.getFdc3Options().contexts) === null || _b === void 0 ? void 0 : _b.broadcasts) || {};
-        Object.keys(broadcastButtonConfigs).forEach((contextType) => {
+        this.getAllRaiseIntentConfigs().forEach((intentConfig) => {
             var _a;
-            const contextConfig = broadcastButtonConfigs[contextType];
-            if (((_a = contextConfig.actionColumn) === null || _a === void 0 ? void 0 : _a.columnId) === columnId) {
-                buttons.push(this.mapFdc3ButtonConfigToAdaptableButton(contextConfig.actionColumn.button, {
-                    action: 'broadcastContext',
-                    contextType,
+            if (((_a = intentConfig.actionColumn) === null || _a === void 0 ? void 0 : _a.columnId) === columnId) {
+                buttons.push(this.mapFdc3ButtonConfigToAdaptableButton(intentConfig.actionColumn.button, {
+                    action: 'raiseIntent',
+                    intent: intentConfig.intentType,
+                    contextType: intentConfig.contextType,
                 }));
             }
         });
-        // custom intents
-        const intentCustomButtonConfigs = ((_c = this.getFdc3Options().customIntents) === null || _c === void 0 ? void 0 : _c.raises) || {};
-        Object.keys(intentCustomButtonConfigs).forEach((intent) => {
-            const intentConfigs = intentCustomButtonConfigs[intent];
-            intentConfigs.forEach((intentConfig) => {
-                var _a;
-                if (((_a = intentConfig.actionColumn) === null || _a === void 0 ? void 0 : _a.columnId) === columnId) {
-                    buttons.push(this.mapFdc3ButtonConfigToAdaptableButton(intentConfig.actionColumn.button, {
-                        action: 'raiseIntent',
-                        intent,
-                        contextType: intentConfig.contextType,
-                    }));
-                }
-            });
-        });
-        // custom contexts
-        const broadcastCustomButtonConfigs = ((_d = this.getFdc3Options().customContexts) === null || _d === void 0 ? void 0 : _d.broadcasts) || {};
-        Object.keys(broadcastCustomButtonConfigs).forEach((contextType) => {
+        this.getAllBroadcastContextConfigs().forEach((contextConfig) => {
             var _a;
-            const contextConfig = broadcastCustomButtonConfigs[contextType];
             if (((_a = contextConfig.actionColumn) === null || _a === void 0 ? void 0 : _a.columnId) === columnId) {
                 buttons.push(this.mapFdc3ButtonConfigToAdaptableButton(contextConfig.actionColumn.button, {
                     action: 'broadcastContext',
-                    contextType,
+                    contextType: contextConfig.contextType,
                 }));
             }
         });
@@ -248,68 +145,59 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
         return types.includes(GeneralConstants_1.AB_FDC3_COLUMN) && !this.isFdc3MainActionColumn(columnId);
     }
     handleIntentResolution(intentResolution, context, raisedIntent, app) {
-        var _a, _b, _c;
-        const raiseIntents = (_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.raises;
-        const raiseCustomIntents = (_b = this.getFdc3Options().customIntents) === null || _b === void 0 ? void 0 : _b.raises;
-        const raiseAllIntents = Object.assign(Object.assign({}, raiseIntents), raiseCustomIntents);
-        const raiseIntentConfig = raiseAllIntents === null || raiseAllIntents === void 0 ? void 0 : raiseAllIntents[raisedIntent];
-        if (raiseIntentConfig === null || raiseIntentConfig === void 0 ? void 0 : raiseIntentConfig.length) {
-            const relevantContextConfig = raiseIntentConfig.find((config) => config.contextType === context.type);
-            (_c = relevantContextConfig === null || relevantContextConfig === void 0 ? void 0 : relevantContextConfig.handleIntentResolution) === null || _c === void 0 ? void 0 : _c.call(relevantContextConfig, Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { intentResolution }));
+        var _a;
+        const relevantRaiseIntentConfig = this.getAllRaiseIntentConfigs().find((config) => config.intentType === raisedIntent && config.contextType === context.type);
+        if (typeof (relevantRaiseIntentConfig === null || relevantRaiseIntentConfig === void 0 ? void 0 : relevantRaiseIntentConfig.handleIntentResolution) === 'function') {
+            // call intent specific resolution handler
+            relevantRaiseIntentConfig.handleIntentResolution(Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { intentResolution }));
+        }
+        else {
+            // call global resolution handler
+            (_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.handleIntentResolution(Object.assign(Object.assign({}, this.getAdaptableApi().internalApi.buildBaseContext()), { intentResolution }));
         }
     }
-    isAtLeastOneActionButtonConfigured() {
-        return (!!Object.keys(this.getIntentConfigsWithActionButtons()).length ||
-            !!Object.keys(this.getContextConfigsWithActionButtons()).length ||
-            !!Object.keys(this.getCustomIntentConfigsWithActionButtons()).length ||
-            !!Object.keys(this.getCustomContextConfigsWithActionButtons()).length);
+    isStandardContextType(contextType) {
+        // @ts-ignore
+        return Fdc3Context_1.StandardContextTypes.includes(contextType);
     }
-    getIntentConfigsWithActionButtons() {
-        var _a;
-        let result = {};
-        const raiseIntents = ((_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.raises) || {};
-        Object.keys(raiseIntents).forEach((intent) => {
-            const intentConfigs = raiseIntents[intent];
-            if (intentConfigs.some((intentConfig) => intentConfig.actionButton)) {
-                // @ts-ignore
-                result[intent] = raiseIntents[intent];
-            }
-        });
-        return result;
+    isStandardIntentType(intentType) {
+        // @ts-ignore
+        return Fdc3Intent_1.Fdc3StandardIntents.includes(intentType);
     }
-    getCustomIntentConfigsWithActionButtons() {
+    getAllRaiseIntentConfigs() {
         var _a;
-        let result = {};
-        const raiseIntents = ((_a = this.getFdc3Options().customIntents) === null || _a === void 0 ? void 0 : _a.raises) || {};
-        Object.keys(raiseIntents).forEach((intent) => {
-            const intentConfigs = raiseIntents[intent];
-            if (intentConfigs.some((intentConfig) => intentConfig.actionButton)) {
-                // @ts-ignore
-                result[intent] = raiseIntents[intent];
+        const result = [];
+        const mapConfig = (intentType, intentConfigs) => intentConfigs.map((intentConfig) => (Object.assign(Object.assign({}, intentConfig), { intentType })));
+        const raiseIntentConfiguration = ((_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.raises) || {};
+        Object.keys(raiseIntentConfiguration).forEach((intentType) => {
+            if (intentType === 'custom') {
+                const customIntentConfigs = raiseIntentConfiguration[intentType];
+                Object.keys(customIntentConfigs).forEach((customIntentType) => {
+                    result.push(...mapConfig(customIntentType, customIntentConfigs[customIntentType]));
+                });
             }
-        });
-        return result;
-    }
-    getContextConfigsWithActionButtons() {
-        var _a;
-        let result = {};
-        const broadcastContexts = ((_a = this.getFdc3Options().contexts) === null || _a === void 0 ? void 0 : _a.broadcasts) || {};
-        Object.keys(broadcastContexts).forEach((contextType) => {
-            const contextConfig = broadcastContexts[contextType];
-            if (contextConfig.actionButton) {
-                result[contextType] = contextConfig;
+            else {
+                const intentConfigs = raiseIntentConfiguration[intentType];
+                result.push(...mapConfig(intentType, intentConfigs));
             }
         });
         return result;
     }
-    getCustomContextConfigsWithActionButtons() {
+    getAllBroadcastContextConfigs() {
         var _a;
-        let result = {};
-        const broadcastContexts = ((_a = this.getFdc3Options().customContexts) === null || _a === void 0 ? void 0 : _a.broadcasts) || {};
-        Object.keys(broadcastContexts).forEach((contextType) => {
-            const contextConfig = broadcastContexts[contextType];
-            if (contextConfig.actionButton) {
-                result[contextType] = contextConfig;
+        const result = [];
+        const mapConfig = (contextType, contextConfig) => (Object.assign(Object.assign({}, contextConfig), { contextType }));
+        const broadcastContextConfiguration = ((_a = this.getFdc3Options().contexts) === null || _a === void 0 ? void 0 : _a.broadcasts) || {};
+        Object.keys(broadcastContextConfiguration).forEach((contextType) => {
+            if (contextType === 'custom') {
+                const customContextConfigs = broadcastContextConfiguration[contextType];
+                Object.keys(customContextConfigs).forEach((customContextType) => {
+                    result.push(mapConfig(customContextType, customContextConfigs[customContextType]));
+                });
+            }
+            else {
+                const contextConfigs = broadcastContextConfiguration[contextType];
+                result.push(mapConfig(contextType, contextConfigs));
             }
         });
         return result;
@@ -350,6 +238,16 @@ class Fdc3InternalApi extends ApiBase_1.ApiBase {
         };
         return mapContext(contextMapping);
     }
+    isAtLeastOneActionButtonConfigured() {
+        return (this.getIntentConfigsWithActionButtons().length ||
+            this.getContextConfigsWithActionButtons().length);
+    }
+    getIntentConfigsWithActionButtons() {
+        return this.getAllRaiseIntentConfigs().filter((intentConfig) => !!intentConfig.actionButton);
+    }
+    getContextConfigsWithActionButtons() {
+        return this.getAllBroadcastContextConfigs().filter((contextConfig) => !!contextConfig.actionButton);
+    }
     mapFdc3ButtonConfigToAdaptableButton(fdc3AdaptableButton, fdcInfo) {
         const buildFdc3Context = (context) => {
             return {

package/src/Strategy/Fdc3Module.d.ts

@@ -7,6 +7,5 @@ export declare class Fdc3Module extends AdaptableModuleBase implements IModule {
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private buildRaiseIntentMenuItem;
     private buildBroadcastMenuItem;
-    private getFdc3Options;
     private getFdc3Api;
 }

package/src/Strategy/Fdc3Module.js

@@ -9,50 +9,23 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.Fdc3ModuleId, ModuleConstants.Fdc3FriendlyName, 'fdc3', null, 'The FDC3 Module - handles the FDC3 integration', api);
     }
     addContextMenuItems(menuContext) {
-        var _a, _b, _c, _d;
         if (!this.isModuleAvailable()) {
             return;
         }
         const currentColumnId = menuContext.adaptableColumn.columnId;
         const currentRowNode = menuContext.rowNode;
         const contextMenuItems = [];
-        // Raise Intent menu items
-        // standard intents
-        const raiseIntents = ((_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.raises) || {};
-        Object.keys(raiseIntents).forEach((intent) => {
-            const contextConfigs = raiseIntents[intent];
-            const configsWithMenuItemsForCurrentColumn = contextConfigs.filter((configElem) => { var _a; return (_a = configElem.contextMenu) === null || _a === void 0 ? void 0 : _a.columnIds.includes(currentColumnId); });
-            configsWithMenuItemsForCurrentColumn.forEach((raiseContextConfig) => {
-                contextMenuItems.push(this.buildRaiseIntentMenuItem(intent, raiseContextConfig.contextType, currentRowNode));
-            });
+        this.getFdc3Api()
+            .internalApi.getAllRaiseIntentConfigs()
+            .filter((raiseIntentConfig) => { var _a; return (_a = raiseIntentConfig.contextMenu) === null || _a === void 0 ? void 0 : _a.columnIds.includes(currentColumnId); })
+            .forEach((raiseIntentConfig) => {
+            contextMenuItems.push(this.buildRaiseIntentMenuItem(raiseIntentConfig.intentType, raiseIntentConfig.contextType, currentRowNode));
         });
-        // custom intents
-        const raiseCustomIntents = ((_b = this.getFdc3Options().customIntents) === null || _b === void 0 ? void 0 : _b.raises) || {};
-        Object.keys(raiseCustomIntents).forEach((intent) => {
-            const contextConfigs = raiseCustomIntents[intent];
-            const configsWithMenuItemsForCurrentColumn = contextConfigs.filter((configElem) => { var _a; return (_a = configElem.contextMenu) === null || _a === void 0 ? void 0 : _a.columnIds.includes(currentColumnId); });
-            configsWithMenuItemsForCurrentColumn.forEach((raiseContextConfig) => {
-                contextMenuItems.push(this.buildRaiseIntentMenuItem(intent, raiseContextConfig.contextType, currentRowNode));
-            });
-        });
-        // Broadcast menu items
-        // standard contexts
-        const broadcastContext = ((_c = this.getFdc3Options().contexts) === null || _c === void 0 ? void 0 : _c.broadcasts) || {};
-        Object.keys(broadcastContext).forEach((contextType) => {
-            var _a;
-            const config = broadcastContext[contextType];
-            if ((_a = config === null || config === void 0 ? void 0 : config.contextMenu) === null || _a === void 0 ? void 0 : _a.columnIds.includes(currentColumnId)) {
-                contextMenuItems.push(this.buildBroadcastMenuItem(contextType, currentRowNode));
-            }
-        });
-        // custom contexts
-        const broadcastCustomContext = ((_d = this.getFdc3Options().customContexts) === null || _d === void 0 ? void 0 : _d.broadcasts) || {};
-        Object.keys(broadcastCustomContext).forEach((contextType) => {
-            var _a;
-            const config = broadcastCustomContext[contextType];
-            if ((_a = config === null || config === void 0 ? void 0 : config.contextMenu) === null || _a === void 0 ? void 0 : _a.columnIds.includes(currentColumnId)) {
-                contextMenuItems.push(this.buildBroadcastMenuItem(contextType, currentRowNode));
-            }
+        this.getFdc3Api()
+            .internalApi.getAllBroadcastContextConfigs()
+            .filter((broadcastConfig) => { var _a; return (_a = broadcastConfig.contextMenu) === null || _a === void 0 ? void 0 : _a.columnIds.includes(currentColumnId); })
+            .forEach((broadcastConfig) => {
+            contextMenuItems.push(this.buildBroadcastMenuItem(broadcastConfig.contextType, currentRowNode));
         });
         if (contextMenuItems.length > 1) {
             const groupMenuItem = {
@@ -92,9 +65,6 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
         };
         return menuItem;
     }
-    getFdc3Options() {
-        return this.api.optionsApi.getFdc3Options();
-    }
     getFdc3Api() {
         return this.api.fdc3Api;
     }

package/src/Utilities/Constants/DocumentationLinkConstants.js

@@ -9,7 +9,7 @@ exports.ScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expre
 exports.ObservableQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-observable`;
 exports.AggregatedBooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation-boolean`;
 exports.AggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation-scalar`;
-exports.CumulativeAggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation-scalar#cumulative-aggregation`;
+exports.CumulativeAggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-cumulative`;
 exports.PredicateDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-predicate`;
 exports.PrimaryKeyDocsLink = `${exports.HOST_URL_DOCS}/guide/getting-started-primary-key`;
 exports.LicenseDocsLink = `${exports.HOST_URL_DOCS}/guide/licensing`;

package/src/Utilities/Services/Fdc3Service.js

@@ -8,11 +8,9 @@ class Fdc3Service {
         this.intentHandlerSubscriptions = [];
         this.loggedAgentError = false;
         this.adaptableApi.eventApi.on('AdaptableReady', () => {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            const adaptableHandleIntentFn = this.getFdc3Options().handleIntent;
-            const listenForStandardIntents = (_b = (_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.listensFor) !== null && _b !== void 0 ? _b : [];
-            const listenForCustomIntents = (_d = (_c = this.getFdc3Options().customIntents) === null || _c === void 0 ? void 0 : _c.listensFor) !== null && _d !== void 0 ? _d : [];
-            const listenForIntents = [...listenForStandardIntents, ...listenForCustomIntents];
+            var _a, _b, _c, _d, _e, _f;
+            const adaptableHandleIntentFn = (_a = this.getFdc3Options().intents) === null || _a === void 0 ? void 0 : _a.handleIntent;
+            const listenForIntents = (_c = (_b = this.getFdc3Options().intents) === null || _b === void 0 ? void 0 : _b.listensFor) !== null && _c !== void 0 ? _c : [];
             if (listenForIntents.length) {
                 if (!adaptableHandleIntentFn) {
                     this.adaptableApi.logError(`Following FDC3 Intent Listener(s) have been provided but no 'handleIntent' function has been supplied in the FDC3 Options`, listenForIntents);
@@ -28,10 +26,8 @@ class Fdc3Service {
                     }).then((listener) => this.intentHandlerSubscriptions.push(listener));
                 });
             }
-            const adaptableHandleContextFn = this.getFdc3Options().handleContext;
-            const listenForStandardContexts = (_f = (_e = this.getFdc3Options().contexts) === null || _e === void 0 ? void 0 : _e.listensFor) !== null && _f !== void 0 ? _f : [];
-            const listenForCustomContexts = (_h = (_g = this.getFdc3Options().customContexts) === null || _g === void 0 ? void 0 : _g.listensFor) !== null && _h !== void 0 ? _h : [];
-            const listenForContexts = [...listenForStandardContexts, ...listenForCustomContexts];
+            const adaptableHandleContextFn = (_d = this.getFdc3Options().contexts) === null || _d === void 0 ? void 0 : _d.handleContext;
+            const listenForContexts = (_f = (_e = this.getFdc3Options().contexts) === null || _e === void 0 ? void 0 : _e.listensFor) !== null && _f !== void 0 ? _f : [];
             if (listenForContexts === null || listenForContexts === void 0 ? void 0 : listenForContexts.length) {
                 if (!adaptableHandleContextFn) {
                     this.adaptableApi.logError(`Following FDC3 Context Listener(s) have been provided but no 'handleContext' function has been supplied in the FDC3 Options`, listenForContexts);
@@ -60,24 +56,31 @@ class Fdc3Service {
         this.intentHandlerSubscriptions.forEach((subscription) => subscription.unsubscribe());
     }
     async raiseIntent(intent, context, app) {
-        var _a;
+        if (!this.getDesktopAgent()) {
+            return;
+        }
         this.logFdc3Event('OUT', `raise ${intent}`, JSON.stringify(context));
-        const intentResolution = await ((_a = this.getDesktopAgent()) === null || _a === void 0 ? void 0 : _a.raiseIntent(intent, context, app));
+        const intentResolution = await this.getDesktopAgent().raiseIntent(intent, context, app);
+        this.logFdc3Event('IN', `IntentResolution`, intentResolution.intent);
         this.getFdc3Api().internalApi.handleIntentResolution(intentResolution, context, intent, app);
         return intentResolution;
     }
     async raiseIntentForContext(context, app) {
-        var _a;
+        if (!this.getDesktopAgent()) {
+            return;
+        }
         this.logFdc3Event('OUT', `raise for context`, JSON.stringify(context));
-        const intentResolution = await ((_a = this.getDesktopAgent()) === null || _a === void 0 ? void 0 : _a.raiseIntentForContext(context, app));
-        // TODO AFL
-        // this.getFdc3Api().internalApi.handleIntentResolution(intentResolution, context, null, app);
+        const intentResolution = await this.getDesktopAgent().raiseIntentForContext(context, app);
+        this.logFdc3Event('IN', `IntentResolution`, intentResolution.intent);
+        this.getFdc3Api().internalApi.handleIntentResolution(intentResolution, context, null, app);
         return intentResolution;
     }
     broadcast(context) {
-        var _a;
+        if (!this.getDesktopAgent()) {
+            return;
+        }
         this.logFdc3Event('OUT', `broadcast`, JSON.stringify(context));
-        return (_a = this.getDesktopAgent()) === null || _a === void 0 ? void 0 : _a.broadcast(context);
+        return this.getDesktopAgent().broadcast(context);
     }
     logFdc3Event(type, ...params) {
         if (!this.getFdc3Options().enableLogging) {

package/src/View/QuickSearch/QuickSearchInput.js

@@ -12,7 +12,7 @@ const QuickSearchInput = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const QuickSearchText = (0, react_redux_1.useSelector)((state) => state.QuickSearch.QuickSearchText);
     const dispatch = (0, react_redux_1.useDispatch)();
-    const onRunQuickSearch = (newQuickSearchText) => dispatch(QuickSearchRedux.QuickSearchRun(newQuickSearchText));
+    const onRunQuickSearch = react_1.default.useCallback((newQuickSearchText) => dispatch(QuickSearchRedux.QuickSearchRun(newQuickSearchText)), []);
     const [searchText, search] = (0, useQuickSearchDebounced_1.useQuickSearchDebounced)({
         QuickSearchText,
         onRunQuickSearch,

package/src/agGrid/Adaptable.d.ts

@@ -378,7 +378,6 @@ export declare class Adaptable implements IAdaptable {
     setColumnSort(columnSorts: ColumnSort[]): void;
     clearColumnSort(): void;
     setGridData(dataSource: any[]): void;
-    setInitialGridData(dataSource: any[]): void;
     getGridData(): any[];
     getFilteredData(): any[];
     updateRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;

package/src/agGrid/Adaptable.js

@@ -4277,9 +4277,6 @@ class Adaptable {
         this.gridOptions.api.setRowData(dataSource);
         this.updateColumnDataTypeIfRowDataIsEmpty();
         this.updateRowGroupsExpandedState();
-    }
-    setInitialGridData(dataSource) {
-        this.setGridData(dataSource);
         this.setupColumns();
     }
     getGridData() {

package/src/metamodel/adaptable.metamodel.d.ts

@@ -1287,6 +1287,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref?: undefined;
+        })[];
     };
     BulkUpdatePermittedValues: {
         name: string;
@@ -3911,6 +3924,25 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+            ref?: undefined;
+        })[];
     };
     RangeValueType: {
         name: string;