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

package/src/View/Filter/FilterSummary.js

@@ -40,7 +40,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

@@ -1,11 +1,15 @@
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import { Box } from 'rebass';
 import { useAdaptable } from '../../AdaptableContext';
 import { AdaptableObjectList } from '../../Components/AdaptableObjectList';
+import { useRerender } from '../../../components/utils/useRerender';
+import { useEffect } from 'react';
 export const AdaptableObjectsSummary = () => {
-    const state = useSelector((state) => state);
     const adaptable = useAdaptable();
+    const rerender = useRerender();
+    useEffect(() => {
+        return adaptable.api.eventApi.on('AdaptableStateChanged', rerender);
+    }, [adaptable]);
     const modules = adaptable.ModuleService.getModuleCollection();
     const baseClassName = 'ab-AdaptableObjectsSummary';
     return (React.createElement(Box, { className: baseClassName }, [...modules].map(([moduleName, module]) => {

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

@@ -10,7 +10,9 @@ import { AdaptableObjectRow } from '../../Components/AdaptableObjectRow';
 import { PopupPanel } from '../../Components/Popups/AdaptablePopup/PopupPanel';
 import { AdaptableObjectsSummary } from './AdaptableObjectsSummary';
 import { ADAPTABLE_VERSION } from '../../../EnvVars';
-const version = ADAPTABLE_VERSION;
+import { AG_GRID_VERSION } from '../../../agGrid/agGridModules';
+const adaptableVersion = ADAPTABLE_VERSION;
+const agGridVersion = AG_GRID_VERSION;
 export const GridInfoPopup = (props) => {
     const api = props.api;
     const CreateGridSummaries = (colItems) => {
@@ -33,7 +35,10 @@ export 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.IsNotNullOrEmpty(sorts) ? sorts.join('; ') : 'None'));
         returnRows.push(createReadOnlyColItem(colItems, 'Column Filters', columnFilterDescription));

package/src/View/Note/NotePopup.js

@@ -2,11 +2,11 @@ import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { DataSource, InfiniteTable } from '../../components/InfiniteTable';
 import { GetAllNotesSelector } from '../../Redux/ActionsReducers/NoteRedux';
-import dateFnsFormat from 'date-fns/format';
 import { useAdaptable } from '../AdaptableContext';
 import { AdaptableButtonComponent } from '../Components/AdaptableButton';
 import { PopupPanel } from '../Components/Popups/AdaptablePopup/PopupPanel';
 import StringExtensions from '../../Utilities/Extensions/StringExtensions';
+import FormatHelper from '../../Utilities/Helpers/FormatHelper';
 const tableDOMProps = {
     style: {
         height: '100%',
@@ -21,6 +21,9 @@ export const NotePopup = (props) => {
         : StringExtensions.Humanize(adaptable.adaptableOptions.primaryKey);
     const allNotes = useSelector((state) => GetAllNotesSelector(state.Note));
     const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Note') === 'ReadOnly';
+    const formatDate = (date, format) => {
+        return FormatHelper.DateFormatter(date, { Pattern: format });
+    };
     const columnsMap = React.useMemo(() => {
         const columns = {
             primaryKey: {
@@ -43,7 +46,7 @@ export const NotePopup = (props) => {
             timestamp: {
                 field: 'Timestamp',
                 valueGetter: (params) => {
-                    return dateFnsFormat(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

@@ -14,7 +14,7 @@ import { useQuickSearchDebounced } from './useQuickSearchDebounced';
 const QuickSearchPopupComponent = (props) => {
     const [searchText, search] = useQuickSearchDebounced(props);
     const [state, setState] = useState({
-        RunQueryAfterQuickSearch: props.api.optionsApi.getQuickSearchOptions().filterResultsAfterQuickSearch,
+        RunQueryAfterQuickSearch: props.api.optionsApi.getQuickSearchOptions().filterGridAfterQuickSearch,
         EditedStyle: props.QuickSearchStyle,
     });
     const onUpdateStyle = (style) => {
@@ -23,7 +23,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, { 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

@@ -18,14 +18,24 @@ export const ScheduleSettingsReport = (props) => {
             });
         },
     }));
+    const destinationOptions = props.allDestinations.map((destination) => ({
+        label: destination,
+        value: destination,
+        onClick: () => {
+            props.onChange({
+                ...props.report,
+                ExportDestination: destination,
+            });
+        },
+    }));
     return (React.createElement(Box, { "data-name": "schedule-settings-report" },
         React.createElement(Tabs, { autoFocus: false, mb: 3 },
-            React.createElement(Tabs.Tab, null, "Report Schedule Settings"),
+            React.createElement(Tabs.Tab, null, "Report Settings"),
             React.createElement(Tabs.Content, null,
                 React.createElement(FormLayout, null,
                     React.createElement(FormRow, { label: "Export" },
                         React.createElement(Box, { maxWidth: 300 },
-                            React.createElement(Select, { "data-name": "select-export", options: reportOptions, value: props?.report?.ReportName, placeholder: "Select Export", onChange: (value) => props.onChange({
+                            React.createElement(Select, { "data-name": "select-report", options: reportOptions, value: props?.report?.ReportName, placeholder: "Select Export", onChange: (value) => props.onChange({
                                     ...props.report,
                                     ReportName: value,
                                 }) }))),
@@ -34,5 +44,11 @@ export const ScheduleSettingsReport = (props) => {
                             React.createElement(Select, { "data-name": "select-format", options: formatOptions, value: props?.report?.ReportFormat, placeholder: "Select Format", onChange: (value) => props.onChange({
                                     ...props.report,
                                     ReportFormat: value,
+                                }) }))),
+                    React.createElement(FormRow, { label: "Destination" },
+                        React.createElement(Box, { maxWidth: 300 },
+                            React.createElement(Select, { "data-name": "select-destination", options: destinationOptions, value: props?.report?.ExportDestination, placeholder: "Select Format", onChange: (value) => props.onChange({
+                                    ...props.report,
+                                    ExportDestination: value,
                                 }) }))))))));
 };

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

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

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

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

package/src/View/StatusBar/AdaptableStatusBar.js

@@ -1,16 +1,18 @@
 import * as React from 'react';
+import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Flex } from 'rebass';
 import { getStatusPanelsSelector } from '../../Redux/ActionsReducers/StatusBarRedux';
 import { useAdaptable } from '../AdaptableContext';
 import { StatusBarPanel } from './StatusBarPanel';
+import { useRerender } from '../../components/utils/useRerender';
 export const AdaptableStatusBar = (props) => {
-    /**
-     * All state is selected so the Status Bar is re-rendered for all adaptable state changes
-     */
-    const state = useSelector((state) => state);
-    const statusPanels = getStatusPanelsSelector(state);
     const adaptable = useAdaptable();
+    const rerender = useRerender();
+    useEffect(() => {
+        return adaptable.api.eventApi.on('AdaptableStateChanged', rerender);
+    }, [adaptable]);
+    const statusPanels = useSelector(getStatusPanelsSelector);
     const dispatch = useDispatch();
     const statusSubPanels = statusPanels.find((statusPanel) => statusPanel.Key === props.context.Key);
     const allMenuItems = useSelector((state) => state?.Internal?.SettingsPanelModuleEntries);

package/src/View/StyledColumn/Wizard/StyledColumnSparklineSettingsSection.d.ts

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { StyledColumn } from '../../../types';
-export interface StyledColumnSparklineSettingsSectionProps {
+import type { StyledColumn } from '../../../types';
+export declare const StyledColumnSparklineSettingsSection: React.FC<{
     onChange: (data: StyledColumn) => void;
-}
-export declare const StyledColumnSparklineSettingsSection: React.FunctionComponent<StyledColumnSparklineSettingsSectionProps>;
+}>;