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

package/src/agGrid/AgGridMenuAdapter.js

@@ -24,18 +24,19 @@ export class AgGridMenuAdapter {
         }
         const adaptableColumn = this.adaptableApi.columnApi.getColumnWithColumnId((_a = params.column) === null || _a === void 0 ? void 0 : _a.getColId());
         const menuContext = this.createColumnMenuContextObject(adaptableColumn, params.column);
+        /**
+         * AG Grid items
+         */
+        const agGridDefaultStructure = agGridMenuItems.map((itemName) => this.mapAgGridItemTypeToAgGridMenuItem(itemName));
         const adaptableMenuItems = this.createAdaptableColumnMenuItems(menuContext);
         const defaultColumnMenuStructure = this.buildColumnMenuDefaultStructure(adaptableMenuItems, menuContext);
         // 1. first check if there is a custom column menu defined
         if (typeof menuOptions.customColumnMenu === 'function') {
-            const defaultAgGridMenuItems = agGridMenuItems.map((itemName) => ({
-                menuType: 'AgGrid',
-                name: itemName,
-            }));
+            const defaultAgGridMenuItems = agGridMenuItems.map((itemName) => this.mapAgGridItemTypeToAgGridMenuItem(itemName));
             const defaultAdaptableMenuItems = adaptableMenuItems.map((adaptableItem) => (Object.assign({ menuType: 'Adaptable' }, adaptableItem)));
             const customMenuItems = menuOptions
                 .customColumnMenu(Object.assign(Object.assign({}, menuContext), { defaultAgGridMenuItems,
-                defaultAdaptableMenuItems, defaultAdaptableMenuStructure: this.mapAdaptableMenuItemToSystemMenuItems(defaultColumnMenuStructure) }))
+                defaultAdaptableMenuItems, defaultAdaptableMenuStructure: this.mapAdaptableMenuItemToSystemMenuItems(defaultColumnMenuStructure), defaultAgGridMenuStructure: agGridDefaultStructure }))
                 .filter(Boolean);
             return customMenuItems
                 .map((customMenuItem) => this.mapCustomMenuItemToAgGridMenuDefinition(customMenuItem, menuContext))
@@ -51,56 +52,70 @@ export class AgGridMenuAdapter {
     }
     buildContextMenu(params, originalGetContextMenuItems) {
         var _a;
+        if (!params.column) {
+            return [];
+        }
         // we do this in order to refresh the internal state of selected cells (technically query the AG Grid cellRanges)
         // (right-click selected the current cell, but this was not reflected in the internal state of the selected cells)
         this.adaptableInstance.refreshSelectedCellsState();
         const menuOptions = this.adaptableOptions.menuOptions;
-        const agGridMenuItems = (params.defaultItems ? [...params.defaultItems] : []);
-        if (!params.column) {
-            return [];
-        }
         const adaptableColumn = this.adaptableApi.columnApi.getColumnWithColumnId((_a = params.column) === null || _a === void 0 ? void 0 : _a.getColId());
         const menuContext = this.createContextMenuContextObject(params, adaptableColumn);
+        /**
+         * AG Grid Items
+         */
+        const agGridMenuItems = (params.defaultItems ? [...params.defaultItems] : []);
+        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 agGridDefaultStructure = [
+            {
+                menuType: 'Group',
+                label: 'Copy & Paste',
+                icon: {
+                    name: 'copy',
+                },
+                subMenuItems: agGridCopyItems.map((item) => this.mapAgGridItemTypeToAgGridMenuItem(item)),
+            },
+            ...otherAgGridItems
+                .filter((itemName) => itemName !== 'separator')
+                .map((itemName) => this.mapAgGridItemTypeToAgGridMenuItem(itemName)),
+        ];
+        /**
+         * Adaptable Items
+         */
         const adaptableMenuItems = this.createAdaptableContextMenuItems(menuContext);
-        const defaultContextMenuStructure = this.buildContextMenuDefaultStructure(adaptableMenuItems, menuContext);
+        const adaptableDefaultStructure = this.buildContextMenuDefaultStructure(adaptableMenuItems, menuContext);
+        /**
+         * Build the context menu
+         */
         // 1. first check if there is a custom context menu defined
         if (typeof menuOptions.customContextMenu === 'function') {
-            const defaultAgGridMenuItems = agGridMenuItems.map((itemName) => ({
-                menuType: 'AgGrid',
-                name: itemName,
-            }));
+            const defaultAgGridMenuItems = agGridMenuItems.map((itemName) => this.mapAgGridItemTypeToAgGridMenuItem(itemName));
             const defaultAdaptableMenuItems = adaptableMenuItems.map((adaptableItem) => (Object.assign({ menuType: 'Adaptable' }, adaptableItem)));
             const customMenuItems = menuOptions
                 .customContextMenu(Object.assign(Object.assign({}, menuContext), { defaultAgGridMenuItems,
-                defaultAdaptableMenuItems, defaultAdaptableMenuStructure: this.mapAdaptableMenuItemToSystemMenuItems(defaultContextMenuStructure) }))
+                defaultAdaptableMenuItems, defaultAdaptableMenuStructure: this.mapAdaptableMenuItemToSystemMenuItems(adaptableDefaultStructure), defaultAgGridMenuStructure: agGridDefaultStructure }))
                 .filter(Boolean);
             return customMenuItems
                 .map((customMenuItem) => this.mapCustomMenuItemToAgGridMenuDefinition(customMenuItem, menuContext))
                 .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 = [
-            this.mapCustomMenuItemToAgGridMenuDefinition({
-                menuType: 'Group',
-                label: 'Copy & Paste',
-                icon: {
-                    name: 'copy',
-                },
-                subMenuItems: agGridCopyItems.map((item) => ({
-                    menuType: 'AgGrid',
-                    name: item,
-                })),
-            }, menuContext),
-            ...otherAgGridItems,
+            ...agGridDefaultStructure.map((agGridItem) => this.mapCustomMenuItemToAgGridMenuDefinition(agGridItem, menuContext)),
             'separator',
-            ...defaultContextMenuStructure.map((adaptableItem) => this.mapAdaptableMenuItemToAgGridMenuDefinition(adaptableItem)),
+            ...adaptableDefaultStructure.map((adaptableItem) => this.mapAdaptableMenuItemToAgGridMenuDefinition(adaptableItem)),
         ];
         return this.removeConsecutiveSeparators(defaultContextMenu);
     }
+    mapAgGridItemTypeToAgGridMenuItem(itemName) {
+        return {
+            menuType: 'AgGrid',
+            name: itemName,
+        };
+    }
     // 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) => {
@@ -233,7 +248,7 @@ export class AgGridMenuAdapter {
         // Comment
         const commentMenuItems = this.getModuleSpecificStructure('Comment', availableMenuItems);
         // Dashboard
-        const dashboardMenuItems = this.getModuleSpecificStructure('Dashboard', availableMenuItems);
+        const dashboardMenuItems = this.getModuleSpecificStructure('Dashboard', availableMenuItems, 'dashboard-group');
         // DataImport
         const dataImportMenuItems = this.getModuleSpecificStructure('DataImport', availableMenuItems);
         // Export
@@ -260,8 +275,7 @@ export class AgGridMenuAdapter {
         const gridMenuItem = {
             name: 'grid-group',
             label: 'Grid',
-            // TODO
-            module: 'ColumnInfo',
+            module: 'Group',
             isVisible: true,
             icon: {
                 name: 'grid',
@@ -278,8 +292,7 @@ export class AgGridMenuAdapter {
         const editMenuItem = {
             name: 'edit-group',
             label: 'Edit',
-            // TODO
-            module: 'ColumnInfo',
+            module: 'Group',
             isVisible: true,
             icon: {
                 name: 'edit-table',
@@ -289,8 +302,7 @@ export class AgGridMenuAdapter {
         const columnMenuItem = {
             name: 'column-group',
             label: 'Column',
-            // TODO
-            module: 'ColumnInfo',
+            module: 'Group',
             isVisible: true,
             icon: {
                 name: 'columns',
@@ -332,11 +344,11 @@ export class AgGridMenuAdapter {
     /**
      * Default strategy for menu items: return as is if there is only one item, otherwise group them under a parent item
      */
-    getModuleSpecificStructure(module, menuItems) {
+    getModuleSpecificStructure(module, menuItems, groupName) {
         const moduleItems = menuItems.filter((menuItem) => menuItem.module === module);
         if (moduleItems.length > 1) {
             const moduleInfo = this.adaptableInstance.ModuleService.getModuleInfoByModule(module);
-            return [this.buildMenuGroupParent(module, moduleItems)];
+            return [this.buildMenuGroupParent(module, moduleItems, { groupName })];
         }
         else {
             return moduleItems;
@@ -352,25 +364,25 @@ export class AgGridMenuAdapter {
             ? [
                 this.buildMenuGroupParent('Export', exportMenuItems.filter((item) => item.name.startsWith('export-visual-data-excel')), {
                     label: 'Visual Data',
-                    icon: false,
+                    icon: 'export-data',
                 }),
             ]
             : [];
         const allDataExportItems = this.normalizeMenuGroup(this.buildMenuGroupParent('Export', exportMenuItems.filter((item) => item.name.startsWith('export-all-data')), {
             label: 'All Data',
-            icon: false,
+            icon: 'export-data',
         }));
         const currentDataExportItems = this.normalizeMenuGroup(this.buildMenuGroupParent('Export', exportMenuItems.filter((item) => item.name.startsWith('export-current-data')), {
             label: 'Current Data',
-            icon: false,
+            icon: 'export-data',
         }));
         const selectedCellsExportItems = this.normalizeMenuGroup(this.buildMenuGroupParent('Export', exportMenuItems.filter((item) => item.name.startsWith('export-selected-cells')), {
             label: 'Selected Cells',
-            icon: false,
+            icon: 'export-data',
         }));
         const selectedRowsExportItems = this.normalizeMenuGroup(this.buildMenuGroupParent('Export', exportMenuItems.filter((item) => item.name.startsWith('export-selected-rows')), {
             label: 'Selected Rows',
-            icon: false,
+            icon: 'export-data',
         }));
         return this.normalizeMenuGroup(this.buildMenuGroupParent('Export', [
             ...visualDataExportItems,
@@ -381,6 +393,7 @@ export class AgGridMenuAdapter {
         ], {
             label: 'Export',
             icon: 'export',
+            groupName: 'export-group',
         }));
     }
     getLayoutContextMenuStructure(menuItems) {
@@ -398,14 +411,14 @@ export class AgGridMenuAdapter {
         return [gridActionsItems, otherLayoutItems];
     }
     buildMenuGroupParent(module, menuItems, config) {
-        var _a, _b;
+        var _a, _b, _c;
         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: (_b = config === null || config === void 0 ? void 0 : config.label) !== null && _b !== void 0 ? _b : moduleInfo.FriendlyName,
+            name: (_b = config === null || config === void 0 ? void 0 : config.groupName) !== null && _b !== void 0 ? _b : 'menu-group',
+            label: (_c = config === null || config === void 0 ? void 0 : config.label) !== null && _c !== void 0 ? _c : moduleInfo.FriendlyName,
             isVisible: true,
             module: moduleInfo.ModuleName,
             icon,
@@ -424,7 +437,7 @@ export class AgGridMenuAdapter {
         // CustomSort
         const customSortMenuItems = this.getModuleSpecificStructure('CustomSort', availableMenuItems);
         // Dashboard
-        const dashboardMenuItems = this.getModuleSpecificStructure('Dashboard', availableMenuItems);
+        const dashboardMenuItems = this.getModuleSpecificStructure('Dashboard', availableMenuItems, 'dashboard-group');
         // DataImport
         const dataImportMenuItems = this.getModuleSpecificStructure('DataImport', availableMenuItems);
         // FlashingCell
@@ -451,8 +464,7 @@ export class AgGridMenuAdapter {
         const gridMenuItem = {
             name: 'grid-group',
             label: 'Grid',
-            // TODO
-            module: 'ColumnInfo',
+            module: 'Group',
             isVisible: true,
             icon: {
                 name: 'grid',
@@ -470,8 +482,7 @@ export class AgGridMenuAdapter {
         const columnMenuItem = {
             name: 'column-group',
             label: 'Column',
-            // TODO
-            module: 'ColumnInfo',
+            module: 'Group',
             isVisible: true,
             icon: {
                 name: 'columns',
@@ -489,8 +500,7 @@ export class AgGridMenuAdapter {
         const createStyleMenuItem = {
             name: 'styling-group',
             label: 'Styling',
-            // TODO
-            module: 'ColumnInfo',
+            module: 'Group',
             isVisible: true,
             icon: {
                 name: 'brush',
@@ -549,26 +559,27 @@ export class AgGridMenuAdapter {
         return styledColumnMenuItems;
     }
     mapAdaptableMenuItemToSystemMenuItems(adaptableMenuItems) {
-        return (adaptableMenuItems !== null && adaptableMenuItems !== void 0 ? adaptableMenuItems : []).map((menuItem) => {
+        if (!adaptableMenuItems) {
+            return;
+        }
+        return adaptableMenuItems.map((menuItem) => {
             if (menuItem === '-') {
                 return menuItem;
             }
-            let subItems = menuItem.subItems;
-            if (subItems && subItems.length > 0) {
-                subItems = subItems.map((subItem) => this.mapAdaptableMenuItemToSystemMenuItems(subItem.subItems));
-            }
+            // @ts-ignore
+            const subItems = this.mapAdaptableMenuItemToSystemMenuItems(menuItem.subItems);
             return Object.assign(Object.assign({}, menuItem), { menuType: 'Adaptable', subItems });
         });
     }
     createAdaptableColumnMenuItems(menuContext) {
-        let contextMenuItems = [];
+        let columnMenuItems = [];
         this.adaptableInstance.adaptableModules.forEach((s) => {
             let menuItems = s.createColumnMenuItems(menuContext.adaptableColumn);
             if (menuItems) {
-                contextMenuItems.push(...menuItems.filter(Boolean).filter((item) => item.isVisible !== false));
+                columnMenuItems.push(...menuItems.filter(Boolean).filter((item) => item.isVisible !== false));
             }
         });
-        return contextMenuItems;
+        return columnMenuItems;
     }
     // TODO AFL MIG: pretty sure this logic is duplicated in several other places
     mapAdaptableIconToAgGridIcon(adaptableIcon, style) {

package/src/agGrid/BadgeRenderer.js

@@ -17,7 +17,7 @@ export const getBadgeRendererForColumn = (badgeStyle, abColumn, api) => {
             const isSummaryRow = adapatableApi.gridApi.isSummaryNode(params.node);
             let shouldRender = true;
             if (isGroupedRow) {
-                if ((_a = badgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupedRows) {
+                if ((_a = badgeStyle.RowScope) === null || _a === void 0 ? void 0 : _a.ExcludeGroupRows) {
                     shouldRender = false;
                 }
             }

package/src/agGrid/PercentBarRenderer.js

@@ -13,7 +13,7 @@ export const getPercentBarRendererForColumn = (styledColumn, abColumn, api) => {
             if (Helper.objectNotExists(value)) {
                 value = 0;
             }
-            // No longer support showing Percent Bar in Grouped Rows
+            // We no longer support showing Percent Bar in Group Rows as it only made sense for Min / Max
             if (api.gridApi.isGroupRowNode(params.node)) {
                 if (params.value) {
                     this.eGui = document.createElement('div');

package/src/components/Accordion.d.ts

@@ -0,0 +1,7 @@
+import React, { ReactElement } from 'react';
+interface AccordionProps {
+    title: string | ReactElement;
+    children: ReactElement;
+}
+export declare const Accordion: React.FC<AccordionProps>;
+export default Accordion;

package/src/components/Accordion.js

@@ -0,0 +1,36 @@
+import React, { useState, useEffect, useRef } from 'react';
+import SimpleButton from './SimpleButton';
+import Panel from './Panel';
+export const Accordion = ({ title, children }) => {
+    const [isOpen, setIsOpen] = useState(false);
+    const [height, setHeight] = useState('0px');
+    const content = useRef(null);
+    const observer = useRef(null);
+    useEffect(() => {
+        setHeight(isOpen && content.current ? `${content.current.scrollHeight}px` : '0px');
+    }, [isOpen, content]);
+    useEffect(() => {
+        if (content.current) {
+            observer.current = new MutationObserver(() => {
+                var _a;
+                setHeight(`${(_a = content.current) === null || _a === void 0 ? void 0 : _a.scrollHeight}px`);
+            });
+            observer.current.observe(content.current, { childList: true, subtree: true });
+        }
+        return () => {
+            var _a;
+            (_a = observer.current) === null || _a === void 0 ? void 0 : _a.disconnect();
+        };
+    }, []);
+    const toggleAccordion = () => {
+        setIsOpen(!isOpen);
+    };
+    return (React.createElement(Panel, { className: "ab-Accordion" },
+        React.createElement(SimpleButton, { iconPosition: 'end', icon: isOpen ? 'expand-all' : 'collapse-all', variant: "text", onClick: toggleAccordion, style: { width: '100%', textAlign: 'left' } }, title),
+        React.createElement("div", { ref: content, style: {
+                maxHeight: `${height}`,
+                overflow: 'hidden',
+                transition: 'max-height 0.6s ease',
+            } }, children)));
+};
+export default Accordion;

package/src/components/icons/collapse-all.d.ts

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

package/src/components/icons/collapse-all.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: "m296-80-56-56 240-240 240 240-56 56-184-184L296-80Zm184-504L240-824l56-56 184 184 184-184 56 56-240 240Z" })));

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

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

package/src/components/icons/csv.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: "M230-360h120v-60H250v-120h100v-60H230q-17 0-28.5 11.5T190-560v160q0 17 11.5 28.5T230-360Zm156 0h120q17 0 28.5-11.5T546-400v-60q0-17-11.5-31.5T506-506h-60v-34h100v-60H426q-17 0-28.5 11.5T386-560v60q0 17 11.5 30.5T426-456h60v36H386v60Zm264 0h60l70-240h-60l-40 138-40-138h-60l70 240ZM160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm0-80h640v-480H160v480Zm0 0v-480 480Z" })));

package/src/components/icons/data-object.d.ts

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

package/src/components/icons/data-object.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: "M560-160v-80h120q17 0 28.5-11.5T720-280v-80q0-38 22-69t58-44v-14q-36-13-58-44t-22-69v-80q0-17-11.5-28.5T680-720H560v-80h120q50 0 85 35t35 85v80q0 17 11.5 28.5T840-560h40v160h-40q-17 0-28.5 11.5T800-360v80q0 50-35 85t-85 35H560Zm-280 0q-50 0-85-35t-35-85v-80q0-17-11.5-28.5T120-400H80v-160h40q17 0 28.5-11.5T160-600v-80q0-50 35-85t85-35h120v80H280q-17 0-28.5 11.5T240-680v80q0 38-22 69t-58 44v14q36 13 58 44t22 69v80q0 17 11.5 28.5T280-240h120v80H280Z" })));

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

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

package/src/components/icons/excel.js

@@ -0,0 +1,5 @@
+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: "M200-200h80v-80h-80v80Zm160 0h80v-80h-80v80Zm160 0h80v-80h-80v80Zm160 0h80v-80h-80v80ZM200-680h80v-80h-80v80Zm0 160h80v-80h-80v80Zm0 160h80v-80h-80v80Zm160-320h80v-80h-80v80Zm0 160h80v-80h-80v80Zm0 160h80v-80h-80v80Zm160-320h80v-80h-80v80Zm0 160h80v-80h-80v80Zm0 160h80v-80h-80v80Zm160-320h80v-80h-80v80Zm0 160h80v-80h-80v80Zm0 160h80v-80h-80v80ZM200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Z" }),
+    ' '));

package/src/components/icons/expand-all.d.ts

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

package/src/components/icons/expand-all.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: "M480-80 240-320l57-57 183 183 183-183 57 57L480-80ZM298-584l-58-56 240-240 240 240-58 56-182-182-182 182Z" })));

package/src/components/icons/index.js

@@ -36,6 +36,8 @@ import SortAsc from './sort-asc';
 import SortDesc from './sort-desc';
 import Calendar from './calendar';
 import Delete from './delete';
+import CSV from './csv';
+import Excel from './excel';
 import CheckCircle from './check-circle';
 import Refresh from './refresh';
 import Save from './save';
@@ -52,6 +54,7 @@ import CellValidation from './cell-validation';
 import ColumnFilter from './column-filter';
 import SystemStatus from './system-status';
 import DataSet from './data-set';
+import DataObject from './data-object';
 import FlashingCell from './flashing-cell';
 import edit from './edit';
 import Equation from './equation';
@@ -162,6 +165,8 @@ import SelectAll from './select-all';
 import SelectOff from './select-off';
 import SelectFwd from './select-fwd';
 import Copy from './copy';
+import ExpandAll from './expand-all';
+import CollapseAll from './collapse-all';
 import { IconComponent } from '../Icon';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
 export const allIcons = {
@@ -183,6 +188,8 @@ export const allIcons = {
     news: News,
     brush: Brush,
     'data-set': DataSet,
+    'excel': Excel,
+    json: DataObject,
     export: Export,
     broadcast: Campaign,
     theme: Theme,
@@ -202,6 +209,7 @@ export const allIcons = {
     'percent-tag': PercentBar,
     'spark-line': Sparkline,
     resume: Resume,
+    csv: CSV,
     'pie-chart': PieChart,
     'add-circle': PlusMinus,
     reminder: Reminder,
@@ -327,6 +335,8 @@ export const allIcons = {
     note: Note,
     comments: Comments,
     rows: Rows,
+    'expand-all': ExpandAll,
+    'collapse-all': CollapseAll,
 };
 Object.keys(allIcons).forEach((name) => {
     const ReactCmp = allIcons[name];

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: 1712828124306 || Date.now(),
-    VERSION: "18.0.0-canary.32" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1712926394596 || Date.now(),
+    VERSION: "18.0.0-canary.34" || '--current-version--',
 };

package/src/metamodel/adaptable.metamodel.d.ts

@@ -357,6 +357,11 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
         }[];
     };
+    AdaptableColumnMenuItem: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     AdaptableColumnPredicate: {
         name: string;
         kind: string;
@@ -413,6 +418,11 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         }[];
     };
+    AdaptableContextMenuItem: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     AdaptableCoordinate: {
         name: string;
         kind: string;