@finos/legend-query-builder 4.9.3 → 4.10.0

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

@@ -265,24 +265,28 @@ const QueryBuilderDerivationProjectionColumnEditor = observer(
 );
 
 type CalendarFunctionOption = {
-  label: string | React.ReactNode;
+  label: string;
   value: QueryBuilderAggregateCalendarFunction;
 };
 
+const formatCalendarFunctionOptionLabel = (
+  option: CalendarFunctionOption,
+): React.ReactNode => (
+  <div
+    className="query-builder__projection__calendar__function__label"
+    title={option.value.getLabel()}
+  >
+    <FunctionIcon className="query-builder__projection__calendar__function__label__icon" />
+    <div className="query-builder__projection__calendar__function__label__title">
+      {option.value.getLabel()}
+    </div>
+  </div>
+);
+
 const buildCalendarFunctionOption = (
   calendarFunction: QueryBuilderAggregateCalendarFunction,
 ): CalendarFunctionOption => ({
-  label: (
-    <div
-      className="query-builder__projection__calendar__function__label"
-      title={calendarFunction.getLabel()}
-    >
-      <FunctionIcon className="query-builder__projection__calendar__function__label__icon" />
-      <div className="query-builder__projection__calendar__function__label__title">
-        {calendarFunction.getLabel()}
-      </div>
-    </div>
-  ),
+  label: calendarFunction.getLabel(),
   value: calendarFunction,
 });
 
@@ -684,7 +688,6 @@ const QueryBuilderProjectionColumnEditor = observer(
       }),
       [handleDrop],
     );
-
     return (
       <PanelDnDEntry
         ref={ref}
@@ -728,7 +731,12 @@ const QueryBuilderProjectionColumnEditor = observer(
           onOpen={onContextMenuOpen}
           onClose={onContextMenuClose}
         >
-          <div className="query-builder__projection__column__container">
+          <div
+            data-testid={
+              QUERY_BUILDER_TEST_ID.QUERY_BUILDER_TDS_PROJECTION_COLUMN
+            }
+            className="query-builder__projection__column__container"
+          >
             <PanelEntryDragHandle
               isDragging={false}
               dragSourceConnector={dragHandleRef}
@@ -865,6 +873,7 @@ const QueryBuilderProjectionColumnEditor = observer(
                   options={calendarFunctionOptions}
                   onChange={onCalendarFunctionOptionChange}
                   value={selectedCalendarFunctionOption}
+                  formatOptionLabel={formatCalendarFunctionOptionLabel}
                   placeholder="Select Calendar Function"
                   isClearable={true}
                   escapeClearsValue={true}
@@ -880,9 +889,7 @@ const QueryBuilderProjectionColumnEditor = observer(
                       defaultEndDate
                     }
                     setValueSpecification={(val: ValueSpecification): void => {
-                      if (val instanceof PrimitiveInstanceValue) {
-                        aggregateColumnState.calendarFunction?.setEndDate(val);
-                      }
+                      aggregateColumnState.calendarFunction?.setEndDate(val);
                     }}
                     graph={tdsState.queryBuilderState.graphManagerState.graph}
                     obseverContext={tdsState.queryBuilderState.observerContext}

package/src/graph-manager/protocol/pure/v1/V1_QueryValueSpecificationBuilderHelper.ts

@@ -26,7 +26,7 @@ import {
 import {
   type V1_GraphBuilderContext,
   type V1_ProcessingContext,
-  type V1_ValueSpecification,
+  V1_ValueSpecification,
   type ValueSpecification,
   type SimpleFunctionExpression,
   type Type,
@@ -50,7 +50,6 @@ import {
   VariableExpression,
   Multiplicity,
   PrimitiveType,
-  V1_CStrictDate,
   V1_CString,
   CORE_PURE_PATH,
   FunctionType,
@@ -203,8 +202,8 @@ const buildCalendarFunctionExpression = (
   );
   guaranteeType(
     currentPropertyExpression.parameters[2],
-    V1_CStrictDate,
-    `Can't build calendar aggregation column: only support third parameter of calendar function as StrictDate`,
+    V1_ValueSpecification,
+    `Can't build calendar aggregation column: only support third parameter of calendar function as Date`,
   );
   const dateColumn =
     currentPropertyExpression.parameters[0].accept_ValueSpecificationVisitor(

package/src/stores/QueryBuilderConstantsState.ts

@@ -24,6 +24,12 @@ import {
   buildSourceInformationSourceId,
   ParserError,
   GRAPH_MANAGER_EVENT,
+  SimpleFunctionExpression,
+  PrimitiveInstanceValue,
+  PrimitiveType,
+  extractElementNameFromPath,
+  SUPPORTED_FUNCTIONS,
+  INTERNAL__UnknownValueSpecification,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -70,6 +76,22 @@ export abstract class QueryBuilderConstantExpressionState implements Hashable {
       this.variable.name,
     ]);
   }
+
+  buildLetExpression(): SimpleFunctionExpression {
+    const leftSide = new PrimitiveInstanceValue(
+      GenericTypeExplicitReference.create(
+        new GenericType(PrimitiveType.STRING),
+      ),
+    );
+    leftSide.values = [this.variable.name];
+    const letFunc = new SimpleFunctionExpression(
+      extractElementNameFromPath(SUPPORTED_FUNCTIONS.LET),
+    );
+    letFunc.parametersValues = [leftSide, this.buildLetAssignmentValue()];
+    return letFunc;
+  }
+
+  abstract buildLetAssignmentValue(): ValueSpecification;
 }
 
 export class QueryBuilderSimpleConstantExpressionState
@@ -141,6 +163,10 @@ export class QueryBuilderSimpleConstantExpressionState
     }
   }
 
+  override buildLetAssignmentValue(): ValueSpecification {
+    return this.value;
+  }
+
   override get hashCode(): string {
     return hashArray([
       QUERY_BUILDER_STATE_HASH_STRUCTURE.CONSTANT_EXPRESSION_STATE,
@@ -272,6 +298,10 @@ export class QueryBuilderCalculatedConstantExpressionState
   setValue(val: PlainObject): void {
     this.value = val;
   }
+
+  override buildLetAssignmentValue(): ValueSpecification {
+    return new INTERNAL__UnknownValueSpecification(this.value);
+  }
 }
 
 export class QueryBuilderConstantsState implements Hashable {

package/src/stores/QueryBuilderStateHashUtils.ts

@@ -45,6 +45,8 @@ export enum QUERY_BUILDER_STATE_HASH_STRUCTURE {
   POST_FILTER_TREE_CONDIITION_NODE_DATA = 'POST_FILTER_TREE_CONDITION_NODE_DATA',
   POST_FILTER_TREE_BLANK_CONDITION_NODE_DATA = 'POST_FILTER_TREE_BLANK_CONDITION_NODE_DATA',
   POST_FILTER_CONDITION_STATE = 'POST_FILTER_CONDITION_STATE',
+  POST_FILTER_CONDITION_RIGHT_VALUE = 'POST_FILTER_CONDITION_RIGHT_VALUE',
+  POST_FILTER_CONDITION_RIGHT_VALUE_SPEC = 'POST_FILTER_CONDITION_RIGHT_VALUE_SPEC',
   POST_FILTER_OPERATOR_CONTAIN = 'POST_FILTER_OPERATOR_CONTAIN',
   POST_FILTER_OPERATOR_NOT_CONTAIN = 'POST_FILTER_OPERATOR_NOT_CONTAIN',
   POST_FILTER_OPERATOR_END_WITH = 'POST_FILTER_OPERATOR_END_WITH',

package/src/stores/QueryBuilderValueSpecificationBuilder.ts

@@ -14,14 +14,9 @@
  * limitations under the License.
  */
 
-import {
-  UnsupportedOperationError,
-  guaranteeNonNullable,
-  guaranteeType,
-} from '@finos/legend-shared';
+import { guaranteeNonNullable, guaranteeType } from '@finos/legend-shared';
 import {
   type Class,
-  type ValueSpecification,
   Multiplicity,
   getMilestoneTemporalStereotype,
   extractElementNameFromPath,
@@ -33,11 +28,8 @@ import {
   GenericTypeExplicitReference,
   LambdaFunction,
   SimpleFunctionExpression,
-  PrimitiveInstanceValue,
-  PrimitiveType,
   SUPPORTED_FUNCTIONS,
   RuntimePointer,
-  INTERNAL__UnknownValueSpecification,
 } from '@finos/legend-graph';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import { buildFilterExpression } from './filter/QueryBuilderFilterValueSpecificationBuilder.js';
@@ -46,11 +38,6 @@ import type { QueryBuilderFetchStructureState } from './fetch-structure/QueryBui
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graph/QueryBuilderMetaModelConst.js';
 import { buildWatermarkExpression } from './watermark/QueryBuilderWatermarkValueSpecificationBuilder.js';
 import { buildExecutionQueryFromLambdaFunction } from './shared/LambdaParameterState.js';
-import {
-  QueryBuilderSimpleConstantExpressionState,
-  type QueryBuilderConstantExpressionState,
-  QueryBuilderCalculatedConstantExpressionState,
-} from './QueryBuilderConstantsState.js';
 import {
   QueryBuilderEmbeddedFromExecutionContextState,
   type QueryBuilderExecutionContextState,
@@ -90,40 +77,6 @@ const buildGetAllVersionsFunction = (
   return _func;
 };
 
-const buildLetExpression = (
-  constantExpressionState: QueryBuilderConstantExpressionState,
-): SimpleFunctionExpression => {
-  const varName = constantExpressionState.variable.name;
-  const leftSide = new PrimitiveInstanceValue(
-    GenericTypeExplicitReference.create(new GenericType(PrimitiveType.STRING)),
-  );
-  leftSide.values = [varName];
-  const letFunc = new SimpleFunctionExpression(
-    extractElementNameFromPath(SUPPORTED_FUNCTIONS.LET),
-  );
-  let value: ValueSpecification;
-  if (
-    constantExpressionState instanceof QueryBuilderSimpleConstantExpressionState
-  ) {
-    value = constantExpressionState.value;
-  } else if (
-    constantExpressionState instanceof
-    QueryBuilderCalculatedConstantExpressionState
-  ) {
-    value = new INTERNAL__UnknownValueSpecification(
-      constantExpressionState.value,
-    );
-  } else {
-    throw new UnsupportedOperationError(
-      `Can't build let() expression: unsupported constant state`,
-      constantExpressionState,
-    );
-  }
-
-  letFunc.parametersValues = [leftSide, value];
-  return letFunc;
-};
-
 const buildExecutionContextState = (
   executionState: QueryBuilderExecutionContextState,
   lambdaFunction: LambdaFunction,
@@ -237,8 +190,9 @@ export const buildLambdaFunction = (
 
   // build variable expressions
   if (queryBuilderState.constantState.constants.length) {
-    const letExpressions =
-      queryBuilderState.constantState.constants.map(buildLetExpression);
+    const letExpressions = queryBuilderState.constantState.constants.map((e) =>
+      e.buildLetExpression(),
+    );
     lambdaFunction.expressionSequence = [
       ...letExpressions,
       ...lambdaFunction.expressionSequence,

package/src/stores/explorer/QueryBuilderExplorerState.ts

@@ -218,10 +218,11 @@ export const buildPropertyExpressionFromExplorerTreeNodeData = (
   let parentNode =
     treeData.nodes.get(node.parentId) ??
     propertySearchIndexedTreeNodes.find((n) => n.id === node.parentId);
-  let currentNode: QueryBuilderExplorerTreeNodeData = node;
+  let currentNode: QueryBuilderExplorerTreeNodeData | undefined = node;
   while (
-    parentNode instanceof QueryBuilderExplorerTreePropertyNodeData ||
-    parentNode instanceof QueryBuilderExplorerTreeSubTypeNodeData
+    currentNode &&
+    (parentNode instanceof QueryBuilderExplorerTreePropertyNodeData ||
+      parentNode instanceof QueryBuilderExplorerTreeSubTypeNodeData)
   ) {
     // NOTE: here, we deliberately simplify subtypes chain
     // $x.employees->subType(@Person)->subType(@Staff).department will be simplified to $x.employees->subType(@Staff).department
@@ -234,13 +235,28 @@ export const buildPropertyExpressionFromExplorerTreeNodeData = (
     }
 
     let parentPropertyExpression;
-    if (
-      parentNode instanceof QueryBuilderExplorerTreeSubTypeNodeData ||
+    if (parentNode instanceof QueryBuilderExplorerTreeSubTypeNodeData) {
+      parentPropertyExpression = new SimpleFunctionExpression(
+        extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SUBTYPE),
+      );
+    } else if (
+      parentNode instanceof QueryBuilderExplorerTreePropertyNodeData &&
       parentNode.mappingData.entityMappedProperty?.subType
     ) {
       parentPropertyExpression = new SimpleFunctionExpression(
         extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.SUBTYPE),
       );
+      currentExpression.parametersValues.push(parentPropertyExpression);
+      currentExpression = parentPropertyExpression;
+      parentPropertyExpression = new AbstractPropertyExpression('');
+      propertyExpression_setFunc(
+        parentPropertyExpression,
+        PropertyExplicitReference.create(
+          guaranteeNonNullable(parentNode.property),
+        ),
+      );
+      currentNode = parentNode;
+      parentNode = treeData.nodes.get(parentNode.parentId);
     } else {
       parentPropertyExpression = new AbstractPropertyExpression('');
       propertyExpression_setFunc(
@@ -266,7 +282,11 @@ export const buildPropertyExpressionFromExplorerTreeNodeData = (
     }
     currentExpression = parentPropertyExpression;
     currentNode = parentNode;
-    parentNode = treeData.nodes.get(parentNode.parentId);
+    parentNode =
+      parentNode instanceof QueryBuilderExplorerTreePropertyNodeData ||
+      parentNode instanceof QueryBuilderExplorerTreeSubTypeNodeData
+        ? treeData.nodes.get(parentNode.parentId)
+        : undefined;
     if (
       !parentNode &&
       (currentNode instanceof QueryBuilderExplorerTreePropertyNodeData ||
@@ -281,7 +301,7 @@ export const buildPropertyExpressionFromExplorerTreeNodeData = (
     }
   }
   currentExpression.parametersValues.push(projectionColumnLambdaVariable);
-  if (currentExpression instanceof SimpleFunctionExpression) {
+  if (currentNode && currentExpression instanceof SimpleFunctionExpression) {
     const subclass = new InstanceValue(
       Multiplicity.ONE,
       GenericTypeExplicitReference.create(new GenericType(currentNode.type)),
@@ -458,12 +478,22 @@ export const getQueryBuilderPropertyNodeData = (
       )
     : undefined;
   const propertyNode = new QueryBuilderExplorerTreePropertyNodeData(
-    generateExplorerTreePropertyNodeID(
-      parentNode instanceof QueryBuilderExplorerTreeRootNodeData
-        ? ''
-        : parentNode.id,
-      property.name,
-    ),
+    subClass
+      ? generateExplorerTreeSubtypeNodeID(
+          generateExplorerTreePropertyNodeID(
+            parentNode instanceof QueryBuilderExplorerTreeRootNodeData
+              ? ''
+              : parentNode.id,
+            property.name,
+          ),
+          subClass.path,
+        )
+      : generateExplorerTreePropertyNodeID(
+          parentNode instanceof QueryBuilderExplorerTreeRootNodeData
+            ? ''
+            : parentNode.id,
+          property.name,
+        ),
     property.name,
     `${
       parentNode instanceof QueryBuilderExplorerTreeRootNodeData

package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.ts

@@ -302,6 +302,16 @@ export const addQueryBuilderPropertyNode = (
         parentExplorerTreeNode.parentId,
       );
     }
+    if (
+      parentExplorerTreeNode instanceof
+        QueryBuilderExplorerTreePropertyNodeData &&
+      parentExplorerTreeNode.mappingData.entityMappedProperty?.subType &&
+      parentExplorerTreeNode.type instanceof Class
+    ) {
+      subType = PackageableElementExplicitReference.create(
+        parentExplorerTreeNode.type,
+      );
+    }
     if (
       parentExplorerTreeNode instanceof QueryBuilderExplorerTreePropertyNodeData
     ) {

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

@@ -23,7 +23,6 @@ import {
   AbstractPropertyExpression,
   INTERNAL__UnknownValueSpecification,
   LambdaFunctionInstanceValue,
-  type PrimitiveInstanceValue,
   type SimpleFunctionExpression,
   type ValueSpecification,
 } from '@finos/legend-graph';
@@ -42,7 +41,7 @@ export abstract class QueryBuilderAggregateCalendarFunction
 {
   dateColumn?: AbstractPropertyExpression | undefined;
   calendarType!: QUERY_BUILDER_CALENDAR_TYPE;
-  endDate!: PrimitiveInstanceValue;
+  endDate!: ValueSpecification;
   lambdaParameterName: string = DEFAULT_LAMBDA_VARIABLE_NAME;
 
   constructor() {
@@ -122,7 +121,7 @@ export abstract class QueryBuilderAggregateCalendarFunction
     this.calendarType = val;
   }
 
-  setEndDate(val: PrimitiveInstanceValue): void {
+  setEndDate(val: ValueSpecification): void {
     this.endDate = val;
   }
 

package/src/stores/fetch-structure/tds/aggregation/calendarFunctions/QueryBuilderAggregateCalendarFunctionValueSpecificationBuilder.ts

@@ -15,7 +15,7 @@
  */
 
 import {
-  type ValueSpecification,
+  ValueSpecification,
   SimpleFunctionExpression,
   extractElementNameFromPath,
   matchFunctionName,
@@ -44,7 +44,7 @@ export const buildCalendarFunctionExpression = (
   calendarFunctionFullPath: string,
   dateColumn: AbstractPropertyExpression | undefined,
   calendarType: QUERY_BUILDER_CALENDAR_TYPE,
-  endDate: PrimitiveInstanceValue,
+  endDate: ValueSpecification,
   targetColumn:
     | AbstractPropertyExpression
     | INTERNAL__UnknownValueSpecification,
@@ -165,15 +165,16 @@ export const updateAggregateColumnState = (
 
     const endDate = guaranteeType(
       expression.parametersValues[2],
-      PrimitiveInstanceValue,
+      ValueSpecification,
       `Can't process ${extractElementNameFromPath(
         calendarFunctionFullPath,
       )}() expression: only support ${extractElementNameFromPath(
         calendarFunctionFullPath,
-      )}() with third parameter as PrimitiveInstancevalue`,
+      )}() with third parameter as ValueSpecification`,
     );
     assertTrue(
-      endDate.genericType.value.rawType.name === PRIMITIVE_TYPE.STRICTDATE ||
+      endDate.genericType?.value.rawType.name === PRIMITIVE_TYPE.STRICTDATE ||
+        endDate.genericType?.value.rawType.name === PRIMITIVE_TYPE.DATE ||
         dateColumn.func.value.genericType.value.rawType.name ===
           PRIMITIVE_TYPE.DATE,
 
@@ -181,7 +182,7 @@ export const updateAggregateColumnState = (
         calendarFunctionFullPath,
       )}() expression: only support ${extractElementNameFromPath(
         calendarFunctionFullPath,
-      )}() with third parameter of type StrictDate`,
+      )}() with third parameter of type Date`,
     );
 
     calendarFunction.calendarType = calendarTypeParameter

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

@@ -48,7 +48,7 @@ export abstract class QueryBuilderPostFilterOperator implements Hashable {
   isCompatibleWithPostFilterColumn(
     postFilterState: PostFilterConditionState,
   ): boolean {
-    const columnType = postFilterState.columnState.getColumnType();
+    const columnType = postFilterState.leftConditionValue.getColumnType();
     if (columnType) {
       return this.isCompatibleWithType(columnType);
     }