@adaptabletools/adaptable 11.1.1 → 11.1.4

package/index.css

@@ -3645,6 +3645,9 @@ html.ab--theme-dark .ab-ListBoxFilterForm--aggrid-style {
   max-height: 100%;
   box-shadow: var(--ab-cmp-adaptable-window-popup__box-shadow); }
 
+.ab-Window-Modal .ab-Dialog__close-button {
+    top: 3px; }
+
 .ab-Window-Modal .ab-Panel {
     max-height: initial; }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "11.1.1",
+  "version": "11.1.4",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",
@@ -39,10 +39,10 @@
     "normalize.css": "^8.0.1",
     "prop-types": "^15.6.2",
     "re-resizable": "^6.9.1",
-    "react": ">=16.8.0",
+    "react": "^16.8.0 || ^17.0.0",
     "react-beautiful-dnd": "13.1.0",
     "react-day-picker": "8.0.0-beta.38",
-    "react-dom": ">=16.8.0",
+    "react-dom": "^16.8.0 || ^17.0.0",
     "react-redux": "7.2.4",
     "react-remove-scroll": "2.4.2",
     "react-toastify": "8.1.0",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1648553646478;
+declare const _default: 1649274832417;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1648553646478;
+exports.default = 1649274832417;

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -151,7 +151,7 @@ export interface IAdaptable {
     }>;
     getDistinctCustomSortValuesForColumn(column: AdaptableColumn, visibleRowsOnly: boolean, skipRowNode?: RowNode): Promise<GridCell[]>;
     getDistinctBulkUpdateValuesForColumn(column: AdaptableColumn, visibleRowsOnly: boolean, selectedGridCells: GridCell[], skipRowNode?: RowNode): Promise<GridCell[]>;
-    getDisplayValue(id: any, columnId: string): string;
+    getDisplayValue(id: any, columnId: string): string | undefined;
     getGridCellFromRowNode(rowNode: RowNode, columnId: string): GridCell | undefined;
     getRawValueFromRowNode(rowNode: RowNode, columnId: string): any;
     getDisplayValueFromRowNode(rowNode: RowNode, columnId: string): string | undefined;
@@ -164,7 +164,8 @@ export interface IAdaptable {
     lookupPlugins(propertyName: string, ...args: any): any;
     getPluginProperty(pluginId: string, propertyName: string, ...args: any): any;
     getPlugin(pluginId: string): AdaptablePlugin;
-    setValue(cellDataChangedInfo: CellDataChangedInfo): void;
+    setDataValue(value: any, column: AdaptableColumn, primaryKeyValue: any, rowNode?: RowNode): void;
+    setCellValue(cellDataChangedInfo: CellDataChangedInfo): void;
     cancelEdit(): any;
     isCellEditable(rowNode: RowNode, column: Column): boolean;
     getFirstRowNode(): RowNode;

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -33,10 +33,6 @@ export interface AdaptableOptions {
      * @gridInfoItem
      */
     adaptableId?: string;
-    /**
-     * Commercial license key. If the license is not provided or is expired, various visual information notes will be displayed and some functionality may be limited.
-     */
-    licenseKey?: string;
     /**
      * Identifier used as localStorage persistence key for AdaptableState
      *
@@ -44,6 +40,27 @@ export interface AdaptableOptions {
      * @gridInfoItem
      */
     adaptableStateKey?: string;
+    /**
+     * Will autogenerate a Primary Key; only use as a last resort if no unique column is available, as limits some Adaptable functionalities
+     *
+     * @defaultValue false
+     * @gridInfoItem
+     */
+    autogeneratePrimaryKey?: boolean;
+    /**
+     * The AG Grid object which AdapTable interacts with.  Note: if using AdapTable React or AdapTable Angular, no need to populate this property as AdapTable wires it up differently
+     *
+     * @defaultValue n/a (Mandatory)
+     */
+    gridOptions?: GridOptions;
+    /**
+     * Commercial license key. If the license is not provided or is expired, various visual information notes will be displayed and some functionality may be limited.
+     */
+    licenseKey?: string;
+    /**
+     * AG Grid Modules that should be provided - needs to be provided separately
+     */
+    modules?: Module[];
     /**
      * User State set at design-time and shipped with AdapTable for first use; can be `PredefinedConfig` object or url to file containing config
      *
@@ -57,13 +74,6 @@ export interface AdaptableOptions {
      * @gridInfoItem
      */
     primaryKey: string;
-    /**
-     * Will autogenerate a Primary Key; only use as a last resort if no unique column is available, as limits some Adaptable functionalities
-     *
-     * @defaultValue false
-     * @gridInfoItem
-     */
-    autogeneratePrimaryKey?: boolean;
     /**
      * Name of current AdapTable user
      *
@@ -72,21 +82,9 @@ export interface AdaptableOptions {
      */
     userName?: string;
     /**
-     * The AG Grid object which AdapTable interacts with.  Note: if using AdapTable React or AdapTable Angular, no need to populate this property as AdapTable wires it up differently
-     *
-     * @defaultValue n/a (Mandatory)
-     */
-    gridOptions?: GridOptions;
-    /**
-     * AG Grid Modules that should be provided - needs to be provided separately
-     */
-    modules?: Module[];
-    /**
-     * Options for managing Notifications in AdapTable
-     *
-     * @gridInfoContainer
+     * Options for managing AdapTableQL
      */
-    notificationsOptions?: NotificationsOptions;
+    adaptableQLOptions?: AdaptableQLOptions;
     /**
      * Options for managing Alerts in AdapTable
      *
@@ -97,12 +95,22 @@ export interface AdaptableOptions {
      * Options for setting the 'Div' elements in which AdapTable, AG Grid, popups are placed
      */
     containerOptions?: ContainerOptions;
+    /**
+     * Predicate definitions provided by developers at Design-Time
+     */
+    customPredicateDefs?: AdaptablePredicateDef[];
     /**
      * Options related to managing the Dashboard in AdapTable
      *
      * @gridInfoContainer
      */
     dashboardOptions?: DashboardOptions;
+    /**
+     * Options to manage Data Change History Module which provides an overview of all data changes
+     *
+     * @gridInfoContainer
+     */
+    dataChangeHistoryOptions?: DataChangeHistoryOptions;
     /**
      * Options related to Editing in AdapTable including Server Validation
      *
@@ -121,6 +129,12 @@ export interface AdaptableOptions {
      * @gridInfoContainer
      */
     exportOptions?: ExportOptions;
+    /**
+     * Options for managing Filtering in AdapTable
+     *
+     * @gridInfoContainer
+     */
+    filterOptions?: FilterOptions;
     /**
      * Options for managing Flashing Cells - primarily default values
      *
@@ -145,6 +159,12 @@ export interface AdaptableOptions {
      * @gridInfoContainer
      */
     menuOptions?: MenuOptions;
+    /**
+     * Options for managing Notifications in AdapTable
+     *
+     * @gridInfoContainer
+     */
+    notificationsOptions?: NotificationsOptions;
     /**
      * Options for managing Search related functions in AdapTable
      *
@@ -152,11 +172,11 @@ export interface AdaptableOptions {
      */
     searchOptions?: SearchOptions;
     /**
-     * Options for managing Filtering in AdapTable
+     * Setting panel options
      *
      * @gridInfoContainer
      */
-    filterOptions?: FilterOptions;
+    settingsPanelOptions?: SettingsPanelOptions;
     /**
      * Options related to state hydration / dehydration - allows users to intercept state persistence and state loading and change default behavior of saving to local storage
      */
@@ -167,12 +187,6 @@ export interface AdaptableOptions {
      * @gridInfoContainer
      */
     teamSharingOptions?: TeamSharingOptions;
-    /**
-     * Options for managing the User Interface elements of AdapTable, i.e. Action Columns, Color Palette etc.
-     *
-     * @gridInfoContainer
-     */
-    userInterfaceOptions?: UserInterfaceOptions;
     /**
      * Options related to managing the Tool Panel elements in AdapTable
      *
@@ -180,27 +194,13 @@ export interface AdaptableOptions {
      */
     toolPanelOptions?: ToolPanelOptions;
     /**
-     * Options for managing AdapTableQL
-     */
-    adaptableQLOptions?: AdaptableQLOptions;
-    /**
-     * Options to manage Data Change History Module which provides an overview of all data changes
+     * Options for managing the User Interface elements of AdapTable, i.e. Action Columns, Color Palette etc.
      *
      * @gridInfoContainer
      */
-    dataChangeHistoryOptions?: DataChangeHistoryOptions;
+    userInterfaceOptions?: UserInterfaceOptions;
     /**
      * Used for managing the AdapTable Plugins
      */
     plugins?: AdaptablePlugin[];
-    /**
-     * Predicate definitions provided by developers at Design-Time
-     */
-    customPredicateDefs?: AdaptablePredicateDef[];
-    /**
-     * Setting panel options
-     *
-     * @gridInfoContainer
-     */
-    settingsPanelOptions?: SettingsPanelOptions;
 }

package/src/AdaptableOptions/ContainerOptions.d.ts

@@ -17,7 +17,7 @@ export interface ContainerOptions {
      */
     agGridContainer?: string | HTMLElement;
     /**
-     *  how long AdapTable waits for AG Grid before giving up connecting to it; useful when AG Grid is instantiated separately (eg: by AdapTable React or AdapTable Angular)
+     *  How long AdapTable waits for AG Grid before giving up connecting to it
      *
      * @defaultValue 60s
      * @gridInfoItem

package/src/AdaptableOptions/DashboardOptions.d.ts

@@ -30,7 +30,7 @@ export interface DashboardOptions {
      */
     customToolbars?: CustomToolbar[];
     /**
-     * Position in the Dashboard to show the Module and Custom Buttons
+     * Where in Dashboard to display Module and Custom Buttons
      * @defaultValue 'right'
      */
     buttonsLocation?: 'left' | 'right';

package/src/AdaptableOptions/EditOptions.d.ts

@@ -1,5 +1,6 @@
 import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
+import { SmartEditCustomOperation } from './SmartEdit';
 /**
  * Options related to Editing in Adaptable.
  *
@@ -21,6 +22,9 @@ export interface EditOptions {
      * Function which checks if given Grid Cell is editable
      */
     isCellEditable?: (gridCell: GridCell) => boolean;
+    smartEdit?: {
+        customOperations?: SmartEditCustomOperation[];
+    };
 }
 /**
  * Used for Server Validation ie. after an edit has been made in Adaptable which should be checked on the Server

package/src/AdaptableOptions/LayoutOptions.d.ts

@@ -42,4 +42,15 @@ export interface LayoutOptions {
      * @gridInfoItem
      */
     createDefaultLayout?: boolean;
+    /**
+     * Options to customize how layout items are shown in Settings Panel
+     */
+    view?: {
+        /**
+         * How many columns to display in the inline layout preview
+         *
+         * @defaultValue 10
+         */
+        maxColumnsToDisplay?: number;
+    };
 }

package/src/AdaptableOptions/NotificationsOptions.d.ts

@@ -59,7 +59,7 @@ export interface NotificationsOptions {
      */
     transition?: 'Bounce' | 'Slide' | 'Zoom' | 'Flip';
     /**
-     * Display an Alert when a System Status Message is set
+     * Display System Status Messages as Notifications
      *
      * @defaultValue false
      * @gridInfoItem
@@ -73,7 +73,7 @@ export interface NotificationsOptions {
      */
     maxSystemMessagesInStore?: number;
     /**
-     * Displays the application icon in Notifications (if provided in `UserInterfaceOptions`)
+     * Displays the application icon in Notifications
      * @defaultValue false
      */
     showApplicationIcon?: boolean;

package/src/AdaptableOptions/SmartEdit.d.ts

@@ -0,0 +1,34 @@
+import { MathOperation } from '../PredefinedConfig/Common/Enums';
+import { AdaptableApi, AdaptableColumn, GridCell } from '../types';
+export declare type SmartEditCustomOperation = {
+    /**
+     * Name of the operation, appears in the UI
+     */
+    Name: string;
+    /**
+     * Custom operation function
+     */
+    Operation: (context: {
+        /**
+         * Selected Cell Value
+         */
+        value: number;
+        /**
+         * Smart edit cell value
+         */
+        smartEditValue: number;
+        /**
+         * Selected column
+         */
+        column: AdaptableColumn;
+        /**
+         * Adaptable Api
+         */
+        adaptableApi: AdaptableApi;
+        /**
+         * Selected grid cell
+         */
+        selectedCell: GridCell;
+    }) => number;
+};
+export declare type SmartEditOperation = SmartEditCustomOperation | MathOperation;

package/src/AdaptableOptions/SmartEdit.js

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

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -244,4 +244,4 @@ export interface BulkUpdatePermittedValuesParams extends BaseParams {
     gridCells: GridCell[];
 }
 export declare type GridInfoSections = GridInfoSection[];
-export declare type GridInfoSection = 'GridSummary' | 'AdaptableOptions' | 'ColumnInfo';
+export declare type GridInfoSection = 'GridSummary' | 'AdaptableOptions' | 'ColumnInfo' | 'AdaptableObjectsSummary';

package/src/Api/Implementation/ColumnApiImpl.js

@@ -291,7 +291,7 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, false, filter);
         return {
             values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
-                return cv.normalisedValue;
+                return cv.displayValue;
             }),
             suppressClientSideFilter,
         };

package/src/Api/Implementation/FilterApiImpl.js

@@ -156,7 +156,7 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         return columnFilters.map((cf) => this.columnFilterToString(cf)).join(', ');
     }
     evaluateColumnFilter(columnFilter, node) {
-        var _a;
+        var _a, _b;
         if (!columnFilter.Predicate) {
             return true;
         }
@@ -171,8 +171,14 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         if (!gridCell) {
             return true;
         }
+        let value = gridCell.normalisedValue;
+        if (((_b = columnFilter.Predicate) === null || _b === void 0 ? void 0 : _b.PredicateId) === 'Contains' && column.dataType === 'Date') {
+            // although 'Contains' Predicate is NOT relevant for Date columns, we have to handle the special case of QuickSearching
+            // in that case, we have to evaluate the displayedValue of the cell, not the normalisedValue (it's a textual search after all)
+            value = gridCell.displayValue;
+        }
         return this.adaptable.api.predicateApi.handlePredicate(columnFilter.Predicate, {
-            value: gridCell.normalisedValue,
+            value: value,
             oldValue: null,
             displayValue: gridCell.normalisedValue,
             node,

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

@@ -59,9 +59,9 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getFirstRowNode(): RowNode;
     getFirstDisplayedRowNode(): RowNode;
     getVisibleRowNodes(): RowNode[];
-    getGridCellFromRowNode(rowwNode: RowNode, columnId: string): GridCell | undefined;
-    getRawValueFromRowNode(rowwNode: RowNode, columnId: string): any | undefined;
-    getDisplayValueFromRowNode(rowwNode: RowNode, columnId: string): any | undefined;
+    getGridCellFromRowNode(rowNode: RowNode, columnId: string): GridCell | undefined;
+    getRawValueFromRowNode(rowNode: RowNode, columnId: string): any | undefined;
+    getDisplayValueFromRowNode(rowNode: RowNode, columnId: string): any | undefined;
     getFormattedValueFromRawValue(columnId: string, rawValue: any): string | undefined;
     getNormalisedValueFromRowNode(rowNode: RowNode, columnId: string): any | undefined;
     getRowNodesForPrimaryKeys(primaryKeyValues: any[]): RowNode[];

package/src/Api/Implementation/GridApiImpl.js

@@ -6,6 +6,7 @@ const ApiBase_1 = require("./ApiBase");
 const GridRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/GridRedux"));
 const SystemRedux_1 = require("../../Redux/ActionsReducers/SystemRedux");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
+const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 class GridApiImpl extends ApiBase_1.ApiBase {
     getGridState() {
         return this.getAdaptableState().Grid;
@@ -48,22 +49,20 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     }
     setCellValue(columnId, newValue, primaryKeyValue) {
         const abColumn = this.adaptable.api.columnApi.getColumnFromId(columnId);
-        if (!abColumn || abColumn.readOnly) {
+        if (!abColumn) {
+            LoggingHelper_1.LogAdaptableWarning(`setCellValue() - column not found for columnId: ${columnId}`);
             return;
         }
         const rowNode = this.getRowNodeForPrimaryKey(primaryKeyValue);
+        if (!rowNode) {
+            LoggingHelper_1.LogAdaptableWarning(`setCellValue() - rowNode not found for primaryKeyValue: ${primaryKeyValue}`);
+            return;
+        }
         if (!this.adaptable.isCellEditable(rowNode, this.adaptable.getAgGridColumnForColumnId(columnId))) {
+            LoggingHelper_1.LogAdaptableInfo(`setCellValue() - cell is not editable (primaryKeyValue: ${primaryKeyValue},columnId: ${columnId},value: ${newValue})`);
             return;
         }
-        const gridCell = {
-            primaryKeyValue: primaryKeyValue,
-            rawValue: newValue,
-            displayValue: newValue,
-            normalisedValue: newValue,
-            rowNode: rowNode,
-            column: abColumn,
-        };
-        this.adaptable.api.internalApi.setGridCell(gridCell);
+        this.adaptable.setDataValue(newValue, abColumn, primaryKeyValue, rowNode);
     }
     setCellsValue(gridCells) {
         gridCells === null || gridCells === void 0 ? void 0 : gridCells.forEach((gridCell) => this.setCellValue(gridCell.columnId, gridCell.newValue, gridCell.primaryKeyValue));
@@ -193,16 +192,14 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     getVisibleRowNodes() {
         return this.adaptable.getVisibleRowNodes();
     }
-    getGridCellFromRowNode(rowwNode, columnId) {
-        return this.adaptable.getGridCellFromRowNode(rowwNode, columnId);
+    getGridCellFromRowNode(rowNode, columnId) {
+        return this.adaptable.getGridCellFromRowNode(rowNode, columnId);
     }
-    getRawValueFromRowNode(rowwNode, columnId) {
-        const gridCell = this.getGridCellFromRowNode(rowwNode, columnId);
-        return gridCell ? gridCell.rawValue : undefined;
+    getRawValueFromRowNode(rowNode, columnId) {
+        return this.adaptable.getRawValueFromRowNode(rowNode, columnId);
     }
-    getDisplayValueFromRowNode(rowwNode, columnId) {
-        const gridCell = this.getGridCellFromRowNode(rowwNode, columnId);
-        return gridCell ? gridCell.displayValue : undefined;
+    getDisplayValueFromRowNode(rowNode, columnId) {
+        return this.adaptable.getDisplayValueFromRowNode(rowNode, columnId);
     }
     getFormattedValueFromRawValue(columnId, rawValue) {
         return this.adaptable.getDisplayValueFromRawValue(columnId, rawValue);

package/src/Api/Implementation/InternalApiImpl.js

@@ -198,7 +198,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     }
     setGridCell(gridCell) {
         const cellDataChangedInfo = this.createDataChangedInfoFromGridCell(gridCell);
-        this.adaptable.setValue(cellDataChangedInfo);
+        this.adaptable.setCellValue(cellDataChangedInfo);
     }
     buildDataChangedInfo(config) {
         var _a;

package/src/Api/Implementation/LayoutApiImpl.js

@@ -252,14 +252,20 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
     }
     showLayoutEditor(layoutName, action = 'Edit') {
         const layout = layoutName ? this.getLayoutByName(layoutName) : this.getCurrentLayout();
+        const moduleInfo = this.adaptable.ModuleService.getModuleInfoByModule(ModuleConstants.LayoutModuleId);
         let preparedAction = action;
         if (!['Edit', 'New', 'Clone'].includes(action)) {
             preparedAction = 'Edit';
             LoggingHelper_1.LogAdaptableError(`When opening the layout editor the action must be one of: New, Clone, Edit; given: ${action}`);
         }
+        let title = 'Layout Editor';
+        if (action === 'Edit') {
+            title = `Edit Layout${(layout === null || layout === void 0 ? void 0 : layout.Name) ? `: ${layout.Name}` : ''}`;
+        }
         this.dispatchAction(PopupRedux.PopupShowWindow({
             Id: windowFactory_1.WINDOW_LAYOUT_EDITOR,
-            Title: `Edit Layout: ${layout.Name}`,
+            Title: title,
+            Icon: moduleInfo.Glyph,
             PopupProps: {
                 action: preparedAction,
                 layout,

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

@@ -1,9 +1,10 @@
 import { ApiBase } from './ApiBase';
 import { SmartEditApi } from '../SmartEditApi';
 import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
+import { SmartEditOperation } from '../../AdaptableOptions/SmartEdit';
 export declare class SmartEditApiImpl extends ApiBase implements SmartEditApi {
-    setSmartEditOperation(mathOperation: 'Add' | 'Subtract' | 'Multiply' | 'Divide'): void;
-    getSmartEditOperation(): string;
+    setSmartEditOperation(mathOperation: SmartEditOperation): void;
+    getSmartEditOperation(): SmartEditOperation;
     setSmartEditValue(smartEditValue: number): void;
     getSmartEditValue(): number;
     showSmartEditPopup(): void;

package/src/Api/SmartEditApi.d.ts

@@ -1,3 +1,4 @@
+import { SmartEditOperation } from '../AdaptableOptions/SmartEdit';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 /**
  * Provides run-time access to the Smart Edit Module
@@ -7,11 +8,11 @@ export interface SmartEditApi {
      * Sets Smart Edit operation: ('Add','Subtract','Multiply','Divide'
      * @param operation operation to run
      */
-    setSmartEditOperation(operation: 'Add' | 'Subtract' | 'Multiply' | 'Divide'): void;
+    setSmartEditOperation(operation: SmartEditOperation): void;
     /**
      * Gets current Smart Edit Operation
      */
-    getSmartEditOperation(): string;
+    getSmartEditOperation(): SmartEditOperation;
     /**
      * Sets Smart Edit Value
      * @param smartEditValue the value to use in Smart Edit Operation

package/src/PredefinedConfig/ExportState.d.ts

@@ -6,11 +6,6 @@ import { AdaptableObject } from './Common/AdaptableObject';
 import { AdaptableFormData } from './Common/AdaptableForm';
 import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
 import { ExportDestination } from './Common/Enums';
-import { CustomDestination } from '../types';
-export interface ExportCustomDestinationPopup {
-    ExportDestination: CustomDestination;
-    ReportName: Report['Name'];
-}
 /**
  * Predefined Configuration for Export Module
  */

package/src/PredefinedConfig/PopupState.d.ts

@@ -1,4 +1,4 @@
-import { ScreenPopup, AlertPopup, ConfirmationPopup, PromptPopup, LoadingPopup, WindowPopup } from '../Utilities/Interface/MessagePopups';
+import { ScreenPopup, AlertPopup, ConfirmationPopup, PromptPopup, LoadingPopup, WindowPopup, FormPopup } from '../Utilities/Interface/MessagePopups';
 import { InternalState } from './InternalState';
 /**
  * Internal state to manage open popups - NOT persisted by Redux
@@ -6,6 +6,7 @@ import { InternalState } from './InternalState';
 export interface PopupState extends InternalState {
     ScreenPopup: ScreenPopup;
     WindowPopup: WindowPopup;
+    FormPopup: FormPopup;
     AlertPopup: AlertPopup;
     ConfirmationPopup: ConfirmationPopup;
     PromptPopup: PromptPopup;

package/src/PredefinedConfig/SystemState.d.ts

@@ -13,7 +13,7 @@ import { CachedQuery } from './QueryState';
 import { AdaptableFlashingCell } from './Common/AdaptableFlashingCell';
 import { TypeUuid } from './Uuid';
 import { SummaryOperation } from './Common/Enums';
-import { ExportCustomDestinationPopup } from './ExportState';
+import { SmartEditOperation } from '../AdaptableOptions/SmartEdit';
 export type { IPushPullReport, IPushPullDomain };
 export type { Glue42Report };
 export type { OpenFinReport };
@@ -25,9 +25,6 @@ export declare type DataChangeHistoryMode = 'ACTIVE' | 'INACTIVE' | 'SUSPENDED';
  */
 export interface SystemState extends InternalState, IPushPullState, Glue42State, OpenFinState {
     AdaptableAlerts: AdaptableAlert[];
-    Export: {
-        CustomDestinationPopups: ExportCustomDestinationPopup[];
-    };
     AdaptableFlashingCells: Record<ROW_PRIMARY_KEY, Record<COLUMN_ID_OR_WHOLE_ROW_LABEL, TypeUuid>>;
     AdaptableFlashingCellsMap: Record<TypeUuid, AdaptableFlashingCell>;
     SystemStatusMessages: SystemStatusMessageInfo[];
@@ -43,7 +40,7 @@ export interface SystemState extends InternalState, IPushPullState, Glue42State,
     CachedQueries: CachedQuery[];
     BulkUpdateValue?: string;
     SmartEditValue?: number;
-    SmartEditOperation?: 'Add' | 'Subtract' | 'Multiply' | 'Divide';
+    SmartEditOperation?: SmartEditOperation;
     CellSummaryOperation?: SummaryOperation | string;
     ProgressIndicator: ProgressIndicator;
     License: {

package/src/Redux/ActionsReducers/PopupRedux.d.ts

@@ -4,6 +4,7 @@ import { InputAction, UIPrompt, UIConfirmation } from '../../Utilities/Interface
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableAlert } from '../../PredefinedConfig/Common/AdaptableAlert';
+import { AdaptableForm, ButtonContext } from '../../types';
 export declare const POPUP_SHOW_SCREEN = "POPUP_SHOW_SCREEN";
 export declare const POPUP_HIDE_SCREEN = "POPUP_HIDE_SCREEN";
 export declare const POPUP_SHOW_LOADING = "POPUP_SHOW_LOADING";
@@ -17,8 +18,10 @@ export declare const POPUP_SHOW_CONFIRMATION = "POPUP_SHOW_CONFIRMATION";
 export declare const POPUP_CONFIRM_CONFIRMATION = "POPUP_CONFIRM_CONFIRMATION";
 export declare const POPUP_CANCEL_CONFIRMATION = "POPUP_CANCEL_CONFIRMATION";
 export declare const POPUP_CLEAR_PARAM = "POPUP_CLEAR_PARAM";
-export declare const POPUP_WINDOW_SHOW_SCREEN = "POPUP_WINDOW_SHOW_SCREEN";
-export declare const POPUP_WINDOW_HIDE_SCREEN = "POPUP_WINDOW_HIDE_SCREEN";
+export declare const POPUP_SHOW_WINDOW = "POPUP_SHOW_WINDOW";
+export declare const POPUP_HIDE_WINDOW = "POPUP_HIDE_WINDOW";
+export declare const POPUP_SHOW_FORM = "POPUP_SHOW_FORM";
+export declare const POPUP_HIDE_FORM = "POPUP_FORM_HIDE";
 export interface PopupShowScreenAction extends Redux.Action {
     ComponentModule: AdaptableModule;
     ComponentName: string;
@@ -38,6 +41,15 @@ export interface PopupShowWindowAction extends Redux.Action {
 export interface PopupHideWindowAction extends Redux.Action {
     Id: string;
 }
+export interface PopupShowFormAction extends Redux.Action {
+    Id: string;
+    Form: AdaptableForm<ButtonContext>;
+    FormProps: any;
+    prepareContext?: (context: ButtonContext) => Promise<ButtonContext> | ButtonContext;
+}
+export interface PopupHideFormAction extends Redux.Action {
+    Id: string;
+}
 export interface PopupShowLoadingAction extends Redux.Action {
 }
 export interface PopupHideLoadingAction extends Redux.Action {
@@ -74,7 +86,14 @@ export declare const PopupShowWindow: (config: {
     PopupProps?: any;
     Icon?: string;
 }) => PopupShowWindowAction;
-export declare const PopupWindowHide: (id: string) => PopupHideWindowAction;
+export declare const PopupHideWindow: (id: string) => PopupHideWindowAction;
+export declare const PopupShowForm: (config: {
+    Id: string;
+    Form: AdaptableForm<ButtonContext>;
+    FormProps?: any;
+    prepareContext?: (context: ButtonContext) => Promise<ButtonContext> | ButtonContext;
+}) => PopupShowFormAction;
+export declare const PopupHideForm: (id: string) => PopupHideFormAction;
 export declare const PopupShowAlert: (alert: AdaptableAlert) => PopupShowAlertAction;
 export declare const PopupHideAlert: () => PopupHideAlertAction;
 export declare const PopupShowLoading: () => PopupShowLoadingAction;