@finos/legend-application-query 5.0.1 → 5.0.2

package/src/components/QueryBuilderResultPanel.tsx

@@ -25,6 +25,7 @@ import {
   CaretDownIcon,
   ContextMenu,
   clsx,
+  PauseCircleIcon,
 } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
 import { flowResult } from 'mobx';
@@ -413,21 +414,25 @@ export const QueryBuilderResultPanel = observer(
         ],
       });
     };
-    const execute = (): void => {
+    const runQuery = (): void => {
       if (queryParametersState.parameterStates.length) {
         queryParametersState.parameterValuesEditorState.open(
           (): Promise<void> =>
-            flowResult(resultState.execute()).catch(
+            flowResult(resultState.runQuery()).catch(
               applicationStore.alertUnhandledError,
             ),
           PARAMETER_SUBMIT_ACTION.EXECUTE,
         );
       } else {
-        flowResult(resultState.execute()).catch(
+        flowResult(resultState.runQuery()).catch(
           applicationStore.alertUnhandledError,
         );
       }
     };
+    const cancelQuery = (): void => {
+      resultState.setIsRunningQuery(false);
+      queryBuilderState.resultState.setQueryRunPromise(undefined);
+    };
     const generatePlan = applicationStore.guardUnhandledError(() =>
       flowResult(resultState.generatePlan(false)),
     );
@@ -469,52 +474,65 @@ export const QueryBuilderResultPanel = observer(
                   type="number"
                   value={resultState.previewLimit}
                   onChange={changeLimit}
+                  disabled={!queryBuilderState.isValidQueryBuilderState()}
                 />
               </div>
             )}
-            <button
-              className="query-builder__result__execute-btn"
-              onClick={execute}
-              disabled={
-                resultState.isExecutingQuery || resultState.isGeneratingPlan
-              }
-              tabIndex={-1}
-            >
-              <div className="query-builder__result__execute-btn__label">
-                <PlayIcon className="query-builder__result__execute-btn__label__icon" />
-                <div className="query-builder__result__execute-btn__label__title">
-                  Run Query
+            {resultState.isRunningQuery ? (
+              <button
+                className="query-builder__result__stop-btn"
+                onClick={cancelQuery}
+                tabIndex={-1}
+                disabled={!queryBuilderState.isValidQueryBuilderState()}
+              >
+                <div className="btn--dark btn--caution query-builder__result__stop-btn__label">
+                  <PauseCircleIcon className="query-builder__result__stop-btn__label__icon" />
+                  <div className="query-builder__result__stop-btn__label__title">
+                    Stop
+                  </div>
                 </div>
-              </div>
-              <DropdownMenu
-                className="query-builder__result__execute-btn__dropdown-btn"
-                disabled={
-                  resultState.isExecutingQuery || resultState.isGeneratingPlan
-                }
-                content={
-                  <MenuContent>
-                    <MenuContentItem
-                      className="query-builder__result__execute-btn__option"
-                      onClick={generatePlan}
-                    >
-                      Generate Plan
-                    </MenuContentItem>
-                    <MenuContentItem
-                      className="query-builder__result__execute-btn__option"
-                      onClick={debugPlanGeneration}
-                    >
-                      Debug
-                    </MenuContentItem>
-                  </MenuContent>
-                }
-                menuProps={{
-                  anchorOrigin: { vertical: 'bottom', horizontal: 'right' },
-                  transformOrigin: { vertical: 'top', horizontal: 'right' },
-                }}
+              </button>
+            ) : (
+              <button
+                className="query-builder__result__execute-btn"
+                onClick={runQuery}
+                tabIndex={-1}
+                disabled={!queryBuilderState.isValidQueryBuilderState()}
               >
-                <CaretDownIcon />
-              </DropdownMenu>
-            </button>
+                <div className="query-builder__result__execute-btn__label">
+                  <PlayIcon className="query-builder__result__execute-btn__label__icon" />
+                  <div className="query-builder__result__execute-btn__label__title">
+                    Run Query
+                  </div>
+                </div>
+                <DropdownMenu
+                  className="query-builder__result__execute-btn__dropdown-btn"
+                  disabled={resultState.isGeneratingPlan}
+                  content={
+                    <MenuContent>
+                      <MenuContentItem
+                        className="query-builder__result__execute-btn__option"
+                        onClick={generatePlan}
+                      >
+                        Generate Plan
+                      </MenuContentItem>
+                      <MenuContentItem
+                        className="query-builder__result__execute-btn__option"
+                        onClick={debugPlanGeneration}
+                      >
+                        Debug
+                      </MenuContentItem>
+                    </MenuContent>
+                  }
+                  menuProps={{
+                    anchorOrigin: { vertical: 'bottom', horizontal: 'right' },
+                    transformOrigin: { vertical: 'top', horizontal: 'right' },
+                  }}
+                >
+                  <CaretDownIcon />
+                </DropdownMenu>
+              </button>
+            )}
             <DropdownMenu
               className="query-builder__result__export__dropdown"
               content={
@@ -542,19 +560,24 @@ export const QueryBuilderResultPanel = observer(
                 className="query-builder__result__export__dropdown__label"
                 tabIndex={-1}
                 title="Export"
+                disabled={!queryBuilderState.isValidQueryBuilderState()}
               >
                 Export
               </button>
-              <div className="query-builder__result__export__dropdown__trigger">
+              <button
+                className="query-builder__result__export__dropdown__trigger"
+                tabIndex={-1}
+                disabled={!queryBuilderState.isValidQueryBuilderState()}
+              >
                 <CaretDownIcon />
-              </div>
+              </button>
             </DropdownMenu>
           </div>
         </div>
         <div className="panel__content">
           <PanelLoadingIndicator
             isLoading={
-              resultState.isExecutingQuery ||
+              resultState.isRunningQuery ||
               resultState.isGeneratingPlan ||
               resultState.exportDataState.isInProgress
             }

package/src/stores/QueryBuilderExplorerState.ts

@@ -50,6 +50,8 @@ import {
   EntityMappedProperty,
   Enumeration,
   DerivedProperty,
+  Property,
+  Association,
 } from '@finos/legend-graph';
 import type { QueryBuilderState } from './QueryBuilderState.js';
 import {
@@ -342,7 +344,7 @@ export const getQueryBuilderPropertyNodeData = (
   property: AbstractProperty,
   parentNode: QueryBuilderExplorerTreeNodeData,
   modelCoverageAnalysisResult: MappingModelCoverageAnalysisResult,
-): QueryBuilderExplorerTreePropertyNodeData => {
+): QueryBuilderExplorerTreePropertyNodeData | undefined => {
   const mappingNodeData = generatePropertyNodeMappingData(
     property,
     parentNode.mappingData,
@@ -353,6 +355,16 @@ export const getQueryBuilderPropertyNodeData = (
     parentNode.isPartOfDerivedPropertyBranch ||
     (parentNode instanceof QueryBuilderExplorerTreePropertyNodeData &&
       parentNode.property instanceof DerivedProperty);
+  if (
+    property instanceof Property &&
+    parentNode instanceof QueryBuilderExplorerTreePropertyNodeData &&
+    parentNode.property instanceof Property &&
+    property._OWNER instanceof Association &&
+    parentNode.property._OWNER instanceof Association &&
+    parentNode.property._OWNER === property._OWNER
+  ) {
+    return undefined;
+  }
   const propertyNode = new QueryBuilderExplorerTreePropertyNodeData(
     `${
       parentNode instanceof QueryBuilderExplorerTreeRootNodeData
@@ -455,8 +467,10 @@ const getQueryBuilderTreeData = (
         treeRootNode,
         modelCoverageAnalysisResult,
       );
-      addUniqueEntry(treeRootNode.childrenIds, propertyTreeNodeData.id);
-      nodes.set(propertyTreeNodeData.id, propertyTreeNodeData);
+      if (propertyTreeNodeData) {
+        addUniqueEntry(treeRootNode.childrenIds, propertyTreeNodeData.id);
+        nodes.set(propertyTreeNodeData.id, propertyTreeNodeData);
+      }
     });
   rootClass._subclasses.forEach((subclass) => {
     const subTypeTreeNodeData = getQueryBuilderSubTypeNodeData(

package/src/stores/QueryBuilderFilterState.ts

@@ -55,6 +55,7 @@ import {
   fromGroupOperation,
   QUERY_BUILDER_GROUP_OPERATION,
 } from './QueryBuilderOperatorsHelper.js';
+import type { QueryBuilderProjectionColumnDragSource } from './QueryBuilderProjectionState.js';
 
 export abstract class QueryBuilderFilterOperator {
   readonly uuid = uuid();
@@ -95,6 +96,7 @@ export interface QueryBuilderFilterConditionDragSource {
 
 export type QueryBuilderFilterDropTarget =
   | QueryBuilderExplorerTreeDragSource
+  | QueryBuilderProjectionColumnDragSource
   | QueryBuilderFilterConditionDragSource;
 export type QueryBuilderFilterConditionRearrangeDropTarget =
   QueryBuilderFilterConditionDragSource;
@@ -407,6 +409,11 @@ export class QueryBuilderFilterState
   isRearrangingConditions = false;
   operators: QueryBuilderFilterOperator[] = [];
   private _suppressClickawayEventListener = false;
+  /**
+   * 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.
+   */
+  allowDnDProjectionToFilter = true;
 
   constructor(
     queryBuilderState: QueryBuilderState,

package/src/stores/QueryBuilderOperatorsHelper.ts

@@ -29,6 +29,7 @@ import {
   EnumValueInstanceValue,
   VariableExpression,
   AbstractPropertyExpression,
+  isSuperType,
 } from '@finos/legend-graph';
 import {
   addUniqueEntry,
@@ -189,3 +190,37 @@ export const isPropertyExpressionChainOptional = (
   }
   return isOptional;
 };
+
+export const isTypeCompatibleWithConditionValueType = (
+  type: Type | undefined,
+  conditionValueType: Type,
+): boolean => {
+  const NUMERIC_PRIMITIVE_TYPES = [
+    PRIMITIVE_TYPE.NUMBER,
+    PRIMITIVE_TYPE.INTEGER,
+    PRIMITIVE_TYPE.DECIMAL,
+    PRIMITIVE_TYPE.FLOAT,
+  ] as string[];
+  const DATE_PRIMITIVE_TYPES = [
+    PRIMITIVE_TYPE.DATE,
+    PRIMITIVE_TYPE.DATETIME,
+    PRIMITIVE_TYPE.STRICTDATE,
+    PRIMITIVE_TYPE.LATESTDATE,
+  ] as string[];
+
+  // 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(conditionValueType.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 === conditionValueType ||
+      isSuperType(conditionValueType, type))
+  );
+};

package/src/stores/QueryBuilderProjectionState.ts

@@ -793,4 +793,19 @@ export class QueryBuilderProjectionState {
       );
     }
   }
+
+  isValidProjectionState(): boolean {
+    if (this.queryBuilderState.fetchStructureState.isProjectionMode()) {
+      // duplicate columns check
+      const hasDuplicatedProjectionColumns = this.columns.some(
+        (column) =>
+          this.columns.filter((c) => c.columnName === column.columnName)
+            .length > 1,
+      );
+      // no columns check
+      const hasNoProjectionColumns = this.columns.length === 0;
+      return !hasDuplicatedProjectionColumns && !hasNoProjectionColumns;
+    }
+    return true;
+  }
 }

package/src/stores/QueryBuilderPropertySearchPanelState.ts

@@ -262,7 +262,7 @@ export class QueryBuilderPropertySearchPanelState {
                 ),
               );
               if (
-                propertyTreeNodeData.mappingData.mapped &&
+                propertyTreeNodeData?.mappingData.mapped &&
                 !propertyTreeNodeData.isPartOfDerivedPropertyBranch
               ) {
                 nextLevelPropertyNodes.push(propertyTreeNodeData);

package/src/stores/QueryBuilderResultState.ts

@@ -48,16 +48,18 @@ export class QueryBuilderResultState {
   queryBuilderState: QueryBuilderState;
   exportDataState = ActionState.create();
   previewLimit = DEFAULT_LIMIT;
-  isExecutingQuery = false;
+  isRunningQuery = false;
   isGeneratingPlan = false;
   executionResult?: ExecutionResult | undefined;
   executionPlanState: ExecutionPlanState;
   executionDuration?: number | undefined;
+  queryRunPromise: Promise<ExecutionResult> | undefined = undefined;
 
   constructor(queryBuilderState: QueryBuilderState) {
     makeAutoObservable(this, {
       queryBuilderState: false,
       executionPlanState: false,
+      setIsRunningQuery: action,
       setExecutionResult: action,
     });
 
@@ -68,16 +70,28 @@ export class QueryBuilderResultState {
     );
   }
 
+  setIsRunningQuery = (val: boolean): void => {
+    this.isRunningQuery = val;
+  };
+
   setExecutionResult = (val: ExecutionResult | undefined): void => {
     this.executionResult = val;
   };
+
   setExecutionDuration = (val: number | undefined): void => {
     this.executionDuration = val;
   };
+
   setPreviewLimit = (val: number): void => {
     this.previewLimit = Math.max(1, val);
   };
 
+  setQueryRunPromise = (
+    promise: Promise<ExecutionResult> | undefined,
+  ): void => {
+    this.queryRunPromise = promise;
+  };
+
   buildExecutionRawLambda(): RawLambda {
     let query: RawLambda;
     if (this.queryBuilderState.isQuerySupported()) {
@@ -172,9 +186,9 @@ export class QueryBuilderResultState {
     }
   }
 
-  *execute(): GeneratorFn<void> {
+  *runQuery(): GeneratorFn<void> {
     try {
-      this.isExecutingQuery = true;
+      this.isRunningQuery = true;
       const mapping = guaranteeNonNullable(
         this.queryBuilderState.querySetupState.mapping,
         'Mapping is required to execute query',
@@ -185,15 +199,19 @@ export class QueryBuilderResultState {
       );
       const query = this.buildExecutionRawLambda();
       const startTime = Date.now();
-      const result =
-        (yield this.queryBuilderState.graphManagerState.graphManager.executeMapping(
+      const promise =
+        this.queryBuilderState.graphManagerState.graphManager.executeMapping(
           query,
           mapping,
           runtime,
           this.queryBuilderState.graphManagerState.graph,
-        )) as ExecutionResult;
-      this.setExecutionResult(result);
-      this.setExecutionDuration(Date.now() - startTime);
+        );
+      this.setQueryRunPromise(promise);
+      const result = (yield promise) as ExecutionResult;
+      if (this.queryRunPromise === promise) {
+        this.setExecutionResult(result);
+        this.setExecutionDuration(Date.now() - startTime);
+      }
     } catch (error) {
       assertErrorThrown(error);
       this.queryBuilderState.applicationStore.log.error(
@@ -202,7 +220,7 @@ export class QueryBuilderResultState {
       );
       this.queryBuilderState.applicationStore.notifyError(error);
     } finally {
-      this.isExecutingQuery = false;
+      this.setIsRunningQuery(false);
     }
   }
 

package/src/stores/QueryBuilderState.ts

@@ -558,4 +558,8 @@ export class QueryBuilderState {
       this.fetchStructureState.graphFetchTreeState.initialize();
     }
   }
+
+  isValidQueryBuilderState(): boolean {
+    return this.fetchStructureState.projectionState.isValidProjectionState();
+  }
 }

package/src/stores/filterOperators/QueryBuilderFilterOperator_Equal.ts

@@ -31,7 +31,6 @@ import {
   EnumValueExplicitReference,
   Enumeration,
   PRIMITIVE_TYPE,
-  isSuperType,
   SUPPORTED_FUNCTIONS,
   buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
@@ -46,6 +45,7 @@ import {
   buildNotExpression,
   unwrapNotExpression,
   getNonCollectionValueSpecificationType,
+  isTypeCompatibleWithConditionValueType,
 } from '../QueryBuilderOperatorsHelper.js';
 
 export class QueryBuilderFilterOperator_Equal extends QueryBuilderFilterOperator {
@@ -81,41 +81,12 @@ export class QueryBuilderFilterOperator_Equal extends QueryBuilderFilterOperator
   isCompatibleWithFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
+    return isTypeCompatibleWithConditionValueType(
+      filterConditionState.value
+        ? getNonCollectionValueSpecificationType(filterConditionState.value)
+        : undefined,
       filterConditionState.propertyExpressionState.propertyExpression.func
-        .genericType.value.rawType;
-    const type = filterConditionState.value
-      ? getNonCollectionValueSpecificationType(filterConditionState.value)
-      : undefined;
-
-    const NUMERIC_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.NUMBER,
-      PRIMITIVE_TYPE.INTEGER,
-      PRIMITIVE_TYPE.DECIMAL,
-      PRIMITIVE_TYPE.FLOAT,
-    ] as string[];
-
-    const DATE_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.DATE,
-      PRIMITIVE_TYPE.DATETIME,
-      PRIMITIVE_TYPE.STRICTDATE,
-      PRIMITIVE_TYPE.LATESTDATE,
-    ] as string[];
-
-    // 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(propertyType.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 === propertyType ||
-        isSuperType(propertyType, type))
+        .genericType.value.rawType,
     );
   }
 

package/src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThan.ts

@@ -24,7 +24,6 @@ import {
   type SimpleFunctionExpression,
   type AbstractPropertyExpression,
   PRIMITIVE_TYPE,
-  isSuperType,
   SUPPORTED_FUNCTIONS,
   buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
@@ -35,7 +34,10 @@ import {
 } from './QueryBuilderFilterOperatorHelper.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
 import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
-import { getNonCollectionValueSpecificationType } from '../QueryBuilderOperatorsHelper.js';
+import {
+  getNonCollectionValueSpecificationType,
+  isTypeCompatibleWithConditionValueType,
+} from '../QueryBuilderOperatorsHelper.js';
 
 export class QueryBuilderFilterOperator_GreaterThan extends QueryBuilderFilterOperator {
   getLabel(filterConditionState: FilterConditionState): string {
@@ -64,40 +66,12 @@ export class QueryBuilderFilterOperator_GreaterThan extends QueryBuilderFilterOp
   isCompatibleWithFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
+    return isTypeCompatibleWithConditionValueType(
+      filterConditionState.value
+        ? getNonCollectionValueSpecificationType(filterConditionState.value)
+        : undefined,
       filterConditionState.propertyExpressionState.propertyExpression.func
-        .genericType.value.rawType;
-    const type = filterConditionState.value
-      ? getNonCollectionValueSpecificationType(filterConditionState.value)
-      : undefined;
-    const NUMERIC_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.NUMBER,
-      PRIMITIVE_TYPE.INTEGER,
-      PRIMITIVE_TYPE.DECIMAL,
-      PRIMITIVE_TYPE.FLOAT,
-    ] as string[];
-
-    const DATE_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.DATE,
-      PRIMITIVE_TYPE.DATETIME,
-      PRIMITIVE_TYPE.STRICTDATE,
-      PRIMITIVE_TYPE.LATESTDATE,
-    ] as string[];
-
-    // 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(propertyType.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 === propertyType ||
-        isSuperType(propertyType, type))
+        .genericType.value.rawType,
     );
   }
 

package/src/stores/filterOperators/QueryBuilderFilterOperator_GreaterThanEqual.ts

@@ -24,7 +24,6 @@ import {
   type ValueSpecification,
   type SimpleFunctionExpression,
   type AbstractPropertyExpression,
-  isSuperType,
   SUPPORTED_FUNCTIONS,
   buildPrimitiveInstanceValue,
 } from '@finos/legend-graph';
@@ -35,7 +34,10 @@ import {
 } from './QueryBuilderFilterOperatorHelper.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
 import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
-import { getNonCollectionValueSpecificationType } from '../QueryBuilderOperatorsHelper.js';
+import {
+  getNonCollectionValueSpecificationType,
+  isTypeCompatibleWithConditionValueType,
+} from '../QueryBuilderOperatorsHelper.js';
 
 export class QueryBuilderFilterOperator_GreaterThanEqual extends QueryBuilderFilterOperator {
   getLabel(filterConditionState: FilterConditionState): string {
@@ -64,40 +66,12 @@ export class QueryBuilderFilterOperator_GreaterThanEqual extends QueryBuilderFil
   isCompatibleWithFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
+    return isTypeCompatibleWithConditionValueType(
+      filterConditionState.value
+        ? getNonCollectionValueSpecificationType(filterConditionState.value)
+        : undefined,
       filterConditionState.propertyExpressionState.propertyExpression.func
-        .genericType.value.rawType;
-    const type = filterConditionState.value
-      ? getNonCollectionValueSpecificationType(filterConditionState.value)
-      : undefined;
-    const NUMERIC_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.NUMBER,
-      PRIMITIVE_TYPE.INTEGER,
-      PRIMITIVE_TYPE.DECIMAL,
-      PRIMITIVE_TYPE.FLOAT,
-    ] as string[];
-
-    const DATE_PRIMITIVE_TYPES = [
-      PRIMITIVE_TYPE.DATE,
-      PRIMITIVE_TYPE.DATETIME,
-      PRIMITIVE_TYPE.STRICTDATE,
-      PRIMITIVE_TYPE.LATESTDATE,
-    ] as string[];
-
-    // 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(propertyType.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 === propertyType ||
-        isSuperType(propertyType, type))
+        .genericType.value.rawType,
     );
   }