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

package/src/AdaptableOptions/MenuOptions.d.ts

@@ -1,33 +1,44 @@
 import { AdaptableMenuItem, ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../PredefinedConfig/Common/Menu';
-import { AdaptableColumn, BaseContext } from '../types';
+import { AdaptableColumn, AdaptableIcon, AdaptableModule, BaseContext } from '../types';
 /**
  * Options for managing menus in AdapTable
  */
 export interface MenuOptions<TData = any> {
     /**
-     * Show Adaptable Context Menu (or specific items); can be boolean value or function invoked for each menu item
+     * Adds 'Ungroup' Column Menu item to a row grouped column menu
      *
      * @defaultValue true
      * @gridInfoItem
      */
-    showAdaptableContextMenu?: boolean | ((menuItem: AdaptableMenuItem, menuContext: ContextMenuContext<TData>) => boolean);
+    showUngroupColumnMenuItem?: boolean;
     /**
-     * Show Adaptable Column Menu (or specific items); can be boolean value or function invoked for each menu item
+     * Customised Context Menu. Default context menu items are available in the provided context.
+     */
+    customContextMenu?: (menuContext: CustomContextMenuContext<TData>) => CustomContextMenuItem[];
+    /**
+     * Customised Column Menu. Default column menu items are available in the provided context.
+     */
+    customColumnMenu?: (menuContext: CustomColumnMenuContext<TData>) => CustomColumnMenuItem[];
+    /**
+     * Show Adaptable Context Menu (or specific items); can be boolean value or function invoked for each menu item
      *
+     * @deprecated Use `customContextMenu` instead
      * @defaultValue true
      * @gridInfoItem
      */
-    showAdaptableColumnMenu?: boolean | ((menuItem: AdaptableMenuItem, menuContext: ColumnMenuContext<TData>) => boolean);
+    showAdaptableContextMenu?: boolean | ((menuItem: AdaptableMenuItem, menuContext: ContextMenuContext<TData>) => boolean);
     /**
-     * Adds 'Ungroup' Column Menu item to a row grouped column
+     * Show Adaptable Column Menu (or specific items); can be boolean value or function invoked for each menu item
      *
+     * @deprecated Use `customContextMenu` instead
      * @defaultValue true
      * @gridInfoItem
      */
-    showUngroupColumnMenuItem?: boolean;
+    showAdaptableColumnMenu?: boolean | ((menuItem: AdaptableMenuItem, menuContext: ColumnMenuContext<TData>) => boolean);
     /**
      * Order in which AG Grid, AdapTable and User Menu sections will appear in Column Menu (list or function)
      *
+     * @deprecated Use `customColumnMenu` instead
      * @defaultValue 'aggrid', 'adaptable', 'user'
      * @gridInfoItem
      */
@@ -35,19 +46,143 @@ export interface MenuOptions<TData = any> {
     /**
      * Order in which AG Grid, AdapTable and User Menu sections will appear in Context Menu (list or function)
      *
+     * @deprecated Use `customContextMenu` instead
      * @defaultValue 'aggrid', 'adaptable', 'user'
      * @gridInfoItem
      */
     contextMenuOrder?: ((context: MenuOrderContext) => ('aggrid' | 'adaptable' | 'user')[]) | ('aggrid' | 'adaptable' | 'user')[];
     /**
      * User-defined Menu Items to add to the Column Menu
+     *
+     * @deprecated Use `customColumnMenu` instead
      */
     columnMenuItems?: UserMenuItem<ColumnMenuContext>[];
     /**
-     * User-defined Menu Items to add to the Context Menu
+     * Customised Context Menu. Default context menu items are available in the provided context.
+     *
+     * @deprecated Use `customContextMenu` instead
      */
     contextMenuItems?: UserMenuItem<ContextMenuContext>[];
 }
+/**
+ * Context info provided when building Custom Context Menus
+ */
+export interface CustomContextMenuContext<TData = any> extends ContextMenuContext<TData> {
+    /**
+     * Default AG Grid Menu Items
+     */
+    defaultAgGridMenuItems: AgGridMenuItem<AgGridContextMenuItemType>[];
+    /**
+     * Default Adaptable Menu Items
+     */
+    defaultAdaptableMenuItems: AdaptableSystemMenuItem[];
+}
+/**
+ * Context info provided when building Custom Context Menus
+ */
+export interface CustomColumnMenuContext<TData = any> extends ColumnMenuContext<TData> {
+    /**
+     * Default AG Grid Menu Items
+     */
+    defaultAgGridMenuItems: AgGridMenuItem<AgGridColumnMenuItemType>[];
+    /**
+     * Default Adaptable Menu Items
+     */
+    defaultAdaptableMenuItems: AdaptableSystemMenuItem[];
+}
+/**
+ * Custom Context Menu Item
+ */
+export declare type CustomContextMenuItem = AgGridMenuItem<AgGridContextMenuItemType> | AdaptableSystemMenuItem | UserContextMenuItem | '-' | {
+    menuType: 'Group';
+    label: string;
+    subMenuItems: CustomContextMenuItem[];
+    disabled?: boolean;
+    icon?: AdaptableIcon;
+};
+/**
+ * Custom Column Menu Item
+ */
+export declare type CustomColumnMenuItem = AgGridMenuItem<AgGridColumnMenuItemType> | AdaptableSystemMenuItem | UserColumnMenuItem | '-' | {
+    menuType: 'Group';
+    label: string;
+    subMenuItems: CustomColumnMenuItem[];
+    disabled?: boolean;
+    icon?: AdaptableIcon;
+};
+/**
+ * Menu Item that is provided by AG Grid
+ */
+export interface AgGridMenuItem<MENU_TYPE> {
+    menuType: 'AgGrid';
+    name: MENU_TYPE;
+}
+/**
+ * Context Menu Item that is provided by AdapTable
+ */
+export interface AdaptableSystemMenuItem extends AdaptableMenuItem {
+    menuType: 'Adaptable';
+}
+/**
+ * Context Menu Item that is provided by User
+ */
+export interface UserContextMenuItem {
+    menuType: 'User';
+    /**
+     * Text to appear in the Menu Item
+     */
+    label: string;
+    /**
+     * Function invoked when the Menu Item is clicked
+     */
+    onClick?: (menuContext: ContextMenuContext) => void;
+    /**
+     * Whether menu item is disabled
+     */
+    disabled?: boolean;
+    /**
+     * Whether menu item is hidden
+     */
+    hidden?: boolean;
+    /**
+     * Optional icon to display
+     */
+    icon?: AdaptableIcon;
+    /**
+     * Array of Menu Items, enabling limitless levels of menus
+     */
+    subMenuItems?: CustomContextMenuItem[];
+}
+/**
+ * Context Menu Item that is provided by User
+ */
+export interface UserColumnMenuItem {
+    menuType: 'User';
+    /**
+     * Text to appear in the Menu Item
+     */
+    label: string;
+    /**
+     * Function invoked when the Menu Item is clicked
+     */
+    onClick?: (menuContext: ColumnMenuContext) => void;
+    /**
+     * Whether menu item is disabled
+     */
+    disabled?: boolean;
+    /**
+     * Whether menu item is hidden
+     */
+    hidden?: boolean;
+    /**
+     * Optional icon to display
+     */
+    icon?: AdaptableIcon;
+    /**
+     * Array of Menu Items, enabling limitless levels of menus
+     */
+    subMenuItems?: CustomColumnMenuItem[];
+}
 /**
  * Context used when ordering Menu Sections
  */
@@ -57,3 +192,7 @@ export interface MenuOrderContext extends BaseContext {
      */
     column: AdaptableColumn;
 }
+export declare type AgGridContextMenuItemType = 'autoSizeAll' | 'expandAll' | 'contractAll' | 'copy' | 'copyWithHeaders' | 'cut' | 'paste' | 'resetColumns' | 'export' | 'csvExport' | 'excelExport' | 'chartRange' | 'pivotChart';
+export declare type AgGridColumnMenuItemType = 'pinSubMenu' | 'valueAggSubMenu' | 'autoSizeThis' | 'autoSizeAll' | 'rowGroup' | 'rowUnGroup' | 'resetColumns' | 'expandAll' | 'contractAll';
+export declare const DEFAULT_ADAPTABLE_CONTEXT_MENU_ORDER: AdaptableModule[];
+export declare const DEFAULT_ADAPTABLE_COLUMN_MENU_ORDER: AdaptableModule[];

package/src/AdaptableOptions/MenuOptions.js

@@ -1,2 +1,77 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_ADAPTABLE_COLUMN_MENU_ORDER = exports.DEFAULT_ADAPTABLE_CONTEXT_MENU_ORDER = void 0;
+const tslib_1 = require("tslib");
+const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
+exports.DEFAULT_ADAPTABLE_CONTEXT_MENU_ORDER = [
+    ModuleConstants.SettingsPanelModuleId,
+    ModuleConstants.LayoutModuleId,
+    ModuleConstants.FlashingCellModuleId,
+    ModuleConstants.FormatColumnModuleId,
+    ModuleConstants.StyledColumnModuleId,
+    ModuleConstants.CustomSortModuleId,
+    ModuleConstants.CellSummaryModuleId,
+    ModuleConstants.Fdc3ModuleId,
+    ModuleConstants.PlusMinusModuleId,
+    ModuleConstants.DashboardModuleId,
+    ModuleConstants.SystemStatusModuleId,
+    ModuleConstants.GridInfoModuleId,
+    ModuleConstants.ColumnInfoModuleId,
+    ModuleConstants.DataImportModuleId,
+    ModuleConstants.AlertModuleId,
+    ModuleConstants.CalculatedColumnModuleId,
+    ModuleConstants.ExportModuleId,
+    ModuleConstants.FilterModuleId,
+    ModuleConstants.SmartEditModuleId,
+    ModuleConstants.BulkUpdateModuleId,
+    ModuleConstants.TeamSharingModuleId,
+    ModuleConstants.DataChangeHistoryModuleId,
+    ModuleConstants.DataSetModuleId,
+    ModuleConstants.FreeTextColumnModuleId,
+    ModuleConstants.QueryModuleId,
+    ModuleConstants.QuickSearchModuleId,
+    ModuleConstants.ScheduleModuleId,
+    ModuleConstants.ShortcutModuleId,
+    ModuleConstants.StateManagementModuleId,
+    ModuleConstants.ToolPanelModuleId,
+    ModuleConstants.ThemeModuleId,
+    ModuleConstants.StatusBarModuleId,
+    ModuleConstants.ChartingModuleId,
+    ModuleConstants.NotesModuleId,
+];
+exports.DEFAULT_ADAPTABLE_COLUMN_MENU_ORDER = [
+    ModuleConstants.SettingsPanelModuleId,
+    ModuleConstants.LayoutModuleId,
+    ModuleConstants.FlashingCellModuleId,
+    ModuleConstants.FormatColumnModuleId,
+    ModuleConstants.StyledColumnModuleId,
+    ModuleConstants.CustomSortModuleId,
+    ModuleConstants.CellSummaryModuleId,
+    ModuleConstants.Fdc3ModuleId,
+    ModuleConstants.PlusMinusModuleId,
+    ModuleConstants.DashboardModuleId,
+    ModuleConstants.SystemStatusModuleId,
+    ModuleConstants.GridInfoModuleId,
+    ModuleConstants.ColumnInfoModuleId,
+    ModuleConstants.DataImportModuleId,
+    ModuleConstants.AlertModuleId,
+    ModuleConstants.CalculatedColumnModuleId,
+    ModuleConstants.ExportModuleId,
+    ModuleConstants.FilterModuleId,
+    ModuleConstants.SmartEditModuleId,
+    ModuleConstants.BulkUpdateModuleId,
+    ModuleConstants.TeamSharingModuleId,
+    ModuleConstants.DataChangeHistoryModuleId,
+    ModuleConstants.DataSetModuleId,
+    ModuleConstants.FreeTextColumnModuleId,
+    ModuleConstants.QueryModuleId,
+    ModuleConstants.QuickSearchModuleId,
+    ModuleConstants.ScheduleModuleId,
+    ModuleConstants.ShortcutModuleId,
+    ModuleConstants.StateManagementModuleId,
+    ModuleConstants.ToolPanelModuleId,
+    ModuleConstants.ThemeModuleId,
+    ModuleConstants.StatusBarModuleId,
+    ModuleConstants.ChartingModuleId,
+    ModuleConstants.NotesModuleId,
+];

package/src/Api/AdaptableApi.d.ts

@@ -43,6 +43,7 @@ import { ActionColumnApi } from './ActionColumnApi';
 import { ActionRowApi } from './ActionRowApi';
 import { NotesApi } from './NotesAPi';
 import { Fdc3Api } from './Fdc3Api';
+import { DataImportApi } from './DataImportApi';
 /**
  *
  * The `AdaptableApi` provides developers with run-time access to AdapTable.
@@ -226,6 +227,10 @@ export interface AdaptableApi {
      * Provides access to the Notes Module
      */
     notesApi: NotesApi;
+    /**
+     * Provides access to the Data Import Module
+     */
+    dataImportApi: DataImportApi;
     /**
      * Manages the FDC3 capabilities of AdapTable
      */

package/src/Api/DataImportApi.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Provides run-time access to the Settings Panel
+ **/
+export interface DataImportApi {
+    /**
+     * Opens the Data Import Wizard
+     */
+    openImportWizard(): void;
+}

package/src/Api/DataImportApi.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/Api/Implementation/AdaptableApiImpl.d.ts

@@ -44,6 +44,7 @@ import { ActionColumnApi } from '../ActionColumnApi';
 import { ActionRowApi } from '../ActionRowApi';
 import { NotesApi } from '../NotesAPi';
 import { Fdc3Api } from '../Fdc3Api';
+import { DataImportApiImpl } from './DataImportApiImpl';
 export declare class AdaptableApiImpl implements AdaptableApi {
     protected adaptable: IAdaptable;
     internalApi: AdaptableInternalApi;
@@ -92,6 +93,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     statusBarApi: StatusBarApi;
     notesApi: NotesApi;
     fdc3Api: Fdc3Api;
+    dataImportApi: DataImportApiImpl;
     private destroyed;
     constructor(adaptable: IAdaptable);
     /**

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -47,6 +47,7 @@ const EntitlementApiImpl_1 = require("./EntitlementApiImpl");
 const OptionsApiImpl_1 = require("./OptionsApiImpl");
 const NotesApiImpl_1 = require("./NotesApiImpl");
 const Fdc3ApiImpl_1 = require("./Fdc3ApiImpl");
+const DataImportApiImpl_1 = require("./DataImportApiImpl");
 class AdaptableApiImpl {
     constructor(adaptable) {
         this.adaptable = adaptable;
@@ -97,6 +98,7 @@ class AdaptableApiImpl {
         this.statusBarApi = new StatusBarApiImpl_1.StatusBarApiImpl(adaptable);
         this.notesApi = new NotesApiImpl_1.NotesApiImpl(adaptable);
         this.fdc3Api = new Fdc3ApiImpl_1.Fdc3ApiImpl(adaptable);
+        this.dataImportApi = new DataImportApiImpl_1.DataImportApiImpl(adaptable);
         // adaptable internal api
         this.internalApi = new AdaptableInternalApi_1.AdaptableInternalApi(adaptable);
     }

package/src/Api/Implementation/DataImportApiImpl.d.ts

@@ -0,0 +1,10 @@
+import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
+import { DataImportApi } from '../DataImportApi';
+import { DataImportInternalApi } from '../Internal/DataImportInternalApi';
+import { ApiBase } from './ApiBase';
+export declare class DataImportApiImpl extends ApiBase implements DataImportApi {
+    internalApi: DataImportInternalApi;
+    constructor(adaptable: IAdaptable);
+    openImportWizard(): void;
+    importData(partialRows: any[]): void;
+}

package/src/Api/Implementation/DataImportApiImpl.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataImportApiImpl = void 0;
+const DataImportInternalApi_1 = require("../Internal/DataImportInternalApi");
+const ApiBase_1 = require("./ApiBase");
+class DataImportApiImpl extends ApiBase_1.ApiBase {
+    constructor(adaptable) {
+        super(adaptable);
+        this.internalApi = new DataImportInternalApi_1.DataImportInternalApi(adaptable);
+    }
+    openImportWizard() { }
+    importData(partialRows) { }
+}
+exports.DataImportApiImpl = DataImportApiImpl;

package/src/Api/Implementation/ExpressionApiImpl.js

@@ -47,7 +47,7 @@ class ExpressionApiImpl extends ApiBase_1.ApiBase {
         return isValid;
     }
     getASTForExpression(query) {
-        return parser.getAST(query);
+        return parser.getAbstractSyntaxTree(query);
     }
     getColumnsFromExpression(expression) {
         try {

package/src/Api/Implementation/OptionsApiImpl.d.ts

@@ -43,4 +43,5 @@ export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getFlashingCellOptions(): FlashingCellOptions;
     getSettingsPanelOptions(): SettingsPanelOptions;
     getFdc3Options(): Fdc3Options;
+    getDataImportOptions(): import("../../types").DataImportOptions<any>;
 }

package/src/Api/Implementation/OptionsApiImpl.js

@@ -117,5 +117,8 @@ class OptionsApiImpl extends ApiBase_1.ApiBase {
     getFdc3Options() {
         return this.adaptable.adaptableOptions.fdc3Options;
     }
+    getDataImportOptions() {
+        return this.getOptions().dataImportOptions;
+    }
 }
 exports.OptionsApiImpl = OptionsApiImpl;

package/src/Api/Implementation/UserInterfaceApiImpl.d.ts

@@ -4,7 +4,7 @@ import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
 import { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../../PredefinedConfig/Common/Menu';
 import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
-import { AdaptableObjectTag, GridCell } from '../../types';
+import { AdaptableObjectTag, CustomWindowConfig, GridCell } from '../../types';
 import { UserInterfaceInternalApi } from '../Internal/UserInterfaceInternalApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfaceApi {
@@ -32,4 +32,8 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getCustomIconDefinition(iconName: string): import("../../types").AdaptableIcon | import("../../types").CustomIcon;
     showLoadingScreen(): void;
     hideLoadingScreen(): void;
+    openCustomWindowPopup(config: CustomWindowConfig): {
+        close: () => void;
+    };
+    closeCustomWindowPopup(windowId: string): void;
 }

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -6,6 +6,7 @@ const ApiBase_1 = require("./ApiBase");
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 const ArrayExtensions_1 = require("../../Utilities/Extensions/ArrayExtensions");
 const UserInterfaceInternalApi_1 = require("../Internal/UserInterfaceInternalApi");
+const WindowPopups_1 = require("../../View/Components/Popups/WindowPopups/WindowPopups");
 class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -191,5 +192,26 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
     hideLoadingScreen() {
         this.dispatchAction(PopupRedux.PopupHideLoading());
     }
+    openCustomWindowPopup(config) {
+        const close = () => {
+            this.dispatchAction(PopupRedux.PopupHideWindow(config.id));
+        };
+        const action = PopupRedux.PopupShowWindow({
+            Id: config.id,
+            Title: config.title,
+            FactoryId: WindowPopups_1.CUSTOM_WINDOW_FACTORY_ID,
+            PopupProps: {
+                render: config.render,
+                frameworkComponent: config.frameworkComponent,
+                onFrameworkComponentDestroyed: config.onFrameworkComponentDestroyed,
+            },
+            Icon: config.icon,
+        });
+        this.dispatchAction(action);
+        return { close };
+    }
+    closeCustomWindowPopup(windowId) {
+        this.dispatchAction(PopupRedux.PopupHideWindow(windowId));
+    }
 }
 exports.UserInterfaceApiImpl = UserInterfaceApiImpl;

package/src/Api/Internal/ChartingInternalApi.js

@@ -27,42 +27,42 @@ class ChartingInternalApi extends ApiBase_1.ApiBase {
     }
     // External lib charting service
     isExternalChartOpened(chartDefinition) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions();
-        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.externalCharting.isChartOpened)) {
+        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.isChartOpened)) {
             return false;
         }
         if (!chartDefinition) {
             return false;
         }
-        return externalChartingOptions.externalCharting.isChartOpened(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        return externalChartingOptions.isChartOpened(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
     }
     onHideExternalChart(chartDefinition) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions();
-        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.externalCharting.onHideChart)) {
+        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onHideChart)) {
             return;
         }
-        externalChartingOptions.externalCharting.onHideChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        externalChartingOptions.onHideChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
     }
     onShowExternalChart(chartDefinition, container) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions();
-        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.externalCharting.onShowChart)) {
+        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onShowChart)) {
             return;
         }
-        externalChartingOptions.externalCharting.onShowChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        externalChartingOptions.onShowChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
     }
     onPreviewExternalChart(chartDefinition, container) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions();
-        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.externalCharting.onPreviewChart)) {
+        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onPreviewChart)) {
             return;
         }
-        return externalChartingOptions.externalCharting.onPreviewChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        return externalChartingOptions.onPreviewChart(Object.assign({ chartDefinition: chartDefinition, container: container }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
     }
     onDeleteExternalChart(chartDefinition) {
-        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions();
-        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.externalCharting.onDeleteChart)) {
+        const externalChartingOptions = this.adaptable.api.optionsApi.getChartingOptions().externalChartingOptions;
+        if (!(externalChartingOptions === null || externalChartingOptions === void 0 ? void 0 : externalChartingOptions.onDeleteChart)) {
             return;
         }
-        externalChartingOptions.externalCharting.onDeleteChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
+        externalChartingOptions.onDeleteChart(Object.assign({ chartDefinition: chartDefinition }, (0, ObjectFactory_1.createBaseContext)(this.adaptable.api)));
     }
 }
 exports.ChartingInternalApi = ChartingInternalApi;

package/src/Api/Internal/DataImportInternalApi.d.ts

@@ -0,0 +1,4 @@
+import { ApiBase } from '../Implementation/ApiBase';
+export declare class DataImportInternalApi extends ApiBase {
+    importData(partialRows: any[]): Promise<void>;
+}

package/src/Api/Internal/DataImportInternalApi.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataImportInternalApi = void 0;
+const tslib_1 = require("tslib");
+const ObjectFactory_1 = tslib_1.__importStar(require("../../Utilities/ObjectFactory"));
+const ApiBase_1 = require("../Implementation/ApiBase");
+class DataImportInternalApi extends ApiBase_1.ApiBase {
+    async importData(partialRows) {
+        const dataImportOptions = this.getOptions().dataImportOptions;
+        let importData = partialRows;
+        if (typeof dataImportOptions.preprocessData === 'function') {
+            importData = dataImportOptions.preprocessData(Object.assign({ data: partialRows }, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())));
+        }
+        if (dataImportOptions.applyImport) {
+            dataImportOptions.applyImport(Object.assign({ data: importData }, (0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi())));
+            return;
+        }
+        const gridApi = this.getGridApi();
+        const primaryKey = this.getOptions().primaryKey;
+        let newRows = 0;
+        let updatedRows = 0;
+        const preparedDataRows = importData.map((dataRow) => {
+            const node = gridApi.getRowNodeForPrimaryKey(dataRow[primaryKey]);
+            if (!node) {
+                newRows += 1;
+                return dataRow;
+            }
+            updatedRows += 1;
+            return Object.assign(Object.assign({}, node === null || node === void 0 ? void 0 : node.data), dataRow);
+        });
+        await gridApi.addOrUpdateGridData(preparedDataRows);
+        let message = '';
+        if (newRows && updatedRows) {
+            message = `Added: ${newRows} new Row${newRows > 1 ? 's' : ''}; Updated: ${updatedRows} existing Row${updatedRows > 1 ? 's' : ''}`;
+        }
+        else if (newRows && !updatedRows) {
+            message = `Added: ${newRows} new Row${newRows > 1 ? 's' : ''}`;
+        }
+        else if (!newRows && updatedRows) {
+            message = `Updated: ${updatedRows} existing Row${updatedRows > 1 ? 's' : ''}`;
+        }
+        const alert = {
+            alertType: 'generic',
+            header: 'Data Imported',
+            message,
+            alertDefinition: Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyAlertDefinition()), { MessageType: 'Info', AlertProperties: {
+                    DisplayNotification: true,
+                } }),
+        };
+        this.getAlertApi().showAdaptableAlert(alert);
+    }
+}
+exports.DataImportInternalApi = DataImportInternalApi;

package/src/Api/OptionsApi.d.ts

@@ -4,6 +4,7 @@ import { GroupingOptions } from '../AdaptableOptions/GroupingOptions';
 import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FilterOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotesOptions, NotificationsOptions, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
 import { Fdc3Options } from '../AdaptableOptions/Fdc3Options';
 import { ExpressionOptions } from '../AdaptableOptions/ExpressionOptions';
+import { DataImportOptions } from '../AdaptableOptions/DataImportOptions';
 /**
  * Range of functions to access Adaptable Options
  */
@@ -160,4 +161,8 @@ export interface OptionsApi {
      * Returns `AdaptableOptions.fdc3Options`
      */
     getFdc3Options(): Readonly<Fdc3Options>;
+    /**
+     * Returns `AdaptableOptions.dataImportOptions`
+     */
+    getDataImportOptions(): Readonly<DataImportOptions>;
 }

package/src/Api/UserInterfaceApi.d.ts

@@ -5,6 +5,7 @@ import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermitt
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
 import { AdaptableIcon } from '../types';
+import { CustomWindowConfig } from '../AdaptableOptions/AdaptableFrameworkComponent';
 /**
  * Functions relating to User Interface section of Adaptable State
  */
@@ -88,4 +89,17 @@ export interface UserInterfaceApi {
      * Hides the popup that says getting data and initialising grid
      */
     hideLoadingScreen(): void;
+    /**
+     * Opens window with custom content
+     * @param config
+     */
+    openCustomWindowPopup(config: CustomWindowConfig): {
+        close: () => void;
+    };
+    /**
+     * Closes a custom window
+     *
+     * @param windowId window popup id
+     */
+    closeCustomWindowPopup(windowId: string): void;
 }

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

@@ -54,4 +54,4 @@ export interface AdaptableBaseIcon {
 /**
  * All AdapTable System Icon names
  */
-export declare type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'comment' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note';
+export declare type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'comment' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import';