@finos/legend-query-builder 4.1.2 → 4.1.4

package/src/stores/QueryBuilderTextEditorState.ts

@@ -129,7 +129,9 @@ export class QueryBuilderTextEditorState extends LambdaEditorState {
     }
   }
 
-  *convertLambdaObjectToGrammarString(pretty: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options: {
+    pretty?: boolean | undefined;
+  }): GeneratorFn<void> {
     if (this.rawLambdaState.lambda.body) {
       this.isConvertingLambdaToString = true;
       try {
@@ -144,7 +146,7 @@ export class QueryBuilderTextEditorState extends LambdaEditorState {
         const isolatedLambdas =
           (yield this.queryBuilderState.graphManagerState.graphManager.lambdasToPureCode(
             lambdas,
-            pretty,
+            options.pretty,
           )) as Map<string, string>;
         const grammarText = isolatedLambdas.get(this.lambdaId);
         this.setLambdaString(

package/src/stores/QueryLoaderState.ts

@@ -24,12 +24,14 @@ import {
   type QueryInfo,
   type BasicGraphManagerState,
   type Query,
+  GRAPH_MANAGER_EVENT,
 } from '@finos/legend-graph';
 import {
   ActionState,
   type GeneratorFn,
   assertErrorThrown,
   guaranteeNonNullable,
+  LogEvent,
 } from '@finos/legend-shared';
 import { makeObservable, observable, action, flow } from 'mobx';
 import type { QueryBuilderState } from './QueryBuilderState.js';
@@ -62,6 +64,7 @@ export class QueryLoaderState {
   readonly isReadOnly?: boolean | undefined;
   readonly onQueryRenamed?: ((query: LightQuery) => void) | undefined;
   readonly onQueryDeleted?: ((query: LightQuery) => void) | undefined;
+  readonly handleFetchDefaultQueriesFailure?: (() => void) | undefined;
 
   queryBuilderState?: QueryBuilderState | undefined;
 
@@ -93,6 +96,7 @@ export class QueryLoaderState {
       isReadOnly?: boolean | undefined;
       onQueryRenamed?: ((query: LightQuery) => void) | undefined;
       onQueryDeleted?: ((query: LightQuery) => void) | undefined;
+      handleFetchDefaultQueriesFailure?: (() => void) | undefined;
     },
   ) {
     makeObservable(this, {
@@ -126,6 +130,8 @@ export class QueryLoaderState {
     this.isReadOnly = options.isReadOnly;
     this.onQueryRenamed = options.onQueryRenamed;
     this.onQueryDeleted = options.onQueryDeleted;
+    this.handleFetchDefaultQueriesFailure =
+      options.handleFetchDefaultQueriesFailure;
   }
 
   setSearchText(val: string): void {
@@ -190,7 +196,11 @@ export class QueryLoaderState {
         } catch (error) {
           this.searchQueriesState.fail();
           assertErrorThrown(error);
-          this.applicationStore.notificationService.notifyError(error);
+          this.applicationStore.logService.error(
+            LogEvent.create(GRAPH_MANAGER_EVENT.GET_QUERY_FAILURE),
+            error,
+          );
+          this.handleFetchDefaultQueriesFailure?.();
         }
       }
 

package/src/stores/execution-plan/ExecutionPlanState.ts

@@ -14,15 +14,20 @@
  * limitations under the License.
  */
 
-import { observable, action, makeObservable } from 'mobx';
+import { observable, action, makeObservable, computed } from 'mobx';
 import {
   type RawExecutionPlan,
   type GraphManagerState,
   ExecutionPlan,
   ExecutionNode,
 } from '@finos/legend-graph';
-import type { TreeNodeData } from '@finos/legend-art';
+import type { TreeNodeData, TreeData } from '@finos/legend-art';
 import type { GenericLegendApplicationStore } from '@finos/legend-application';
+import {
+  addUniqueEntry,
+  filterByType,
+  guaranteeNonNullable,
+} from '@finos/legend-shared';
 
 export class ExecutionPlanViewTreeNodeData implements TreeNodeData {
   id: string;
@@ -33,10 +38,22 @@ export class ExecutionPlanViewTreeNodeData implements TreeNodeData {
   executionPlan!: ExecutionPlan;
 
   constructor(id: string, label: string, executionPlan: ExecutionPlan) {
+    makeObservable(this, {
+      isSelected: observable,
+      isOpen: observable,
+      setIsSelected: action,
+      setIsOpen: action,
+    });
     this.id = id;
     this.label = label;
     this.executionPlan = executionPlan;
   }
+  setIsSelected(val: boolean): void {
+    this.isSelected = val;
+  }
+  setIsOpen(val: boolean): void {
+    this.isOpen = val;
+  }
 }
 
 export class ExecutionNodeTreeNodeData implements TreeNodeData {
@@ -48,12 +65,85 @@ export class ExecutionNodeTreeNodeData implements TreeNodeData {
   executionNode: ExecutionNode;
 
   constructor(id: string, label: string, executionNode: ExecutionNode) {
+    makeObservable(this, {
+      isSelected: observable,
+      isOpen: observable,
+      setIsSelected: action,
+      setIsOpen: action,
+    });
     this.id = id;
     this.label = label;
     this.executionNode = executionNode;
   }
+
+  setIsSelected(val: boolean): void {
+    this.isSelected = val;
+  }
+  setIsOpen(val: boolean): void {
+    this.isOpen = val;
+  }
 }
 
+export const generateExecutionNodeTreeNodeData = (
+  executionNode: ExecutionNode,
+  label: string,
+  parentNode:
+    | ExecutionNodeTreeNodeData
+    | ExecutionPlanViewTreeNodeData
+    | undefined,
+): ExecutionNodeTreeNodeData => {
+  const executionNodeTreeNode = new ExecutionNodeTreeNodeData(
+    executionNode._UUID,
+    label,
+    executionNode,
+  );
+
+  const childrenIds: string[] = [];
+
+  executionNode.executionNodes
+    .slice()
+    .filter(filterByType(ExecutionNode))
+    .forEach((childExecutionNode) => {
+      addUniqueEntry(childrenIds, childExecutionNode._UUID);
+    });
+
+  executionNodeTreeNode.childrenIds = childrenIds;
+
+  return executionNodeTreeNode;
+};
+
+export const generateExecutionPlanTreeNodeData = (
+  executionPlan: ExecutionPlan,
+): ExecutionPlanViewTreeNodeData => {
+  const executionPlanNode = new ExecutionPlanViewTreeNodeData(
+    `Execution Plan`,
+    `Execution Plan`,
+    executionPlan,
+  );
+
+  const childrenIds: string[] = [];
+
+  const rootNodeId = executionPlan.rootExecutionNode._UUID;
+  addUniqueEntry(childrenIds, rootNodeId);
+  executionPlanNode.childrenIds = childrenIds;
+  return executionPlanNode;
+};
+
+export const getExecutionPlanTreeData = (
+  executionPlan: ExecutionPlan,
+): TreeData<ExecutionPlanViewTreeNodeData | ExecutionNodeTreeNodeData> => {
+  const rootIds: string[] = [];
+  const nodes = new Map<
+    string,
+    ExecutionPlanViewTreeNodeData | ExecutionNodeTreeNodeData
+  >();
+  const executionPlanTreeNode =
+    generateExecutionPlanTreeNodeData(executionPlan);
+  addUniqueEntry(rootIds, executionPlanTreeNode.id);
+  nodes.set(executionPlanTreeNode.id, executionPlanTreeNode);
+  return { rootIds, nodes };
+};
+
 export enum EXECUTION_PLAN_VIEW_MODE {
   FORM = 'Form',
   JSON = 'JSON',
@@ -69,6 +159,9 @@ export class ExecutionPlanState {
     | ExecutionPlanViewTreeNodeData
     | undefined = undefined;
   viewMode: EXECUTION_PLAN_VIEW_MODE = EXECUTION_PLAN_VIEW_MODE.FORM;
+  treeData?:
+    | TreeData<ExecutionPlanViewTreeNodeData | ExecutionNodeTreeNodeData>
+    | undefined;
   rawPlan?: RawExecutionPlan | undefined;
   plan?: ExecutionPlan | undefined;
   debugText?: string | undefined;
@@ -84,6 +177,7 @@ export class ExecutionPlanState {
       rawPlan: observable,
       plan: observable,
       debugText: observable,
+      treeData: observable,
       setExecutionPlanDisplayData: action,
       setExecutionPlanDisplayDataJson: action,
       transformMetadataToProtocolJson: action,
@@ -92,6 +186,11 @@ export class ExecutionPlanState {
       setPlan: action,
       setViewMode: action,
       setDebugText: action,
+      setTreeNode: action,
+      setTreeData: action,
+      refreshTreeData: action,
+      nonNullableTreeData: computed,
+      initialize: action,
     });
     this.applicationStore = applicationStore;
     this.graphManagerState = graphManagerState;
@@ -101,6 +200,36 @@ export class ExecutionPlanState {
     this.viewMode = val;
   }
 
+  setTreeNode(
+    id: string,
+    node: ExecutionPlanViewTreeNodeData | ExecutionNodeTreeNodeData,
+  ): void {
+    this.treeData?.nodes.set(id, node);
+  }
+
+  setTreeData(
+    val:
+      | TreeData<ExecutionPlanViewTreeNodeData | ExecutionNodeTreeNodeData>
+      | undefined,
+  ): void {
+    this.treeData = val;
+  }
+
+  refreshTreeData(): void {
+    if (this.treeData) {
+      this.setTreeData({ ...this.treeData });
+    }
+  }
+
+  get nonNullableTreeData(): TreeData<
+    ExecutionPlanViewTreeNodeData | ExecutionNodeTreeNodeData
+  > {
+    return guaranteeNonNullable(
+      this.treeData,
+      'Execution plan viewer tree data has not been initialized',
+    );
+  }
+
   setRawPlan = (val: RawExecutionPlan | undefined): void => {
     this.rawPlan = val;
   };
@@ -109,6 +238,15 @@ export class ExecutionPlanState {
     this.plan = val;
   };
 
+  initialize = (val: ExecutionPlan | undefined): void => {
+    this.setPlan(val);
+    if (val !== undefined) {
+      this.setTreeData(getExecutionPlanTreeData(val));
+    } else {
+      this.setTreeData(undefined);
+    }
+  };
+
   setDebugText(val: string | undefined): void {
     this.debugText = val;
   }
@@ -117,10 +255,10 @@ export class ExecutionPlanState {
     node: ExecutionNodeTreeNodeData | ExecutionPlanViewTreeNodeData | undefined,
   ): void {
     if (this.selectedNode) {
-      this.selectedNode.isSelected = false;
+      this.selectedNode.setIsSelected(false);
     }
     if (node) {
-      node.isSelected = true;
+      node.setIsSelected(true);
     }
     this.selectedNode = node;
   }

package/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts

@@ -465,7 +465,9 @@ export class QueryBuilderTDSState
     // convert to grammar for display
     flowResult(
       derivationColumnState.derivationLambdaEditorState.convertLambdaObjectToGrammarString(
-        false,
+        {
+          pretty: false,
+        },
       ),
     ).catch(this.queryBuilderState.applicationStore.alertUnhandledError);
   }

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts

@@ -226,7 +226,10 @@ class QueryBuilderDerivationProjectionLambdaState extends LambdaEditorState {
     }
   }
 
-  *convertLambdaObjectToGrammarString(pretty: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+    preserveCompilationError?: boolean | undefined;
+  }): GeneratorFn<void> {
     if (this.derivationProjectionColumnState.lambda.body) {
       try {
         const lambdas = new Map<string, RawLambda>();
@@ -240,7 +243,7 @@ class QueryBuilderDerivationProjectionLambdaState extends LambdaEditorState {
         const isolatedLambdas =
           (yield this.queryBuilderState.graphManagerState.graphManager.lambdasToPureCode(
             lambdas,
-            pretty,
+            options?.pretty,
           )) as Map<string, string>;
         const grammarText = isolatedLambdas.get(this.lambdaId);
         this.setLambdaString(
@@ -248,7 +251,9 @@ class QueryBuilderDerivationProjectionLambdaState extends LambdaEditorState {
             ? this.extractLambdaString(grammarText)
             : '',
         );
-        this.clearErrors();
+        this.clearErrors({
+          preserveCompilationError: options?.preserveCompilationError,
+        });
       } catch (error) {
         assertErrorThrown(error);
         this.queryBuilderState.applicationStore.logService.error(

package/src/stores/shared/LambdaEditorState.ts

@@ -64,9 +64,15 @@ export abstract class LambdaEditorState {
     this.lambdaString = val;
   }
 
-  clearErrors(): void {
-    this.setCompilationError(undefined);
+  clearErrors(options?: {
+    preserveCompilationError?: boolean | undefined;
+  }): void {
     this.setParserError(undefined);
+    if (options?.preserveCompilationError && this.compilationError) {
+      this.compilationError.sourceInformation = undefined;
+    } else {
+      this.setCompilationError(undefined);
+    }
   }
 
   setCompilationError(compilationError: CompilationError | undefined): void {
@@ -113,7 +119,8 @@ export abstract class LambdaEditorState {
   }
 
   abstract convertLambdaGrammarStringToObject(): GeneratorFn<void>;
-  abstract convertLambdaObjectToGrammarString(
-    pretty: boolean,
-  ): GeneratorFn<void>;
+  abstract convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+    preserveCompilationError?: boolean | undefined;
+  }): GeneratorFn<void>;
 }

package/tsconfig.json

@@ -222,8 +222,16 @@
     "./src/components/ServiceQuerySetupUtils.tsx",
     "./src/components/__test-utils__/QueryBuilderComponentTestUtils.tsx",
     "./src/components/data-access/DataAccessOverview.tsx",
+    "./src/components/execution-plan/AllocationExecutionNodeViewer.tsx",
+    "./src/components/execution-plan/ConstantExecutionNodeViewer.tsx",
+    "./src/components/execution-plan/DataTypeResultTypeViewer.tsx",
     "./src/components/execution-plan/ExecutionPlanViewer.tsx",
+    "./src/components/execution-plan/FunctionParametersValidationNodeViewer.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/TDSResultTypeViewer.tsx",
     "./src/components/explorer/QueryBuilderExplorerPanel.tsx",
     "./src/components/explorer/QueryBuilderFunctionsExplorerPanel.tsx",
     "./src/components/explorer/QueryBuilderMilestoningEditor.tsx",