@adaptabletools/adaptable-cjs 22.0.0-canary.2 → 22.0.0-canary.4

package/src/components/Dashboard/DashboardToolbar.js

@@ -12,5 +12,5 @@ function DashboardToolbar(props) {
         React.createElement(Flex_1.Flex, { className: "ab-Dashboard__toolbar-title twa:items-center twa:justify-center twa:px-2 twa:pb-1 twa:opacity-70", flexDirection: "row" },
             React.createElement("span", { className: "twa:text-2" }, props.title),
             props.showConfigure && (React.createElement(SimpleButton_1.default, { "aria-label": `Configure ${props.title}`, icon: "spanner", variant: "text", tone: "none", "data-name": "configure", iconSize: 16, className: "twa:ml-1", tooltip: props.tooltip || `Configure ${props.title}`, onClick: () => props.onConfigure() })),
-            props.showClose && (React.createElement(SimpleButton_1.default, { "aria-label": `Close ${props.title}`, style: { alignSelf: 'flex-end' }, disabled: props.accessLevel == 'ReadOnly', "data-name": "close", icon: "close", variant: "text", tone: "none", iconSize: 16, className: "twa:ml-1", tooltip: props.tooltip || `Close ${props.title} Toolbar`, onClick: () => props.onClose() })))));
+            props.showClose && (React.createElement(SimpleButton_1.default, { "aria-label": `Close ${props.title}`, style: { alignSelf: 'flex-end' }, disabled: props.accessLevel == 'ReadOnly', "data-name": "close", icon: "close", variant: "text", tone: "none", iconSize: 16, className: "twa:ml-1", tooltip: props.tooltip || `Close ${props.title} Toolbar`, onClick: () => props.onClose?.() })))));
 }

package/src/components/ExpressionEditor/EditorInput.js

@@ -6,7 +6,6 @@ const react_1 = require("react");
 const BaseEditorInput_1 = require("./BaseEditorInput");
 const editorButtonsSearch_1 = require("./editorButtonsSearch");
 const EditorContext_1 = require("./EditorContext");
-const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const editorButtonsAggregatedScalar_1 = require("./editorButtonsAggregatedScalar");
 const aggregatedScalarExpressionFunctions_1 = require("../../Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions");
 const editorButtonsCumulativeAggregatedScalar_1 = require("./editorButtonsCumulativeAggregatedScalar");
@@ -52,8 +51,25 @@ function EditorInput(props) {
             };
     }, [props.type]);
     const { setSelectedFunction } = (0, EditorContext_1.useExpressionEditor)();
-    const queryName = `${StringExtensions_1.default.CapitaliseFirstLetter(props.type)}Query`;
-    return (React.createElement(BaseEditorInput_1.BaseEditorInput, { type: 'main', value: props.value, placeholder: `Create ${queryName}`, onChange: props.onChange, onSelectedFunctionChange: setSelectedFunction, expressionFunctions: expressionFunctions, editorButtons: props.type === 'aggregatedScalar'
+    let queryName;
+    switch (props.type) {
+        case 'boolean':
+            queryName = 'Create an Expression that returns true / false';
+            break;
+        case 'scalar':
+            queryName = "Create an Expression that returns a single value of any type";
+            break;
+        case 'aggregatedScalar':
+            queryName = "Create an Expression that evaluates multiple rows and returns a value of any type";
+            break;
+        case 'cumulativeAggregatedScalar':
+            queryName = "Create a Cumulative Expression";
+            break;
+        case 'quantileAggregatedScalar':
+            queryName = "Create a Quantile Expression";
+            break;
+    }
+    return (React.createElement(BaseEditorInput_1.BaseEditorInput, { type: 'main', value: props.value, placeholder: queryName, onChange: props.onChange, onSelectedFunctionChange: setSelectedFunction, expressionFunctions: expressionFunctions, editorButtons: props.type === 'aggregatedScalar'
             ? editorButtonsAggregatedScalar_1.editorButtonsAggregatedScalar
             : props.type === 'cumulativeAggregatedScalar'
                 ? editorButtonsCumulativeAggregatedScalar_1.editorButtonsCumulativeAggregatedScalar

package/src/components/Tree/TreeDropdown/index.js

@@ -254,7 +254,7 @@ function TreeDropdown(props) {
                     } }, children));
             } },
             React.createElement(FieldWrap_1.default, { style: props.fieldStyle, className: "twa:w-full" },
-                React.createElement(Input_1.default, { type: "text", readOnly: true, "data-name": "Select Values", placeholder: props.placeholder ?? 'Select a value', className: `twa:w-full ${props.clearable ? 'twa:pr-0' : ''}`, value: props.toDisplayValue ? props.toDisplayValue(value) : toDisplayValueDefault(value), onFocus: () => {
+                React.createElement(Input_1.default, { type: "text", readOnly: true, "data-name": "Select Values", "aria-expanded": visible, placeholder: props.placeholder ?? 'Select a value', className: `twa:w-full ${props.clearable ? 'twa:pr-0' : ''}`, value: props.toDisplayValue ? props.toDisplayValue(value) : toDisplayValueDefault(value), onFocus: () => {
                         if (!visible) {
                             setVisible(true);
                         }

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: 1769449948892 || Date.now(),
-    VERSION: "22.0.0-canary.2" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1770224017085 || Date.now(),
+    VERSION: "22.0.0-canary.4" || '--current-version--',
 };

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

@@ -172,5 +172,6 @@ export interface PivotLayoutModel extends BaseLayoutModel {
      * Display automatically calculated Totals within EACH Pivot Column Group, in the position specified
      */
     PivotColumnTotal?: 'before' | 'after' | boolean;
+    PivotResultColumns?: string[] | boolean;
 }
 export type LayoutModel = TableLayoutModel | PivotLayoutModel;

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

@@ -169,7 +169,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         this.setupEvents();
         this.indexColumns();
         this.setupPivotTotals();
-        globalThis.layoutManager = this;
+        // (globalThis as any).layoutManager = this;
     }
     destroy() {
         if (this.destroyed) {
@@ -347,10 +347,11 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         const columnState = this.gridApi
             .getColumnState()
             .filter((col) => !pivotResultColumnsSet.has(col.colId));
-        let PivotColumns = this.gridApi.getPivotColumns().map((col) => col.getColId());
+        const PivotColumns = this.gridApi.getPivotColumns().map((col) => col.getColId());
         const layout = this.getUndecidedLayoutModelFromGrid(columnState);
         let ColumnSizing = layout.ColumnSizing || {};
         let ColumnVisibility = { ...layout.ColumnVisibility };
+        const storePivotResultColumns = !!prevLayout?.PivotResultColumns;
         //let's also include the column widths of the pivotResult columns
         pivotResultColumns.forEach((col) => {
             const colId = col.getColId();
@@ -404,6 +405,13 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             GrandTotalRow: layout.GrandTotalRow,
             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.PivotResultColumns = displayedPivotResultColumns.map((col) => col.getColId());
+        }
         if (layout.SuppressAggFuncInHeader) {
             pivotLayout.SuppressAggFuncInHeader = layout.SuppressAggFuncInHeader;
         }
@@ -427,20 +435,20 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         let TableColumns = columnState.map((c) => c.colId);
         // .filter((colId) => colId !== 'ag-Grid-SelectionColumn');
         let ColumnSorts = [];
-        let RowGroupedColumns = [];
+        const RowGroupedColumns = [];
         let RowGroupValues = undefined;
         let ColumnGroupValues = undefined;
         let TableAggregationColumns = [];
-        let ColumnPinning = {};
+        const ColumnPinning = {};
         const gridState = this.gridApi.getState();
         const prevLayout = this.currentLayout;
         const prevAggColumns = prevLayout?.TableAggregationColumns ?? prevLayout?.PivotAggregationColumns;
-        let ColumnSizing = { ...prevLayout?.ColumnSizing };
+        const ColumnSizing = { ...prevLayout?.ColumnSizing };
         const prevAggColumnsMap = prevAggColumns?.reduce((acc, agg) => {
             acc[agg.ColumnId] = agg;
             return acc;
         }, {});
-        let ColumnVisibility = columnState.reduce((acc, colState) => {
+        const ColumnVisibility = columnState.reduce((acc, colState) => {
             const colId = colState.colId;
             // normally we take the initial width from this object
             let initialWidth = this.initialColumnWidths[colId];
@@ -1242,7 +1250,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         }
     }
     computeColumnStateForPivotLayout(layout) {
-        let columnState = {};
+        const columnState = {};
         const pivotColumnsToIndexes = (layout.PivotColumns || []).reduce((acc, colId, index) => {
             acc[colId] = index;
             return acc;
@@ -1273,6 +1281,12 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
         this.computeColumnSorts(layout, columnState);
         this.computePinnedColumns(layout, columnState);
         this.computePivotAggregations(layout, columnState);
+        // Add pivot result columns to the state for ordering (will be applied with applyOrder: true later)
+        if (Array.isArray(layout.PivotResultColumns)) {
+            layout.PivotResultColumns.forEach((colId) => {
+                columnState.state.push({ colId });
+            });
+        }
         return columnState;
     }
     computePivotAggregations(layout, columnState) {
@@ -1513,6 +1527,10 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
             });
             // now recompute and apply the last one
             this.computePivotAggregations(layout, columnState);
+            // Apply order only on the final call when PivotResultColumns is specified
+            if (Array.isArray(layout.PivotResultColumns)) {
+                columnState.applyOrder = true;
+            }
             this.gridApi.applyColumnState(columnState);
             // let's also include the column widths of the pivotResult columns
             // we can't simply include those in the columnState because the columnState will also apply order

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

@@ -138,6 +138,9 @@ function normalizePivotLayoutModel(layout) {
     if (!layout.ColumnPinning) {
         layout.ColumnPinning = {};
     }
+    if (!layout.PivotResultColumns) {
+        layout.PivotResultColumns = false;
+    }
     if (!layout.ColumnSizing) {
         layout.ColumnSizing = {};
     }

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

@@ -1000,12 +1000,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
-        props: {
+        props: ({
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
-        }[];
+            ref: string;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref?: undefined;
+        })[];
     };
     AdaptableSystemColumnMenuItem: {
         name: string;
@@ -1712,11 +1719,6 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
-    CellAlignment: {
-        name: string;
-        kind: string;
-        desc: string;
-    };
     CellColorRange: {
         name: string;
         kind: string;
@@ -2155,12 +2157,20 @@ export declare const ADAPTABLE_METAMODEL: {
             name: string;
             kind: string;
             desc: string;
+            isOpt?: undefined;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
             ref?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             ref: string;
+            isOpt?: undefined;
         })[];
     };
     CommandHandler: {
@@ -4066,6 +4076,18 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    Identifiable: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        }[];
+    };
     InFilterValue: {
         name: string;
         kind: string;
@@ -4455,6 +4477,16 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
+    NamedObject: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+        }[];
+    };
     NamedQuery: {
         name: string;
         kind: string;