@finos/legend-query-builder 4.10.1 → 4.10.2

package/src/__lib__/QueryBuilderEvent.ts

@@ -26,6 +26,7 @@ export enum QUERY_BUILDER_EVENT {
 
   MAPPING_MODEL_COVERAGE_ANALYSYS__LAUNCH = 'query-builder.mapping-model-coverage-analysis.launch',
   MAPPING_MODEL_COVERAGE_ANALYSYS__SUCCESS = 'query-builder.mapping-model-coverage-analysis.success',
+  UNSUPPORTED_QUERY_LAUNCH = 'query-builder.unsupported-query.lanuch',
 }
 
 export enum QUERY_BUILDER_FILTER_EVENT {

package/src/components/QueryBuilderResultPanel.tsx

@@ -52,6 +52,7 @@ import {
   EnumValueInstanceValue,
   EnumValueExplicitReference,
   RelationalExecutionActivities,
+  getTDSRowRankByColumnInAsc,
 } from '@finos/legend-graph';
 import {
   ActionAlertActionType,
@@ -62,6 +63,8 @@ import {
 import {
   assertErrorThrown,
   guaranteeNonNullable,
+  isBoolean,
+  type PlainObject,
   prettyDuration,
   filterByType,
   isValidURL,
@@ -417,7 +420,9 @@ const QueryBuilderGridResultContextMenu = observer(
       ),
     );
 
-    const findSelectedCellRowData = (): string => {
+    const findRowFromRowIndex = (
+      rowIndex: number,
+    ): (string | number | boolean | null)[] => {
       if (
         !tdsState.queryBuilderState.resultState.executionResult ||
         !(
@@ -425,31 +430,21 @@ const QueryBuilderGridResultContextMenu = observer(
           TDSExecutionResult
         )
       ) {
-        return '';
+        return [''];
       }
-      const rowData = tdsState.queryBuilderState.resultState.rowData.find(
-        (rData) =>
-          rData.rowNumber ===
-          tdsState.queryBuilderState.resultState.selectedCells[0]?.coordinates
-            .rowIndex,
+      return (
+        tdsState.queryBuilderState.resultState.executionResult.result.rows[
+          rowIndex
+        ]?.values ?? ['']
       );
-      // try to get the entire row value separated by comma
-      // rowData is in format of {columnName: value, columnName1: value, ...., rowNumber:value}
-      const valueArr: (string | number | boolean | null | undefined)[] = [];
-      if (rowData) {
-        Object.entries(rowData).forEach((entry) => {
-          if (entry[0] !== 'rowNumber') {
-            valueArr.push(entry[1]);
-          }
-        });
-        return valueArr.join(',');
-      }
-      return '';
     };
 
     const handleCopyRowValue = applicationStore.guardUnhandledError(() =>
       applicationStore.clipboardService.copyTextToClipboard(
-        findSelectedCellRowData(),
+        findRowFromRowIndex(
+          tdsState.queryBuilderState.resultState.selectedCells[0]?.coordinates
+            .rowIndex ?? 0,
+        ).toString(),
       ),
     );
 
@@ -507,18 +502,18 @@ const QueryResultCellRenderer = observer(
       isString(cellValue) && isValidURL(cellValue) ? cellValue : undefined;
     const columnName = params.column?.getColId() ?? '';
     const findCoordinatesFromResultValue = (
-      colName: string,
+      colId: string,
       rowNumber: number,
     ): QueryBuilderTDSResultCellCoordinate => {
       const colIndex = tdsExecutionResult.result.columns.findIndex(
-        (col) => col === colName,
+        (col) => col === colId,
       );
       return { rowIndex: rowNumber, colIndex: colIndex };
     };
 
     const currentCellCoordinates = findCoordinatesFromResultValue(
       columnName,
-      params.data.rowNumber,
+      params.rowIndex,
     );
     const cellInFilteredResults = resultState.selectedCells.some(
       (result) =>
@@ -526,9 +521,9 @@ const QueryResultCellRenderer = observer(
         result.coordinates.rowIndex === currentCellCoordinates.rowIndex,
     );
 
-    const findColumnNameFromColumnIndex = (
+    const findColumnFromCoordinates = (
       colIndex: number,
-    ): string | undefined => {
+    ): string | number | boolean | null | undefined => {
       if (
         !resultState.executionResult ||
         !(resultState.executionResult instanceof TDSExecutionResult)
@@ -539,12 +534,30 @@ const QueryResultCellRenderer = observer(
     };
 
     const findResultValueFromCoordinates = (
-      rowIndex: number,
-      colName: string,
-    ): string | number | boolean | null | undefined =>
-      resultState.rowData.find((data) => data.rowNumber === rowIndex)![
-        colName
-      ] as string | number | boolean | null | undefined;
+      resultCoordinate: [number, number],
+    ): string | number | boolean | null | undefined => {
+      const rowIndex = resultCoordinate[0];
+      const colIndex = resultCoordinate[1];
+
+      if (
+        !resultState.executionResult ||
+        !(resultState.executionResult instanceof TDSExecutionResult)
+      ) {
+        return undefined;
+      }
+      if (params.columnApi.getColumnState()[colIndex]?.sort === 'asc') {
+        resultState.executionResult.result.rows.sort((a, b) =>
+          getTDSRowRankByColumnInAsc(a, b, colIndex),
+        );
+      } else if (params.columnApi.getColumnState()[colIndex]?.sort === 'desc') {
+        resultState.executionResult.result.rows.sort((a, b) =>
+          getTDSRowRankByColumnInAsc(b, a, colIndex),
+        );
+      }
+      return resultState.executionResult.result.rows[rowIndex]?.values[
+        colIndex
+      ];
+    };
 
     const isCoordinatesSelected = (
       resultCoordinate: QueryBuilderTDSResultCellCoordinate,
@@ -561,12 +574,12 @@ const QueryResultCellRenderer = observer(
       if (event.shiftKey) {
         const coordinates = findCoordinatesFromResultValue(
           columnName,
-          params.data.rowNumber,
+          params.rowIndex,
         );
-        const actualValue = findResultValueFromCoordinates(
+        const actualValue = findResultValueFromCoordinates([
           coordinates.rowIndex,
-          columnName,
-        );
+          coordinates.colIndex,
+        ]);
         resultState.addSelectedCell({
           value: actualValue,
           columnName: columnName,
@@ -580,12 +593,12 @@ const QueryResultCellRenderer = observer(
         resultState.setSelectedCells([]);
         const coordinates = findCoordinatesFromResultValue(
           columnName,
-          params.data.rowNumber,
+          params.rowIndex,
         );
-        const actualValue = findResultValueFromCoordinates(
+        const actualValue = findResultValueFromCoordinates([
           coordinates.rowIndex,
-          columnName,
-        );
+          coordinates.colIndex,
+        ]);
         resultState.setSelectedCells([
           {
             value: actualValue,
@@ -599,14 +612,14 @@ const QueryResultCellRenderer = observer(
       if (event.button === 2) {
         const coordinates = findCoordinatesFromResultValue(
           columnName,
-          params.data.rowNumber,
+          params.rowIndex,
         );
         const isInSelected = isCoordinatesSelected(coordinates);
         if (!isInSelected) {
-          const actualValue = findResultValueFromCoordinates(
+          const actualValue = findResultValueFromCoordinates([
             coordinates.rowIndex,
-            columnName,
-          );
+            coordinates.colIndex,
+          ]);
           resultState.setSelectedCells([
             {
               value: actualValue,
@@ -636,7 +649,7 @@ const QueryResultCellRenderer = observer(
         const firstCorner = results.coordinates;
         const secondCorner = findCoordinatesFromResultValue(
           columnName,
-          params.data.rowNumber,
+          params.rowIndex,
         );
 
         resultState.setSelectedCells([results]);
@@ -648,13 +661,11 @@ const QueryResultCellRenderer = observer(
 
         for (let x = minRow; x <= maxRow; x++) {
           for (let y = minCol; y <= maxCol; y++) {
-            const actualValue = findResultValueFromCoordinates(
-              x,
-              findColumnNameFromColumnIndex(y) as string,
-            );
+            const actualValue = findResultValueFromCoordinates([x, y]);
+
             const valueAndColumnId = {
               value: actualValue,
-              columnName: findColumnNameFromColumnIndex(y),
+              columnName: findColumnFromCoordinates(y),
               coordinates: {
                 rowIndex: x,
                 colIndex: y,
@@ -673,6 +684,7 @@ const QueryResultCellRenderer = observer(
           }
         }
       }
+
       resultState.setMouseOverCell(resultState.selectedCells[0] ?? null);
     };
 
@@ -729,6 +741,20 @@ const QueryBuilderGridResult = observer(
 
     const resultState = queryBuilderState.resultState;
 
+    const rowData = executionResult.result.rows.map((_row, rowIdx) => {
+      const row: PlainObject = {};
+      const cols = executionResult.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;
+    });
+
     return (
       <div className="query-builder__result__values__table">
         <div
@@ -737,20 +763,7 @@ const QueryBuilderGridResult = observer(
           )}
         >
           <DataGrid
-            rowData={queryBuilderState.resultState.getRowData()}
-            onSortChanged={(params) => {
-              const sortedData: Record<
-                string,
-                string | number | boolean | null
-              >[] = [];
-              params.api.forEachNodeAfterFilterAndSort((node, index) => {
-                node.rowIndex = index;
-                // rowNumber has to be manually updated after sorting the column
-                node.data.rowNumber = index;
-                sortedData.push(node.data);
-              });
-              queryBuilderState.resultState.setRowData(sortedData);
-            }}
+            rowData={rowData}
             gridOptions={{
               suppressScrollOnNewData: true,
               getRowId: (data) => data.data.rowNumber,

package/src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx

@@ -32,14 +32,12 @@ import {
   MenuContentItem,
   ModalFooterButton,
 } from '@finos/legend-art';
-import {
-  COLUMN_SORT_TYPE,
-  SortColumnState,
-} from '../../stores/fetch-structure/tds/QueryResultSetModifierState.js';
+import { SortColumnState } from '../../stores/fetch-structure/tds/QueryResultSetModifierState.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { useApplicationStore } from '@finos/legend-application';
 import type { QueryBuilderTDSState } from '../../stores/fetch-structure/tds/QueryBuilderTDSState.js';
 import type { QueryBuilderTDSColumnState } from '../../stores/fetch-structure/tds/QueryBuilderTDSColumnState.js';
+import { COLUMN_SORT_TYPE } from '../../graph/QueryBuilderMetaModelConst.js';
 
 const ColumnSortEditor = observer(
   (props: { tdsState: QueryBuilderTDSState; sortState: SortColumnState }) => {

package/src/components/fetch-structure/QueryBuilderTDSWindowPanel.tsx

@@ -66,9 +66,9 @@ import {
 import { QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderTDSColumnState } from '../../stores/fetch-structure/tds/QueryBuilderTDSColumnState.js';
 import type { QueryBuilderTDSState } from '../../stores/fetch-structure/tds/QueryBuilderTDSState.js';
-import { COLUMN_SORT_TYPE } from '../../stores/fetch-structure/tds/QueryResultSetModifierState.js';
 import { QUERY_BUILDER_TEST_ID } from '../../__lib__/QueryBuilderTesting.js';
 import { QueryBuilderPanelIssueCountBadge } from '../shared/QueryBuilderPanelIssueCountBadge.js';
+import { COLUMN_SORT_TYPE } from '../../graph/QueryBuilderMetaModelConst.js';
 
 // helpers
 const createWindowColumnState = (

package/src/graph/QueryBuilderMetaModelConst.ts

@@ -105,6 +105,7 @@ export enum QUERY_BUILDER_SUPPORTED_FUNCTIONS {
   TDS_GROUP_BY = 'meta::pure::tds::groupBy',
   TDS_SORT = 'meta::pure::tds::sort',
   TDS_TAKE = 'meta::pure::tds::take',
+  TDS_RESTRICT = 'meta::pure::tds::restrict',
   TDS_FUNC = 'meta::pure::tds::func',
 
   // filter
@@ -149,4 +150,28 @@ export enum QUERY_BUILDER_SUPPORTED_FUNCTIONS {
   FROM = 'meta::pure::mapping::from',
   CHECKED = 'meta::pure::dataQuality::checked',
   MERGERUNTIMES = 'meta::pure::runtime::mergeRuntimes',
+
+  // TOTDS
+  TABLE_TO_TDS = 'meta::pure::tds::tableToTDS',
+  TABLE_REFERENCE = 'meta::relational::functions::database::tableReference',
+}
+
+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 enum COLUMN_SORT_TYPE {
+  ASC = 'ASC',
+  DESC = 'DESC',
 }

package/src/index.ts

@@ -29,7 +29,10 @@ export { QueryBuilderNavigationBlocker } from './components/QueryBuilderNavigati
 export { QueryBuilder } from './components/QueryBuilder.js';
 export { QUERY_BUILDER_COMPONENT_ELEMENT_ID } from './components/QueryBuilderComponentElement.js';
 export { QueryBuilderState } from './stores/QueryBuilderState.js';
-
+export {
+  getTDSColumnDerivedProperyFromType,
+  buildTDSSortTypeExpression,
+} from './stores/fetch-structure/tds/QueryBuilderTDSHelper.js';
 export { QueryBuilderPropertySearchState } from './stores/explorer/QueryBuilderPropertySearchState.js';
 export {
   QueryBuilderClassSelector,
@@ -43,7 +46,11 @@ export {
   type ServiceExecutionContext,
   ServiceQueryBuilderState,
 } from './stores/workflows/ServiceQueryBuilderState.js';
-export { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from './graph/QueryBuilderMetaModelConst.js';
+export {
+  TDS_COLUMN_GETTER,
+  COLUMN_SORT_TYPE,
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+} from './graph/QueryBuilderMetaModelConst.js';
 export { getQueryBuilderGraphManagerExtension } from './graph-manager/protocol/pure/QueryBuilder_PureGraphManagerExtension.js';
 export type { ServiceExecutionAnalysisResult } from './graph-manager/action/analytics/ServiceExecutionAnalysis.js';
 export type { MappingRuntimeCompatibilityAnalysisResult } from './graph-manager/action/analytics/MappingRuntimeCompatibilityAnalysis.js';

package/src/stores/QueryBuilderPreviewDataHelper.ts

@@ -29,12 +29,10 @@ import { QueryBuilderAggregateOperator_StdDev_Sample } from './fetch-structure/t
 import { QueryBuilderAggregateOperator_Sum } from './fetch-structure/tds/aggregation/operators/QueryBuilderAggregateOperator_Sum.js';
 import { QueryBuilderSimpleProjectionColumnState } from './fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderState } from './QueryBuilderState.js';
-import {
-  COLUMN_SORT_TYPE,
-  SortColumnState,
-} from './fetch-structure/tds/QueryResultSetModifierState.js';
+import { SortColumnState } from './fetch-structure/tds/QueryResultSetModifierState.js';
 import type { QueryBuilderAggregateOperator } from './fetch-structure/tds/aggregation/QueryBuilderAggregateOperator.js';
 import { QueryBuilderTDSState } from './fetch-structure/tds/QueryBuilderTDSState.js';
+import { COLUMN_SORT_TYPE } from '../graph/QueryBuilderMetaModelConst.js';
 
 const PREVIEW_DATA_TAKE_LIMIT = 10;
 const PREVIEW_DATA_NON_NUMERIC_VALUE_COLUMN_NAME = 'Value';

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';
@@ -83,7 +81,6 @@ 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;
@@ -113,8 +110,6 @@ export class QueryBuilderResultState {
       setQueryRunPromise: action,
       setIsQueryUsageViewerOpened: action,
       exportData: flow,
-      getRowData: action,
-      setRowData: action,
       runQuery: flow,
       cancelQuery: flow,
       generatePlan: flow,
@@ -129,36 +124,6 @@ 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;
-  }
-
   setIsSelectingCells(val: boolean): void {
     this.isSelectingCells = val;
   }

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;
@@ -555,6 +556,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,