@finos/legend-query-builder 4.9.2 → 4.9.4

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,
 });
 
@@ -865,6 +869,7 @@ const QueryBuilderProjectionColumnEditor = observer(
                   options={calendarFunctionOptions}
                   onChange={onCalendarFunctionOptionChange}
                   value={selectedCalendarFunctionOption}
+                  formatOptionLabel={formatCalendarFunctionOptionLabel}
                   placeholder="Select Calendar Function"
                   isClearable={true}
                   escapeClearsValue={true}
@@ -880,9 +885,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/components/filter/QueryBuilderFilterPanel.tsx

@@ -932,6 +932,9 @@ const QueryBuilderFilterTreeNodeContainer = observer(
       >
         <div
           ref={ref}
+          data-testid={
+            QUERY_BUILDER_TEST_ID.QUERY_BUILDER_FILTER_TREE_NODE_CONTENT
+          }
           className={clsx(
             'tree-view__node__container query-builder-filter-tree__node__container',
             {
@@ -1036,7 +1039,10 @@ const QueryBuilderFilterTreeNodeView = observer(
       innerProps,
     } = props;
     return (
-      <div className="tree-view__node__block">
+      <div
+        data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_FILTER_TREE_NODE}
+        className="tree-view__node__block"
+      >
         <QueryBuilderFilterTreeNodeContainer
           node={node}
           level={level + 1}
@@ -1079,7 +1085,10 @@ const QueryBuilderFilterTree = observer(
         ? node.childrenIds.map((id) => filterState.getNode(id))
         : [];
     return (
-      <div className="tree-view__node__root query-builder-filter-tree__root">
+      <div
+        data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_FILTER_TREE}
+        className="tree-view__node__root query-builder-filter-tree__root"
+      >
         {rootNodes.map((node) => (
           <QueryBuilderFilterTreeNodeView
             key={node.id}
@@ -1248,7 +1257,7 @@ export const QueryBuilderFilterPanel = observer(
 
     return (
       <div
-        data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_FILTER}
+        data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_FILTER_PANEL}
         className="panel"
       >
         <div className="panel__header">

package/src/components/shared/QueryBuilderPropertyInfoTooltip.tsx

@@ -21,6 +21,7 @@ import {
   getMultiplicityDescription,
   CORE_PURE_PATH,
   PURE_DOC_TAG,
+  type Type,
 } from '@finos/legend-graph';
 
 export const QueryBuilderPropertyInfoTooltip: React.FC<{
@@ -29,8 +30,9 @@ export const QueryBuilderPropertyInfoTooltip: React.FC<{
   isMapped: boolean;
   children: React.ReactElement;
   placement?: TooltipPlacement | undefined;
+  type?: Type | undefined;
 }> = (props) => {
-  const { property, path, isMapped, children, placement } = props;
+  const { property, path, isMapped, children, placement, type } = props;
   const documentation = property.taggedValues
     .filter(
       (taggedValue) =>
@@ -60,7 +62,7 @@ export const QueryBuilderPropertyInfoTooltip: React.FC<{
           <div className="query-builder__tooltip__item">
             <div className="query-builder__tooltip__item__label">Type</div>
             <div className="query-builder__tooltip__item__value">
-              {property.genericType.value.rawType.path}
+              {type?.path ?? property.genericType.value.rawType.path}
             </div>
           </div>
           <div className="query-builder__tooltip__item">

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/explorer/QueryBuilderExplorerState.ts

@@ -152,13 +152,14 @@ export class QueryBuilderExplorerTreePropertyNodeData extends QueryBuilderExplor
     parentId: string,
     isPartOfDerivedPropertyBranch: boolean,
     mappingData: QueryBuilderExplorerTreeNodeMappingData,
+    type?: Type | undefined,
   ) {
     super(
       id,
       label,
       dndText,
       isPartOfDerivedPropertyBranch,
-      property.genericType.value.rawType,
+      type ?? property.genericType.value.rawType,
       mappingData,
     );
     this.property = property;
@@ -217,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
@@ -237,6 +239,24 @@ export const buildPropertyExpressionFromExplorerTreeNodeData = (
       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(
@@ -262,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 ||
@@ -277,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)),
@@ -444,13 +468,32 @@ export const getQueryBuilderPropertyNodeData = (
   ) {
     return undefined;
   }
+  const _subclasses =
+    property.genericType.value.rawType instanceof Class
+      ? getAllSubclasses(property.genericType.value.rawType)
+      : [];
+  const subClass = mappingNodeData.entityMappedProperty?.subType
+    ? _subclasses.find(
+        (c) => c.path === mappingNodeData.entityMappedProperty?.subType,
+      )
+    : 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
@@ -461,6 +504,9 @@ export const getQueryBuilderPropertyNodeData = (
     parentNode.id,
     isPartOfDerivedPropertyBranch,
     mappingNodeData,
+    // Inorder to cast the properties to the right subType based on what mapping analysis
+    // returns we assign the type of the property node to the mapped subClass
+    subClass,
   );
   if (propertyNode.type instanceof Class) {
     propertyNode.childrenIds =

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