@finos/legend-query-builder 4.14.75 → 4.14.76

package/src/components/shared/CustomDatePicker.tsx

@@ -1320,21 +1320,23 @@ export const CustomDatePicker: React.FC<{
       const theReservedCustomDateOption = reservedCustomDateOptions.filter(
         (d) => d.value === chosenDatePickerOption.value,
       );
-      theReservedCustomDateOption.length > 0
-        ? setValueSpecification(
-            buildPureAdjustDateFunction(
-              guaranteeNonNullable(theReservedCustomDateOption[0]),
-              graph,
-              observerContext,
-            ),
-          )
-        : setValueSpecification(
-            buildPureDateFunctionExpression(
-              chosenDatePickerOption,
-              graph,
-              observerContext,
-            ),
-          );
+      if (theReservedCustomDateOption.length > 0) {
+        setValueSpecification(
+          buildPureAdjustDateFunction(
+            guaranteeNonNullable(theReservedCustomDateOption[0]),
+            graph,
+            observerContext,
+          ),
+        );
+      } else {
+        setValueSpecification(
+          buildPureDateFunctionExpression(
+            chosenDatePickerOption,
+            graph,
+            observerContext,
+          ),
+        );
+      }
     }
     setDatePickerOption(chosenDatePickerOption);
   };

package/src/graph-manager/QueryBuilder_GraphManagerPreset.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import packageJson from '../../package.json' assert { type: 'json' };
+import packageJson from '../../package.json' with { type: 'json' };
 import { AbstractPreset } from '@finos/legend-shared';
 import { QueryBuilder_PureProtocolProcessorPlugin } from './protocol/pure/QueryBuilder_PureProtocolProcessorPlugin.js';
 import { QueryBuilder_PureGraphManagerPlugin } from './QueryBuilder_PureGraphManagerPlugin.js';

package/src/graph-manager/QueryBuilder_PureGraphManagerPlugin.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import packageJson from '../../package.json' assert { type: 'json' };
+import packageJson from '../../package.json' with { type: 'json' };
 import {
   PureGraphManagerPlugin,
   type PureGraphManagerExtensionBuilder,

package/src/graph-manager/protocol/pure/QueryBuilder_PureProtocolProcessorPlugin.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import packageJson from '../../../../package.json' assert { type: 'json' };
+import packageJson from '../../../../package.json' with { type: 'json' };
 import {
   V1_buildExistsFunctionExpression,
   V1_buildFilterFunctionExpression,

package/src/stores/QueryBuilderState.ts

@@ -111,6 +111,7 @@ import { QUERY_BUILDER_EVENT } from '../__lib__/QueryBuilderEvent.js';
 import { QueryBuilderChangeHistoryState } from './QueryBuilderChangeHistoryState.js';
 import { type QueryBuilderWorkflowState } from './query-workflow/QueryBuilderWorkFlowState.js';
 
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface QueryableSourceInfo {}
 
 export type QueryableClassMappingRuntimeInfo = QueryableSourceInfo & {

package/src/stores/QueryBuilderValueSpecificationHelper.ts

@@ -213,7 +213,7 @@ export const isPropertyExpressionChainOptional = (
 
 export const isTypeCompatibleForAssignment = (
   type: Type | undefined,
-  assignmentType: Type,
+  assignmentType: Type | undefined,
 ): boolean => {
   const NUMERIC_PRIMITIVE_TYPES = [
     PRIMITIVE_TYPE.NUMBER,
@@ -231,6 +231,7 @@ export const isTypeCompatibleForAssignment = (
   // When changing the return type for LHS, the RHS value should be adjusted accordingly.
   return (
     type !== undefined &&
+    assignmentType !== undefined &&
     // Numeric value is handled loosely because of autoboxing
     // e.g. LHS (integer) = RHS (float) is acceptable
     ((NUMERIC_PRIMITIVE_TYPES.includes(type.path) &&

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

@@ -19,13 +19,13 @@ import {
   type PureModel,
   type Type,
   type ValueSpecification,
-  type VariableExpression,
   type SimpleFunctionExpression,
   type ExecutionResultWithMetadata,
   observe_ValueSpecification,
   PrimitiveType,
   CollectionInstanceValue,
   InstanceValue,
+  VariableExpression,
 } from '@finos/legend-graph';
 import {
   type GeneratorFn,
@@ -74,11 +74,13 @@ import type { QueryBuilderTDSColumnState } from '../QueryBuilderTDSColumnState.j
 import {
   getCollectionValueSpecificationType,
   getNonCollectionValueSpecificationType,
+  isTypeCompatibleForAssignment,
   isValidInstanceValue,
   isValueExpressionReferencedInValue,
 } from '../../../QueryBuilderValueSpecificationHelper.js';
 import { buildtdsPropertyExpressionFromColState } from './operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { TDS_COLUMN_GETTER } from '../../../../graph/QueryBuilderMetaModelConst.js';
+import type { QueryBuilderFilterTreeNodeData } from '../../../filter/QueryBuilderFilterState.js';
 
 export enum QUERY_BUILDER_POST_FILTER_DND_TYPE {
   GROUP_CONDITION = 'QUERY_BUILDER_POST_FILTER_DND_TYPE.GROUP_CONDITION',
@@ -1012,15 +1014,45 @@ export class QueryBuilderPostFilterState
     );
   }
 
+  isInvalidValueSpecPostFilterValue(
+    node: QueryBuilderPostFilterTreeNodeData,
+  ): boolean {
+    return (
+      node instanceof QueryBuilderPostFilterTreeConditionNodeData &&
+      node.condition.rightConditionValue instanceof
+        PostFilterValueSpecConditionValueState &&
+      ((node.condition.rightConditionValue.value instanceof InstanceValue &&
+        !isValidInstanceValue(node.condition.rightConditionValue.value)) ||
+        (node.condition.rightConditionValue.value instanceof
+          VariableExpression &&
+          !isTypeCompatibleForAssignment(
+            node.condition.leftConditionValue.getColumnType(),
+            node.condition.rightConditionValue.type,
+          )))
+    );
+  }
+
+  isInvalidTDSColumnPostFilterValue(
+    node: QueryBuilderFilterTreeNodeData,
+  ): boolean {
+    return (
+      node instanceof QueryBuilderPostFilterTreeConditionNodeData &&
+      node.condition.rightConditionValue instanceof
+        PostFilterTDSColumnValueConditionValueState &&
+      !isTypeCompatibleForAssignment(
+        node.condition.leftConditionValue.getColumnType(),
+        node.condition.rightConditionValue.type,
+      )
+    );
+  }
+
   get allValidationIssues(): string[] {
     const validationIssues: string[] = [];
     Array.from(this.nodes.values()).forEach((node) => {
       if (node instanceof QueryBuilderPostFilterTreeConditionNodeData) {
         if (
-          node.condition.rightConditionValue instanceof
-            PostFilterValueSpecConditionValueState &&
-          node.condition.rightConditionValue.value instanceof InstanceValue &&
-          !isValidInstanceValue(node.condition.rightConditionValue.value)
+          this.isInvalidValueSpecPostFilterValue(node) ||
+          this.isInvalidTDSColumnPostFilterValue(node)
         ) {
           validationIssues.push(
             `Filter value for ${node.condition.leftConditionValue.columnName} is missing or invalid`,
@@ -1043,11 +1075,8 @@ export class QueryBuilderPostFilterState
   get hasInvalidFilterValues(): boolean {
     return Array.from(this.nodes.values()).some(
       (node) =>
-        node instanceof QueryBuilderPostFilterTreeConditionNodeData &&
-        node.condition.rightConditionValue instanceof
-          PostFilterValueSpecConditionValueState &&
-        node.condition.rightConditionValue.value instanceof InstanceValue &&
-        !isValidInstanceValue(node.condition.rightConditionValue.value),
+        this.isInvalidValueSpecPostFilterValue(node) ||
+        this.isInvalidTDSColumnPostFilterValue(node),
     );
   }
 

package/src/stores/filter/QueryBuilderFilterState.ts

@@ -38,7 +38,6 @@ import { QueryBuilderPropertyExpressionState } from '../QueryBuilderPropertyEdit
 import type { QueryBuilderState } from '../QueryBuilderState.js';
 import {
   type ValueSpecification,
-  type VariableExpression,
   type Type,
   type ExecutionResultWithMetadata,
   AbstractPropertyExpression,
@@ -46,6 +45,7 @@ import {
   CollectionInstanceValue,
   InstanceValue,
   SimpleFunctionExpression,
+  VariableExpression,
   matchFunctionName,
 } from '@finos/legend-graph';
 import { DEFAULT_LAMBDA_VARIABLE_NAME } from '../QueryBuilderConfig.js';
@@ -61,6 +61,7 @@ import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../QueryBuilderStateHashUtil
 import {
   getCollectionValueSpecificationType,
   getNonCollectionValueSpecificationType,
+  isTypeCompatibleForAssignment,
   isValidInstanceValue,
   isValueExpressionReferencedInValue,
 } from '../QueryBuilderValueSpecificationHelper.js';
@@ -1186,8 +1187,15 @@ export class QueryBuilderFilterState
       node instanceof QueryBuilderFilterTreeConditionNodeData &&
       node.condition.rightConditionValue instanceof
         FilterValueSpecConditionValueState &&
-      node.condition.rightConditionValue.value instanceof InstanceValue &&
-      !isValidInstanceValue(node.condition.rightConditionValue.value)
+      ((node.condition.rightConditionValue.value instanceof InstanceValue &&
+        !isValidInstanceValue(node.condition.rightConditionValue.value)) ||
+        (node.condition.rightConditionValue.value instanceof
+          VariableExpression &&
+          !isTypeCompatibleForAssignment(
+            node.condition.propertyExpressionState.propertyExpression.func.value
+              .genericType.value.rawType,
+            node.condition.rightConditionValue.value.genericType?.value.rawType,
+          )))
     );
   }
 

package/src/stores/shared/ValueSpecificationModifierHelper.ts

@@ -55,7 +55,6 @@ export const valueSpecification_setMultiplicity = action(
 export const simpleFunctionExpression_setFunc = action(
   (
     target: SimpleFunctionExpression,
-    // eslint-disable-next-line @typescript-eslint/ban-types
     val: PackageableElementReference<Function> | undefined,
   ): void => {
     target.func = val ? observe_PackageableElementReference(val) : undefined;