@finos/legend-query-builder 4.14.72 → 4.14.74

package/src/components/result/QueryBuilderResultPanel.tsx

@@ -55,6 +55,7 @@ import {
   extractExecutionResultValues,
   TDSExecutionResult,
   RawExecutionResult,
+  ExecutionError,
 } from '@finos/legend-graph';
 import {
   ActionAlertActionType,
@@ -80,8 +81,13 @@ import { getExecutedSqlFromExecutionResult } from './tds/QueryBuilderTDSResultSh
 import { QueryBuilderTDSGridResult } from './tds/QueryBuilderTDSGridResult.js';
 import type { QueryBuilder_LegendApplicationPlugin_Extension } from '../../stores/QueryBuilder_LegendApplicationPlugin_Extension.js';
 import type { QueryBuilderResultState } from '../../stores/QueryBuilderResultState.js';
+import { QueryBuilderBaseInfoTooltip } from '../shared/QueryBuilderPropertyInfoTooltip.js';
 
-const PERMISSION_ERRORS = ['permission denied', 'invalid user id or password'];
+const PERMISSION_ERRORS = [
+  'permission denied',
+  'invalid user id or password',
+  'Incorrect username or password',
+];
 
 export const QueryBuilderExecutionErrorPanel = observer(
   (props: {
@@ -90,24 +96,38 @@ export const QueryBuilderExecutionErrorPanel = observer(
   }) => {
     const { resultState, executionError } = props;
     const queryBuilderState = resultState.queryBuilderState;
-    const errorMessage = executionError
-      ? queryBuilderState.applicationStore.notificationService.getErrorMessage(
-          executionError,
-        )
-      : '';
-    const isPermissionDeniedError = () =>
-      Boolean(
-        PERMISSION_ERRORS.find((e) => errorMessage?.toLowerCase().includes(e)),
-      );
+    const errorMessage =
+      executionError instanceof Error ? executionError.message : executionError;
+    const errorStackTrace =
+      executionError instanceof ExecutionError ? executionError.stack : '';
+    const isPermissionDeniedError = Boolean(
+      PERMISSION_ERRORS.find((e) =>
+        queryBuilderState.applicationStore.notificationService
+          .getErrorMessage(executionError)
+          ?.toLowerCase()
+          .includes(e),
+      ),
+    );
     const openCheckEntitlmentsEditor = (): void => {
       queryBuilderState.checkEntitlementsState.setShowCheckEntitlementsViewer(
         true,
       );
     };
+    const frequentlyAskedQuestionEntry =
+      queryBuilderState.applicationStore.documentationService.getDocEntry(
+        QUERY_BUILDER_DOCUMENTATION_KEY.FREQUENTLY_ASKED_QUESTIONS,
+      );
+    const openFrequentlyAskedQuestions = (): void => {
+      if (frequentlyAskedQuestionEntry?.url) {
+        queryBuilderState.applicationStore.navigationService.navigator.visitAddress(
+          frequentlyAskedQuestionEntry.url,
+        );
+      }
+    };
 
     return (
       <>
-        {isPermissionDeniedError() && (
+        {isPermissionDeniedError && (
           <div className="query-builder__result__permission-error">
             <div className="query-builder__result__permission-error__header">
               Entitlement / Authorization error - Please
@@ -128,14 +148,54 @@ export const QueryBuilderExecutionErrorPanel = observer(
             </button>
           </div>
         )}
-        <div className="query-builder__result__execution-error">
+        <div
+          className={clsx('query-builder__result__execution-error', {
+            'query-builder__result__execution-error--max':
+              !isPermissionDeniedError,
+          })}
+        >
           <div className="query-builder__result__execution-error__header">
             <span style={{ fontWeight: 'bold' }}>Error Execution Query</span>.
-            Please try again later or review options in application`s
-            <span style={{ fontWeight: 'bold' }}> Help</span> menu.
+            Please try again later or review options in application`s{' '}
+            <span
+              style={{ fontWeight: 'bold' }}
+              onClick={openFrequentlyAskedQuestions}
+            >
+              Help
+            </span>{' '}
+            menu.
           </div>
           <div className="query-builder__result__execution-error__body">
-            {errorMessage}
+            <div className="query-builder__result__execution-error__body__entry">
+              {errorMessage}
+            </div>
+            {resultState.executionTraceId && queryBuilderState.config && (
+              <div className="query-builder__result__execution-error__body__entry">
+                <span style={{ fontWeight: 'bold' }}> ### trace: </span>
+                {resultState.executionTraceId} |{' '}
+                <button
+                  className="query-builder__result__execution-error__body__entry__btn"
+                  disabled={!queryBuilderState.config.zipkinTraceBaseURL}
+                  onClick={() => {
+                    if (queryBuilderState.config?.zipkinTraceBaseURL) {
+                      queryBuilderState.applicationStore.navigationService.navigator.visitAddress(
+                        queryBuilderState.config.zipkinTraceBaseURL +
+                          resultState.executionTraceId,
+                      );
+                    }
+                  }}
+                >
+                  {queryBuilderState.config.zipkinTraceBaseURL +
+                    resultState.executionTraceId}{' '}
+                </button>
+              </div>
+            )}
+            {errorStackTrace && (
+              <div className="query-builder__result__execution-error__body__entry">
+                <span style={{ fontWeight: 'bold' }}>### stack trace: </span>
+                {errorStackTrace}
+              </div>
+            )}
           </div>
         </div>
       </>
@@ -180,7 +240,6 @@ export const QueryBuilderEmptyExecutionResultPanel = observer(
     );
   },
 );
-import { QueryBuilderBaseInfoTooltip } from '../shared/QueryBuilderPropertyInfoTooltip.js';
 
 export const QueryBuilderResultValues = observer(
   (props: {

package/src/stores/QueryBuilderConfig.ts

@@ -25,12 +25,13 @@ export const DEFAULT_VARIABLE_NAME = 'var';
 export const DEFAULT_CONSTANT_VARIABLE_NAME = 'c_var';
 export const DEFAULT_POST_FILTER_LAMBDA_VARIABLE_NAME = 'row';
 
-export const QUERY_BUILDER_PROPERTY_SEARCH_MAX_DEPTH = 5;
+export const QUERY_BUILDER_PROPERTY_SEARCH_MAX_DEPTH = 10;
 export const QUERY_BUILDER_PROPERTY_SEARCH_MAX_NODES = 10000;
 export const QUERY_BUILDER_PROPERTY_SEARCH_RESULTS_LIMIT = 100;
 
 export enum QUERY_BUILDER_PROPERTY_SEARCH_TYPE {
   CLASS = 'CLASS',
+  ENUMERATION = 'ENUMERATION',
   STRING = 'STRING',
   BOOLEAN = 'BOOLEAN',
   NUMBER = 'NUMBER',

package/src/stores/QueryBuilderResultState.ts

@@ -38,6 +38,7 @@ import {
   reportGraphAnalytics,
   TDSExecutionResult,
   V1_ZIPKIN_TRACE_HEADER,
+  ExecutionError,
 } from '@finos/legend-graph';
 import { buildLambdaFunction } from './QueryBuilderValueSpecificationBuilder.js';
 import {
@@ -536,6 +537,9 @@ export class QueryBuilderResultState {
           error,
         );
         this.setExecutionError(error);
+        if (error instanceof ExecutionError && error.executionTraceId) {
+          this.setExecutionTraceId(error.executionTraceId);
+        }
       }
     } finally {
       this.setIsRunningQuery(false);

package/src/stores/explorer/QueryBuilderExplorerState.ts

@@ -31,6 +31,7 @@ import {
   type MappingModelCoverageAnalysisResult,
   type EnumMappedProperty,
   type MappedEntity,
+  type ExecutionResultWithMetadata,
   AbstractPropertyExpression,
   Class,
   VariableExpression,
@@ -55,7 +56,6 @@ import {
   Association,
   PRIMITIVE_TYPE,
   TDSExecutionResult,
-  type ExecutionResult,
   getAllSubclasses,
   PropertyExplicitReference,
   reportGraphAnalytics,
@@ -115,6 +115,7 @@ export abstract class QueryBuilderExplorerTreeNodeData implements TreeNodeData {
     isPartOfDerivedPropertyBranch: boolean,
     type: Type,
     mappingData: QueryBuilderExplorerTreeNodeMappingData,
+    childrenIds?: string[] | undefined,
   ) {
     makeObservable(this, {
       isHighlighting: observable,
@@ -131,6 +132,9 @@ export abstract class QueryBuilderExplorerTreeNodeData implements TreeNodeData {
     this.isPartOfDerivedPropertyBranch = isPartOfDerivedPropertyBranch;
     this.type = type;
     this.mappingData = mappingData;
+    if (childrenIds) {
+      this.childrenIds = childrenIds;
+    }
     this.elementRef = createRef();
   }
 
@@ -169,6 +173,7 @@ export class QueryBuilderExplorerTreePropertyNodeData extends QueryBuilderExplor
     isPartOfDerivedPropertyBranch: boolean,
     mappingData: QueryBuilderExplorerTreeNodeMappingData,
     type?: Type | undefined,
+    childrenIds?: string[],
   ) {
     super(
       id,
@@ -177,6 +182,7 @@ export class QueryBuilderExplorerTreePropertyNodeData extends QueryBuilderExplor
       isPartOfDerivedPropertyBranch,
       type ?? property.genericType.value.rawType,
       mappingData,
+      childrenIds,
     );
     this.property = property;
     this.parentId = parentId;
@@ -197,6 +203,7 @@ export class QueryBuilderExplorerTreeSubTypeNodeData extends QueryBuilderExplore
     isPartOfDerivedPropertyBranch: boolean,
     mappingData: QueryBuilderExplorerTreeNodeMappingData,
     multiplicity: Multiplicity,
+    childrenIds?: string[],
   ) {
     super(
       id,
@@ -205,6 +212,7 @@ export class QueryBuilderExplorerTreeSubTypeNodeData extends QueryBuilderExplore
       isPartOfDerivedPropertyBranch,
       subclass,
       mappingData,
+      childrenIds,
     );
     this.subclass = subclass;
     this.parentId = parentId;
@@ -652,6 +660,49 @@ const getQueryBuilderTreeData = (
   return { rootIds, nodes };
 };
 
+export const cloneQueryBuilderExplorerTreeNodeData = (
+  node: QueryBuilderExplorerTreeNodeData,
+): QueryBuilderExplorerTreeNodeData => {
+  if (node instanceof QueryBuilderExplorerTreeRootNodeData) {
+    return new QueryBuilderExplorerTreeRootNodeData(
+      node.id,
+      node.label,
+      node.dndText,
+      node.isPartOfDerivedPropertyBranch,
+      node.type,
+      node.mappingData,
+      node.childrenIds,
+    );
+  } else if (node instanceof QueryBuilderExplorerTreePropertyNodeData) {
+    return new QueryBuilderExplorerTreePropertyNodeData(
+      node.id,
+      node.label,
+      node.dndText,
+      node.property,
+      node.parentId,
+      node.isPartOfDerivedPropertyBranch,
+      node.mappingData,
+      node.type,
+      node.childrenIds,
+    );
+  } else if (node instanceof QueryBuilderExplorerTreeSubTypeNodeData) {
+    return new QueryBuilderExplorerTreeSubTypeNodeData(
+      node.id,
+      node.label,
+      node.dndText,
+      node.subclass,
+      node.parentId,
+      node.isPartOfDerivedPropertyBranch,
+      node.mappingData,
+      node.multiplicity,
+      node.childrenIds,
+    );
+  }
+  throw new UnsupportedOperationError(
+    `Unable to clone node of type ${node.constructor.name}`,
+  );
+};
+
 export class QueryBuilderExplorerPreviewDataState {
   isGeneratingPreviewData = false;
   propertyName = '(unknown)';
@@ -957,7 +1008,7 @@ export class QueryBuilderExplorerState {
         case PRIMITIVE_TYPE.INTEGER:
         case PRIMITIVE_TYPE.DECIMAL:
         case PRIMITIVE_TYPE.FLOAT: {
-          const previewResult =
+          const previewResult = (
             (yield this.queryBuilderState.graphManagerState.graphManager.runQuery(
               buildNumericPreviewDataQuery(
                 this.queryBuilderState,
@@ -970,7 +1021,8 @@ export class QueryBuilderExplorerState {
                 abortController:
                   this.previewDataState.previewDataAbortController,
               },
-            )) as ExecutionResult;
+            )) as ExecutionResultWithMetadata
+          ).executionResult;
           assertType(
             previewResult,
             TDSExecutionResult,
@@ -998,7 +1050,7 @@ export class QueryBuilderExplorerState {
         case PRIMITIVE_TYPE.DATE:
         case PRIMITIVE_TYPE.STRICTDATE:
         case PRIMITIVE_TYPE.DATETIME: {
-          const previewResult =
+          const previewResult = (
             (yield this.queryBuilderState.graphManagerState.graphManager.runQuery(
               buildNonNumericPreviewDataQuery(
                 this.queryBuilderState,
@@ -1011,7 +1063,8 @@ export class QueryBuilderExplorerState {
                 abortController:
                   this.previewDataState.previewDataAbortController,
               },
-            )) as ExecutionResult;
+            )) as ExecutionResultWithMetadata
+          ).executionResult;
           assertType(
             previewResult,
             TDSExecutionResult,

package/src/stores/explorer/QueryBuilderFuzzySearchAdvancedConfigState.ts

@@ -18,7 +18,7 @@ import { FuzzySearchAdvancedConfigState } from '@finos/legend-shared';
 import { action, makeObservable, observable } from 'mobx';
 
 export class QueryBuilderFuzzySearchAdvancedConfigState extends FuzzySearchAdvancedConfigState {
-  includeSubTypes = false;
+  includeSubTypes = true;
   includeDocumentation = false;
 
   constructor(