@adaptabletools/adaptable-plugin-openfin 19.2.3 → 20.0.0-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-plugin-openfin",
-  "version": "19.2.3",
+  "version": "20.0.0-canary.0",
   "description": "",
   "homepage": "http://www.adaptabletools.com/",
   "author": {
@@ -12,13 +12,13 @@
     "lodash": "^4.17.15",
     "openfin-notifications": "^0.12.6",
     "prop-types": "^15.6.2",
-    "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-    "react-redux": "7.2.8",
+    "react": "^18.0.0 || ^19.0.0",
+    "react-redux": "^9.2.0",
     "rebass": "^3.2.2",
-    "redux": "4.0.5",
+    "redux": "^5.0.1",
     "styled-components": "^4.4.1",
-    "tslib": "^2.3.0",
-    "@adaptabletools/adaptable": "19.2.3"
+    "tslib": "^2.8.1",
+    "@adaptabletools/adaptable": "20.0.0-canary.0"
   },
   "type": "module",
   "module": "src/index.js"

package/src/Module/OpenFinModule.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableModuleBase } from '@adaptabletools/adaptable/src/Strategy/AdaptableModuleBase';
 import { IOpenFinModule } from './Interface/IOpenFinModule';
 import { OpenFinApi } from '@adaptabletools/adaptable/src/Api/OpenFinApi';
-import { OpenFinReport } from '@adaptabletools/adaptable/src/PredefinedConfig/SystemState';
+import { OpenFinReport } from '@adaptabletools/adaptable/src/PredefinedConfig/InternalState';
 import { AdaptableApi, AccessLevel } from '@adaptabletools/adaptable/types';
 export declare const EXCEL_VALIDATION_FAILED = "excelValidationFailed";
 export declare class OpenFinModule extends AdaptableModuleBase implements IOpenFinModule {
@@ -13,7 +13,6 @@ export declare class OpenFinModule extends AdaptableModuleBase implements IOpenF
     private removeDataChangedListener;
     private removeGridRefreshedListener;
     private removeGridFilteredListener;
-    private removeGridSortChangedListener;
     private removeCellSelectionChangedListener;
     private removeRowSelectionChangedListener;
     private removeSheetChangedListener;

package/src/Module/OpenFinModule.js

@@ -1,7 +1,7 @@
 import { AdaptableModuleBase } from '@adaptabletools/adaptable/src/Strategy/AdaptableModuleBase';
 import * as ModuleConstants from '@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants';
 import throttle from 'lodash/throttle';
-import { SELECTED_CELLS_REPORT, DEFAULT_LIVE_REPORT_THROTTLE_TIME, SELECTED_ROWS_REPORT, ALL_DATA_REPORT, } from '@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants';
+import { DEFAULT_LIVE_REPORT_THROTTLE_TIME, ALL_DATA_REPORT, SELECTED_DATA_REPORT, } from '@adaptabletools/adaptable/src/Utilities/Constants/GeneralConstants';
 export const EXCEL_VALIDATION_FAILED = 'excelValidationFailed';
 export class OpenFinModule extends AdaptableModuleBase {
     constructor(api) {
@@ -22,8 +22,7 @@ export class OpenFinModule extends AdaptableModuleBase {
             this.AccessLevel = 'Hidden';
         }
         else {
-            this.AccessLevel = this.api.entitlementApi
-                .getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
+            this.AccessLevel = this.api.entitlementApi.getEntitlementAccessLevelForModule(this.moduleInfo.ModuleName);
         }
     }
     getOpenFinApi() {
@@ -75,8 +74,7 @@ export class OpenFinModule extends AdaptableModuleBase {
             this.sendInitialLiveData();
         }, 500); // for whatever strange excel reason, the timeout is needed
         const isSelectionReport = (report) => {
-            return (report &&
-                (report.ReportName === SELECTED_CELLS_REPORT || report.ReportName === SELECTED_ROWS_REPORT));
+            return report && report.ReportName === SELECTED_DATA_REPORT;
         };
         const resendLiveDataNoSelectionReport = () => {
             // Rerun all reports except selected cells / rows
@@ -108,7 +106,7 @@ export class OpenFinModule extends AdaptableModuleBase {
         // if the grid has refreshed then update all live reports
         this.removeGridRefreshedListener = this.adaptable._on('GridRefreshed', resendLiveDataNoSelectionReport);
         if (iOpenFinReport.ReportName !== ALL_DATA_REPORT) {
-            this.removeGridSortChangedListener = this.adaptable._on('SortChanged', resendLiveData);
+            //  this.removeGridSortChangedListener = this.adaptable._on('SortChanged', resendLiveData);
             // if the grid filters have changed then update any live reports except cell or row selected
             this.removeGridFilteredListener = this.adaptable._on('AdapTableFiltersApplied', resendLiveDataNoSelectionReport);
         }
@@ -116,14 +114,14 @@ export class OpenFinModule extends AdaptableModuleBase {
         this.removeCellSelectionChangedListener = this.api.eventApi.on('CellSelectionChanged', () => {
             const currentLiveIOpenFinReport = this.getOpenFinApi().getCurrentLiveOpenFinReport();
             if (currentLiveIOpenFinReport &&
-                currentLiveIOpenFinReport.ReportName === SELECTED_CELLS_REPORT) {
+                currentLiveIOpenFinReport.ReportName === SELECTED_DATA_REPORT) {
                 this.throttledRecomputeAndSendLiveDataEvent();
             }
         });
         this.removeRowSelectionChangedListener = this.api.eventApi.on('RowSelectionChanged', () => {
             const currentLiveIOpenFinReport = this.getOpenFinApi().getCurrentLiveOpenFinReport();
             if (currentLiveIOpenFinReport &&
-                currentLiveIOpenFinReport.ReportName === SELECTED_ROWS_REPORT) {
+                currentLiveIOpenFinReport.ReportName === SELECTED_DATA_REPORT) {
                 this.throttledRecomputeAndSendLiveDataEvent();
             }
         });
@@ -182,7 +180,7 @@ export class OpenFinModule extends AdaptableModuleBase {
                                     return reject(msg);
                                     // return resolve({ ignore: true });
                                 }
-                                const cellDataChangedInfo = this.api.internalApi.buildDataChangedInfo({
+                                const cellDataChangedInfo = this.api.internalApi.buildCellDataChangedInfo({
                                     oldValue,
                                     newValue,
                                     column: this.api.columnApi.getColumnWithColumnId(columnId),
@@ -237,7 +235,6 @@ export class OpenFinModule extends AdaptableModuleBase {
                 }, { success: true, dataChangedInfos, failedValidationRules });
             })
                 .then(({ success, dataChangedInfos, failedValidationRules }) => {
-                var _a, _b, _c;
                 const api = this.getOpenFinApi();
                 const pluginOptions = api.getPluginOptions();
                 if (!success) {
@@ -258,14 +255,14 @@ export class OpenFinModule extends AdaptableModuleBase {
                         pluginOptions.onValidationFailureInExcel === 'show-undo-notification') {
                         const textPredicate = this.adaptable.api.columnScopeApi.getScopeDescription(failedValidationRules[0].Scope) +
                             ' ' +
-                            ((_a = failedValidationRules[0].Rule) === null || _a === void 0 ? void 0 : _a.Predicates.map((predicate) => this.adaptable.api.predicateApi.predicateToString(predicate)).join(' AND '));
-                        const info = Object.assign({}, dataChangedInfos[0]);
+                            failedValidationRules[0].Rule?.Predicates.map((predicate) => this.adaptable.api.predicateApi.predicateToString(predicate)).join(' AND ');
+                        const info = { ...dataChangedInfos[0] };
                         delete info.rowNode;
                         const alertOptions = this.api.optionsApi.getAlertOptions();
-                        alertOptions.actionHandlers = (_b = alertOptions.actionHandlers) !== null && _b !== void 0 ? _b : [];
+                        alertOptions.commandHandlers = alertOptions.commandHandlers ?? [];
                         if (pluginOptions.onValidationFailureInExcel === 'show-undo-notification' &&
-                            !alertOptions.actionHandlers.find((handler) => handler.name === 'openfin-plugin:excel-undo')) {
-                            alertOptions.actionHandlers.push({
+                            !alertOptions.commandHandlers.find((handler) => handler.name === 'openfin-plugin:excel-undo')) {
+                            alertOptions.commandHandlers.push({
                                 name: 'openfin-plugin:excel-undo',
                                 handler: (button, context) => {
                                     try {
@@ -278,7 +275,7 @@ export class OpenFinModule extends AdaptableModuleBase {
                                 },
                             });
                         }
-                        this.adaptable.api.alertApi.showAdaptableAlert({
+                        this.adaptable.api.alertApi.displayAdaptableAlert({
                             alertType: 'cellChanged',
                             cellDataChangedInfo: info,
                             alertDefinition: {
@@ -289,13 +286,13 @@ export class OpenFinModule extends AdaptableModuleBase {
                                 Scope: {
                                     All: true,
                                 },
-                                Rule: { Predicates: (_c = failedValidationRules[0].Rule) === null || _c === void 0 ? void 0 : _c.Predicates },
+                                Rule: { Predicates: failedValidationRules[0].Rule?.Predicates },
                                 AlertForm: {
                                     Buttons: pluginOptions.onValidationFailureInExcel === 'show-undo-notification'
                                         ? [
                                             {
                                                 Label: 'Undo change',
-                                                Action: 'openfin-plugin:excel-undo',
+                                                Command: 'openfin-plugin:excel-undo',
                                             },
                                         ]
                                         : [],
@@ -334,9 +331,6 @@ export class OpenFinModule extends AdaptableModuleBase {
         if (this.removeGridRefreshedListener) {
             this.removeGridRefreshedListener();
         }
-        if (this.removeGridSortChangedListener) {
-            this.removeGridSortChangedListener();
-        }
         if (this.removeGridFilteredListener) {
             this.removeGridFilteredListener();
         }

package/src/OpenFinApiImpl.d.ts

@@ -1,7 +1,7 @@
 import { ApiBase } from '@adaptabletools/adaptable/src/Api/Implementation/ApiBase';
 import { OpenFinApi } from '@adaptabletools/adaptable/src/Api/OpenFinApi';
 import { OpenFinPluginOptions } from '@adaptabletools/adaptable/src/AdaptableOptions/OpenFinPluginOptions';
-import { AdaptableAlert, AlertOptions, NotificationsOptions } from '@adaptabletools/adaptable/types';
+import { AdaptableAlert } from '@adaptabletools/adaptable/types';
 import { OpenFinReport, OpenFinSchedule, OpenFinState } from '@adaptabletools/adaptable/src/PredefinedConfig/OpenFinState';
 import { IAdaptable } from '@adaptabletools/adaptable/src/AdaptableInterfaces/IAdaptable';
 export declare class OpenFinApiImpl extends ApiBase implements OpenFinApi {
@@ -18,8 +18,6 @@ export declare class OpenFinApiImpl extends ApiBase implements OpenFinApi {
     getOpenFinThrottleTime(): number | undefined;
     getCurrentLiveOpenFinReport(): OpenFinReport | undefined;
     getOpenFinSchedules(): OpenFinSchedule[];
-    getNotificationsOptions(): NotificationsOptions;
-    getAlertOptions(): AlertOptions;
     startLiveData(OpenFinReport: OpenFinReport): void;
     stopLiveData(): void;
 }

package/src/OpenFinApiImpl.js

@@ -22,9 +22,8 @@ export class OpenFinApiImpl extends ApiBase {
         this.options = options;
         if (isRunningInOpenfin()) {
             addEventListener('notification-action', (event) => {
-                var _a, _b, _c, _d, _e;
                 if (this.options.onValidationFailureInExcel === 'show-undo-notification' &&
-                    ((_a = event.notification.customData) === null || _a === void 0 ? void 0 : _a.name) === 'validation-failed') {
+                    event.notification.customData?.name === 'validation-failed') {
                     if (this.getCurrentLiveOpenFinReport()) {
                         try {
                             let openFinModule = (this.getAdaptableInternalApi().getModules().get(ModuleConstants.OpenFinModuleId));
@@ -36,7 +35,7 @@ export class OpenFinApiImpl extends ApiBase {
                         }
                     }
                 }
-                const alertId = (_c = (_b = event.notification.customData) === null || _b === void 0 ? void 0 : _b.AlertId) !== null && _c !== void 0 ? _c : '';
+                const alertId = event.notification.customData?.AlertId ?? '';
                 const alert = this.getAlertApi()
                     .internalApi.getAdaptableAlerts()
                     .find((alert) => alert.Uuid === alertId);
@@ -45,16 +44,14 @@ export class OpenFinApiImpl extends ApiBase {
                     if (clickedButton) {
                         const context = {
                             alert: alert,
-                            adaptableApi: this.getAdaptableApi(),
-                            userName: this.getOptions().userName,
-                            adaptableId: this.getOptions().adaptableId,
                             formData: undefined,
+                            ...this.getAdaptableInternalApi().buildBaseContext(),
                         };
                         this.getAlertApi().internalApi.executeAlertButton(clickedButton, context);
                     }
                 }
                 event.notification.alert = alert;
-                (_e = (_d = this.options).onNotificationAction) === null || _e === void 0 ? void 0 : _e.call(_d, event);
+                this.options.onNotificationAction?.(event);
             });
         }
     }
@@ -83,13 +80,13 @@ export class OpenFinApiImpl extends ApiBase {
             ? null
             : alert.alertDefinition.AlertForm ||
                 this.getAlertApi().internalApi.getDefaultAlertNotificationForm();
-        if (alertForm && (alertForm === null || alertForm === void 0 ? void 0 : alertForm.Buttons)) {
+        if (alertForm && alertForm?.Buttons) {
             notification.buttons = alertForm.Buttons.map((button) => {
                 const { ButtonStyle: buttonStyle } = button;
                 return {
                     title: button.Label,
                     type: 'button',
-                    cta: (buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant) === 'raised',
+                    cta: buttonStyle?.variant === 'raised',
                     onClick: {
                         customData: button,
                         task: CLICK_ALERT_BUTTON,
@@ -100,13 +97,12 @@ export class OpenFinApiImpl extends ApiBase {
         this.showNotification(notification, alert);
     }
     showNotification(notification, alert) {
-        var _a;
         notification = notification || {};
         if (notification.expires === undefined && this.options.notificationTimeout) {
             notification.expires = new Date(Date.now() + this.options.notificationTimeout);
         }
         const showIcon = this.options.showAppIconInNotifications;
-        const appIcon = (_a = this.getUserInterfaceOptions()) === null || _a === void 0 ? void 0 : _a.applicationIcon;
+        const appIcon = this.getUserInterfaceOptions()?.applicationIcon;
         if (!notification.icon && showIcon && isAdaptableCustomIcon(appIcon)) {
             notification.icon = appIcon.src;
         }
@@ -118,7 +114,7 @@ export class OpenFinApiImpl extends ApiBase {
         create(notification);
     }
     getOpenFinState() {
-        return this.getAdaptableState().System;
+        return this.getAdaptableState().Internal;
     }
     isOpenFinRunning() {
         let OpenFinState = this.getOpenFinState();
@@ -137,27 +133,21 @@ export class OpenFinApiImpl extends ApiBase {
         return this.options.throttleTime;
     }
     getCurrentLiveOpenFinReport() {
-        return this.getAdaptableState().System.CurrentLiveOpenFinReport;
+        return this.getAdaptableState().Internal.CurrentLiveOpenFinReport;
     }
     getOpenFinSchedules() {
         return this.getAdaptableState().Schedule.OpenFinSchedules || [];
     }
-    getNotificationsOptions() {
-        return this.getAdaptableApi().optionsApi.getNotificationsOptions();
-    }
-    getAlertOptions() {
-        return this.getAdaptableApi().optionsApi.getAlertOptions();
-    }
     startLiveData(OpenFinReport) {
         if (this.checkItemExists(OpenFinReport, OpenFinReport.ReportName, 'OpenFin Report')) {
             this.dispatchAction(OpenFinRedux.OpenFinStartLiveData(OpenFinReport));
-            this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('OpenFin', 'LiveDataStarted', OpenFinReport);
+            this.getExportApi().internalApi.publishLiveLiveDataChangedEvent('OpenFin', 'LiveDataStarted', OpenFinReport);
         }
     }
     stopLiveData() {
         let currentLiveReport = this.getCurrentLiveOpenFinReport();
         this.dispatchAction(OpenFinRedux.OpenFinStopLiveData(currentLiveReport));
         // fire the Live Report event for Export Stopped
-        this.getAdaptableApi().exportApi.internalApi.publishLiveLiveDataChangedEvent('OpenFin', 'LiveDataStopped', currentLiveReport);
+        this.getExportApi().internalApi.publishLiveLiveDataChangedEvent('OpenFin', 'LiveDataStopped', currentLiveReport);
     }
 }

package/src/View/OpenFinPopup.d.ts

@@ -3,20 +3,12 @@ import { ConnectedComponent } from 'react-redux';
 import * as OpenFinRedux from '../Redux/ActionReducers/OpenFinRedux';
 import { ModuleViewPopupProps } from '@adaptabletools/adaptable/src/View/Components/SharedProps/ModuleViewPopupProps';
 import * as TeamSharingRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers/TeamSharingRedux';
-import { EditableConfigEntityState } from '@adaptabletools/adaptable/src/View/Components/SharedProps/EditableConfigEntityState';
 import { AdaptableObject } from '@adaptabletools/adaptable/src/PredefinedConfig/Common/AdaptableObject';
 import { OpenFinReport } from '@adaptabletools/adaptable/src/PredefinedConfig/OpenFinState';
 import { AdaptableSharedEntityConfig } from '@adaptabletools/adaptable/src/PredefinedConfig/TeamSharingState';
-interface OpenFinPopupProps extends ModuleViewPopupProps<OpenFinPopupComponent> {
+interface OpenFinPopupProps extends ModuleViewPopupProps<any> {
     onOpenFinSendSnapshot: (OpenFineport: OpenFinReport) => OpenFinRedux.OpenFinSendSnapshotAction;
     onShare: (entity: AdaptableObject, config: AdaptableSharedEntityConfig) => TeamSharingRedux.TeamSharingShareAction;
 }
-declare class OpenFinPopupComponent extends React.Component<OpenFinPopupProps, EditableConfigEntityState> {
-    constructor(props: OpenFinPopupProps);
-    shouldClosePopupOnFinishWizard: boolean;
-    componentDidMount(): void;
-    render(): JSX.Element;
-    onApplyExport(OpenFinReport: OpenFinReport): void;
-}
-export declare const OpenFinPopup: ConnectedComponent<typeof OpenFinPopupComponent, Pick<React.ClassAttributes<OpenFinPopupComponent> & OpenFinPopupProps, never>>;
+export declare const OpenFinPopup: ConnectedComponent<React.FC<OpenFinPopupProps>, Pick<OpenFinPopupProps, never>>;
 export {};

package/src/View/OpenFinPopup.js

@@ -3,26 +3,19 @@ import { connect } from 'react-redux';
 import { PanelWithButton } from '@adaptabletools/adaptable/src/View/Components/Panels/PanelWithButton';
 import * as TeamSharingRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers/TeamSharingRedux';
 import * as ModuleConstants from '@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants';
-import { UIHelper } from '@adaptabletools/adaptable/src/View/UIHelper';
-class OpenFinPopupComponent extends React.Component {
-    constructor(props) {
-        super(props);
-        this.shouldClosePopupOnFinishWizard = false;
-        this.state = UIHelper.getEmptyConfigState();
-    }
-    componentDidMount() {
-        if (this.props.popupParams) {
-            this.shouldClosePopupOnFinishWizard =
-                this.props.popupParams.source && this.props.popupParams.source == 'Toolbar';
+const OpenFinPopupComponent = (props) => {
+    const shouldClosePopupOnFinishWizardRef = React.useRef(false);
+    React.useEffect(() => {
+        if (props.popupParams) {
+            shouldClosePopupOnFinishWizardRef.current =
+                props.popupParams.source && props.popupParams.source == 'Toolbar';
         }
-    }
-    render() {
-        return (React.createElement(PanelWithButton, { headerText: this.props.moduleInfo.FriendlyName, bodyProps: { padding: 0 }, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() }));
-    }
-    onApplyExport(OpenFinReport) {
-        this.props.onOpenFinSendSnapshot(OpenFinReport);
-    }
-}
+    }, [props.popupParams]);
+    // const onApplyExport = (OpenFinReport: OpenFinReport) => {
+    //   props.onOpenFinSendSnapshot(OpenFinReport);
+    // };
+    return (React.createElement(PanelWithButton, { headerText: props.moduleInfo.FriendlyName, bodyProps: { padding: 0 }, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() }));
+};
 function mapStateToProps(state) {
     return {};
 }

package/src/View/OpenFinViewPanel.js

@@ -38,7 +38,6 @@ class OpenFinViewPanelComponent extends React.Component {
         let allReports = this.props.api.exportApi
             .getAvailableSystemReports()
             .filter((s) => this.props.api.exportApi.internalApi.isSystemReportActive(s))
-            .filter((s) => s !== GeneralConstants.VISUAL_DATA_REPORT)
             .map((s) => {
             return s;
         })
@@ -90,10 +89,10 @@ class OpenFinViewPanelComponent extends React.Component {
 }
 function mapStateToProps(state) {
     return {
-        CurrentLiveOpenFinReport: state.System.CurrentLiveOpenFinReport,
+        CurrentLiveOpenFinReport: state.Internal.CurrentLiveOpenFinReport,
         Reports: state.Export.Reports,
-        IsOpenFinRunning: !!state.System.CurrentLiveOpenFinReport,
-        currentReportName: state.System.OpenFinCurrentReportName,
+        IsOpenFinRunning: !!state.Internal.CurrentLiveOpenFinReport,
+        currentReportName: state.Internal.OpenFinCurrentReportName,
     };
 }
 function mapDispatchToProps(dispatch) {

package/src/index.d.ts

@@ -1,6 +1,6 @@
 import { AdaptablePlugin } from '@adaptabletools/adaptable/types';
 import * as Redux from 'redux';
-import { SystemState } from '@adaptabletools/adaptable/src/PredefinedConfig/SystemState';
+import { InternalState } from '@adaptabletools/adaptable/src/PredefinedConfig/InternalState';
 import { OpenFinApi } from '@adaptabletools/adaptable/src/Api/OpenFinApi';
 import { OpenFinPluginOptions } from '@adaptabletools/adaptable/src/AdaptableOptions/OpenFinPluginOptions';
 import { IAdaptable } from '@adaptabletools/adaptable/src/AdaptableInterfaces/IAdaptable';
@@ -14,7 +14,7 @@ declare class OpenFinPlugin extends AdaptablePlugin {
     afterInit(adaptable: IAdaptable): void;
     afterInitApi(adaptable: IAdaptable): void;
     rootReducer: (rootReducer: any) => {
-        System: (state: SystemState, action: Redux.Action) => SystemState;
+        System: (state: InternalState, action: Redux.Action) => InternalState;
     };
     reduxMiddleware: (adaptable: IAdaptable) => Redux.Middleware;
     afterInitStore(adaptable: IAdaptable): void;

package/src/index.js

@@ -1,7 +1,6 @@
-import { AdaptablePlugin, } from '@adaptabletools/adaptable/types';
-// TODO in the future, try to put back the version check
-// import { version, name } from '../package.json';
-// import { version as coreVersion } from '@adaptabletools/adaptable/package.json';
+import { AdaptablePlugin } from '@adaptabletools/adaptable/types';
+import { version, name } from '../package.json';
+import { version as coreVersion } from '@adaptabletools/adaptable/package.json';
 import * as ModuleConstants from '@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants';
 import { OpenFinModuleId } from '@adaptabletools/adaptable/src/Utilities/Constants/ModuleConstants';
 import * as PopupRedux from '@adaptabletools/adaptable/src/Redux/ActionsReducers/PopupRedux';
@@ -13,14 +12,14 @@ import { initialOpenFinState, OpenFinReducer } from './Redux/ActionReducers/Open
 import { OPENFIN_START_LIVE_DATA, OPENFIN_STOP_LIVE_DATA, } from '@adaptabletools/adaptable/src/Redux/ActionsReducers/PluginsRedux';
 import { OpenFinViewPanelControl } from './View/OpenFinViewPanel';
 import { isRunningInOpenfin } from './Utilities/isRunningInOpenfin';
-// const suffix = name.endsWith('-cjs') ? '-cjs' : '';
-// if (version !== coreVersion) {
-//   console.warn(`
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// !!!!!!! "@adaptabletools/adaptable-plugin-openfin${suffix}" (v @${version}) and "@adaptabletools/adaptable${suffix}" (v @${coreVersion}) have different versions - they should have the exact same version.
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// `);
-// }
+const suffix = name.endsWith('-cjs') ? '-cjs' : '';
+if (version !== coreVersion) {
+    console.warn(`
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!! "@adaptabletools/adaptable-plugin-openfin${suffix}" (v @${version}) and "@adaptabletools/adaptable${suffix}" (v @${coreVersion}) have different versions - they should have the exact same version.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+`);
+}
 const defaultOptions = {
     throttleTime: 2000,
     notificationTimeout: 5000,
@@ -67,7 +66,10 @@ class OpenFinPlugin extends AdaptablePlugin {
                 };
             };
         };
-        this.options = Object.assign(Object.assign({}, defaultOptions), options);
+        this.options = {
+            ...defaultOptions,
+            ...options,
+        };
     }
     afterInit(adaptable) {
         this.openFinModule = (adaptable.adaptableModules.get(ModuleConstants.OpenFinModuleId));