@finos/legend-query-builder 4.4.0 → 4.5.1

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

@@ -20,13 +20,14 @@ import {
   deleteEntry,
   hashArray,
   type Hashable,
+  UnsupportedOperationError,
 } from '@finos/legend-shared';
 import type { TreeNodeData, TreeData } from '@finos/legend-art';
 import {
   type AbstractProperty,
   type GraphFetchTree,
   type Type,
-  type RootGraphFetchTree,
+  RootGraphFetchTree,
   PropertyExplicitReference,
   Class,
   PropertyGraphFetchTree,
@@ -51,7 +52,7 @@ export class QueryBuilderGraphFetchTreeNodeData
 {
   readonly id: string;
   readonly label: string;
-  readonly tree: PropertyGraphFetchTree;
+  readonly tree: PropertyGraphFetchTree | RootGraphFetchTree;
   readonly parentId?: string | undefined;
   isSelected?: boolean | undefined;
   isOpen?: boolean | undefined;
@@ -61,7 +62,7 @@ export class QueryBuilderGraphFetchTreeNodeData
     id: string,
     label: string,
     parentId: string | undefined,
-    graphFetchTreeNode: PropertyGraphFetchTree,
+    graphFetchTreeNode: PropertyGraphFetchTree | RootGraphFetchTree,
   ) {
     makeObservable(this, {
       hashCode: computed,
@@ -76,7 +77,16 @@ export class QueryBuilderGraphFetchTreeNodeData
   }
 
   get type(): Type {
-    return this.tree.property.value.genericType.value.rawType;
+    if (this.tree instanceof PropertyGraphFetchTree) {
+      return this.tree.property.value.genericType.value.rawType;
+    }
+    if (this.tree instanceof RootGraphFetchTree) {
+      return this.tree.class.value;
+    }
+    throw new UnsupportedOperationError(
+      `Can't get type of Graph Fetch Tree`,
+      this.tree,
+    );
   }
 
   get hashCode(): string {
@@ -105,6 +115,14 @@ export const generateGraphFetchTreeNodeID = (
     subType ? `${TYPE_CAST_TOKEN}${subType.path}` : ''
   }`;
 
+export const generateRootGraphFetchTreeNodeID = (
+  parentNodeId: string | undefined,
+  classValue: string | undefined,
+): string =>
+  `${parentNodeId ? `${parentNodeId}.` : ''}${
+    classValue ? `${TYPE_CAST_TOKEN}${classValue}` : ''
+  }`;
+
 const buildGraphFetchSubTree = (
   tree: GraphFetchTree,
   parentNode: QueryBuilderGraphFetchTreeNodeData | undefined,
@@ -132,19 +150,65 @@ const buildGraphFetchSubTree = (
   return node;
 };
 
+const buildRootGraphFetchSubTree = (
+  tree: RootGraphFetchTree,
+  parentNode: QueryBuilderGraphFetchTreeNodeData | undefined,
+  nodes: Map<string, QueryBuilderGraphFetchTreeNodeData>,
+): QueryBuilderGraphFetchTreeNodeData => {
+  const parentNodeId = parentNode?.id;
+  const node = new QueryBuilderGraphFetchTreeNodeData(
+    generateRootGraphFetchTreeNodeID(
+      parentNodeId,
+      tree.class.valueForSerialization ?? '',
+    ),
+    tree.class.value.name,
+    parentNodeId,
+    tree,
+  );
+  tree.subTrees.forEach((subTree) => {
+    const subTreeNode = buildGraphFetchSubTree(subTree, node, nodes);
+    addUniqueEntry(node.childrenIds, subTreeNode.id);
+    nodes.set(subTreeNode.id, subTreeNode);
+  });
+  return node;
+};
+
 /**
  * Build graph fetch tree data from an existing graph fetch tree root
  */
 export const buildGraphFetchTreeData = (
   tree: RootGraphFetchTree,
+  displayRoot: boolean = false,
 ): QueryBuilderGraphFetchTreeData => {
   const rootIds: string[] = [];
   const nodes = new Map<string, QueryBuilderGraphFetchTreeNodeData>();
-  tree.subTrees.forEach((subTree) => {
-    const subTreeNode = buildGraphFetchSubTree(subTree, undefined, nodes);
-    addUniqueEntry(rootIds, subTreeNode.id);
-    nodes.set(subTreeNode.id, subTreeNode);
-  });
+  if (displayRoot) {
+    const rootNode = buildRootGraphFetchSubTree(tree, undefined, nodes);
+    addUniqueEntry(rootIds, rootNode.id);
+    nodes.set(rootNode.id, rootNode);
+  } else {
+    tree.subTrees.forEach((subTree) => {
+      const subTreeNode = buildGraphFetchSubTree(subTree, undefined, nodes);
+      addUniqueEntry(rootIds, subTreeNode.id);
+      nodes.set(subTreeNode.id, subTreeNode);
+    });
+  }
+
+  return { rootIds, nodes, tree };
+};
+
+export const buildPropertyGraphFetchTreeData = (
+  propertyTree: PropertyGraphFetchTree,
+): QueryBuilderGraphFetchTreeData => {
+  const rootIds: string[] = [];
+  const nodes = new Map<string, QueryBuilderGraphFetchTreeNodeData>();
+  const propertyNode = buildGraphFetchSubTree(propertyTree, undefined, nodes);
+  addUniqueEntry(rootIds, propertyNode.id);
+  nodes.set(propertyNode.id, propertyNode);
+  const tree = new RootGraphFetchTree(
+    PackageableElementExplicitReference.create(new Class('root')),
+  );
+  tree.subTrees.push(propertyTree);
   return { rootIds, nodes, tree };
 };
 

package/src/stores/filter/QueryBuilderFilterState.ts

@@ -343,16 +343,21 @@ export class QueryBuilderFilterTreeExistsNodeData
   extends QueryBuilderFilterTreeOperationNodeData
   implements Hashable
 {
-  propertyExpression!: AbstractPropertyExpression;
+  readonly filterState: QueryBuilderFilterState;
+  propertyExpressionState!: QueryBuilderPropertyExpressionState;
 
-  constructor(parentId: string | undefined) {
+  constructor(
+    filterState: QueryBuilderFilterState,
+    parentId: string | undefined,
+  ) {
     super(parentId);
 
     makeObservable(this, {
-      propertyExpression: observable,
+      propertyExpressionState: observable,
       setPropertyExpression: action,
     });
 
+    this.filterState = filterState;
     this.isOpen = true;
   }
 
@@ -361,7 +366,10 @@ export class QueryBuilderFilterTreeExistsNodeData
   }
 
   setPropertyExpression(val: AbstractPropertyExpression): void {
-    this.propertyExpression = val;
+    this.propertyExpressionState = new QueryBuilderPropertyExpressionState(
+      this.filterState.queryBuilderState,
+      val,
+    );
   }
 
   get hashCode(): string {
@@ -369,7 +377,7 @@ export class QueryBuilderFilterTreeExistsNodeData
       QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_TREE_EXISTS_NODE_DATA,
       this.parentId ?? '',
       hashArray(this.childrenIds),
-      this.propertyExpression,
+      this.propertyExpressionState.propertyExpression,
       this.lambdaParameterName ?? '',
     ]);
   }

package/src/stores/filter/QueryBuilderFilterStateBuilder.ts

@@ -120,6 +120,7 @@ const processFilterTree = (
       propertyExpression.func.value.multiplicity.upperBound > 1
     ) {
       const existsNode = new QueryBuilderFilterTreeExistsNodeData(
+        filterState,
         parentFilterNodeId,
       );
       const lambdaFunctionInstance = guaranteeType(

package/src/stores/filter/QueryBuilderFilterValueSpecificationBuilder.ts

@@ -37,6 +37,7 @@ import {
 } from './QueryBuilderFilterState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graph/QueryBuilderMetaModelConst.js';
 import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../QueryBuilderConfig.js';
+import { buildPropertyExpressionChain } from '../QueryBuilderValueSpecificationBuilderHelper.js';
 
 const buildFilterConditionExpression = (
   filterState: QueryBuilderFilterState,
@@ -110,7 +111,19 @@ const buildFilterConditionExpression = (
           )
         : undefined;
     }
-    const propertyExpression = guaranteeNonNullable(node.propertyExpression);
+    const lambdaParameterName = node.parentId
+      ? guaranteeType(
+          filterState.nodes.get(guaranteeNonNullable(node.parentId)),
+          QueryBuilderFilterTreeOperationNodeData,
+        ).lambdaParameterName
+      : undefined;
+    const propertyExpression = guaranteeNonNullable(
+      buildPropertyExpressionChain(
+        node.propertyExpressionState.propertyExpression,
+        node.propertyExpressionState.queryBuilderState,
+        lambdaParameterName ?? filterState.lambdaParameterName,
+      ),
+    );
     const clauses = node.childrenIds
       .map((e) => filterState.nodes.get(e))
       .filter(isNonNullable)

package/tsconfig.json

@@ -232,11 +232,18 @@
     "./src/components/execution-plan/DataTypeResultTypeViewer.tsx",
     "./src/components/execution-plan/ExecutionPlanViewer.tsx",
     "./src/components/execution-plan/FunctionParametersValidationNodeViewer.tsx",
+    "./src/components/execution-plan/ImplementationViewer.tsx",
+    "./src/components/execution-plan/PartialClassResultViewer.tsx",
+    "./src/components/execution-plan/RelationalClassQueryTempTableGraphFetchExecutionNodeViewer.tsx",
+    "./src/components/execution-plan/RelationalCrossRootQueryTempTableGraphFetchExecutionNodeViewer.tsx",
+    "./src/components/execution-plan/RelationalRootQueryTempTableGraphFetchExecutionNodeViewer.tsx",
     "./src/components/execution-plan/RelationalTDSInstantiationExecutionNodeViewer.tsx",
     "./src/components/execution-plan/ResultTypeViewer.tsx",
     "./src/components/execution-plan/SQLExecutionNodeViewer.tsx",
     "./src/components/execution-plan/SequenceExecutionNodeViewer.tsx",
+    "./src/components/execution-plan/StoreMappingGlobalGraphFetchExecutionNodeViewer.tsx",
     "./src/components/execution-plan/TDSResultTypeViewer.tsx",
+    "./src/components/execution-plan/TempTableStrategyViewer.tsx",
     "./src/components/explorer/QueryBuilderExplorerPanel.tsx",
     "./src/components/explorer/QueryBuilderFunctionsExplorerPanel.tsx",
     "./src/components/explorer/QueryBuilderMilestoningEditor.tsx",