@adaptabletools/adaptable 10.0.2 → 10.0.3

package/src/Api/UserInterfaceApi.d.ts

@@ -1,7 +1,7 @@
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
 import { UserMenuItem } from '../PredefinedConfig/Common/Menu';
-import { ActionColumn, CellValuesList } from '../AdaptableOptions/UserInterfaceOptions';
+import { ActionColumn, BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../AdaptableOptions/UserInterfaceOptions';
 /**
  * Functions relating to User Interface section of Adaptable State
  */
@@ -17,27 +17,36 @@ export interface UserInterfaceApi {
     /**
      * Retrieves `permittedValues` property from User Interface Options
      */
-    getAllPermittedValuesItems(): CellValuesList[];
+    getAllPermittedValuesItems(): PermittedValues[];
     /**
      * Retrieves Permitted Values for a given Column
      * @param column column for which to retrieve Permitted Values
      */
     getPermittedValuesForColumn(column: AdaptableColumn): any[];
+    /**
+     * Retrieves Permitted values for filtering by column values in Floating Filter and dropdown Filter.
+     */
+    getFilterPermittedValuesForColumn(column: AdaptableColumn): FilterPermittedValues | undefined;
+    /**
+     * Retrieves Permitted values for Custom sort.
+     */
+    getCustomSortPermittedValuesForColumn(column: AdaptableColumn): CustomSortPermittedValues | undefined;
+    getBulkUpdatePermittedValuesForColumn(column: AdaptableColumn): BulkUpdatePermittedValues | undefined;
     /**
      * Retrieves `editLookUpItems` property from User Interface Options
      */
-    getAllEditLookUpItems(): CellValuesList[];
+    getAllEditLookUpItems(): EditLookUpPermittedValues[];
     /**
      * Retrieves EditLookUpItems for a given Column
      * @param columnId Column for which to retrieve EditLookUpItems
      */
-    getEditLookUpItemForColumn(columnId: string): CellValuesList | undefined;
+    getEditLookUpItemForColumn(column: AdaptableColumn): EditLookUpPermittedValues | undefined;
     /**
      * Retrieves actual Look Up Values from an EditLookUpItem
      * @param editLookUpItem editLookUpItem to check
      * @param columnId Column to check
      */
-    getEditLookUpValuesForEditLookUpItem(editLookUpItem: CellValuesList, columnId: string): any[] | undefined;
+    getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, columnId: string, rowData: any): any[] | undefined;
     /**
      * Adds menu item to Column Menu
      * @param userMenuItem Menu Item to add

package/src/PredefinedConfig/AlertState.d.ts

@@ -11,6 +11,7 @@ import { XOR } from '../Utilities/Extensions/TypeExtensions';
 import { AdaptableAggregationQuery, AdaptableBooleanQuery, AdaptableObservableQuery } from './Common/AdaptableQuery';
 import { ButtonStyle } from './Common/ButtonStyle';
 import { AlertButtonContext } from '../AdaptableOptions/NotificationsOptions';
+import { DataChangedInfo } from './Common/DataChangedInfo';
 /**
  * Predefined Configuration for Alert function
  */
@@ -82,6 +83,10 @@ export interface AlertDefinition extends BaseAlertDefinition {
      * Type of Alert: 'Info', 'Success', 'Warning', 'Error'; influences Alert colour, icon and logging
      */
     MessageType: AdaptableMessageType;
+    /**
+     * Alert Message - can be string or function; if not provided AdapTable creates dynamically using Rule & Scope
+     */
+    MessageText?: string | ((scope: AdaptableScope, rule: AlertRule, dataChangedInfo?: DataChangedInfo) => string);
     /**
      * Series of properties which set what happens when Alert is triggered
      */

package/src/PredefinedConfig/CalculatedColumnState.d.ts

@@ -1,6 +1,7 @@
 import { ConfigState } from './ConfigState';
 import { AdaptableObject } from './Common/AdaptableObject';
 import { AdaptableScalarQuery } from './Common/AdaptableQuery';
+import { SpecialColumnSettings } from './Common/SpecialColumnSettings';
 /**
  * Predefined Configuration for Calculated Column function
  **/
@@ -24,7 +25,7 @@ export interface CalculatedColumn extends AdaptableObject {
      */
     FriendlyName?: string;
     /**
-     * Addtional optional properties for Column (e.g. filterable, resizable)
+     * Additional optional properties for Column (e.g. filterable, resizable)
      */
     CalculatedColumnSettings?: CalculatedColumnSettings;
     /**
@@ -35,9 +36,9 @@ export interface CalculatedColumn extends AdaptableObject {
 /**
  * Set of optional properties that define a Calculated Column's behaviour
  */
-export interface CalculatedColumnSettings {
+export interface CalculatedColumnSettings extends SpecialColumnSettings {
     /**
-     *  Expression's return value DataType; inferred by AdapTable but setable by User
+     *  Expression's return value DataType; inferred by AdapTable but settable by User
      */
     DataType?: 'String' | 'Number' | 'Boolean' | 'Date';
     /**
@@ -45,38 +46,4 @@ export interface CalculatedColumnSettings {
      * @defaultValue false
      */
     ShowToolTip?: boolean;
-    /**
-     * Preferred width (in pixels) for Column; if unset, calculated dynamically by underlying Grid
-     */
-    Width?: number;
-    /**
-     * Whether Column is filterable
-     * @defaultValue true
-     */
-    Filterable?: boolean;
-    /**
-     * Whether Column can be resized (by dragging column header edges)
-     * @defaultValue true
-     */
-    Resizable?: boolean;
-    /**
-     * Whether Column can be grouped
-     * @defaultValue true
-     */
-    Groupable?: boolean;
-    /**
-     * Whether Column is sortable
-     * @defaultValue true
-     */
-    Sortable?: boolean;
-    /**
-     * Whether Column can be used when grid is in pivot mode
-     * @defaultValue true
-     */
-    Pivotable?: boolean;
-    /**
-     * Whether Column can be used in an aggregation when grouping
-     * @defaultValue true
-     */
-    Aggregatable?: boolean;
 }

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -16,6 +16,7 @@ const isAfter_1 = tslib_1.__importDefault(require("date-fns/isAfter"));
 const isBefore_1 = tslib_1.__importDefault(require("date-fns/isBefore"));
 const isSameDay_1 = tslib_1.__importDefault(require("date-fns/isSameDay"));
 const CalendarHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/CalendarHelper"));
+const DateHelper_1 = require("../../Utilities/Helpers/DateHelper");
 /**
  * Array of Predicate Defs which are shipped by AdapTable
  */
@@ -273,7 +274,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isToday_1.default(value),
+        handler: ({ value }) => isToday_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'Yesterday',
@@ -281,7 +282,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isYesterday_1.default(value),
+        handler: ({ value }) => isYesterday_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'Tomorrow',
@@ -289,7 +290,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isTomorrow_1.default(value),
+        handler: ({ value }) => isTomorrow_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'ThisWeek',
@@ -297,7 +298,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isThisWeek_1.default(value),
+        handler: ({ value }) => isThisWeek_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'ThisMonth',
@@ -305,7 +306,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isThisMonth_1.default(value),
+        handler: ({ value }) => isThisMonth_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'ThisQuarter',
@@ -313,7 +314,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isThisQuarter_1.default(value),
+        handler: ({ value }) => isThisQuarter_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'ThisYear',
@@ -321,7 +322,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isThisYear_1.default(value),
+        handler: ({ value }) => isThisYear_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'InPast',
@@ -329,7 +330,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isPast_1.default(value),
+        handler: ({ value }) => isPast_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'InFuture',
@@ -337,7 +338,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value }) => isFuture_1.default(value),
+        handler: ({ value }) => isFuture_1.default(DateHelper_1.parseDateValue(value)),
     },
     {
         id: 'After',
@@ -346,7 +347,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => isAfter_1.default(value, new Date(inputs[0])),
+        handler: ({ value, inputs }) => isAfter_1.default(DateHelper_1.parseDateValue(value), new Date(inputs[0])),
         toString: ({ inputs }) => `> ${inputs[0]}`,
     },
     {
@@ -356,7 +357,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => isBefore_1.default(value, new Date(inputs[0])),
+        handler: ({ value, inputs }) => isBefore_1.default(DateHelper_1.parseDateValue(value), new Date(inputs[0])),
         toString: ({ inputs }) => `< ${inputs[0]}`,
     },
     {
@@ -366,7 +367,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => isSameDay_1.default(value, new Date(inputs[0])),
+        handler: ({ value, inputs }) => isSameDay_1.default(DateHelper_1.parseDateValue(value), new Date(inputs[0])),
         toString: ({ inputs }) => `= ${inputs[0]}`,
     },
     {
@@ -376,7 +377,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => !isSameDay_1.default(value, new Date(inputs[0])),
+        handler: ({ value, inputs }) => !isSameDay_1.default(DateHelper_1.parseDateValue(value), new Date(inputs[0])),
         toString: ({ inputs }) => `!= ${inputs[0]}`,
     },
     {
@@ -385,7 +386,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value, api }) => isSameDay_1.default(value, CalendarHelper_1.default.getNextWorkingDay()),
+        handler: ({ value, api }) => isSameDay_1.default(DateHelper_1.parseDateValue(value), CalendarHelper_1.default.getNextWorkingDay()),
     },
     {
         id: 'LastWorkDay',
@@ -393,7 +394,7 @@ exports.SystemPredicateDefs = [
         icon: { path: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'conditionalstyle'],
-        handler: ({ value, api }) => isSameDay_1.default(value, CalendarHelper_1.default.getPreviousWorkingDay()),
+        handler: ({ value, api }) => isSameDay_1.default(DateHelper_1.parseDateValue(value), CalendarHelper_1.default.getPreviousWorkingDay()),
     },
     {
         id: 'InRange',

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

@@ -3,11 +3,15 @@
  */
 export interface DataUpdateConfig {
     /**
-     * Whether data should be updated aysnchoronously
+     * Whether data should be updated asynchronously
      */
     runAsync?: boolean;
     /**
      * Callback function invoked when a batch successfully updates
      */
     callback?: (res: any) => void;
+    /**
+     * Index where to add new rows
+     */
+    addIndex?: number;
 }

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

@@ -0,0 +1,49 @@
+/**
+ * Base Settings for SpecialColumns
+ */
+export interface SpecialColumnSettings {
+    /**
+     * Preferred width (in pixels) for Column; if unset, calculated dynamically by underlying Grid
+     */
+    Width?: number;
+    /**
+     * Whether Column is filterable
+     * @defaultValue true
+     */
+    Filterable?: boolean;
+    /**
+     * Whether Column can be resized (by dragging column header edges)
+     * @defaultValue true
+     */
+    Resizable?: boolean;
+    /**
+     * Whether Column can be grouped
+     * @defaultValue true
+     */
+    Groupable?: boolean;
+    /**
+     * Whether Column is sortable
+     * @defaultValue true
+     */
+    Sortable?: boolean;
+    /**
+     * Whether Column can be used when grid is in pivot mode
+     * @defaultValue true
+     */
+    Pivotable?: boolean;
+    /**
+     * Whether Column can be used in an aggregation when grouping
+     * @defaultValue true
+     */
+    Aggregatable?: boolean;
+    /**
+     * Whether if no menu should be shown for this Column header.
+     * @defaultValue false
+     */
+    SuppressMenu?: boolean;
+    /**
+     * Whether if this Column should be movable via dragging
+     * @defaultValue false
+     */
+    SuppressMovable?: boolean;
+}

package/src/PredefinedConfig/FilterState.d.ts

@@ -48,4 +48,4 @@ export interface ColumnFilterPredicate extends AdaptablePredicate {
     PredicateId: TypeHint<string, SystemFilterPredicateId>;
 }
 export declare type SystemFilterPredicateIds = SystemFilterPredicateId[];
-export declare type SystemFilterPredicateId = 'Values' | 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'InRange' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False';
+export declare type SystemFilterPredicateId = 'Values' | 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'InRange' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'True' | 'False' | 'BooleanToggle';

package/src/PredefinedConfig/FreeTextColumnState.d.ts

@@ -1,5 +1,6 @@
 import { ConfigState } from './ConfigState';
 import { AdaptableObject } from './Common/AdaptableObject';
+import { SpecialColumnSettings } from './Common/SpecialColumnSettings';
 /**
  * Predefined Configuration for the Free Text Column function
  */
@@ -39,6 +40,10 @@ export interface FreeTextColumn extends AdaptableObject {
      * @defaultValue 'String'
      */
     DataType?: 'String' | 'Number' | 'Boolean' | 'Date';
+    /**
+     * Additional optional properties for Column (e.g. filterable, resizable)
+     */
+    FreeTextColumnSettings?: FreeTextColumnSettings;
 }
 /**
  * Defines a cell value stored in a Free Text Column
@@ -53,3 +58,8 @@ export interface FreeTextStoredValue {
      */
     FreeText: any;
 }
+/**
+ * Set of optional properties that define a FreeText Columns behaviour
+ */
+export interface FreeTextColumnSettings extends SpecialColumnSettings {
+}

package/src/PredefinedConfig/Selection/GridRow.d.ts

@@ -25,19 +25,27 @@ export interface GridRow {
  */
 export interface RowInfo {
     /**
-     * Whether Row is a Master Row (in a Master-Detail grid)
+     * Is Row  a Master Row (in a Master-Detail grid)
      */
     isMaster?: boolean;
     /**
-     * Whether - if a Group Row - it is currently expanded
+     * Is Row expanded (if a group row)
      */
     isExpanded?: boolean;
     /**
-     * Whether Row is a Row Group
+     * Is Row grouped
      */
     isGroup?: boolean;
+    /**
+     * Is Row selected
+     */
+    isSelected?: boolean;
+    /**
+     * Is Row displayed (ie. filtered, not necessarily in viewport)
+     */
+    isDisplayed?: boolean;
     /**
      * What level the Row is (if Row Grouping is active)
      */
-    level?: number;
+    rowGroupLevel?: number;
 }

package/src/PredefinedConfig/SystemState.d.ts

@@ -14,7 +14,6 @@ import { CachedQuery } from './QueryState';
 import { AdaptableFlashingAlert } from './Common/AdaptableFlashingAlert';
 import { TypeUuid } from './Uuid';
 import { SummaryOperation } from './Common/Enums';
-import { ProgressIndicator } from '../Utilities/Interface/ProgressIndicator';
 import { ExportCustomDestinationPopup } from './ExportState';
 export type { IPushPullReport, IPushPullDomain };
 export type { Glue42Report };
@@ -63,3 +62,7 @@ export interface SystemState extends InternalState, IPushPullState, Glue42State,
         suspendTime: Date;
     };
 }
+export interface ProgressIndicator {
+    active: boolean;
+    label: string;
+}

package/src/Redux/Store/AdaptableStore.js

@@ -43,6 +43,7 @@ const PreviewHelper_1 = require("../../Utilities/Helpers/PreviewHelper");
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
 const Emitter_1 = tslib_1.__importDefault(require("../../Utilities/Emitter"));
 const AdaptableToaster_1 = require("../../View/Components/Popups/AdaptableToaster");
+const SystemRedux_1 = require("../ActionsReducers/SystemRedux");
 exports.INIT_STATE = 'INIT_STATE';
 exports.LOAD_STATE = 'LOAD_STATE';
 const NON_PERSIST_ACTIONS = {
@@ -50,6 +51,9 @@ const NON_PERSIST_ACTIONS = {
     '@@INIT': true,
     '@@redux/init': true,
     [exports.INIT_STATE]: true,
+    // progress indicators should NOT interfere with state management as it may lead to race conditions due to load/persist state being async
+    [SystemRedux_1.SYSTEM_PROGRESS_INDICATOR_SHOW]: true,
+    [SystemRedux_1.SYSTEM_PROGRESS_INDICATOR_HIDE]: true,
 };
 exports.InitState = () => ({
     type: exports.INIT_STATE,

package/src/Strategy/AlertModule.js

@@ -272,7 +272,7 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     showAlertForDefinitions(dataChangedInfo, alertDefinitions = []) {
         alertDefinitions.forEach((alertDefinition) => {
             // might be better to do a single alert with all the messages?
-            this.api.alertApi.showAlert(this.api.columnApi.getFriendlyNameFromColumnId(dataChangedInfo.columnId), this.api.alertApi.getAlertDescription(alertDefinition), alertDefinition, dataChangedInfo);
+            this.api.alertApi.showAlert(this.api.columnApi.getFriendlyNameFromColumnId(dataChangedInfo.columnId), this.api.alertApi.getAlertDescription(alertDefinition, dataChangedInfo), alertDefinition, dataChangedInfo);
         });
     }
     showFlashingAlertsForDefinitions(dataChangedInfo, flashingAlertDefinitions = []) {

package/src/Strategy/ExportModule.d.ts

@@ -24,6 +24,4 @@ export declare class ExportModule extends AdaptableModuleBase implements IExport
     getTeamSharingAction(): TeamSharingImportInfo<Report>;
     private isEmptyReportData;
     private showEmptyExportWarning;
-    private showExportIndicator;
-    private hideExportIndicator;
 }

package/src/Strategy/ExportModule.js

@@ -14,7 +14,6 @@ const LoggingHelper_1 = require("../Utilities/Helpers/LoggingHelper");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
 const ObjectFactory_1 = require("../Utilities/ObjectFactory");
-const SystemRedux_1 = require("../Redux/ActionsReducers/SystemRedux");
 class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ExportModuleId, 'Export', 'export-data', 'ExportPopup', 'Export data from the Grid to numerous locations in numerous formatso', api);
@@ -53,68 +52,72 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         this.api.exportApi.editReports(reportsToEdit);
     }
     addContextMenuItems(menuContext) {
-        let menuItemClickFunction = undefined;
-        if (!menuContext.isRowGroupColumn && this.isModuleAvailable() && menuContext.selectedCellInfo) {
-            if (ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns) &&
-                ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.gridCells)) {
-                let selectedCellReport = this.api.exportApi.getReportByName(GeneralConstants_1.SELECTED_CELLS_REPORT);
-                let clickFunction = () => {
-                    this.export(selectedCellReport, Enums_1.ExportDestination.Excel);
-                };
-                menuItemClickFunction = this.createColumnMenuItemClickFunction('Export Selected Cells', this.moduleInfo.Glyph, clickFunction);
-            }
+        const canExport = !menuContext.isRowGroupColumn &&
+            this.isModuleAvailable() &&
+            menuContext.selectedCellInfo &&
+            ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.columns) &&
+            ArrayExtensions_1.default.IsNotNullOrEmpty(menuContext.selectedCellInfo.gridCells);
+        if (!canExport) {
+            return;
+        }
+        const selectedCellReport = this.api.exportApi.getReportByName(GeneralConstants_1.SELECTED_CELLS_REPORT);
+        const menuItems = [];
+        for (const destination of this.api.exportApi.getAvailableExportDestinations()) {
+            menuItems.push(this.createColumnMenuItemClickFunction(destination, this.moduleInfo.Glyph, () => this.export(selectedCellReport, destination)));
+        }
+        for (const customDestination of this.api.exportApi.getAllCustomDestination()) {
+            menuItems.push(this.createColumnMenuItemClickFunction(customDestination.name, this.moduleInfo.Glyph, () => this.export(selectedCellReport, customDestination.name)));
         }
-        return [menuItemClickFunction];
+        return [
+            {
+                label: 'Export Selected Cells',
+                isVisible: true,
+                icon: this.moduleInfo.Glyph,
+                subItems: menuItems,
+            },
+        ];
     }
     export(report, exportDestination) {
-        this.showExportIndicator(`${report.Name} Export in progress...`);
-        // setTimeout required to give the export indicator a head-start to render
-        setTimeout(() => {
+        this.api.internalApi.executeWithProgressIndicator(`${report.Name} Export in progress...`, () => {
             var _a;
-            try {
-                if (this.isCustomDestination(exportDestination)) {
-                    const customDestination = (_a = this.api.internalApi
-                        .getAdaptableOptions()
-                        .exportOptions.customDestinations) === null || _a === void 0 ? void 0 : _a.find((cd) => cd.name == exportDestination);
-                    if (customDestination === null || customDestination === void 0 ? void 0 : customDestination.form) {
-                        this.api.internalApi.dispatchReduxAction(SystemRedux.SystemExportCustomDestinationPopupShow({
-                            ReportName: report.Name,
-                            ExportDestination: customDestination,
-                        }));
-                    }
-                    else if (customDestination) {
-                        customDestination.onExport(report, this.api.internalApi.getReportService().getReportData(report));
-                    }
+            if (this.isCustomDestination(exportDestination)) {
+                const customDestination = (_a = this.api.internalApi
+                    .getAdaptableOptions()
+                    .exportOptions.customDestinations) === null || _a === void 0 ? void 0 : _a.find((cd) => cd.name == exportDestination);
+                if (customDestination === null || customDestination === void 0 ? void 0 : customDestination.form) {
+                    this.api.internalApi.dispatchReduxAction(SystemRedux.SystemExportCustomDestinationPopupShow({
+                        ReportName: report.Name,
+                        ExportDestination: customDestination,
+                    }));
                 }
-                else {
-                    switch (exportDestination) {
-                        case Enums_1.ExportDestination.Excel:
-                            if (report.Name === GeneralConstants_1.VISUAL_DATA_REPORT) {
-                                // WYSIWYG is fully delegated to the ag-grid excel export
-                                this.api.exportApi.exportVisualDataToExcel();
-                            }
-                            else {
-                                this.convertReportToExcel(report);
-                            }
-                            break;
-                        case Enums_1.ExportDestination.Clipboard:
-                            this.copyToClipboard(report);
-                            break;
-                        case Enums_1.ExportDestination.CSV:
-                            this.convertReportToCsv(report);
-                            break;
-                        case Enums_1.ExportDestination.JSON:
-                            this.convertReportToJSON(report);
-                            break;
-                    }
+                else if (customDestination) {
+                    customDestination.onExport(report, this.api.internalApi.getReportService().getReportData(report));
                 }
-                this.hideExportIndicator();
             }
-            catch (error) {
-                this.hideExportIndicator();
-                throw error;
+            else {
+                switch (exportDestination) {
+                    case Enums_1.ExportDestination.Excel:
+                        if (report.Name === GeneralConstants_1.VISUAL_DATA_REPORT) {
+                            // WYSIWYG is fully delegated to the ag-grid excel export
+                            this.api.exportApi.exportVisualDataToExcel();
+                        }
+                        else {
+                            this.convertReportToExcel(report);
+                        }
+                        break;
+                    case Enums_1.ExportDestination.Clipboard:
+                        this.copyToClipboard(report);
+                        break;
+                    case Enums_1.ExportDestination.CSV:
+                        this.convertReportToCsv(report);
+                        break;
+                    case Enums_1.ExportDestination.JSON:
+                        this.convertReportToJSON(report);
+                        break;
+                }
             }
-        }, 16);
+            this.api.internalApi.hideProgressIndicator();
+        });
     }
     isCustomDestination(exportDestination) {
         if (Object.values(Enums_1.ExportDestination).some((val) => val === exportDestination)) {
@@ -183,11 +186,5 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             alertDefinition: ObjectFactory_1.ObjectFactory.CreateInternalAlertDefinitionForMessages('Error'),
         }));
     }
-    showExportIndicator(label) {
-        this.api.internalApi.dispatchReduxAction(SystemRedux_1.SystemProgressIndicatorShow(label));
-    }
-    hideExportIndicator() {
-        this.api.internalApi.dispatchReduxAction(SystemRedux_1.SystemProgressIndicatorHide());
-    }
 }
 exports.ExportModule = ExportModule;

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -131,6 +131,7 @@ exports.DefaultAdaptableOptions = {
         useAdaptableQuickFilter: true,
         clearFiltersOnStartUp: false,
         quickFilterTrigger: 'mouseenter',
+        quickFilterValuesTrigger: 'mouseenter',
         filterActionOnUserDataChange: {
             applyFilter: GeneralConstants.FILTER_ALWAYS,
             throttleDelay: 0,

package/src/Utilities/Helpers/DateHelper.d.ts

@@ -6,5 +6,5 @@ export declare const isValidDate: (date: Date) => boolean;
  */
 export declare const isValueValidDate: (data: any) => boolean;
 export declare const dateToISO: (date: Date | number | string) => string;
-export declare const parseToISO: (date: string | Date | number, dateFormat: string) => string;
-export declare const parseDate: (date: string, dateFormat: string) => Date | undefined;
+export declare const parseToISO: (date: string | Date | number, dateFormat?: string) => string;
+export declare const parseDateValue: (dateValue: string | Date | number, dateFormat?: string) => Date | undefined;