@finos/legend-application-repl 0.0.23 → 0.0.25

package/lib/stores/dataCube/grid/DataCubeGridClientEngine.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeGridClientEngine.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/grid/DataCubeGridClientEngine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataCubeGridClientEngine.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/grid/DataCubeGridClientEngine.ts"],"names":[],"mappings":"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"}

package/lib/stores/dataCube/grid/DataCubeGridQuerySnapshotAnalyzer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeGridQuerySnapshotAnalyzer.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/grid/DataCubeGridQuerySnapshotAnalyzer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AA8M3D,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,qBAAqB,GAC9B,WAAW,CAmBb"}
+{"version":3,"file":"DataCubeGridQuerySnapshotAnalyzer.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/grid/DataCubeGridQuerySnapshotAnalyzer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAkP3D,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,qBAAqB,GAC9B,WAAW,CAmBb"}

package/lib/stores/dataCube/grid/DataCubeGridQuerySnapshotAnalyzer.js

@@ -15,6 +15,7 @@
  */
 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) {
 //     case 'asc':
@@ -202,6 +203,33 @@ function buildColumnSortSpecification(colName, snapshot) {
         sortIndex: snapshot.sortColumns.indexOf(sortCol),
     };
 }
+function getAggregationColumnCustomizations(colName, snapshot) {
+    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, snapshot) {
+    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) {
     const gridOptions = {
         columnDefs: snapshot.columns.map((col) => ({
@@ -213,10 +241,10 @@ export function generateGridOptionsFromSnapshot(snapshot) {
             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;

package/lib/stores/dataCube/grid/DataCubeGridQuerySnapshotAnalyzer.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeGridQuerySnapshotAnalyzer.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/grid/DataCubeGridQuerySnapshotAnalyzer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataCubeGridQuerySnapshotAnalyzer.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/grid/DataCubeGridQuerySnapshotAnalyzer.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-repl",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "description": "Legend REPL Grid client application core",
   "keywords": [
     "legend",
@@ -51,10 +51,10 @@
     "@ag-grid-enterprise/menu": "31.3.2",
     "@ag-grid-enterprise/row-grouping": "31.3.2",
     "@ag-grid-enterprise/server-side-row-model": "31.3.2",
-    "@finos/legend-application": "15.1.6",
-    "@finos/legend-art": "7.1.35",
+    "@finos/legend-application": "15.1.8",
+    "@finos/legend-art": "7.1.36",
     "@finos/legend-graph": "31.10.3",
-    "@finos/legend-lego": "1.2.36",
+    "@finos/legend-lego": "1.2.38",
     "@finos/legend-shared": "10.0.39",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",

package/src/components/dataCube/grid/DataCubeGrid.tsx

@@ -55,6 +55,8 @@ export const DataCubeGrid = observer((props: { editorStore: REPLStore }) => {
         alwaysMultiSort={true}
         rowModelType="serverSide"
         serverSideDatasource={dataCubeState.grid.clientDataSource}
+        suppressAggFuncInHeader={true}
+        suppressServerSideInfiniteScroll={true}
         modules={[
           // community
           ClientSideRowModelModule,

package/src/stores/dataCube/DataCubeMetaModelConst.ts

@@ -55,6 +55,21 @@ export enum DATA_CUBE_AGGREGATE_FUNCTION {
   LAST = 'last',
 }
 
+export enum DATA_CUBE_FILTER_OPERATION {
+  EQUALS = 'equal',
+  NOT_EQUAL = 'notEqual',
+  GREATER_THAN = 'greaterThan',
+  GREATER_THAN_OR_EQUAL = 'greaterThanOrEqual',
+  LESS_THAN = 'lessThan',
+  LESS_THAN_OR_EQUAL = 'lessThanOrEqual',
+  BLANK = 'isEmpty',
+  NOT_BLANK = 'isNotEmpty',
+  CONTAINS = 'contains',
+  NOT_CONTAINS = 'notContains',
+  STARTS_WITH = 'startsWith',
+  ENDS_WITH = 'endsWith',
+}
+
 export enum DATA_CUBE_COLUMN_SORT_DIRECTION {
   ASCENDING = 'ascending',
   DESCENDING = 'descending',

package/src/stores/dataCube/core/DataCubeQueryBuilder.ts

@@ -15,23 +15,49 @@
  */
 
 import {
+  PRIMITIVE_TYPE,
   V1_AppliedFunction,
+  V1_AppliedProperty,
+  V1_CBoolean,
+  V1_CDateTime,
+  V1_CDecimal,
+  V1_CFloat,
+  V1_CInteger,
+  V1_CStrictDate,
+  V1_CStrictTime,
+  V1_CString,
   V1_ClassInstance,
   V1_ClassInstanceType,
   V1_ColSpec,
+  V1_ColSpecArray,
   V1_Collection,
+  V1_Lambda,
   V1_Multiplicity,
   V1_PackageableElementPtr,
+  type V1_PrimitiveValueSpecification,
+  V1_Variable,
   V1_deserializeValueSpecification,
   extractElementNameFromPath,
-  type V1_Lambda,
   type V1_ValueSpecification,
 } from '@finos/legend-graph';
-import type { DataCubeQuerySnapshot } from './DataCubeQuerySnapshot.js';
-import { guaranteeNonNullable } from '@finos/legend-shared';
+import type {
+  DataCubeQueryFilterCondition,
+  DataCubeQueryFilter,
+  DataCubeQuerySnapshot,
+} from './DataCubeQuerySnapshot.js';
 import {
+  guaranteeNonNullable,
+  guaranteeIsString,
+  guaranteeIsBoolean,
+  guaranteeIsNumber,
+  UnsupportedOperationError,
+} from '@finos/legend-shared';
+import {
+  DATA_CUBE_AGGREGATE_FUNCTION,
   DATA_CUBE_COLUMN_SORT_DIRECTION,
+  DATA_CUBE_FILTER_OPERATION,
   DATA_CUBE_FUNCTIONS,
+  DEFAULT_LAMBDA_VARIABLE_NAME,
 } from '../DataCubeMetaModelConst.js';
 
 function createColSpec(
@@ -51,6 +77,197 @@ function createColSpec(
   return instance;
 }
 
+function getAggregationColSpec(
+  column: string,
+  functionName: string,
+  columnType: string,
+  // Temporary. Remove it when we support groupBy with empty aggregations
+  columnName?: string,
+): V1_ColSpec {
+  const colSpec = new V1_ColSpec();
+  const aggLambda = new V1_Lambda();
+  const property = new V1_AppliedProperty();
+  property.property = column;
+  property.class = columnType;
+  const defaultVariable = new V1_Variable();
+  defaultVariable.name = DEFAULT_LAMBDA_VARIABLE_NAME;
+  property.parameters = [defaultVariable];
+  aggLambda.body.push(property);
+  aggLambda.parameters.push(defaultVariable);
+  colSpec.function1 = aggLambda;
+
+  const funcLambda = new V1_Lambda();
+  const aggFunc = new V1_AppliedFunction();
+  aggFunc.function = functionName;
+  const aggVariable = new V1_Variable();
+  aggVariable.name = 'agg';
+  funcLambda.body.push(aggFunc);
+  aggFunc.parameters.push(aggVariable);
+  funcLambda.parameters.push(aggVariable);
+  colSpec.function2 = funcLambda;
+
+  colSpec.name = columnName ?? column;
+  return colSpec;
+}
+
+function getPrimitiveValueSpecification(
+  type: string,
+  column: unknown,
+): V1_PrimitiveValueSpecification {
+  switch (type) {
+    case PRIMITIVE_TYPE.STRING: {
+      const stringValue = new V1_CString();
+      stringValue.value = guaranteeIsString(column);
+      return stringValue;
+    }
+    case PRIMITIVE_TYPE.BOOLEAN: {
+      const booleanValue = new V1_CBoolean();
+      booleanValue.value = guaranteeIsBoolean(column);
+      return booleanValue;
+    }
+    case PRIMITIVE_TYPE.NUMBER:
+    case PRIMITIVE_TYPE.DECIMAL: {
+      const cDecimal = new V1_CDecimal();
+      cDecimal.value = guaranteeIsNumber(column);
+      return cDecimal;
+    }
+    case PRIMITIVE_TYPE.INTEGER: {
+      const cInteger = new V1_CInteger();
+      cInteger.value = guaranteeIsNumber(column);
+      return cInteger;
+    }
+    case PRIMITIVE_TYPE.FLOAT: {
+      const cFloat = new V1_CFloat();
+      cFloat.value = guaranteeIsNumber(column);
+      return cFloat;
+    }
+    case PRIMITIVE_TYPE.DATE:
+    case PRIMITIVE_TYPE.DATETIME: {
+      const cDateTime = new V1_CDateTime();
+      cDateTime.value = guaranteeIsString(column);
+      return cDateTime;
+    }
+    case PRIMITIVE_TYPE.STRICTDATE: {
+      const cStrictDate = new V1_CStrictDate();
+      cStrictDate.value = guaranteeIsString(column);
+      return cStrictDate;
+    }
+    case PRIMITIVE_TYPE.STRICTTIME: {
+      const cStrictTime = new V1_CStrictTime();
+      cStrictTime.value = guaranteeIsString(column);
+      return cStrictTime;
+    }
+    default:
+      throw new UnsupportedOperationError(
+        `Unsupported dataCube column type ${type}`,
+      );
+  }
+}
+
+function processFilterQuery(filter: object): V1_ValueSpecification {
+  const defaultVariable = new V1_Variable();
+  defaultVariable.name = DEFAULT_LAMBDA_VARIABLE_NAME;
+  if ('groupOperation' in filter) {
+    const groupFilter = filter as DataCubeQueryFilter;
+    let conditionExpressions: V1_ValueSpecification[] = [];
+    groupFilter.conditions.forEach((condition) => {
+      const conditionExpression = processFilterQuery(condition);
+      conditionExpressions.push(conditionExpression);
+      if (conditionExpressions.length === 2) {
+        const groupCondition = groupFilter.groupOperation;
+        const groupFunc = new V1_AppliedFunction();
+        groupFunc.function = groupCondition;
+        groupFunc.parameters = conditionExpressions;
+        conditionExpressions = [groupFunc];
+      }
+    });
+    if (conditionExpressions.length === 1) {
+      return guaranteeNonNullable(conditionExpressions[0]);
+    }
+  } else {
+    const condition = filter as DataCubeQueryFilterCondition;
+    const filterCondition = new V1_AppliedFunction();
+    const property = new V1_AppliedProperty();
+    property.property = condition.name;
+    property.class = condition.type;
+    property.parameters = [defaultVariable];
+
+    switch (condition.operation) {
+      case DATA_CUBE_FILTER_OPERATION.EQUALS:
+      case DATA_CUBE_FILTER_OPERATION.GREATER_THAN:
+      case DATA_CUBE_FILTER_OPERATION.GREATER_THAN_OR_EQUAL:
+      case DATA_CUBE_FILTER_OPERATION.LESS_THAN:
+      case DATA_CUBE_FILTER_OPERATION.LESS_THAN_OR_EQUAL:
+      case DATA_CUBE_FILTER_OPERATION.CONTAINS:
+      case DATA_CUBE_FILTER_OPERATION.ENDS_WITH:
+      case DATA_CUBE_FILTER_OPERATION.STARTS_WITH: {
+        filterCondition.function = condition.operation;
+        filterCondition.parameters.push(property);
+        filterCondition.parameters.push(
+          getPrimitiveValueSpecification(condition.type, condition.value),
+        );
+        break;
+      }
+      case DATA_CUBE_FILTER_OPERATION.BLANK: {
+        filterCondition.function = condition.operation;
+        filterCondition.parameters.push(property);
+        break;
+      }
+      case DATA_CUBE_FILTER_OPERATION.NOT_EQUAL: {
+        filterCondition.function = extractElementNameFromPath(
+          DATA_CUBE_FUNCTIONS.NOT,
+        );
+
+        const filterConditionFunc = new V1_AppliedFunction();
+        filterConditionFunc.function = DATA_CUBE_FILTER_OPERATION.EQUALS;
+        filterConditionFunc.parameters.push(property);
+        filterConditionFunc.parameters.push(
+          getPrimitiveValueSpecification(condition.type, condition.value),
+        );
+
+        filterCondition.parameters.push(filterConditionFunc);
+        break;
+      }
+      case DATA_CUBE_FILTER_OPERATION.NOT_BLANK: {
+        filterCondition.function = extractElementNameFromPath(
+          DATA_CUBE_FUNCTIONS.NOT,
+        );
+
+        const filterConditionFunc = new V1_AppliedFunction();
+        filterConditionFunc.function = DATA_CUBE_FILTER_OPERATION.BLANK;
+        filterConditionFunc.parameters.push(property);
+        filterConditionFunc.parameters.push(
+          getPrimitiveValueSpecification(condition.type, condition.value),
+        );
+
+        filterCondition.parameters.push(filterConditionFunc);
+        break;
+      }
+      case DATA_CUBE_FILTER_OPERATION.NOT_CONTAINS: {
+        filterCondition.function = extractElementNameFromPath(
+          DATA_CUBE_FUNCTIONS.NOT,
+        );
+
+        const filterConditionFunc = new V1_AppliedFunction();
+        filterConditionFunc.function = DATA_CUBE_FILTER_OPERATION.CONTAINS;
+        filterConditionFunc.parameters.push(property);
+        filterConditionFunc.parameters.push(
+          getPrimitiveValueSpecification(condition.type, condition.value),
+        );
+
+        filterCondition.parameters.push(filterConditionFunc);
+        break;
+      }
+      default:
+        throw new UnsupportedOperationError(
+          `Unsupported filter operation ${condition.operation}`,
+        );
+    }
+    return filterCondition;
+  }
+  throw new UnsupportedOperationError(`Unsupported dataCube filter`, filter);
+}
+
 export function buildExecutableQueryFromSnapshot(
   snapshot: DataCubeQuerySnapshot,
 ): V1_ValueSpecification {
@@ -66,11 +283,86 @@ export function buildExecutableQueryFromSnapshot(
   // --------------------------------- FILTER ---------------------------------
   // TODO: @akphi - implement this
 
+  // --------------------------------- GROUP BY FILTER ---------------------------------
+  if (snapshot.groupByFilter) {
+    const filter = snapshot.groupByFilter;
+    const filterValueSpec = processFilterQuery(filter);
+    const filterLambda = new V1_Lambda();
+    const defaultVariable = new V1_Variable();
+    defaultVariable.name = DEFAULT_LAMBDA_VARIABLE_NAME;
+    filterLambda.body = [filterValueSpec];
+
+    filterLambda.parameters = [defaultVariable];
+    const filterFunc = new V1_AppliedFunction();
+    filterFunc.function = extractElementNameFromPath(
+      DATA_CUBE_FUNCTIONS.FILTER,
+    );
+    filterFunc.parameters.push(filterLambda);
+    sequence.push(filterFunc);
+  }
+
   // --------------------------------- RENAME ---------------------------------
   // TODO: @akphi - implement this
 
   // --------------------------------- GROUP BY ---------------------------------
   // TODO: @akphi - implement this
+  if (snapshot.groupByColumns.length) {
+    const groupByInstance = new V1_ClassInstance();
+    groupByInstance.type = V1_ClassInstanceType.COL_SPEC_ARRAY;
+    const groupByColSpecArray = new V1_ColSpecArray();
+    const aggregationColSpecArray = new V1_ColSpecArray();
+    const aggregationInstance = new V1_ClassInstance();
+    aggregationInstance.type = V1_ClassInstanceType.COL_SPEC_ARRAY;
+
+    if (
+      snapshot.groupByExpandedKeys.length !== snapshot.groupByColumns.length
+    ) {
+      const groupKeys = snapshot.groupByExpandedKeys;
+      for (let index = 0; index <= groupKeys.length; index++) {
+        const currentGroupByColumn = snapshot.groupByColumns[index];
+        const columnSpec = new V1_ColSpec();
+        columnSpec.name = guaranteeNonNullable(currentGroupByColumn).name;
+        groupByColSpecArray.colSpecs.push(columnSpec);
+      }
+
+      // Temporary. Remove it later when we support empty aggregations
+      if (snapshot.groupByAggColumns.length === 0) {
+        const column = guaranteeNonNullable(snapshot.groupByColumns[0]);
+        const colSpec = getAggregationColSpec(
+          column.name,
+          DATA_CUBE_AGGREGATE_FUNCTION.COUNT,
+          PRIMITIVE_TYPE.STRING,
+          DATA_CUBE_AGGREGATE_FUNCTION.COUNT,
+        );
+        aggregationColSpecArray.colSpecs.push(colSpec);
+      }
+    }
+
+    if (
+      snapshot.groupByExpandedKeys.length === 0 ||
+      snapshot.groupByExpandedKeys.length !== snapshot.groupByColumns.length
+    ) {
+      snapshot.groupByAggColumns.forEach((agg) => {
+        const colSpec = getAggregationColSpec(agg.name, agg.function, agg.type);
+        aggregationColSpecArray.colSpecs.push(colSpec);
+      });
+    }
+
+    groupByInstance.value = groupByColSpecArray;
+    aggregationInstance.value = aggregationColSpecArray;
+
+    if (
+      groupByColSpecArray.colSpecs.length !== 0 ||
+      aggregationColSpecArray.colSpecs.length !== 0
+    ) {
+      const groupBy = new V1_AppliedFunction();
+      groupBy.function = extractElementNameFromPath(
+        DATA_CUBE_FUNCTIONS.GROUP_BY,
+      );
+      groupBy.parameters = [groupByInstance, aggregationInstance];
+      sequence.push(groupBy);
+    }
+  }
 
   // --------------------------------- SELECT ---------------------------------
   // TODO: @akphi - implement this
@@ -82,7 +374,34 @@ export function buildExecutableQueryFromSnapshot(
   // TODO: @akphi - implement this
 
   // --------------------------------- GROUP EXTEND ---------------------------------
-  // TODO: @akphi - implement this
+  if (snapshot.groupByExpandedKeys.length !== snapshot.groupByColumns.length) {
+    const extendFunc = new V1_AppliedFunction();
+    extendFunc.function = extractElementNameFromPath(
+      DATA_CUBE_FUNCTIONS.EXTEND,
+    );
+    const classInstance = new V1_ClassInstance();
+    classInstance.type = V1_ClassInstanceType.COL_SPEC_ARRAY;
+    const colSpecArray = new V1_ColSpecArray();
+    classInstance.value = colSpecArray;
+    snapshot.columns.forEach((col) => {
+      if (!snapshot.groupByColumns.find((c) => c.name === col.name)) {
+        const colSpec = new V1_ColSpec();
+        const lambda = new V1_Lambda();
+        const defaultVariable = new V1_Variable();
+        defaultVariable.name = DEFAULT_LAMBDA_VARIABLE_NAME;
+        lambda.parameters.push(defaultVariable);
+        const variableValue = new V1_CString();
+        variableValue.value = '';
+        lambda.body.push(variableValue);
+        colSpec.function1 = lambda;
+        colSpec.name = col.name;
+        colSpecArray.colSpecs.push(colSpec);
+      }
+    });
+    extendFunc.parameters.push(classInstance);
+
+    sequence.push(extendFunc);
+  }
 
   // --------------------------------- SORT ---------------------------------
 
@@ -95,17 +414,26 @@ export function buildExecutableQueryFromSnapshot(
       snapshot.sortColumns.length,
     );
     snapshot.sortColumns.forEach((sortCol) => {
-      const sortInfo = new V1_AppliedFunction();
-      sortInfo.function = extractElementNameFromPath(
-        sortCol.direction === DATA_CUBE_COLUMN_SORT_DIRECTION.ASCENDING
-          ? DATA_CUBE_FUNCTIONS.ASC
-          : DATA_CUBE_FUNCTIONS.DESC,
-      );
-      sortInfo.parameters.push(createColSpec(sortCol.name));
-      sortInfos.values.push(sortInfo);
+      if (
+        snapshot.groupByColumns.length ===
+          snapshot.groupByExpandedKeys.length ||
+        snapshot.groupByColumns.map((col) => col.name).indexOf(sortCol.name) ===
+          snapshot.groupByExpandedKeys.length
+      ) {
+        const sortInfo = new V1_AppliedFunction();
+        sortInfo.function = extractElementNameFromPath(
+          sortCol.direction === DATA_CUBE_COLUMN_SORT_DIRECTION.ASCENDING
+            ? DATA_CUBE_FUNCTIONS.ASC
+            : DATA_CUBE_FUNCTIONS.DESC,
+        );
+        sortInfo.parameters.push(createColSpec(sortCol.name));
+        sortInfos.values.push(sortInfo);
+      }
     });
     sort.parameters.push(sortInfos);
-    sequence.push(sort);
+    if (sortInfos.values.length) {
+      sequence.push(sort);
+    }
   }
 
   // --------------------------------- LIMIT ---------------------------------

package/src/stores/dataCube/core/DataCubeQuerySnapshot.ts

@@ -20,6 +20,7 @@ import { uuid, type PlainObject, type Writable } from '@finos/legend-shared';
 import type {
   DATA_CUBE_AGGREGATE_FUNCTION,
   DATA_CUBE_COLUMN_SORT_DIRECTION,
+  DATA_CUBE_FILTER_OPERATION,
 } from '../DataCubeMetaModelConst.js';
 
 // export enum FILTER_OPERATION {
@@ -94,8 +95,14 @@ import type {
 //   );
 // }
 
+export type DataCubeQueryFilterCondition = DataCubeQuerySnapshotColumn & {
+  value: unknown;
+  operation: DATA_CUBE_FILTER_OPERATION;
+};
+
 export type DataCubeQueryFilter = {
-  // TODO: @akphi
+  groupOperation: string;
+  conditions: (DataCubeQueryFilterCondition | DataCubeQueryFilter)[];
 };
 
 export enum DataCubeQuerySnapshotColumnOrigin {
@@ -149,7 +156,9 @@ export type DataCubeQuerySnapshot = {
   filter?: DataCubeQueryFilter | undefined;
   renamedColumns: DataCubeQuerySnapshotRenamedColumn[];
   groupByColumns: DataCubeQuerySnapshotColumn[];
+  groupByExpandedKeys: string[];
   groupByAggColumns: DataCubeQuerySnapshotAggregateColumn[];
+  groupByFilter?: DataCubeQueryFilter | undefined;
   selectedColumns: DataCubeQuerySnapshotColumn[];
   pivotColumns: DataCubeQuerySnapshotColumn[];
   pivotAggColumns: DataCubeQuerySnapshotAggregateColumn[];
@@ -180,12 +189,14 @@ export function createSnapshot(
     filter: undefined,
     renamedColumns: [],
     groupByColumns: [],
+    groupByExpandedKeys: [],
     groupByAggColumns: [],
     selectedColumns: [],
     pivotColumns: [],
     pivotAggColumns: [],
     castColumns: [],
     groupExtendedColumns: [],
+    groupByFilter: undefined,
     sortColumns: [],
     limit: undefined,
     columns: [],