@finos/legend-query-builder 4.14.34 → 4.14.36

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

@@ -36,13 +36,12 @@ import type {
 } from '../QueryBuilderPostFilterState.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
-import { buildPrimitiveInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
+import { buildDefaultInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderPostFilterOperator_Contain
   extends QueryBuilderPostFilterOperator
@@ -73,13 +72,14 @@ export class QueryBuilderPostFilterOperator_Contain
     );
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.STRING: {
-        return buildPrimitiveInstanceValue(
+        return buildDefaultInstanceValue(
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
-          propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          propertyType,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .INTERNAL__enableInitializingDefaultSimpleExpressionValue,
         );
       }
       default:

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

@@ -34,13 +34,12 @@ import type {
 } from '../QueryBuilderPostFilterState.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
-import { buildPrimitiveInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
+import { buildDefaultInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderPostFilterOperator_EndWith
   extends QueryBuilderPostFilterOperator
@@ -70,13 +69,14 @@ export class QueryBuilderPostFilterOperator_EndWith
       postFilterConditionState.leftConditionValue.getColumnType();
     switch (propertyType?.path) {
       case PRIMITIVE_TYPE.STRING: {
-        return buildPrimitiveInstanceValue(
+        return buildDefaultInstanceValue(
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
-          propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          propertyType,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .INTERNAL__enableInitializingDefaultSimpleExpressionValue,
         );
       }
       default:

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

@@ -17,15 +17,10 @@
 import {
   type Type,
   type ValueSpecification,
-  type Enum,
   type SimpleFunctionExpression,
   type FunctionExpression,
   AbstractPropertyExpression,
   Enumeration,
-  EnumValueExplicitReference,
-  EnumValueInstanceValue,
-  GenericType,
-  GenericTypeExplicitReference,
   PRIMITIVE_TYPE,
   PrimitiveType,
 } from '@finos/legend-graph';
@@ -33,7 +28,6 @@ import {
   guaranteeNonNullable,
   type Hashable,
   hashArray,
-  UnsupportedOperationError,
 } from '@finos/legend-shared';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
 import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
@@ -43,15 +37,13 @@ import {
 } from '../QueryBuilderPostFilterState.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   isTypeCompatibleForAssignment,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
-import { buildPrimitiveInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
-import { instanceValue_setValues } from '../../../../shared/ValueSpecificationModifierHelper.js';
+import { buildDefaultInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderPostFilterOperator_Equal
   extends QueryBuilderPostFilterOperator
@@ -101,66 +93,15 @@ export class QueryBuilderPostFilterOperator_Equal
     const propertyType = guaranteeNonNullable(
       postFilterConditionState.leftConditionValue.getColumnType(),
     );
-    switch (propertyType.path) {
-      case PRIMITIVE_TYPE.STRING:
-      case PRIMITIVE_TYPE.BOOLEAN:
-      case PRIMITIVE_TYPE.STRICTDATE:
-      case PRIMITIVE_TYPE.DATETIME:
-      case PRIMITIVE_TYPE.NUMBER:
-      case PRIMITIVE_TYPE.DECIMAL:
-      case PRIMITIVE_TYPE.FLOAT:
-      case PRIMITIVE_TYPE.INTEGER: {
-        return buildPrimitiveInstanceValue(
-          postFilterConditionState.postFilterState.tdsState.queryBuilderState
-            .graphManagerState.graph,
-          propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
-          postFilterConditionState.postFilterState.tdsState.queryBuilderState
-            .observerContext,
-        );
-      }
-      case PRIMITIVE_TYPE.DATE: {
-        return buildPrimitiveInstanceValue(
-          postFilterConditionState.postFilterState.tdsState.queryBuilderState
-            .graphManagerState.graph,
-          PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
-          postFilterConditionState.postFilterState.tdsState.queryBuilderState
-            .observerContext,
-        );
-      }
-      default:
-        if (propertyType instanceof Enumeration) {
-          if (propertyType.values.length > 0) {
-            const enumValueInstanceValue = new EnumValueInstanceValue(
-              GenericTypeExplicitReference.create(
-                new GenericType(propertyType),
-              ),
-            );
-            instanceValue_setValues(
-              enumValueInstanceValue,
-              [
-                EnumValueExplicitReference.create(
-                  propertyType.values[0] as Enum,
-                ),
-              ],
-              postFilterConditionState.postFilterState.tdsState
-                .queryBuilderState.observerContext,
-            );
-            return enumValueInstanceValue;
-          }
-          throw new UnsupportedOperationError(
-            `Can't get default value for post-filter operator '${this.getLabel()}' since enumeration '${
-              propertyType.path
-            }' has no value`,
-          );
-        }
-        throw new UnsupportedOperationError(
-          `Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${
-            propertyType.path
-          }'`,
-        );
-    }
+    return buildDefaultInstanceValue(
+      postFilterConditionState.postFilterState.tdsState.queryBuilderState
+        .graphManagerState.graph,
+      propertyType,
+      postFilterConditionState.postFilterState.tdsState.queryBuilderState
+        .observerContext,
+      postFilterConditionState.postFilterState.tdsState.queryBuilderState
+        .INTERNAL__enableInitializingDefaultSimpleExpressionValue,
+    );
   }
 
   buildPostFilterConditionExpression(

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

@@ -34,14 +34,11 @@ import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
-import {
-  generateDefaultValueForPrimitiveType,
-  isTypeCompatibleForAssignment,
-} from '../../../../QueryBuilderValueSpecificationHelper.js';
+import { isTypeCompatibleForAssignment } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
-import { buildPrimitiveInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
+import { buildDefaultInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderPostFilterOperator_GreaterThan
   extends QueryBuilderPostFilterOperator
@@ -89,24 +86,16 @@ export class QueryBuilderPostFilterOperator_GreaterThan
       case PRIMITIVE_TYPE.FLOAT:
       case PRIMITIVE_TYPE.INTEGER:
       case PRIMITIVE_TYPE.STRICTDATE:
-      case PRIMITIVE_TYPE.DATETIME: {
-        return buildPrimitiveInstanceValue(
-          postFilterConditionState.postFilterState.tdsState.queryBuilderState
-            .graphManagerState.graph,
-          propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
-          postFilterConditionState.postFilterState.tdsState.queryBuilderState
-            .observerContext,
-        );
-      }
+      case PRIMITIVE_TYPE.DATETIME:
       case PRIMITIVE_TYPE.DATE: {
-        return buildPrimitiveInstanceValue(
+        return buildDefaultInstanceValue(
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
-          PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          propertyType,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .INTERNAL__enableInitializingDefaultSimpleExpressionValue,
         );
       }
       default:

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

@@ -34,14 +34,11 @@ import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
-import {
-  generateDefaultValueForPrimitiveType,
-  isTypeCompatibleForAssignment,
-} from '../../../../QueryBuilderValueSpecificationHelper.js';
+import { isTypeCompatibleForAssignment } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
-import { buildPrimitiveInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
+import { buildDefaultInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderPostFilterOperator_LessThan
   extends QueryBuilderPostFilterOperator
@@ -89,24 +86,16 @@ export class QueryBuilderPostFilterOperator_LessThan
       case PRIMITIVE_TYPE.FLOAT:
       case PRIMITIVE_TYPE.INTEGER:
       case PRIMITIVE_TYPE.STRICTDATE:
-      case PRIMITIVE_TYPE.DATETIME: {
-        return buildPrimitiveInstanceValue(
-          postFilterConditionState.postFilterState.tdsState.queryBuilderState
-            .graphManagerState.graph,
-          propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
-          postFilterConditionState.postFilterState.tdsState.queryBuilderState
-            .observerContext,
-        );
-      }
+      case PRIMITIVE_TYPE.DATETIME:
       case PRIMITIVE_TYPE.DATE: {
-        return buildPrimitiveInstanceValue(
+        return buildDefaultInstanceValue(
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
-          PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          propertyType,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .INTERNAL__enableInitializingDefaultSimpleExpressionValue,
         );
       }
       default:

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

@@ -35,13 +35,12 @@ import type {
 } from '../QueryBuilderPostFilterState.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
-import { buildPrimitiveInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
+import { buildDefaultInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderPostFilterOperator_StartWith
   extends QueryBuilderPostFilterOperator
@@ -71,13 +70,14 @@ export class QueryBuilderPostFilterOperator_StartWith
       postFilterConditionState.leftConditionValue.getColumnType();
     switch (propertyType?.path) {
       case PRIMITIVE_TYPE.STRING: {
-        return buildPrimitiveInstanceValue(
+        return buildDefaultInstanceValue(
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .graphManagerState.graph,
-          propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          propertyType,
           postFilterConditionState.postFilterState.tdsState.queryBuilderState
             .observerContext,
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .INTERNAL__enableInitializingDefaultSimpleExpressionValue,
         );
       }
       default:

package/src/stores/filter/QueryBuilderFilterState.ts

@@ -55,7 +55,10 @@ import {
 import type { QueryBuilderFilterOperator } from './QueryBuilderFilterOperator.js';
 import { QUERY_BUILDER_GROUP_OPERATION } from '../QueryBuilderGroupOperationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../QueryBuilderStateHashUtils.js';
-import { isValueExpressionReferencedInValue } from '../QueryBuilderValueSpecificationHelper.js';
+import {
+  isValidInstanceValue,
+  isValueExpressionReferencedInValue,
+} from '../QueryBuilderValueSpecificationHelper.js';
 import { instanceValue_setValues } from '../shared/ValueSpecificationModifierHelper.js';
 
 export enum QUERY_BUILDER_FILTER_DND_TYPE {
@@ -201,7 +204,8 @@ export class FilterConditionState implements Hashable {
       let defaultValue = this.operator.getDefaultFilterConditionValue(this);
       if (
         defaultValue instanceof CollectionInstanceValue &&
-        this.value instanceof InstanceValue
+        this.value instanceof InstanceValue &&
+        isValidInstanceValue(this.value)
       ) {
         instanceValue_setValues(
           defaultValue,
@@ -494,6 +498,9 @@ export class QueryBuilderFilterState
       collapseTree: action,
       setShowPanel: action,
       expandTree: action,
+      allValidationIssues: computed,
+      hasInvalidFilterValues: computed,
+      hasInvalidDerivedPropertyParameters: computed,
       hashCode: computed,
     });
 
@@ -953,6 +960,45 @@ export class QueryBuilderFilterState
     );
   }
 
+  get allValidationIssues(): string[] {
+    const validationIssues: string[] = [];
+    Array.from(this.nodes.values()).forEach((node) => {
+      if (node instanceof QueryBuilderFilterTreeConditionNodeData) {
+        if (
+          node.condition.value instanceof InstanceValue &&
+          !isValidInstanceValue(node.condition.value)
+        ) {
+          validationIssues.push(
+            `Filter value for ${node.condition.propertyExpressionState.title} is missing or invalid`,
+          );
+        }
+        if (!node.condition.propertyExpressionState.isValid) {
+          validationIssues.push(
+            `Derived property parameter value for ${node.condition.propertyExpressionState.title} is missing or invalid`,
+          );
+        }
+      }
+    });
+    return validationIssues;
+  }
+
+  get hasInvalidFilterValues(): boolean {
+    return Array.from(this.nodes.values()).some(
+      (node) =>
+        node instanceof QueryBuilderFilterTreeConditionNodeData &&
+        node.condition.value instanceof InstanceValue &&
+        !isValidInstanceValue(node.condition.value),
+    );
+  }
+
+  get hasInvalidDerivedPropertyParameters(): boolean {
+    return Array.from(this.nodes.values()).some(
+      (node) =>
+        node instanceof QueryBuilderFilterTreeConditionNodeData &&
+        !node.condition.propertyExpressionState.isValid,
+    );
+  }
+
   get hashCode(): string {
     return hashArray([
       QUERY_BUILDER_STATE_HASH_STRUCTURE.FILTER_STATE,

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

@@ -36,13 +36,12 @@ import {
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
-import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
+import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderFilterOperator_Contain
   extends QueryBuilderFilterOperator
@@ -79,12 +78,13 @@ export class QueryBuilderFilterOperator_Contain
         .genericType.value.rawType;
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.STRING: {
-        return buildPrimitiveInstanceValue(
+        return buildDefaultInstanceValue(
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
-          propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          propertyType,
           filterConditionState.filterState.queryBuilderState.observerContext,
+          filterConditionState.filterState.queryBuilderState
+            .INTERNAL__enableInitializingDefaultSimpleExpressionValue,
         );
       }
       default:

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

@@ -36,13 +36,12 @@ import {
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
-import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
+import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderFilterOperator_EndWith
   extends QueryBuilderFilterOperator
@@ -79,12 +78,13 @@ export class QueryBuilderFilterOperator_EndWith
         .genericType.value.rawType;
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.STRING: {
-        return buildPrimitiveInstanceValue(
+        return buildDefaultInstanceValue(
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
-          propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          propertyType,
           filterConditionState.filterState.queryBuilderState.observerContext,
+          filterConditionState.filterState.queryBuilderState
+            .INTERNAL__enableInitializingDefaultSimpleExpressionValue,
         );
       }
       default:

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

@@ -22,20 +22,11 @@ import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import {
   type ValueSpecification,
   type SimpleFunctionExpression,
-  type Enum,
   type AbstractPropertyExpression,
-  EnumValueInstanceValue,
-  GenericTypeExplicitReference,
-  GenericType,
-  EnumValueExplicitReference,
   Enumeration,
   PRIMITIVE_TYPE,
 } from '@finos/legend-graph';
-import {
-  type Hashable,
-  hashArray,
-  UnsupportedOperationError,
-} from '@finos/legend-shared';
+import { type Hashable, hashArray } from '@finos/legend-shared';
 import {
   buildFilterConditionState,
   buildFilterConditionExpression,
@@ -43,14 +34,12 @@ import {
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
   buildNotExpression,
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
   unwrapNotExpression,
 } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
-import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
-import { instanceValue_setValues } from '../../shared/ValueSpecificationModifierHelper.js';
+import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderFilterOperator_Equal
   extends QueryBuilderFilterOperator
@@ -103,64 +92,14 @@ export class QueryBuilderFilterOperator_Equal
     const propertyType =
       filterConditionState.propertyExpressionState.propertyExpression.func.value
         .genericType.value.rawType;
-    switch (propertyType.path) {
-      case PRIMITIVE_TYPE.STRING:
-      case PRIMITIVE_TYPE.BOOLEAN:
-      case PRIMITIVE_TYPE.STRICTDATE:
-      case PRIMITIVE_TYPE.DATETIME:
-      case PRIMITIVE_TYPE.NUMBER:
-      case PRIMITIVE_TYPE.DECIMAL:
-      case PRIMITIVE_TYPE.FLOAT:
-      case PRIMITIVE_TYPE.INTEGER: {
-        return buildPrimitiveInstanceValue(
-          filterConditionState.filterState.queryBuilderState.graphManagerState
-            .graph,
-          propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
-          filterConditionState.filterState.queryBuilderState.observerContext,
-        );
-      }
-      case PRIMITIVE_TYPE.DATE: {
-        return buildPrimitiveInstanceValue(
-          filterConditionState.filterState.queryBuilderState.graphManagerState
-            .graph,
-          PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
-          filterConditionState.filterState.queryBuilderState.observerContext,
-        );
-      }
-      default:
-        if (propertyType instanceof Enumeration) {
-          if (propertyType.values.length > 0) {
-            const enumValueInstanceValue = new EnumValueInstanceValue(
-              GenericTypeExplicitReference.create(
-                new GenericType(propertyType),
-              ),
-            );
-            instanceValue_setValues(
-              enumValueInstanceValue,
-              [
-                EnumValueExplicitReference.create(
-                  propertyType.values[0] as Enum,
-                ),
-              ],
-              filterConditionState.filterState.queryBuilderState
-                .observerContext,
-            );
-            return enumValueInstanceValue;
-          }
-          throw new UnsupportedOperationError(
-            `Can't get default value for filter operator '${this.getLabel(
-              filterConditionState,
-            )}' since enumeration '${propertyType.path}' has no value`,
-          );
-        }
-        throw new UnsupportedOperationError(
-          `Can't get default value for filter operator '${this.getLabel(
-            filterConditionState,
-          )}' when the LHS property is of type '${propertyType.path}'`,
-        );
-    }
+    return buildDefaultInstanceValue(
+      filterConditionState.filterState.queryBuilderState.graphManagerState
+        .graph,
+      propertyType,
+      filterConditionState.filterState.queryBuilderState.observerContext,
+      filterConditionState.filterState.queryBuilderState
+        .INTERNAL__enableInitializingDefaultSimpleExpressionValue,
+    );
   }
 
   buildFilterConditionExpression(

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

@@ -36,12 +36,11 @@ import {
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
-import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
+import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderFilterOperator_GreaterThan
   extends QueryBuilderFilterOperator
@@ -94,22 +93,15 @@ export class QueryBuilderFilterOperator_GreaterThan
       case PRIMITIVE_TYPE.FLOAT:
       case PRIMITIVE_TYPE.INTEGER:
       case PRIMITIVE_TYPE.STRICTDATE:
-      case PRIMITIVE_TYPE.DATETIME: {
-        return buildPrimitiveInstanceValue(
-          filterConditionState.filterState.queryBuilderState.graphManagerState
-            .graph,
-          propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
-          filterConditionState.filterState.queryBuilderState.observerContext,
-        );
-      }
+      case PRIMITIVE_TYPE.DATETIME:
       case PRIMITIVE_TYPE.DATE: {
-        return buildPrimitiveInstanceValue(
+        return buildDefaultInstanceValue(
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
-          PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          propertyType,
           filterConditionState.filterState.queryBuilderState.observerContext,
+          filterConditionState.filterState.queryBuilderState
+            .INTERNAL__enableInitializingDefaultSimpleExpressionValue,
         );
       }
       default:

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

@@ -36,12 +36,11 @@ import {
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
-  generateDefaultValueForPrimitiveType,
   getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
-import { buildPrimitiveInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
+import { buildDefaultInstanceValue } from '../../shared/ValueSpecificationEditorHelper.js';
 
 export class QueryBuilderFilterOperator_GreaterThanEqual
   extends QueryBuilderFilterOperator
@@ -94,22 +93,15 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
       case PRIMITIVE_TYPE.FLOAT:
       case PRIMITIVE_TYPE.INTEGER:
       case PRIMITIVE_TYPE.STRICTDATE:
-      case PRIMITIVE_TYPE.DATETIME: {
-        return buildPrimitiveInstanceValue(
-          filterConditionState.filterState.queryBuilderState.graphManagerState
-            .graph,
-          propertyType.path,
-          generateDefaultValueForPrimitiveType(propertyType.path),
-          filterConditionState.filterState.queryBuilderState.observerContext,
-        );
-      }
+      case PRIMITIVE_TYPE.DATETIME:
       case PRIMITIVE_TYPE.DATE: {
-        return buildPrimitiveInstanceValue(
+        return buildDefaultInstanceValue(
           filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph,
-          PRIMITIVE_TYPE.STRICTDATE,
-          generateDefaultValueForPrimitiveType(propertyType.path),
+          propertyType,
           filterConditionState.filterState.queryBuilderState.observerContext,
+          filterConditionState.filterState.queryBuilderState
+            .INTERNAL__enableInitializingDefaultSimpleExpressionValue,
         );
       }
       default: