@finos/legend-query-builder 4.17.97 → 4.17.99

package/src/stores/QueryBuilderValueSpecificationHelper.ts

@@ -47,6 +47,7 @@ import {
   isSubType,
   type ObserverContext,
   InstanceValue,
+  getCorrespondingStandardPrimitiveType,
 } from '@finos/legend-graph';
 import {
   addUniqueEntry,
@@ -211,6 +212,21 @@ export const isPropertyExpressionChainOptional = (
   return isOptional;
 };
 
+/**
+ * Maps a type to its equivalent standard PRIMITIVE_TYPE for compatibility checks.
+ * For standard primitive types, returns their own enum value.
+ * For precise primitive types, returns their standard equivalent.
+ * Returns undefined for non-primitive types (e.g. Enumeration, Class).
+ */
+export const getStandardPrimitiveTypeEquivalent = (
+  type: Type,
+): PRIMITIVE_TYPE | undefined => {
+  if (type instanceof PrimitiveType) {
+    return type.path as PRIMITIVE_TYPE;
+  }
+  return getCorrespondingStandardPrimitiveType(type.path);
+};
+
 export const isTypeCompatibleForAssignment = (
   type: Type | undefined,
   assignmentType: Type,
@@ -228,20 +244,29 @@ export const isTypeCompatibleForAssignment = (
     PRIMITIVE_TYPE.LATESTDATE,
   ] as string[];
 
+  if (type === undefined) {
+    return false;
+  }
+
+  // Normalize precise primitive types to their standard equivalents
+  const normalizedTypePath =
+    getStandardPrimitiveTypeEquivalent(type) ?? type.path;
+  const normalizedAssignmentTypePath =
+    getStandardPrimitiveTypeEquivalent(assignmentType) ?? assignmentType.path;
+
   // When changing the return type for LHS, the RHS value should be adjusted accordingly.
   return (
-    type !== undefined &&
     // Numeric value is handled loosely because of autoboxing
     // e.g. LHS (integer) = RHS (float) is acceptable
-    ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&
-      NUMERIC_PRIMITIVE_TYPES.includes(assignmentType.path)) ||
-      // Date value is handled loosely as well if the LHS is of type DateTime
-      // This is because we would simulate auto-boxing for date by altering the
-      // Pure function used for the operation
-      // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
-      DATE_PRIMITIVE_TYPES.includes(type.path) ||
-      type.path === assignmentType.path ||
-      isSuperType(assignmentType, type))
+    (NUMERIC_PRIMITIVE_TYPES.includes(normalizedTypePath) &&
+      NUMERIC_PRIMITIVE_TYPES.includes(normalizedAssignmentTypePath)) ||
+    // Date value is handled loosely as well if the LHS is of type DateTime
+    // This is because we would simulate auto-boxing for date by altering the
+    // Pure function used for the operation
+    // e.g. LHS(DateTime) = RHS(Date) -> we use isOnDay() instead of is()
+    DATE_PRIMITIVE_TYPES.includes(normalizedTypePath) ||
+    normalizedTypePath === normalizedAssignmentTypePath ||
+    isSuperType(assignmentType, type)
   );
 };
 

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts

@@ -21,7 +21,6 @@ import {
   type LambdaFunction,
   type FunctionExpression,
   PRIMITIVE_TYPE,
-  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -37,6 +36,7 @@ import type {
 } from '../QueryBuilderPostFilterState.js';
 import {
   buildNotExpression,
+  getStandardPrimitiveTypeEquivalent,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
@@ -53,15 +53,17 @@ export class QueryBuilderPostFilterOperator_Contain
   }
 
   isCompatibleWithType(type: Type): boolean {
-    return type === PrimitiveType.STRING;
+    return getStandardPrimitiveTypeEquivalent(type) === PRIMITIVE_TYPE.STRING;
   }
 
   isCompatibleWithConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): boolean {
+    const rhsType = postFilterConditionState.rightConditionValue.type;
     return (
       !postFilterConditionState.rightConditionValue.isCollection &&
-      PrimitiveType.STRING === postFilterConditionState.rightConditionValue.type
+      rhsType !== undefined &&
+      getStandardPrimitiveTypeEquivalent(rhsType) === PRIMITIVE_TYPE.STRING
     );
   }
 

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts

@@ -20,7 +20,6 @@ import {
   type FunctionExpression,
   type LambdaFunction,
   PRIMITIVE_TYPE,
-  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -35,6 +34,7 @@ import type {
 } from '../QueryBuilderPostFilterState.js';
 import {
   buildNotExpression,
+  getStandardPrimitiveTypeEquivalent,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
@@ -51,15 +51,17 @@ export class QueryBuilderPostFilterOperator_EndWith
   }
 
   isCompatibleWithType(type: Type): boolean {
-    return PrimitiveType.STRING === type;
+    return getStandardPrimitiveTypeEquivalent(type) === PRIMITIVE_TYPE.STRING;
   }
 
   isCompatibleWithConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): boolean {
+    const rhsType = postFilterConditionState.rightConditionValue.type;
     return (
       !postFilterConditionState.rightConditionValue.isCollection &&
-      PrimitiveType.STRING === postFilterConditionState.rightConditionValue.type
+      rhsType !== undefined &&
+      getStandardPrimitiveTypeEquivalent(rhsType) === PRIMITIVE_TYPE.STRING
     );
   }
 

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts

@@ -38,6 +38,7 @@ import {
 } from '../QueryBuilderPostFilterState.js';
 import {
   buildNotExpression,
+  getStandardPrimitiveTypeEquivalent,
   isTypeCompatibleForAssignment,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
@@ -55,20 +56,22 @@ export class QueryBuilderPostFilterOperator_Equal
   }
 
   isCompatibleWithType(type: Type): boolean {
+    const normalizedType = getStandardPrimitiveTypeEquivalent(type);
     return (
-      (
-        [
-          PRIMITIVE_TYPE.STRING,
-          PRIMITIVE_TYPE.BOOLEAN,
-          PRIMITIVE_TYPE.NUMBER,
-          PRIMITIVE_TYPE.INTEGER,
-          PRIMITIVE_TYPE.DECIMAL,
-          PRIMITIVE_TYPE.FLOAT,
-          PRIMITIVE_TYPE.DATE,
-          PRIMITIVE_TYPE.STRICTDATE,
-          PRIMITIVE_TYPE.DATETIME,
-        ] as string[]
-      ).includes(type.path) ||
+      (normalizedType !== undefined &&
+        (
+          [
+            PRIMITIVE_TYPE.STRING,
+            PRIMITIVE_TYPE.BOOLEAN,
+            PRIMITIVE_TYPE.NUMBER,
+            PRIMITIVE_TYPE.INTEGER,
+            PRIMITIVE_TYPE.DECIMAL,
+            PRIMITIVE_TYPE.FLOAT,
+            PRIMITIVE_TYPE.DATE,
+            PRIMITIVE_TYPE.STRICTDATE,
+            PRIMITIVE_TYPE.DATETIME,
+          ] as string[]
+        ).includes(normalizedType)) ||
       // if the type is enumeration, make sure the enumeration has some value
       (type instanceof Enumeration && type.values.length > 0)
     );

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts

@@ -35,7 +35,10 @@ import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
-import { isTypeCompatibleForAssignment } from '../../../../QueryBuilderValueSpecificationHelper.js';
+import {
+  getStandardPrimitiveTypeEquivalent,
+  isTypeCompatibleForAssignment,
+} from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
@@ -50,17 +53,21 @@ export class QueryBuilderPostFilterOperator_GreaterThan
   }
 
   isCompatibleWithType(type: Type): boolean {
+    const normalizedType = getStandardPrimitiveTypeEquivalent(type);
     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(type.path);
+      normalizedType !== undefined &&
+      (
+        [
+          PRIMITIVE_TYPE.NUMBER,
+          PRIMITIVE_TYPE.INTEGER,
+          PRIMITIVE_TYPE.DECIMAL,
+          PRIMITIVE_TYPE.FLOAT,
+          PRIMITIVE_TYPE.DATE,
+          PRIMITIVE_TYPE.STRICTDATE,
+          PRIMITIVE_TYPE.DATETIME,
+        ] as string[]
+      ).includes(normalizedType)
+    );
   }
 
   isCompatibleWithConditionValue(

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.ts

@@ -44,6 +44,7 @@ import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilt
 import {
   buildNotExpression,
   getCollectionValueSpecificationType,
+  getStandardPrimitiveTypeEquivalent,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
@@ -58,16 +59,18 @@ export class QueryBuilderPostFilterOperator_In
   }
 
   isCompatibleWithType(type: Type): boolean {
+    const normalizedType = getStandardPrimitiveTypeEquivalent(type);
     return (
-      (
-        [
-          PRIMITIVE_TYPE.STRING,
-          PRIMITIVE_TYPE.NUMBER,
-          PRIMITIVE_TYPE.INTEGER,
-          PRIMITIVE_TYPE.DECIMAL,
-          PRIMITIVE_TYPE.FLOAT,
-        ] as string[]
-      ).includes(type.path) ||
+      (normalizedType !== undefined &&
+        (
+          [
+            PRIMITIVE_TYPE.STRING,
+            PRIMITIVE_TYPE.NUMBER,
+            PRIMITIVE_TYPE.INTEGER,
+            PRIMITIVE_TYPE.DECIMAL,
+            PRIMITIVE_TYPE.FLOAT,
+          ] as string[]
+        ).includes(normalizedType)) ||
       // TODO: do we care if the enumeration type has no value (like in the case of `==` operator)?
       type instanceof Enumeration
     );

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.ts

@@ -21,6 +21,7 @@ import {
   type LambdaFunction,
   Enumeration,
   PrimitiveType,
+  PrecisePrimitiveType,
 } from '@finos/legend-graph';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
 import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
@@ -49,7 +50,11 @@ export class QueryBuilderPostFilterOperator_IsEmpty
   }
 
   isCompatibleWithType(type: Type): boolean {
-    return type instanceof PrimitiveType || type instanceof Enumeration;
+    return (
+      type instanceof PrimitiveType ||
+      type instanceof PrecisePrimitiveType ||
+      type instanceof Enumeration
+    );
   }
 
   isCompatibleWithConditionValue(

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts

@@ -35,7 +35,10 @@ import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
-import { isTypeCompatibleForAssignment } from '../../../../QueryBuilderValueSpecificationHelper.js';
+import {
+  getStandardPrimitiveTypeEquivalent,
+  isTypeCompatibleForAssignment,
+} from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
@@ -50,17 +53,21 @@ export class QueryBuilderPostFilterOperator_LessThan
   }
 
   isCompatibleWithType(type: Type): boolean {
+    const normalizedType = getStandardPrimitiveTypeEquivalent(type);
     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(type.path);
+      normalizedType !== undefined &&
+      (
+        [
+          PRIMITIVE_TYPE.NUMBER,
+          PRIMITIVE_TYPE.INTEGER,
+          PRIMITIVE_TYPE.DECIMAL,
+          PRIMITIVE_TYPE.FLOAT,
+          PRIMITIVE_TYPE.DATE,
+          PRIMITIVE_TYPE.STRICTDATE,
+          PRIMITIVE_TYPE.DATETIME,
+        ] as string[]
+      ).includes(normalizedType)
+    );
   }
 
   isCompatibleWithConditionValue(

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts

@@ -21,7 +21,6 @@ import {
   type FunctionExpression,
   type LambdaFunction,
   PRIMITIVE_TYPE,
-  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -36,6 +35,7 @@ import type {
 } from '../QueryBuilderPostFilterState.js';
 import {
   buildNotExpression,
+  getStandardPrimitiveTypeEquivalent,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
@@ -52,15 +52,17 @@ export class QueryBuilderPostFilterOperator_StartWith
   }
 
   isCompatibleWithType(type: Type): boolean {
-    return PrimitiveType.STRING === type;
+    return getStandardPrimitiveTypeEquivalent(type) === PRIMITIVE_TYPE.STRING;
   }
 
   isCompatibleWithConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): boolean {
+    const rhsType = postFilterConditionState.rightConditionValue.type;
     return (
       !postFilterConditionState.rightConditionValue.isCollection &&
-      PrimitiveType.STRING === postFilterConditionState.rightConditionValue.type
+      rhsType !== undefined &&
+      getStandardPrimitiveTypeEquivalent(rhsType) === PRIMITIVE_TYPE.STRING
     );
   }
 

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

@@ -23,7 +23,6 @@ import {
   PRIMITIVE_TYPE,
   type ValueSpecification,
   type SimpleFunctionExpression,
-  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -36,6 +35,7 @@ import {
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import {
   buildNotExpression,
+  getStandardPrimitiveTypeEquivalent,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
@@ -54,9 +54,10 @@ export class QueryBuilderFilterOperator_Contain
     filterConditionState: FilterConditionState,
   ): boolean {
     return (
-      PrimitiveType.STRING ===
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType
+      getStandardPrimitiveTypeEquivalent(
+        filterConditionState.propertyExpressionState.propertyExpression.func
+          .value.genericType.value.rawType,
+      ) === PRIMITIVE_TYPE.STRING
     );
   }
 
@@ -68,7 +69,10 @@ export class QueryBuilderFilterOperator_Contain
       !filterConditionState.rightConditionValue.isCollection
         ? filterConditionState.rightConditionValue.type
         : undefined;
-    return PrimitiveType.STRING === type;
+    return (
+      type !== undefined &&
+      getStandardPrimitiveTypeEquivalent(type) === PRIMITIVE_TYPE.STRING
+    );
   }
 
   getDefaultFilterConditionValue(

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

@@ -23,7 +23,6 @@ import {
   PRIMITIVE_TYPE,
   type ValueSpecification,
   type SimpleFunctionExpression,
-  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -36,6 +35,7 @@ import {
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import {
   buildNotExpression,
+  getStandardPrimitiveTypeEquivalent,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
@@ -54,9 +54,10 @@ export class QueryBuilderFilterOperator_EndWith
     filterConditionState: FilterConditionState,
   ): boolean {
     return (
-      PrimitiveType.STRING ===
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType
+      getStandardPrimitiveTypeEquivalent(
+        filterConditionState.propertyExpressionState.propertyExpression.func
+          .value.genericType.value.rawType,
+      ) === PRIMITIVE_TYPE.STRING
     );
   }
 
@@ -68,7 +69,10 @@ export class QueryBuilderFilterOperator_EndWith
       !filterConditionState.rightConditionValue.isCollection
         ? filterConditionState.rightConditionValue.type
         : undefined;
-    return PrimitiveType.STRING === type;
+    return (
+      type !== undefined &&
+      getStandardPrimitiveTypeEquivalent(type) === PRIMITIVE_TYPE.STRING
+    );
   }
 
   getDefaultFilterConditionValue(

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

@@ -34,6 +34,7 @@ import {
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   buildNotExpression,
+  getStandardPrimitiveTypeEquivalent,
   isTypeCompatibleForAssignment,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
@@ -54,20 +55,22 @@ export class QueryBuilderFilterOperator_Equal
     const propertyType =
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType;
+    const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
-      (
-        [
-          PRIMITIVE_TYPE.STRING,
-          PRIMITIVE_TYPE.BOOLEAN,
-          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) ||
+      (normalizedType !== undefined &&
+        (
+          [
+            PRIMITIVE_TYPE.STRING,
+            PRIMITIVE_TYPE.BOOLEAN,
+            PRIMITIVE_TYPE.NUMBER,
+            PRIMITIVE_TYPE.INTEGER,
+            PRIMITIVE_TYPE.DECIMAL,
+            PRIMITIVE_TYPE.FLOAT,
+            PRIMITIVE_TYPE.DATE,
+            PRIMITIVE_TYPE.STRICTDATE,
+            PRIMITIVE_TYPE.DATETIME,
+          ] as string[]
+        ).includes(normalizedType)) ||
       // if the type is enumeration, make sure the enumeration has some value
       (propertyType instanceof Enumeration && propertyType.values.length > 0)
     );

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

@@ -35,7 +35,10 @@ import {
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
-import { isTypeCompatibleForAssignment } from '../../QueryBuilderValueSpecificationHelper.js';
+import {
+  getStandardPrimitiveTypeEquivalent,
+  isTypeCompatibleForAssignment,
+} from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
@@ -53,17 +56,21 @@ export class QueryBuilderFilterOperator_GreaterThan
     const propertyType =
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType;
+    const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     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(propertyType.path);
+      normalizedType !== undefined &&
+      (
+        [
+          PRIMITIVE_TYPE.NUMBER,
+          PRIMITIVE_TYPE.INTEGER,
+          PRIMITIVE_TYPE.DECIMAL,
+          PRIMITIVE_TYPE.FLOAT,
+          PRIMITIVE_TYPE.DATE,
+          PRIMITIVE_TYPE.STRICTDATE,
+          PRIMITIVE_TYPE.DATETIME,
+        ] as string[]
+      ).includes(normalizedType)
+    );
   }
 
   isCompatibleWithFilterConditionValue(

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

@@ -35,7 +35,10 @@ import {
   buildFilterConditionExpression,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
-import { isTypeCompatibleForAssignment } from '../../QueryBuilderValueSpecificationHelper.js';
+import {
+  getStandardPrimitiveTypeEquivalent,
+  isTypeCompatibleForAssignment,
+} from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
@@ -53,17 +56,21 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
     const propertyType =
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType;
+    const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     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(propertyType.path);
+      normalizedType !== undefined &&
+      (
+        [
+          PRIMITIVE_TYPE.NUMBER,
+          PRIMITIVE_TYPE.INTEGER,
+          PRIMITIVE_TYPE.DECIMAL,
+          PRIMITIVE_TYPE.FLOAT,
+          PRIMITIVE_TYPE.DATE,
+          PRIMITIVE_TYPE.STRICTDATE,
+          PRIMITIVE_TYPE.DATETIME,
+        ] as string[]
+      ).includes(normalizedType)
+    );
   }
 
   isCompatibleWithFilterConditionValue(

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

@@ -39,6 +39,7 @@ import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMe
 import {
   buildNotExpression,
   getCollectionValueSpecificationType,
+  getStandardPrimitiveTypeEquivalent,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
@@ -58,19 +59,21 @@ export class QueryBuilderFilterOperator_In
     const propertyType =
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType;
+    const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
-      (
-        [
-          PRIMITIVE_TYPE.STRING,
-          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) ||
+      (normalizedType !== undefined &&
+        (
+          [
+            PRIMITIVE_TYPE.STRING,
+            PRIMITIVE_TYPE.NUMBER,
+            PRIMITIVE_TYPE.INTEGER,
+            PRIMITIVE_TYPE.DECIMAL,
+            PRIMITIVE_TYPE.FLOAT,
+            PRIMITIVE_TYPE.DATE,
+            PRIMITIVE_TYPE.STRICTDATE,
+            PRIMITIVE_TYPE.DATETIME,
+          ] as string[]
+        ).includes(normalizedType)) ||
       // TODO: do we care if the enumeration type has no value (like in the case of `==` operator)?
       propertyType instanceof Enumeration
     );
@@ -109,7 +112,10 @@ export class QueryBuilderFilterOperator_In
               PRIMITIVE_TYPE.STRICTDATE,
               PRIMITIVE_TYPE.DATETIME,
             ] as string[]
-          ).includes(propertyType.path)
+          ).includes(
+            getStandardPrimitiveTypeEquivalent(propertyType) ??
+              propertyType.path,
+          )
         ) {
           return (
             [
@@ -121,7 +127,10 @@ export class QueryBuilderFilterOperator_In
               PRIMITIVE_TYPE.STRICTDATE,
               PRIMITIVE_TYPE.DATETIME,
             ] as string[]
-          ).includes(collectionType.path);
+          ).includes(
+            getStandardPrimitiveTypeEquivalent(collectionType) ??
+              collectionType.path,
+          );
         }
         return collectionType === propertyType;
       } else if (valueSpec instanceof VariableExpression) {