@finos/legend-data-cube 0.0.42 → 0.0.44

package/src/stores/view/editor/DataCubeEditorSortsPanelState.ts

@@ -14,45 +14,21 @@
  * limitations under the License.
  */
 
-import { action, makeObservable, observable } from 'mobx';
 import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
-import { _toCol } from '../../core/model/DataCubeColumn.js';
+import { _findCol, _toCol } from '../../core/model/DataCubeColumn.js';
 import {
   DataCubeColumnKind,
   DataCubeQuerySortDirection,
 } from '../../core/DataCubeQueryEngine.js';
 import type { DataCubeQueryEditorPanelState } from './DataCubeEditorPanelState.js';
 import {
-  DataCubeEditorColumnSelectorColumnState,
   DataCubeEditorColumnSelectorState,
+  DataCubeEditorSortColumnState,
 } from './DataCubeEditorColumnSelectorState.js';
 import type { DataCubeEditorState } from './DataCubeEditorState.js';
 import type { DataCubeConfiguration } from '../../core/model/DataCubeConfiguration.js';
 import { uniqBy } from '@finos/legend-shared';
 
-export class DataCubeEditorSortColumnState extends DataCubeEditorColumnSelectorColumnState {
-  direction: DataCubeQuerySortDirection;
-
-  constructor(
-    name: string,
-    type: string,
-    direction: DataCubeQuerySortDirection,
-  ) {
-    super(name, type);
-
-    makeObservable(this, {
-      direction: observable,
-      setDirection: action,
-    });
-
-    this.direction = direction;
-  }
-
-  setDirection(val: DataCubeQuerySortDirection) {
-    this.direction = val;
-  }
-}
-
 export class DataCubeEditorSortColumnSelectorState extends DataCubeEditorColumnSelectorState<DataCubeEditorSortColumnState> {
   override cloneColumn(column: DataCubeEditorSortColumnState) {
     return new DataCubeEditorSortColumnState(
@@ -78,8 +54,9 @@ export class DataCubeEditorSortColumnSelectorState extends DataCubeEditorColumnS
                   this._editor.columnProperties.getColumnConfiguration(
                     column.name,
                   ).kind === DataCubeColumnKind.DIMENSION &&
-                  !this._editor.horizontalPivots.selector.selectedColumns.find(
-                    (col) => col.name === column.name,
+                  !_findCol(
+                    this._editor.horizontalPivots.selector.selectedColumns,
+                    column.name,
                   ),
               ),
             ]
@@ -113,7 +90,7 @@ export class DataCubeEditorSortsPanelState
   adaptPropagatedChanges(): void {
     this.selector.setSelectedColumns(
       this.selector.selectedColumns.filter((column) =>
-        this.selector.availableColumns.find((col) => col.name === column.name),
+        _findCol(this.selector.availableColumns, column.name),
       ),
     );
   }

package/src/stores/view/editor/DataCubeEditorState.tsx

@@ -23,6 +23,7 @@ import {
   type DataCubeQuerySnapshotExtendedColumn,
 } from '../../core/DataCubeQuerySnapshot.js';
 import {
+  _findCol,
   _toCol,
   type DataCubeColumn,
 } from '../../core/model/DataCubeColumn.js';
@@ -177,9 +178,7 @@ export class DataCubeEditorState extends DataCubeQuerySnapshotController {
           this.sorts.selector.availableColumns
             .filter(
               (col) =>
-                !tempSnapshot.data.groupExtendedColumns.find(
-                  (column) => column.name === col.name,
-                ),
+                !_findCol(tempSnapshot.data.groupExtendedColumns, col.name),
             )
             .map(_toCol);
       }

package/src/stores/view/editor/DataCubeEditorVerticalPivotsPanelState.ts

@@ -18,7 +18,7 @@ import { uniqBy } from '@finos/legend-shared';
 import type { DataCubeConfiguration } from '../../core/model/DataCubeConfiguration.js';
 import { DataCubeColumnKind } from '../../core/DataCubeQueryEngine.js';
 import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
-import { _toCol } from '../../core/model/DataCubeColumn.js';
+import { _findCol, _toCol } from '../../core/model/DataCubeColumn.js';
 import {
   DataCubeEditorColumnSelectorColumnState,
   DataCubeEditorColumnSelectorState,
@@ -42,12 +42,11 @@ export class DataCubeEditorVerticalPivotColumnSelectorState extends DataCubeEdit
         (column) =>
           column.kind === DataCubeColumnKind.DIMENSION &&
           // exclude group-level extended columns
-          !this._editor.groupExtendColumns.find(
-            (col) => col.name === column.name,
-          ) &&
+          !_findCol(this._editor.groupExtendColumns, column.name) &&
           // exclude pivot columns
-          !this._editor.horizontalPivots.selector.selectedColumns.find(
-            (col) => col.name === column.name,
+          !_findCol(
+            this._editor.horizontalPivots.selector.selectedColumns,
+            column.name,
           ),
       )
       .map(
@@ -69,7 +68,7 @@ export class DataCubeEditorVerticalPivotsPanelState
   adaptPropagatedChanges(): void {
     this.selector.setSelectedColumns(
       this.selector.selectedColumns.filter((column) =>
-        this.selector.availableColumns.find((col) => col.name === column.name),
+        _findCol(this.selector.availableColumns, column.name),
       ),
     );
   }

package/src/stores/view/extend/DataCubeColumnEditorState.tsx

@@ -52,6 +52,7 @@ import {
   _serializeValueSpecification,
   _deserializeValueSpecification,
 } from '../../core/DataCubeQueryBuilderUtils.js';
+import { _findCol } from '../../core/model/DataCubeColumn.js';
 
 export abstract class DataCubeColumnBaseEditorState {
   protected readonly uuid = uuid();
@@ -244,9 +245,7 @@ export abstract class DataCubeColumnBaseEditorState {
           this.buildExtendBaseQuery(),
           this.view.source,
         );
-      let returnType = returnRelationType.columns.find(
-        (col) => col.name === this._name,
-      )?.type;
+      let returnType = _findCol(returnRelationType.columns, this._name)?.type;
       returnType =
         returnType && isPrimitiveType(returnType) ? returnType : undefined;
       this.setReturnType(returnType);

package/src/stores/view/extend/DataCubeExtendManagerState.tsx

@@ -20,6 +20,7 @@ import {
   type DataCubeQuerySnapshotExtendedColumn,
 } from '../../core/DataCubeQuerySnapshot.js';
 import {
+  _findCol,
   _toCol,
   type DataCubeColumn,
 } from '../../core/model/DataCubeColumn.js';
@@ -45,7 +46,7 @@ import {
   DataCubeColumnKind,
   getDataType,
 } from '../../core/DataCubeQueryEngine.js';
-import { buildDefaultColumnConfiguration } from '../../core/DataCubeConfigurationBuilder.js';
+import { newColumnConfiguration } from '../../core/DataCubeConfigurationBuilder.js';
 import { _lambda } from '../../core/DataCubeQueryBuilderUtils.js';
 import { EngineError } from '@finos/legend-graph';
 
@@ -142,21 +143,21 @@ export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController
     }
 
     if (
-      !this.leafExtendedColumns.find((col) => col.name === columnName) &&
-      !this.groupExtendedColumns.find((col) => col.name === columnName)
+      !_findCol(this.leafExtendedColumns, columnName) &&
+      !_findCol(this.groupExtendedColumns, columnName)
     ) {
       return;
     }
     const editor = new DataCubeExistingColumnEditorState(
       this,
       guaranteeNonNullable(
-        this.leafExtendedColumns.find((col) => col.name === columnName) ??
-          this.groupExtendedColumns.find((col) => col.name === columnName),
+        _findCol(this.leafExtendedColumns, columnName) ??
+          _findCol(this.groupExtendedColumns, columnName),
       ).data,
       guaranteeNonNullable(
-        this.columnConfigurations.find((col) => col.name === columnName),
+        _findCol(this.columnConfigurations, columnName),
       ).kind,
-      Boolean(this.groupExtendedColumns.find((col) => col.name === columnName)),
+      Boolean(_findCol(this.groupExtendedColumns, columnName)),
     );
     await editor.initialize();
     this.existingColumnEditors.push(editor);
@@ -169,7 +170,7 @@ export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController
     columnKind: DataCubeColumnKind | undefined,
     editor: DataCubeNewColumnState,
   ) {
-    const columnConfiguration = buildDefaultColumnConfiguration(column);
+    const columnConfiguration = newColumnConfiguration(column);
     if (columnKind) {
       columnConfiguration.kind = columnKind;
       columnConfiguration.excludedFromPivot =
@@ -197,14 +198,14 @@ export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController
     columnKind: DataCubeColumnKind | undefined,
   ) {
     if (
-      !this.leafExtendedColumns.find((col) => col.name === columnName) &&
-      !this.groupExtendedColumns.find((col) => col.name === columnName)
+      !_findCol(this.leafExtendedColumns, columnName) &&
+      !_findCol(this.groupExtendedColumns, columnName)
     ) {
       return;
     }
 
     const columnConfiguration = guaranteeNonNullable(
-      this.columnConfigurations.find((col) => col.name === columnName),
+      _findCol(this.columnConfigurations, columnName),
     );
 
     const task = this.view.taskService.newTask('Column update check');
@@ -326,8 +327,8 @@ export class DataCubeExtendManagerState extends DataCubeQuerySnapshotController
 
   async deleteColumn(columnName: string) {
     if (
-      !this.leafExtendedColumns.find((col) => col.name === columnName) &&
-      !this.groupExtendedColumns.find((col) => col.name === columnName)
+      !_findCol(this.leafExtendedColumns, columnName) &&
+      !_findCol(this.groupExtendedColumns, columnName)
     ) {
       return;
     }

package/src/stores/view/filter/DataCubeFilterEditorState.tsx

@@ -37,6 +37,7 @@ import {
 } from '../../core/model/DataCubeConfiguration.js';
 import type { DisplayState } from '../../services/DataCubeLayoutService.js';
 import { DataCubeFilterEditor } from '../../../components/view/filter/DataCubeFilterEditor.js';
+import { _findCol } from '../../core/model/DataCubeColumn.js';
 
 /**
  * This query editor state backs the form editor for filter. It batches changes made
@@ -295,10 +296,7 @@ export class DataCubeFilterEditorState extends DataCubeQuerySnapshotController {
     );
     // NOTE: filtering group-level extended columns is not supported
     this.columns = configuration.columns.filter(
-      (column) =>
-        !snapshot.data.groupExtendedColumns.find(
-          (col) => col.name === column.name,
-        ),
+      (column) => !_findCol(snapshot.data.groupExtendedColumns, column.name),
     );
 
     this.tree.nodes = new Map<string, DataCubeFilterEditorTreeNode>();

package/src/stores/view/grid/DataCubeGridClientEngine.ts

@@ -31,18 +31,19 @@ import {
   pruneObject,
 } from '@finos/legend-shared';
 import { buildExecutableQuery } from '../../core/DataCubeQueryBuilder.js';
-import { type TabularDataSet, V1_Lambda } from '@finos/legend-graph';
+import {
+  PureClientVersion,
+  type TabularDataSet,
+  V1_Lambda,
+} from '@finos/legend-graph';
 import { makeObservable, observable, runInAction } from 'mobx';
 import type {
   DataCubeConfiguration,
   DataCubeConfigurationColorKey,
 } from '../../core/model/DataCubeConfiguration.js';
 import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
-import { _sortByColName } from '../../core/model/DataCubeColumn.js';
-import {
-  isPivotResultColumnName,
-  type DataCubeQueryFunctionMap,
-} from '../../core/DataCubeQueryEngine.js';
+import { _findCol, _sortByColName } from '../../core/model/DataCubeColumn.js';
+import { isPivotResultColumnName } from '../../core/DataCubeQueryEngine.js';
 import { buildQuerySnapshot } from './DataCubeGridQuerySnapshotBuilder.js';
 import { AlertType } from '../../services/DataCubeAlertService.js';
 import { sum } from 'mathjs';
@@ -260,6 +261,7 @@ async function getCastColumns(
   const snapshot = currentSnapshot.clone();
   guaranteeNonNullable(snapshot.data.pivot).castColumns = [];
   snapshot.data.groupBy = undefined;
+  snapshot.data.groupExtendedColumns = [];
   snapshot.data.sortColumns = [];
   snapshot.data.limit = 0;
   const query = buildExecutableQuery(
@@ -277,18 +279,6 @@ async function getCastColumns(
         filterOperations,
         aggregateOperations,
       ) => {
-        const _unprocess = (funcMapKey: keyof DataCubeQueryFunctionMap) => {
-          const func = funcMap[funcMapKey];
-          if (func) {
-            sequence.splice(sequence.indexOf(func), 1);
-            funcMap[funcMapKey] = undefined;
-          }
-        };
-
-        if (funcMap.groupExtend) {
-          _unprocess('groupExtend');
-        }
-
         // when both pivot and groupBy present, we need to account for the count column
         // in the cast expression
         if (funcMap.pivot && currentSnapshot.data.groupBy) {
@@ -304,6 +294,11 @@ async function getCastColumns(
     debug: view.settingService.getBooleanValue(
       DataCubeSettingKey.DEBUGGER__ENABLE_DEBUG_MODE,
     ),
+    clientVersion: view.settingService.getBooleanValue(
+      DataCubeSettingKey.DEBUGGER__USE_DEV_CLIENT_PROTOCOL_VERSION,
+    )
+      ? PureClientVersion.VX_X_X
+      : undefined,
   });
 
   return result.result.builder.columns.map((column) => ({
@@ -380,8 +375,9 @@ export class DataCubeGridClientServerSideDataSource
             newSnapshot.data.pivot.castColumns = castColumns;
             newSnapshot.data.sortColumns = newSnapshot.data.sortColumns.filter(
               (column) =>
-                [...castColumns, ...newSnapshot.data.groupExtendedColumns].find(
-                  (col) => column.name === col.name,
+                _findCol(
+                  [...castColumns, ...newSnapshot.data.groupExtendedColumns],
+                  column.name,
                 ),
             );
           } catch (error) {
@@ -430,6 +426,11 @@ export class DataCubeGridClientServerSideDataSource
           debug: this._view.settingService.getBooleanValue(
             DataCubeSettingKey.DEBUGGER__ENABLE_DEBUG_MODE,
           ),
+          clientVersion: this._view.settingService.getBooleanValue(
+            DataCubeSettingKey.DEBUGGER__USE_DEV_CLIENT_PROTOCOL_VERSION,
+          )
+            ? PureClientVersion.VX_X_X
+            : undefined,
         },
       );
       const rowData = buildRowData(result.result.result, newSnapshot);

package/src/stores/view/grid/DataCubeGridConfigurationBuilder.tsx

@@ -21,9 +21,13 @@
  * AG Grid, from the query snapshot.
  ***************************************************************************************/
 
-import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
+import {
+  type DataCubeQuerySnapshot,
+  type DataCubeQuerySnapshotPivot,
+} from '../../core/DataCubeQuerySnapshot.js';
 import {
   _findCol,
+  _toCol,
   type DataCubeColumn,
 } from '../../core/model/DataCubeColumn.js';
 import type {
@@ -61,11 +65,11 @@ import {
   last,
   getQueryParameters,
   getQueryParameterValue,
-  guaranteeNonNullable,
   isNonNullable,
   isNullable,
   isNumber,
   isValidUrl,
+  assertTrue,
 } from '@finos/legend-shared';
 import type {
   DataCubeColumnConfiguration,
@@ -216,17 +220,15 @@ function _displaySpec(columnData: ColumnData) {
       column.hideFromView ||
       !column.isSelected ||
       (Boolean(
-        snapshot.data.pivot &&
-          !snapshot.data.pivot.castColumns.find((col) => col.name === name),
+        snapshot.data.pivot && !_findCol(snapshot.data.pivot.castColumns, name),
       ) &&
-        !snapshot.data.groupExtendedColumns.find((col) => col.name === name)),
+        !_findCol(snapshot.data.groupExtendedColumns, name)),
     lockVisible:
       !column.isSelected ||
       (Boolean(
-        snapshot.data.pivot &&
-          !snapshot.data.pivot.castColumns.find((col) => col.name === name),
+        snapshot.data.pivot && !_findCol(snapshot.data.pivot.castColumns, name),
       ) &&
-        !snapshot.data.groupExtendedColumns.find((col) => col.name === name)),
+        !_findCol(snapshot.data.groupExtendedColumns, name)),
     pinned:
       column.pinned !== undefined
         ? column.pinned === DataCubeColumnPinPlacement.RIGHT
@@ -643,7 +645,7 @@ function generatePivotResultColumnHeaderTooltip(
     return values.join(' / ');
   }
   if (values.length === snapshot.data.pivot.columns.length + 1) {
-    const baseColumnName = guaranteeNonNullable(values[values.length - 1]);
+    const baseColumnName = at(values, values.length - 1);
     const columnConfiguration = _findCol(configuration.columns, baseColumnName);
     return `Column = ${
       columnConfiguration
@@ -783,6 +785,53 @@ function generateDefinitionForPivotResultColumns(
   return columnDefs;
 }
 
+/**
+ * We tried to push-down to the DB level to ensure a particular order
+ * for the pivot result columns, we do so by preceding pivot() with a sort().
+ *
+ * Implementations of pivot() is highly non-standard across different DBs, so
+ * this rearranging needs to be done client-side.
+ */
+function rearrangePivotResultColumns(
+  pivotResultColumns: DataCubeColumn[],
+  pivotData: DataCubeQuerySnapshotPivot,
+  configuration: DataCubeConfiguration,
+) {
+  try {
+    const columns: (DataCubeColumn & { values: string[] })[] = [];
+    for (const pivotResultColumn of pivotResultColumns) {
+      const column = {
+        ...pivotResultColumn,
+        values: pivotResultColumn.name
+          .split(PIVOT_COLUMN_NAME_VALUE_SEPARATOR)
+          .slice(0, -1), // remove the last entry
+      };
+      assertTrue(column.values.length === pivotData.columns.length);
+      columns.push(column);
+    }
+    const columnConfigs = pivotData.columns
+      .map((col) => configuration.getColumn(col.name))
+      .filter(isNonNullable);
+    assertTrue(columnConfigs.length === pivotData.columns.length);
+
+    // apply multi dimensional sorts by starting from the last pivot column to the first
+    for (let i = pivotData.columns.length - 1; i >= 0; i--) {
+      const direction =
+        columnConfigs[i]?.pivotSortDirection ??
+        DataCubeQuerySortDirection.ASCENDING;
+      columns.sort((a, b) =>
+        direction === DataCubeQuerySortDirection.ASCENDING
+          ? at(a.values, i).localeCompare(at(b.values, i))
+          : at(b.values, i).localeCompare(at(a.values, i)),
+      );
+    }
+
+    return columns.map((col) => _toCol(col));
+  } catch {
+    return pivotResultColumns;
+  }
+}
+
 export function generateColumnDefs(
   snapshot: DataCubeQuerySnapshot,
   configuration: DataCubeConfiguration,
@@ -795,17 +844,17 @@ export function generateColumnDefs(
   // must still be included in the column definitions, and made hidden instead.
   const columns = configuration.columns.filter(
     (col) =>
-      snapshot.data.selectColumns.find((column) => column.name === col.name) ??
-      snapshot.data.groupExtendedColumns.find(
-        (column) => column.name === col.name,
-      ),
+      _findCol(snapshot.data.selectColumns, col.name) ??
+      _findCol(snapshot.data.groupExtendedColumns, col.name),
   );
   let pivotResultColumns: DataCubeColumn[] = [];
 
   if (snapshot.data.pivot) {
     const castColumns = snapshot.data.pivot.castColumns;
-    pivotResultColumns = castColumns.filter((col) =>
-      isPivotResultColumnName(col.name),
+    pivotResultColumns = rearrangePivotResultColumns(
+      castColumns.filter((col) => isPivotResultColumnName(col.name)),
+      snapshot.data.pivot,
+      configuration,
     );
   }
 

package/src/stores/view/grid/DataCubeGridControllerState.ts

@@ -26,15 +26,16 @@ import {
   type DataCubeQuerySnapshotSortColumn,
 } from '../../core/DataCubeQuerySnapshot.js';
 import {
+  _findCol,
   _toCol,
   type DataCubeColumn,
 } from '../../core/model/DataCubeColumn.js';
 import { DataCubeQuerySnapshotController } from '../../services/DataCubeQuerySnapshotService.js';
 import {
-  type DataCubeQuerySortDirection,
   type DataCubeColumnPinPlacement,
   DataCubeColumnKind,
   DataCubeQueryFilterGroupOperator,
+  DataCubeQuerySortDirection,
   isPivotResultColumnName,
   getPivotResultColumnBaseColumnName,
 } from '../../core/DataCubeQueryEngine.js';
@@ -92,7 +93,7 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
     | undefined;
 
   getColumnConfiguration(colName: string | undefined) {
-    return this.configuration.columns.find((col) => col.name === colName);
+    return _findCol(this.configuration.columns, colName);
   }
 
   // --------------------------------- FILTER ---------------------------------
@@ -184,7 +185,7 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
     ];
 
     const rearrangedSelectColumns = columns
-      .map((colName) => this.selectColumns.find((col) => col.name === colName))
+      .map((colName) => _findCol(this.selectColumns, colName))
       .filter(isNonNullable);
     this.selectColumns = [
       ...rearrangedSelectColumns,
@@ -221,14 +222,15 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
   }
 
   getHorizontalPivotableColumn(colName: string) {
-    return this.configuration.columns
-      .filter(
+    return _findCol(
+      this.configuration.columns.filter(
         (col) =>
           col.kind === DataCubeColumnKind.DIMENSION &&
           // exclude group-level extended columns
-          !this.groupExtendedColumns.find((column) => column.name === col.name),
-      )
-      .find((col) => col.name === colName);
+          !_findCol(this.groupExtendedColumns, col.name),
+      ),
+      colName,
+    );
   }
 
   setHorizontalPivotOnColumn(colName: string) {
@@ -277,20 +279,17 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
   verticalPivotColumns: DataCubeColumn[] = [];
 
   getVerticalPivotableColumn(colName: string) {
-    return this.configuration.columns
-      .filter(
+    return _findCol(
+      this.configuration.columns.filter(
         (col) =>
           col.kind === DataCubeColumnKind.DIMENSION &&
           // exclude group-level extended columns
-          !this.groupExtendedColumns.find(
-            (column) => column.name === col.name,
-          ) &&
+          !_findCol(this.groupExtendedColumns, col.name) &&
           // exclude pivot columns
-          !this.horizontalPivotColumns.find(
-            (column) => column.name === col.name,
-          ),
-      )
-      .find((col) => col.name === colName);
+          !_findCol(this.horizontalPivotColumns, col.name),
+      ),
+      colName,
+    );
   }
 
   setVerticalPivotOnColumn(colName: string) {
@@ -349,12 +348,15 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
     if (!colName) {
       return undefined;
     }
-    return [
-      ...(this.horizontalPivotCastColumns.length
-        ? this.horizontalPivotCastColumns
-        : this.selectColumns),
-      ...this.groupExtendedColumns,
-    ].find((col) => col.name === colName);
+    return _findCol(
+      [
+        ...(this.horizontalPivotCastColumns.length
+          ? this.horizontalPivotCastColumns
+          : this.selectColumns),
+        ...this.groupExtendedColumns,
+      ],
+      colName,
+    );
   }
 
   setSortByColumn(colName: string, direction: DataCubeQuerySortDirection) {
@@ -430,23 +432,24 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
 
   private propagateChanges(baseSnapshot: DataCubeQuerySnapshot) {
     this.verticalPivotColumns = this.verticalPivotColumns.filter(
-      (col) =>
-        !this.horizontalPivotColumns.find((column) => column.name === col.name),
+      (col) => !_findCol(this.horizontalPivotColumns, col.name),
     );
     this.configuration.pivotLayout.expandedPaths = _pruneExpandedPaths(
       baseSnapshot.data.groupBy?.columns ?? [],
       this.verticalPivotColumns,
       this.configuration.pivotLayout.expandedPaths,
     );
+    this.configuration.columns.forEach((col) => {
+      col.pivotSortDirection = _findCol(this.horizontalPivotColumns, col.name)
+        ? (col.pivotSortDirection ?? DataCubeQuerySortDirection.ASCENDING)
+        : undefined;
+    });
 
     this.selectColumns = uniqBy(
       [
         ...this.configuration.columns.filter(
           (col) =>
-            col.isSelected &&
-            !this.groupExtendedColumns.find(
-              (column) => column.name === col.name,
-            ),
+            col.isSelected && !_findCol(this.groupExtendedColumns, col.name),
         ),
         ...this.horizontalPivotColumns,
         ...this.verticalPivotColumns,
@@ -468,9 +471,7 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
                 (column) =>
                   this.getColumnConfiguration(column.name)?.kind ===
                     DataCubeColumnKind.DIMENSION &&
-                  !this.horizontalPivotColumns.find(
-                    (col) => col.name === column.name,
-                  ),
+                  !_findCol(this.horizontalPivotColumns, column.name),
               ),
             ]
           : [
@@ -482,7 +483,7 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
       (col) => col.name,
     );
     this.sortColumns = this.sortColumns.filter((col) =>
-      sortableColumns.find((column) => column.name === col.name),
+      _findCol(sortableColumns, col.name),
     );
   }