@finos/legend-application-repl 0.0.24 → 0.0.25

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

@@ -22,7 +22,11 @@ import type {
 import type { DataCubeGridState } from './DataCubeGridState.js';
 import {
   cloneSnapshot,
+  type DataCubeQueryFilter,
+  type DataCubeQueryFilterCondition,
   type DataCubeQuerySnapshot,
+  type DataCubeQuerySnapshotAggregateColumn,
+  type DataCubeQuerySnapshotColumn,
   type DataCubeQuerySnapshotSortColumn,
 } from '../core/DataCubeQuerySnapshot.js';
 import {
@@ -33,8 +37,17 @@ import {
   isBoolean,
 } from '@finos/legend-shared';
 import { buildExecutableQueryFromSnapshot } from '../core/DataCubeQueryBuilder.js';
-import { type TabularDataSet, V1_Lambda } from '@finos/legend-graph';
-import { DATA_CUBE_COLUMN_SORT_DIRECTION } from '../DataCubeMetaModelConst.js';
+import {
+  type TabularDataSet,
+  V1_Lambda,
+  PRIMITIVE_TYPE,
+  extractElementNameFromPath,
+} from '@finos/legend-graph';
+import {
+  DATA_CUBE_COLUMN_SORT_DIRECTION,
+  DATA_CUBE_FILTER_OPERATION,
+  DATA_CUBE_FUNCTIONS,
+} from '../DataCubeMetaModelConst.js';
 import { APPLICATION_EVENT } from '@finos/legend-application';
 
 export type GridClientResultCellDataType =
@@ -117,7 +130,41 @@ export class DataCubeGridClientServerSideDataSource
     let createNew = false;
 
     // --------------------------------- GROUP BY ---------------------------------
-    // TODO: @akphi - Implement this
+    const groupByExpandedKeys = request.groupKeys;
+    const groupByColumns = request.rowGroupCols.map((r) => {
+      const column = baseSnapshot.columns.find((col) => col.name === r.id);
+      return {
+        name: r.id,
+        type: guaranteeNonNullable(column).type,
+      } as DataCubeQuerySnapshotColumn;
+    });
+    const groupByAggColumns = request.valueCols.map((v) => {
+      const type = baseSnapshot.columns.find(
+        (col) => col.name === v.field,
+      )?.type;
+      return {
+        name: v.field,
+        type: type,
+        function: v.aggFunc,
+      } as DataCubeQuerySnapshotAggregateColumn;
+    });
+    let groupByFilter: DataCubeQueryFilter | undefined;
+
+    for (let index = 0; index < groupByExpandedKeys.length; index++) {
+      const groupFilter = {
+        conditions: [
+          {
+            name: guaranteeNonNullable(groupByColumns.at(index)).name,
+            type: PRIMITIVE_TYPE.STRING,
+            operation: DATA_CUBE_FILTER_OPERATION.EQUALS,
+            value: groupByExpandedKeys.at(index),
+          } as DataCubeQueryFilterCondition,
+        ],
+        groupOperation: extractElementNameFromPath(DATA_CUBE_FUNCTIONS.AND),
+      } as DataCubeQueryFilter;
+
+      groupByFilter = groupFilter;
+    }
 
     // --------------------------------- SORT ---------------------------------
 
@@ -136,7 +183,13 @@ export class DataCubeGridClientServerSideDataSource
         };
       });
 
-    if (!deepEqual(newSortColumns, baseSnapshot.sortColumns)) {
+    if (
+      !deepEqual(newSortColumns, baseSnapshot.sortColumns) ||
+      !deepEqual(groupByExpandedKeys, baseSnapshot.groupByExpandedKeys) ||
+      !deepEqual(groupByColumns, baseSnapshot.groupByColumns) ||
+      !deepEqual(groupByAggColumns, baseSnapshot.groupByAggColumns) ||
+      !deepEqual(groupByFilter, baseSnapshot.groupByFilter)
+    ) {
       createNew = true;
     }
 
@@ -145,6 +198,10 @@ export class DataCubeGridClientServerSideDataSource
     if (createNew) {
       const newSnapshot = cloneSnapshot(baseSnapshot);
       newSnapshot.sortColumns = newSortColumns;
+      newSnapshot.groupByExpandedKeys = groupByExpandedKeys;
+      newSnapshot.groupByColumns = groupByColumns;
+      newSnapshot.groupByAggColumns = groupByAggColumns;
+      newSnapshot.groupByFilter = groupByFilter;
       return newSnapshot;
     }
     return baseSnapshot;

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

@@ -18,6 +18,7 @@ import type { DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
 import type { GridOptions } from '@ag-grid-community/core';
 import { DATA_CUBE_COLUMN_SORT_DIRECTION } from '../DataCubeMetaModelConst.js';
 import { GridClientSortDirection } from './DataCubeGridClientEngine.js';
+import { PRIMITIVE_TYPE } from '@finos/legend-graph';
 
 // export const getTDSSortOrder = (sortOrder: string): TDS_SORT_ORDER => {
 //   switch (sortOrder) {
@@ -221,6 +222,41 @@ function buildColumnSortSpecification(
   };
 }
 
+function getAggregationColumnCustomizations(
+  colName: string,
+  snapshot: DataCubeQuerySnapshot,
+): string[] {
+  const columnType = snapshot.columns.find((col) => col.name === colName)?.type;
+  switch (columnType) {
+    case PRIMITIVE_TYPE.STRING:
+      return [];
+    case PRIMITIVE_TYPE.DATE:
+    case PRIMITIVE_TYPE.DATETIME:
+    case PRIMITIVE_TYPE.STRICTDATE:
+      return [];
+    case PRIMITIVE_TYPE.DECIMAL:
+    case PRIMITIVE_TYPE.INTEGER:
+    case PRIMITIVE_TYPE.FLOAT:
+      return ['count', 'sum', 'max', 'min', 'avg'];
+    default:
+      return [];
+  }
+}
+
+function buildColumnGroupBySpecification(
+  colName: string,
+  snapshot: DataCubeQuerySnapshot,
+) {
+  const rowGroup = snapshot.groupByColumns.find((c) => c.name === colName);
+  const aggColumn = snapshot.groupByAggColumns.find((c) => c.name === colName);
+  return {
+    rowGroup: Boolean(rowGroup),
+    hide: Boolean(rowGroup),
+    aggFunc: aggColumn ? aggColumn.function : null,
+    allowedAggFuncs: getAggregationColumnCustomizations(colName, snapshot),
+  };
+}
+
 export function generateGridOptionsFromSnapshot(
   snapshot: DataCubeQuerySnapshot,
 ): GridOptions {
@@ -235,10 +271,10 @@ export function generateGridOptionsFromSnapshot(
       sortable: true,
       flex: 1,
       resizable: true,
-      // enableRowGroup: true,
-      // allowedAggFuncs: ['count', 'sum', 'max', 'min', 'avg'],
-      // enableValue: true,
-      // menuTabs: ['filterMenuTab', 'generalMenuTab', 'columnsMenuTab'],
+      enableRowGroup: true,
+      enableValue: true,
+      menuTabs: ['generalMenuTab', 'columnsMenuTab'],
+      ...buildColumnGroupBySpecification(col.name, snapshot),
     })),
   };
   return gridOptions;