@adaptabletools/adaptable 11.3.0 → 12.0.0-canary.0

package/src/agGrid/agGridHelper.js

@@ -11,7 +11,7 @@ const CellSummaryModule_1 = require("../Strategy/CellSummaryModule");
 const ConditionalStyleModule_1 = require("../Strategy/ConditionalStyleModule");
 const CustomSortModule_1 = require("../Strategy/CustomSortModule");
 const DashboardModule_1 = require("../Strategy/DashboardModule");
-const DataSourceModule_1 = require("../Strategy/DataSourceModule");
+const DataSetModule_1 = require("../Strategy/DataSetModule");
 const ExportModule_1 = require("../Strategy/ExportModule");
 const FilterModule_1 = require("../Strategy/FilterModule");
 const FormatColumnModule_1 = require("../Strategy/FormatColumnModule");
@@ -41,6 +41,8 @@ const ChartingModule_1 = require("../Strategy/ChartingModule");
 const PercentBarRenderer_1 = require("./PercentBarRenderer");
 const Helper_1 = require("../Utilities/Helpers/Helper");
 const StatusBarModule_1 = require("../Strategy/StatusBarModule");
+const GeneralConstants = tslib_1.__importStar(require("../Utilities/Constants/GeneralConstants"));
+const UIHelper_1 = tslib_1.__importDefault(require("../View/UIHelper"));
 const tinycolor = require('tinycolor2');
 /**
  * Adaptable AG Grid implementation is getting really big and unwieldy
@@ -79,7 +81,7 @@ class agGridHelper {
         modules.set(ModuleConstants.ConditionalStyleModuleId, new ConditionalStyleModule_1.ConditionalStyleModule(api));
         modules.set(ModuleConstants.CustomSortModuleId, new CustomSortModule_1.CustomSortModule(api));
         modules.set(ModuleConstants.DataChangeHistoryModuleId, new DataChangeHistoryModule_1.DataChangeHistoryModule(api));
-        modules.set(ModuleConstants.DataSourceModuleId, new DataSourceModule_1.DataSourceModule(api));
+        modules.set(ModuleConstants.DataSetModuleId, new DataSetModule_1.DataSetModule(api));
         modules.set(ModuleConstants.ExportModuleId, new ExportModule_1.ExportModule(api));
         modules.set(ModuleConstants.FilterModuleId, new FilterModule_1.FilterModule(api));
         modules.set(ModuleConstants.FormatColumnModuleId, new FormatColumnModule_1.FormatColumnModule(api));
@@ -155,7 +157,11 @@ class agGridHelper {
     createAdaptableColumnFromAgGridColumn(agGridColumn, colsToGroups) {
         const colId = agGridColumn.getColId();
         const colDef = agGridColumn.getColDef();
-        const FriendlyName = this.gridOptions.columnApi.getDisplayNameForColumn(agGridColumn, 'header');
+        const columnFriendlyName = this.adaptable.adaptableOptions.columnOptions.columnFriendlyName;
+        const customFriendlyName = typeof columnFriendlyName === 'function'
+            ? columnFriendlyName({ colId: colId, agColumn: agGridColumn })
+            : null;
+        const FriendlyName = customFriendlyName !== null && customFriendlyName !== void 0 ? customFriendlyName : this.gridOptions.columnApi.getDisplayNameForColumn(agGridColumn, 'header');
         if (!this.initialAgGridColDefs[colId]) {
             this.initialAgGridColDefs[colId] = Object.assign({}, agGridColumn.getUserProvidedColDef());
         }
@@ -203,55 +209,26 @@ class agGridHelper {
         }
         return abColumn;
     }
-    createAdaptableSideBarDefs(showFilterPanel, showColumnsPanel) {
-        const toolPanelDef = [];
-        if (showFilterPanel) {
-            const filterToolPanel = {
-                id: 'filters',
-                labelDefault: 'Filters',
-                labelKey: 'filters',
-                iconKey: 'filter',
-                toolPanel: 'agFiltersToolPanel',
-            };
-            toolPanelDef.push(filterToolPanel);
-        }
-        if (showColumnsPanel) {
-            const columnsToolPanel = {
-                id: 'columns',
-                labelDefault: 'Columns',
-                labelKey: 'columns',
-                iconKey: 'columns',
-                toolPanel: 'agColumnsToolPanel',
-            };
-            toolPanelDef.push(columnsToolPanel);
-        }
-        toolPanelDef.push(this.createAdaptableToolPanel());
-        this.orderToolPanels(toolPanelDef);
-        const abSideBarDef = {
-            toolPanels: toolPanelDef,
-            defaultToolPanel: '',
-        };
-        return abSideBarDef;
-    }
-    createAdaptableToolPanel() {
+    buildAdaptableToolPanelDef() {
         return {
-            id: 'adaptable',
-            toolPanel: 'AdaptableToolPanel',
-            labelDefault: this.adaptable.adaptableOptions.toolPanelOptions.adaptableToolPanelTitle,
+            id: GeneralConstants.ADAPTABLE_TOOLPANEL_ID,
+            toolPanel: GeneralConstants.ADAPTABLE_TOOLPANEL_COMPONENT,
+            labelDefault: GeneralConstants.ADAPTABLE,
             labelKey: 'adaptable',
-            iconKey: this.adaptable.adaptableOptions.toolPanelOptions.iconKey,
-            width: this.adaptable.adaptableOptions.toolPanelOptions.width,
-            minWidth: this.adaptable.adaptableOptions.toolPanelOptions.minWidth,
-            maxWidth: this.adaptable.adaptableOptions.toolPanelOptions.maxWidth,
+            iconKey: 'menu',
+            width: UIHelper_1.default.getAdaptableToolPanelWidth(),
+            minWidth: UIHelper_1.default.getAdaptableToolPanelWidth(),
         };
     }
-    orderToolPanels(toolPanelDefs) {
-        const customOrder = this.adaptable.adaptableOptions.toolPanelOptions.toolPanelOrder;
-        toolPanelDefs.sort(function (left, right) {
-            const leftOperand = typeof left === 'string' ? left : left.id;
-            const rightOperand = typeof right === 'string' ? right : right.id;
-            return customOrder.indexOf(leftOperand) - customOrder.indexOf(rightOperand);
-        });
+    isSideBarDefObject(sidebarDef) {
+        var _a;
+        return Array.isArray((_a = sidebarDef) === null || _a === void 0 ? void 0 : _a.toolPanels);
+    }
+    mapToolPanelDefs(toolPanelDefs = []) {
+        // if it's an alias for the adaptable tool panel, map it to a ToolPanelDef, otherwise return it as it is
+        return toolPanelDefs.map((toolPanelDef) => toolPanelDef === GeneralConstants.ADAPTABLE_TOOLPANEL_ID
+            ? this.buildAdaptableToolPanelDef()
+            : toolPanelDef);
     }
     // This method reselects cells - only IF they are in a single column
     // Might be able to change that later
@@ -404,12 +381,12 @@ class agGridHelper {
             if (Array.isArray(colType)) {
                 colType.forEach((c) => {
                     if (dataType == Enums_1.DataType.Unknown) {
-                        dataType = this.getabColDefValue(c);
+                        dataType = this.getAbColDefValue(c);
                     }
                 });
             }
             else {
-                dataType = this.getabColDefValue(colType);
+                dataType = this.getAbColDefValue(colType);
             }
             if (dataType != Enums_1.DataType.Unknown) {
                 return dataType;
@@ -463,12 +440,13 @@ class agGridHelper {
         LoggingHelper_1.LogAdaptableWarning(`No defined type for column '${column.getColId()}'. Defaulting to type of first value: ${dataType}`);
         return dataType;
     }
-    getabColDefValue(colType) {
+    getAbColDefValue(colType) {
         if (colType == 'numericColumn') {
             return Enums_1.DataType.Number;
         }
         if (colType.startsWith('abColDef')) {
-            switch (colType) {
+            const abColType = colType;
+            switch (abColType) {
                 case 'abColDefNumber':
                     return Enums_1.DataType.Number;
                 case 'abColDefString':
@@ -508,20 +486,20 @@ class agGridHelper {
     checkShouldClearExistingFiltersOrSearches() {
         // if they have selected to clear column filters on startup then do it
         if (this.adaptable.adaptableOptions.filterOptions.clearFiltersOnStartUp) {
-            if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(this.adaptable.api.filterApi.getAllColumnFilter())) {
+            if (ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(this.adaptable.api.layoutApi.getAllColumnFilter())) {
                 LoggingHelper_1.LogAdaptableWarning('Clearing existing Column Filters as "clearFiltersOnStartUp" is true');
-                this.adaptable.api.filterApi.clearAllColumnFilter();
+                this.adaptable.api.layoutApi.clearAllColumnFilter();
             }
         }
         // if they have selected to clear searches on startup then do it
         if (this.adaptable.adaptableOptions.searchOptions.clearSearchesOnStartUp) {
             if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.adaptable.api.quickSearchApi.getQuickSearchState().QuickSearchText) ||
                 StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.adaptable.api.queryApi.getCurrentQuery()) ||
-                ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(this.adaptable.api.dataSourceApi.getAllDataSource())) {
+                ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(this.adaptable.api.dataSetApi.getAllDataSets())) {
                 LoggingHelper_1.LogAdaptableWarning('Clearing existing Searches as "clearSearchesOnStartUp" is true');
                 this.adaptable.api.quickSearchApi.clearQuickSearch();
                 this.adaptable.api.queryApi.clearCurrentQuery();
-                this.adaptable.api.dataSourceApi.clearDataSource();
+                this.adaptable.api.dataSetApi.clearCurrentDataSet();
             }
         }
     }

package/src/agGrid/agGridMenuHelper.js

@@ -52,6 +52,9 @@ class agGridMenuHelper {
         }));
     }
     buildContextMenu(params, originalgetContextMenuItems) {
+        // 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.adaptable.setSelectedCells();
         let agGridContextMenuItems = [];
         let adaptableContextMenuItems = [];
         let userContextMenuItems = [];
@@ -240,7 +243,7 @@ class agGridMenuHelper {
                 isSingleSelectedColumn = ArrayExtensions_1.ArrayExtensions.CorrectLength(selectedCellInfo.columns, 1);
             }
         }
-        let selectedRowInfo = this.adaptable.setSelectedRows();
+        let selectedRowInfo = this.adaptable.api.gridApi.getSelectedRowInfo();
         return {
             isSelectedCell: isSelectedCell,
             gridCell: clickedCell,

package/src/components/AdaptableFormComponent/AdaptableFormComponent.js

@@ -19,14 +19,15 @@ function AdaptableFormComponentButtons({ formDef, onClick, defaultTone, disabled
                 width: 15,
             },
         };
-        const iconProps = button.icon && Object.assign({}, defaultIconProps, button.icon);
+        const buttonIcon = api.internalApi.getIconForButton(button, context);
+        const iconProps = buttonIcon && Object.assign({}, defaultIconProps, buttonIcon);
         let buttonStyle = api.internalApi.getStyleForButton(button, context ? context : { adaptableApi: api });
         let buttonLabel = api.internalApi.getLabelForButton(button, context ? context : { adaptableApi: api });
         let buttonTooltip = api.internalApi.getTooltipForButton(button, context ? context : { adaptableApi: api });
         return (React.createElement(SimpleButton_1.default, { autoFocus: focusFirstButton && index === 0, disabled: disabledButtons[index], key: index, tooltip: buttonTooltip, tone: (_a = buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.tone) !== null && _a !== void 0 ? _a : defaultTone, variant: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.variant, "data-text": buttonLabel, className: buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.className, marginLeft: index ? 2 : 0, onClick: () => {
                 onClick(button);
             } },
-            button.icon ? React.createElement("img", Object.assign({}, iconProps)) : null,
+            buttonIcon ? React.createElement("img", Object.assign({}, iconProps)) : null,
             buttonLabel));
     })));
 }

package/src/components/Dashboard/DashboardToolbar.js

@@ -11,8 +11,8 @@ function DashboardToolbar(props) {
         React.createElement("div", { className: "ab-Dashboard__toolbar-content" }, props.children),
         React.createElement(rebass_1.Flex, { className: "ab-Dashboard__toolbar-title", flexDirection: "row", alignItems: "center" },
             React.createElement("span", null, props.title),
-            props.showConfigure && (React.createElement(SimpleButton_1.default, { icon: "build", variant: "text", tone: "none", "data-name": "configure", iconSize: 16, marginLeft: 1, tooltip: props.tooltip || `Configure ${props.title}`, onClick: () => props.onConfigure() })),
+            props.showConfigure && (React.createElement(SimpleButton_1.default, { icon: "build", variant: "text", tone: "none", "data-name": "configure", iconSize: 16, marginLeft: 1, tooltip: props.tooltip || `Configure ${props.title} Toolbar`, onClick: () => props.onConfigure() })),
             ' ',
-            props.showClose && (React.createElement(SimpleButton_1.default, { style: { alignSelf: 'flex-end' }, disabled: props.accessLevel == 'ReadOnly', "data-name": "close", icon: "clear", variant: "text", tone: "none", iconSize: 16, marginLeft: 1, tooltip: props.tooltip || `Close ${props.title}`, onClick: () => props.onClose() })))));
+            props.showClose && (React.createElement(SimpleButton_1.default, { style: { alignSelf: 'flex-end' }, disabled: props.accessLevel == 'ReadOnly', "data-name": "close", icon: "clear", variant: "text", tone: "none", iconSize: 16, marginLeft: 1, tooltip: props.tooltip || `Close ${props.title} Toolbar`, onClick: () => props.onClose() })))));
 }
 exports.DashboardToolbar = DashboardToolbar;

package/src/components/SelectList.d.ts

@@ -0,0 +1,10 @@
+import * as React from 'react';
+export interface SelectListOption {
+    label: string;
+    value: string;
+}
+export interface SelectListProps {
+    options: SelectListOption[];
+    onChange: (option: SelectListOption) => void;
+}
+export declare const SelectList: React.FunctionComponent<SelectListProps>;

package/src/components/SelectList.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SelectList = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const SimpleButton_1 = tslib_1.__importDefault(require("./SimpleButton"));
+exports.SelectList = (props) => {
+    return (React.createElement(React.Fragment, null, props.options.map((option) => (React.createElement(SimpleButton_1.default, { p: 2, width: '100%', variant: "text", onClick: () => props.onChange(option), key: option.label }, option.label)))));
+};

package/src/components/icons/index.js

@@ -56,7 +56,7 @@ const column_filter_1 = tslib_1.__importDefault(require("./column-filter"));
 const column_info_1 = tslib_1.__importDefault(require("./column-info"));
 const custom_sort_1 = tslib_1.__importDefault(require("./custom-sort"));
 const system_status_1 = tslib_1.__importDefault(require("./system-status"));
-const data_source_1 = tslib_1.__importDefault(require("./data-source"));
+const data_set_1 = tslib_1.__importDefault(require("./data-set"));
 const flashing_cell_1 = tslib_1.__importDefault(require("./flashing-cell"));
 const edit_1 = tslib_1.__importDefault(require("./edit"));
 const equation_1 = tslib_1.__importDefault(require("./equation"));
@@ -153,7 +153,7 @@ const allIcons = {
     call: call_1.default,
     instrument: instrument_1.default,
     news: news_1.default,
-    'data-source': data_source_1.default,
+    'data-set': data_set_1.default,
     export: export_1.default,
     campaign: campaign_1.default,
     broadcast: campaign_1.default,

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

@@ -74,6 +74,26 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    ActionOptions: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            defaultValue?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            defaultValue: string;
+        })[];
+    };
     AdaptableAlert: {
         name: string;
         kind: string;
@@ -124,21 +144,13 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
-        properties: ({
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            reference?: undefined;
-        } | {
+        properties: {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
             isOptional: boolean;
-            reference: string;
-        })[];
+        }[];
     };
     AdaptableCalculatedColumnQuery: {
         name: string;
@@ -188,12 +200,24 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
-        properties: {
+        properties: ({
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
-        }[];
+            reference?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        })[];
+    };
+    AdaptableColumnDataType: {
+        name: string;
+        kind: string;
+        description: string;
     };
     AdaptableComparerFunction: {
         name: string;
@@ -436,18 +460,18 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
+            defaultValue: string;
+            reference: string;
             gridInfo?: undefined;
-            defaultValue?: undefined;
-            reference?: undefined;
         } | {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
             isOptional: boolean;
-            defaultValue: string;
-            reference: string;
             gridInfo?: undefined;
+            defaultValue?: undefined;
+            reference?: undefined;
         } | {
             name: string;
             kind: string;
@@ -536,6 +560,15 @@ export declare const ADAPTABLE_METAMODEL: {
             gridInfo: string;
             defaultValue: string;
             reference?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            gridInfo?: undefined;
+            defaultValue?: undefined;
+            reference?: undefined;
         } | {
             name: string;
             kind: string;
@@ -787,6 +820,26 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
     };
+    AlertMessageContext: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+            isOptional?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            reference: string;
+        })[];
+    };
     AlertOptions: {
         name: string;
         kind: string;
@@ -1233,6 +1286,24 @@ export declare const ADAPTABLE_METAMODEL: {
             reference: string;
         })[];
     };
+    ColumnFriendlyNameContext: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference?: undefined;
+        })[];
+    };
     ColumnMenuContext: {
         name: string;
         kind: string;
@@ -1251,6 +1322,28 @@ export declare const ADAPTABLE_METAMODEL: {
             reference?: undefined;
         })[];
     };
+    ColumnOptions: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            gridInfo: string;
+            defaultValue: string;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            gridInfo?: undefined;
+            defaultValue?: undefined;
+        })[];
+    };
     ColumnSort: {
         name: string;
         kind: string;
@@ -1844,7 +1937,15 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
-        properties: {
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            gridInfo?: undefined;
+            defaultValue?: undefined;
+        } | {
             name: string;
             kind: string;
             description: string;
@@ -1852,9 +1953,9 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             gridInfo: string;
             defaultValue: string;
-        }[];
+        })[];
     };
-    DataSource: {
+    DataSet: {
         name: string;
         kind: string;
         description: string;
@@ -1872,7 +1973,7 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
         })[];
     };
-    DataSourceApi: {
+    DataSetApi: {
         name: string;
         kind: string;
         description: string;
@@ -1883,18 +1984,6 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
         }[];
     };
-    DataSourceState: {
-        name: string;
-        kind: string;
-        description: string;
-        properties: {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-        }[];
-    };
     DataUpdateConfig: {
         name: string;
         kind: string;
@@ -2295,26 +2384,6 @@ export declare const ADAPTABLE_METAMODEL: {
             defaultValue: string;
         }[];
     };
-    FilterState: {
-        name: string;
-        kind: string;
-        description: string;
-        properties: ({
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            defaultValue?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            defaultValue: string;
-        })[];
-    };
     FinanceApi: {
         name: string;
         kind: string;
@@ -2589,16 +2658,16 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
-            gridInfo: string;
-            defaultValue: string;
+            defaultValue?: undefined;
+            gridInfo?: undefined;
         } | {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
             isOptional: boolean;
-            defaultValue?: undefined;
-            gridInfo?: undefined;
+            gridInfo: string;
+            defaultValue: string;
         })[];
     };
     Glue42Api: {
@@ -3046,6 +3115,26 @@ export declare const ADAPTABLE_METAMODEL: {
             reference: string;
         })[];
     };
+    MasterDetailPluginOptions: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            reference: string;
+            isOptional?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            reference?: undefined;
+        })[];
+    };
     MenuOptions: {
         name: string;
         kind: string;
@@ -3906,6 +3995,19 @@ export declare const ADAPTABLE_METAMODEL: {
             reference?: undefined;
         })[];
     };
+    StatusBarState: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            defaultValue: string;
+        }[];
+    };
     StringFormatterOptions: {
         name: string;
         kind: string;
@@ -4111,14 +4213,6 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
         properties: ({
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            gridInfo: string;
-            defaultValue: string;
-        } | {
             name: string;
             kind: string;
             description: string;
@@ -4132,8 +4226,8 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
+            gridInfo: string;
             defaultValue: string;
-            gridInfo?: undefined;
         })[];
     };
     ToolPanelState: {
@@ -4184,8 +4278,8 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
+            reference: string;
             defaultValue?: undefined;
-            reference?: undefined;
             gridInfo?: undefined;
         } | {
             name: string;
@@ -4202,17 +4296,8 @@ export declare const ADAPTABLE_METAMODEL: {
             description: string;
             uiLabel: string;
             isOptional: boolean;
-            reference: string;
-            defaultValue?: undefined;
-            gridInfo?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            defaultValue: string;
             reference?: undefined;
+            defaultValue?: undefined;
             gridInfo?: undefined;
         } | {
             name: string;
@@ -4230,8 +4315,8 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
             isOptional: boolean;
             gridInfo: string;
-            defaultValue?: undefined;
             reference?: undefined;
+            defaultValue?: undefined;
         })[];
     };
     UserMenuItem: {