@adaptabletools/adaptable 20.0.0 → 20.0.2-canary.0

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

@@ -23,6 +23,11 @@ import { AdaptableFormControlTextClear } from '../../../Components/Forms/Adaptab
 import { sortColumnIdsByOrder } from '../../../../layout-manager/src/sortColumnIdsByOrder';
 import HelpBlock from '../../../../components/HelpBlock';
 const PropertyOrderText = (props) => (React.createElement(Text, { fontWeight: 600, fontSize: 2 }, props.children));
+const columnTypes = {
+    default: {
+        defaultFlex: 1,
+    },
+};
 export const ColumnsSectionSummary = () => {
     const adaptable = useAdaptable();
     const { data: layout } = useOnePageAdaptableWizardContext();
@@ -124,11 +129,7 @@ export const ColumnsSectionSummary = () => {
         },
     };
     return (React.createElement(DataSource, { data: data, primaryKey: "columnId" },
-        React.createElement(InfiniteTable, { columnTypes: {
-                default: {
-                    defaultFlex: 1,
-                },
-            }, rowHeight: rowHeight, domProps: tableDOMProps, columns: columns })));
+        React.createElement(InfiniteTable, { columnTypes: columnTypes, rowHeight: rowHeight, columnHeaderHeight: headerHeight, domProps: tableDOMProps, columns: columns })));
 };
 const ColumnRow = (props) => {
     const [isExpanded, setIsExpanded] = React.useState(false);

package/src/View/Note/NotePopup.js

@@ -14,6 +14,17 @@ const tableDOMProps = {
         // minHeight: 600,
     },
 };
+const columnTypes = {
+    default: {
+        align: 'start',
+        defaultFlex: 1,
+        defaultSortable: false,
+        style: { fontSize: 'var(--ab-font-size-3)' },
+    },
+};
+const headerOptions = {
+    alwaysReserveSpaceForSortIcon: false,
+};
 export const NotePopup = (props) => {
     const adaptable = useAdaptable();
     const primaryKeyHeader = adaptable.api.columnApi.getPrimaryKeyColumn()
@@ -76,14 +87,5 @@ export const NotePopup = (props) => {
                     }
                 }
             } },
-            React.createElement(InfiniteTable, { columnTypes: {
-                    default: {
-                        align: 'start',
-                        defaultFlex: 1,
-                        defaultSortable: false,
-                        style: { fontSize: 'var(--ab-font-size-3)' },
-                    },
-                }, headerOptions: {
-                    alwaysReserveSpaceForSortIcon: false,
-                }, rowHeight: 40, columnHeaderHeight: 65, domProps: tableDOMProps, columns: columnsMap }))));
+            React.createElement(InfiniteTable, { columnTypes: columnTypes, headerOptions: headerOptions, domProps: tableDOMProps, columns: columnsMap }))));
 };

package/src/View/StateManagement/StateManagementViewPanel.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
 import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
-export interface ThemeViewPanelComponentProps extends ViewPanelProps {
+export interface StateManagementViewPanelComponentProps extends ViewPanelProps {
 }
-export declare const StateManagementViewPanel: React.FunctionComponent<ThemeViewPanelComponentProps>;
+export declare const StateManagementViewPanel: React.FunctionComponent<StateManagementViewPanelComponentProps>;

package/src/View/Theme/ThemeEditor.js

@@ -8,6 +8,7 @@ import { Box, Flex, Text } from 'rebass';
 import Panel from '../../components/Panel';
 import { Field } from './ThemeField';
 import { VariantSelector } from './VariantSelector';
+import { getAccessLevelForObject } from '../../Utilities/Helpers/AdaptableHelper';
 const fields = [
     {
         name: 'Primary Color',
@@ -73,10 +74,11 @@ const fields = [
 export const ThemeEditor = (props) => {
     const adaptable = useAdaptable();
     const allThemes = adaptable.api.themeApi.getUserThemes();
-    const disabled = props.accessLevel === 'ReadOnly';
     const [currentThemeObject, setCurrentThemeObject] = React.useState(() => {
         return adaptable.api.themeApi.getCurrentThemeObject();
     });
+    const currentThemeAccessLevel = getAccessLevelForObject(currentThemeObject, props.accessLevel);
+    const currentThemeIsReadOnly = currentThemeAccessLevel !== 'Full';
     // THEME variables
     const themeVariables = currentThemeObject?.CSSVariables;
     const valuesFromTheme = fields.reduce((acc, field) => {
@@ -138,22 +140,22 @@ export const ThemeEditor = (props) => {
     const saveNameDisabled = !nameHasChanged || nameIsNotUnique || currentThemeObject.Name === '';
     return (React.createElement(Panel, { header: React.createElement(Flex, { alignItems: "center", width: "100%" },
             React.createElement(Box, { flex: 1 }, " Edit Custom Theme"),
-            React.createElement(SimpleButton, { "data-name": "delete", disabled: props.accessLevel !== 'Full', icon: "delete", onClick: handleDeleteTheme, variant: "text" })) },
+            React.createElement(SimpleButton, { "data-name": "delete", accessLevel: currentThemeAccessLevel, icon: "delete", onClick: handleDeleteTheme, variant: "text" })) },
         React.createElement(FormLayout, null,
             React.createElement(FormRow, { label: "Theme Name" },
-                React.createElement(AdaptableInput, { mr: 2, onChange: (event) => setCurrentThemeObject({
+                React.createElement(AdaptableInput, { disabled: currentThemeIsReadOnly, mr: 2, onChange: (event) => setCurrentThemeObject({
                         ...currentThemeObject,
                         Name: event.target.value.replace(/ /g, '-'),
                     }), value: currentThemeObject.Name ?? '' }),
-                React.createElement(SimpleButton, { onClick: handleSaveName, disabled: saveNameDisabled, icon: "save" }),
+                React.createElement(SimpleButton, { onClick: handleSaveName, disabled: saveNameDisabled || currentThemeIsReadOnly, icon: "save", hidden: currentThemeIsReadOnly }),
                 React.createElement(Text, { fontSize: 2, marginTop: 1 }, "The name cannot contain spaces."),
                 nameIsNotUnique && (React.createElement(Text, { fontSize: 2, color: "var(--ab-color-error)" }, "Name must be unique."))),
             React.createElement(FormRow, { label: "Description" },
-                React.createElement(AdaptableInput, { onChange: (event) => handleDescriptionChange('Description', event.target.value), value: currentThemeObject?.Description ?? '' })),
+                React.createElement(AdaptableInput, { disabled: currentThemeIsReadOnly, onChange: (event) => handleDescriptionChange('Description', event.target.value), value: currentThemeObject?.Description ?? '' })),
             React.createElement(FormRow, { label: "Variant" },
-                React.createElement(VariantSelector, { onChange: handleVariantChange, theme: currentThemeObject })),
+                React.createElement(VariantSelector, { onChange: handleVariantChange, theme: currentThemeObject, disabled: currentThemeIsReadOnly })),
             fields.map((field) => {
-                return (React.createElement(Field, { disabled: disabled, key: field.name, type: field.type, name: field.name, value: valuesFromTheme[field.variable], variable: field.variable, onChange: (val) => {
+                return (React.createElement(Field, { disabled: currentThemeIsReadOnly, key: field.name, type: field.type, name: field.name, value: valuesFromTheme[field.variable], variable: field.variable, onChange: (val) => {
                         // needs a fresh copy
                         const currentThemeObject = adaptable.api.themeApi.getCurrentThemeObject();
                         let newTheme = null;

package/src/View/Theme/VariantSelector.d.ts

@@ -3,5 +3,6 @@ import { AdaptableTheme } from '../../types';
 export interface VariantSelectorProps {
     theme: AdaptableTheme;
     onChange: (variant: AdaptableTheme['Variant'] | null) => void;
+    disabled?: boolean;
 }
 export declare const VariantSelector: React.FunctionComponent<VariantSelectorProps>;

package/src/View/Theme/VariantSelector.js

@@ -2,9 +2,12 @@ import * as React from 'react';
 import DropdownButton from '../../components/DropdownButton';
 import SimpleButton from '../../components/SimpleButton';
 import { useAdaptable } from '../AdaptableContext';
+import { OS_THEME } from '../../Utilities/Constants/GeneralConstants';
 export const VariantSelector = (props) => {
     const adaptable = useAdaptable();
-    const systemTemes = adaptable.api.themeApi.getSystemThemes();
+    const systemTemes = adaptable.api.themeApi
+        .getSystemThemes()
+        .filter((theme) => theme.Name !== OS_THEME);
     const options = systemTemes.map((theme) => ({
         label: theme.Description,
         value: theme.Name,
@@ -14,6 +17,6 @@ export const VariantSelector = (props) => {
         ? options.find((theme) => theme.value === props.theme.Variant)?.label
         : 'Select a theme';
     return (React.createElement(React.Fragment, null,
-        React.createElement(DropdownButton, { mr: 2, columns: ['label'], items: options }, label),
-        React.createElement(SimpleButton, { onClick: () => props.onChange(null), disabled: !props.theme.Variant, icon: "delete" })));
+        React.createElement(DropdownButton, { mr: 2, columns: ['label'], items: options, disabled: props.disabled }, label),
+        React.createElement(SimpleButton, { onClick: () => props.onChange(null), disabled: !props.theme.Variant || props.disabled, hidden: props.disabled, icon: "delete" })));
 };

package/src/agGrid/AdaptableAgGrid.js

@@ -319,11 +319,13 @@ export class AdaptableAgGrid {
              */
             postLoadHook: (state) => {
                 if (this.adaptableOptions.stateOptions.autoMigrateState) {
-                    state = AdaptableUpgradeHelper.migrateAdaptableState(state, {
+                    this.api.logError;
+                    const config = {
                         // version 16 actually includes all versions up until 16
                         fromVersion: 16,
                         logger: this.logger,
-                    });
+                    };
+                    state = AdaptableUpgradeHelper.migrateAdaptableState(state, config);
                 }
                 state = this.normalizeAdaptableState(state, config.gridOptions);
                 return state;
@@ -2635,6 +2637,7 @@ You need to define at least one Layout!`);
         themesToRemove.forEach((theme) => {
             el.classList.remove(`infinite-theme-mode--${theme.Name}`);
         });
+        el.classList.remove(`infinite-theme-name--default`);
         // VARIANT
         let variantTheme = '';
         if (!isSystemTheme && themeObject.Variant) {
@@ -2654,6 +2657,7 @@ You need to define at least one Layout!`);
         else if (variantTheme) {
             el.classList.add(`infinite-theme-mode--${variantTheme}`);
         }
+        el.classList.add(`infinite-theme-name--default`);
         // Update AG THEME
         this.agGridThemeAdapter.applyAgGridThemeOnAdaptableThemeChange(newTheme, variantTheme, container, themesToRemove);
         // MAC LIKE SCROLLBARS

package/src/agGrid/AgGridAdapter.js

@@ -448,6 +448,11 @@ export class AgGridAdapter {
             this.logger.warn(`Column is undefined, returning 'text' for Type`);
             return 'text';
         }
+        const colDefType = [].concat(agColumn.getColDef()?.type || []).filter(Boolean);
+        const skippedSpecialCols = ['actionColumn', 'fdc3Column'];
+        if (skippedSpecialCols.some((specialColType) => colDefType.includes(specialColType))) {
+            return 'unknown';
+        }
         let dataType = 'unknown';
         // get the column type if already in store (and not unknown)
         const existingColumn = this.adaptableApi.columnApi.getColumnWithColumnId(agColumn.getId(), logWarning);

package/src/agGrid/AgGridColumnAdapter.js

@@ -238,13 +238,6 @@ export class AgGridColumnAdapter {
                 return cellDataTypeEditor;
             }
         });
-        this.setColDefProperty(col, 'cellEditorPopup', () => {
-            // as specified in https://www.ag-grid.com/react-data-grid/provided-cell-editors/#rich-select-cell-editor
-            // agRichSelectCellEditor should always set cellEditorPopup=true. Otherwise the editor will be clipped to the cell contents
-            if (shouldShowSelectCellEditor && hasRichSelectCellEditor) {
-                return true;
-            }
-        });
         this.setColDefProperty(col, 'cellEditorParams', (params) => {
             if (shouldShowSelectCellEditor) {
                 return (params) => {

package/src/agGrid/AgGridThemeAdapter.js

@@ -24,10 +24,10 @@ export class AgGridThemeAdapter {
         const isSystemTheme = this.api.themeApi.internalApi.isSystemTheme(themeName);
         if (adaptableTheme && (isSystemTheme || variantTheme)) {
             if ((variantTheme || themeName) === LIGHT_THEME) {
-                document.body.dataset.agThemeMode = 'light';
+                document.body.dataset.agThemeMode = adaptableTheme.AgThemeMode ?? 'light';
             }
             if ((variantTheme || themeName) === DARK_THEME) {
-                document.body.dataset.agThemeMode = 'dark';
+                document.body.dataset.agThemeMode = adaptableTheme.AgThemeMode ?? 'dark';
             }
         }
     }

package/src/agGrid/FloatingFilterWrapper.js

@@ -10,6 +10,7 @@ const filterContainerStyle = {
     display: 'flex',
     alignItems: 'stretch',
     position: 'relative',
+    flex: '1 1 auto',
 };
 export const FloatingFilterWrapperFactory = (adaptable) => {
     const adaptableApi = adaptable.api;

package/src/agGrid/index.d.ts

@@ -1,4 +1,6 @@
 import { Adaptable, AdaptableNoCodeWizard as ABWizard } from './Adaptable';
+import { AdaptableLogger as ABLogger } from './AdaptableLogger';
 export { default as AdaptableWizardView } from '../View/AdaptableWizardView';
 export default Adaptable;
 export declare const AdaptableNoCodeWizard: typeof ABWizard;
+export declare const AdaptableLogger: typeof ABLogger;

package/src/agGrid/index.js

@@ -1,7 +1,8 @@
 import { Adaptable, 
 //init as initFn,
 AdaptableNoCodeWizard as ABWizard, } from './Adaptable';
+import { AdaptableLogger as ABLogger } from './AdaptableLogger';
 export { default as AdaptableWizardView } from '../View/AdaptableWizardView';
 export default Adaptable;
 export const AdaptableNoCodeWizard = ABWizard;
-//export const init = initFn;
+export const AdaptableLogger = ABLogger;

package/src/components/ExpressionEditor/BaseEditorInput.js

@@ -118,7 +118,7 @@ const FunctionsDropdown = ({ expressionFunctions, baseClassName }) => {
                     }, onClick: handleFunctionCategoryChange(option.value), checked: currentFunctionCategory === option.value }, option.label));
             })),
             React.createElement(Flex, null,
-                React.createElement(Flex, { className: `${baseClassName}__dropdown-functions-list`, "data-name": "expression-dropdown-fuctions-list", flexDirection: "column", p: 2, maxHeight: '50vh' }, orderedGroupNames
+                React.createElement(Flex, { className: `${baseClassName}__dropdown-functions-list`, "data-name": "expression-dropdown-functions-list", flexDirection: "column", p: 2, maxHeight: '50vh' }, orderedGroupNames
                     .filter((groupName) => !!groupedFunctions[groupName])
                     .map((groupName) => {
                     const functionsInGroup = Object.keys(groupedFunctions[groupName]);

package/src/components/Select/Select.js

@@ -7,7 +7,6 @@ import { Box } from 'rebass';
 import { DataSource, InfiniteTable, } from '@infinite-table/infinite-react';
 import { useMemo } from 'react';
 import join from '../utils/join';
-const ROW_HEIGHT = 40;
 const checkboxStyle = {
     position: 'relative',
     top: 1,
@@ -330,7 +329,7 @@ export const Select = function (props) {
                 data: filteredOptions, primaryKey: "value", selectionMode: isMulti ? 'multi-row' : 'single-row', 
                 // @ts-ignore
                 onRowSelectionChange: isLoading ? null : isMulti ? onRowSelectionChange : onSingleRowSelectionChange, rowSelection: rowSelection, isRowDisabled: isRowDisabled },
-                React.createElement(InfiniteTable, { header: isMulti && showHeaderSelectionCheckbox ? true : false, rowClassName: rowClassName, showZebraRows: false, onCellClick: isLoading ? null : onCellClick, keyboardNavigation: isLoading ? false : 'row', activeRowIndex: focusedOptionIndex, keyboardSelection: true, rowHeight: ROW_HEIGHT, columns: isMulti ? INFINITE_COLUMNS_WITH_CHECKBOX : INFINITE_COLUMNS_WITH_RADIO, domProps: INFINITE_DOM_PROPS })));
+                React.createElement(InfiniteTable, { header: isMulti && showHeaderSelectionCheckbox ? true : false, rowClassName: rowClassName, showZebraRows: false, rowHeight: '--ab-grid-row-height', onCellClick: isLoading ? null : onCellClick, keyboardNavigation: isLoading ? false : 'row', activeRowIndex: focusedOptionIndex, keyboardSelection: true, columns: isMulti ? INFINITE_COLUMNS_WITH_CHECKBOX : INFINITE_COLUMNS_WITH_RADIO, domProps: INFINITE_DOM_PROPS })));
         };
     }, [isMulti, showHeaderSelectionCheckbox]);
     const DropdownIndicator = React.useMemo(() => {
@@ -417,7 +416,7 @@ export const Select = function (props) {
                     zIndex: 999999,
                     boxShadow: 'var(--ab-cmp-select-menu__box-shadow)',
                     minWidth: `var(--ab-cmp-select-menu__min-width)`,
-                    '--ab-cmp-select-menu__min-height': `min(${((props.options || []).length + (showHeaderSelectionCheckbox ? 1 : 0)) * ROW_HEIGHT}px, 20rem)`,
+                    '--ab-cmp-select-menu__min-height': `min(${(props.options || []).length + (showHeaderSelectionCheckbox ? 1 : 0)} * var(--ab-grid-row-height), 20rem)`,
                     ...commonStyles(state),
                     ...props.menuStyle,
                 };

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     NEXT_PUBLIC_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: 1742808186097 || Date.now(),
-    VERSION: "20.0.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1743597189803 || Date.now(),
+    VERSION: "20.0.2-canary.0" || '--current-version--',
 };

package/src/layout-manager/src/LayoutManagerModel.d.ts

@@ -36,7 +36,7 @@ export interface BaseLayoutModel {
         Values: any[][];
     };
     /**
-     * Whether to include the aggFunc name in the column header: e.g. 'sum(Bank Balance)' will just be 'Bank Balance'
+     * Hides aggFunc name in the column header: e.g. 'sum(Bank Balance)' will just be 'Bank Balance'
      */
     SuppressAggFuncInHeader?: boolean;
     /**

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

@@ -278,6 +278,11 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
         }[];
     };
+    AdaptableColumnDataType: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     AdaptableColumnGroup: {
         name: string;
         kind: string;
@@ -618,13 +623,13 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             desc: string;
             isOpt: boolean;
-            ref?: undefined;
+            ref: string;
         } | {
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
-            ref: string;
+            ref?: undefined;
         })[];
     };
     AdaptableObjectLookupCriteria: {
@@ -1047,6 +1052,11 @@ export declare const ADAPTABLE_METAMODEL: {
             defVal: string;
         })[];
     };
+    AdaptableVersion: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     AggregatedExpressionFilterRowContext: {
         name: string;
         kind: string;
@@ -2323,6 +2333,16 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
+    CustomGroupColumnMenuItem: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
+    CustomGroupContextMenuItem: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     CustomIcon: {
         name: string;
         kind: string;
@@ -2863,6 +2883,16 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    DefaultAdaptableMenuStructure: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
+    DefaultAgGridMenuStructure: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     DetailInitContext: {
         name: string;
         kind: string;
@@ -2975,6 +3005,11 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
+    ExportDestinationType: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     ExportFormContext: {
         name: string;
         kind: string;
@@ -4071,6 +4106,16 @@ export declare const ADAPTABLE_METAMODEL: {
             ref?: undefined;
         })[];
     };
+    MenuCategory: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
+    MenuSeparator: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     ModuleExpressionFunctions: {
         name: string;
         kind: string;
@@ -4309,6 +4354,11 @@ export declare const ADAPTABLE_METAMODEL: {
             defVal?: undefined;
         })[];
     };
+    PivotAggregationColumns: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     PivotLayout: {
         name: string;
         kind: string;
@@ -4491,6 +4541,16 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
         }[];
     };
+    ProcessExportContext: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+        }[];
+    };
     ProgressIndicatorConfig: {
         name: string;
         kind: string;
@@ -4659,6 +4719,17 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
+    ReportColumn: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+        }[];
+    };
     ReportColumnScope: {
         name: string;
         kind: string;
@@ -4701,6 +4772,16 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
         }[];
     };
+    ReportFormatType: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
+    ReportNameType: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     ReportRowScope: {
         name: string;
         kind: string;
@@ -4759,6 +4840,17 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    RowFormColumnContext: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            ref: string;
+        }[];
+    };
     RowFormContext: {
         name: string;
         kind: string;
@@ -4792,6 +4884,11 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    RowFormType: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     RowGroupValues: {
         name: string;
         kind: string;
@@ -5362,6 +5459,11 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt?: undefined;
         })[];
     };
+    TableAggregationColumns: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     TableLayout: {
         name: string;
         kind: string;