@adaptabletools/adaptable-cjs 22.0.1 → 22.0.3

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

@@ -543,7 +543,7 @@ const ColumnPropertiesEditor = (props) => {
                 { label: 'Moveable', checked: props.column.moveable },
                 { label: 'Pivotable', checked: props.column.pivotable },
                 { label: 'Sortable', checked: props.column.sortable },
-            ].map(({ label, checked }) => (React.createElement(Flex_1.Flex, { alignItems: "center", className: (0, clsx_1.default)({
+            ].map(({ label, checked }) => (React.createElement(Flex_1.Flex, { key: label, alignItems: "center", className: (0, clsx_1.default)({
                     'twa:rounded-standard twa:gap-2': true,
                 }) },
                 React.createElement(Flex_1.Box, { className: "twa:size-5" }, checked ? (React.createElement(icons_1.Icon, { name: "check", className: "twa:text-success" })) : (React.createElement(icons_1.Icon, { name: "close", className: "twa:text-error" }))),

package/src/View/SmartEdit/SmartEditViewPanel.js

@@ -85,9 +85,7 @@ class SmartEditViewPanelComponent extends React.Component {
                 !shouldDisable && (React.createElement(ButtonApply_1.ButtonApply, { onClick: () => this.onApplyClick(), style: applyButtonStyle, className: `ab-${elementType}__SmartEdit__apply`, tooltip: "Apply Smart Edit", disabled: StringExtensions_1.StringExtensions.IsNullOrEmpty(`${this.props.SmartEditValue}`) ||
                         (this.props.PreviewInfo != null &&
                             this.props.PreviewInfo.previewValidationSummary.validationResult == 'All'), accessLevel: this.props.accessLevel }, this.props.viewType === 'ToolPanel' && 'Apply Smart Edit')),
-                !shouldDisable && (React.createElement(AdaptablePopover_1.AdaptablePopover, { headerText: "Preview Results", className: `ab-${elementType}__SmartEdit__info`, 
-                    //  tooltipText="Preview Results"
-                    bodyText: [previewPanel], MessageType: UIHelper_1.UIHelper.getMessageTypeByStatusColour(statusColour), useButton: true, showEvent: 'focus', hideEvent: "blur" })))));
+                !shouldDisable && (React.createElement(AdaptablePopover_1.AdaptablePopover, { headerText: "Preview Results", className: `ab-${elementType}__SmartEdit__info`, bodyText: [previewPanel], popoverMinWidth: 360, popoverMaxWidth: 500, popupPadding: 0, MessageType: UIHelper_1.UIHelper.getMessageTypeByStatusColour(statusColour), useButton: true, showEvent: 'focus', hideEvent: "blur" })))));
     }
     checkSelectedCells() {
         this.props.onSmartEditCheckSelectedCells();

package/src/agGrid/AdaptableAgGrid.d.ts

@@ -16,6 +16,7 @@ import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLan
 import { IAlertService } from '../Utilities/Services/Interface/IAlertService';
 import { ITeamSharingService } from '../Utilities/Services/Interface/ITeamSharingService';
 import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelService';
+import { IThemeService } from '../Utilities/Services/Interface/IThemeService';
 import { Fdc3Service } from '../Utilities/Services/Fdc3Service';
 import { AnnotationsService } from '../Utilities/Services/AnnotationsService';
 import { IModuleCollection } from '../Strategy/Interface/IModule';
@@ -92,9 +93,9 @@ export declare class AdaptableAgGrid implements IAdaptable {
     Fdc3Service: Fdc3Service;
     AnnotationsService: AnnotationsService;
     FlashingCellService: FlashingCellService;
+    ThemeService: IThemeService;
     private LicenseService;
     private ChartingService;
-    private ThemeService;
     private rowListeners;
     private throttleFilterOnDataChange;
     private debouncedSetSelectedRows;

package/src/agGrid/AdaptableAgGrid.js

@@ -200,9 +200,9 @@ class AdaptableAgGrid {
     Fdc3Service;
     AnnotationsService;
     FlashingCellService;
+    ThemeService;
     LicenseService;
     ChartingService;
-    ThemeService;
     rowListeners;
     throttleFilterOnDataChange;
     debouncedSetSelectedRows;

package/src/agGrid/AgGridExportAdapter.js

@@ -351,7 +351,9 @@ class AgGridExportAdapter {
         let exportedColumnIds = [];
         switch (report.ReportColumnScope) {
             case 'AllColumns':
-                exportedColumnIds = exportableColumnIds.filter((colId) => this.isTreeDataGrid() || !this.adaptableApi.columnApi.isAutoRowGroupColumn(colId));
+                exportedColumnIds = exportableColumnIds.filter((colId) => this.isTreeDataGrid() ||
+                    (!this.adaptableApi.columnApi.isAutoRowGroupColumn(colId) &&
+                        !this.adaptableApi.columnApi.isSelectionColumn(colId)));
                 break;
             case 'VisibleColumns':
                 exportedColumnIds = getVisibleColumnIds();
@@ -360,7 +362,9 @@ class AgGridExportAdapter {
                     // in this case we have to map the auto-group columns to the real keys
                     exportedColumnIds = [
                         ...groupColumnIds,
-                        ...exportedColumnIds.filter((columnId) => this.isTreeDataGrid() || !this.adaptableApi.columnApi.isAutoRowGroupColumn(columnId)),
+                        ...exportedColumnIds.filter((columnId) => this.isTreeDataGrid() ||
+                            (!this.adaptableApi.columnApi.isAutoRowGroupColumn(columnId) &&
+                                !this.adaptableApi.columnApi.isSelectionColumn(columnId))),
                     ];
                 }
                 break;

package/src/components/Dropdown/index.js

@@ -36,7 +36,7 @@ const Dropdown = (props) => {
         };
         options = lazyOptions;
     }
-    let placeholder = props.emptyText || props.placeholder || 'Select an option';
+    let placeholder = props.emptyText || (typeof props.placeholder === 'string' ? props.placeholder : null) || 'Select an option';
     const finalOptions = options.map((option) => {
         if (typeof option === 'string') {
             option = {
@@ -66,7 +66,7 @@ const Dropdown = (props) => {
             return;
         }
         if (e.target === domRef.current) {
-            selectRef.current.focus();
+            selectRef.current?.focus();
         }
     };
     const onBlur = () => {
@@ -80,7 +80,7 @@ const Dropdown = (props) => {
         selectedText = placeholder;
     }
     //20  ... 20 16
-    const renderClearButton = () => (React.createElement(SimpleButton_1.default, { variant: "text", icon: "close", tone: "none", tooltip: "Clear", iconSize: 20, ...clearButtonProps, className: (0, twMerge_1.twMerge)('twa:p-0 twa:mr-1 twa:z-10 twa:color-inherit', clearButtonProps.className), style: {
+    const renderClearButton = () => (React.createElement(SimpleButton_1.default, { variant: "text", icon: "close", tone: "none", tooltip: "Clear", iconSize: 20, ...clearButtonProps, className: (0, twMerge_1.twMerge)('twa:p-0 twa:mr-1 twa:z-10 twa:color-inherit', clearButtonProps?.className), style: {
             ...(clearButtonProps ? clearButtonProps.style : null),
         }, onClick: (e) => {
             e.preventDefault();

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.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: 1772196204253 || Date.now(),
-    VERSION: "22.0.1" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1773422119897 || Date.now(),
+    VERSION: "22.0.3" || '--current-version--',
 };

package/src/layout-manager/src/destructurePivotColumnId.js

@@ -29,6 +29,10 @@ function destructurePivotColumnId(colDef, currentModel, logWarning) {
         const pivotColumnIds = pivotColsTxt.split('-');
         const pivotKeys = pivotKeysTxt.split('-');
         const pivotColumnId = pivotColumnIds[pivotKeys.length - 1];
+        if (aggregationColumnId !== '' && !currentModel.aggColIds.includes(aggregationColumnId)) {
+            logWarning(`Unknown aggregation column: ${aggregationColumnId}`);
+            return '!unknown!';
+        }
         return {
             pivotColumnIds,
             pivotKeys,
@@ -55,16 +59,18 @@ function destructurePivotColumnId(colDef, currentModel, logWarning) {
         return {
             pivotColumnIds,
             pivotKeys,
-            pivotColumnId: pivotColumnIds[pivotKeys.length],
+            pivotColumnId: pivotColumnIds[pivotKeys.length - 1],
         };
     }
-    // For regular pivot columns, work backwards to find aggregation column
-    const parts = withoutPrefix.split('_');
-    const lastPart = parts[parts.length - 1];
-    // Find the longest matching aggregation column id from the end
-    const aggregationColumnId = currentModel.aggColIds.find((aggId) => lastPart.endsWith(aggId));
+    // For regular pivot columns, work backwards to find aggregation column.
+    // Check if the full string ends with _${aggColId} rather than splitting by _,
+    // since agg column IDs may themselves contain underscores (e.g. github_stars).
+    // Sort by length descending so the longest match wins.
+    const aggregationColumnId = [...currentModel.aggColIds]
+        .sort((a, b) => b.length - a.length)
+        .find((aggId) => withoutPrefix.endsWith('_' + aggId));
     if (!aggregationColumnId) {
-        logWarning(`Could not identify aggregation column in: ${lastPart}`);
+        logWarning(`Could not identify aggregation column in: ${withoutPrefix}`);
         return '!unknown!';
     }
     // Remove aggregation part and get pivot columns

package/src/layout-manager/src/index.js

@@ -406,11 +406,12 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             PivotExpandLevel: prevLayout?.PivotExpandLevel ?? -1,
         };
         if (storePivotResultColumns) {
-            // Get pivot result columns in display order (not creation order)
-            const displayedPivotResultColumns = this.gridApi
-                .getAllDisplayedColumns()
-                .filter((col) => pivotResultColumnsSet.has(col.getColId()));
-            pivotLayout.PivotResultColumnsOrder = displayedPivotResultColumns.map((col) => col.getColId());
+            // Save all pivot result columns (including hidden ones from collapsed
+            // groups) in their current order, so the order is fully preserved.
+            const allPivotResultColumnsInOrder = this.gridApi
+                .getColumnState()
+                .filter((col) => pivotResultColumnsSet.has(col.colId));
+            pivotLayout.PivotResultColumnsOrder = allPivotResultColumnsInOrder.map((col) => col.colId);
         }
         if (layout.SuppressAggFuncInHeader) {
             pivotLayout.SuppressAggFuncInHeader = layout.SuppressAggFuncInHeader;

package/src/types.d.ts

@@ -28,7 +28,6 @@ export type { CellSummaryOptions } from './AdaptableOptions/CellSummaryOptions';
 export type { CustomSortOptions, ColumnValuesComparer } from './AdaptableOptions/CustomSortOptions';
 export type { NoteOptions, NotableCellContext } from './AdaptableOptions/NoteOptions';
 export type { CommentOptions, CommentableCellContext, CommentLoadContext, } from './AdaptableOptions/CommentOptions';
-export type { IPushPullPluginOptions } from './AdaptableOptions/IPushPullPluginOptions';
 export type { LayoutOptions, LayoutViewOptions, LayoutTagOptions, LayoutExtendedContext, AutoGenerateTagsForLayoutsContext, PivotPreviewColumnsContext, TableLayoutCreationDefaultProperties, PivotLayoutCreationDefaultProperties, LayoutCreationDefaultProperties, LayoutCreationDefaultPropertiesContext, } from './AdaptableOptions/LayoutOptions';
 export type { ChartingOptions, ChartContainer, ExternalChartingContext, ExternalChartingOptions, SaveChartBehaviour, } from './AdaptableOptions/ChartingOptions';
 export type { OpenFinPluginOptions } from './AdaptableOptions/OpenFinPluginOptions';