@adaptabletools/adaptable-cjs 20.0.0-canary.2 → 20.0.0-canary.21

package/src/Utilities/Helpers/FormatHelper.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StringFormatter = exports.DateFormatter = exports.NumberFormatter = void 0;
 const tslib_1 = require("tslib");
 // TODO inspect why the following is erroring on angular build
-// import dateFnsFormat from 'date-fns/format';
-const format_1 = tslib_1.__importDefault(require("date-fns/format"));
+const date_fns_1 = require("date-fns");
 const sentence_case_1 = require("sentence-case");
 const GeneralConstants_1 = require("../Constants/GeneralConstants");
 const Helper_1 = tslib_1.__importDefault(require("./Helper"));
+const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
 function NumberFormatter(input, options = {}, rowNode, column, api) {
     let preparedInput;
     if (options.Content) {
@@ -103,7 +103,7 @@ function DateFormatter(input, options, strictFormatting = false) {
         if (typeof input === 'string') {
             input = new Date(input);
         }
-        return (0, format_1.default)(input, options?.Pattern || GeneralConstants_1.DEFAULT_DATE_FORMAT_PATTERN);
+        return (0, date_fns_1.format)(input, options?.Pattern || GeneralConstants_1.DEFAULT_DATE_FORMAT_PATTERN);
     }
     catch (error) {
         if (strictFormatting) {
@@ -117,20 +117,33 @@ function DateFormatter(input, options, strictFormatting = false) {
 }
 exports.DateFormatter = DateFormatter;
 function StringFormatter(input, options = {}, rowNode, column, api) {
+    let normalisedTextInput = input;
+    if (input != undefined && typeof input !== 'string') {
+        const warningMessage = column
+            ? `StringFormatter: input '${input}' from column ${column.columnId} (${column.dataType}) is not a string, but a ${typeof input}`
+            : `StringFormatter: input '${input}' is not a string, received ${typeof input}`;
+        if (api) {
+            api.logWarn(warningMessage);
+        }
+        else {
+            console.warn(warningMessage);
+        }
+        normalisedTextInput = `${input}`;
+    }
     let preparedInput;
     if (options.Content) {
         const context = {
             column,
             rowNode,
-            input,
+            input: normalisedTextInput,
             api,
         };
         preparedInput = formatPlaceholder(options.Content, context);
     }
     else {
-        preparedInput = input;
+        preparedInput = normalisedTextInput;
     }
-    if (preparedInput == null || preparedInput == undefined) {
+    if (StringExtensions_1.default.IsNullOrEmptyOrWhiteSpace(preparedInput)) {
         return undefined;
     }
     if (options.Empty) {

package/src/Utilities/ObjectFactory.js

@@ -180,6 +180,7 @@ function CreateEmptyReportSchedule() {
         Schedule: CreateEmptySchedule(),
         ReportName: GeneralConstants_1.EMPTY_STRING,
         ReportFormat: GeneralConstants_1.EMPTY_STRING,
+        ExportDestination: 'Download',
     };
 }
 exports.CreateEmptyReportSchedule = CreateEmptyReportSchedule;

package/src/Utilities/Services/Fdc3Service.d.ts

@@ -1,7 +1,7 @@
 import { IAdaptableService } from './Interface/IAdaptableService';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 import { Fdc3Options } from '../../AdaptableOptions/Fdc3Options';
-import { AppIdentifier, DesktopAgent, IntentResolution } from '@finos/fdc3';
+import { AppIdentifier, Channel, DesktopAgent, IntentResolution } from '@finos/fdc3';
 import { Context } from '@finos/fdc3/dist/context/ContextTypes';
 export declare class Fdc3Service implements IAdaptableService {
     private adaptableApi;
@@ -15,7 +15,7 @@ export declare class Fdc3Service implements IAdaptableService {
     destroy(): void;
     raiseIntent(intent: string, context: Context, app?: AppIdentifier): Promise<IntentResolution>;
     raiseIntentForContext(context: Context, app?: AppIdentifier): Promise<IntentResolution>;
-    broadcast(context: Context): Promise<void>;
+    broadcast(context: Context, channel?: Channel): Promise<void>;
     private logFdc3Event;
     private logFdc3Error;
     private getFdc3Api;

package/src/Utilities/Services/Fdc3Service.js

@@ -134,7 +134,7 @@ class Fdc3Service {
             this.logFdc3Error(error);
         }
     }
-    broadcast(context) {
+    broadcast(context, channel) {
         if (!this.getDesktopAgent()) {
             return;
         }
@@ -147,7 +147,12 @@ class Fdc3Service {
                 context,
             };
             this.adaptableApi.eventApi.emit('Fdc3Message', payload);
-            return this.getDesktopAgent().broadcast(context);
+            if (channel) {
+                return channel.broadcast(context);
+            }
+            else {
+                return this.getDesktopAgent().broadcast(context);
+            }
         }
         catch (error) {
             this.logFdc3Error(error);

package/src/Utilities/Services/ThemeService.d.ts

@@ -5,10 +5,10 @@ export declare class ThemeService implements IThemeService {
     private unsubscribe;
     private styleSheetObject;
     constructor(api: AdaptableApi);
+    destroy(): void;
     subscribe(): void;
     onThemeChanged: () => void;
     applyNewThemeVariables(theme: AdaptableTheme): void;
-    destroy(): void;
     showMissingThemeFiles(theme: AdaptableTheme): void;
     getDOMPrefferedColorScheme(): 'dark' | 'light';
     mapOsTheme(theme: AdaptableTheme | string): AdaptableTheme;

package/src/Utilities/Services/ThemeService.js

@@ -23,6 +23,11 @@ class ThemeService {
             ];
         }
     }
+    destroy() {
+        this.api = null;
+        this.unsubscribe();
+        document.adoptedStyleSheets = [...document.adoptedStyleSheets].filter((sheet) => sheet !== this.styleSheetObject);
+    }
     subscribe() {
         const themeChangedUnsubscribe = this.api.eventApi.on('ThemeChanged', this.onThemeChanged);
         const prefferedColorSchemeUnsubscribe = this.attachPrefferedColorSchemeListener();
@@ -47,11 +52,6 @@ class ThemeService {
         str += '}';
         this.styleSheetObject.replaceSync(str);
     }
-    destroy() {
-        this.api = null;
-        this.unsubscribe();
-        document.adoptedStyleSheets = [...document.adoptedStyleSheets].filter((sheet) => sheet !== this.styleSheetObject);
-    }
     showMissingThemeFiles(theme) {
         // run time defined theme
         // because it may be an empty theme

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizard.js

@@ -46,6 +46,47 @@ const ConfigurationWizard = (props) => {
                 delete newColumn.caption;
                 return newColumn;
             });
+            const columnDefs = adaptableConfig.gridOptions.columnDefs;
+            // handle the layout creation
+            let Layouts = newAdaptableOptions.predefinedConfig?.Layout?.Layouts || [];
+            const NewLayout = {
+                TableColumns: columnDefs.map((col) => col.colId ?? col.field),
+                Name: 'Default Layout',
+            };
+            let currentLayoutName = NewLayout.Name;
+            let found = false;
+            if (!Layouts.length) {
+                // no layouts, make this the only one
+                Layouts = [NewLayout];
+            }
+            else {
+                Layouts = Layouts.map((layout) => {
+                    if (found) {
+                        return layout;
+                    }
+                    if (layout.TableColumns?.length === 0) {
+                        // when finding the first empty layout
+                        // set its column to be those of the new layout
+                        found = true;
+                        // and grab the name so we can put it in the Layout.CurrentLayout state
+                        currentLayoutName = layout.Name;
+                        layout = { ...layout };
+                        layout.TableColumns = NewLayout.TableColumns;
+                    }
+                    return layout;
+                });
+                if (!found) {
+                    Layouts.push(NewLayout);
+                }
+            }
+            newAdaptableOptions.predefinedConfig = {
+                ...newAdaptableOptions.predefinedConfig,
+                Layout: {
+                    ...newAdaptableOptions.predefinedConfig.Layout,
+                    Layouts: Layouts,
+                    CurrentLayout: currentLayoutName,
+                },
+            };
             newAdaptableOptions.primaryKey = columnsHandle.current.getPrimaryKey();
         }
         const newAdaptableConfig = {

package/src/View/ColumnInfo/ColumnInfo.js

@@ -209,7 +209,6 @@ const ModuleView = (props) => {
             }, moduleInfo: moduleInfo, data: null, configEntities: null, onCloseWizard: handleWizardClose, onFinishWizard: handleWizardClose }))));
 };
 const ColumnInfo = (props) => {
-    //  const state = useSelector((state: AdaptableState) => state);
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const [selectedColumnId, setSelectedColumnId] = React.useState(props.selectedColumnId);
     const column = adaptable.api.columnApi.getColumnWithColumnId(selectedColumnId);

package/src/View/Comments/CommentsEditor.js

@@ -12,7 +12,7 @@ const CommentsRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/
 const InternalRedux_1 = require("../../Redux/ActionsReducers/InternalRedux");
 const AdaptableContext_1 = require("../AdaptableContext");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../Components/AdaptableInput"));
-const format_1 = tslib_1.__importDefault(require("date-fns/format"));
+const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
 // Edit Mode
 // [author] [edit, delete]
 // [text-editor] * this is different
@@ -52,6 +52,9 @@ const CommentsEditor = (props) => {
     if (!commentThread) {
         return null;
     }
+    const formatDate = (date, format) => {
+        return FormatHelper_1.default.DateFormatter(date, { Pattern: format });
+    };
     return (React.createElement(Panel_1.default, { color: "var(--ab-color-text-on-primary)", onClick: () => props.enableEditMode(), minWidth: 250, className: "ab-CommentPopup", onKeyDown: (event) => {
             if (event.key === 'Escape') {
                 api.commentApi.hideCommentsPopup();
@@ -79,7 +82,7 @@ const CommentsEditor = (props) => {
                     React.createElement(rebass_1.Flex, { mb: 2, alignItems: "center" },
                         React.createElement(rebass_1.Box, null,
                             React.createElement(rebass_1.Box, { "data-name": "comment-username", fontSize: 3, fontWeight: "bold" }, comment?.Author?.UserName),
-                            comment.Timestamp && (React.createElement(rebass_1.Box, { "data-name": "comment-timestamp", fontSize: 2 }, (0, format_1.default)(comment.Timestamp, api.commentApi.internalApi.getCommentsDateFormat())))),
+                            comment.Timestamp && (React.createElement(rebass_1.Box, { "data-name": "comment-timestamp", fontSize: 2 }, formatDate(comment.Timestamp, api.commentApi.internalApi.getCommentsDateFormat())))),
                         React.createElement(rebass_1.Box, { flex: 1 }),
                         React.createElement(SimpleButton_1.default, { variant: "text", icon: "edit", disabled: !isOwnComment || isReadOnlyModule, onClick: () => setActiveEditingComment(comment.Uuid) }),
                         React.createElement(SimpleButton_1.default, { variant: "text", icon: "delete", disabled: !isOwnComment || isReadOnlyModule, onClick: () => {

package/src/View/Comments/CommentsPopup.js

@@ -7,10 +7,10 @@ const react_redux_1 = require("react-redux");
 const InfiniteTable_1 = require("../../components/InfiniteTable");
 const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
 const rebass_1 = require("rebass");
-const format_1 = tslib_1.__importDefault(require("date-fns/format"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
+const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
 const tableDOMProps = {
     style: {
         minHeight: 160,
@@ -20,6 +20,9 @@ const tableDOMProps = {
 const CellComments = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Comment') === 'ReadOnly';
+    const formatDate = (date, format) => {
+        return FormatHelper_1.default.DateFormatter(date, { Pattern: format });
+    };
     const columnsMap = React.useMemo(() => {
         const columns = {
             author: {
@@ -31,7 +34,7 @@ const CellComments = (props) => {
                 field: 'Timestamp',
                 maxWidth: 150,
                 valueGetter: (params) => {
-                    return (0, format_1.default)(params.data.Timestamp, adaptable.api.commentApi.internalApi.getCommentsDateFormat());
+                    return formatDate(params.data.Timestamp, adaptable.api.commentApi.internalApi.getCommentsDateFormat());
                 },
             },
             text: {

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

@@ -6,7 +6,7 @@ interface ColumnFilterComponentProps {
     disabled?: boolean;
     predicate?: QlPredicate;
     predicateDefs: QlPredicateDef[];
-    onPredicateChange: (predicate: QlPredicate) => void;
+    onPredicateChange: (predicate: QlPredicate | null) => void;
     wrapperProps?: BoxProps;
 }
 export declare const ColumnFilterComponent: React.FunctionComponent<ColumnFilterComponentProps>;

package/src/View/Components/ColumnFilter/ColumnFilter.js

@@ -73,7 +73,9 @@ const ColumnFilterComponent = (props) => {
         setPredicateNotYetApplied(undefined);
     };
     const onPredicateChange = (predicate) => {
-        if (autoApplyColumnFilter) {
+        // even if autoApplyColumnFilter is false, when we explicitly clear the filter
+        // we want to apply the filter immediately
+        if (autoApplyColumnFilter || !predicate) {
             props.onPredicateChange(predicate);
         }
         else {
@@ -116,7 +118,7 @@ const ColumnFilterComponent = (props) => {
     return (React.createElement(React.Fragment, null,
         React.createElement(rebass_1.Flex, { m: 2 },
             React.createElement(AndOrInput, { onChange: onCombineChange, operator: currentPredicate.operator }),
-            React.createElement(SimpleButton_1.default, { ml: 2, onClick: () => onPredicateChange({ operator: 'AND', args: [] }) }, "Clear All")),
+            React.createElement(SimpleButton_1.default, { ml: 2, onClick: () => onPredicateChange(null) }, "Clear All")),
         React.createElement(rebass_1.Flex, { flexDirection: "column", className: "ab-ColumnFilter", flex: 1, minHeight: 0, ...props.wrapperProps },
             React.createElement(rebass_1.Box, { flex: 1, style: { overflow: 'auto' } },
                 currentPredicate.args.map((predicate, index) => {

package/src/View/Components/ColumnFilter/FloatingFilter.js

@@ -82,7 +82,7 @@ const FloatingFilter = (props) => {
                 } }))),
         isInlineEditable && (React.createElement(SimpleButton_1.default, { px: 0, onClick: () => {
                 adaptable.api.filterApi.columnFilterApi.internalApi.openColumnFilterPopup(props.columnId);
-            }, icon: "expand", variant: "text" })),
+            }, "data-name": "expand-filter", icon: "expand", variant: "text" })),
         (isMultiple ||
             !(0, utils_1.isPredicateEmpty)(props.predicate.args[0], singleFilterPredicateDef)) && (React.createElement(SimpleButton_1.default, { "data-name": "clear-filter", p: 0, variant: "text", onClick: handleClear, icon: "close" }))));
 };

package/src/View/Components/ColumnFilter/LayoutColumnFilter.js

@@ -21,7 +21,7 @@ const LayoutColumnFilter = (props) => {
             ...props.columnFilter,
             ColumnId: props.columnFilter.ColumnId,
             Predicates: newAdaptablePredicates,
-            PredicatesLogic: newPredicate.operator,
+            PredicatesOperator: newPredicate.operator,
         };
         props.onColumnFilterChange(newFilter);
     };

package/src/View/Components/ColumnFilter/useAdaptableFilterWrapper.d.ts

@@ -6,7 +6,7 @@ export declare const useAdaptableFilterWrapper: (columnId: string, handleOnChang
     qlPredicateDefs: import("@adaptabletools/adaptable/src/parser/src/predicate/types").QlPredicateDef[];
     columnFilter: ColumnFilter;
     handleClear: () => LayoutRedux.LayoutColumnFilterClearAction;
-    handlePredicateChange: (newPredicate: QlPredicate) => void;
+    handlePredicateChange: (newPredicate: QlPredicate | null) => void;
     handleOnChange: (adaptablePredicate: AdaptablePredicate[], logic?: QlLogicalOperator) => void;
     column: import("../../../types").AdaptableColumn<any>;
 };

package/src/View/Components/ColumnFilter/useAdaptableFilterWrapper.js

@@ -35,7 +35,7 @@ const useAdaptableFilterWrapper = (columnId, handleOnChangeOverride) => {
             ...columnFilter,
             ColumnId: columnId,
             Predicates: adaptablePredicate,
-            PredicatesLogic: logic,
+            PredicatesOperator: logic,
         };
         if (handleOnChangeOverride) {
             handleOnChangeOverride(newFilter);
@@ -46,11 +46,15 @@ const useAdaptableFilterWrapper = (columnId, handleOnChangeOverride) => {
                 : LayoutRedux.LayoutColumnFilterAdd(newFilter));
         }
     };
-    const handleClear = () => dispatch(LayoutRedux.LayoutColumnFilterClear(columnFilter));
+    const handleClear = React.useCallback(() => dispatch(LayoutRedux.LayoutColumnFilterClear(columnId)), [columnId]);
     /**
      * Converts a QlPredicate to an AdaptablePredicate and dispatches the change.
      */
     const handlePredicateChange = React.useCallback((newPredicate) => {
+        if (!newPredicate) {
+            handleClear();
+            return;
+        }
         const newAdaptablePredicates = newPredicate.args.map(utils_1.mapQlPredicateToAdaptablePredicate);
         handleOnChange(newAdaptablePredicates, newPredicate.operator);
     }, [columnId]);

package/src/View/Components/ColumnFilter/utils.js

@@ -75,7 +75,7 @@ const qlPredicateToString = (qlPredicate, predicateDefs) => {
 };
 exports.qlPredicateToString = qlPredicateToString;
 const isPredicateEmpty = (predicate, predicateDef) => {
-    if (!predicateDef.inputs || predicateDef.inputs.length === 0) {
+    if (!predicateDef?.inputs || predicateDef.inputs.length === 0) {
         return false;
     }
     return (!predicate ||
@@ -85,7 +85,7 @@ const isPredicateEmpty = (predicate, predicateDef) => {
 };
 exports.isPredicateEmpty = isPredicateEmpty;
 const mapColumnFilterToQlPredicate = (columnFilter, abColumn, qlPredicateDefs, columnFilterOptions) => {
-    const combinator = columnFilter?.PredicatesLogic ?? 'AND';
+    const combinator = columnFilter?.PredicatesOperator ?? 'AND';
     const qlPredicate = {
         operator: combinator,
         args: (columnFilter?.Predicates ?? []).map?.(exports.mapAdaptablePredicateToQlPredicate),

package/src/View/Components/FilterForm/ListBoxFilterForm.js

@@ -4,7 +4,7 @@ exports.ColumnValuesSelect = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const StringExtensions_1 = require("../../../Utilities/Extensions/StringExtensions");
-const isEqual_1 = tslib_1.__importDefault(require("date-fns/isEqual"));
+const date_fns_1 = require("date-fns");
 const DateHelper_1 = require("../../../Utilities/Helpers/DateHelper");
 const join_1 = tslib_1.__importDefault(require("../../../components/utils/join"));
 const Select_1 = require("../../../components/Select");
@@ -17,7 +17,7 @@ const ColumnValuesSelect = (props) => {
         let isActive = selectedColumnValues.indexOf(distinctValue.value) >= 0;
         // special case for date objects, need to check against string values
         if (!isActive && distinctValue.value && distinctValue.value instanceof Date) {
-            isActive = selectedColumnValues.some((dateStr) => (0, isEqual_1.default)((0, DateHelper_1.parseDateValue)(dateStr), (0, DateHelper_1.parseDateValue)(distinctValue.value)));
+            isActive = selectedColumnValues.some((dateStr) => (0, date_fns_1.isEqual)((0, DateHelper_1.parseDateValue)(dateStr), (0, DateHelper_1.parseDateValue)(distinctValue.value)));
         }
         const columnLabel = distinctValue.label;
         if (StringExtensions_1.StringExtensions.IsNullOrEmpty(columnLabel)) {
@@ -28,7 +28,7 @@ const ColumnValuesSelect = (props) => {
         }
         return true;
     });
-    const component = (React.createElement(Select_1.Select, { isMulti: true, searchable: true, closeMenuOnSelect: false, size: "small", menuStyle: {
+    const component = (React.createElement(Select_1.Select, { isMulti: true, showHeaderSelectionCheckbox: true, searchable: true, closeMenuOnSelect: false, size: "small", menuStyle: {
             minWidth: `var(--ab-cmp-select-column-menu-${column.columnId}__min-width, var(--ab-cmp-select-column-menu__min-width, 260px))`,
         }, ...props.selectProps, options: options, value: value, isLoading: props.isLoading, onChange: props.onChange }));
     return (React.createElement("div", { className: (0, join_1.default)(baseClassName, props.isLoading && `${baseClassName}--loading`), onKeyDownCapture: (e) => {

package/src/View/Dashboard/CustomToolbar.js

@@ -92,8 +92,8 @@ const CustomToolbarCmp = (props) => {
 exports.CustomToolbarCmp = CustomToolbarCmp;
 const CustomToolbarWrapper = (props) => {
     const { api } = (0, AdaptableContext_1.useAdaptable)();
-    return (React.createElement(PanelDashboard_1.PanelDashboard, { headerText: props.customToolbar.title ? props.customToolbar.title : '', showConfigureActionButton: props.customToolbar.toolbarActions?.find((b) => b == 'Configure') !=
-            undefined, showCloseActionButton: props.customToolbar.toolbarActions?.find((b) => b == 'Close') != undefined, onConfigure: () => {
+    return (React.createElement(PanelDashboard_1.PanelDashboard, { headerText: props.customToolbar.title ? props.customToolbar.title : '', showConfigureActionButton: props.customToolbar.toolbarActions?.find((b) => b == 'configure') !=
+            undefined, showCloseActionButton: props.customToolbar.toolbarActions?.find((b) => b == 'close') != undefined, onConfigure: () => {
             const customToolbarConfiguredInfo = {
                 ...api.internalApi.buildBaseContext(),
                 customToolbar: props.customToolbar,

package/src/View/DataChangeHistory/DataChangeHistoryPopup.js

@@ -58,7 +58,10 @@ class DataChangeHistoryPopupComponent extends React.Component {
                 this.props.api.dataChangeHistoryApi.clearDataChangeHistoryEntry(changeToBeUndone);
             }
         };
-        const currentAgGridTheme = this.props.api.themeApi.getAgGridCurrentThemeName();
+        const agGridThemeMode = this.props.api.internalApi
+            .getAdaptableInstance()
+            .agGridThemeAdapter.getAgGridThemeMode();
+        const currentAgGridTheme = agGridThemeMode === 'legacy' ? this.props.api.themeApi.getAgGridCurrentThemeName() : '';
         return (React.createElement(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() },
             React.createElement(rebass_1.Flex, { className: "ab-DataChangeHistoryPopup", flexDirection: "column", style: { height: '100%' } },
                 React.createElement(rebass_1.Flex, { style: {

package/src/View/Filter/FilterSummary.js

@@ -45,7 +45,7 @@ function mapStateToProps(state) {
 }
 function mapDispatchToProps(dispatch) {
     return {
-        onClearFilter: (columnFilter) => dispatch(LayoutRedux.LayoutColumnFilterClear(columnFilter)),
+        onClearFilter: (columnFilter) => dispatch(LayoutRedux.LayoutColumnFilterClear(columnFilter.ColumnId)),
         onClearPopupParams: () => dispatch(PopupRedux.PopupClearParam()),
         onShare: (entity, config) => dispatch(TeamSharingRedux.TeamSharingShare(entity, ModuleConstants.ColumnFilterModuleId, config)),
     };

package/src/View/GridInfo/GridInfoPopup/AdaptableObjectsSummary.js

@@ -3,13 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdaptableObjectsSummary = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const react_redux_1 = require("react-redux");
 const rebass_1 = require("rebass");
 const AdaptableContext_1 = require("../../AdaptableContext");
 const AdaptableObjectList_1 = require("../../Components/AdaptableObjectList");
+const useRerender_1 = require("../../../components/utils/useRerender");
+const react_1 = require("react");
 const AdaptableObjectsSummary = () => {
-    const state = (0, react_redux_1.useSelector)((state) => state);
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const rerender = (0, useRerender_1.useRerender)();
+    (0, react_1.useEffect)(() => {
+        return adaptable.api.eventApi.on('AdaptableStateChanged', rerender);
+    }, [adaptable]);
     const modules = adaptable.ModuleService.getModuleCollection();
     const baseClassName = 'ab-AdaptableObjectsSummary';
     return (React.createElement(rebass_1.Box, { className: baseClassName }, [...modules].map(([moduleName, module]) => {

package/src/View/GridInfo/GridInfoPopup/GridInfoPopup.js

@@ -14,7 +14,9 @@ const AdaptableObjectRow_1 = require("../../Components/AdaptableObjectRow");
 const PopupPanel_1 = require("../../Components/Popups/AdaptablePopup/PopupPanel");
 const AdaptableObjectsSummary_1 = require("./AdaptableObjectsSummary");
 const EnvVars_1 = require("../../../EnvVars");
-const version = EnvVars_1.ADAPTABLE_VERSION;
+const agGridModules_1 = require("../../../agGrid/agGridModules");
+const adaptableVersion = EnvVars_1.ADAPTABLE_VERSION;
+const agGridVersion = agGridModules_1.AG_GRID_VERSION;
 const GridInfoPopup = (props) => {
     const api = props.api;
     const CreateGridSummaries = (colItems) => {
@@ -37,7 +39,10 @@ const GridInfoPopup = (props) => {
             : null;
         const selectedRowInfo = api.gridApi.getSelectedRowInfo();
         if (api.optionsApi.getUserInterfaceOptions()?.showAdapTableVersion) {
-            returnRows.push(createReadOnlyColItem(colItems, 'AdapTable Version', version));
+            returnRows.push(createReadOnlyColItem(colItems, 'AdapTable Version', adaptableVersion));
+        }
+        if (api.optionsApi.getUserInterfaceOptions()?.showAgGridVersion) {
+            returnRows.push(createReadOnlyColItem(colItems, 'AG Grid Version', agGridVersion));
         }
         returnRows.push(createReadOnlyColItem(colItems, 'Sorted Columns', ArrayExtensions_1.default.IsNotNullOrEmpty(sorts) ? sorts.join('; ') : 'None'));
         returnRows.push(createReadOnlyColItem(colItems, 'Column Filters', columnFilterDescription));

package/src/View/Note/NotePopup.js

@@ -6,11 +6,11 @@ const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const InfiniteTable_1 = require("../../components/InfiniteTable");
 const NoteRedux_1 = require("../../Redux/ActionsReducers/NoteRedux");
-const format_1 = tslib_1.__importDefault(require("date-fns/format"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
 const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
+const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
 const tableDOMProps = {
     style: {
         height: '100%',
@@ -25,6 +25,9 @@ const NotePopup = (props) => {
         : StringExtensions_1.default.Humanize(adaptable.adaptableOptions.primaryKey);
     const allNotes = (0, react_redux_1.useSelector)((state) => (0, NoteRedux_1.GetAllNotesSelector)(state.Note));
     const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Note') === 'ReadOnly';
+    const formatDate = (date, format) => {
+        return FormatHelper_1.default.DateFormatter(date, { Pattern: format });
+    };
     const columnsMap = React.useMemo(() => {
         const columns = {
             primaryKey: {
@@ -47,7 +50,7 @@ const NotePopup = (props) => {
             timestamp: {
                 field: 'Timestamp',
                 valueGetter: (params) => {
-                    return (0, format_1.default)(params.data.Timestamp, adaptable.api.noteApi.internalApi.getNotesDateFormat());
+                    return formatDate(params.data.Timestamp, adaptable.api.noteApi.internalApi.getNotesDateFormat());
                 },
             },
             delete: {

package/src/View/QuickSearch/QuickSearchPopup.js

@@ -18,7 +18,7 @@ const useQuickSearchDebounced_1 = require("./useQuickSearchDebounced");
 const QuickSearchPopupComponent = (props) => {
     const [searchText, search] = (0, useQuickSearchDebounced_1.useQuickSearchDebounced)(props);
     const [state, setState] = (0, react_1.useState)({
-        RunQueryAfterQuickSearch: props.api.optionsApi.getQuickSearchOptions().filterResultsAfterQuickSearch,
+        RunQueryAfterQuickSearch: props.api.optionsApi.getQuickSearchOptions().filterGridAfterQuickSearch,
         EditedStyle: props.QuickSearchStyle,
     });
     const onUpdateStyle = (style) => {
@@ -27,7 +27,7 @@ const QuickSearchPopupComponent = (props) => {
     };
     const onQuickSearchBehaviourChange = (checked) => {
         setState({ ...state, RunQueryAfterQuickSearch: checked });
-        props.api.optionsApi.getAdaptableOptions().quickSearchOptions.filterResultsAfterQuickSearch =
+        props.api.optionsApi.getAdaptableOptions().quickSearchOptions.filterGridAfterQuickSearch =
             checked;
     };
     return (React.createElement(PopupPanel_1.PopupPanel, { headerText: props.moduleInfo.FriendlyName, glyphicon: props.moduleInfo.Glyph, infoLink: props.moduleInfo.HelpPage, infoLinkDisabled: !props.api.internalApi.isDocumentationLinksDisplayed() },

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsReport.d.ts

@@ -1,10 +1,12 @@
 import * as React from 'react';
+import { ExportDestinationType } from '../../../../AdaptableOptions/ExportOptions';
 import { Report, ReportFormatType, ReportSchedule } from '../../../../PredefinedConfig/ExportState';
 interface ReportScheduleProps {
     report: ReportSchedule;
     onChange: (reminder: ReportSchedule) => void;
     allReports: Report[];
     allFormats: ReportFormatType[];
+    allDestinations: ExportDestinationType[];
 }
 export declare const ScheduleSettingsReport: React.FunctionComponent<ReportScheduleProps>;
 export {};

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsReport.js

@@ -22,14 +22,24 @@ const ScheduleSettingsReport = (props) => {
             });
         },
     }));
+    const destinationOptions = props.allDestinations.map((destination) => ({
+        label: destination,
+        value: destination,
+        onClick: () => {
+            props.onChange({
+                ...props.report,
+                ExportDestination: destination,
+            });
+        },
+    }));
     return (React.createElement(rebass_1.Box, { "data-name": "schedule-settings-report" },
         React.createElement(Tabs_1.Tabs, { autoFocus: false, mb: 3 },
-            React.createElement(Tabs_1.Tabs.Tab, null, "Report Schedule Settings"),
+            React.createElement(Tabs_1.Tabs.Tab, null, "Report Settings"),
             React.createElement(Tabs_1.Tabs.Content, null,
                 React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, { label: "Export" },
                         React.createElement(rebass_1.Box, { maxWidth: 300 },
-                            React.createElement(Select_1.Select, { "data-name": "select-export", options: reportOptions, value: props?.report?.ReportName, placeholder: "Select Export", onChange: (value) => props.onChange({
+                            React.createElement(Select_1.Select, { "data-name": "select-report", options: reportOptions, value: props?.report?.ReportName, placeholder: "Select Export", onChange: (value) => props.onChange({
                                     ...props.report,
                                     ReportName: value,
                                 }) }))),
@@ -38,6 +48,12 @@ const ScheduleSettingsReport = (props) => {
                             React.createElement(Select_1.Select, { "data-name": "select-format", options: formatOptions, value: props?.report?.ReportFormat, placeholder: "Select Format", onChange: (value) => props.onChange({
                                     ...props.report,
                                     ReportFormat: value,
+                                }) }))),
+                    React.createElement(FormLayout_1.FormRow, { label: "Destination" },
+                        React.createElement(rebass_1.Box, { maxWidth: 300 },
+                            React.createElement(Select_1.Select, { "data-name": "select-destination", options: destinationOptions, value: props?.report?.ExportDestination, placeholder: "Select Format", onChange: (value) => props.onChange({
+                                    ...props.report,
+                                    ExportDestination: value,
                                 }) }))))))));
 };
 exports.ScheduleSettingsReport = ScheduleSettingsReport;

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsSummary.js

@@ -43,6 +43,10 @@ const getScheduleSettingsValues = (data) => {
                 label: 'Report Format',
                 value: report?.ReportFormat || 'Not Specified',
             },
+            {
+                label: 'Export Destination',
+                value: report?.ExportDestination || 'Download',
+            },
         ];
     }
     if (data.ScheduleType === Enums_1.ScheduleType.ipushpull) {

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsWizard.js

@@ -17,7 +17,8 @@ const ScheduleSettingsWizard = (props) => {
     }
     if (data?.ScheduleType === Enums_1.ScheduleType.Report) {
         const allFormats = api.exportApi.getAvailableSystemFormats();
-        return (React.createElement(ScheduleSettingsReport_1.ScheduleSettingsReport, { allReports: allReports ?? [], allFormats: allFormats ?? [], report: data, onChange: props.onChange }));
+        const allDestinations = api.exportApi.getAllExportDestinations();
+        return (React.createElement(ScheduleSettingsReport_1.ScheduleSettingsReport, { allReports: allReports ?? [], allFormats: allFormats ?? [], allDestinations: allDestinations ?? [], report: data, onChange: props.onChange }));
     }
     if (data?.ScheduleType === Enums_1.ScheduleType.ipushpull) {
         const ippApi = api.pluginsApi.getipushpullPluginApi();