@finos/legend-query-builder 4.10.1 → 4.11.0

package/src/stores/QueryBuilderResultState.ts

@@ -17,15 +17,14 @@
 import { action, flow, makeObservable, observable } from 'mobx';
 import {
   type GeneratorFn,
-  type ContentType,
   assertErrorThrown,
   LogEvent,
   guaranteeNonNullable,
+  type ContentType,
   downloadFileUsingDataURI,
   ActionState,
   StopWatch,
   getContentTypeFileExtension,
-  isBoolean,
 } from '@finos/legend-shared';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import {
@@ -38,7 +37,6 @@ import {
   buildRawLambdaFromLambdaFunction,
   reportGraphAnalytics,
   extractExecutionResultValues,
-  TDSExecutionResult,
 } from '@finos/legend-graph';
 import { buildLambdaFunction } from './QueryBuilderValueSpecificationBuilder.js';
 import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
@@ -50,6 +48,7 @@ import type { LambdaFunctionBuilderOption } from './QueryBuilderValueSpecificati
 import { QueryBuilderTelemetryHelper } from '../__lib__/QueryBuilderTelemetryHelper.js';
 import { QUERY_BUILDER_EVENT } from '../__lib__/QueryBuilderEvent.js';
 import { ExecutionPlanState } from './execution-plan/ExecutionPlanState.js';
+import type { DataGridColumnState } from '@finos/legend-lego/data-grid';
 
 export const DEFAULT_LIMIT = 1000;
 
@@ -69,6 +68,11 @@ export interface QueryBuilderTDSResultCellCoordinate {
   colIndex: number;
 }
 
+type QueryBuilderDataGridConfig = {
+  columns: DataGridColumnState[];
+  isPivotModeEnabled: boolean;
+};
+
 export class QueryBuilderResultState {
   readonly queryBuilderState: QueryBuilderState;
   readonly exportDataState = ActionState.create();
@@ -83,12 +87,13 @@ export class QueryBuilderResultState {
   latestRunHashCode?: string | undefined;
   queryRunPromise: Promise<ExecutionResult> | undefined = undefined;
   isQueryUsageViewerOpened = false;
-  rowData: Record<string, string | number | boolean | null>[] = [];
 
   selectedCells: QueryBuilderTDSResultCellData[];
   mousedOverCell: QueryBuilderTDSResultCellData | null = null;
   isSelectingCells: boolean;
 
+  gridConfig!: QueryBuilderDataGridConfig;
+
   constructor(queryBuilderState: QueryBuilderState) {
     makeObservable(this, {
       executionResult: observable,
@@ -102,6 +107,8 @@ export class QueryBuilderResultState {
       isRunningQuery: observable,
       isSelectingCells: observable,
       isQueryUsageViewerOpened: observable,
+      gridConfig: observable,
+      setGridConfig: action,
       setIsSelectingCells: action,
       setIsRunningQuery: action,
       setExecutionResult: action,
@@ -113,8 +120,6 @@ export class QueryBuilderResultState {
       setQueryRunPromise: action,
       setIsQueryUsageViewerOpened: action,
       exportData: flow,
-      getRowData: action,
-      setRowData: action,
       runQuery: flow,
       cancelQuery: flow,
       generatePlan: flow,
@@ -122,6 +127,10 @@ export class QueryBuilderResultState {
     this.isSelectingCells = false;
 
     this.selectedCells = [];
+    this.gridConfig = {
+      columns: [],
+      isPivotModeEnabled: false,
+    };
     this.queryBuilderState = queryBuilderState;
     this.executionPlanState = new ExecutionPlanState(
       this.queryBuilderState.applicationStore,
@@ -129,34 +138,8 @@ export class QueryBuilderResultState {
     );
   }
 
-  getRowData(): Record<string, string | number | boolean | null>[] {
-    if (
-      this.executionResult &&
-      this.executionResult instanceof TDSExecutionResult
-    ) {
-      const data = this.executionResult.result.rows.map((_row, rowIdx) => {
-        const row: Record<string, string | number | boolean | null> = {};
-        const cols = (this.executionResult as TDSExecutionResult).result
-          .columns;
-        _row.values.forEach((value, colIdx) => {
-          // `ag-grid` shows `false` value as empty string so we have
-          // call `.toString()` to avoid this behavior.
-          // See https://github.com/finos/legend-studio/issues/1008
-          row[cols[colIdx] as string] = isBoolean(value)
-            ? String(value)
-            : value;
-        });
-        row.rowNumber = rowIdx;
-        return row;
-      });
-      this.rowData = data;
-      return data;
-    }
-    return [];
-  }
-
-  setRowData(val: Record<string, string | number | boolean | null>[]): void {
-    this.rowData = val;
+  setGridConfig(val: QueryBuilderDataGridConfig): void {
+    this.gridConfig = val;
   }
 
   setIsSelectingCells(val: boolean): void {

package/src/stores/QueryBuilderState.ts

@@ -100,6 +100,7 @@ import {
   type QueryBuilderExecutionContextState,
 } from './QueryBuilderExecutionContextState.js';
 import type { QueryBuilderConfig } from '../graph-manager/QueryBuilderConfig.js';
+import { QUERY_BUILDER_EVENT } from '../__lib__/QueryBuilderEvent.js';
 
 export abstract class QueryBuilderState implements CommandRegistrar {
   readonly applicationStore: GenericLegendApplicationStore;
@@ -130,6 +131,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
   isCheckingEntitlments = false;
   isCalendarEnabled = false;
   isQueryChatOpened = false;
+  isAdvancedModeEnabled = false;
 
   class?: Class | undefined;
   executionContextState: QueryBuilderExecutionContextState;
@@ -165,6 +167,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
       executionContextState: observable,
       class: observable,
       isQueryChatOpened: observable,
+      isAdvancedModeEnabled: observable,
 
       sideBarClassName: computed,
       isQuerySupported: computed,
@@ -177,6 +180,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
       setIsCheckingEntitlments: action,
       setClass: action,
       setIsQueryChatOpened: action,
+      setIsAdvancedModeEnabled: action,
 
       resetQueryResult: action,
       resetQueryContent: action,
@@ -259,6 +263,10 @@ export abstract class QueryBuilderState implements CommandRegistrar {
     this.isQueryChatOpened = val;
   }
 
+  setIsAdvancedModeEnabled(val: boolean): void {
+    this.isAdvancedModeEnabled = val;
+  }
+
   setInternalize(val: QueryBuilderInternalizeState | undefined): void {
     this.internalizeState = val;
   }
@@ -555,6 +563,10 @@ export abstract class QueryBuilderState implements CommandRegistrar {
       this.fetchStructureState.initializeWithQuery();
     } catch (error) {
       assertErrorThrown(error);
+      this.applicationStore.logService.error(
+        LogEvent.create(QUERY_BUILDER_EVENT.UNSUPPORTED_QUERY_LAUNCH),
+        error,
+      );
       this.resetQueryResult({ preserveResult: options?.preserveResult });
       this.resetQueryContent();
       this.unsupportedQueryState.setLambdaError(error);

package/src/stores/QueryBuilderTypeaheadHelper.ts

@@ -58,10 +58,6 @@ import {
 } from '@finos/legend-shared';
 import { QueryBuilderPostFilterOperator_StartWith } from './fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.js';
 import type { QueryBuilderAggregateColumnState } from './fetch-structure/tds/aggregation/QueryBuilderAggregationState.js';
-import {
-  getTDSColumnDerivedProperyFromType,
-  type TDS_COLUMN_GETTER,
-} from './fetch-structure/tds/post-filter/QueryBuilderPostFilterState.js';
 import {
   QueryBuilderDerivationProjectionColumnState,
   QueryBuilderProjectionColumnState,
@@ -75,6 +71,7 @@ import {
 import {
   QUERY_BUILDER_PURE_PATH,
   QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+  type TDS_COLUMN_GETTER,
 } from '../graph/QueryBuilderMetaModelConst.js';
 import {
   functionExpression_setParametersValues,
@@ -89,6 +86,7 @@ import {
   DEFAULT_POST_FILTER_LAMBDA_VARIABLE_NAME,
 } from './QueryBuilderConfig.js';
 import type { QueryBuilderAggregateOperator } from './fetch-structure/tds/aggregation/QueryBuilderAggregateOperator.js';
+import { getTDSColumnDerivedProperyFromType } from './fetch-structure/tds/QueryBuilderTDSHelper.js';
 
 const buildPropertyExpressionChainWithDefaultMilestoningDates = (
   propertyExpression: AbstractPropertyExpression,

package/src/stores/fetch-structure/tds/QueryBuilderTDSHelper.ts

@@ -15,6 +15,11 @@
  */
 
 import {
+  type Type,
+  Enumeration,
+  PRIMITIVE_TYPE,
+  SimpleFunctionExpression,
+  createPrimitiveInstance_String,
   extractElementNameFromPath,
   matchFunctionName,
 } from '@finos/legend-graph';
@@ -22,10 +27,13 @@ import {
   guaranteeNonNullable,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
+import {
+  COLUMN_SORT_TYPE,
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+  TDS_COLUMN_GETTER,
+} from '../../../graph/QueryBuilderMetaModelConst.js';
 import type { QueryBuilderTDSState } from './QueryBuilderTDSState.js';
 import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState.js';
-import { COLUMN_SORT_TYPE } from './QueryResultSetModifierState.js';
 
 export const findTDSColumnState = (
   projectionState: QueryBuilderTDSState,
@@ -77,3 +85,51 @@ export const getFunctionNameFromTDSSortColumn = (
       );
   }
 };
+
+export const buildTDSSortTypeExpression = (
+  sortType: COLUMN_SORT_TYPE,
+  column: string,
+): SimpleFunctionExpression => {
+  const sortColumnFunction = new SimpleFunctionExpression(
+    extractElementNameFromPath(
+      sortType === COLUMN_SORT_TYPE.ASC
+        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_ASC
+        : QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_DESC,
+    ),
+  );
+  const sortColumnName = createPrimitiveInstance_String(column);
+  sortColumnFunction.parametersValues[0] = sortColumnName;
+  return sortColumnFunction;
+};
+
+export const getTDSColumnDerivedProperyFromType = (
+  type: Type,
+): TDS_COLUMN_GETTER => {
+  if (type instanceof Enumeration) {
+    return TDS_COLUMN_GETTER.GET_ENUM;
+  }
+  switch (type.path) {
+    case PRIMITIVE_TYPE.STRING:
+      return TDS_COLUMN_GETTER.GET_STRING;
+    case PRIMITIVE_TYPE.NUMBER:
+      return TDS_COLUMN_GETTER.GET_NUMBER;
+    case PRIMITIVE_TYPE.INTEGER:
+      return TDS_COLUMN_GETTER.GET_INTEGER;
+    case PRIMITIVE_TYPE.FLOAT:
+      return TDS_COLUMN_GETTER.GET_FLOAT;
+    case PRIMITIVE_TYPE.DECIMAL:
+      return TDS_COLUMN_GETTER.GET_DECIMAL;
+    case PRIMITIVE_TYPE.DATE:
+      return TDS_COLUMN_GETTER.GET_DATE;
+    case PRIMITIVE_TYPE.DATETIME:
+      return TDS_COLUMN_GETTER.GET_DATETIME;
+    case PRIMITIVE_TYPE.STRICTDATE:
+      return TDS_COLUMN_GETTER.GET_STRICTDATE;
+    case PRIMITIVE_TYPE.BOOLEAN:
+      return TDS_COLUMN_GETTER.GET_BOOLEAN;
+    default:
+      throw new UnsupportedOperationError(
+        `Can't find TDS column derived property name for type: '${type.path}'`,
+      );
+  }
+};

package/src/stores/fetch-structure/tds/QueryResultSetModifierState.ts

@@ -24,11 +24,7 @@ import {
 } from '@finos/legend-shared';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import type { QueryBuilderTDSColumnState } from './QueryBuilderTDSColumnState.js';
-
-export enum COLUMN_SORT_TYPE {
-  ASC = 'ASC',
-  DESC = 'DESC',
-}
+import { COLUMN_SORT_TYPE } from '../../../graph/QueryBuilderMetaModelConst.js';
 
 export class SortColumnState implements Hashable {
   columnState: QueryBuilderTDSColumnState;

package/src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregateOperator.ts

@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  uuid,
-  guaranteeNonNullable,
-  type Hashable,
-} from '@finos/legend-shared';
+import { uuid, type Hashable } from '@finos/legend-shared';
 import type {
   AbstractPropertyExpression,
   PureModel,
@@ -82,10 +78,10 @@ export abstract class QueryBuilderAggregateOperator implements Hashable {
    * Returns the expected return type of the operator.
    * defaults to using the return type of the projection column state which is being aggregated.
    */
-  getReturnType(aggregateColumnState: QueryBuilderAggregateColumnState): Type {
-    return guaranteeNonNullable(
-      aggregateColumnState.projectionColumnState.getColumnType(),
-    );
+  getReturnType(
+    aggregateColumnState: QueryBuilderAggregateColumnState,
+  ): Type | undefined {
+    return aggregateColumnState.projectionColumnState.getColumnType();
   }
 
   abstract get hashCode(): string;

package/src/stores/fetch-structure/tds/aggregation/QueryBuilderAggregationState.ts

@@ -25,7 +25,10 @@ import type { Type } from '@finos/legend-graph';
 import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../../../QueryBuilderConfig.js';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import type { QueryBuilderAggregateOperator } from './QueryBuilderAggregateOperator.js';
-import type { QueryBuilderProjectionColumnState } from '../projection/QueryBuilderProjectionColumnState.js';
+import {
+  QueryBuilderDerivationProjectionColumnState,
+  type QueryBuilderProjectionColumnState,
+} from '../projection/QueryBuilderProjectionColumnState.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../QueryBuilderStateHashUtils.js';
 import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
 import type { QueryBuilderAggregateCalendarFunction } from './QueryBuilderAggregateCalendarFunction.js';
@@ -58,6 +61,7 @@ export class QueryBuilderAggregateColumnState
       setLambdaParameterName: action,
       setOperator: action,
       setCalendarFunction: action,
+      handleUsedPostFilterType: action,
       hashCode: computed,
     });
 
@@ -88,10 +92,20 @@ export class QueryBuilderAggregateColumnState
     this.operator = val;
   }
 
-  getColumnType(): Type {
+  getColumnType(): Type | undefined {
     return this.operator.getReturnType(this);
   }
 
+  handleUsedPostFilterType(type: Type): void {
+    if (
+      this.getColumnType() === undefined &&
+      this.projectionColumnState instanceof
+        QueryBuilderDerivationProjectionColumnState
+    ) {
+      this.projectionColumnState.setReturnType(type);
+    }
+  }
+
   get hashCode(): string {
     return hashArray([
       QUERY_BUILDER_STATE_HASH_STRUCTURE.AGGREGATE_COLUMN_STATE,

package/src/stores/fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_DistinctCount.ts

@@ -26,6 +26,7 @@ import {
   type Type,
   Enumeration,
   Multiplicity,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   assertTrue,
@@ -169,10 +170,7 @@ export class QueryBuilderAggregateOperator_DistinctCount
   override getReturnType(
     aggregateColumnState: QueryBuilderAggregateColumnState,
   ): Type {
-    const graph =
-      aggregateColumnState.aggregationState.tdsState.queryBuilderState
-        .graphManagerState.graph;
-    return graph.getType(PRIMITIVE_TYPE.INTEGER);
+    return PrimitiveType.INTEGER;
   }
 
   get hashCode(): string {

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

@@ -23,8 +23,8 @@ import { type Hashable, uuid } from '@finos/legend-shared';
 import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,
-  TDS_COLUMN_GETTER,
 } from './QueryBuilderPostFilterState.js';
+import type { TDS_COLUMN_GETTER } from '../../../../graph/QueryBuilderMetaModelConst.js';
 
 export abstract class QueryBuilderPostFilterOperator implements Hashable {
   readonly uuid = uuid();

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

@@ -22,8 +22,6 @@ import {
   type ExecutionResult,
   type VariableExpression,
   type SimpleFunctionExpression,
-  Enumeration,
-  PRIMITIVE_TYPE,
   observe_ValueSpecification,
   PrimitiveType,
   CollectionInstanceValue,
@@ -38,7 +36,6 @@ import {
   guaranteeNonNullable,
   guaranteeType,
   IllegalStateError,
-  UnsupportedOperationError,
   uuid,
   filterByType,
   ActionState,
@@ -78,6 +75,7 @@ import {
   isValueExpressionReferencedInValue,
 } from '../../../QueryBuilderValueSpecificationHelper.js';
 import { buildtdsPropertyExpressionFromColState } from './operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
+import { TDS_COLUMN_GETTER } from '../../../../graph/QueryBuilderMetaModelConst.js';
 
 export enum QUERY_BUILDER_POST_FILTER_DND_TYPE {
   GROUP_CONDITION = 'GROUP_CONDITION',
@@ -85,53 +83,6 @@ export enum QUERY_BUILDER_POST_FILTER_DND_TYPE {
   BLANK_CONDITION = 'BLANK_CONDITION',
 }
 
-export enum TDS_COLUMN_GETTER {
-  GET_STRING = 'getString',
-  GET_NUMBER = 'getNumber',
-  GET_INTEGER = 'getInteger',
-  GET_FLOAT = 'getFloat',
-  GET_DECIMAL = 'getDecimal',
-  GET_DATE = 'getDate',
-  GET_DATETIME = 'getDateTime',
-  GET_STRICTDATE = 'getStrictDate',
-  GET_BOOLEAN = 'getBoolean',
-  GET_ENUM = 'getEnum',
-  IS_NULL = 'isNull',
-  IS_NOT_NULL = 'isNotNull',
-}
-
-export const getTDSColumnDerivedProperyFromType = (
-  type: Type,
-): TDS_COLUMN_GETTER => {
-  if (type instanceof Enumeration) {
-    return TDS_COLUMN_GETTER.GET_ENUM;
-  }
-  switch (type.path) {
-    case PRIMITIVE_TYPE.STRING:
-      return TDS_COLUMN_GETTER.GET_STRING;
-    case PRIMITIVE_TYPE.NUMBER:
-      return TDS_COLUMN_GETTER.GET_NUMBER;
-    case PRIMITIVE_TYPE.INTEGER:
-      return TDS_COLUMN_GETTER.GET_INTEGER;
-    case PRIMITIVE_TYPE.FLOAT:
-      return TDS_COLUMN_GETTER.GET_FLOAT;
-    case PRIMITIVE_TYPE.DECIMAL:
-      return TDS_COLUMN_GETTER.GET_DECIMAL;
-    case PRIMITIVE_TYPE.DATE:
-      return TDS_COLUMN_GETTER.GET_DATE;
-    case PRIMITIVE_TYPE.DATETIME:
-      return TDS_COLUMN_GETTER.GET_DATETIME;
-    case PRIMITIVE_TYPE.STRICTDATE:
-      return TDS_COLUMN_GETTER.GET_STRICTDATE;
-    case PRIMITIVE_TYPE.BOOLEAN:
-      return TDS_COLUMN_GETTER.GET_BOOLEAN;
-    default:
-      throw new UnsupportedOperationError(
-        `Can't find TDS column derived property name for type: '${type.path}'`,
-      );
-  }
-};
-
 export const getTypeFromDerivedProperty = (
   derivedProperty: TDS_COLUMN_GETTER,
   graph: PureModel,

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

@@ -36,24 +36,29 @@ import {
 } from '@finos/legend-shared';
 import { QueryBuilderDerivationProjectionColumnState } from '../projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
-import { getTDSColumnState } from '../QueryBuilderTDSHelper.js';
+import {
+  getTDSColumnDerivedProperyFromType,
+  getTDSColumnState,
+} from '../QueryBuilderTDSHelper.js';
 import type { QueryBuilderPostFilterOperator } from './QueryBuilderPostFilterOperator.js';
 import {
   type QueryBuilderPostFilterState,
-  getTDSColumnDerivedProperyFromType,
   PostFilterConditionState,
   QueryBuilderPostFilterTreeConditionNodeData,
   QueryBuilderPostFilterTreeGroupNodeData,
-  TDS_COLUMN_GETTER,
   getTypeFromDerivedProperty,
   PostFilterValueSpecConditionValueState,
   PostFilterTDSColumnValueConditionValueState,
 } from './QueryBuilderPostFilterState.js';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graph/QueryBuilderMetaModelConst.js';
+import {
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+  TDS_COLUMN_GETTER,
+} from '../../../../graph/QueryBuilderMetaModelConst.js';
 import type { QueryBuilderState } from '../../../QueryBuilderState.js';
 import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import { toGroupOperation } from '../../../QueryBuilderGroupOperationHelper.js';
 import { simplifyValueExpression } from '../../../QueryBuilderValueSpecificationHelper.js';
+import { QueryBuilderAggregateColumnState } from '../aggregation/QueryBuilderAggregationState.js';
 
 const findProjectionColumnState = (
   propertyExpression: AbstractPropertyExpression,
@@ -93,6 +98,19 @@ const findProjectionColumnState = (
         columnState.setReturnType(type);
       }
       return columnState;
+    } else if (
+      columnState instanceof QueryBuilderAggregateColumnState &&
+      columnState.projectionColumnState instanceof
+        QueryBuilderDerivationProjectionColumnState
+    ) {
+      const type = getTypeFromDerivedProperty(
+        tdsColumnGetter,
+        postFilterState.tdsState.queryBuilderState.graphManagerState.graph,
+      );
+      if (type) {
+        columnState.handleUsedPostFilterType(type);
+      }
+      return columnState;
     }
     const columnType = guaranteeNonNullable(columnState.getColumnType());
     assertTrue(

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

@@ -31,13 +31,13 @@ import {
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import type { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
+import { type PostFilterConditionState } from '../QueryBuilderPostFilterState.js';
 import {
-  type PostFilterConditionState,
+  QUERY_BUILDER_PURE_PATH,
   type TDS_COLUMN_GETTER,
-  getTDSColumnDerivedProperyFromType,
-} from '../QueryBuilderPostFilterState.js';
-import { QUERY_BUILDER_PURE_PATH } from '../../../../../graph/QueryBuilderMetaModelConst.js';
+} from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import type { QueryBuilderTDSColumnState } from '../../QueryBuilderTDSColumnState.js';
+import { getTDSColumnDerivedProperyFromType } from '../../QueryBuilderTDSHelper.js';
 
 export const buildtdsPropertyExpressionFromColState = (
   filterConditionState: PostFilterConditionState,

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

@@ -26,7 +26,6 @@ import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBui
 import {
   type PostFilterConditionState,
   type QueryBuilderPostFilterState,
-  TDS_COLUMN_GETTER,
   PostFilterValueSpecConditionValueState,
 } from '../QueryBuilderPostFilterState.js';
 import { QueryBuilderSimpleProjectionColumnState } from '../../projection/QueryBuilderProjectionColumnState.js';
@@ -34,6 +33,7 @@ import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOper
 import { isPropertyExpressionChainOptional } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
+import { TDS_COLUMN_GETTER } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 
 export class QueryBuilderPostFilterOperator_IsEmpty
   extends QueryBuilderPostFilterOperator

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

@@ -37,7 +37,10 @@ import {
   isNonNullable,
   returnUndefOnError,
 } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graph/QueryBuilderMetaModelConst.js';
+import {
+  COLUMN_SORT_TYPE,
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+} from '../../../../graph/QueryBuilderMetaModelConst.js';
 import type { QueryBuilderState } from '../../../QueryBuilderState.js';
 import { QueryBuilderValueSpecificationProcessor } from '../../../QueryBuilderStateBuilder.js';
 import {
@@ -51,10 +54,7 @@ import {
   QueryBuilderSimpleProjectionColumnState,
 } from './QueryBuilderProjectionColumnState.js';
 import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
-import {
-  COLUMN_SORT_TYPE,
-  SortColumnState,
-} from '../QueryResultSetModifierState.js';
+import { SortColumnState } from '../QueryResultSetModifierState.js';
 
 export const processTDSProjectExpression = (
   expression: SimpleFunctionExpression,

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

@@ -40,7 +40,6 @@ import {
 } from './QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import {
-  COLUMN_SORT_TYPE,
   type QueryResultSetModifierState,
   type SortColumnState,
 } from '../QueryResultSetModifierState.js';
@@ -49,24 +48,15 @@ import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderVa
 import { buildPropertyExpressionChain } from '../../../QueryBuilderValueSpecificationBuilderHelper.js';
 import { appendOLAPGroupByState } from '../window/QueryBuilderWindowValueSpecificationBuilder.js';
 import { appendPostFilter } from '../post-filter/QueryBuilderPostFilterValueSpecificationBuilder.js';
+import { buildTDSSortTypeExpression } from '../QueryBuilderTDSHelper.js';
 
 const buildSortExpression = (
   sortColumnState: SortColumnState,
-): SimpleFunctionExpression => {
-  const sortColumnFunction = new SimpleFunctionExpression(
-    extractElementNameFromPath(
-      sortColumnState.sortType === COLUMN_SORT_TYPE.ASC
-        ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_ASC
-        : QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_DESC,
-    ),
+): SimpleFunctionExpression =>
+  buildTDSSortTypeExpression(
+    sortColumnState.sortType,
+    sortColumnState.columnState.columnName,
   );
-  const sortColumnName = new PrimitiveInstanceValue(
-    GenericTypeExplicitReference.create(new GenericType(PrimitiveType.STRING)),
-  );
-  sortColumnName.values = [sortColumnState.columnState.columnName];
-  sortColumnFunction.parametersValues[0] = sortColumnName;
-  return sortColumnFunction;
-};
 
 const appendResultSetModifier = (
   resultModifierState: QueryResultSetModifierState,

package/src/stores/fetch-structure/tds/window/QueryBuilderWindowState.ts

@@ -29,8 +29,8 @@ import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../../../QueryBuilderConfig.js';
 import type { QueryBuilderProjectionColumnDragSource } from '../projection/QueryBuilderProjectionColumnState.js';
 import { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.js';
 import type { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
-import type { COLUMN_SORT_TYPE } from '../QueryResultSetModifierState.js';
 import type { QueryBuilderTDS_WindowOperator } from './operators/QueryBuilderTDS_WindowOperator.js';
+import type { COLUMN_SORT_TYPE } from '../../../../graph/QueryBuilderMetaModelConst.js';
 
 export const QUERY_BUILDER_WINDOW_COLUMN_DND_TYPE = 'WINDOW_COLUMN';