@finos/legend-application-query 5.2.5 → 5.2.6

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

@@ -25,6 +25,7 @@ import {
   Class,
   PropertyGraphFetchTree,
   PackageableElementExplicitReference,
+  TYPE_CAST_TOKEN,
 } from '@finos/legend-graph';
 import {
   type QueryBuilderExplorerTreeNodeData,
@@ -72,11 +73,16 @@ export interface QueryBuilderGraphFetchTreeData
 
 const generateNodeId = (
   property: AbstractProperty,
-  subType: Type | undefined,
+  parentNodeId: string | undefined,
+): string => `${parentNodeId ? `${parentNodeId}.` : ''}${property.name}`;
+
+const generateNodeIdForSubType = (
+  property: AbstractProperty,
+  subType: Type,
   parentNodeId: string | undefined,
 ): string =>
-  `${parentNodeId ? `${parentNodeId}.` : ''}${property.name}${
-    subType ? subType.path : ''
+  `${parentNodeId ? `${parentNodeId}.` : ''}${property.name}${TYPE_CAST_TOKEN}${
+    subType.path
   }`;
 
 const buildGraphFetchSubTree = (
@@ -93,7 +99,9 @@ const buildGraphFetchSubTree = (
   const subType = tree.subType?.value;
   const parentNodeId = parentNode?.id;
   const node = new QueryBuilderGraphFetchTreeNodeData(
-    generateNodeId(property, subType, parentNodeId),
+    subType
+      ? generateNodeIdForSubType(property, subType, parentNodeId)
+      : generateNodeId(property, parentNodeId),
     property.name,
     parentNodeId,
     tree,
@@ -248,11 +256,13 @@ export const addQueryBuilderPropertyNode = (
   let parentNode: QueryBuilderGraphFetchTreeNodeData | undefined = undefined;
   let newSubTree: PropertyGraphFetchTree | undefined;
   for (const propertyGraphFetchTree of propertyGraphFetchTrees) {
-    currentNodeId = generateNodeId(
-      propertyGraphFetchTree.property.value,
-      propertyGraphFetchTree.subType?.value,
-      currentNodeId,
-    );
+    currentNodeId = propertyGraphFetchTree.subType?.value
+      ? generateNodeIdForSubType(
+          propertyGraphFetchTree.property.value,
+          propertyGraphFetchTree.subType.value,
+          currentNodeId,
+        )
+      : generateNodeId(propertyGraphFetchTree.property.value, currentNodeId);
     const existingGraphFetchNode = treeData.nodes.get(currentNodeId);
     if (existingGraphFetchNode) {
       parentNode = existingGraphFetchNode;

package/src/stores/fetch-structure/projection/QueryBuilderProjectionState.ts

@@ -42,10 +42,15 @@ import {
   LAMBDA_PIPE,
   RawLambda,
   isStubbed_RawLambda,
+  AbstractPropertyExpression,
+  matchFunctionName,
+  SimpleFunctionExpression,
+  type ValueSpecification,
 } from '@finos/legend-graph';
 import {
   DEFAULT_LAMBDA_VARIABLE_NAME,
   QUERY_BUILDER_SOURCE_ID_LABEL,
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
 } from '../../../QueryBuilder_Const.js';
 import { QueryBuilderAggregationState } from './aggregation/QueryBuilderAggregationState.js';
 import { buildGenericLambdaFunctionInstanceValue } from '../../QueryBuilderValueSpecificationHelper.js';
@@ -58,10 +63,14 @@ import type { QueryBuilderAggregateOperator } from './aggregation/QueryBuilderAg
 import { getQueryBuilderCoreAggregrationOperators } from './aggregation/QueryBuilderAggregateOperatorLoader.js';
 import {
   QueryBuilderDerivationProjectionColumnState,
+  QueryBuilderSimpleProjectionColumnState,
   type QueryBuilderProjectionColumnState,
-  type QueryBuilderSimpleProjectionColumnState,
 } from './QueryBuilderProjectionColumnState.js';
 import type { QueryBuilderFetchStructureState } from '../QueryBuilderFetchStructureState.js';
+import {
+  getPropertyNodeId,
+  getPropertyNodeIdForSubType,
+} from '../../explorer/QueryBuilderExplorerState.js';
 
 export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImplementationState {
   columns: QueryBuilderProjectionColumnState[] = [];
@@ -387,4 +396,69 @@ export class QueryBuilderProjectionState extends QueryBuilderFetchStructureImple
       ),
     );
   }
+
+  get usedPropertyNodeIds(): string[] {
+    let usedNodeIds: string[] = [];
+    this.columns.forEach((column) => {
+      if (column instanceof QueryBuilderSimpleProjectionColumnState) {
+        let nodeIds: string[] = [];
+        const subClassNames = [];
+        let currentPropertyExpression: ValueSpecification =
+          column.propertyExpressionState.propertyExpression;
+        while (
+          currentPropertyExpression instanceof AbstractPropertyExpression
+        ) {
+          nodeIds.push(currentPropertyExpression.func.name);
+          currentPropertyExpression = guaranteeNonNullable(
+            currentPropertyExpression.parametersValues[0],
+          );
+          if (
+            currentPropertyExpression instanceof SimpleFunctionExpression &&
+            matchFunctionName(
+              currentPropertyExpression.functionName,
+              QUERY_BUILDER_SUPPORTED_FUNCTIONS.SUBTYPE,
+            ) &&
+            currentPropertyExpression.parametersValues.length >= 1 &&
+            currentPropertyExpression.parametersValues[1]?.genericType?.value
+              .rawType.path
+          ) {
+            nodeIds.push(
+              currentPropertyExpression.parametersValues[1]?.genericType?.value
+                .rawType.path,
+            );
+            subClassNames.push(
+              currentPropertyExpression.parametersValues[1]?.genericType?.value
+                .rawType.path,
+            );
+            currentPropertyExpression = guaranteeNonNullable(
+              currentPropertyExpression.parametersValues[0],
+            );
+          }
+        }
+        nodeIds = nodeIds.reverse();
+        if (
+          nodeIds.length &&
+          subClassNames.includes(guaranteeNonNullable(nodeIds[0]))
+        ) {
+          nodeIds[0] = getPropertyNodeIdForSubType(
+            '',
+            guaranteeNonNullable(nodeIds[0]),
+          );
+        }
+        for (let i = 1; i < nodeIds.length; i++) {
+          nodeIds[i] = subClassNames.includes(guaranteeNonNullable(nodeIds[i]))
+            ? getPropertyNodeIdForSubType(
+                guaranteeNonNullable(nodeIds[i - 1]),
+                guaranteeNonNullable(nodeIds[i]),
+              )
+            : getPropertyNodeId(
+                guaranteeNonNullable(nodeIds[i - 1]),
+                guaranteeNonNullable(nodeIds[i]),
+              );
+        }
+        usedNodeIds = usedNodeIds.concat(nodeIds);
+      }
+    });
+    return usedNodeIds;
+  }
 }