@adaptabletools/adaptable 23.0.21 → 23.1.0-canary.0

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

@@ -1340,20 +1340,6 @@ export class LayoutManager extends LMEmitter {
         this.computeColumnSorts(layout, columnState);
         this.computePinnedColumns(layout, columnState);
         this.computePivotAggregations(layout, columnState);
-        if (Array.isArray(layout.PivotResultColumnsOrder)) {
-            const pivotResultColumnsOrderSet = new Set(layout.PivotResultColumnsOrder);
-            const existingPivotResultState = {};
-            columnState.state = columnState.state.filter((colState) => {
-                if (pivotResultColumnsOrderSet.has(colState.colId)) {
-                    existingPivotResultState[colState.colId] = colState;
-                    return false;
-                }
-                return true;
-            });
-            layout.PivotResultColumnsOrder.forEach((colId) => {
-                columnState.state.push(existingPivotResultState[colId] || { colId });
-            });
-        }
         return columnState;
     }
     computePivotAggregations(layout, columnState) {
@@ -1583,10 +1569,8 @@ export class LayoutManager extends LMEmitter {
                 this.gridApi.applyColumnState(columnState);
             });
             this.computePivotAggregations(layout, columnState);
-            if (Array.isArray(layout.PivotResultColumnsOrder)) {
-                columnState.applyOrder = true;
-            }
             this.gridApi.applyColumnState(columnState);
+            this.applyPivotResultColumnsState(layout);
             if (layout.ColumnSizing) {
                 const colWidthForPivotResultColumns = [];
                 (this.gridApi.getPivotResultColumns() || []).forEach((col) => {
@@ -1608,6 +1592,43 @@ export class LayoutManager extends LMEmitter {
             }
         });
     }
+    applyPivotResultColumnsState(layout) {
+        const existingPivotResultColIds = (this.gridApi.getPivotResultColumns() || []).map((col) => col.getColId());
+        if (!existingPivotResultColIds.length) {
+            return;
+        }
+        const existingSet = new Set(existingPivotResultColIds);
+        const persistedOrder = Array.isArray(layout.PivotResultColumnsOrder) && layout.PivotResultColumnsOrder.length > 0
+            ? layout.PivotResultColumnsOrder
+            : null;
+        let orderedColIds = existingPivotResultColIds;
+        if (persistedOrder) {
+            const desiredSet = new Set(persistedOrder);
+            const knownColIds = existingPivotResultColIds.filter((colId) => desiredSet.has(colId));
+            const extraColIds = existingPivotResultColIds.filter((colId) => !desiredSet.has(colId));
+            orderedColIds = [
+                ...sortColumnIdsByOrder(knownColIds, persistedOrder).filter((colId) => existingSet.has(colId)),
+                ...extraColIds,
+            ];
+        }
+        const sorts = layout.ColumnSorts || [];
+        const sortIndexes = new Map(sorts.map((sort, index) => [sort.ColumnId, index]));
+        const pinning = layout.ColumnPinning || {};
+        const state = orderedColIds.map((colId) => {
+            const sortIndex = sortIndexes.get(colId);
+            const sort = sortIndex != null ? sorts[sortIndex] : undefined;
+            return {
+                colId,
+                sort: sort ? (sort.SortOrder === 'Asc' ? 'asc' : 'desc') : null,
+                sortIndex: sort ? sortIndex : null,
+                pinned: pinning[colId] ?? null,
+            };
+        });
+        this.gridApi.applyColumnState({
+            state,
+            applyOrder: !!persistedOrder,
+        });
+    }
     applyPivotTotals(layout) {
         if (layout.PivotGrandTotal) {
             const pivotGrandTotal = layout.PivotGrandTotal === true || layout.PivotGrandTotal === 'before'

package/src/types.d.ts

@@ -34,7 +34,7 @@ export type { OpenFinPluginOptions } from './AdaptableOptions/OpenFinPluginOptio
 export type { InteropioPluginOptions } from './AdaptableOptions/InteropioPluginOptions';
 export type { MasterDetailPluginOptions, DetailInitContext, } from './AdaptableOptions/MasterDetailPluginOptions';
 export type { DateInputOptions } from './AdaptableOptions/DateInputOptions';
-export type { FilterOptions, ColumnFilterOptions, GridFilterOptions, IsRowFilterableContext, InFilterValueInfo, InFilterValueResult, InFilterValue, CustomInFilterValuesContext, GridFilterEditors, DefaultPredicateFilterContext, AdaptableFilterComponentLocation, } from './AdaptableOptions/FilterOptions';
+export type { FilterOptions, ColumnFilterOptions, GridFilterOptions, IsRowFilterableContext, InFilterValueInfo, InFilterValueResult, InFilterValue, CustomInFilterValuesContext, InFilterLabelContext, GridFilterEditors, DefaultPredicateFilterContext, AdaptableFilterComponentLocation, } from './AdaptableOptions/FilterOptions';
 export type { QuickSearchOptions, QuickSearchContext } from './AdaptableOptions/QuickSearchOptions';
 export type { FormatColumnOptions, CustomDisplayFormatter, CustomDisplayFormatterContext, } from './AdaptableOptions/FormatColumnOptions';
 export type { PlusMinusOptions } from './AdaptableOptions/EditOptions';