@adaptabletools/adaptable 18.0.0-canary.28 → 18.0.0-canary.29

package/src/agGrid/AgGridMenuAdapter.js

@@ -47,7 +47,7 @@ export class AgGridMenuAdapter {
             'separator',
             ...defaultColumnMenuStructure.map((adaptableItem) => this.mapAdaptableMenuItemToAgGridMenuDefinition(adaptableItem)),
         ];
-        return defaultContextMenu;
+        return this.removeConsecutiveSeparators(defaultContextMenu);
     }
     buildContextMenu(params, originalGetContextMenuItems) {
         var _a;
@@ -57,8 +57,7 @@ export class AgGridMenuAdapter {
         const menuOptions = this.adaptableOptions.menuOptions;
         const agGridMenuItems = (params.defaultItems ? [...params.defaultItems] : []);
         if (!params.column) {
-            // return only AG Grid context if the Adaptable column is not found (should not happen)
-            return agGridMenuItems;
+            return [];
         }
         const adaptableColumn = this.adaptableApi.columnApi.getColumnWithColumnId((_a = params.column) === null || _a === void 0 ? void 0 : _a.getColId());
         const menuContext = this.createContextMenuContextObject(params, adaptableColumn);
@@ -80,12 +79,37 @@ export class AgGridMenuAdapter {
                 .filter(Boolean);
         }
         // 2. if not, return the default context menu
+        const agGridCopyItems = agGridMenuItems.filter((item) => ['copy', 'copyWithHeaders', 'copyWithGroupHeaders', 'cut', 'paste'].includes(item));
+        const otherAgGridItems = agGridMenuItems.filter((item) => !agGridCopyItems.includes(item) &&
+            // we provide Adaptable exports in the context menu
+            !['export', 'csvExport', 'excelExport'].includes(item));
         const defaultContextMenu = [
-            ...agGridMenuItems,
+            this.mapCustomMenuItemToAgGridMenuDefinition({
+                menuType: 'Group',
+                label: 'Copy & Paste',
+                icon: {
+                    name: 'copy',
+                },
+                subMenuItems: agGridCopyItems.map((item) => ({
+                    menuType: 'AgGrid',
+                    name: item,
+                })),
+            }, menuContext),
+            ...otherAgGridItems,
             'separator',
             ...defaultContextMenuStructure.map((adaptableItem) => this.mapAdaptableMenuItemToAgGridMenuDefinition(adaptableItem)),
         ];
-        return defaultContextMenu;
+        return this.removeConsecutiveSeparators(defaultContextMenu);
+    }
+    // due to entitlements or other reasons, some menu items might be hidden, leading to consecutive separators
+    removeConsecutiveSeparators(menuItems, separator = 'separator') {
+        return menuItems.reduce((acc, item, index, array) => {
+            if (item === separator && array[index + 1] === separator) {
+                return acc;
+            }
+            acc.push(item);
+            return acc;
+        }, []);
     }
     createColumnMenuContextObject(adaptableColumn, agGridColumn) {
         return Object.assign(Object.assign({}, this.adaptableInstance.api.internalApi.buildBaseContext()), { adaptableColumn: adaptableColumn, agGridColumn: agGridColumn, isRowGroupColumn: this.adaptableInstance.api.columnApi.isAutoRowGroupColumn(agGridColumn.getColId()) });
@@ -251,6 +275,17 @@ export class AgGridMenuAdapter {
                 ...gridInfoMenuItems,
             ],
         };
+        const editMenuItem = {
+            name: 'edit-group',
+            label: 'Edit',
+            // TODO
+            module: 'ColumnInfo',
+            isVisible: true,
+            icon: {
+                name: 'edit-table',
+            },
+            subItems: [...bulkUpdateMenuItems, ...smartEditMenuItems],
+        };
         const columnMenuItem = {
             name: 'column-group',
             label: 'Column',
@@ -260,27 +295,39 @@ export class AgGridMenuAdapter {
             icon: {
                 name: 'columns',
             },
-            subItems: [
-                ...bulkUpdateMenuItems,
-                ...smartEditMenuItems,
-                ...calculatedColumnMenuItems,
-                ...columnInfoMenuItems,
-            ],
+            subItems: [...calculatedColumnMenuItems, ...columnInfoMenuItems],
         };
-        return [
+        return this.removeConsecutiveSeparators([
+            ...exportMenuItems,
+            '-',
             ...noteMenuItems,
             ...commentMenuItems,
-            '-',
-            ...settingsPanelMenuItems,
-            ...dashboardMenuItems,
             ...columnFilterMenuItems,
-            gridMenuItem,
-            columnMenuItem,
-            ...exportMenuItems,
             ...flashingCellMenuItems,
             ...alertMenuItems,
             ...fdc3MenuItems,
-        ];
+            '-',
+            ...settingsPanelMenuItems,
+            ...dashboardMenuItems,
+            '-',
+            ...this.normalizeMenuGroup(editMenuItem),
+            '-',
+            ...this.normalizeMenuGroup(gridMenuItem),
+            ...this.normalizeMenuGroup(columnMenuItem),
+        ], '-');
+    }
+    /**
+     * Hide menu group with no subitems or elevate single subitem to parent level
+     */
+    normalizeMenuGroup(menuItem) {
+        var _a, _b;
+        if (!((_a = menuItem.subItems) === null || _a === void 0 ? void 0 : _a.length)) {
+            return [];
+        }
+        if (((_b = menuItem.subItems) === null || _b === void 0 ? void 0 : _b.length) === 1) {
+            return [menuItem.subItems[0]];
+        }
+        return [menuItem];
     }
     /**
      * Default strategy for menu items: return as is if there is only one item, otherwise group them under a parent item
@@ -300,35 +347,41 @@ export class AgGridMenuAdapter {
         if (!exportMenuItems.length) {
             return [];
         }
-        const cellSelectionItems = exportMenuItems.filter((item) => item.name.startsWith('export-cells'));
-        const canExportCells = cellSelectionItems.length;
-        const rowSelectionItems = exportMenuItems.filter((item) => item.name.startsWith('export-rows'));
-        const canExportRows = rowSelectionItems.length;
-        if (canExportCells && !canExportRows) {
-            return [
-                this.buildMenuGroupParent('Export', cellSelectionItems, {
-                    label: 'Export Selected Cells',
-                }),
-            ];
-        }
-        if (!canExportCells && canExportRows) {
-            return [
-                this.buildMenuGroupParent('Export', rowSelectionItems, {
-                    label: 'Export Selected Rows',
-                }),
-            ];
-        }
-        if (canExportCells && canExportRows) {
-            const cellsSubMenu = this.buildMenuGroupParent('Export', cellSelectionItems, {
-                label: 'Cells',
-            });
-            const rowsSubMenu = this.buildMenuGroupParent('Export', rowSelectionItems, { label: 'Rows' });
-            return [
-                this.buildMenuGroupParent('Export', [cellsSubMenu, rowsSubMenu], {
-                    label: 'Export Selected',
+        const visualReportItems = exportMenuItems.filter((item) => item.name.startsWith('export-visual-data-excel'));
+        const visualDataExportItems = visualReportItems.length
+            ? [
+                this.buildMenuGroupParent('Export', exportMenuItems.filter((item) => item.name.startsWith('export-visual-data-excel')), {
+                    label: 'Visual Data',
+                    icon: false,
                 }),
-            ];
-        }
+            ]
+            : [];
+        const allDataExportItems = this.normalizeMenuGroup(this.buildMenuGroupParent('Export', exportMenuItems.filter((item) => item.name.startsWith('export-all-data')), {
+            label: 'All Data',
+            icon: false,
+        }));
+        const currentDataExportItems = this.normalizeMenuGroup(this.buildMenuGroupParent('Export', exportMenuItems.filter((item) => item.name.startsWith('export-current-data')), {
+            label: 'Current Data',
+            icon: false,
+        }));
+        const selectedCellsExportItems = this.normalizeMenuGroup(this.buildMenuGroupParent('Export', exportMenuItems.filter((item) => item.name.startsWith('export-selected-cells')), {
+            label: 'Selected Cells',
+            icon: false,
+        }));
+        const selectedRowsExportItems = this.normalizeMenuGroup(this.buildMenuGroupParent('Export', exportMenuItems.filter((item) => item.name.startsWith('export-selected-rows')), {
+            label: 'Selected Rows',
+            icon: false,
+        }));
+        return this.normalizeMenuGroup(this.buildMenuGroupParent('Export', [
+            ...visualDataExportItems,
+            ...allDataExportItems,
+            ...currentDataExportItems,
+            ...selectedCellsExportItems,
+            ...selectedRowsExportItems,
+        ], {
+            label: 'Export',
+            icon: 'export',
+        }));
     }
     getLayoutContextMenuStructure(menuItems) {
         const layoutMenuItems = menuItems.filter((menuItem) => menuItem.module === 'Layout');
@@ -347,14 +400,15 @@ export class AgGridMenuAdapter {
     buildMenuGroupParent(module, menuItems, config) {
         var _a, _b;
         const moduleInfo = this.adaptableInstance.ModuleService.getModuleInfoByModule(module);
+        const icon = config && config.icon === false
+            ? undefined
+            : { name: (_a = config === null || config === void 0 ? void 0 : config.icon) !== null && _a !== void 0 ? _a : moduleInfo.Glyph };
         return {
             name: 'menu-group',
-            label: (_a = config === null || config === void 0 ? void 0 : config.label) !== null && _a !== void 0 ? _a : moduleInfo.FriendlyName,
+            label: (_b = config === null || config === void 0 ? void 0 : config.label) !== null && _b !== void 0 ? _b : moduleInfo.FriendlyName,
             isVisible: true,
             module: moduleInfo.ModuleName,
-            icon: {
-                name: (_b = config === null || config === void 0 ? void 0 : config.icon) !== null && _b !== void 0 ? _b : moduleInfo.Glyph,
-            },
+            icon,
             subItems: menuItems,
         };
     }
@@ -441,16 +495,16 @@ export class AgGridMenuAdapter {
             icon: {
                 name: 'brush',
             },
-            subItems: [...flashingCellMenuItems, ...formatColumnMenuItems, ...styledColumnMenuItems],
+            subItems: [...formatColumnMenuItems, ...styledColumnMenuItems, ...flashingCellMenuItems],
         };
-        return [
+        return this.removeConsecutiveSeparators([
             ...settingsPanelMenuItems,
             ...dashboardMenuItems,
             ...columnFilterGroup,
-            createStyleMenuItem,
-            gridMenuItem,
-            columnMenuItem,
-        ];
+            ...this.normalizeMenuGroup(createStyleMenuItem),
+            ...this.normalizeMenuGroup(gridMenuItem),
+            ...this.normalizeMenuGroup(columnMenuItem),
+        ], '-');
     }
     getColumnFilterColumnMenuStructure(menuItems) {
         const columnFilterMenuItems = menuItems.filter((menuItem) => menuItem.module === 'ColumnFilter');

package/src/agGrid/BadgeRenderer.js

@@ -1,6 +1,7 @@
 import { Badge } from '../View/Components/Badge';
 import { renderWithAdaptableContext } from '../View/renderWithAdaptableContext';
 import * as React from 'react';
+import { ROW_SUMMARY_ROW_ID } from '../PredefinedConfig/Common/RowSummary';
 export const getBadgeRendererForColumn = (styledColumn, abColumn, api) => {
     if (!styledColumn.BadgeStyle) {
         return;
@@ -11,7 +12,7 @@ export const getBadgeRendererForColumn = (styledColumn, abColumn, api) => {
             return adaptable;
         }
         init(params) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g;
             const adaptable = this.getAdaptableInstance(params);
             const adapatableApi = adaptable.api;
             this.eGui = document.createElement('div');
@@ -23,6 +24,11 @@ export const getBadgeRendererForColumn = (styledColumn, abColumn, api) => {
                 this.eGui.innerHTML = formattedValue;
                 return;
             }
+            if (((_d = params === null || params === void 0 ? void 0 : params.data) === null || _d === void 0 ? void 0 : _d[ROW_SUMMARY_ROW_ID]) && !styledColumn.IncludeRowSummaries) {
+                const formattedValue = (_g = (_f = (_e = params.formatValue) === null || _e === void 0 ? void 0 : _e.call(params, params.value)) !== null && _f !== void 0 ? _f : params.value) !== null && _g !== void 0 ? _g : '';
+                this.eGui.innerHTML = formattedValue;
+                return;
+            }
             if (['NumberArray', 'StringArray'].includes(abColumn.dataType)) {
                 this.renderArrayValues(params, adapatableApi);
             }

package/src/agGrid/PercentBarRenderer.js

@@ -13,7 +13,9 @@ export const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
             if (Helper.objectNotExists(value)) {
                 value = 0;
             }
-            if (!styledColumn.IncludeGroupedRows && api.gridApi.isGroupRowNode(params.node)) {
+            // No longer support showing Percent Bar in Grouped Rows
+            if (api.gridApi.isGroupRowNode(params.node)) {
+                // if (!styledColumn.IncludeGroupedRows && api.gridApi.isGroupRowNode(params.node)) {
                 if (params.value) {
                     this.eGui = document.createElement('div');
                     this.eGui.append(params.value);

package/src/components/CheckBox/index.js

@@ -1,6 +1,6 @@
 import { __rest } from "tslib";
 import * as React from 'react';
-import { useState, useRef } from 'react';
+import { useRef, useState } from 'react';
 import { Box, Flex } from 'rebass';
 import join from '../utils/join';
 const Square = (props) => {

package/src/components/ProgressIndicator/ProgressIndicator.js

@@ -3,8 +3,12 @@ import { useSelector } from 'react-redux';
 import { useEffect, useState } from 'react';
 import { LoaderSpinner } from '../Loader';
 import { useAdaptable } from '../../View/AdaptableContext';
+import { ExternalRenderer } from '../../View/Components/ExternalRenderer';
+import Dialog from '../Dialog';
+import { Box, Flex } from 'rebass';
 export const ProgressIndicator = () => {
-    const { active, label } = useSelector((state) => state.System.ProgressIndicator);
+    const adaptable = useAdaptable();
+    const { active, text, render, frameworkComponent } = useSelector((state) => state.System.ProgressIndicator);
     const [visible, setVisible] = useState(false);
     const [progressIndicatorCoordinates, setProgressIndicatorCoordinates] = useState({
         top: 0,
@@ -12,7 +16,6 @@ export const ProgressIndicator = () => {
         height: 0,
         width: 0,
     });
-    const adaptable = useAdaptable();
     const disableAdaptableGrid = (containerElement, disabled) => {
         const DISABLING_CSS_CLASS = 'ab-wait-for-progress-indicator';
         if (!containerElement) {
@@ -35,14 +38,20 @@ export const ProgressIndicator = () => {
     useEffect(() => {
         disableAdaptableGrid(adaptable.getAdaptableContainerElement(), active);
         disableAdaptableGrid(adaptable.getAgGridContainerElement(), active);
-        updateGridContainerCoordinates(adaptable.getAdaptableContainerElement());
+        updateGridContainerCoordinates(adaptable.getAgGridContainerElement());
         // without rAF the progress indicator would be rendered instantly, without the 'transition-delay' defined via CSS
         requestAnimationFrame(() => {
             setVisible(active);
         });
     }, [active]);
-    return (React.createElement(React.Fragment, null, active && (React.createElement("div", { className: `ab-progress-indicator-wrapper ${visible ? 'ab-progress-indicator-wrapper--visible' : ''}`, style: progressIndicatorCoordinates },
-        React.createElement("div", { className: "ab-progress-indicator-body" },
+    let customEl = null;
+    if (render || frameworkComponent) {
+        customEl = React.createElement(ExternalRenderer, { render: render, frameworkComponent: frameworkComponent });
+    }
+    return (React.createElement(React.Fragment, null, active && (React.createElement(Dialog, { modal: true, isOpen: true, showCloseButton: false, className: `ab-ProgressIndicator ${visible ? 'ab-ProgressIndicator--visible' : ''}` },
+        React.createElement(Flex, { alignItems: "center", flexDirection: "column", p: 3, className: "ab-ProgressIndicator-body" },
             React.createElement(LoaderSpinner, null),
-            React.createElement("span", { style: { marginLeft: 'var(--ab-space-2)' } }, label))))));
+            React.createElement(Box, { mt: 3 },
+                text && React.createElement(Box, null, text),
+                customEl))))));
 };

package/src/components/icons/copy.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: (props: any) => JSX.Element;
+export default _default;

package/src/components/icons/copy.js

@@ -0,0 +1,4 @@
+import * as React from 'react';
+import DefaultIcon from './DefaultIcon';
+export default (props) => (React.createElement(DefaultIcon, Object.assign({}, props, { viewBox: "0 -960 960 960" }),
+    React.createElement("path", { d: "M360-240q-33 0-56.5-23.5T280-320v-480q0-33 23.5-56.5T360-880h360q33 0 56.5 23.5T800-800v480q0 33-23.5 56.5T720-240H360Zm0-80h360v-480H360v480ZM200-80q-33 0-56.5-23.5T120-160v-560h80v560h440v80H200Zm160-240v-480 480Z" })));

package/src/components/icons/index.js

@@ -161,6 +161,7 @@ import Comments from './comments';
 import SelectAll from './select-all';
 import SelectOff from './select-off';
 import SelectFwd from './select-fwd';
+import Copy from './copy';
 import { IconComponent } from '../Icon';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
 export const allIcons = {
@@ -168,6 +169,7 @@ export const allIcons = {
     grid: Layout,
     cells: CellSummary,
     columns: ColumnChooser,
+    copy: Copy,
     'chart-and-grid': CalculatedColumn,
     laptop: Application,
     alert: Alert,

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1712667835989 || Date.now(),
-    VERSION: "18.0.0-canary.28" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1712751917039 || Date.now(),
+    VERSION: "18.0.0-canary.29" || '--current-version--',
 };