@finos/legend-application-repl 0.0.57 → 0.0.59

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

@@ -14,12 +14,17 @@
  * limitations under the License.
  */
 
-import { guaranteeNonNullable, isNonNullable } from '@finos/legend-shared';
+import {
+  guaranteeNonNullable,
+  isNonNullable,
+  uniqBy,
+} from '@finos/legend-shared';
 import { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
-import type {
-  DataCubeQuerySnapshot,
-  DataCubeQuerySnapshotColumn,
-  DataCubeQuerySnapshotSortColumn,
+import {
+  _toCol,
+  type DataCubeQuerySnapshot,
+  type DataCubeQuerySnapshotColumn,
+  type DataCubeQuerySnapshotSortColumn,
 } from '../core/DataCubeQuerySnapshot.js';
 import { DataCubeQuerySnapshotController } from '../core/DataCubeQuerySnapshotManager.js';
 import {
@@ -27,7 +32,8 @@ import {
   type DataCubeColumnPinPlacement,
   DataCubeColumnKind,
   DataCubeQueryFilterGroupOperator,
-  PIVOT_COLUMN_NAME_VALUE_SEPARATOR,
+  isPivotResultColumnName,
+  getPivotResultColumnBaseColumnName,
 } from '../core/DataCubeQueryEngine.js';
 import type {
   GetContextMenuItemsParams,
@@ -139,7 +145,8 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
   // --------------------------------- COLUMNS ---------------------------------
 
   selectColumns: DataCubeQuerySnapshotColumn[] = [];
-  extendedColumns: DataCubeQuerySnapshotColumn[] = [];
+  leafExtendedColumns: DataCubeQuerySnapshotColumn[] = [];
+  groupExtendedColumns: DataCubeQuerySnapshotColumn[] = [];
 
   pinColumn(
     colName: string | undefined,
@@ -153,20 +160,28 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
   }
 
   rearrangeColumns(columnByNames: string[]) {
-    const columnConfigurations = columnByNames
+    // rearrange the column configurations and select columns
+    // anything that is not rearranged (e.g. due to pivot) will be
+    // pushed to the end
+    const rearrangedColumnConfigurations = columnByNames
       .map((colName) => this.getColumnConfiguration(colName))
       .filter(isNonNullable);
     this.configuration.columns = [
+      ...rearrangedColumnConfigurations,
       ...this.configuration.columns.filter(
-        (col) => !columnConfigurations.includes(col),
+        (col) => !rearrangedColumnConfigurations.includes(col),
       ),
-      ...columnConfigurations,
     ];
-    this.selectColumns = this.configuration.columns
-      .map((column) =>
-        this.selectColumns.find((col) => col.name === column.name),
-      )
+
+    const rearrangedSelectColumns = columnByNames
+      .map((colName) => this.selectColumns.find((col) => col.name === colName))
       .filter(isNonNullable);
+    this.selectColumns = [
+      ...rearrangedSelectColumns,
+      ...rearrangedSelectColumns.filter(
+        (col) => !rearrangedSelectColumns.includes(col),
+      ),
+    ];
     this.applyChanges();
   }
 
@@ -183,16 +198,35 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
     }
   }
 
+  private updateSelectColumns() {
+    this.selectColumns = uniqBy(
+      [
+        ...this.configuration.columns.filter((col) => col.isSelected),
+        ...this.horizontalPivotedColumns,
+        ...this.verticalPivotedColumns,
+      ],
+      (col) => col.name,
+    ).map((col) => _toCol(col));
+  }
+
   // --------------------------------- PIVOT ---------------------------------
 
-  horizontalPivotableColumns: DataCubeQuerySnapshotColumn[] = [];
   horizontalPivotedColumns: DataCubeQuerySnapshotColumn[] = [];
   horizontalPivotCastColumns: DataCubeQuerySnapshotColumn[] = [];
 
-  setHorizontalPivotOnColumn(colName: string | undefined) {
-    const column = this.horizontalPivotableColumns.find(
-      (col) => col.name === colName,
-    );
+  getHorizontalPivotableColumn(colName: string) {
+    return 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);
+  }
+
+  setHorizontalPivotOnColumn(colName: string) {
+    const column = this.getHorizontalPivotableColumn(colName);
     if (column) {
       this.horizontalPivotedColumns = [column];
       /** TODO?: @datacube pivot - naively propagate this change, this might cause a bug so to be revisited */
@@ -204,10 +238,8 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
     }
   }
 
-  addHorizontalPivotOnColumn(colName: string | undefined) {
-    const column = this.horizontalPivotableColumns.find(
-      (col) => col.name === colName,
-    );
+  addHorizontalPivotOnColumn(colName: string) {
+    const column = this.getHorizontalPivotableColumn(colName);
     if (column) {
       this.horizontalPivotedColumns = [
         ...this.horizontalPivotedColumns,
@@ -227,12 +259,9 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
     this.applyChanges();
   }
 
-  excludeColumnFromHorizontalPivot(colName: string | undefined) {
-    if (colName?.includes(PIVOT_COLUMN_NAME_VALUE_SEPARATOR)) {
-      const baseColumnName = colName.substring(
-        colName.lastIndexOf(PIVOT_COLUMN_NAME_VALUE_SEPARATOR) +
-          PIVOT_COLUMN_NAME_VALUE_SEPARATOR.length,
-      );
+  excludeColumnFromHorizontalPivot(colName: string) {
+    if (isPivotResultColumnName(colName)) {
+      const baseColumnName = getPivotResultColumnBaseColumnName(colName);
       const columnConfiguration = this.getColumnConfiguration(baseColumnName);
       if (
         columnConfiguration &&
@@ -244,7 +273,7 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
     }
   }
 
-  includeColumnInHorizontalPivot(colName: string | undefined) {
+  includeColumnInHorizontalPivot(colName: string) {
     const columnConfiguration = this.getColumnConfiguration(colName);
     if (columnConfiguration?.excludedFromHorizontalPivot) {
       columnConfiguration.excludedFromHorizontalPivot = false;
@@ -254,32 +283,44 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
 
   // --------------------------------- GROUP BY ---------------------------------
 
-  verticalPivotableColumns: DataCubeQuerySnapshotColumn[] = [];
   verticalPivotedColumns: DataCubeQuerySnapshotColumn[] = [];
 
-  setVerticalPivotOnColumn(colName: string | undefined) {
-    const column = this.verticalPivotableColumns.find(
-      (col) => col.name === colName,
-    );
+  getVerticalPivotableColumn(colName: string) {
+    return this.configuration.columns
+      .filter(
+        (col) =>
+          col.kind === DataCubeColumnKind.DIMENSION &&
+          // exclude group-level extended columns
+          !this.groupExtendedColumns.find(
+            (column) => column.name === col.name,
+          ) &&
+          // exclude pivot columns
+          !this.horizontalPivotedColumns.find(
+            (column) => column.name === col.name,
+          ),
+      )
+      .find((col) => col.name === colName);
+  }
+
+  setVerticalPivotOnColumn(colName: string) {
+    const column = this.getVerticalPivotableColumn(colName);
     if (column) {
       this.verticalPivotedColumns = [column];
       this.applyChanges();
     }
   }
 
-  addVerticalPivotOnColumn(colName: string | undefined) {
-    const column = this.verticalPivotableColumns.find(
-      (col) => col.name === colName,
-    );
+  addVerticalPivotOnColumn(colName: string) {
+    const column = this.getVerticalPivotableColumn(colName);
     if (column) {
       this.verticalPivotedColumns = [...this.verticalPivotedColumns, column];
       this.applyChanges();
     }
   }
 
-  removeVerticalPivotOnColumn(colName: string | undefined) {
+  removeVerticalPivotOnColumn(colName: string) {
     this.verticalPivotedColumns = this.verticalPivotedColumns.filter(
-      (col) => col.name === colName,
+      (col) => col.name !== colName,
     );
     this.applyChanges();
   }
@@ -291,14 +332,25 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
 
   // --------------------------------- SORT ---------------------------------
 
-  sortableColumns: DataCubeQuerySnapshotColumn[] = [];
   sortColumns: DataCubeQuerySnapshotSortColumn[] = [];
 
-  getActionableSortColumn(
+  getSortableColumn(colName: string | undefined) {
+    if (!colName) {
+      return undefined;
+    }
+    return [
+      ...(this.horizontalPivotCastColumns.length
+        ? this.horizontalPivotCastColumns
+        : this.selectColumns),
+      ...this.groupExtendedColumns,
+    ].find((col) => col.name === colName);
+  }
+
+  private getActionableSortColumn(
     colName: string,
     operation: DataCubeQuerySortOperator,
   ) {
-    const column = this.sortableColumns.find((col) => col.name === colName);
+    const column = this.getSortableColumn(colName);
     if (!column) {
       return undefined;
     }
@@ -344,38 +396,6 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
 
   // --------------------------------- MAIN ---------------------------------
 
-  private applyChanges() {
-    const baseSnapshot = guaranteeNonNullable(this.getLatestSnapshot());
-    const snapshot = baseSnapshot.clone();
-
-    snapshot.data.filter = this.filterTree.root
-      ? buildFilterQuerySnapshot(this.filterTree.root)
-      : undefined;
-    snapshot.data.selectColumns = this.selectColumns;
-    snapshot.data.sortColumns = this.sortColumns;
-    snapshot.data.configuration = DataCubeConfiguration.serialization.toJson(
-      this.configuration,
-    );
-
-    snapshot.data.pivot = this.horizontalPivotedColumns.length
-      ? {
-          columns: this.horizontalPivotedColumns,
-          castColumns: this.horizontalPivotCastColumns,
-        }
-      : undefined;
-
-    snapshot.data.groupBy = this.verticalPivotedColumns.length
-      ? {
-          columns: this.verticalPivotedColumns,
-        }
-      : undefined;
-
-    snapshot.finalize();
-    if (snapshot.hashCode !== baseSnapshot.hashCode) {
-      this.publishSnapshot(snapshot);
-    }
-  }
-
   override async applySnapshot(
     snapshot: DataCubeQuerySnapshot,
     previousSnapshot: DataCubeQuerySnapshot | undefined,
@@ -397,33 +417,52 @@ export class DataCubeGridControllerState extends DataCubeQuerySnapshotController
       : undefined;
 
     this.selectColumns = newSnapshot.data.selectColumns;
-    this.extendedColumns = [
-      ...newSnapshot.data.leafExtendedColumns,
-      ...newSnapshot.data.groupExtendedColumns,
-    ];
+    this.leafExtendedColumns = newSnapshot.data.leafExtendedColumns;
+    this.groupExtendedColumns = newSnapshot.data.groupExtendedColumns;
 
-    this.horizontalPivotableColumns = newSnapshot
-      .stageCols('pivot')
-      .filter(
-        (column) =>
-          this.getColumnConfiguration(column.name)?.kind ===
-          DataCubeColumnKind.DIMENSION,
-      );
     this.horizontalPivotedColumns = newSnapshot.data.pivot?.columns ?? [];
     this.horizontalPivotCastColumns = newSnapshot.data.pivot?.castColumns ?? [];
 
-    this.verticalPivotableColumns = newSnapshot
-      .stageCols('group-by')
-      .filter(
-        (column) =>
-          this.getColumnConfiguration(column.name)?.kind ===
-          DataCubeColumnKind.DIMENSION,
-      );
     this.verticalPivotedColumns = newSnapshot.data.groupBy?.columns ?? [];
 
-    this.sortableColumns = newSnapshot.stageCols('sort');
     this.sortColumns = newSnapshot.data.sortColumns;
 
     this.menuBuilder = generateMenuBuilder(this);
   }
+
+  private applyChanges() {
+    const baseSnapshot = guaranteeNonNullable(this.getLatestSnapshot());
+    const snapshot = baseSnapshot.clone();
+
+    snapshot.data.configuration = DataCubeConfiguration.serialization.toJson(
+      this.configuration,
+    );
+
+    snapshot.data.filter = this.filterTree.root
+      ? buildFilterQuerySnapshot(this.filterTree.root)
+      : undefined;
+
+    this.updateSelectColumns();
+    snapshot.data.selectColumns = this.selectColumns;
+
+    snapshot.data.pivot = this.horizontalPivotedColumns.length
+      ? {
+          columns: this.horizontalPivotedColumns,
+          castColumns: this.horizontalPivotCastColumns,
+        }
+      : undefined;
+
+    snapshot.data.groupBy = this.verticalPivotedColumns.length
+      ? {
+          columns: this.verticalPivotedColumns,
+        }
+      : undefined;
+
+    snapshot.data.sortColumns = this.sortColumns;
+
+    snapshot.finalize();
+    if (snapshot.hashCode !== baseSnapshot.hashCode) {
+      this.publishSnapshot(snapshot);
+    }
+  }
 }

package/src/stores/dataCube/grid/DataCubeGridMenuBuilder.tsx

@@ -27,7 +27,8 @@ import {
   DataCubeColumnKind,
   type DataCubeOperationValue,
   DataCubeQueryFilterOperator,
-  PIVOT_COLUMN_NAME_VALUE_SEPARATOR,
+  isPivotResultColumnName,
+  getPivotResultColumnBaseColumnName,
 } from '../core/DataCubeQueryEngine.js';
 import {
   guaranteeIsNumber,
@@ -176,19 +177,18 @@ export function generateMenuBuilder(
     const column = params.column ?? undefined;
     const columnName = column?.getColId();
     const columnConfiguration = controller.getColumnConfiguration(columnName);
-    const baseColumnConfiguration = columnName?.includes(
-      PIVOT_COLUMN_NAME_VALUE_SEPARATOR,
-    )
-      ? controller.getColumnConfiguration(
-          columnName.substring(
-            columnName.lastIndexOf(PIVOT_COLUMN_NAME_VALUE_SEPARATOR) +
-              PIVOT_COLUMN_NAME_VALUE_SEPARATOR.length,
-          ),
-        )
-      : undefined;
+    const baseColumnConfiguration =
+      columnName && isPivotResultColumnName(columnName)
+        ? controller.getColumnConfiguration(
+            getPivotResultColumnBaseColumnName(columnName),
+          )
+        : undefined;
     const isExtendedColumn =
       columnName &&
-      controller.extendedColumns.find((col) => col.name === columnName);
+      [
+        ...controller.leafExtendedColumns,
+        ...controller.groupExtendedColumns,
+      ].find((col) => col.name === columnName);
     // NOTE: here we assume the value must be coming from the same column
     const value: unknown = 'value' in params ? params.value : undefined;
 
@@ -196,7 +196,7 @@ export function generateMenuBuilder(
       {
         name: 'Sort',
         subMenu: [
-          ...(column && columnName
+          ...(column && columnName && controller.getSortableColumn(columnName)
             ? [
                 {
                   name: 'Ascending',
@@ -286,7 +286,7 @@ export function generateMenuBuilder(
           },
         ],
       },
-    ];
+    ] satisfies (string | MenuItemDef)[];
 
     let newFilterMenu: MenuItemDef[] = [];
     if (columnConfiguration && column && value !== undefined) {
@@ -494,7 +494,8 @@ export function generateMenuBuilder(
         subMenu: [
           ...(column &&
           columnName &&
-          columnConfiguration?.kind === DataCubeColumnKind.DIMENSION
+          columnConfiguration?.kind === DataCubeColumnKind.DIMENSION &&
+          controller.getVerticalPivotableColumn(columnName)
             ? [
                 {
                   name: `Vertical Pivot on ${column.getColId()}`,
@@ -518,6 +519,13 @@ export function generateMenuBuilder(
                     controller.removeVerticalPivotOnColumn(columnName),
                 },
                 'separator',
+              ]
+            : []),
+          ...(column &&
+          columnName &&
+          columnConfiguration?.kind === DataCubeColumnKind.DIMENSION &&
+          controller.getHorizontalPivotableColumn(columnName)
+            ? [
                 {
                   name: `Horizontal Pivot on ${column.getColId()}`,
                   action: () =>
@@ -673,25 +681,73 @@ export function generateMenuBuilder(
           {
             name: `Auto-size All Columns`,
             action: () =>
-              params.api.autoSizeColumns(
-                controller.configuration.columns
-                  .filter((col) => col.fixedWidth === undefined)
+              params.api.autoSizeColumns([
+                ...controller.configuration.columns
+                  .filter(
+                    (col) =>
+                      col.fixedWidth === undefined &&
+                      col.isSelected &&
+                      !col.hideFromView,
+                  )
                   .map((col) => col.name),
-              ),
+                ...controller.horizontalPivotCastColumns
+                  .map((col) => {
+                    if (isPivotResultColumnName(col.name)) {
+                      const colConf = controller.configuration.columns.find(
+                        (c) =>
+                          c.name ===
+                          getPivotResultColumnBaseColumnName(col.name),
+                      );
+                      if (
+                        colConf &&
+                        colConf.fixedWidth === undefined &&
+                        colConf.isSelected &&
+                        !colConf.hideFromView
+                      ) {
+                        return col.name;
+                      }
+                    }
+                    return undefined;
+                  })
+                  .filter(isNonNullable),
+              ]),
           },
           {
             name: `Minimize All Columns`,
             action: () => {
-              params.api.setColumnWidths(
-                // TODO: take care of pivot columns
-                controller.configuration.columns
+              params.api.setColumnWidths([
+                ...controller.configuration.columns
                   .filter((col) => col.fixedWidth === undefined)
                   .map((col) => ({
                     key: col.name,
                     newWidth:
                       columnConfiguration?.minWidth ?? DEFAULT_COLUMN_MIN_WIDTH,
                   })),
-              );
+                ...controller.horizontalPivotCastColumns
+                  .map((col) => {
+                    if (isPivotResultColumnName(col.name)) {
+                      const colConf = controller.configuration.columns.find(
+                        (c) =>
+                          c.name ===
+                          getPivotResultColumnBaseColumnName(col.name),
+                      );
+                      if (
+                        colConf &&
+                        colConf.fixedWidth === undefined &&
+                        colConf.isSelected &&
+                        !colConf.hideFromView
+                      ) {
+                        return {
+                          key: col.name,
+                          newWidth:
+                            colConf.minWidth ?? DEFAULT_COLUMN_MIN_WIDTH,
+                        };
+                      }
+                    }
+                    return undefined;
+                  })
+                  .filter(isNonNullable),
+              ]);
             },
           },
           {
@@ -795,6 +851,6 @@ export function generateMenuBuilder(
           editor.display.open();
         },
       },
-    ];
+    ] satisfies (string | MenuItemDef)[];
   };
 }

package/src/stores/dataCube/grid/DataCubeGridQueryBuilder.ts

@@ -35,6 +35,7 @@ import {
   _function,
   _lambda,
   _var,
+  _functionCompositionUnProcessor,
 } from '../core/DataCubeQueryBuilderUtils.js';
 import {
   INTERNAL__GRID_CLIENT_MISSING_VALUE,
@@ -76,13 +77,7 @@ export function generateRowGroupingDrilldownExecutableQueryPostProcessor(
     filterOperations: DataCubeQueryFilterOperation[],
     aggregateOperations: DataCubeQueryAggregateOperation[],
   ) => {
-    const _unprocess = (funcMapKey: keyof DataCubeQueryFunctionMap) => {
-      const func = funcMap[funcMapKey];
-      if (func) {
-        sequence.splice(sequence.indexOf(func), 1);
-        funcMap[funcMapKey] = undefined;
-      }
-    };
+    const _unprocess = _functionCompositionUnProcessor(sequence, funcMap);
     const data = snapshot.data;
 
     if (funcMap.groupBy) {

package/src/stores/dataCube/grid/DataCubeGridQuerySnapshotBuilder.ts

@@ -23,14 +23,30 @@
 
 import type { IServerSideGetRowsRequest } from '@ag-grid-community/core';
 import {
+  _toCol,
   type DataCubeQuerySnapshot,
-  _getCol,
 } from '../core/DataCubeQuerySnapshot.js';
 import {
   GridClientSortDirection,
   INTERNAL__GRID_CLIENT_TREE_COLUMN_ID,
 } from './DataCubeGridClientEngine.js';
-import { DataCubeQuerySortOperator } from '../core/DataCubeQueryEngine.js';
+import {
+  DataCubeQuerySortOperator,
+  getPivotResultColumnBaseColumnName,
+  isPivotResultColumnName,
+} from '../core/DataCubeQueryEngine.js';
+import { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
+import { guaranteeNonNullable } from '@finos/legend-shared';
+
+export function getColumnConfiguration(
+  colName: string,
+  configuration: DataCubeConfiguration,
+) {
+  return guaranteeNonNullable(
+    configuration.columns.find((col) => col.name === colName),
+    `Can't find configuration for column '${colName}'`,
+  );
+}
 
 // --------------------------------- MAIN ---------------------------------
 
@@ -39,14 +55,16 @@ export function buildQuerySnapshot(
   baseSnapshot: DataCubeQuerySnapshot,
 ) {
   const snapshot = baseSnapshot.clone();
+  const configuration = DataCubeConfiguration.serialization.fromJson(
+    snapshot.data.configuration,
+  );
 
   // --------------------------------- GROUP BY ---------------------------------
 
   if (request.rowGroupCols.length) {
-    const availableCols = baseSnapshot.stageCols('group-by');
     const newGroupByColumns = request.rowGroupCols.map((col) => ({
       name: col.id,
-      type: _getCol(availableCols, col.id).type,
+      type: getColumnConfiguration(col.id, configuration).type,
     }));
     snapshot.data.groupBy = {
       columns: newGroupByColumns,
@@ -65,7 +83,14 @@ export function buildQuerySnapshot(
     // the tree-group, all group-by columns will be sorted in that direction
     .filter((item) => item.colId !== INTERNAL__GRID_CLIENT_TREE_COLUMN_ID)
     .map((item) => ({
-      ..._getCol(baseSnapshot.stageCols('sort'), item.colId),
+      ..._toCol(
+        getColumnConfiguration(
+          isPivotResultColumnName(item.colId)
+            ? getPivotResultColumnBaseColumnName(item.colId)
+            : item.colId,
+          configuration,
+        ),
+      ),
       operation:
         item.sort === GridClientSortDirection.ASCENDING
           ? DataCubeQuerySortOperator.ASCENDING