@finos/legend-query-builder 0.2.3 → 0.3.1

package/src/stores/fetch-structure/tds/olapGroupBy/operators/QueryBuilderTDSOlapRankOperator_RowNumber_.ts

@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { PRIMITIVE_TYPE, type Type } from '@finos/legend-graph';
+import { hashArray } from '@finos/legend-shared';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../../graphManager/QueryBuilderHashUtils.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { QueryBuilderTDSOlapOperator } from './QueryBuilderTDSOlapOperator_.js';
+
+export class QueryBuilderTDSOlapRankOperator_RowNumber extends QueryBuilderTDSOlapOperator {
+  getLabel(): string {
+    return 'row number';
+  }
+
+  get pureFunc(): string {
+    return QUERY_BUILDER_SUPPORTED_FUNCTIONS.OLAP_ROW_NUMBER;
+  }
+
+  get hashCode(): string {
+    return hashArray([QUERY_BUILDER_HASH_STRUCTURE.OLAP_OPERATOR_ROW_NUMBER]);
+  }
+
+  isCompatibleWithType(type: Type | undefined): boolean {
+    if (type) {
+      return (
+        [
+          PRIMITIVE_TYPE.STRING,
+          PRIMITIVE_TYPE.BOOLEAN,
+          PRIMITIVE_TYPE.NUMBER,
+          PRIMITIVE_TYPE.INTEGER,
+          PRIMITIVE_TYPE.DECIMAL,
+          PRIMITIVE_TYPE.FLOAT,
+          PRIMITIVE_TYPE.DATE,
+          PRIMITIVE_TYPE.STRICTDATE,
+          PRIMITIVE_TYPE.DATETIME,
+        ] as string[]
+      ).includes(type.path);
+    }
+    return true;
+  }
+}

package/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterOperator.ts

@@ -31,7 +31,7 @@ export abstract class QueryBuilderPostFilterOperator implements Hashable {
 
   abstract getLabel(): string;
 
-  getTdsColumnGetter(): TDS_COLUMN_GETTER | undefined {
+  getTDSColumnGetter(): TDS_COLUMN_GETTER | undefined {
     return undefined;
   }
 
@@ -48,7 +48,7 @@ export abstract class QueryBuilderPostFilterOperator implements Hashable {
   isCompatibleWithPostFilterColumn(
     postFilterState: PostFilterConditionState,
   ): boolean {
-    const columnType = postFilterState.columnState.getReturnType();
+    const columnType = postFilterState.columnState.getColumnType();
     if (columnType) {
       return this.isCompatibleWithType(columnType);
     }

package/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.ts

@@ -38,8 +38,9 @@ import {
   uuid,
   filterByType,
   ActionState,
-  type Hashable,
   hashArray,
+  uniq,
+  type Hashable,
 } from '@finos/legend-shared';
 import {
   action,
@@ -50,10 +51,10 @@ import {
   observable,
 } from 'mobx';
 import { DEFAULT_POST_FILTER_LAMBDA_VARIABLE_NAME } from '../../../QueryBuilderConfig.js';
-import type { QueryBuilderAggregateColumnState } from '../aggregation/QueryBuilderAggregationState.js';
+import { QueryBuilderAggregateColumnState } from '../aggregation/QueryBuilderAggregationState.js';
 import type { QueryBuilderPostFilterOperator } from './QueryBuilderPostFilterOperator.js';
 import {
-  type QueryBuilderProjectionColumnState,
+  QueryBuilderProjectionColumnState,
   type QueryBuilderProjectionColumnDragSource,
   QueryBuilderDerivationProjectionColumnState,
 } from '../projection/QueryBuilderProjectionColumnState.js';
@@ -65,6 +66,7 @@ import {
 import { QUERY_BUILDER_GROUP_OPERATION } from '../../../QueryBuilderGroupOperationHelper.js';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../graphManager/QueryBuilderHashUtils.js';
+import type { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState_.js';
 
 export enum QUERY_BUILDER_POST_FILTER_DND_TYPE {
   GROUP_CONDITION = 'GROUP_CONDITION',
@@ -303,9 +305,7 @@ export class QueryBuilderPostFilterTreeBlankConditionNodeData
 
 export class PostFilterConditionState implements Hashable {
   readonly postFilterState: QueryBuilderPostFilterState;
-  columnState:
-    | QueryBuilderProjectionColumnState
-    | QueryBuilderAggregateColumnState;
+  columnState: QueryBuilderTDSColumnState;
   value?: ValueSpecification | undefined;
   operator: QueryBuilderPostFilterOperator;
   typeaheadSearchResults: string[] | undefined;
@@ -313,9 +313,7 @@ export class PostFilterConditionState implements Hashable {
 
   constructor(
     postFilterState: QueryBuilderPostFilterState,
-    colState:
-      | QueryBuilderProjectionColumnState
-      | QueryBuilderAggregateColumnState,
+    colState: QueryBuilderTDSColumnState,
     value: ValueSpecification | undefined,
     operator: QueryBuilderPostFilterOperator | undefined,
   ) {
@@ -363,12 +361,18 @@ export class PostFilterConditionState implements Hashable {
     try {
       this.typeaheadSearchState.inProgress();
       this.typeaheadSearchResults = undefined;
+      const _columnState =
+        this.columnState instanceof QueryBuilderProjectionColumnState ||
+        this.columnState instanceof QueryBuilderAggregateColumnState
+          ? this.columnState
+          : undefined;
+      const columnState = guaranteeNonNullable(_columnState);
       if (performTypeahead(this.value)) {
         const result =
           (yield this.postFilterState.tdsState.queryBuilderState.graphManagerState.graphManager.executeMapping(
             buildProjectionColumnTypeaheadQuery(
               this.postFilterState.tdsState.queryBuilderState,
-              this.columnState,
+              columnState,
               this.value,
             ),
             guaranteeNonNullable(
@@ -536,6 +540,14 @@ export class QueryBuilderPostFilterState
       : undefined;
   }
 
+  get referencedTDSColumns(): QueryBuilderTDSColumnState[] {
+    return uniq(
+      Array.from(this.nodes.values())
+        .filter(filterByType(QueryBuilderPostFilterTreeConditionNodeData))
+        .map((n) => n.condition.columnState),
+    );
+  }
+
   getRootNode(): QueryBuilderPostFilterTreeNodeData | undefined {
     assertTrue(
       this.rootIds.length < 2,

package/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterStateBuilder.ts

@@ -32,7 +32,9 @@ import {
   guaranteeType,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
-import type { QueryBuilderAggregateColumnState } from '../aggregation/QueryBuilderAggregationState.js';
+import { QueryBuilderDerivationProjectionColumnState } from '../projection/QueryBuilderProjectionColumnState.js';
+import type { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState_.js';
+import { getTDSColumnState } from '../QueryBuilderTDSHelper.js';
 import type { QueryBuilderPostFilterOperator } from './QueryBuilderPostFilterOperator.js';
 import {
   type QueryBuilderPostFilterState,
@@ -43,20 +45,16 @@ import {
   TDS_COLUMN_GETTER,
   getTypeFromDerivedProperty,
 } from './QueryBuilderPostFilterState.js';
-import {
-  type QueryBuilderProjectionColumnState,
-  QueryBuilderDerivationProjectionColumnState,
-} from '../projection/QueryBuilderProjectionColumnState.js';
-import { toGroupOperation } from '../../../QueryBuilderGroupOperationHelper.js';
-import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
-import type { QueryBuilderState } from '../../../QueryBuilderState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import type { QueryBuilderState } from '../../../QueryBuilderState.js';
+import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
+import { toGroupOperation } from '../../../QueryBuilderGroupOperationHelper.js';
 
 const findProjectionColumnState = (
   propertyExpression: AbstractPropertyExpression,
   postFilterState: QueryBuilderPostFilterState,
-): QueryBuilderProjectionColumnState | QueryBuilderAggregateColumnState => {
-  const tdsState = postFilterState.tdsState;
+): QueryBuilderTDSColumnState => {
+  const projectionState = postFilterState.tdsState;
   const properyExpressionName = propertyExpression.func.value.name;
   assertTrue(
     Object.values(TDS_COLUMN_GETTER).includes(
@@ -76,13 +74,7 @@ const findProjectionColumnState = (
     ).values[0],
     'Can`t process TDS column expression: Column should be a string primitive instance value',
   );
-  const columnStates = [
-    ...tdsState.aggregationState.columns,
-    ...tdsState.projectionColumns,
-  ];
-  const columnState = guaranteeNonNullable(
-    columnStates.find((c) => c.columnName === columnName),
-  );
+  const columnState = getTDSColumnState(projectionState, columnName);
   if (
     tdsColumnGetter !== TDS_COLUMN_GETTER.IS_NULL &&
     tdsColumnGetter !== TDS_COLUMN_GETTER.IS_NOT_NULL
@@ -97,7 +89,7 @@ const findProjectionColumnState = (
       }
       return columnState;
     }
-    const columnType = guaranteeNonNullable(columnState.getReturnType());
+    const columnType = guaranteeNonNullable(columnState.getColumnType());
     assertTrue(
       (getTDSColumnDerivedProperyFromType(columnType) as string) ===
         tdsColumnGetter,
@@ -116,7 +108,7 @@ export const buildPostFilterConditionState = (
   operator: QueryBuilderPostFilterOperator,
 ): PostFilterConditionState | undefined => {
   let postConditionState: PostFilterConditionState | undefined;
-  const tdsColumnGetter = operator.getTdsColumnGetter();
+  const tdsColumnGetter = operator.getTDSColumnGetter();
   if (
     tdsColumnGetter &&
     expression instanceof AbstractPropertyExpression &&

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperatorHelper.ts

@@ -20,20 +20,21 @@ import {
 } from '@finos/legend-graph';
 import { UnsupportedOperationError } from '@finos/legend-shared';
 import { QueryBuilderAggregateColumnState } from '../../aggregation/QueryBuilderAggregationState.js';
-import {
-  type QueryBuilderProjectionColumnState,
-  QueryBuilderSimpleProjectionColumnState,
-} from '../../projection/QueryBuilderProjectionColumnState.js';
+import { QueryBuilderOlapGroupByColumnState } from '../../olapGroupBy/QueryBuilderOlapGroupByState.js';
+import { QueryBuilderSimpleProjectionColumnState } from '../../projection/QueryBuilderProjectionColumnState.js';
+import type { QueryBuilderTDSColumnState } from '../../QueryBuilderTDSColumnState_.js';
 
 export const getColumnMultiplicity = (
-  columnState:
-    | QueryBuilderProjectionColumnState
-    | QueryBuilderAggregateColumnState,
+  columnState: QueryBuilderTDSColumnState | QueryBuilderAggregateColumnState,
 ): Multiplicity => {
   if (columnState instanceof QueryBuilderAggregateColumnState) {
     return columnState.aggregationState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
       TYPICAL_MULTIPLICITY_TYPE.ONE,
     );
+  } else if (columnState instanceof QueryBuilderOlapGroupByColumnState) {
+    return columnState.olapState.tdsState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(
+      TYPICAL_MULTIPLICITY_TYPE.ONE,
+    );
   } else if (columnState instanceof QueryBuilderSimpleProjectionColumnState) {
     return columnState.propertyExpressionState.propertyExpression.func.value
       .multiplicity;

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.ts

@@ -63,11 +63,11 @@ export const buildPostFilterConditionExpression = (
     multiplicityOne,
   );
   let tdsDerivedPropertyName: TDS_COLUMN_GETTER;
-  const correspondingTdsDerivedProperty = operator.getTdsColumnGetter();
-  if (correspondingTdsDerivedProperty) {
-    tdsDerivedPropertyName = correspondingTdsDerivedProperty;
+  const correspondingTDSDerivedProperty = operator.getTDSColumnGetter();
+  if (correspondingTDSDerivedProperty) {
+    tdsDerivedPropertyName = correspondingTDSDerivedProperty;
   } else {
-    const type = guaranteeNonNullable(colState.getReturnType());
+    const type = guaranteeNonNullable(colState.getColumnType());
     tdsDerivedPropertyName = getTDSColumnDerivedProperyFromType(type);
   }
   tdsPropertyExpression.func = PropertyExplicitReference.create(

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts

@@ -72,7 +72,7 @@ export class QueryBuilderPostFilterOperator_Contain
     postFilterConditionState: PostFilterConditionState,
   ): ValueSpecification {
     const propertyType = guaranteeNonNullable(
-      postFilterConditionState.columnState.getReturnType(),
+      postFilterConditionState.columnState.getColumnType(),
     );
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.STRING: {

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts

@@ -69,7 +69,7 @@ export class QueryBuilderPostFilterOperator_EndWith
   getDefaultFilterConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): ValueSpecification {
-    const propertyType = postFilterConditionState.columnState.getReturnType();
+    const propertyType = postFilterConditionState.columnState.getColumnType();
     switch (propertyType?.path) {
       case PRIMITIVE_TYPE.STRING: {
         return buildPrimitiveInstanceValue(

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts

@@ -91,7 +91,7 @@ export class QueryBuilderPostFilterOperator_Equal
       return isTypeCompatibleForAssignment(
         getNonCollectionValueSpecificationType(valueSpecification),
         guaranteeNonNullable(
-          postFilterConditionState.columnState.getReturnType(),
+          postFilterConditionState.columnState.getColumnType(),
         ),
       );
     }
@@ -102,7 +102,7 @@ export class QueryBuilderPostFilterOperator_Equal
     postFilterConditionState: PostFilterConditionState,
   ): ValueSpecification {
     const propertyType = guaranteeNonNullable(
-      postFilterConditionState.columnState.getReturnType(),
+      postFilterConditionState.columnState.getColumnType(),
     );
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.STRING:
@@ -166,7 +166,7 @@ export class QueryBuilderPostFilterOperator_Equal
     return buildPostFilterConditionExpression(
       postFilterConditionState,
       this,
-      postFilterConditionState.columnState.getReturnType()?.path ===
+      postFilterConditionState.columnState.getColumnType()?.path ===
         PRIMITIVE_TYPE.DATETIME &&
         postFilterConditionState.value?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts

@@ -74,7 +74,7 @@ export class QueryBuilderPostFilterOperator_GreaterThan
         ? getNonCollectionValueSpecificationType(postFilterConditionState.value)
         : undefined,
       guaranteeNonNullable(
-        postFilterConditionState.columnState.getReturnType(),
+        postFilterConditionState.columnState.getColumnType(),
       ),
     );
   }
@@ -82,7 +82,7 @@ export class QueryBuilderPostFilterOperator_GreaterThan
   getDefaultFilterConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): ValueSpecification {
-    const propertyType = postFilterConditionState.columnState.getReturnType();
+    const propertyType = postFilterConditionState.columnState.getColumnType();
     switch (propertyType?.path) {
       case PRIMITIVE_TYPE.NUMBER:
       case PRIMITIVE_TYPE.DECIMAL:
@@ -120,7 +120,7 @@ export class QueryBuilderPostFilterOperator_GreaterThan
     return buildPostFilterConditionExpression(
       postFilterConditionState,
       this,
-      postFilterConditionState.columnState.getReturnType()?.path ===
+      postFilterConditionState.columnState.getColumnType()?.path ===
         PRIMITIVE_TYPE.DATETIME &&
         postFilterConditionState.value?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.ts

@@ -43,7 +43,7 @@ export class QueryBuilderPostFilterOperator_GreaterThanEqual extends QueryBuilde
     return buildPostFilterConditionExpression(
       postFilterConditionState,
       this,
-      postFilterConditionState.columnState.getReturnType()?.path ===
+      postFilterConditionState.columnState.getColumnType()?.path ===
         PRIMITIVE_TYPE.DATETIME &&
         postFilterConditionState.value?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.ts

@@ -75,7 +75,7 @@ export class QueryBuilderPostFilterOperator_In
     postFilterConditionState: PostFilterConditionState,
   ): boolean {
     const propertyType = guaranteeNonNullable(
-      postFilterConditionState.columnState.getReturnType(),
+      postFilterConditionState.columnState.getColumnType(),
     );
     const valueSpec = postFilterConditionState.value;
     if (valueSpec instanceof CollectionInstanceValue) {
@@ -128,7 +128,7 @@ export class QueryBuilderPostFilterOperator_In
         TYPICAL_MULTIPLICITY_TYPE.ONE,
       );
     const propertyType = guaranteeNonNullable(
-      postFilterConditionState.columnState.getReturnType(),
+      postFilterConditionState.columnState.getColumnType(),
     );
     return new CollectionInstanceValue(
       multiplicityOne,

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.ts

@@ -42,7 +42,7 @@ export class QueryBuilderPostFilterOperator_IsEmpty
     return 'is empty';
   }
 
-  override getTdsColumnGetter(): TDS_COLUMN_GETTER | undefined {
+  override getTDSColumnGetter(): TDS_COLUMN_GETTER | undefined {
     return TDS_COLUMN_GETTER.IS_NULL;
   }
 
@@ -62,7 +62,7 @@ export class QueryBuilderPostFilterOperator_IsEmpty
   override isCompatibleWithPostFilterColumn(
     postFilterState: PostFilterConditionState,
   ): boolean {
-    const columnType = postFilterState.columnState.getReturnType();
+    const columnType = postFilterState.columnState.getColumnType();
     if (columnType && this.isCompatibleWithType(columnType)) {
       if (
         postFilterState.columnState instanceof
@@ -118,7 +118,7 @@ export class QueryBuilderPostFilterOperator_IsNotEmpty extends QueryBuilderPostF
     return `is not empty`;
   }
 
-  override getTdsColumnGetter(): TDS_COLUMN_GETTER | undefined {
+  override getTDSColumnGetter(): TDS_COLUMN_GETTER | undefined {
     return TDS_COLUMN_GETTER.IS_NOT_NULL;
   }
 

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts

@@ -74,7 +74,7 @@ export class QueryBuilderPostFilterOperator_LessThan
         ? getNonCollectionValueSpecificationType(postFilterConditionState.value)
         : undefined,
       guaranteeNonNullable(
-        postFilterConditionState.columnState.getReturnType(),
+        postFilterConditionState.columnState.getColumnType(),
       ),
     );
   }
@@ -82,7 +82,7 @@ export class QueryBuilderPostFilterOperator_LessThan
   getDefaultFilterConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): ValueSpecification {
-    const propertyType = postFilterConditionState.columnState.getReturnType();
+    const propertyType = postFilterConditionState.columnState.getColumnType();
     switch (propertyType?.path) {
       case PRIMITIVE_TYPE.NUMBER:
       case PRIMITIVE_TYPE.DECIMAL:
@@ -120,7 +120,7 @@ export class QueryBuilderPostFilterOperator_LessThan
     return buildPostFilterConditionExpression(
       postFilterConditionState,
       this,
-      postFilterConditionState.columnState.getReturnType()?.path ===
+      postFilterConditionState.columnState.getColumnType()?.path ===
         PRIMITIVE_TYPE.DATETIME &&
         postFilterConditionState.value?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThanEqual.ts

@@ -46,7 +46,7 @@ export class QueryBuilderPostFilterOperator_LessThanEqual
     return buildPostFilterConditionExpression(
       postFilterConditionState,
       this,
-      postFilterConditionState.columnState.getReturnType()?.path ===
+      postFilterConditionState.columnState.getColumnType()?.path ===
         PRIMITIVE_TYPE.DATETIME &&
         postFilterConditionState.value?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts

@@ -70,7 +70,7 @@ export class QueryBuilderPostFilterOperator_StartWith
   getDefaultFilterConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): ValueSpecification {
-    const propertyType = postFilterConditionState.columnState.getReturnType();
+    const propertyType = postFilterConditionState.columnState.getColumnType();
     switch (propertyType?.path) {
       case PRIMITIVE_TYPE.STRING: {
         return buildPrimitiveInstanceValue(

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts

@@ -19,7 +19,6 @@ import {
   type GeneratorFn,
   LogEvent,
   assertErrorThrown,
-  uuid,
   guaranteeNonNullable,
   assertTrue,
   assertNonEmptyString,
@@ -50,11 +49,12 @@ import {
   RawLambda,
   stub_RawLambda,
 } from '@finos/legend-graph';
+import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState_.js';
+import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import {
   DEFAULT_LAMBDA_VARIABLE_NAME,
   QUERY_BUILDER_SOURCE_ID_LABEL,
 } from '../../../QueryBuilderConfig.js';
-import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../../../graphManager/QueryBuilderHashUtils.js';
 import { LambdaEditorState } from '../../../shared/LambdaEditorState.js';
 
@@ -64,12 +64,15 @@ export interface QueryBuilderProjectionColumnDragSource {
   columnState: QueryBuilderProjectionColumnState;
 }
 
-export abstract class QueryBuilderProjectionColumnState implements Hashable {
-  readonly uuid = uuid();
+export abstract class QueryBuilderProjectionColumnState
+  extends QueryBuilderTDSColumnState
+  implements Hashable
+{
   tdsState: QueryBuilderTDSState;
   columnName: string;
 
   constructor(tdsState: QueryBuilderTDSState, columnName: string) {
+    super();
     makeObservable(this, {
       uuid: false,
       tdsState: false,
@@ -77,7 +80,6 @@ export abstract class QueryBuilderProjectionColumnState implements Hashable {
       setColumnName: action,
       hashCode: computed,
     });
-
     this.tdsState = tdsState;
     this.columnName = columnName;
   }
@@ -85,10 +87,6 @@ export abstract class QueryBuilderProjectionColumnState implements Hashable {
   setColumnName(val: string): void {
     this.columnName = val;
   }
-
-  abstract getReturnType(): Type | undefined;
-
-  abstract get hashCode(): string;
 }
 
 export class QueryBuilderSimpleProjectionColumnState
@@ -143,7 +141,7 @@ export class QueryBuilderSimpleProjectionColumnState
     );
   }
 
-  override getReturnType(): Type | undefined {
+  override getColumnType(): Type | undefined {
     return this.propertyExpressionState.propertyExpression.func.value
       .genericType.value.rawType;
   }
@@ -333,7 +331,7 @@ export class QueryBuilderDerivationProjectionColumnState
     this.setReturnType(resolvedType);
   }
 
-  override getReturnType(): Type | undefined {
+  override getColumnType(): Type | undefined {
     return this.returnType;
   }
 

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.ts

@@ -346,6 +346,7 @@ export const processTDSSortExpression = (
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_PROJECT,
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_GROUP_BY,
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FILTER,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.OLAP_GROUPBY,
     ]),
     `Can't process sort() expression: only support sort() in TDS expression`,
   );

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.ts

@@ -35,10 +35,6 @@ import {
   guaranteeNonNullable,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/QueryBuilderSupportedFunctions.js';
-import { buildPropertyExpressionChain } from '../../../QueryBuilderValueSpecificationBuilderHelper.js';
-import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';
-import { appendPostFilter } from '../post-filter/QueryBuilderPostFilterValueSpecificationBuilder.js';
 import {
   QueryBuilderDerivationProjectionColumnState,
   QueryBuilderSimpleProjectionColumnState,
@@ -49,6 +45,11 @@ import {
   type QueryResultSetModifierState,
   type SortColumnState,
 } from '../QueryResultSetModifierState.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/QueryBuilderSupportedFunctions.js';
+import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';
+import { buildPropertyExpressionChain } from '../../../QueryBuilderValueSpecificationBuilderHelper.js';
+import { appendOlapGroupByState } from '../olapGroupBy/QueryBuilderOlapGroupByValueSpecificationBuilder.js';
+import { appendPostFilter } from '../post-filter/QueryBuilderPostFilterValueSpecificationBuilder.js';
 
 const buildSortExpression = (
   sortColumnState: SortColumnState,
@@ -396,6 +397,9 @@ export const appendProjection = (
     lambdaFunction.expressionSequence[0] = projectFunction;
   }
 
+  // build olapGroupBy
+  appendOlapGroupByState(tdsState.olapGroupByState, lambdaFunction);
+
   // build post-filter
   appendPostFilter(tdsState.postFilterState, lambdaFunction);
 

package/src/stores/filter/QueryBuilderFilterState.ts

@@ -374,6 +374,7 @@ export class QueryBuilderFilterState
   isRearrangingConditions = false;
   operators: QueryBuilderFilterOperator[] = [];
   private _suppressClickawayEventListener = false;
+  showPanel = true;
 
   constructor(
     queryBuilderState: QueryBuilderState,
@@ -385,6 +386,7 @@ export class QueryBuilderFilterState
       selectedNode: observable,
       isRearrangingConditions: observable,
       lambdaParameterName: observable,
+      showPanel: observable,
       setLambdaParameterName: action,
       setRearrangingConditions: action,
       suppressClickawayEventListener: action,
@@ -398,6 +400,7 @@ export class QueryBuilderFilterState
       pruneTree: action,
       simplifyTree: action,
       collapseTree: action,
+      setShowPanel: action,
       expandTree: action,
       hashCode: computed,
     });
@@ -414,6 +417,10 @@ export class QueryBuilderFilterState
     this.lambdaParameterName = val;
   }
 
+  setShowPanel(val: boolean): void {
+    this.showPanel = val;
+  }
+
   setRearrangingConditions(val: boolean): void {
     this.isRearrangingConditions = val;
   }

package/tsconfig.json

@@ -77,6 +77,8 @@
     "./src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeStateBuilder.ts",
     "./src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.ts",
     "./src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeValueSpecificationBuilder.ts",
+    "./src/stores/fetch-structure/tds/QueryBuilderTDSColumnState_.ts",
+    "./src/stores/fetch-structure/tds/QueryBuilderTDSHelper.ts",
     "./src/stores/fetch-structure/tds/QueryBuilderTDSState.ts",
     "./src/stores/fetch-structure/tds/QueryResultSetModifierState.ts",
     "./src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateOperator.ts",
@@ -94,6 +96,20 @@
     "./src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Population.ts",
     "./src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_StdDev_Sample.ts",
     "./src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Sum.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/QueryBuilderOlapGroupByOperatorLoader.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/QueryBuilderOlapGroupByState.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/QueryBuilderOlapGroupByStateBuilder.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/QueryBuilderOlapGroupByValueSpecificationBuilder.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/operators/QueryBuilderTDSOlapOperator_.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/operators/QueryBuilderTDSOlapOperator_Average.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/operators/QueryBuilderTDSOlapOperator_Count.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/operators/QueryBuilderTDSOlapOperator_Max.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/operators/QueryBuilderTDSOlapOperator_Min.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/operators/QueryBuilderTDSOlapOperator_Sum.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/operators/QueryBuilderTDSOlapRankOperator_AverageRank_.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/operators/QueryBuilderTDSOlapRankOperator_DenseRank_.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/operators/QueryBuilderTDSOlapRankOperator_Rank_.ts",
+    "./src/stores/fetch-structure/tds/olapGroupBy/operators/QueryBuilderTDSOlapRankOperator_RowNumber_.ts",
     "./src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterOperator.ts",
     "./src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterOperatorLoader.ts",
     "./src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.ts",
@@ -154,8 +170,11 @@
     "./src/components/explorer/QueryBuilderPropertySearchPanel.tsx",
     "./src/components/fetch-structure/QueryBuilderFetchStructurePanel.tsx",
     "./src/components/fetch-structure/QueryBuilderGraphFetchTreePanel.tsx",
+    "./src/components/fetch-structure/QueryBuilderOlapGroupByPanel.tsx",
     "./src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx",
+    "./src/components/fetch-structure/QueryBuilderPostTDSPanel.tsx",
     "./src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx",
+    "./src/components/fetch-structure/QueryBuilderTDSComponentHelper.tsx",
     "./src/components/fetch-structure/QueryBuilderTDSPanel.tsx",
     "./src/components/filter/QueryBuilderFilterPanel.tsx",
     "./src/components/shared/BasicValueSpecificationEditor.tsx",