@adaptabletools/adaptable 16.0.0 → 16.0.1-canary.1

package/src/Strategy/CommentsModule.js

@@ -41,7 +41,7 @@ class CommentsModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return undefined;
         }
         const items = [];
-        const isCellCommentable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getUserInterfaceOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable;
+        const isCellCommentable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable;
         if (!isCellCommentable ||
             isCellCommentable({
                 adaptableApi: this.adaptable.api,
@@ -102,9 +102,9 @@ class CommentsModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return;
         }
         const cellPosition = this.getCellPositionFromEvent(event);
-        const openCommentPosition = this.adaptable.api.commentsApi.getOpenCommentPosition();
+        const openCommentGridCell = this.adaptable.api.commentsApi.getOpenCommentGridCell();
         // Hovering over someting that is not a cell and there is no open comment
-        if (!cellPosition && openCommentPosition) {
+        if (!cellPosition && openCommentGridCell) {
             // need to close if the new cell does not have a comment
             this.adaptable.api.commentsApi.hideComment();
         }
@@ -112,16 +112,16 @@ class CommentsModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             this.adaptable.api.commentsApi.showComment(cellPosition, false);
         }
     }
-    handleCellSelected(cellPosition) {
+    handleCellSelected(commentGridCell) {
         // if already opened - do nothing
-        const openCommentPosition = this.adaptable.api.commentsApi.getOpenCommentPosition();
-        if ((openCommentPosition === null || openCommentPosition === void 0 ? void 0 : openCommentPosition.PrimaryKeyValue) === cellPosition.PrimaryKeyValue &&
-            (openCommentPosition === null || openCommentPosition === void 0 ? void 0 : openCommentPosition.ColumnId) === cellPosition.ColumnId) {
+        const openCommentGridCell = this.adaptable.api.commentsApi.getOpenCommentGridCell();
+        if ((openCommentGridCell === null || openCommentGridCell === void 0 ? void 0 : openCommentGridCell.PrimaryKeyValue) === commentGridCell.PrimaryKeyValue &&
+            (openCommentGridCell === null || openCommentGridCell === void 0 ? void 0 : openCommentGridCell.ColumnId) === commentGridCell.ColumnId) {
             return;
         }
         // if open but this has no comment, close
-        const cellComments = this.adaptable.api.commentsApi.getCellComments(cellPosition);
-        if (openCommentPosition && !(cellComments === null || cellComments === void 0 ? void 0 : cellComments.length)) {
+        const cellComments = this.adaptable.api.commentsApi.getCellComments(commentGridCell);
+        if (openCommentGridCell && !(cellComments === null || cellComments === void 0 ? void 0 : cellComments.length)) {
             // hide only if in edit mode
             // because if you select a cell and move the mouse fast over another cell
             // with a comment, you do not want to close that comment
@@ -132,8 +132,8 @@ class CommentsModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return;
         }
         // if open but the new selection has a comment open that one in edit mode (because of click)
-        if (openCommentPosition && (cellComments === null || cellComments === void 0 ? void 0 : cellComments.length)) {
-            this.adaptable.api.commentsApi.showComment(cellPosition, true);
+        if (openCommentGridCell && (cellComments === null || cellComments === void 0 ? void 0 : cellComments.length)) {
+            this.adaptable.api.commentsApi.showComment(commentGridCell, true);
             return;
         }
     }

package/src/Strategy/Fdc3Module.d.ts

@@ -4,7 +4,6 @@ import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 export declare class Fdc3Module extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    isModuleAvailable(): boolean;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private buildRaiseIntentMenuItem;
     private buildBroadcastMenuItem;

package/src/Strategy/Fdc3Module.js

@@ -8,9 +8,6 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.Fdc3ModuleId, ModuleConstants.Fdc3FriendlyName, 'fdc3', null, 'The FDC3 Module - handles the FDC3 integration', api);
     }
-    isModuleAvailable() {
-        return this.getFdc3Options().enableFdc3;
-    }
     addContextMenuItems(menuContext) {
         var _a, _b, _c, _d;
         if (!this.isModuleAvailable()) {

package/src/Utilities/Constants/GeneralConstants.d.ts

@@ -31,7 +31,6 @@ export declare const AG_GRID_PIVOT_COLUMN: string;
 export declare const AG_GRID_CHART_WINDOW = "AG Grid Window";
 export declare const ADAPTABLE_ROW_ACTION_BUTTONS = "adaptableRowActionButtons";
 export declare const ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = "(ActionRowButtons)";
-export declare const ADAPTABLE_FDC3_ACTION_COLUMN = "fdc3ActionColumn";
 export declare const ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = "(FDC3ActionColumn)";
 export declare const DEFAULT_DATE_FORMAT_PATTERN = "dd-MM-yyyy";
 export declare const SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE: number;

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = exports.ADAPTABLE_FDC3_ACTION_COLUMN = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_FDC3_COLUMN = exports.AB_ROW_ACTIONS_COLUMN = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
-exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = void 0;
+exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_FDC3_COLUMN = exports.AB_ROW_ACTIONS_COLUMN = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const UIHelper_1 = require("../../View/UIHelper");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
@@ -34,7 +34,6 @@ exports.AG_GRID_PIVOT_COLUMN = 'pivot_';
 exports.AG_GRID_CHART_WINDOW = 'AG Grid Window';
 exports.ADAPTABLE_ROW_ACTION_BUTTONS = 'adaptableRowActionButtons';
 exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = '(ActionRowButtons)';
-exports.ADAPTABLE_FDC3_ACTION_COLUMN = 'fdc3ActionColumn';
 exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = '(FDC3ActionColumn)';
 exports.DEFAULT_DATE_FORMAT_PATTERN = 'dd-MM-yyyy';
 /*

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -295,9 +295,9 @@ exports.DefaultAdaptableOptions = {
         agGridContainerName: GeneralConstants.AG_GRID_CHART_WINDOW,
     },
     fdc3Options: {
-        enableFdc3: false,
         enableLogging: false,
         actionColumnDefaultConfiguration: {
+            columnId: 'fdc3ActionColumn',
             headerName: 'FDC3 Actions',
             width: 200,
             resizable: true,

package/src/Utilities/Services/Fdc3Service.js

@@ -59,15 +59,20 @@ class Fdc3Service {
         this.contextHandlerSubscriptions.forEach((subscription) => subscription.unsubscribe());
         this.intentHandlerSubscriptions.forEach((subscription) => subscription.unsubscribe());
     }
-    raiseIntent(intent, context, app) {
+    async raiseIntent(intent, context, app) {
         var _a;
         this.logFdc3Event('OUT', `raise ${intent}`, JSON.stringify(context));
-        return (_a = this.getDesktopAgent()) === null || _a === void 0 ? void 0 : _a.raiseIntent(intent, context, app);
+        const intentResolution = await ((_a = this.getDesktopAgent()) === null || _a === void 0 ? void 0 : _a.raiseIntent(intent, context, app));
+        this.getFdc3Api().internalApi.handleIntentResolution(intentResolution, context, intent, app);
+        return intentResolution;
     }
-    raiseIntentForContext(context, app) {
+    async raiseIntentForContext(context, app) {
         var _a;
         this.logFdc3Event('OUT', `raise for context`, JSON.stringify(context));
-        return (_a = this.getDesktopAgent()) === null || _a === void 0 ? void 0 : _a.raiseIntentForContext(context, app);
+        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);
+        return intentResolution;
     }
     broadcast(context) {
         var _a;

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizard.js

@@ -10,11 +10,9 @@ const ConfigurationWizardColumnsStep_1 = require("./ConfigurationWizardColumnsSt
 const GridOptionsForm_1 = tslib_1.__importDefault(require("./GridOptionsForm"));
 const EntitlementsForm_1 = tslib_1.__importDefault(require("./EntitlementsForm"));
 const UiOptionsForm_1 = require("./UIOptions/UiOptionsForm");
-const FinanceForm_1 = require("./FinanceForm");
 const AdaptableOptionsForm_1 = require("./AdaptableOptionsForm");
 const AdaptableHelper_1 = tslib_1.__importDefault(require("../../../Utilities/Helpers/AdaptableHelper"));
 const ConfigurationWizard = (props) => {
-    var _a, _b;
     const [isPrimaryKeySelected, setIsValid] = React.useState(true);
     const [adaptableConfig, setAdaptableConfig] = (0, react_1.useState)(() => {
         const gridOptionDefaults = {
@@ -71,7 +69,6 @@ const ConfigurationWizard = (props) => {
     const handleGridOptionsChange = React.useCallback((gridOptions) => {
         setAdaptableConfig((adaptableConfig) => (Object.assign(Object.assign({}, adaptableConfig), { gridOptions: gridOptions })));
     }, []);
-    const financePlugin = (_b = (_a = adaptableConfig.adaptableOptions.plugins) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, (plugin) => plugin.pluginId === 'finance');
     let sections = [
         {
             title: 'Columns',
@@ -105,11 +102,17 @@ const ConfigurationWizard = (props) => {
             details: 'Configure Entitlements',
             render: () => (React.createElement(EntitlementsForm_1.default, { adaptableOptions: adaptableConfig.adaptableOptions, onChangedAptableOptions: handleAdaptableOptionsChange })),
         },
+        /**
         financePlugin && {
-            title: 'Finance',
-            details: 'Finance Options',
-            render: () => (React.createElement(FinanceForm_1.FinanceForm, { adaptableConfig: adaptableConfig, onChangedAdaptableConfig: setAdaptableConfig })),
-        },
+          title: 'Finance',
+          details: 'Finance Options',
+          render: () => (
+            <FinanceForm
+              adaptableConfig={adaptableConfig}
+              onChangedAdaptableConfig={setAdaptableConfig}
+            />
+          ),
+        },  */
     ].filter(Boolean);
     if (props.startSections) {
         sections = [

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/FinanceForm/FinanceForm.d.ts

@@ -1,7 +1 @@
-import * as React from 'react';
-import { AdaptableConfig } from '../../../../types';
-export interface FinanceFormProps {
-    adaptableConfig: AdaptableConfig;
-    onChangedAdaptableConfig: (adaptableConfig: AdaptableConfig) => void;
-}
-export declare const FinanceForm: React.FunctionComponent<React.PropsWithChildren<FinanceFormProps>>;
+export {};