@adaptabletools/adaptable-cjs 23.0.4 → 23.0.5-canary.1

package/src/components/WindowModal/useStacking.js

@@ -6,7 +6,6 @@ const React = tslib_1.__importStar(require("react"));
 const uuid_1 = require("../utils/uuid");
 const setZIndexMap = {};
 const zIndexMap = [];
-// starts with 3000, to be above the default zIndex of the Modal component
 const BASE_Z_INDEX = 3000;
 const Z_INDEX_GAP = 5;
 let GLOBAL_COUNTER = 0;
@@ -17,18 +16,12 @@ const getNewOffset = () => {
 const getNewZIndex = () => {
     return BASE_Z_INDEX + getNewOffset();
 };
-/**
- * Used to facilitate the stacking between multiple opened windows.
- * When calling 'bringToFront' brings caller to top.
- * This is done by changing the zIndex of all registered window-modals.
- */
 const useStacking = () => {
     const modalZIndexId = React.useMemo(() => (0, uuid_1.createUuid)(), []);
     const [zIndex, setZIndex] = React.useState(getNewZIndex);
     React.useEffect(() => {
         setZIndexMap[modalZIndexId] = setZIndex;
         return () => {
-            // clean-up
             delete setZIndexMap[modalZIndexId];
             const indexInMap = zIndexMap.indexOf(modalZIndexId);
             zIndexMap.splice(indexInMap, 1);

package/src/components/icons/bullet-chart.js

@@ -3,8 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const DefaultIcon_1 = tslib_1.__importDefault(require("./DefaultIcon"));
-// Bullet Chart icon - a horizontal layout consisting of (back to front):
-//  - three qualitative bands (light/medium/dark) along the full width
-//  - a foreground "actual value" bar over the lower portion of the bands
-//  - a vertical target marker line that crosses the bar
 exports.default = (props) => ((0, jsx_runtime_1.jsxs)(DefaultIcon_1.default, { ...props, children: [(0, jsx_runtime_1.jsx)("rect", { x: "2", y: "9", width: "6", height: "6", fill: "currentColor", opacity: "0.25" }), (0, jsx_runtime_1.jsx)("rect", { x: "8", y: "9", width: "6", height: "6", fill: "currentColor", opacity: "0.45" }), (0, jsx_runtime_1.jsx)("rect", { x: "14", y: "9", width: "8", height: "6", fill: "currentColor", opacity: "0.65" }), (0, jsx_runtime_1.jsx)("rect", { x: "2", y: "11", width: "13", height: "2", fill: "currentColor" }), (0, jsx_runtime_1.jsx)("rect", { x: "17", y: "8", width: "1.5", height: "8", fill: "currentColor" })] }));

package/src/components/icons/icon-style.js

@@ -3,8 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const DefaultIcon_1 = tslib_1.__importDefault(require("./DefaultIcon"));
-// Icon Style icon - represents the "key → icon" mapping idea:
-//  - left: a stylised value (rectangle suggesting a cell)
-//  - middle: a small arrow / connector
-//  - right: a glyph (filled diamond) standing in for the matched icon
 exports.default = (props) => ((0, jsx_runtime_1.jsxs)(DefaultIcon_1.default, { ...props, children: [(0, jsx_runtime_1.jsx)("rect", { x: "2", y: "8", width: "6", height: "8", rx: "1.2", ry: "1.2", fill: "none", stroke: "currentColor", strokeWidth: "1.5" }), (0, jsx_runtime_1.jsx)("path", { d: "M9.5 12 L13.5 12", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round" }), (0, jsx_runtime_1.jsx)("polygon", { points: "13.5,10 13.5,14 15,12", fill: "currentColor" }), (0, jsx_runtime_1.jsx)("path", { d: "M17 6 v12", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round" }), (0, jsx_runtime_1.jsx)("path", { d: "M17 7 h4 l-1 2 l1 2 h-4 z", fill: "currentColor" })] }));

package/src/components/icons/index.js

@@ -181,17 +181,17 @@ const styled_grid_1 = tslib_1.__importDefault(require("./styled-grid"));
 const Icon_1 = require("../Icon");
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 exports.allIcons = {
-    search: query_1.default, // original icon is search
-    grid: layout_1.default, // original icon is apps,
-    cells: cell_summary_1.default, // original icon is view-module
+    search: query_1.default,
+    grid: layout_1.default,
+    cells: cell_summary_1.default,
     columns: column_chooser_1.default,
     copy: copy_1.default,
-    'calculated-column': calculated_column_1.default, // original icon is phone-setup
-    laptop: application_1.default, // original icon is   laptop,
+    'calculated-column': calculated_column_1.default,
+    laptop: application_1.default,
     alert: alert_1.default,
     building: analysis_1.default,
-    'edit-table': bulk_update_1.default, // original icon is update,
-    chart: chart_1.default, // original icon is bar-chart
+    'edit-table': bulk_update_1.default,
+    chart: chart_1.default,
     'column-add': column_add_1.default,
     person: person_1.default,
     quote: quote_1.default,
@@ -203,36 +203,35 @@ exports.allIcons = {
     json: data_object_1.default,
     export: export_1.default,
     broadcast: campaign_1.default,
-    theme: theme_1.default, // original icon is color-fill
+    theme: theme_1.default,
     brain: instrument_1.default,
     calendar: calendar_1.default,
     chat: chat_1.default,
-    'filter-list': column_filter_1.default, // original icon is filter-list
+    'filter-list': column_filter_1.default,
     'column-outline': column_outline_1.default,
     'grid-filter': grid_filter_1.default,
     'grid-info': grid_info_1.default,
     filter: filter_1.default,
     'filter-off': filter_off_1.default,
-    'search-table': quick_search_1.default, // original icon is page-view
-    lightning: flashing_cell_1.default, // flashOn,
-    'color-palette': format_column_1.default, /// color-lens
-    'export-data': table_arrow_right_1.default, /// color-lens
-    'horizontal-lines': freetext_column_1.default, //  short-text
-    'percent-tag': percent_bar_1.default, // linear-scale
-    'spark-line': spark_line_1.default, //    show-chart
-    resume: resume_1.default, //    unsuspend
+    'search-table': quick_search_1.default,
+    lightning: flashing_cell_1.default,
+    'color-palette': format_column_1.default,
+    'export-data': table_arrow_right_1.default,
+    'horizontal-lines': freetext_column_1.default,
+    'percent-tag': percent_bar_1.default,
+    'spark-line': spark_line_1.default,
+    resume: resume_1.default,
     csv: csv_1.default,
     'pie-chart': pie_chart_1.default,
-    'add-circle': plus_minus_1.default, //add-circle
-    reminder: reminder_1.default, // alarm_on
-    schedule: schedule_1.default, // schedule
-    link: shortcut_1.default, // link
-    assignment: state_management_1.default, //   assignment,
+    'add-circle': plus_minus_1.default,
+    reminder: reminder_1.default,
+    schedule: schedule_1.default,
+    link: shortcut_1.default,
+    assignment: state_management_1.default,
     clipboard: tool_panel_1.default,
-    'traffic-lights': system_status_1.default, // was traffic
+    'traffic-lights': system_status_1.default,
     add: add_row_1.default,
-    downloaded: updated_row_1.default, //   system-update
-    // others
+    downloaded: updated_row_1.default,
     edit: edit_1.default,
     undo: undo_1.default,
     clone: clone_1.default,
@@ -282,7 +281,7 @@ exports.allIcons = {
     'folder-open': folder_open_1.default,
     'folder-shared': folder_shared_1.default,
     folder: folder_1.default,
-    newpage: newpage_1.default, //note_add
+    newpage: newpage_1.default,
     drag: drag_1.default,
     'date-range': date_range_1.default,
     settings: settings_1.default,
@@ -339,7 +338,7 @@ exports.allIcons = {
     'case-lower': case_lower_1.default,
     'case-upper': case_upper_1.default,
     'case-sentence': case_sentence_1.default,
-    flag: cell_validation_1.default, // original icon is flag,
+    flag: cell_validation_1.default,
     fdc3: fdc3_1.default,
     mail: mail_1.default,
     dollar: dollar_1.default,
@@ -374,8 +373,6 @@ const NaturallySizedIcon = (props) => {
     return (0, jsx_runtime_1.jsx)(exports.Icon, { ...props, size: '1.5em', style: { marginTop: '-0.125em', ...props.style } });
 };
 exports.NaturallySizedIcon = NaturallySizedIcon;
-// SVG attributes that React accepts in camelCase but emits as-is in markup
-// (everything else gets converted to kebab-case at serialise time).
 const SVG_KEEP_AS_IS = new Set([
     'viewBox',
     'preserveAspectRatio',
@@ -395,14 +392,12 @@ const SVG_KEEP_AS_IS = new Set([
     'baseProfile',
     'repeatCount',
 ]);
-// React-prop -> HTML/SVG attribute name mapping
 const REACT_TO_HTML_ATTR = {
     className: 'class',
     htmlFor: 'for',
     tabIndex: 'tabindex',
     acceptCharset: 'accept-charset',
 };
-// CSS properties whose numeric values do NOT need a "px" suffix
 const UNITLESS_CSS_PROPS = new Set([
     'animationIterationCount',
     'borderImageOutset',
@@ -438,7 +433,6 @@ const UNITLESS_CSS_PROPS = new Set([
     'widows',
     'zIndex',
     'zoom',
-    // SVG
     'fillOpacity',
     'floodOpacity',
     'stopOpacity',
@@ -492,7 +486,6 @@ const propToAttrName = (key) => {
         return key;
     if (SVG_KEEP_AS_IS.has(key))
         return key;
-    // Camel-case SVG attributes (fillRule, clipPath, strokeWidth, ...) are emitted kebab-case.
     return /[A-Z]/.test(key) ? camelToKebab(key) : key;
 };
 const reactElementToString = (node) => {
@@ -510,9 +503,6 @@ const reactElementToString = (node) => {
     if (type === React.Fragment) {
         return reactElementToString(props.children);
     }
-    // Function component: invoke it and recurse on the returned element.
-    // (All AdapTable system-icon components and the <Icon> wrapper are pure
-    // and use no hooks, so this is safe.)
     if (typeof type === 'function') {
         return reactElementToString(type(props));
     }

package/src/components/icons/range-bar.js

@@ -3,9 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const DefaultIcon_1 = tslib_1.__importDefault(require("./DefaultIcon"));
-// Range Bar icon - a horizontal layout consisting of:
-//  - end-caps at the min and max bounds
-//  - a thin track running between them representing the [Min, Max] range
-//  - a diamond-shaped value marker positioned along the track
-//  - a smaller secondary mark hinting at an optional reference value
 exports.default = (props) => ((0, jsx_runtime_1.jsxs)(DefaultIcon_1.default, { ...props, children: [(0, jsx_runtime_1.jsx)("rect", { x: "2", y: "8", width: "1.5", height: "8", fill: "currentColor" }), (0, jsx_runtime_1.jsx)("rect", { x: "20.5", y: "8", width: "1.5", height: "8", fill: "currentColor" }), (0, jsx_runtime_1.jsx)("rect", { x: "3.5", y: "11", width: "17", height: "2", fill: "currentColor", opacity: "0.35" }), (0, jsx_runtime_1.jsx)("rect", { x: "8", y: "9", width: "1", height: "6", fill: "currentColor", opacity: "0.6" }), (0, jsx_runtime_1.jsx)("polygon", { points: "14,7.5 17,12 14,16.5 11,12", fill: "currentColor" })] }));

package/src/components/icons/star.js

@@ -3,5 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const DefaultIcon_1 = tslib_1.__importDefault(require("./DefaultIcon"));
-// 5-pointed star, the canonical Rating column glyph.
 exports.default = (props) => ((0, jsx_runtime_1.jsx)(DefaultIcon_1.default, { ...props, children: (0, jsx_runtime_1.jsx)("path", { d: "M12 2 L14.9 8.6 L22 9.3 L16.7 14.1 L18.2 21 L12 17.4 L5.8 21 L7.3 14.1 L2 9.3 L9.1 8.6 Z" }) }));

package/src/components/twUtils.js

@@ -2,21 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.targetChildren = exports.targetPeer = exports.targetOwn = void 0;
 exports.targetOwn = {
-    focusOutline: 
-    // 'twa:outline-0 twa:focus:outline-2 twa:focus:outline-offset-1 twa:focus:outline-accent',
-    // 'twa:outline-0 twa:focus:shadow-(--ab-focus__box-shadow)',
-    'twa:outline-none twa:focus-visible:border-ring twa:focus-visible:ring-3 twa:focus-visible:ring-ring/50',
-    focusWithinOutline: 
-    // 'twa:outline-0 twa:focus-within:outline-2 twa:focus-within:outline-offset-1 twa:focus-within:outline-accent',
-    // 'twa:outline-0 twa:focus-within:shadow-(--ab-focus__box-shadow)',
-    'twa:outline-none twa:focus-within:border-ring twa:focus-within:ring-3 twa:focus-within:ring-ring/50',
+    focusOutline: 'twa:outline-none twa:focus-visible:border-ring twa:focus-visible:ring-3 twa:focus-visible:ring-ring/50',
+    focusWithinOutline: 'twa:outline-none twa:focus-within:border-ring twa:focus-within:ring-3 twa:focus-within:ring-ring/50',
 };
 exports.targetPeer = {
     focusVisibleOutline: 'twa:peer-focus-visible:border-ring twa:peer-focus-visible:ring-3 twa:peer-focus-visible:ring-ring/50',
 };
 exports.targetChildren = {
-    focusWithinOutline: 
-    // 'twa:*:outline-0 twa:*:focus-within:outline-2 twa:*:focus-within:outline-offset-1 twa:*:focus-within:outline-accent',
-    // 'twa:*:outline-0 twa:*:focus-within:shadow-(--ab-focus__box-shadow)',
-    'twa:*:outline-none twa:*:focus-within:border-ring twa:*:focus-within:ring-3 twa:*:focus-within:ring-ring/50',
+    focusWithinOutline: 'twa:*:outline-none twa:*:focus-within:border-ring twa:*:focus-within:ring-3 twa:*:focus-within:ring-ring/50',
 };

package/src/components/ui/calendar.js

@@ -45,11 +45,7 @@ function Calendar({ className, classNames, showOutsideDays = true, captionLayout
             week: (0, utils_1.cn)('twa:mt-2 twa:flex twa:w-full', defaultClassNames.week),
             week_number_header: (0, utils_1.cn)('twa:w-(--cell-size) twa:select-none', defaultClassNames.week_number_header),
             week_number: (0, utils_1.cn)('twa:text-[0.8rem] twa:text-muted-foreground twa:select-none', defaultClassNames.week_number),
-            day: (0, utils_1.cn)('twa:group/day twa:relative twa:aspect-square twa:h-full twa:w-full twa:rounded-standard twa:p-0 twa:text-center twa:select-none twa:[&:last-child[data-selected=true]_button]:rounded-r-standard', 
-            // props.showWeekNumber
-            //   ? "twa:[&:nth-child(2)[data-selected=true]_button]:rounded-l-standard"
-            //   : "twa:[&:first-child[data-selected=true]_button]:rounded-l-standard",
-            defaultClassNames.day),
+            day: (0, utils_1.cn)('twa:group/day twa:relative twa:aspect-square twa:h-full twa:w-full twa:rounded-standard twa:p-0 twa:text-center twa:select-none twa:[&:last-child[data-selected=true]_button]:rounded-r-standard', defaultClassNames.day),
             range_start: (0, utils_1.cn)('twa:relative twa:isolate twa:z-0 twa:rounded-l-standard twa:bg-muted twa:after:absolute twa:after:inset-y-0 twa:after:right-0 twa:after:w-4 twa:after:bg-muted', defaultClassNames.range_start),
             range_middle: (0, utils_1.cn)('twa:rounded-none', defaultClassNames.range_middle),
             range_end: (0, utils_1.cn)('twa:relative twa:isolate twa:z-0 twa:rounded-r-standard twa:bg-muted twa:after:absolute twa:after:inset-y-0 twa:after:left-0 twa:after:w-4 twa:after:bg-muted', defaultClassNames.range_end),
@@ -77,8 +73,6 @@ function CalendarDayButton({ className, day, modifiers, ...props }) {
     React.useEffect(() => {
         if (modifiers.focused) {
             const active = document.activeElement;
-            // Only grab focus when no other interactive element (nav button, dropdown)
-            // is focused, or when keyboard-navigating between day cells.
             const shouldFocus = !active ||
                 active === document.body ||
                 active === document.documentElement ||
@@ -92,8 +86,6 @@ function CalendarDayButton({ className, day, modifiers, ...props }) {
     React.useEffect(() => {
         if (selected) {
             const active = document.activeElement;
-            // Only grab focus when no other interactive element (nav button, dropdown)
-            // is focused, or when keyboard-navigating between day cells.
             const shouldFocus = !active ||
                 active === document.body ||
                 active === document.documentElement ||

package/src/components/ui/combobox.js

@@ -101,11 +101,7 @@ exports.ComboboxChips = ComboboxChips;
 const ComboboxChip = React.forwardRef(function ComboboxChip({ className, children, showRemove = true, onRemove, ...props }, ref) {
     return ((0, jsx_runtime_1.jsxs)(react_1.Combobox.Chip, { ref: ref, "data-slot": "combobox-chip", className: (0, utils_1.cn)('twa:flex twa:h-[calc(--spacing(5.5))] twa:w-fit twa:items-center twa:justify-center twa:gap-1 twa:rounded-input twa:bg-muted twa:px-1.5 twa:text-xs twa:font-medium twa:whitespace-nowrap twa:text-input-foreground twa:has-disabled:pointer-events-none twa:has-disabled:cursor-not-allowed twa:has-disabled:opacity-50 twa:has-data-[slot=combobox-chip-remove]:pr-0', className), ...props, children: [children, showRemove &&
                 (onRemove ? ((0, jsx_runtime_1.jsx)(button_1.Button, { type: "button", variant: "ghost", size: "icon-xs", tabIndex: -1, "data-slot": "combobox-chip-remove", className: "twa:-ml-1 twa:opacity-50 twa:hover:opacity-100", onMouseDown: (e) => {
-                        // Don't let base-ui's Chip onMouseDown steal focus back to the
-                        // input before the click fires.
                         e.preventDefault();
-                        // and also stop the propagation, so the mousedown wont
-                        // trigger the combobox to open
                         e.stopPropagation();
                     }, onClick: (e) => {
                         e.stopPropagation();

package/src/components/utils/captureTabNavigation/getFocusableChildren.js

@@ -11,6 +11,5 @@ const selector = [
 ].join(', ');
 exports.default = (node) => {
     const children = [...node.querySelectorAll(selector)];
-    // ensure they are all in the dom
     return children.filter((child) => child.offsetParent);
 };

package/src/components/utils/useDraggable.js

@@ -22,10 +22,6 @@ function useDraggable({ onMove, onDrop, getBoundingRect = () => document.body.ge
     }, []);
     (0, react_1.useEffect)(() => {
         if (handleSelector) {
-            /**
-             * Element may not be yet attached.
-             * This gives time react to render the node handle.
-             */
             setTimeout(() => {
                 const node = targetRef?.current?.querySelector(handleSelector);
                 node && handleRefCallback(node);

package/src/components/utils/useProperty.js

@@ -4,24 +4,6 @@ const react_1 = require("react");
 const toUpperFirst = (str) => `${str.charAt(0).toUpperCase()}${str.substring(1)}`;
 const isControlled = (value) => value !== undefined;
 const emptyFn = () => { };
-/**
- *
- * useProperty can be used to easily manage a given prop - especially when you want to support both the controlled and the uncontrolled behviour.
- *
- * @param props - the props of the component
- * @param propName - the name of the property to manage
- * @param defaultValue? - a default value for the prop - especially useful when the prop you're targeting via `propName` is uncontrolled
- * @param config.onChange? - defaults to `props.on${PropName}Change` - useful when you want to be notified of when the property is changed - via the returned setter.
- * config.onChange is called for both controlled and uncontrolled prop.
- *
- * If the prop is uncontrolled, when the returned propSetter is called, the useProperty hook will update the state internally - you can be notified of this via config.onChange.
- *
- * If you don't have config.onChange specified, the useProperty hook will try to call `props.on${PropName}Change` if it's defined.
- *
- * So even for a controlled prop, if you respect this convention and have this pair `${propName}` + `on${PropName}Change` - useProperty will do all the work and call the "event" handler prop for you.
- *
- * Returns [propValue, propSetterFunction] - the value of the prop and a setter function
- */
 const useProperty = (props, propName, defaultValue, config) => {
     const PropName = toUpperFirst(propName);
     const defaultValueFromProps = props[`default${PropName}`];

package/src/devTools/index.js

@@ -15,7 +15,6 @@ const AVAILABLE_COLORS = [
     'tertiary',
     'tertiary-light',
     'tertiary-dark',
-    // 'error',
 ];
 const colorMap = new Map();
 function getColor(identifier) {

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: 1782415257078 || Date.now(),
-    VERSION: "23.0.4" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1782475394624 || Date.now(),
+    VERSION: "23.0.5-canary.1" || '--current-version--',
 };

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

@@ -10,10 +10,6 @@ class LMEmitter extends LMLogger_1.LMLogger {
     constructor(options) {
         super(options);
     }
-    /**
-     * For each supported event, we have a Set that holds all the callbacks that should be executed
-     * when the event is triggered.
-     */
     eventSets = {
         gridLayoutChanged: new Set(),
         columnDefsChanged: new Set(),
@@ -43,7 +39,6 @@ class LMEmitter extends LMLogger_1.LMLogger {
             if (this.destroyed) {
                 return;
             }
-            // @ts-ignore
             callback(...args);
         });
     }

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

@@ -1,25 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.destructurePivotColumnId = destructurePivotColumnId;
-// supports only pivotTotalColumns (aggregation total) and pivotGroupTotal
-// AG Grid builds the ID as: `pivot_${pivotCols.join('-')}_${pivotKeys.join('-')}_${measureColumnId}`
-// see https://github.com/ag-grid/ag-grid/blob/e0cfe533b55b75cdc148cdfb1a4e977731dc0712/packages/ag-grid-enterprise/src/pivot/pivotColDefService.ts#L454C16-L454C88
 function destructurePivotColumnId(colDef, currentModel, logWarning) {
     const { colId } = colDef;
-    // Basic validation
     if (!colId?.startsWith('pivot_')) {
         logWarning(`Column id must start with 'pivot_': ${colId}`);
         return '!unknown!';
     }
     const hasSpecialChars = (arr) => arr.some((str) => str.includes('-') || str.includes('_'));
-    // AG Grid uses _ and - as delimiters
-    // if we have these special characters in the column IDs, we need to parse them differently
     const colIdsOrKeysContainSpecialChars = hasSpecialChars(currentModel.pivotColIds) ||
         hasSpecialChars(currentModel.aggColIds) ||
         hasSpecialChars(colDef.pivotKeys || []);
-    // Fast path - no special characters
     if (!colIdsOrKeysContainSpecialChars) {
-        // Split by underscore to get 4 parts
         const parts = colId.split('_');
         if (parts.length !== 4) {
             logWarning(`Unsupported format of pivot total column id: ${colId}`);
@@ -40,17 +32,11 @@ function destructurePivotColumnId(colDef, currentModel, logWarning) {
             aggregationColumnId: aggregationColumnId !== '' ? aggregationColumnId : undefined,
         };
     }
-    // the complex path, where we have to handle the special characters
-    // Remove 'pivot_' prefix
     const withoutPrefix = colId.slice(6);
-    // Check if it's a pivot group total
     const isPivotGroupTotal = withoutPrefix.endsWith('_');
-    // Get pivot keys from colDef (more reliable than string parsing)
     const pivotKeys = colDef.pivotKeys || [];
     if (isPivotGroupTotal) {
-        // Remove trailing underscore for pivot group totals
         const content = withoutPrefix.slice(0, -1);
-        // The remaining content should be the pivot columns
         const pivotColumnIds = currentModel.pivotColIds.filter((id) => content.includes(id));
         if (!pivotColumnIds.length) {
             logWarning(`Could not identify pivot columns in: ${content}`);
@@ -62,10 +48,6 @@ function destructurePivotColumnId(colDef, currentModel, logWarning) {
             pivotColumnId: pivotColumnIds[pivotKeys.length - 1],
         };
     }
-    // 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));
@@ -73,7 +55,6 @@ function destructurePivotColumnId(colDef, currentModel, logWarning) {
         logWarning(`Could not identify aggregation column in: ${withoutPrefix}`);
         return '!unknown!';
     }
-    // Remove aggregation part and get pivot columns
     const withoutAgg = withoutPrefix.slice(0, -(aggregationColumnId.length + 1));
     const pivotColumnIds = currentModel.pivotColIds.filter((id) => withoutAgg.includes(id));
     if (!pivotColumnIds.length) {