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

package/src/agGrid/AgGridMenuAdapter.js

@@ -133,6 +133,9 @@ export class AgGridMenuAdapter {
     }
     mapAdaptableMenuItemToAgGridMenuDefinition(adaptableMenuItem) {
         var _a;
+        if (adaptableMenuItem === '-') {
+            return 'separator';
+        }
         return {
             name: adaptableMenuItem.label,
             action: adaptableMenuItem.onClick
@@ -218,7 +221,7 @@ export class AgGridMenuAdapter {
         // GridInfo
         const gridInfoMenuItems = this.getModuleSpecificStructure('GridInfo', availableMenuItems);
         // Layout
-        const layoutMenuItems = this.getLayoutContextMenuStructure(availableMenuItems);
+        const [gridActionItems, otherLayoutItems] = this.getLayoutContextMenuStructure(availableMenuItems);
         // Note
         const noteMenuItems = this.getModuleSpecificStructure('Note', availableMenuItems);
         // SettingsPanel
@@ -227,25 +230,56 @@ export class AgGridMenuAdapter {
         const smartEditMenuItems = this.getModuleSpecificStructure('SmartEdit', availableMenuItems);
         // SystemStatus
         const systemStatusMenuItems = this.getModuleSpecificStructure('SystemStatus', availableMenuItems);
+        /**
+         * Custom structures
+         */
+        const gridMenuItem = {
+            name: 'grid-group',
+            label: 'Grid',
+            // TODO
+            module: 'ColumnInfo',
+            isVisible: true,
+            icon: {
+                name: 'grid',
+            },
+            subItems: [
+                ...gridActionItems,
+                ...otherLayoutItems,
+                ...cellSummaryMenuItems,
+                ...dataImportMenuItems,
+                ...systemStatusMenuItems,
+                ...gridInfoMenuItems,
+            ],
+        };
+        const columnMenuItem = {
+            name: 'column-group',
+            label: 'Column',
+            // TODO
+            module: 'ColumnInfo',
+            isVisible: true,
+            icon: {
+                name: 'columns',
+            },
+            subItems: [
+                ...bulkUpdateMenuItems,
+                ...smartEditMenuItems,
+                ...calculatedColumnMenuItems,
+                ...columnInfoMenuItems,
+            ],
+        };
         return [
-            ...alertMenuItems,
-            ...bulkUpdateMenuItems,
-            ...calculatedColumnMenuItems,
-            ...cellSummaryMenuItems,
-            ...columnFilterMenuItems,
-            ...columnInfoMenuItems,
+            ...noteMenuItems,
             ...commentMenuItems,
+            '-',
+            ...settingsPanelMenuItems,
             ...dashboardMenuItems,
-            ...dataImportMenuItems,
+            ...columnFilterMenuItems,
+            gridMenuItem,
+            columnMenuItem,
             ...exportMenuItems,
-            ...fdc3MenuItems,
             ...flashingCellMenuItems,
-            ...gridInfoMenuItems,
-            ...layoutMenuItems,
-            ...noteMenuItems,
-            ...settingsPanelMenuItems,
-            ...smartEditMenuItems,
-            ...systemStatusMenuItems,
+            ...alertMenuItems,
+            ...fdc3MenuItems,
         ];
     }
     /**
@@ -299,7 +333,7 @@ export class AgGridMenuAdapter {
     getLayoutContextMenuStructure(menuItems) {
         const layoutMenuItems = menuItems.filter((menuItem) => menuItem.module === 'Layout');
         if (!layoutMenuItems.length) {
-            return [];
+            return [[], []];
         }
         const gridActionsItemNames = [
             'layout-clear-selection',
@@ -308,19 +342,13 @@ export class AgGridMenuAdapter {
         ];
         const gridActionsItems = layoutMenuItems.filter((item) => gridActionsItemNames.includes(item.name));
         const otherLayoutItems = layoutMenuItems.filter((item) => !gridActionsItemNames.includes(item.name));
-        return [
-            this.buildMenuGroupParent('Layout', gridActionsItems, {
-                label: 'Grid',
-                icon: 'align-justify',
-            }),
-            ...otherLayoutItems,
-        ];
+        return [gridActionsItems, otherLayoutItems];
     }
     buildMenuGroupParent(module, menuItems, config) {
         var _a, _b;
         const moduleInfo = this.adaptableInstance.ModuleService.getModuleInfoByModule(module);
         return {
-            name: 'menu-group-parent',
+            name: 'menu-group',
             label: (_a = config === null || config === void 0 ? void 0 : config.label) !== null && _a !== void 0 ? _a : moduleInfo.FriendlyName,
             isVisible: true,
             module: moduleInfo.ModuleName,
@@ -336,7 +364,7 @@ export class AgGridMenuAdapter {
         // CellSummary
         const cellSummaryMenuItems = this.getModuleSpecificStructure('CellSummary', availableMenuItems);
         // ColumnFilter
-        const columnFilterMenuItems = this.getModuleSpecificStructure('ColumnFilter', availableMenuItems);
+        const [columnFilterGroup, filterVisibilityItems] = this.getColumnFilterColumnMenuStructure(availableMenuItems);
         // ColumnInfo
         const columnInfoMenuItems = this.getModuleSpecificStructure('ColumnInfo', availableMenuItems);
         // CustomSort
@@ -354,7 +382,7 @@ export class AgGridMenuAdapter {
         // GridInfo
         const gridInfoMenuItems = this.getModuleSpecificStructure('GridInfo', availableMenuItems);
         // Layout
-        const layoutMenuItems = this.getLayoutColumnMenuStructure(availableMenuItems);
+        const [gridSelectItems, columnSelectItems, columnActionGroup, otherLayoutItems] = this.getLayoutColumnMenuStructure(availableMenuItems);
         // PlusMinus
         const plusMinusMenuItems = this.getModuleSpecificStructure('PlusMinus', availableMenuItems);
         // SettingsPanel
@@ -363,62 +391,114 @@ export class AgGridMenuAdapter {
         const styledColumnMenuItems = this.getStyledColumnColumnMenuStructure(availableMenuItems);
         // SystemStatus
         const systemStatusMenuItems = this.getModuleSpecificStructure('SystemStatus', availableMenuItems);
+        /**
+         * Custom structures
+         */
+        const gridMenuItem = {
+            name: 'grid-group',
+            label: 'Grid',
+            // TODO
+            module: 'ColumnInfo',
+            isVisible: true,
+            icon: {
+                name: 'grid',
+            },
+            subItems: [
+                ...otherLayoutItems,
+                ...filterVisibilityItems,
+                ...gridSelectItems,
+                ...cellSummaryMenuItems,
+                ...dataImportMenuItems,
+                ...systemStatusMenuItems,
+                ...gridInfoMenuItems,
+            ],
+        };
+        const columnMenuItem = {
+            name: 'column-group',
+            label: 'Column',
+            // TODO
+            module: 'ColumnInfo',
+            isVisible: true,
+            icon: {
+                name: 'columns',
+            },
+            subItems: [
+                ...columnActionGroup,
+                ...calculatedColumnMenuItems,
+                ...freeTextColumnMenuItems,
+                ...customSortMenuItems,
+                ...plusMinusMenuItems,
+                ...columnSelectItems,
+                ...columnInfoMenuItems,
+            ],
+        };
+        const createStyleMenuItem = {
+            name: 'styling-group',
+            label: 'Styling',
+            // TODO
+            module: 'ColumnInfo',
+            isVisible: true,
+            icon: {
+                name: 'brush',
+            },
+            subItems: [...flashingCellMenuItems, ...formatColumnMenuItems, ...styledColumnMenuItems],
+        };
         return [
-            ...calculatedColumnMenuItems,
-            ...cellSummaryMenuItems,
-            ...columnFilterMenuItems,
-            ...columnInfoMenuItems,
-            ...customSortMenuItems,
-            ...dashboardMenuItems,
-            ...dataImportMenuItems,
-            ...flashingCellMenuItems,
-            ...formatColumnMenuItems,
-            ...freeTextColumnMenuItems,
-            ...gridInfoMenuItems,
-            ...layoutMenuItems,
-            ...plusMinusMenuItems,
             ...settingsPanelMenuItems,
-            ...styledColumnMenuItems,
-            ...systemStatusMenuItems,
+            ...dashboardMenuItems,
+            ...columnFilterGroup,
+            createStyleMenuItem,
+            gridMenuItem,
+            columnMenuItem,
         ];
     }
+    getColumnFilterColumnMenuStructure(menuItems) {
+        const columnFilterMenuItems = menuItems.filter((menuItem) => menuItem.module === 'ColumnFilter');
+        const filterVisibilityItems = columnFilterMenuItems.filter((item) => ['column-filter-bar-hide', 'column-filter-bar-show'].includes(item.name));
+        const filterActionItems = columnFilterMenuItems.filter((item) => ['column-filter-clear', 'column-filter-suspend', 'column-filter-unsuspend'].includes(item.name));
+        const columnFilterGroup = filterActionItems.length
+            ? [
+                {
+                    name: 'column-filter-group',
+                    label: 'Filter',
+                    module: 'ColumnFilter',
+                    isVisible: true,
+                    icon: {
+                        name: 'filter',
+                    },
+                    subItems: filterActionItems,
+                },
+            ]
+            : [];
+        return [columnFilterGroup, filterVisibilityItems];
+    }
     getLayoutColumnMenuStructure(menuItems) {
         const layoutMenuItems = menuItems.filter((menuItem) => menuItem.module === 'Layout');
         if (!layoutMenuItems.length) {
-            return [];
+            return [[], [], [], []];
         }
-        const selectActionsItemNames = [
+        const columnSelectItemNames = [
             'layout-column-select-preserve',
             'layout-column-select-reset',
             'layout-column-select',
-            'layout-select-all',
-        ];
-        const selectActionsItems = layoutMenuItems.filter((item) => selectActionsItemNames.includes(item.name));
-        const otherLayoutItems = layoutMenuItems.filter((item) => !selectActionsItemNames.includes(item.name));
-        return [
-            ...otherLayoutItems,
-            this.buildMenuGroupParent('Layout', selectActionsItems, {
-                label: 'Select',
-                icon: 'tab-unselected',
-            }),
         ];
+        const columnSelectItems = layoutMenuItems.filter((item) => columnSelectItemNames.includes(item.name));
+        const gridSelectItems = layoutMenuItems.filter((item) => item.name === 'layout-grid-select');
+        const columnActionGroup = layoutMenuItems.filter((item) => ['layout-column-caption-change', 'layout-column-hide'].includes(item.name));
+        const otherLayoutItems = layoutMenuItems.filter((item) => !columnSelectItemNames.includes(item.name) &&
+            !['layout-column-caption-change', 'layout-column-hide'].includes(item.name) &&
+            item.name !== 'layout-grid-select');
+        return [gridSelectItems, columnSelectItems, columnActionGroup, otherLayoutItems];
     }
     getStyledColumnColumnMenuStructure(menuItems) {
         const styledColumnMenuItems = menuItems.filter((menuItem) => menuItem.module === 'StyledColumn');
-        if (!styledColumnMenuItems.length) {
-            return [];
-        }
-        if (styledColumnMenuItems.length === 1) {
-            return styledColumnMenuItems;
-        }
-        return [
-            this.buildMenuGroupParent('StyledColumn', styledColumnMenuItems, {
-                label: 'Create Styled Column',
-            }),
-        ];
+        return styledColumnMenuItems;
     }
     mapAdaptableMenuItemToSystemMenuItems(adaptableMenuItems) {
         return (adaptableMenuItems !== null && adaptableMenuItems !== void 0 ? adaptableMenuItems : []).map((menuItem) => {
+            if (menuItem === '-') {
+                return menuItem;
+            }
             let subItems = menuItem.subItems;
             if (subItems && subItems.length > 0) {
                 subItems = subItems.map((subItem) => this.mapAdaptableMenuItemToSystemMenuItems(subItem.subItems));

package/src/components/icons/filter-off.d.ts

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

package/src/components/icons/filter-off.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: "m592-481-57-57 143-182H353l-80-80h487q25 0 36 22t-4 42L592-481ZM791-56 560-287v87q0 17-11.5 28.5T520-160h-80q-17 0-28.5-11.5T400-200v-247L56-791l56-57 736 736-57 56ZM535-538Z" })));

package/src/components/icons/grid-info.d.ts

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

package/src/components/icons/grid-info.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: "M143-192v-72h432v72H143Zm480.774-240Q544-432 488-488.226t-56-136Q432-704 488.226-760t136-56Q704-816 760-759.774t56 136Q816-544 759.774-488t-136 56ZM143-492v-72h224q5 20 12 37.5t17 34.5H143Zm0 150v-72h322q24.227 18.242 51.613 30.621Q544-371 575-365v23H143Zm457-186h48v-96h-48v96Zm24-144q9.6 0 16.8-7.2 7.2-7.2 7.2-16.8 0-9.6-7.2-16.8-7.2-7.2-16.8-7.2-9.6 0-16.8 7.2-7.2 7.2-7.2 16.8 0 9.6 7.2 16.8 7.2 7.2 16.8 7.2Z" })));

package/src/components/icons/index.js

@@ -100,6 +100,7 @@ import Expand from './expand';
 import ArrowExpand from './arrow-expand';
 import History from './history';
 import Filter from './filter';
+import FilterOff from './filter-off';
 import Close from './close';
 import Function from './function';
 import GreaterThanOrEqual from './greater-than-or-equal';
@@ -139,6 +140,7 @@ import Lowercase from './case-lower';
 import Uppercase from './case-upper';
 import SentenceCase from './case-sentence';
 import GridFilter from './grid-filter';
+import GridInfo from './grid-info';
 import Rows from './rows';
 import Quote from './quote';
 import News from './news';
@@ -156,6 +158,9 @@ import Order from './order';
 import Contact from './contact';
 import Note from './note';
 import Comments from './comments';
+import SelectAll from './select-all';
+import SelectOff from './select-off';
+import SelectFwd from './select-fwd';
 import { IconComponent } from '../Icon';
 import { AdaptableLogger } from '../../agGrid/AdaptableLogger';
 export const allIcons = {
@@ -184,7 +189,9 @@ export const allIcons = {
     chat: Chat,
     'filter-list': ColumnFilter,
     'grid-filter': GridFilter,
+    'grid-info': GridInfo,
     filter: Filter,
+    'filter-off': FilterOff,
     'search-table': QuickSearch,
     lightning: FlashingCell,
     'color-palette': FormatColumn,
@@ -211,6 +218,9 @@ export const allIcons = {
     refresh: Refresh,
     delete: Delete,
     'tab-unselected': tabUnselected,
+    'select-all': SelectAll,
+    'select-off': SelectOff,
+    'select-fwd': SelectFwd,
     checked: checkBox,
     unchecked: checkBoxOutline,
     'boolean-list': booleanList,

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

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

package/src/components/icons/select-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: "M280-280v-400h400v400H280Zm80-80h240v-240H360v240ZM200-200v80q-33 0-56.5-23.5T120-200h80Zm-80-80v-80h80v80h-80Zm0-160v-80h80v80h-80Zm0-160v-80h80v80h-80Zm80-160h-80q0-33 23.5-56.5T200-840v80Zm80 640v-80h80v80h-80Zm0-640v-80h80v80h-80Zm160 640v-80h80v80h-80Zm0-640v-80h80v80h-80Zm160 640v-80h80v80h-80Zm0-640v-80h80v80h-80Zm160 640v-80h80q0 33-23.5 56.5T760-120Zm0-160v-80h80v80h-80Zm0-160v-80h80v80h-80Zm0-160v-80h80v80h-80Zm0-160v-80q33 0 56.5 23.5T840-760h-80Z" })));

package/src/components/icons/select-fwd.d.ts

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

package/src/components/icons/select-fwd.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: "m672-336-51-51 57-57H432v-72h246l-57-57 51-51 144 144-144 144ZM216-216h78v-528h-78v528Zm-72 72v-672h222v672H144Zm300 0v-72h72v72h-72Zm0-600v-72h72v72h-72Zm150 600v-72h72v72h-72Zm0-600v-72h72v72h-72Zm150 600v-72h72v72h-72Zm0-600v-72h72v72h-72ZM216-216h78-78Z" })));

package/src/components/icons/select-off.d.ts

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

package/src/components/icons/select-off.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: "m507-144-51-51 129.053-129.053L456-453.106 506.894-504l129.053 129.053L765-504l51 51-129.053 129.053L816-194.894 765.106-144 636.053-273.053 507-144Zm-213 0v-72h72v72h-72Zm-78-600h-72q0-29.7 21.15-50.85Q186.3-816 216-816v72Zm78 0v-72h72v72h-72Zm150 0v-72h72v72h-72Zm150 0v-72h72v72h-72Zm150 0v-72q29.7 0 50.85 21.15Q816-773.7 816-744h-72ZM216-216v72q-29.7 0-50.85-21.15Q144-186.3 144-216h72Zm-72-78v-72h72v72h-72Zm0-150v-72h72v72h-72Zm0-150v-72h72v72h-72Zm600 0v-72h72v72h-72Z" })));

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: 1712613802729 || Date.now(),
-    VERSION: "18.0.0-canary.27" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1712667835989 || Date.now(),
+    VERSION: "18.0.0-canary.28" || '--current-version--',
 };