@adaptabletools/adaptable 16.0.10-canary.0 → 16.1.0-canary.1

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

@@ -1,4 +1,3 @@
-import * as Redux from 'redux';
 import { GridCell } from '../Selection/GridCell';
 import { AdaptableColumn } from './AdaptableColumn';
 import { AdaptableModule } from './Types';
@@ -17,11 +16,7 @@ export interface AdaptableMenuItem {
     /**
      * Adaptable Module associated with (Adaptable) menu item.
      */
-    module?: AdaptableModule | 'General';
-    /**
-     * Adaptable Redux Action to invoke when (Adaptable) menu item is clicked
-     */
-    reduxAction?: Redux.Action;
+    module: AdaptableModule | 'General' | 'CustomSettingsPanel';
     /**
      * Function to invoke when (custom) menu item is clicked
      */

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

@@ -11,7 +11,7 @@ export declare const ALL_TOOLBARS: AdaptableDashboardToolbar[];
 /**
  * Modules which can appear in the AdapTable Status Bar
  */
-export declare type AdaptableStatusBarPanel = 'Alert' | 'CalculatedColumn' | 'BulkUpdate' | 'CellSummary' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'SmartEdit' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
+export declare type AdaptableStatusBarPanel = 'Alert' | 'CalculatedColumn' | 'BulkUpdate' | 'CellSummary' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataImport' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'SmartEdit' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare const ALL_STATUS_SUB_PANELS: AdaptableStatusBarPanel[];
 export declare type AdaptableToolPanels = AdaptableToolPanel[];
 /**
@@ -28,18 +28,18 @@ export declare type AdaptableModuleButtons = AdaptableModuleButton[];
 /**
  * List of all the Module buttons Adaptable provides - each Module has a popup for which this is a shortcut button
  */
-export declare type AdaptableModuleButton = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme';
+export declare type AdaptableModuleButton = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataImport' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme';
 export declare type AdaptableStateKeys = AdaptableStateKey[];
 export declare type AdaptableStateKey = keyof AdaptablePersistentState | 'OpenFin' | 'Glue42' | 'IPushPull';
 /**
  * Modules provided by AdapTable, subject to Entitlements and usually have Predefined Config
  */
-export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Fdc3' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'ColumnInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Notes';
+export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Fdc3' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'ColumnInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StyledColumn' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Notes' | 'DataImport';
 export declare const ALL_MODULES: AdaptableModule[];
 /**
  * Modules which can appear in the Settings Panel
  */
-export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'StyledColumn' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Notes';
+export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'Charting' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'ColumnInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'StyledColumn' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'Notes' | 'DataImport';
 export declare type TypeHint<Base, Literals> = (Base & {
     __subType?: true;
 }) | Literals;

package/src/PredefinedConfig/Common/Types.js

@@ -35,6 +35,7 @@ exports.ALL_STATUS_SUB_PANELS = [
     'Charting',
     'Dashboard',
     'DataChangeHistory',
+    'DataImport',
     'DataSet',
     'Export',
     'Filter',
@@ -87,6 +88,7 @@ exports.ALL_MODULES = [
     ModuleConstants.DashboardModuleId,
     ModuleConstants.DataChangeHistoryModuleId,
     ModuleConstants.DataSetModuleId,
+    ModuleConstants.DataImportModuleId,
     ModuleConstants.ExportModuleId,
     ModuleConstants.FilterModuleId,
     ModuleConstants.FlashingCellModuleId,

package/src/Strategy/ChartingModule.js

@@ -36,7 +36,7 @@ class ChartingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     isModuleAvailable() {
         const agChartsAvailable = this.api.chartingApi.isChartingEnabled() && super.isModuleAvailable();
-        const externalChartsAvailable = this.api.optionsApi.getChartingOptions().externalCharting;
+        const externalChartsAvailable = this.api.optionsApi.getChartingOptions().externalChartingOptions;
         return Boolean(agChartsAvailable || externalChartsAvailable);
     }
     getModuleAdaptableObjects() {

package/src/Strategy/DataImportModule.d.ts

@@ -0,0 +1,11 @@
+import { AdaptableApi } from '../Api/AdaptableApi';
+import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
+import { AdaptableModuleBase } from './AdaptableModuleBase';
+import { IModule } from './Interface/IModule';
+export declare class DataImportModule extends AdaptableModuleBase implements IModule {
+    constructor(api: AdaptableApi);
+    addModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
+    addContextMenuItems(): AdaptableMenuItem[] | undefined;
+    addColumnMenuItems(): AdaptableMenuItem[] | undefined;
+    private getOpenPopupMenuItem;
+}

package/src/Strategy/DataImportModule.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataImportModule = void 0;
+const tslib_1 = require("tslib");
+const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
+const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
+class DataImportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
+    constructor(api) {
+        super(ModuleConstants.DataImportModuleId, ModuleConstants.DataImportFriendyName, 'import', 'DataImportPopup', 'Import Data', api);
+    }
+    addModuleMenuItem(source) {
+        if (this.isModuleAvailable()) {
+            return this.getOpenPopupMenuItem(source);
+        }
+    }
+    addContextMenuItems() {
+        if (this.isModuleAvailable()) {
+            return [this.getOpenPopupMenuItem('ContextMenu')];
+        }
+        return undefined;
+    }
+    addColumnMenuItems() {
+        if (this.isModuleAvailable()) {
+            return [this.getOpenPopupMenuItem('ColumnMenu')];
+        }
+    }
+    getOpenPopupMenuItem(source) {
+        const moduleParams = {
+            action: 'New',
+            source: source,
+            maxWidth: this.getPopupMaxWidth(),
+        };
+        return this.createColumnMenuItemShowPopup('Import Data', this.moduleInfo.Popup, this.moduleInfo.Glyph, moduleParams);
+    }
+}
+exports.DataImportModule = DataImportModule;

package/src/Strategy/Fdc3Module.js

@@ -30,6 +30,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
             });
             if (contextMenuItems.length > 1) {
                 const groupMenuItem = {
+                    module: this.moduleInfo.ModuleName,
                     label: 'FDC3',
                     icon: {
                         name: 'fdc3',
@@ -51,7 +52,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
                 this.getFdc3Api().raiseIntentFromRow(rowNode, intentType, contextType);
             },
             isVisible: true,
-            module: 'Fdc3',
+            module: this.moduleInfo.ModuleName,
         };
         if ((_a = intentConfig.contextMenu) === null || _a === void 0 ? void 0 : _a.icon) {
             const menuItemIcon = ((_b = intentConfig.contextMenu) === null || _b === void 0 ? void 0 : _b.icon) === '_defaultFdc3'
@@ -70,7 +71,7 @@ class Fdc3Module extends AdaptableModuleBase_1.AdaptableModuleBase {
                 this.getFdc3Api().broadcastFromRow(rowNode, contextType);
             },
             isVisible: true,
-            module: 'Fdc3',
+            module: this.moduleInfo.ModuleName,
         };
         if ((_a = contextConfig.contextMenu) === null || _a === void 0 ? void 0 : _a.icon) {
             const menuItemIcon = ((_b = contextConfig.contextMenu) === null || _b === void 0 ? void 0 : _b.icon) === '_defaultFdc3'

package/src/Strategy/LayoutModule.js

@@ -291,6 +291,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             pivotColumnId,
         };
         return {
+            module: this.moduleInfo.ModuleName,
             isVisible: true,
             label: 'Expand Aggregated Value',
             onClick: () => {

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

@@ -71,6 +71,8 @@ export declare const SettingsPanelModuleId: ModuleConstants;
 export declare const SettingsPanelFriendlyName = "Settings Panel";
 export declare const StatusBarModuleId: ModuleConstants;
 export declare const StatusBarFriendlyName = "Status Bar";
+export declare const DataImportModuleId: ModuleConstants;
+export declare const DataImportFriendyName = "Data Import";
 export declare const ADAPTABLE_MODULE_MAP: {
     Alert: string;
     FlashingCell: string;
@@ -108,4 +110,5 @@ export declare const ADAPTABLE_MODULE_MAP: {
     StatusBar: string;
     Notes: string;
     ColumnInfo: string;
+    DataImport: string;
 };

package/src/Utilities/Constants/ModuleConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuickSearchFriendlyName = exports.QuickSearchModuleId = exports.QueryFriendlyName = exports.QueryModuleId = exports.PlusMinusFriendlyName = exports.PlusMinusModuleId = exports.OpenFinFriendlyName = exports.OpenFinModuleId = exports.LayoutFriendlyName = exports.LayoutModuleId = exports.IPushPullFriendlyName = exports.IPushPullModuleId = exports.NotesFriendlyName = exports.NotesModuleId = exports.ColumnInfoFriendlyName = exports.ColumnInfoModuleId = exports.GridInfoFriendlyName = exports.GridInfoModuleId = exports.Glue42FriendlyName = exports.Glue42ModuleId = exports.FreeTextColumnFriendlyName = exports.FreeTextColumnModuleId = exports.FormatColumnFriendlyName = exports.FormatColumnModuleId = exports.FilterFriendlyName = exports.FilterModuleId = exports.Fdc3FriendlyName = exports.Fdc3ModuleId = exports.ExportFriendlyName = exports.ExportModuleId = exports.DataSetFriendlyName = exports.DataSetModuleId = exports.DataChangeHistoryFriendlyName = exports.DataChangeHistoryModuleId = exports.DashboardFriendlyName = exports.DashboardModuleId = exports.CustomSortFriendlyName = exports.CustomSortModuleId = exports.ChartingFriendlyName = exports.ChartingModuleId = exports.CellSummaryFriendlyName = exports.CellSummaryModuleId = exports.CalculatedColumnFriendlyName = exports.CalculatedColumnModuleId = exports.BulkUpdateFriendlyName = exports.BulkUpdateModuleId = exports.FlashingCellFriendlyName = exports.FlashingCellModuleId = exports.AlertModuleFriendlyName = exports.AlertModuleId = void 0;
-exports.ADAPTABLE_MODULE_MAP = exports.StatusBarFriendlyName = exports.StatusBarModuleId = exports.SettingsPanelFriendlyName = exports.SettingsPanelModuleId = exports.ToolPanelFriendlyName = exports.ToolPanelModuleId = exports.ThemeFriendlyName = exports.ThemeModuleId = exports.TeamSharingFriendlyName = exports.TeamSharingModuleId = exports.SystemStatusFriendlyName = exports.SystemStatusModuleId = exports.StateManagementFriendlyName = exports.StateManagementModuleId = exports.StyledColumnFriendlyName = exports.StyledColumnModuleId = exports.SmartEditFriendlyName = exports.SmartEditModuleId = exports.ShortcutFriendlyName = exports.ShortcutModuleId = exports.ScheduleFriendlyName = exports.ScheduleModuleId = void 0;
+exports.ADAPTABLE_MODULE_MAP = exports.DataImportFriendyName = exports.DataImportModuleId = exports.StatusBarFriendlyName = exports.StatusBarModuleId = exports.SettingsPanelFriendlyName = exports.SettingsPanelModuleId = exports.ToolPanelFriendlyName = exports.ToolPanelModuleId = exports.ThemeFriendlyName = exports.ThemeModuleId = exports.TeamSharingFriendlyName = exports.TeamSharingModuleId = exports.SystemStatusFriendlyName = exports.SystemStatusModuleId = exports.StateManagementFriendlyName = exports.StateManagementModuleId = exports.StyledColumnFriendlyName = exports.StyledColumnModuleId = exports.SmartEditFriendlyName = exports.SmartEditModuleId = exports.ShortcutFriendlyName = exports.ShortcutModuleId = exports.ScheduleFriendlyName = exports.ScheduleModuleId = void 0;
 exports.AlertModuleId = 'Alert';
 exports.AlertModuleFriendlyName = 'Alert';
 exports.FlashingCellModuleId = 'FlashingCell';
@@ -74,6 +74,8 @@ exports.SettingsPanelModuleId = 'SettingsPanel';
 exports.SettingsPanelFriendlyName = 'Settings Panel';
 exports.StatusBarModuleId = 'StatusBar';
 exports.StatusBarFriendlyName = 'Status Bar';
+exports.DataImportModuleId = 'DataImport';
+exports.DataImportFriendyName = 'Data Import';
 exports.ADAPTABLE_MODULE_MAP = {
     [exports.AlertModuleId]: exports.AlertModuleFriendlyName,
     [exports.FlashingCellModuleId]: exports.FlashingCellFriendlyName,
@@ -111,4 +113,5 @@ exports.ADAPTABLE_MODULE_MAP = {
     [exports.StatusBarModuleId]: exports.StatusBarFriendlyName,
     [exports.NotesModuleId]: exports.NotesFriendlyName,
     [exports.ColumnInfoModuleId]: exports.ColumnInfoFriendlyName,
+    [exports.DataImportModuleId]: exports.DataImportFriendyName,
 };

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -40,6 +40,7 @@ exports.DefaultAdaptableOptions = {
         showSystemStatusMessageNotifications: false,
         maxSystemMessagesInStore: 100,
     },
+    dataImportOptions: {},
     flashingCellOptions: {
         defaultFlashDuration: 500,
         defaultFlashTarget: 'cell',
@@ -296,6 +297,7 @@ exports.DefaultAdaptableOptions = {
     chartingOptions: {
         saveStrategy: 'none',
         agGridContainerName: GeneralConstants.AG_GRID_CHART_WINDOW,
+        externalChartingOptions: {},
     },
     fdc3Options: {
         enableLogging: false,

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -39,6 +39,7 @@ exports.DEFAULT_NAVIGATION_ITEMS = [
     'DataChangeHistory',
     '-',
     'Charting',
+    'DataImport',
     'Schedule',
     'StateManagement',
     'TeamSharing',

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -11,6 +11,7 @@ function assignAdaptableOptions(adaptableOptions) {
     const returnedAdaptableOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions, adaptableOptions);
     returnedAdaptableOptions.adaptableStateKey =
         (_a = returnedAdaptableOptions.adaptableStateKey) !== null && _a !== void 0 ? _a : returnedAdaptableOptions.adaptableId;
+    returnedAdaptableOptions.dataImportOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dataImportOptions, adaptableOptions.dataImportOptions);
     returnedAdaptableOptions.expressionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.expressionOptions, adaptableOptions.expressionOptions);
     returnedAdaptableOptions.calendarOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.calendarOptions, adaptableOptions.calendarOptions);
     returnedAdaptableOptions.columnOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.columnOptions, adaptableOptions.columnOptions);
@@ -43,6 +44,7 @@ function assignAdaptableOptions(adaptableOptions) {
     returnedAdaptableOptions.toolPanelOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.toolPanelOptions, adaptableOptions.toolPanelOptions);
     returnedAdaptableOptions.dataChangeHistoryOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dataChangeHistoryOptions, adaptableOptions.dataChangeHistoryOptions);
     returnedAdaptableOptions.chartingOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.chartingOptions, adaptableOptions.chartingOptions);
+    returnedAdaptableOptions.chartingOptions.externalChartingOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.chartingOptions.externalChartingOptions, returnedAdaptableOptions.chartingOptions.externalChartingOptions);
     returnedAdaptableOptions.settingsPanelOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.settingsPanelOptions, adaptableOptions.settingsPanelOptions);
     returnedAdaptableOptions.fdc3Options = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.fdc3Options, adaptableOptions.fdc3Options);
     returnedAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration, returnedAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration);

package/src/Utilities/Interface/MessagePopups.d.ts

@@ -1,8 +1,8 @@
 import { Action } from 'redux';
-import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableForm, BaseContext } from '../../types';
+import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 export interface UIConfirmation {
     Header: string;
     Msg: string;

package/src/Utilities/Services/ModuleService.js

@@ -143,6 +143,8 @@ class ModuleService {
                 return learnUrl + 'handbook-column-formatting#styled-columns';
             case 'Charting':
                 return learnUrl + 'handbook-charts';
+            case 'DataImport':
+                return learnUrl + 'handbook-data-import';
             default:
                 return 'good';
         }

package/src/View/AdaptableViewFactory.js

@@ -33,6 +33,7 @@ const StatusBarPopup_1 = require("./StatusBar/StatusBarPopup");
 const ChartingViewPanel_1 = require("./Charting/ChartingViewPanel");
 const ColumnInfoPopup_1 = require("./ColumnInfo/ColumnInfoPopup");
 const NotesListing_1 = require("./Notes/NotesListing");
+const DataImportPopup_1 = require("./DataImport/DataImportPopup");
 exports.AdaptableViewFactory = {
     BulkUpdatePopup: BulkUpdatePopup_1.BulkUpdatePopup,
     DashboardPopup: DashboardPopup_1.DashboardPopup,
@@ -48,6 +49,7 @@ exports.AdaptableViewFactory = {
     SystemStatusPopup: SystemStatusPopup_1.SystemStatusPopup,
     DataChangeHistoryPopup: DataChangeHistoryPopup_1.DataChangeHistoryPopup,
     NotesPopup: NotesListing_1.NotesListing,
+    DataImportPopup: DataImportPopup_1.DataImportPopup,
 };
 exports.AdaptableViewPanelFactory = new Map([
     [ModuleConstants.AlertModuleId, AlertViewPanel_1.AlertViewPanelControl],

package/src/View/Charting/ChartingWizard/ExternalChartingWizard/ExternalChartingWizard.js

@@ -28,7 +28,7 @@ const PreviewChartSection = ({ chartDefinition }) => {
 const ExternalChartingWizard = (props) => {
     var _a;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const onPreviewChart = (_a = adaptable.api.optionsApi.getChartingOptions().externalCharting) === null || _a === void 0 ? void 0 : _a.onPreviewChart;
+    const onPreviewChart = (_a = adaptable.api.optionsApi.getChartingOptions().externalChartingOptions) === null || _a === void 0 ? void 0 : _a.onPreviewChart;
     const [chartDefinition, setChartDefinition] = React.useState(() => {
         var _a, _b;
         return (_a = props.data) !== null && _a !== void 0 ? _a : (_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.value;

package/src/View/Components/ExternalRenderer.d.ts

@@ -6,6 +6,7 @@ interface ExternalRendererProps {
     componentName?: string;
     render?: Render;
     frameworkComponent?: AdaptableFrameworkComponent;
+    onDestroy?: () => void;
 }
 export declare const ExternalRenderer: React.FunctionComponent<ExternalRendererProps>;
 export {};

package/src/View/Components/ExternalRenderer.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const ExternalRenderer = (_a) => {
-    var { render, frameworkComponent, componentName = 'N/A' } = _a, rest = tslib_1.__rest(_a, ["render", "frameworkComponent", "componentName"]);
+    var { render, frameworkComponent, componentName = 'N/A', onDestroy } = _a, rest = tslib_1.__rest(_a, ["render", "frameworkComponent", "componentName", "onDestroy"]);
     const ref = React.useRef();
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const [contentsHTML, setContentsHTML] = React.useState('');
@@ -36,6 +36,7 @@ const ExternalRenderer = (_a) => {
                 });
             }
             else if (frameworkComponent) {
+                onDestroy === null || onDestroy === void 0 ? void 0 : onDestroy();
                 adaptableApi.internalApi.destroyFrameworkComponent(element, frameworkComponent, 
                 // @ts-ignore
                 componentName);

package/src/View/Components/Panels/PanelWithImage.js

@@ -13,6 +13,7 @@ const ButtonInfo_1 = require("../Buttons/ButtonInfo");
 //let { buttonContent, ...other } = this.props
 class PanelWithImageCmp extends React.Component {
     render() {
+        var _a;
         const IconCmp = icons_1.allIcons[(this.props.icon || this.props.glyphicon)];
         const headerStyle = {};
         if (this.props.headerColor) {
@@ -21,10 +22,9 @@ class PanelWithImageCmp extends React.Component {
         }
         let headerRow = (React.createElement(rebass_1.Flex, { flex: 1 },
             React.createElement(rebass_1.Flex, { alignItems: "center" },
-                React.createElement(rebass_1.Flex, { alignItems: "center", style: headerStyle },
+                React.createElement(rebass_1.Flex, { minHeight: 15, alignItems: "center", style: headerStyle },
                     IconCmp ? React.createElement(IconCmp, null) : null,
-                    React.createElement(rebass_1.Box, { marginRight: 2 }),
-                    this.props.header,
+                    React.createElement(rebass_1.Box, { marginRight: 2 }), (_a = this.props.header) !== null && _a !== void 0 ? _a : '',
                     React.createElement(rebass_1.Box, { marginRight: 2, "data-name": "space-after" }),
                     this.props.infoLink != null && !this.props.infoLinkDisabled && (React.createElement(ButtonInfo_1.ButtonInfo, { onClick: () => window.open(this.props.infoLink, '_blank' // <- opens the link in a new tab or window.
                         ) }))),

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopup.js

@@ -39,7 +39,7 @@ const AdaptablePopup = (props) => {
     let componentName = props.componentName;
     // ts forces to check for General, there is no menu item General
     const useFirstItem = !props.componentName;
-    if (useFirstItem && firstMenuModule !== 'General') {
+    if (useFirstItem && firstMenuModule !== 'General' && firstMenuModule !== 'CustomSettingsPanel') {
         componentModule = firstMenuModule;
     }
     const customSettingsPanel = (_c = settingsPanelOptions === null || settingsPanelOptions === void 0 ? void 0 : settingsPanelOptions.customSettingsPanels) === null || _c === void 0 ? void 0 : _c.find((customPanel) => useFirstItem ? customPanel.name === firstMenuItem.label : customPanel.name === componentName);

package/src/View/Components/Popups/AdaptablePopup/Navigation.js

@@ -43,10 +43,13 @@ const Navigation = (props) => {
             const isActive = props.activeItem === menuItem.module || menuItem.label === props.activeItem;
             const className = (0, join_1.default)(baseClassName, isActive && `${baseClassName}--active`);
             let customIcon = (_d = (_c = (_b = (_a = props.customSettingsPanels) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, (customSettingPanel) => customSettingPanel.name === menuItem.label)) === null || _c === void 0 ? void 0 : _c.icon) !== null && _d !== void 0 ? _d : null;
+            const dataName = menuItem.module === 'CustomSettingsPanel'
+                ? `CSP-${menuItem.label}`
+                : (_e = menuItem.module) !== null && _e !== void 0 ? _e : menuItem.label;
             return (React.createElement("li", { className: className, key: menuItem.label },
                 React.createElement("button", { type: "button", className: `${baseClassName}__Button`, onClick: () => {
                         dispatch(menuItem.reduxAction);
-                    }, "data-name": (_e = menuItem.module) !== null && _e !== void 0 ? _e : menuItem.label },
+                    }, "data-name": dataName },
                     menuItem.icon && (React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: menuItem.icon, iconClassName: `${baseClassName}__Icon` })),
                     customIcon && React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: customIcon }),
                     menuItem.label)));

package/src/View/Components/Popups/AdaptablePopup/useMenuItems.js

@@ -21,6 +21,7 @@ const useMenuItems = () => {
             }
         }
         const visibleItems = allMenuItems.filter((item) => item.module !== 'General' &&
+            item.module !== 'CustomSettingsPanel' &&
             !DefaultSettingsPanel_1.STANDALONE_MODULE_POPUPS.includes(item.module) &&
             item.isVisible);
         return navigationItems
@@ -32,7 +33,9 @@ const useMenuItems = () => {
             const customSettingsPanel = (_b = (_a = settingsPanelOptions === null || settingsPanelOptions === void 0 ? void 0 : settingsPanelOptions.customSettingsPanels) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, (panel) => panel.name === moduleName);
             let customPanelMenuItem = null;
             if (customSettingsPanel) {
+                // @ts-ignore
                 customPanelMenuItem = {
+                    module: 'CustomSettingsPanel',
                     label: customSettingsPanel.name,
                     isVisible: true,
                     reduxAction: PopupRedux.PopupShowScreen(null, customSettingsPanel.name),

package/src/View/Components/Popups/WindowPopups/WindowPopups.d.ts

@@ -5,4 +5,5 @@ export interface WindowPopupChildProps {
     popupProps: any;
     api: AdaptableApi;
 }
+export declare const CUSTOM_WINDOW_FACTORY_ID = "CUSTOM_WINDOW_FACTORY_ID";
 export declare const WindowPopups: React.FunctionComponent;

package/src/View/Components/Popups/WindowPopups/WindowPopups.js

@@ -1,18 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WindowPopups = void 0;
+exports.WindowPopups = exports.CUSTOM_WINDOW_FACTORY_ID = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const Dialog_1 = tslib_1.__importDefault(require("../../../../components/Dialog"));
 const PopupRedux_1 = require("../../../../Redux/ActionsReducers/PopupRedux");
 const AdaptableContext_1 = require("../../../AdaptableContext");
+const ExternalRenderer_1 = require("../../ExternalRenderer");
 const PanelWithImage_1 = require("../../Panels/PanelWithImage");
 const Utilities_1 = require("../Utilities");
 const windowFactory_1 = require("./windowFactory");
 const NoopComponent = () => {
     return React.createElement(React.Fragment, null);
 };
+exports.CUSTOM_WINDOW_FACTORY_ID = 'CUSTOM_WINDOW_FACTORY_ID';
 const WindowPopups = () => {
     const [windowModalSettings, setWindowModalSettings] = React.useState({});
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
@@ -20,18 +22,26 @@ const WindowPopups = () => {
     const windowItems = (0, react_redux_1.useSelector)((state) => state.Popup.WindowPopup.PopupList);
     return (React.createElement(React.Fragment, null, windowItems === null || windowItems === void 0 ? void 0 : windowItems.map((windowItem) => {
         var _a, _b, _c, _d, _e, _f;
-        const Component = (_a = windowFactory_1.windowFactory[windowItem.FactoryId]) !== null && _a !== void 0 ? _a : NoopComponent;
+        let Component = (_a = windowFactory_1.windowFactory[windowItem.FactoryId]) !== null && _a !== void 0 ? _a : null;
         const _g = (_b = windowItem === null || windowItem === void 0 ? void 0 : windowItem.PopupProps) !== null && _b !== void 0 ? _b : {}, { windowModalProps } = _g, restPopupProps = tslib_1.__rest(_g, ["windowModalProps"]);
         const handleDismiss = () => {
             dispatch((0, PopupRedux_1.PopupHideWindow)(windowItem.Id));
         };
         const size = (_d = (_c = windowModalSettings === null || windowModalSettings === void 0 ? void 0 : windowModalSettings[windowItem.Id]) === null || _c === void 0 ? void 0 : _c.size) !== null && _d !== void 0 ? _d : (0, Utilities_1.getWindowPopupSize)();
         const position = (_f = (_e = windowModalSettings === null || windowModalSettings === void 0 ? void 0 : windowModalSettings[windowItem.Id]) === null || _e === void 0 ? void 0 : _e.position) !== null && _f !== void 0 ? _f : (0, Utilities_1.getMiddlePosition)(size);
+        let componentNode = null;
+        if (!Component &&
+            (windowItem.PopupProps.render || windowItem.PopupProps.frameworkComponent)) {
+            componentNode = (React.createElement(ExternalRenderer_1.ExternalRenderer, { render: windowItem.PopupProps.render, frameworkComponent: windowItem.PopupProps.frameworkComponent, onDestroy: windowItem.PopupProps.onFrameworkComponentDestroyed }));
+        }
+        else {
+            Component = Component !== null && Component !== void 0 ? Component : NoopComponent;
+            componentNode = (React.createElement(Component, { api: adaptable.api, onDismiss: handleDismiss, popupProps: restPopupProps }));
+        }
         return (React.createElement(Dialog_1.default, { "data-name": windowItem.Id, style: { height: '100%' }, className: "ab-Window-Modal", key: windowItem.Id, windowModal: true, windowModalProps: Object.assign(Object.assign({}, windowModalProps), { onChange: (settings) => {
                     setWindowModalSettings((settingsMap) => (Object.assign(Object.assign({}, settingsMap), { [windowItem.Id]: settings })));
                 }, handleSelector: '.ab-Window-Modal .ab-Panel__header', size: size, position: position }), fixed: false, padding: 0, onDismiss: handleDismiss, isOpen: true, showCloseButton: true },
-            React.createElement(PanelWithImage_1.PanelWithImage, { style: { height: '100%' }, bodyProps: { padding: 0, height: '100%' }, header: windowItem.Title, glyphicon: windowItem.Icon, variant: "primary" },
-                React.createElement(Component, { api: adaptable.api, onDismiss: handleDismiss, popupProps: restPopupProps }))));
+            React.createElement(PanelWithImage_1.PanelWithImage, { style: { height: '100%' }, bodyProps: { padding: 0, height: '100%' }, header: windowItem.Title, glyphicon: windowItem.Icon, variant: "primary" }, componentNode)));
     })));
 };
 exports.WindowPopups = WindowPopups;

package/src/View/DataImport/DataImportPopup.d.ts

@@ -0,0 +1,6 @@
+import * as React from 'react';
+import { ModuleViewPopupProps } from '../Components/SharedProps/ModuleViewPopupProps';
+interface DataImportPopupProps extends ModuleViewPopupProps<null> {
+}
+export declare const DataImportPopup: React.FunctionComponent<DataImportPopupProps>;
+export {};

package/src/View/DataImport/DataImportPopup.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataImportPopup = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const rebass_1 = require("rebass");
+const HelpBlock_1 = tslib_1.__importDefault(require("../../components/HelpBlock"));
+const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
+const DataImportWizard_1 = require("./DataImportWizard");
+const DataImportPopup = (props) => {
+    const [isWizardOpen, setIsWizardOpen] = React.useState(false);
+    React.useEffect(() => {
+        var _a, _b;
+        if (((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'New' && ((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.source) !== 'ModuleMenu') {
+            setIsWizardOpen(true);
+        }
+    }, []);
+    return (React.createElement(React.Fragment, null,
+        React.createElement(PopupPanel_1.PopupPanel, { headerText: 'Data Import', glyphicon: 'import' },
+            React.createElement(rebass_1.Box, null,
+                React.createElement(HelpBlock_1.default, { mb: 2, fontSize: 3 }, "Click the 'Import Data' button to insert or update data into AdapTable"),
+                React.createElement(SimpleButton_1.default, { icon: "import", variant: "raised", onClick: () => setIsWizardOpen(true) }, "Import Data"))),
+        isWizardOpen && (React.createElement(DataImportWizard_1.DataImportWizard, { onClose: () => {
+                var _a;
+                setIsWizardOpen(false);
+                if (['Toolbar', 'ContextMenu', 'ColumnMenu', 'ModuleButton'].includes((_a = props === null || props === void 0 ? void 0 : props.popupParams) === null || _a === void 0 ? void 0 : _a.source)) {
+                    props.onClosePopup();
+                }
+            } }))));
+};
+exports.DataImportPopup = DataImportPopup;

package/src/View/DataImport/DataImportWizard/DataImportWizard.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import { DataImportValidationError } from '../../../types';
+export interface ValidationErrorsMap {
+    [key: string]: DataImportValidationError[] | null;
+}
+export declare const DataImportWizard: (props: {
+    onClose: () => void;
+}) => JSX.Element;