@adaptabletools/adaptable 18.0.0-canary.32 → 18.0.0-canary.34

package/src/Utilities/Services/RowSummaryService.js

@@ -5,7 +5,7 @@ import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import Helper from '../Helpers/Helper';
 import { AggregatedScalarLiveValue } from './AggregatedScalarLiveValue';
 import { isObjectEmpty } from '../Extensions/ObjectExtensions';
-import debounce from 'lodash/debounce';
+import throttle from 'lodash/throttle';
 /**
  * The logic is extracted here to make it easier to follow
  */
@@ -13,7 +13,12 @@ export class RowSummaryService {
     constructor(api) {
         this.api = api;
         this.cachedCellSummary = new Map();
-        this.debouncedEvaluateRowSummary = debounce(this.evaluateRowSummary, 300);
+        this._throttleAcumulatedColumnsThatChanged = new Set();
+        /**
+         *
+         * @param colId optional to evaluate only one column
+         */
+        this._throttledEvaluateRowSummary = throttle(this.evaluateRowSummary, 300);
     }
     onAdapterReady() {
         this.rowSummariesSubscriptions();
@@ -27,17 +32,17 @@ export class RowSummaryService {
         if (!this.api.layoutApi.internalApi.getLayoutSupportedFeatures().RowSummaries) {
             return;
         }
-        this.debouncedEvaluateRowSummary();
+        this.throttledEvaluateRowSummary();
         this.api.eventApi.on('AdaptableStateReloaded', () => {
-            this.debouncedEvaluateRowSummary();
+            this.throttledEvaluateRowSummary();
         });
         this.api.eventApi.on('GridDataChanged', (event) => {
-            this.debouncedEvaluateRowSummary();
+            this.throttledEvaluateRowSummary();
         });
         this.api.eventApi.on('CellChanged', (event) => {
             const columnId = event.cellChange.column.columnId;
-            this.debouncedEvaluateRowSummary({
-                columnId,
+            this.throttledEvaluateRowSummary({
+                columnIds: [columnId],
             });
         });
         this.api.eventApi.on('LayoutChanged', (event) => {
@@ -47,25 +52,34 @@ export class RowSummaryService {
             }
             setTimeout(() => {
                 // the timeout is added so the grid has time to repond to the layout changed
-                this.debouncedEvaluateRowSummary();
+                this.throttledEvaluateRowSummary();
             }, 16);
         });
         const adaptable = this.api.internalApi.getAdaptableInstance();
         adaptable._on('AdapTableFiltersApplied', () => {
             // we need to use this instead of layout changed
             // so the rows have time to update
-            this.debouncedEvaluateRowSummary();
+            this.throttledEvaluateRowSummary();
         });
         adaptable._on('FirstDataRendered', () => {
-            this.debouncedEvaluateRowSummary();
+            this.throttledEvaluateRowSummary();
         });
     }
-    /**
-     *
-     * @param colId optional to evaluate only one column
-     */
+    throttledEvaluateRowSummary(reason) {
+        if (reason) {
+            reason.columnIds.forEach((col) => this._throttleAcumulatedColumnsThatChanged.add(col));
+        }
+        this._throttledEvaluateRowSummary(reason);
+    }
     evaluateRowSummary(reason) {
         var _a;
+        if (this._throttleAcumulatedColumnsThatChanged.size > 0) {
+            const columnIds = Array.from(this._throttleAcumulatedColumnsThatChanged.values());
+            reason = {
+                columnIds,
+            };
+            this._throttleAcumulatedColumnsThatChanged.clear();
+        }
         if (this.api.isDestroyed()) {
             return;
         }
@@ -91,7 +105,7 @@ export class RowSummaryService {
                             // refresh all of them
                             expressionLiveValue.refresh();
                         }
-                        else if ('columnId' in reason && reason.columnId === columnId) {
+                        else if ('columnIds' in reason && reason.columnIds.includes(columnId)) {
                             expressionLiveValue.refresh();
                         }
                     }

package/src/View/BulkUpdate/BulkUpdatePopup.js

@@ -50,7 +50,7 @@ class BulkUpdatePopupComponent extends React.Component {
                     React.createElement(SimpleButton, { disabled: StringExtensions.IsNullOrEmpty(this.props.BulkUpdateValue) ||
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All', onClick: () => {
                             this.onApplyClick();
-                        }, variant: "raised", tone: "accent" }, "Apply to Grid")))) : (React.createElement(React.Fragment, null,
+                        }, variant: "raised", tone: "accent" }, "Apply Bulk Update")))) : (React.createElement(React.Fragment, null,
                 React.createElement(HelpBlock, { marginTop: 2, marginBottom: 2 }, "Select an existing Column value from the dropdown, or enter a new value"),
                 React.createElement(Flex, { marginTop: 2, flexDirection: "row", alignItems: "center" },
                     React.createElement(Flex, { alignItems: "center", flexDirection: "row", flex: 1, marginRight: 2 },
@@ -59,7 +59,7 @@ class BulkUpdatePopupComponent extends React.Component {
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All' ||
                             hasDataTypeError, variant: "raised", tone: "accent", marginRight: 2, onClick: () => {
                             this.onApplyClick();
-                        } }, "Apply to Grid"),
+                        } }, "Apply Bulk Update"),
                     ' ',
                     hasDataTypeError && (React.createElement(AdaptablePopover, { headerText: 'Update Error', bodyText: [dataTypeErrorMessage], MessageType: 'Error' })),
                     StringExtensions.IsNotNullOrEmpty(this.props.BulkUpdateValue) &&

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopup.js

@@ -35,7 +35,10 @@ export const AdaptablePopup = (props) => {
     let componentName = props.componentName;
     // ts forces to check for General, there is no menu item General
     const useFirstItem = !props.componentName;
-    if (useFirstItem && firstMenuModule !== 'General' && firstMenuModule !== 'CustomSettingsPanel') {
+    if (useFirstItem &&
+        firstMenuModule !== 'General' &&
+        firstMenuModule !== 'CustomSettingsPanel' &&
+        firstMenuModule !== 'Group') {
         componentModule = firstMenuModule;
     }
     const customSettingsPanel = (_c = settingsPanelOptions === null || settingsPanelOptions === void 0 ? void 0 : settingsPanelOptions.customSettingsPanels) === null || _c === void 0 ? void 0 : _c.find((customPanel) => useFirstItem ? customPanel.name === firstMenuItem.label : customPanel.name === componentName);

package/src/View/Components/Popups/AdaptablePopup/useMenuItems.js

@@ -18,6 +18,7 @@ export const useMenuItems = () => {
         }
         const visibleItems = allMenuItems.filter((item) => item.module !== 'General' &&
             item.module !== 'CustomSettingsPanel' &&
+            item.module !== 'Group' &&
             !STANDALONE_MODULE_POPUPS.includes(item.module) &&
             item.isVisible);
         let navItems = navigationItems

package/src/View/Components/Popups/GridCellPopup/GridCellPopup.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { Flex } from 'rebass';
-import { GetNotesSelector } from '../../../../Redux/ActionsReducers/NoteRedux';
+import { GetNoteSelector } from '../../../../Redux/ActionsReducers/NoteRedux';
 import { SystemCommentsAndNotesEditModeSelector, SystemCommentsAndNotesFocusedEntitySelector, SystemCommentsAndNotesSelector, } from '../../../../Redux/ActionsReducers/SystemRedux';
 import { useAdaptable } from '../../../AdaptableContext';
 import { CommentsEditor } from '../../../Comments/CommentsEditor';
@@ -13,11 +13,8 @@ const ConnectedNoteEditor = ({ enableEditMode }) => {
     const editMode = useSelector((state) => SystemCommentsAndNotesEditModeSelector(state.System));
     const cellPopupService = api.internalApi.getCellPopupService();
     const cellAddress = useSelector((state) => SystemCommentsAndNotesSelector(state.System));
-    const [
-    // Only handle first note for now
-    // Later we can handle multiple notes
-    note,] = useSelector((state) => {
-        return cellAddress ? GetNotesSelector(state.Note, cellAddress) : [];
+    const note = useSelector((state) => {
+        return cellAddress ? GetNoteSelector(state.Note, cellAddress) : null;
     });
     const handleNoteChange = React.useCallback((value) => {
         api.noteApi.updateNoteText(value, note);

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -95,7 +95,7 @@ const buildAdaptableOptions = (mainAdaptableInstance, gridOptions, adaptableCont
                     columnId: 'undoActionColumn',
                     friendlyName: ' ',
                     rowScope: {
-                        ExcludeGroupedRows: true,
+                        ExcludeGroupRows: true,
                         ExcludeSummaryRows: true,
                     },
                     actionColumnSettings: { suppressMenu: true, suppressMovable: true },

package/src/View/FormatColumn/Wizard/FormatColumnSettingsWizardSection.js

@@ -18,8 +18,8 @@ export const renderFormatColumnSettingsSummary = (data) => {
             React.createElement(Tag, null, ((_b = data.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeDataRows) ? 'no' : 'yes')),
         ' ',
         React.createElement(Text, { mt: 3 },
-            "Grouped Rows ",
-            React.createElement(Tag, null, ((_c = data.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeGroupedRows) ? 'no' : 'yes')),
+            "Group Rows ",
+            React.createElement(Tag, null, ((_c = data.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeGroupRows) ? 'no' : 'yes')),
         React.createElement(Text, { mt: 3 },
             "Summary Rows ",
             React.createElement(Tag, null, ((_d = data.RowScope) === null || _d === void 0 ? void 0 : _d.ExcludeSummaryRows) ? 'no' : 'yes'))));
@@ -38,7 +38,7 @@ export const FormatColumnSettingsWizardSection = (props) => {
         props.onChange(Object.assign(Object.assign({}, data), { RowScope: Object.assign(Object.assign({}, data.RowScope), { ExcludeDataRows }) }));
     };
     const onExcludeGroupedRowsChanged = (ExcludeGroupedRows) => {
-        props.onChange(Object.assign(Object.assign({}, data), { RowScope: Object.assign(Object.assign({}, data.RowScope), { ExcludeGroupedRows }) }));
+        props.onChange(Object.assign(Object.assign({}, data), { RowScope: Object.assign(Object.assign({}, data.RowScope), { ExcludeGroupRows: ExcludeGroupedRows }) }));
     };
     const onExcludeSummaryRowsChanged = (ExcludeSummaryRows) => {
         props.onChange(Object.assign(Object.assign({}, data), { RowScope: Object.assign(Object.assign({}, data.RowScope), { ExcludeSummaryRows }) }));
@@ -62,9 +62,9 @@ export const FormatColumnSettingsWizardSection = (props) => {
                     React.createElement(FormRow, { label: "Exclude Data Rows:" },
                         React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
                             React.createElement(CheckBox, { "data-name": "exclude-data-rows-checkbox", checked: (_a = data.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeDataRows, onChange: onExcludeDataRowsChanged, mr: 2 }))),
-                    React.createElement(FormRow, { label: "Exclude Grouped Rows:" },
+                    React.createElement(FormRow, { label: "Exclude Group Rows:" },
                         React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
-                            React.createElement(CheckBox, { "data-name": "exclude-grouped-rows-checkbox", checked: (_b = data.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows, onChange: onExcludeGroupedRowsChanged, mr: 2 }))),
+                            React.createElement(CheckBox, { "data-name": "exclude-grouped-rows-checkbox", checked: (_b = data.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupRows, onChange: onExcludeGroupedRowsChanged, mr: 2 }))),
                     React.createElement(FormRow, { label: "Exclude Row Summaries:" },
                         React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
                             React.createElement(CheckBox, { "data-name": "exclude-summary-rows-checkbox", checked: (_c = data.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows, onChange: onExcludeSummaryRowsChanged, mr: 2 }))))))));

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

@@ -43,7 +43,7 @@ export const RowGroupingSection = (props) => {
         props.onChange(Object.assign(Object.assign({}, layout), { RowGroupedColumns: columnIds }));
     };
     return (React.createElement(Tabs, { style: { height: '100%' } },
-        React.createElement(Tabs.Tab, null, "Grouped Rows"),
+        React.createElement(Tabs.Tab, null, "Group Rows"),
         ((_a = layout.ExpandedRowGroupValues) === null || _a === void 0 ? void 0 : _a.length) && React.createElement(Tabs.Tab, null, "Expanded Rows"),
         React.createElement(Tabs.Content, null,
             React.createElement(ValueSelector, { showFilterInput: true, showSelectedOnlyPosition: "top", filter: columnFilter, toIdentifier: (option) => `${option.columnId}`, toLabel: (option) => { var _a; return (_a = option.friendlyName) !== null && _a !== void 0 ? _a : option.columnId; }, options: sortedGroupableColumns, value: (_b = layout.RowGroupedColumns) !== null && _b !== void 0 ? _b : [], allowReorder: true, xSelectedLabel: () => {

package/src/View/SmartEdit/SmartEditPopup.js

@@ -63,7 +63,7 @@ class SmartEditPopupComponent extends React.Component {
                         (this.props.PreviewInfo &&
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All'), onClick: () => {
                         this.submit();
-                    }, marginRight: 2 }, "Apply to Grid"),
+                    }, marginRight: 2 }, "Apply Smart Edit"),
                 ' ',
                 this.props.PreviewInfo &&
                     this.props.PreviewInfo.previewValidationSummary.validationResult != 'None' && (React.createElement(AdaptablePopover, { headerText: 'Validation Error', bodyText: [globalValidationMessage], MessageType: 'Error' }))),

package/src/View/StyledColumn/Wizard/StyledColumnBadgeSection.js

@@ -7,7 +7,6 @@ import HelpBlock from '../../../components/HelpBlock';
 import SimpleButton from '../../../components/SimpleButton';
 import { Tabs } from '../../../components/Tabs';
 import ObjectFactory from '../../../Utilities/ObjectFactory';
-import { AdaptablePopover } from '../../AdaptablePopover';
 import { AdaptableIconSelector } from '../../Components/AdaptableIconSelector';
 import { PredicateEditor } from '../../Components/PredicateEditor/PredicateEditor';
 import { StyleComponent } from '../../Components/StyleComponent';
@@ -16,6 +15,7 @@ import { StyledColumnBadgePreview } from './StyledColumnWizardStyleSection/Compo
 import { Badge } from '../../Components/Badge';
 import { AdaptableIconComponent } from '../../Components/AdaptableIconComponent';
 import { DEFAULT_INTEGER_DISPLAY_VALUE, DEFAULT_STRING_DISPLAY_VALUE, } from '../../../Utilities/Constants/GeneralConstants';
+import { Accordion } from '../../../components/Accordion';
 const BadgeEditor = (props) => {
     var _a, _b;
     const { api } = useOnePageAdaptableWizardContext();
@@ -36,12 +36,10 @@ const BadgeEditor = (props) => {
                 React.createElement(FormRow, { label: "Style" },
                     React.createElement(HelpBlock, { fontSize: 2, mb: 1, mt: 2 }, "Select the Style for the Badge"),
                     ' ',
-                    React.createElement(AdaptablePopover, { showEvent: "mouseenter", hideEvent: "mouseleave", showIcon: false, useButton: false, popoverMaxWidth: 700, bodyText: [
-                            React.createElement(StyleComponent, { showFontSizeAs: "radio", headless: true, hidePreview: true, api: api, Style: (_a = badge.Style) !== null && _a !== void 0 ? _a : {}, UpdateStyle: (Style) => {
-                                    onChange(Object.assign(Object.assign({}, badge), { Style }));
-                                } }),
-                        ] },
-                        React.createElement(SimpleButton, { variant: "raised" }, "Edit Badge Style"))),
+                    React.createElement(Accordion, { title: "Edit Badge Style" },
+                        React.createElement(StyleComponent, { showFontSizeAs: "radio", headless: true, hidePreview: true, api: api, Style: (_a = badge.Style) !== null && _a !== void 0 ? _a : {}, UpdateStyle: (Style) => {
+                                onChange(Object.assign(Object.assign({}, badge), { Style }));
+                            } }))),
                 !api.columnApi.hasArrayDataType(columnId) && ( // dont show predicates for arrays
                 (React.createElement(
                     FormRow,

package/src/View/StyledColumn/Wizard/StyledColumnWizardSettingsSection.js

@@ -14,8 +14,8 @@ export const renderStyledColumnWizardSettingsSummary = (data) => {
             React.createElement(Tag, null, ((_a = badgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeDataRows) ? 'no' : 'yes')),
         ' ',
         React.createElement(Text, { mt: 3 },
-            "Grouped Rows ",
-            React.createElement(Tag, null, ((_b = badgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows) ? 'no' : 'yes')),
+            "Group Rows ",
+            React.createElement(Tag, null, ((_b = badgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupRows) ? 'no' : 'yes')),
         React.createElement(Text, { mt: 3 },
             "Summary Rows ",
             React.createElement(Tag, null, ((_c = badgeStyle.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeSummaryRows) ? 'no' : 'yes'))));
@@ -27,7 +27,7 @@ export const StyledColumnWizardSettingsSection = (props) => {
         props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeDataRows }) }) }));
     };
     const onExcludeGroupedRowsChanged = (ExcludeGroupedRows) => {
-        props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeGroupedRows }) }) }));
+        props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeGroupRows: ExcludeGroupedRows }) }) }));
     };
     const onExcludeSummaryRowsChanged = (ExcludeSummaryRows) => {
         props.onChange(Object.assign(Object.assign({}, data), { BadgeStyle: Object.assign(Object.assign({}, data.BadgeStyle), { RowScope: Object.assign(Object.assign({}, data.BadgeStyle.RowScope), { ExcludeSummaryRows }) }) }));
@@ -42,11 +42,11 @@ export const StyledColumnWizardSettingsSection = (props) => {
                             React.createElement(CheckBox, { "data-name": "exclude-data-rows-checkbox", checked: 
                                 // @ts-ignore
                                 (_a = data.BadgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeDataRows, onChange: onExcludeDataRowsChanged, mr: 2 }))),
-                    React.createElement(FormRow, { label: "Exclude Grouped Rows:" },
+                    React.createElement(FormRow, { label: "Exclude Group Rows:" },
                         React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
                             React.createElement(CheckBox, { "data-name": "exclude-grouped-rows-checkbox", checked: 
                                 // @ts-ignore
-                                (_b = data.BadgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupedRows, onChange: onExcludeGroupedRowsChanged, mr: 2 }))),
+                                (_b = data.BadgeStyle.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeGroupRows, onChange: onExcludeGroupedRowsChanged, mr: 2 }))),
                     React.createElement(FormRow, { label: "Exclude Row Summaries:" },
                         React.createElement(Flex, { alignItems: "center", marginLeft: 2 },
                             React.createElement(CheckBox, { "data-name": "exclude-summary-rows-checkbox", checked: 

package/src/agGrid/ActionColumnRenderer.js

@@ -43,7 +43,7 @@ export const ReactActionColumnRenderer = (props) => {
     const isSummaryRow = adaptable.api.gridApi.isSummaryNode(props.node);
     let shouldRender = true;
     if (isGroupedRow) {
-        if ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupedRows) {
+        if ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupRows) {
             shouldRender = false;
         }
     }
@@ -89,7 +89,7 @@ export class ActionColumnRenderer {
         const isSummaryRow = adaptable.api.gridApi.isSummaryNode(params.node);
         let shouldRender = true;
         if (isGroupedRow) {
-            if ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupedRows) {
+            if ((_a = actionColumn.rowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupRows) {
                 shouldRender = false;
             }
         }

package/src/agGrid/AgGridColumnAdapter.js

@@ -576,8 +576,8 @@ export class AgGridColumnAdapter {
             PrimaryKeyValue: gridCell.primaryKeyValue,
             ColumnId: gridCell.column.columnId,
         };
-        const cellNotes = this.adaptableApi.noteApi.getNotesForCell(cellPosition);
-        if (!(cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length)) {
+        const cellNote = this.adaptableApi.noteApi.getNoteForCell(cellPosition);
+        if (!cellNote) {
             return undefined;
         }
         return 'ab-Cell-Note';

package/src/agGrid/AgGridMenuAdapter.d.ts

@@ -10,6 +10,7 @@ export declare class AgGridMenuAdapter {
     destroy(): void;
     buildColumnMenu(params: GetMainMenuItemsParams, originalGetMainMenuItems: GetMainMenuItems): (string | MenuItemDef)[];
     buildContextMenu(params: GetContextMenuItemsParams, originalGetContextMenuItems: GetContextMenuItems): (string | MenuItemDef)[];
+    private mapAgGridItemTypeToAgGridMenuItem;
     private removeConsecutiveSeparators;
     private createColumnMenuContextObject;
     private createAdaptableContextMenuItems;