@adaptabletools/adaptable-cjs 18.0.0-canary.11 → 18.0.0-canary.13

package/src/View/Layout/Wizard/LayoutWizard.js

@@ -18,6 +18,7 @@ const AggregationsSection_1 = require("./sections/AggregationsSection");
 const SortSection_1 = require("./sections/SortSection");
 const FilterSection_1 = require("./sections/FilterSection");
 const GridFilterSection_1 = require("./sections/GridFilterSection");
+const RowSummarySection_1 = require("./sections/RowSummarySection");
 const LayoutWizard = (props) => {
     var _a, _b;
     const dispatch = (0, react_redux_1.useDispatch)();
@@ -37,8 +38,9 @@ const LayoutWizard = (props) => {
             preparedLayout = ObjectFactory_1.default.CreateEmptyLayout({ Name: '' });
         }
         if (preparedLayout.SuppressAggFuncInHeader === undefined) {
-            preparedLayout.SuppressAggFuncInHeader =
-                !!adaptable.agGridAdapter.initialGridOptions.suppressAggFuncInHeader;
+            preparedLayout.SuppressAggFuncInHeader = !!adaptable.agGridAdapter
+                .getAgGridApi()
+                .getGridOption('suppressAggFuncInHeader');
         }
         return preparedLayout;
     });
@@ -110,6 +112,13 @@ const LayoutWizard = (props) => {
                 render: () => (React.createElement(rebass_1.Box, { p: 2, style: { height: '100%' } },
                     React.createElement(RowGroupingSection_1.RowGroupingSection, { onChange: setLayout }))),
             },
+            {
+                title: 'Row Summaries',
+                details: 'Configure Row Summaries',
+                renderSummary: () => React.createElement(RowGroupingSection_1.RowGroupingSectionSummary, null),
+                render: () => (React.createElement(rebass_1.Box, { p: 2, style: { height: '100%' } },
+                    React.createElement(RowSummarySection_1.RowSummarySection, { onChange: setLayout }))),
+            },
             {
                 title: 'Aggregations',
                 isVisible: () => layoutSupportedFeatures.AggregationColumns,

package/src/View/Layout/Wizard/sections/RowSummarySection.d.ts

@@ -0,0 +1,8 @@
+import * as React from 'react';
+import { Layout } from '../../../../../types';
+export declare const RowGroupingSectionSummary: React.FunctionComponent;
+interface RowSummarySectionProps {
+    onChange: (data: Layout) => void;
+}
+export declare const RowSummarySection: React.FunctionComponent<RowSummarySectionProps>;
+export {};

package/src/View/Layout/Wizard/sections/RowSummarySection.js

@@ -0,0 +1,146 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RowSummarySection = exports.RowGroupingSectionSummary = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const rebass_1 = require("rebass");
+const FormLayout_1 = tslib_1.__importStar(require("../../../../components/FormLayout"));
+const Panel_1 = tslib_1.__importDefault(require("../../../../components/Panel"));
+const Select_1 = require("../../../../components/Select");
+const SimpleButton_1 = tslib_1.__importDefault(require("../../../../components/SimpleButton"));
+const Tabs_1 = require("../../../../components/Tabs");
+const Tag_1 = require("../../../../components/Tag");
+const adaptableQlUtils_1 = require("../../../../Utilities/adaptableQlUtils");
+const ModuleConstants_1 = require("../../../../Utilities/Constants/ModuleConstants");
+const SummaryService_1 = require("../../../../Utilities/Services/SummaryService");
+const sortWithOrder_1 = require("../../../../Utilities/sortWithOrder");
+const AdaptableContext_1 = require("../../../AdaptableContext");
+const ValueSelector_1 = require("../../../Components/ValueSelector");
+const OnePageAdaptableWizard_1 = require("../../../Wizard/OnePageAdaptableWizard");
+const Utilities_1 = require("./Utilities");
+const getAvailableExpressionsForColumnType = (columnType, availableScalarExpressions) => {
+    const inputType = (0, adaptableQlUtils_1.mapColumnDataTypeToExpressionFunctionType)(columnType);
+    return Object.entries(availableScalarExpressions !== null && availableScalarExpressions !== void 0 ? availableScalarExpressions : {})
+        .map(([expression, expressionDef]) => {
+        var _a, _b;
+        let firstArg = null;
+        if (!SummaryService_1.summarySupportedExpressions.includes(expression)) {
+            return null;
+        }
+        if (Array.isArray((_a = expressionDef === null || expressionDef === void 0 ? void 0 : expressionDef.inputs) === null || _a === void 0 ? void 0 : _a[0])) {
+            // @ts-ignore
+            firstArg = (_b = expressionDef.inputs.find((input) => input.includes(inputType))) === null || _b === void 0 ? void 0 : _b[0];
+        }
+        else {
+            firstArg = expressionDef.inputs[0];
+        }
+        if (inputType === firstArg) {
+            return expression;
+        }
+        else {
+            return null;
+        }
+    })
+        .filter(Boolean);
+};
+const RowGroupingSectionSummary = () => {
+    var _a;
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+    return (React.createElement(rebass_1.Box, null, ((_a = layout.RowGroupedColumns) === null || _a === void 0 ? void 0 : _a.length) ? (layout.RowGroupedColumns.map((columnId) => (React.createElement(Tag_1.Tag, { mr: 1, key: columnId }, adaptable.api.columnApi.getFriendlyNameForColumnId(columnId))))) : (React.createElement(Tag_1.Tag, null, "No Row Grouping"))));
+};
+exports.RowGroupingSectionSummary = RowGroupingSectionSummary;
+const RowSummaryEditor = ({ rowSummary, onChange, availableScalarExpressions, onDelete, }) => {
+    const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const columns = React.useMemo(() => {
+        const colIds = adaptable.api.columnApi
+            .getColumns()
+            .filter((column) => {
+            var _a, _b;
+            if (!['Number', 'String'].includes(column.dataType))
+                return false;
+            return (_b = (_a = layout.Columns) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, column.columnId);
+        })
+            .map((c) => c.columnId);
+        return (0, sortWithOrder_1.sortWithOrderArray)(colIds, Object.keys(rowSummary.ColumnsMap), {
+            sortUnorderedItems: false,
+        }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
+    }, [rowSummary.ColumnsMap]);
+    return (React.createElement(Panel_1.default, { header: React.createElement(rebass_1.Flex, { style: { width: '100%' } },
+            React.createElement(rebass_1.Flex, { flex: 1, alignItems: "center" }, "Row Summary"),
+            React.createElement(SimpleButton_1.default, { icon: "delete", onClick: () => {
+                    onDelete();
+                } })), p: 2 },
+        React.createElement(FormLayout_1.default, null,
+            React.createElement(FormLayout_1.FormRow, { label: "Position" },
+                React.createElement(Select_1.Select, { options: [
+                        {
+                            label: 'Top',
+                            value: 'Top',
+                        },
+                        {
+                            label: 'Bottom',
+                            value: 'Bottom',
+                        },
+                    ], value: rowSummary.Position, onChange: (position) => {
+                        onChange(Object.assign(Object.assign({}, rowSummary), { Position: position }));
+                    } }))),
+        React.createElement(rebass_1.Flex, { flexDirection: 'column', mt: 2, mb: 1 },
+            React.createElement(rebass_1.Flex, { alignItems: "center", flex: 1, mb: 2 }, "Column Aggregations"),
+            React.createElement(Panel_1.default, { bodyProps: { maxHeight: '100%' }, style: { height: 360 } },
+                React.createElement(ValueSelector_1.ValueSelector, { style: { maxHeight: '100%' }, showFilterInput: true, filter: Utilities_1.columnFilter, toIdentifier: (column) => column.columnId, toLabel: (option) => { var _a; return (_a = option.friendlyName) !== null && _a !== void 0 ? _a : option.columnId; }, options: columns, xSelectedLabel: () => {
+                        return 'Active Aggregations:';
+                    }, toListLabel: (column) => {
+                        var _a, _b;
+                        const label = (_a = column.friendlyName) !== null && _a !== void 0 ? _a : column.columnId;
+                        if (!(column.columnId in ((_b = rowSummary.ColumnsMap) !== null && _b !== void 0 ? _b : {}))) {
+                            return label;
+                        }
+                        const expressionOptions = getAvailableExpressionsForColumnType(column.dataType, availableScalarExpressions).map((expression) => ({
+                            label: expression,
+                            value: expression,
+                        }));
+                        const expression = rowSummary.ColumnsMap[column.columnId];
+                        return (React.createElement(rebass_1.Flex, null,
+                            React.createElement(rebass_1.Flex, { mr: 2, alignItems: 'center' }, label),
+                            React.createElement(Select_1.Select, { value: expression, options: expressionOptions, onChange: (expression) => {
+                                    onChange(Object.assign(Object.assign({}, rowSummary), { ColumnsMap: Object.assign(Object.assign({}, rowSummary.ColumnsMap), { [column.columnId]: expression }) }));
+                                } })));
+                    }, value: Object.keys(rowSummary.ColumnsMap), onChange: (colIds) => {
+                        const newColumnsMap = {};
+                        colIds.forEach((colId) => {
+                            var _a;
+                            newColumnsMap[colId] = (_a = rowSummary.ColumnsMap[colId]) !== null && _a !== void 0 ? _a : null;
+                        });
+                        onChange(Object.assign(Object.assign({}, rowSummary), { ColumnsMap: newColumnsMap }));
+                    } })))));
+};
+const RowSummarySection = (props) => {
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+    const availableScalarExpressions = React.useMemo(() => {
+        return adaptable.api.internalApi
+            .getQueryLanguageService()
+            .getModuleExpressionFunctionsMap(ModuleConstants_1.LayoutModuleId).aggregatedScalarFunctions;
+    }, []);
+    return (React.createElement(Tabs_1.Tabs, { style: { height: '100%' } },
+        React.createElement(Tabs_1.Tabs.Tab, null, "Row Summaries"),
+        React.createElement(Tabs_1.Tabs.Content, null,
+            React.createElement("div", null,
+                React.createElement(rebass_1.Flex, { mb: 1 },
+                    React.createElement(rebass_1.Flex, { flex: 1 }),
+                    React.createElement(SimpleButton_1.default, { icon: "plus" }, "Add Row Summary")),
+                layout.RowSummaries.map((rowSummary, index) => {
+                    return (React.createElement(RowSummaryEditor, { key: index, onDelete: () => {
+                            const newSummaries = [...layout.RowSummaries];
+                            newSummaries.splice(index, 1);
+                            props.onChange(Object.assign(Object.assign({}, layout), { RowSummaries: newSummaries }));
+                        }, availableScalarExpressions: availableScalarExpressions, rowSummary: rowSummary, onChange: (rowSummary) => {
+                            const newSummaries = [...layout.RowSummaries];
+                            newSummaries[index] = rowSummary;
+                            props.onChange(Object.assign(Object.assign({}, layout), { RowSummaries: newSummaries }));
+                        } }));
+                })))));
+};
+exports.RowSummarySection = RowSummarySection;

package/src/View/Note/NotePopup.d.ts

@@ -0,0 +1,2 @@
+import * as React from 'react';
+export declare const NotePopup: React.FunctionComponent;

package/src/View/{Notes/NotesPopup.js → Note/NotePopup.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NotesPopup = void 0;
+exports.NotePopup = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const InfiniteTable_1 = require("../../components/InfiniteTable");
-const NotesRedux_1 = require("../../Redux/ActionsReducers/NotesRedux");
+const NoteRedux_1 = require("../../Redux/ActionsReducers/NoteRedux");
 const AdaptableContext_1 = require("../AdaptableContext");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
 const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
@@ -16,10 +16,10 @@ const tableDOMProps = {
         // minHeight: 600,
     },
 };
-const NotesPopup = (props) => {
+const NotePopup = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const primaryKeyHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(adaptable.api.columnApi.getPrimaryKeyColumn().columnId);
-    const allNotes = (0, react_redux_1.useSelector)((state) => (0, NotesRedux_1.GetAllNotesSelector)(state.Notes));
+    const allNotes = (0, react_redux_1.useSelector)((state) => (0, NoteRedux_1.GetAllNotesSelector)(state.Note));
     const columnsMap = React.useMemo(() => {
         const columns = {
             primaryKey: {
@@ -49,8 +49,8 @@ const NotesPopup = (props) => {
                 defaultWidth: 50,
                 render: (params) => {
                     return (React.createElement(AdaptableButton_1.AdaptableButtonComponent, { variant: "text", icon: "delete", onClick: () => {
-                            const note = adaptable.api.notesApi.getNoteByUuid(params.data.Uuid);
-                            adaptable.api.notesApi.deleteNote(note);
+                            const note = adaptable.api.noteApi.getNoteByUuid(params.data.Uuid);
+                            adaptable.api.noteApi.deleteNote(note);
                         } }));
                 },
             },
@@ -66,7 +66,7 @@ const NotesPopup = (props) => {
                             const data = change.data;
                             const prevNote = allNotes.find((x) => x.Uuid === uuid);
                             if (prevNote.Text !== data.Text) {
-                                adaptable.api.notesApi.updateNoteText(data.Text, prevNote);
+                                adaptable.api.noteApi.updateNoteText(data.Text, prevNote);
                             }
                         }
                     }
@@ -83,4 +83,4 @@ const NotesPopup = (props) => {
                     alwaysReserveSpaceForSortIcon: false,
                 }, rowHeight: 40, columnHeaderHeight: 65, domProps: tableDOMProps, columns: columnsMap }))));
 };
-exports.NotesPopup = NotesPopup;
+exports.NotePopup = NotePopup;

package/src/View/SpecialColumnSettingsWizardStep.js

@@ -13,7 +13,7 @@ const AdaptableContext_1 = require("./AdaptableContext");
 const SpecialColumnSettingsWizardStep = (props) => {
     var _a, _b, _c;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const possibleColumnTypes = (_a = adaptable.api.optionsApi.getColumnTypes()) !== null && _a !== void 0 ? _a : [];
+    const possibleColumnTypes = (_a = adaptable.api.columnApi.getColumnTypes()) !== null && _a !== void 0 ? _a : [];
     const { Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable, SuppressMenu, SuppressMovable, } = (_b = props.settings) !== null && _b !== void 0 ? _b : {};
     const handleColumnTypeChange = (columnType, checked) => {
         var _a, _b, _c;

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -300,6 +300,8 @@ export declare class AdaptableAgGrid implements IAdaptable {
     canExportToExcel(): boolean;
     exportToExcel(reportData: ReportData, fileName: string): void;
     exportVisualDataToExcel(): void;
+    private processRowGroupForExcelExport;
+    private processCellForExcelExport;
     isQuickFilterAvailable(): boolean;
     private hasFloatingFilterOnAtLeastOneColumn;
     getChartRef(chartId: string): ChartRef;

package/src/agGrid/AdaptableAgGrid.js

@@ -63,12 +63,12 @@ const ColumnInfoModule_1 = require("../Strategy/ColumnInfoModule");
 const SettingsPanelModule_1 = require("../Strategy/SettingsPanelModule");
 const StatusBarModule_1 = require("../Strategy/StatusBarModule");
 const ChartingModule_1 = require("../Strategy/ChartingModule");
-const NotesModule_1 = require("../Strategy/NotesModule");
+const NoteModule_1 = require("../Strategy/NoteModule");
 const StyledColumnModule_1 = require("../Strategy/StyledColumnModule");
 const Fdc3Module_1 = require("../Strategy/Fdc3Module");
 const GridFilterModule_1 = require("../Strategy/GridFilterModule");
 const NamedQueryModule_1 = require("../Strategy/NamedQueryModule");
-const CommentsModule_1 = require("../Strategy/CommentsModule");
+const CommentModule_1 = require("../Strategy/CommentModule");
 const AdaptableNumberEditor_1 = require("./editors/AdaptableNumberEditor");
 const AdaptableDateEditor_1 = require("./editors/AdaptableDateEditor");
 const Helper_1 = require("../Utilities/Helpers/Helper");
@@ -364,7 +364,7 @@ class AdaptableAgGrid {
         this.api.themeApi.applyCurrentTheme();
         this.validatePrimaryKey();
         this.embedColumnMenu = this.agGridAdapter.isModulePresent(core_1.ModuleNames.MenuModule);
-        this.api.internalApi.setTreeMode(this.agGridAdapter.initialGridOptions.treeData);
+        this.api.internalApi.setTreeMode(!!this.agGridAdapter.getAgGridApi().getGridOption('treeData'));
         // TODO AFL MIG: we could just patch the defautl Layout on init? instead
         this.checkShouldClearExistingFiltersOrSearches();
         this.applyColumnFiltering();
@@ -890,6 +890,13 @@ class AdaptableAgGrid {
             }
             return original_floatingFiltersHeight;
         });
+        /**
+         * `excelStyles`
+         */
+        this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'excelStyles', (original_excelStyles) => {
+            // we need this here just to register the original excelStyles in the service
+            return original_excelStyles;
+        });
         /**
          * `columnTypes`
          */
@@ -1062,7 +1069,7 @@ class AdaptableAgGrid {
         return resultColDefs;
     }
     useRowNodeLookUp() {
-        return this.agGridAdapter.initialGridOptions.getRowId != undefined;
+        return this.agGridAdapter.getAgGridApi().getGridOption('getRowId') != undefined;
     }
     getAgGridContainerElement() {
         if (!this.DANGER_USE_GETTER_agGridContainerElement) {
@@ -1109,8 +1116,8 @@ class AdaptableAgGrid {
         return selectedRowInfo;
     }
     isGridSelectable() {
-        return (this.agGridAdapter.initialGridOptions.rowSelection === 'single' ||
-            this.agGridAdapter.initialGridOptions.rowSelection === 'multiple');
+        const rowSelection = this.agGridAdapter.getAgGridApi().getGridOption('rowSelection');
+        return rowSelection === 'single' || rowSelection === 'multiple';
     }
     initAdaptableStore() {
         const perfNewAdaptableStore = this.logger.beginPerf(`initAdaptableStore()`);
@@ -1578,7 +1585,7 @@ class AdaptableAgGrid {
         modules.set(ModuleConstants.ChartingModuleId, new ChartingModule_1.ChartingModule(this.api));
         modules.set(ModuleConstants.ColumnFilterModuleId, new ColumnFilterModule_1.ColumnFilterModule(this.api));
         modules.set(ModuleConstants.ColumnInfoModuleId, new ColumnInfoModule_1.ColumnInfoModule(this.api));
-        modules.set(ModuleConstants.CommentsModuleId, new CommentsModule_1.CommentsModule(this.api));
+        modules.set(ModuleConstants.CommentModuleId, new CommentModule_1.CommentModule(this.api));
         modules.set(ModuleConstants.CustomSortModuleId, new CustomSortModule_1.CustomSortModule(this.api));
         modules.set(ModuleConstants.DashboardModuleId, new DashboardModule_1.DashboardModule(this.api));
         modules.set(ModuleConstants.DataChangeHistoryModuleId, new DataChangeHistoryModule_1.DataChangeHistoryModule(this.api));
@@ -1593,7 +1600,7 @@ class AdaptableAgGrid {
         modules.set(ModuleConstants.GridInfoModuleId, new GridInfoModule_1.GridInfoModule(this.api));
         modules.set(ModuleConstants.LayoutModuleId, new LayoutModule_1.LayoutModule(this.api));
         modules.set(ModuleConstants.NamedQueryModuleId, new NamedQueryModule_1.NamedQueryModule(this.api));
-        modules.set(ModuleConstants.NotesModuleId, new NotesModule_1.NotesModule(this.api));
+        modules.set(ModuleConstants.NoteModuleId, new NoteModule_1.NoteModule(this.api));
         modules.set(ModuleConstants.PlusMinusModuleId, new PlusMinusModule_1.PlusMinusModule(this.api));
         modules.set(ModuleConstants.QuickSearchModuleId, new QuickSearchModule_1.QuickSearchModule(this.api));
         modules.set(ModuleConstants.ScheduleModuleId, new ScheduleModule_1.ScheduleModule(this.api));
@@ -1618,7 +1625,9 @@ class AdaptableAgGrid {
         this.api.eventApi.on('AdaptableReady', () => {
             var _a, _b;
             // update status bar state
-            const adaptableStatusPanels = (_b = (_a = this.agGridAdapter.initialGridOptions.statusBar) === null || _a === void 0 ? void 0 : _a.statusPanels) === null || _b === void 0 ? void 0 : _b.filter((statusPanel) => this.adaptableStatusPanelKeys.includes(statusPanel.key));
+            const adaptableStatusPanels = (_b = (_a = this.agGridAdapter
+                .getAgGridApi()
+                .getGridOption('statusBar')) === null || _a === void 0 ? void 0 : _a.statusPanels) === null || _b === void 0 ? void 0 : _b.filter((statusPanel) => this.adaptableStatusPanelKeys.includes(statusPanel.key));
             const statusBarModule = this.ModuleService.getModuleById(ModuleConstants.StatusBarModuleId);
             // need to add only the adaptable panels
             statusBarModule.syncStateWithOptions(adaptableStatusPanels);
@@ -2411,10 +2420,10 @@ class AdaptableAgGrid {
         });
     }
     getAgGridRowModelType() {
-        var _a, _b;
+        var _a;
         // it seems that this can be null so we need explicitly to return "clientSide" in this case
         // need to check that for ServerSideRowModel it is ALWAYS returned...
-        return (_b = (_a = this.agGridAdapter.initialGridOptions) === null || _a === void 0 ? void 0 : _a.rowModelType) !== null && _b !== void 0 ? _b : 'clientSide';
+        return (_a = this.agGridAdapter.getAgGridApi().getGridOption('rowModelType')) !== null && _a !== void 0 ? _a : 'clientSide';
     }
     getAllRowNodes(config) {
         let rowNodes = [];
@@ -2537,7 +2546,7 @@ class AdaptableAgGrid {
     }
     canGenerateCharts() {
         return (this.agGridAdapter.isModulePresent(core_1.ModuleNames.GridChartsModule) &&
-            this.agGridAdapter.initialGridOptions.enableCharts);
+            this.agGridAdapter.getAgGridApi().getGridOption('enableCharts'));
     }
     canDisplaySparklines() {
         return this.agGridAdapter.isModulePresent(core_1.ModuleNames.SparklinesModule);
@@ -3052,52 +3061,82 @@ class AdaptableAgGrid {
         ephemeralGridApi.destroy();
     }
     exportVisualDataToExcel() {
-        // // add adaptable style props to user defined props
-        // this.setExcelStylesForExport();
-        //
-        // this.gridOptions.api.exportDataAsExcel({
-        //   sheetName: 'Sheet 1',
-        //   fileName: this.ReportService.getReportFileName(this.adaptableOptions.adaptableId, 'Excel'),
-        //   // delegate the cell value processing to Adaptable
-        //   processCellCallback: ({ node, column, value }: ProcessCellForExportParams): string => {
-        //     const columnId = column.getColId();
-        //     if (
-        //         node?.group &&
-        //         (this.api.columnApi.isAutoRowGroupColumn(columnId) ||
-        //             // we would still need to process the cell if this is a group row with an aggregated value
-        //             node?.aggData?.[columnId] == undefined)
-        //     ) {
-        //       // skip processing of row groups, this was already handled in processRowGroupCallback()
-        //       return value;
-        //     }
-        //     return this.processCellForExcelExport(node, columnId);
-        //   },
-        //   processRowGroupCallback: (params: ProcessRowGroupForExportParams): string => {
-        //     // recreating the standard AG Grid styling for row groups: 'Parent -> Child'
-        //     // additionally the values are formatted
-        //     let rowGroupNode = params.node;
-        //     const isFooterRow = rowGroupNode.footer;
-        //     const rowGroupSummary = [this.processRowGroupForExcelExport(rowGroupNode) ?? ''];
-        //     while (rowGroupNode.parent) {
-        //       rowGroupNode = rowGroupNode.parent;
-        //       const formattedParentNode = this.processRowGroupForExcelExport(rowGroupNode);
-        //       if (formattedParentNode) {
-        //         rowGroupSummary.push(formattedParentNode);
-        //       }
-        //     }
-        //
-        //     let summary = rowGroupSummary.reverse().join(' -> ');
-        //     if (isFooterRow) {
-        //       summary = `Total: ${summary}`;
-        //     }
-        //     return summary;
-        //   },
-        // });
-        //
-        // // keep only the user defined props
-        // this.setGridOptionsProperty('excelStyles', (userExcelStyles) => {
-        //   return userExcelStyles;
-        // });
+        try {
+            const exportExcelStyles = this.ReportService.buildExcelStylesForVisualReports();
+            this.agGridOptionsService.CAREFUL_patchGridOptionsProperty('excelStyles', exportExcelStyles);
+            this.agGridAdapter.getAgGridApi().exportDataAsExcel({
+                sheetName: 'Sheet 1',
+                fileName: this.ReportService.getReportFileName(this.adaptableOptions.adaptableId, 'Excel'),
+                // delegate the cell value processing to Adaptable
+                processCellCallback: ({ node, column, value }) => {
+                    var _a;
+                    const columnId = column.getColId();
+                    if ((node === null || node === void 0 ? void 0 : node.group) &&
+                        (this.api.columnApi.isAutoRowGroupColumn(columnId) ||
+                            // we would still need to process the cell if this is a group row with an aggregated value
+                            ((_a = node === null || node === void 0 ? void 0 : node.aggData) === null || _a === void 0 ? void 0 : _a[columnId]) == undefined)) {
+                        // skip processing of row groups, this was already handled in processRowGroupCallback()
+                        return value;
+                    }
+                    return this.processCellForExcelExport(node, columnId);
+                },
+                processRowGroupCallback: (params) => {
+                    var _a;
+                    // recreating the standard AG Grid styling for row groups: 'Parent -> Child'
+                    // additionally the values are formatted
+                    let rowGroupNode = params.node;
+                    const isFooterRow = rowGroupNode.footer;
+                    const rowGroupSummary = [(_a = this.processRowGroupForExcelExport(rowGroupNode)) !== null && _a !== void 0 ? _a : ''];
+                    while (rowGroupNode.parent) {
+                        rowGroupNode = rowGroupNode.parent;
+                        const formattedParentNode = this.processRowGroupForExcelExport(rowGroupNode);
+                        if (formattedParentNode) {
+                            rowGroupSummary.push(formattedParentNode);
+                        }
+                    }
+                    let summary = rowGroupSummary.reverse().join(' -> ');
+                    if (isFooterRow) {
+                        summary = `Total: ${summary}`;
+                    }
+                    return summary;
+                },
+            });
+            this.agGridOptionsService.revertGridOptionsPropertyToUserValue('excelStyles');
+        }
+        catch (error) {
+            this.logger.consoleError('Error exporting visual data to Excel', error);
+        }
+    }
+    processRowGroupForExcelExport(rowNode) {
+        var _a, _b, _c, _d, _e;
+        const columnId = (_c = (_a = rowNode.field) !== null && _a !== void 0 ? _a : (_b = rowNode.rowGroupColumn) === null || _b === void 0 ? void 0 : _b.getColId()) !== null && _c !== void 0 ? _c : (_e = (_d = rowNode.rowGroupColumn) === null || _d === void 0 ? void 0 : _d.getColDef()) === null || _e === void 0 ? void 0 : _e.field;
+        if (!columnId || !rowNode.key) {
+            return;
+        }
+        let rawValue = rowNode.key;
+        if (this.api.columnApi.getColumnDataTypeForColumnId(columnId) === 'Date' &&
+            typeof rawValue === 'string' &&
+            // rawValue is composed only of digits
+            /^\d+$/.test(rawValue)) {
+            // AG-Grid converts the value to string, we have to reconvert it back
+            const dateRawValue = parseInt(rawValue);
+            if (dateRawValue != undefined) {
+                // @ts-ignore
+                rawValue = dateRawValue;
+            }
+        }
+        return this.ReportService.getCellExportValueFromRawValue(rowNode, rawValue, columnId);
+    }
+    processCellForExcelExport(rowNode, columnId) {
+        if (this.api.exportApi.internalApi.isVisualDataExportInProgress()) {
+            const cellKey = this.agGridColumnAdapter.getExcelClassNameForCell(columnId, this.getPrimaryKeyValueFromRowNode(rowNode));
+            const isoFormattedDate = this.ReportService.getExcelStyleWithFormattedDate(cellKey);
+            if (isoFormattedDate) {
+                // this is a Date cell which will be formatted by Excel
+                return isoFormattedDate;
+            }
+        }
+        return this.ReportService.getCellExportValueFromRowNode(rowNode, columnId);
     }
     isQuickFilterAvailable() {
         if (this.api.layoutApi.getCurrentLayout().EnablePivot) {

package/src/agGrid/AgGridAdapter.d.ts

@@ -25,6 +25,7 @@ export declare class AgGridAdapter {
     getLiveGridOptions(): GridOptions | undefined;
     updateGridOptions(options: ManagedGridOptions): void;
     setGridOption<Key extends ManagedGridOptionKey>(key: Key, value: GridOptions[Key]): void;
+    getUserGridOptionsProperty<T extends keyof GridOptions>(propertyName: T): GridOptions[T];
     updateColumnFilterActiveState(): void;
     deriveSelectedCellInfoFromAgGrid(): SelectedCellInfo;
     deriveSelectedRowInfoFromAgGrid(): SelectedRowInfo;
@@ -59,4 +60,5 @@ export declare class AgGridAdapter {
      * Mutates the colDefs to ensure that each column has a colId
      */
     assignColumnIdsToColDefs(colDefs?: (ColDef | ColGroupDef)[]): void;
+    getDefaultColumnDefinition(): GridOptions['defaultColDef'];
 }

package/src/agGrid/AgGridAdapter.js

@@ -68,6 +68,9 @@ class AgGridAdapter {
         var _a;
         (_a = this.getAgGridApi()) === null || _a === void 0 ? void 0 : _a.setGridOption(key, value);
     }
+    getUserGridOptionsProperty(propertyName) {
+        return this.adaptableInstance.agGridOptionsService.getUserGridOptionsProperty(propertyName);
+    }
     updateColumnFilterActiveState() {
         var _a;
         const columnFilters = this.adaptableApi.columnFilterApi.getActiveColumnFilters();
@@ -578,5 +581,10 @@ class AgGridAdapter {
         };
         colDefs.forEach((colDef) => assignColId(colDef));
     }
+    getDefaultColumnDefinition() {
+        var _a, _b;
+        // for early init phase, gridApi might not be ready yet
+        return (_b = (_a = this.getAgGridApi(true)) === null || _a === void 0 ? void 0 : _a.getGridOption('defaultColDef')) !== null && _b !== void 0 ? _b : {};
+    }
 }
 exports.AgGridAdapter = AgGridAdapter;

package/src/agGrid/AgGridColumnAdapter.d.ts

@@ -30,7 +30,7 @@ export declare class AgGridColumnAdapter {
     private setupColumnEditable;
     private setupColumnValueSetter;
     private setupColumnComparator;
-    private getExcelClassNameForCell;
+    getExcelClassNameForCell(colId: string, primaryKeyValue: any, userDefinedCellClass?: string | string[]): string;
     private isQuickSearchActive;
     private getEditableCellClass;
     private getReadonlyCellClass;

package/src/agGrid/AgGridColumnAdapter.js

@@ -607,24 +607,24 @@ class AgGridColumnAdapter {
                     : undefined;
     }
     getNoteCellClassName(gridCell, params) {
-        if (!this.adaptableApi.internalApi.getModuleService().isModuleAvailable('Notes')) {
+        if (!this.adaptableApi.internalApi.getModuleService().isModuleAvailable('Note')) {
             return;
         }
-        if (!this.adaptableApi.notesApi.internalApi.areNotesAvailable()) {
+        if (!this.adaptableApi.noteApi.internalApi.areNotesAvailable()) {
             return;
         }
         const cellPosition = {
             PrimaryKeyValue: gridCell.primaryKeyValue,
             ColumnId: gridCell.column.columnId,
         };
-        const cellNotes = this.adaptableApi.notesApi.getCellNotes(cellPosition);
+        const cellNotes = this.adaptableApi.noteApi.getNotesForCell(cellPosition);
         if (!(cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length)) {
             return undefined;
         }
         return 'ab-Cell-Note';
     }
     getCommentCellClassName(gridCell, params) {
-        if (!this.adaptableApi.internalApi.getModuleService().isModuleAvailable('Comments')) {
+        if (!this.adaptableApi.internalApi.getModuleService().isModuleAvailable('Comment')) {
             return;
         }
         if (!this.adaptableApi.commentApi.internalApi.areCommentsAvailable()) {

package/src/agGrid/AgGridOptionsService.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableAgGrid } from './AdaptableAgGrid';
-import { GridOptions } from '@ag-grid-community/core';
+import { GridOptions, ManagedGridOptionKey } from '@ag-grid-community/core';
 export declare class AgGridOptionsService {
     private adaptableInstance;
     private gridOptionsPropertyCache;
@@ -7,6 +7,9 @@ export declare class AgGridOptionsService {
     constructor(adaptableInstance: AdaptableAgGrid);
     destroy(): void;
     setGridOptionsProperty<T extends keyof GridOptions>(gridOptions: GridOptions, propertyName: T, propertyGetter: (userPropertyValue: GridOptions[T]) => GridOptions[T] | undefined): GridOptions;
+    getUserGridOptionsProperty<T extends keyof GridOptions>(propertyName: T): GridOptions[T];
+    revertGridOptionsPropertyToUserValue(propertyName: ManagedGridOptionKey): void;
+    CAREFUL_patchGridOptionsProperty<T extends keyof GridOptions>(propertyName: T, value: GridOptions[T]): void;
     revertGridOptionsPropertiesToUserValue<T extends keyof GridOptions>(gridOptions: GridOptions, propertyNames: T[]): void;
     private get agGridAdapter();
 }

package/src/agGrid/AgGridOptionsService.js

@@ -43,6 +43,28 @@ class AgGridOptionsService {
         gridOptions[propertyName] = adaptableValue !== null && adaptableValue !== void 0 ? adaptableValue : userValue;
         return gridOptions;
     }
+    getUserGridOptionsProperty(propertyName) {
+        const userKey = `user.${propertyName}`;
+        return this.gridOptionsPropertyCache.get(userKey);
+    }
+    revertGridOptionsPropertyToUserValue(propertyName) {
+        const userKey = `user.${propertyName}`;
+        const userValue = this.gridOptionsPropertyCache.get(userKey);
+        this.agGridAdapter.setGridOption(propertyName, userValue);
+    }
+    CAREFUL_patchGridOptionsProperty(propertyName, value) {
+        var _a;
+        // @ts-ignore this is required to set gridOptions peroperties which are marked as initial (writable once, before grid is initialised)
+        const gos = (_a = this.agGridAdapter.getAgGridApi()) === null || _a === void 0 ? void 0 : _a.gos;
+        if (gos) {
+            gos.updateGridOptions({
+                options: {
+                    [propertyName]: value,
+                },
+                source: 'api',
+            });
+        }
+    }
     revertGridOptionsPropertiesToUserValue(gridOptions, propertyNames) {
         for (const propertyName of propertyNames) {
             // see this.setGridOptionsProperty(...)