@finos/legend-query-builder 4.14.62 → 4.14.64

package/src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts

@@ -34,7 +34,6 @@ import {
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   buildNotExpression,
-  getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
@@ -78,8 +77,9 @@ export class QueryBuilderFilterOperator_Equal
     filterConditionState: FilterConditionState,
   ): boolean {
     return isTypeCompatibleForAssignment(
-      filterConditionState.value
-        ? getNonCollectionValueSpecificationType(filterConditionState.value)
+      filterConditionState.rightConditionValue &&
+        !filterConditionState.rightConditionValue.isCollection
+        ? filterConditionState.rightConditionValue.type
         : undefined,
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType,
@@ -110,7 +110,7 @@ export class QueryBuilderFilterOperator_Equal
       filterConditionState,
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
-        filterConditionState.value?.genericType?.value.rawType.path !==
+        filterConditionState.rightConditionValue?.type?.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.EQUAL,

package/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts

@@ -35,10 +35,7 @@ import {
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
-import {
-  getNonCollectionValueSpecificationType,
-  isTypeCompatibleForAssignment,
-} from '../../QueryBuilderValueSpecificationHelper.js';
+import { isTypeCompatibleForAssignment } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
@@ -73,8 +70,9 @@ export class QueryBuilderFilterOperator_GreaterThan
     filterConditionState: FilterConditionState,
   ): boolean {
     return isTypeCompatibleForAssignment(
-      filterConditionState.value
-        ? getNonCollectionValueSpecificationType(filterConditionState.value)
+      filterConditionState.rightConditionValue &&
+        !filterConditionState.rightConditionValue.isCollection
+        ? filterConditionState.rightConditionValue.type
         : undefined,
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType,
@@ -121,7 +119,7 @@ export class QueryBuilderFilterOperator_GreaterThan
       filterConditionState,
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
-        filterConditionState.value?.genericType?.value.rawType.path !==
+        filterConditionState.rightConditionValue?.type?.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_AFTER_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN,

package/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts

@@ -35,10 +35,7 @@ import {
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
-import {
-  getNonCollectionValueSpecificationType,
-  isTypeCompatibleForAssignment,
-} from '../../QueryBuilderValueSpecificationHelper.js';
+import { isTypeCompatibleForAssignment } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
@@ -73,8 +70,9 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
     filterConditionState: FilterConditionState,
   ): boolean {
     return isTypeCompatibleForAssignment(
-      filterConditionState.value
-        ? getNonCollectionValueSpecificationType(filterConditionState.value)
+      filterConditionState.rightConditionValue &&
+        !filterConditionState.rightConditionValue.isCollection
+        ? filterConditionState.rightConditionValue.type
         : undefined,
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType,
@@ -121,7 +119,7 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
       filterConditionState,
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
-        filterConditionState.value?.genericType?.value.rawType.path !==
+        filterConditionState.rightConditionValue?.type?.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN_EQUAL,

package/src/stores/filter/operators/QueryBuilderFilterOperator_In.ts

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import type {
-  QueryBuilderFilterState,
-  FilterConditionState,
+import {
+  type QueryBuilderFilterState,
+  type FilterConditionState,
+  FilterValueSpecConditionValueState,
 } from '../QueryBuilderFilterState.js';
 import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import {
@@ -81,51 +82,55 @@ export class QueryBuilderFilterOperator_In
     const propertyType =
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType;
-    const valueSpec = filterConditionState.value;
-    if (valueSpec instanceof CollectionInstanceValue) {
-      if (valueSpec.values.length === 0) {
-        return true;
-      }
-      const collectionType = getCollectionValueSpecificationType(
-        filterConditionState.filterState.queryBuilderState.graphManagerState
-          .graph,
-        valueSpec.values,
-      );
-      if (!collectionType) {
-        return false;
-      }
-      if (
-        (
-          [
-            PRIMITIVE_TYPE.NUMBER,
-            PRIMITIVE_TYPE.INTEGER,
-            PRIMITIVE_TYPE.DECIMAL,
-            PRIMITIVE_TYPE.FLOAT,
-            PRIMITIVE_TYPE.DATE,
-            PRIMITIVE_TYPE.STRICTDATE,
-            PRIMITIVE_TYPE.DATETIME,
-          ] as string[]
-        ).includes(propertyType.path)
-      ) {
-        return (
-          [
-            PRIMITIVE_TYPE.NUMBER,
-            PRIMITIVE_TYPE.INTEGER,
-            PRIMITIVE_TYPE.DECIMAL,
-            PRIMITIVE_TYPE.FLOAT,
-            PRIMITIVE_TYPE.DATE,
-            PRIMITIVE_TYPE.STRICTDATE,
-            PRIMITIVE_TYPE.DATETIME,
-          ] as string[]
-        ).includes(collectionType.path);
-      }
-      return collectionType === propertyType;
-    } else if (valueSpec instanceof VariableExpression) {
-      // check if not a single value
-      if (valueSpec.multiplicity.upperBound === 1) {
-        return false;
+    const rightSide = filterConditionState.rightConditionValue;
+    // `in`/`not in` does not support right hand value being column state as the multipliticy for columns are [0..1]
+    if (rightSide instanceof FilterValueSpecConditionValueState) {
+      const valueSpec = rightSide.value;
+      if (valueSpec instanceof CollectionInstanceValue) {
+        if (valueSpec.values.length === 0) {
+          return true;
+        }
+        const collectionType = getCollectionValueSpecificationType(
+          filterConditionState.filterState.queryBuilderState.graphManagerState
+            .graph,
+          valueSpec.values,
+        );
+        if (!collectionType) {
+          return false;
+        }
+        if (
+          (
+            [
+              PRIMITIVE_TYPE.NUMBER,
+              PRIMITIVE_TYPE.INTEGER,
+              PRIMITIVE_TYPE.DECIMAL,
+              PRIMITIVE_TYPE.FLOAT,
+              PRIMITIVE_TYPE.DATE,
+              PRIMITIVE_TYPE.STRICTDATE,
+              PRIMITIVE_TYPE.DATETIME,
+            ] as string[]
+          ).includes(propertyType.path)
+        ) {
+          return (
+            [
+              PRIMITIVE_TYPE.NUMBER,
+              PRIMITIVE_TYPE.INTEGER,
+              PRIMITIVE_TYPE.DECIMAL,
+              PRIMITIVE_TYPE.FLOAT,
+              PRIMITIVE_TYPE.DATE,
+              PRIMITIVE_TYPE.STRICTDATE,
+              PRIMITIVE_TYPE.DATETIME,
+            ] as string[]
+          ).includes(collectionType.path);
+        }
+        return collectionType === propertyType;
+      } else if (valueSpec instanceof VariableExpression) {
+        // check if not a single value
+        if (valueSpec.multiplicity.upperBound === 1) {
+          return false;
+        }
+        return propertyType === valueSpec.genericType?.value.rawType;
       }
-      return propertyType === valueSpec.genericType?.value.rawType;
     }
     return false;
   }

package/src/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.ts

@@ -69,7 +69,7 @@ export class QueryBuilderFilterOperator_IsEmpty
   isCompatibleWithFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): boolean {
-    return filterConditionState.value === undefined;
+    return filterConditionState.rightConditionValue === undefined;
   }
 
   getDefaultFilterConditionValue(

package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts

@@ -35,10 +35,7 @@ import {
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
-import {
-  getNonCollectionValueSpecificationType,
-  isTypeCompatibleForAssignment,
-} from '../../QueryBuilderValueSpecificationHelper.js';
+import { isTypeCompatibleForAssignment } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
@@ -73,8 +70,9 @@ export class QueryBuilderFilterOperator_LessThan
     filterConditionState: FilterConditionState,
   ): boolean {
     return isTypeCompatibleForAssignment(
-      filterConditionState.value
-        ? getNonCollectionValueSpecificationType(filterConditionState.value)
+      filterConditionState.rightConditionValue &&
+        !filterConditionState.rightConditionValue.isCollection
+        ? filterConditionState.rightConditionValue.type
         : undefined,
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType,
@@ -121,7 +119,7 @@ export class QueryBuilderFilterOperator_LessThan
       filterConditionState,
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
-        filterConditionState.value?.genericType?.value.rawType.path !==
+        filterConditionState.rightConditionValue?.type?.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_BEFORE_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN,

package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts

@@ -35,10 +35,7 @@ import {
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
-import {
-  getNonCollectionValueSpecificationType,
-  isTypeCompatibleForAssignment,
-} from '../../QueryBuilderValueSpecificationHelper.js';
+import { isTypeCompatibleForAssignment } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
@@ -73,8 +70,9 @@ export class QueryBuilderFilterOperator_LessThanEqual
     filterConditionState: FilterConditionState,
   ): boolean {
     return isTypeCompatibleForAssignment(
-      filterConditionState.value
-        ? getNonCollectionValueSpecificationType(filterConditionState.value)
+      filterConditionState.rightConditionValue &&
+        !filterConditionState.rightConditionValue.isCollection
+        ? filterConditionState.rightConditionValue.type
         : undefined,
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType,
@@ -121,7 +119,7 @@ export class QueryBuilderFilterOperator_LessThanEqual
       filterConditionState,
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
-        filterConditionState.value?.genericType?.value.rawType.path !==
+        filterConditionState.rightConditionValue?.type?.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN_EQUAL,

package/src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts

@@ -37,7 +37,6 @@ import {
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   buildNotExpression,
-  getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
@@ -64,9 +63,11 @@ export class QueryBuilderFilterOperator_StartWith
   isCompatibleWithFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const type = filterConditionState.value
-      ? getNonCollectionValueSpecificationType(filterConditionState.value)
-      : undefined;
+    const type =
+      filterConditionState.rightConditionValue &&
+      !filterConditionState.rightConditionValue.isCollection
+        ? filterConditionState.rightConditionValue.type
+        : undefined;
     return PrimitiveType.STRING === type;
   }
 

package/src/stores/shared/ValueSpecificationEditorHelper.ts

@@ -43,16 +43,21 @@ import {
   buildRawLambdaFromLambdaFunction,
   getValueSpecificationReturnType,
   isSubType,
+  AbstractPropertyExpression,
+  PropertyExplicitReference,
 } from '@finos/legend-graph';
 import {
   Randomizer,
   UnsupportedOperationError,
   deepClone,
+  guaranteeNonNullable,
   returnUndefOnError,
 } from '@finos/legend-shared';
 import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationHelper.js';
 import {
+  functionExpression_setParametersValues,
   instanceValue_setValues,
+  propertyExpression_setFunc,
   valueSpecification_setGenericType,
 } from './ValueSpecificationModifierHelper.js';
 import {
@@ -103,6 +108,29 @@ export const cloneValueSpecification = (
   return copy;
 };
 
+export const cloneAbstractPropertyExpression = (
+  propertyExpression: AbstractPropertyExpression,
+  observerContext: ObserverContext,
+): AbstractPropertyExpression => {
+  const clonedPropertyExpression = new AbstractPropertyExpression(
+    propertyExpression.functionName,
+  );
+  propertyExpression_setFunc(
+    clonedPropertyExpression,
+    PropertyExplicitReference.create(
+      guaranteeNonNullable(propertyExpression.func.value),
+    ),
+  );
+  functionExpression_setParametersValues(
+    clonedPropertyExpression,
+    propertyExpression.parametersValues.map((param) =>
+      cloneValueSpecification(param, observerContext),
+    ),
+    observerContext,
+  );
+  return clonedPropertyExpression;
+};
+
 export const createMockPrimitiveValueSpecification = (
   primitiveType: PrimitiveType,
   graph: PureModel,

package/tsconfig.json

@@ -59,6 +59,7 @@
     "./src/components/QueryBuilderComponentElement.ts",
     "./src/components/QueryBuilder_LegendApplicationPlugin.ts",
     "./src/components/QuerySetupUtils.ts",
+    "./src/components/shared/QueryBuilderFilterHelper.ts",
     "./src/graph/QueryBuilderMetaModelConst.ts",
     "./src/graph-manager/QueryBuilderConfig.ts",
     "./src/graph-manager/QueryBuilderConst.ts",