@finos/legend-application-query 5.1.0 → 5.2.1

package/src/stores/QueryBuilderProjectionState.ts

@@ -85,9 +85,7 @@ import {
   buildNonNumericPreviewDataQuery,
 } from './QueryBuilderPreviewDataHelper.js';
 
-export enum QUERY_BUILDER_PROJECTION_DND_TYPE {
-  PROJECTION_COLUMN = 'PROJECTION_COLUMN',
-}
+export const QUERY_BUILDER_PROJECTION_COLUMN_DND_TYPE = 'PROJECTION_COLUMN';
 
 export interface QueryBuilderProjectionColumnDragSource {
   columnState: QueryBuilderProjectionColumnState;
@@ -96,7 +94,6 @@ export interface QueryBuilderProjectionColumnDragSource {
 export abstract class QueryBuilderProjectionColumnState {
   readonly uuid = uuid();
   projectionState: QueryBuilderProjectionState;
-  isBeingDragged = false;
   columnName: string;
 
   constructor(
@@ -106,9 +103,7 @@ export abstract class QueryBuilderProjectionColumnState {
     makeObservable(this, {
       uuid: false,
       projectionState: false,
-      isBeingDragged: observable,
       columnName: observable,
-      setIsBeingDragged: action,
       setColumnName: action,
     });
 
@@ -116,10 +111,6 @@ export abstract class QueryBuilderProjectionColumnState {
     this.columnName = columnName;
   }
 
-  setIsBeingDragged(val: boolean): void {
-    this.isBeingDragged = val;
-  }
-
   setColumnName(val: string): void {
     this.columnName = val;
   }
@@ -590,7 +581,9 @@ export class QueryBuilderProjectionState {
   addNewBlankDerivation(): void {
     const derivation = new QueryBuilderDerivationProjectionColumnState(
       this,
-      this.queryBuilderState.graphManagerState.graphManager.HACKY__createDefaultBlankLambda(),
+      this.queryBuilderState.graphManagerState.graphManager.createDefaultBasicRawLambda(
+        { addDummyParameter: true },
+      ),
     );
     this.addColumn(derivation);
     derivation.derivationLambdaEditorState.setLambdaString(
@@ -770,11 +763,7 @@ export class QueryBuilderProjectionState {
     }
   }
 
-  isValidProjectionState(): boolean {
-    return Boolean(!this.getValidationErrorMessage());
-  }
-
-  getValidationErrorMessage(): string | undefined {
+  get validationIssues(): string[] | undefined {
     if (this.queryBuilderState.fetchStructureState.isProjectionMode()) {
       const hasDuplicatedProjectionColumns = this.columns.some(
         (column) =>
@@ -782,11 +771,11 @@ export class QueryBuilderProjectionState {
             .length > 1,
       );
       if (hasDuplicatedProjectionColumns) {
-        return 'Query has duplicated projection columns';
+        return ['Query has duplicated projection columns'];
       }
       const hasNoProjectionColumns = this.columns.length === 0;
       if (hasNoProjectionColumns) {
-        return 'Query has no projection columns';
+        return ['Query has no projection columns'];
       }
     }
     return undefined;

package/src/stores/QueryBuilderSetupState.ts

@@ -106,7 +106,7 @@ export class QueryBuilderSetupState {
   get classes(): Class[] {
     return this.queryBuilderState.graphManagerState.graph.ownClasses
       .concat(
-        this.queryBuilderState.graphManagerState.filterSystemElementOptions(
+        this.queryBuilderState.graphManagerState.collectExposedSystemElements(
           this.queryBuilderState.graphManagerState.graph.systemModel.ownClasses,
         ),
       )

package/src/stores/QueryBuilderState.ts

@@ -81,6 +81,14 @@ export abstract class QueryBuilderMode {
   abstract get isParametersDisabled(): boolean;
 
   abstract get isResultPanelHidden(): boolean;
+
+  /**
+   * This flag is for turning on/off dnd from projection panel to filter panel,
+   * and will be leveraged when the concepts of workflows are introduced into query builder.
+   */
+  get isDnDProjectionToFilterSupported(): boolean {
+    return true;
+  }
 }
 
 export class StandardQueryBuilderMode extends QueryBuilderMode {
@@ -480,8 +488,8 @@ export class QueryBuilderState {
     }
   }
 
-  isValidQueryBuilderState(): boolean {
-    return this.fetchStructureState.projectionState.isValidProjectionState();
+  get validationIssues(): string[] | undefined {
+    return this.fetchStructureState.validationIssues;
   }
 
   createBareBuilderState(): QueryBuilderState {

package/src/stores/QueryBuilderValueSpecificationBuilderHelper.ts

@@ -64,13 +64,15 @@ export const buildGenericLambdaFunctionInstanceValue = (
     TYPICAL_MULTIPLICITY_TYPE.ONE,
   );
   const typeAny = graph.getType(CORE_PURE_PATH.ANY);
-  const aggregateLambda = new LambdaFunctionInstanceValue(multiplicityOne);
-  const colLambdaFunctionType = new FunctionType(typeAny, multiplicityOne);
-  colLambdaFunctionType.parameters.push(
+  const functionInstanceValue = new LambdaFunctionInstanceValue(
+    multiplicityOne,
+  );
+  const functionType = new FunctionType(typeAny, multiplicityOne);
+  functionType.parameters.push(
     new VariableExpression(lambdaParameterName, multiplicityOne),
   );
-  const colLambdaFunction = new LambdaFunction(colLambdaFunctionType);
-  colLambdaFunction.expressionSequence = lambdaBodyExpressions;
-  aggregateLambda.values.push(colLambdaFunction);
-  return aggregateLambda;
+  const lambdaFunction = new LambdaFunction(functionType);
+  lambdaFunction.expressionSequence = lambdaBodyExpressions;
+  functionInstanceValue.values.push(lambdaFunction);
+  return functionInstanceValue;
 };

package/src/stores/QueryEditorStore.ts

@@ -50,6 +50,7 @@ import {
   type GraphBuilderReport,
   GraphManagerTelemetry,
   extractElementNameFromPath,
+  isSystemElement,
 } from '@finos/legend-graph';
 import {
   QueryBuilderState,
@@ -448,15 +449,30 @@ export class CreateQueryEditorStore extends QueryEditorStore {
       );
       this.queryBuilderState.querySetupState.setClassIsReadOnly(true);
     } else {
-      this.queryBuilderState.changeClass(
+      // try to find a class to set
+      // first, find classes which is mapped by the mapping
+      // then, find any classes except for class coming from system
+      // if none found, default to a dummy blank query
+      const defaultClass =
         getNullableFirstElement(
           this.queryBuilderState.querySetupState.mapping
             ? getAllClassMappings(
                 this.queryBuilderState.querySetupState.mapping,
               ).map((classMapping) => classMapping.class.value)
             : [],
-        ),
-      );
+        ) ??
+        getNullableFirstElement(
+          this.queryBuilderState.graphManagerState.graph.classes.filter(
+            (el) => !isSystemElement(el),
+          ),
+        );
+      if (defaultClass) {
+        this.queryBuilderState.changeClass(defaultClass);
+      } else {
+        this.queryBuilderState.initialize(
+          this.queryBuilderState.graphManagerState.graphManager.createDefaultBasicRawLambda(),
+        );
+      }
     }
   }
 

package/src/stores/QueryFunctionsExplorerState.ts

@@ -31,10 +31,7 @@ import { action, makeObservable, observable } from 'mobx';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import type { TreeNodeData, TreeData } from '@finos/legend-art';
 
-export enum QUERY_BUILDER_FUNCTIONS_EXPLORER_TREE_DND_TYPE {
-  FUNCTION = 'FUNCTION',
-  PACKAGE = 'PACKAGE',
-}
+export const QUERY_BUILDER_FUNCTION_DND_TYPE = 'QUERY_BUILDER_FUNCTION';
 
 export interface QueryBuilderFunctionsExplorerDragSource {
   node: QueryBuilderFunctionsExplorerTreeNodeData;
@@ -43,7 +40,6 @@ export interface QueryBuilderFunctionsExplorerDragSource {
 export class QueryBuilderFunctionsExplorerTreeNodeData implements TreeNodeData {
   id: string;
   label: string;
-  dndType: string;
   childrenIds: string[] = [];
   isOpen?: boolean | undefined;
   packageableElement: PackageableElement;
@@ -51,12 +47,10 @@ export class QueryBuilderFunctionsExplorerTreeNodeData implements TreeNodeData {
   constructor(
     id: string,
     label: string,
-    dndType: string,
     packageableElement: PackageableElement,
   ) {
     this.id = id;
     this.label = label;
-    this.dndType = dndType;
     this.packageableElement = packageableElement;
   }
 }
@@ -81,10 +75,6 @@ export const generateFunctionsExplorerTreeNodeData = (
   rootPackageName: ROOT_PACKAGE_NAME,
 ): QueryBuilderFunctionsExplorerTreeNodeData => ({
   id: element.path,
-  dndType:
-    element instanceof Package
-      ? QUERY_BUILDER_FUNCTIONS_EXPLORER_TREE_DND_TYPE.PACKAGE
-      : QUERY_BUILDER_FUNCTIONS_EXPLORER_TREE_DND_TYPE.FUNCTION,
   label: element.name,
   childrenIds:
     element instanceof Package

package/src/stores/QueryParametersState.ts

@@ -21,9 +21,7 @@ import {
 import { observable, makeObservable, action } from 'mobx';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 
-export enum QUERY_BUILDER_PARAMETER_TREE_DND_TYPE {
-  VARIABLE = 'VARIABLE',
-}
+export const QUERY_BUILDER_PARAMETER_DND_TYPE = 'PARAMETER';
 
 export interface QueryBuilderParameterDragSource {
   variable: LambdaParameterState;

package/src/stores/filterOperators/QueryBuilderFilterOperator_Equal.ts

@@ -99,7 +99,6 @@ export class QueryBuilderFilterOperator_Equal extends QueryBuilderFilterOperator
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.STRING:
       case PRIMITIVE_TYPE.BOOLEAN:
-      case PRIMITIVE_TYPE.DATE:
       case PRIMITIVE_TYPE.STRICTDATE:
       case PRIMITIVE_TYPE.DATETIME:
       case PRIMITIVE_TYPE.NUMBER:
@@ -113,6 +112,14 @@ export class QueryBuilderFilterOperator_Equal extends QueryBuilderFilterOperator
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
       }
+      case PRIMITIVE_TYPE.DATE: {
+        return buildPrimitiveInstanceValue(
+          filterConditionState.filterState.queryBuilderState.graphManagerState
+            .graph,
+          PRIMITIVE_TYPE.STRICTDATE,
+          generateDefaultValueForPrimitiveType(propertyType.path),
+        );
+      }
       default:
         if (propertyType instanceof Enumeration) {
           if (propertyType.values.length > 0) {

package/src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThan.ts

@@ -86,7 +86,6 @@ export class QueryBuilderFilterOperator_GreaterThan extends QueryBuilderFilterOp
       case PRIMITIVE_TYPE.DECIMAL:
       case PRIMITIVE_TYPE.FLOAT:
       case PRIMITIVE_TYPE.INTEGER:
-      case PRIMITIVE_TYPE.DATE:
       case PRIMITIVE_TYPE.STRICTDATE:
       case PRIMITIVE_TYPE.DATETIME: {
         return buildPrimitiveInstanceValue(
@@ -96,6 +95,14 @@ export class QueryBuilderFilterOperator_GreaterThan extends QueryBuilderFilterOp
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
       }
+      case PRIMITIVE_TYPE.DATE: {
+        return buildPrimitiveInstanceValue(
+          filterConditionState.filterState.queryBuilderState.graphManagerState
+            .graph,
+          PRIMITIVE_TYPE.STRICTDATE,
+          generateDefaultValueForPrimitiveType(propertyType.path),
+        );
+      }
       default:
         throw new UnsupportedOperationError(
           `Can't get default value for filter operator '${this.getLabel(

package/src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThanEqual.ts

@@ -86,7 +86,6 @@ export class QueryBuilderFilterOperator_GreaterThanEqual extends QueryBuilderFil
       case PRIMITIVE_TYPE.DECIMAL:
       case PRIMITIVE_TYPE.FLOAT:
       case PRIMITIVE_TYPE.INTEGER:
-      case PRIMITIVE_TYPE.DATE:
       case PRIMITIVE_TYPE.STRICTDATE:
       case PRIMITIVE_TYPE.DATETIME: {
         return buildPrimitiveInstanceValue(
@@ -96,6 +95,14 @@ export class QueryBuilderFilterOperator_GreaterThanEqual extends QueryBuilderFil
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
       }
+      case PRIMITIVE_TYPE.DATE: {
+        return buildPrimitiveInstanceValue(
+          filterConditionState.filterState.queryBuilderState.graphManagerState
+            .graph,
+          PRIMITIVE_TYPE.STRICTDATE,
+          generateDefaultValueForPrimitiveType(propertyType.path),
+        );
+      }
       default:
         throw new UnsupportedOperationError(
           `Can't get default value for filter operator '${this.getLabel(

package/src/stores/filterOperators/QueryBuilderFilterOperator_LessThan.ts

@@ -86,7 +86,6 @@ export class QueryBuilderFilterOperator_LessThan extends QueryBuilderFilterOpera
       case PRIMITIVE_TYPE.DECIMAL:
       case PRIMITIVE_TYPE.FLOAT:
       case PRIMITIVE_TYPE.INTEGER:
-      case PRIMITIVE_TYPE.DATE:
       case PRIMITIVE_TYPE.STRICTDATE:
       case PRIMITIVE_TYPE.DATETIME: {
         return buildPrimitiveInstanceValue(
@@ -96,6 +95,14 @@ export class QueryBuilderFilterOperator_LessThan extends QueryBuilderFilterOpera
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
       }
+      case PRIMITIVE_TYPE.DATE: {
+        return buildPrimitiveInstanceValue(
+          filterConditionState.filterState.queryBuilderState.graphManagerState
+            .graph,
+          PRIMITIVE_TYPE.STRICTDATE,
+          generateDefaultValueForPrimitiveType(propertyType.path),
+        );
+      }
       default:
         throw new UnsupportedOperationError(
           `Can't get default value for filter operator '${this.getLabel(

package/src/stores/filterOperators/QueryBuilderFilterOperator_LessThanEqual.ts

@@ -86,7 +86,6 @@ export class QueryBuilderFilterOperator_LessThanEqual extends QueryBuilderFilter
       case PRIMITIVE_TYPE.DECIMAL:
       case PRIMITIVE_TYPE.FLOAT:
       case PRIMITIVE_TYPE.INTEGER:
-      case PRIMITIVE_TYPE.DATE:
       case PRIMITIVE_TYPE.STRICTDATE:
       case PRIMITIVE_TYPE.DATETIME: {
         return buildPrimitiveInstanceValue(
@@ -96,6 +95,14 @@ export class QueryBuilderFilterOperator_LessThanEqual extends QueryBuilderFilter
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
       }
+      case PRIMITIVE_TYPE.DATE: {
+        return buildPrimitiveInstanceValue(
+          filterConditionState.filterState.queryBuilderState.graphManagerState
+            .graph,
+          PRIMITIVE_TYPE.STRICTDATE,
+          generateDefaultValueForPrimitiveType(propertyType.path),
+        );
+      }
       default:
         throw new UnsupportedOperationError(
           `Can't get default value for filter operator '${this.getLabel(

package/src/stores/postFilterOperators/QueryBuilderPostFilterOperator_Equal.ts

@@ -100,7 +100,6 @@ export class QueryBuilderPostFilterOperator_Equal extends QueryBuilderPostFilter
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.STRING:
       case PRIMITIVE_TYPE.BOOLEAN:
-      case PRIMITIVE_TYPE.DATE:
       case PRIMITIVE_TYPE.STRICTDATE:
       case PRIMITIVE_TYPE.DATETIME:
       case PRIMITIVE_TYPE.NUMBER:
@@ -114,6 +113,14 @@ export class QueryBuilderPostFilterOperator_Equal extends QueryBuilderPostFilter
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
       }
+      case PRIMITIVE_TYPE.DATE: {
+        return buildPrimitiveInstanceValue(
+          postFilterConditionState.postFilterState.queryBuilderState
+            .graphManagerState.graph,
+          PRIMITIVE_TYPE.STRICTDATE,
+          generateDefaultValueForPrimitiveType(propertyType.path),
+        );
+      }
       default:
         if (propertyType instanceof Enumeration) {
           if (propertyType.values.length > 0) {

package/src/stores/postFilterOperators/QueryBuilderPostFilterOperator_GreaterThan.ts

@@ -82,7 +82,6 @@ export class QueryBuilderPostFilterOperator_GreaterThan extends QueryBuilderPost
       case PRIMITIVE_TYPE.DECIMAL:
       case PRIMITIVE_TYPE.FLOAT:
       case PRIMITIVE_TYPE.INTEGER:
-      case PRIMITIVE_TYPE.DATE:
       case PRIMITIVE_TYPE.STRICTDATE:
       case PRIMITIVE_TYPE.DATETIME: {
         return buildPrimitiveInstanceValue(
@@ -92,6 +91,14 @@ export class QueryBuilderPostFilterOperator_GreaterThan extends QueryBuilderPost
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
       }
+      case PRIMITIVE_TYPE.DATE: {
+        return buildPrimitiveInstanceValue(
+          postFilterConditionState.postFilterState.queryBuilderState
+            .graphManagerState.graph,
+          PRIMITIVE_TYPE.STRICTDATE,
+          generateDefaultValueForPrimitiveType(propertyType.path),
+        );
+      }
       default:
         throw new UnsupportedOperationError(
           `Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${

package/src/stores/postFilterOperators/QueryBuilderPostFilterOperator_LessThan.ts

@@ -82,7 +82,6 @@ export class QueryBuilderPostFilterOperator_LessThan extends QueryBuilderPostFil
       case PRIMITIVE_TYPE.DECIMAL:
       case PRIMITIVE_TYPE.FLOAT:
       case PRIMITIVE_TYPE.INTEGER:
-      case PRIMITIVE_TYPE.DATE:
       case PRIMITIVE_TYPE.STRICTDATE:
       case PRIMITIVE_TYPE.DATETIME: {
         return buildPrimitiveInstanceValue(
@@ -92,6 +91,14 @@ export class QueryBuilderPostFilterOperator_LessThan extends QueryBuilderPostFil
           generateDefaultValueForPrimitiveType(propertyType.path),
         );
       }
+      case PRIMITIVE_TYPE.DATE: {
+        return buildPrimitiveInstanceValue(
+          postFilterConditionState.postFilterState.queryBuilderState
+            .graphManagerState.graph,
+          PRIMITIVE_TYPE.STRICTDATE,
+          generateDefaultValueForPrimitiveType(propertyType.path),
+        );
+      }
       default:
         throw new UnsupportedOperationError(
           `Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${

package/tsconfig.json

@@ -128,6 +128,7 @@
     "./src/components/QueryBuilderGraphFetchTreePanel.tsx",
     "./src/components/QueryBuilderLambdaEditor.tsx",
     "./src/components/QueryBuilderMilestoneEditor.tsx",
+    "./src/components/QueryBuilderPanelIssueCountBadge.tsx",
     "./src/components/QueryBuilderParameterPanel.tsx",
     "./src/components/QueryBuilderPostFilterPanel.tsx",
     "./src/components/QueryBuilderProjectionPanel.tsx",