@finos/legend-data-cube 0.0.40 → 0.0.42

package/src/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.tsx

@@ -32,11 +32,8 @@ import {
   _var,
 } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable, isString } from '@finos/legend-shared';
-import {
-  V1_AppliedProperty,
-  type V1_AppliedFunction,
-} from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import { _caseSensitiveBaseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -61,8 +58,8 @@ export class DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn extends Da
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       value.value !== undefined &&
+      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       isString(value.value)
     );
   }
@@ -74,20 +71,17 @@ export class DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn extends Da
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeConditionSnapshot(
+      _caseSensitiveBaseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.EQUAL,
+      ),
     );
-
-    if (value instanceof V1_AppliedProperty) {
-      filterConditionSnapshot.value = {
-        value: value.property,
-        type: DataCubeOperationAdvancedValueType.COLUMN,
-      } satisfies DataCubeOperationValue;
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__EqualColumn.tsx

@@ -32,11 +32,8 @@ import {
   _var,
 } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable, isString } from '@finos/legend-shared';
-import {
-  V1_AppliedProperty,
-  type V1_AppliedFunction,
-} from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__EqualColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -66,8 +63,8 @@ export class DataCubeQueryFilterOperation__EqualColumn extends DataCubeQueryFilt
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       value.value !== undefined &&
+      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       isString(value.value)
     );
   }
@@ -79,20 +76,13 @@ export class DataCubeQueryFilterOperation__EqualColumn extends DataCubeQueryFilt
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(expression, columnGetter, DataCubeFunction.EQUAL),
     );
-
-    if (value instanceof V1_AppliedProperty) {
-      filterConditionSnapshot.value = {
-        value: value.property,
-        type: DataCubeOperationAdvancedValueType.COLUMN,
-      } satisfies DataCubeOperationValue;
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThan.tsx

@@ -15,7 +15,7 @@
  */
 import {
   DataCubeQueryFilterOperation,
-  generateDefaultFilterConditionPrimitiveTypeValue,
+  _defaultPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
@@ -23,6 +23,7 @@ import {
   DataCubeColumnDataType,
   DataCubeFunction,
   DataCubeQueryFilterOperator,
+  isPrimitiveType,
   ofDataType,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
@@ -33,15 +34,8 @@ import {
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import {
-  V1_PrimitiveValueSpecification,
-  type V1_AppliedFunction,
-  type V1_AppliedProperty,
-} from '@finos/legend-graph';
-import {
-  _buildConditionSnapshotProperty,
-  _dataCubeOperationValue,
-} from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__GreaterThan extends DataCubeQueryFilterOperation {
   override get label() {
@@ -70,12 +64,13 @@ export class DataCubeQueryFilterOperation__GreaterThan extends DataCubeQueryFilt
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
+      value.value !== undefined &&
+      isPrimitiveType(value.type) &&
       ofDataType(value.type, [
         DataCubeColumnDataType.NUMBER,
         DataCubeColumnDataType.DATE,
         DataCubeColumnDataType.TIME,
       ]) &&
-      value.value !== undefined &&
       !Array.isArray(value.value)
     );
   }
@@ -83,20 +78,21 @@ export class DataCubeQueryFilterOperation__GreaterThan extends DataCubeQueryFilt
   generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
-      value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+      value: _defaultPrimitiveTypeValue(column.type),
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.GREATER_THAN,
+      ),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanColumn.tsx

@@ -32,11 +32,8 @@ import {
   _var,
 } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable, isString } from '@finos/legend-shared';
-import {
-  V1_AppliedProperty,
-  type V1_AppliedFunction,
-} from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__GreaterThanColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -65,8 +62,8 @@ export class DataCubeQueryFilterOperation__GreaterThanColumn extends DataCubeQue
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       value.value !== undefined &&
+      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       isString(value.value)
     );
   }
@@ -78,20 +75,17 @@ export class DataCubeQueryFilterOperation__GreaterThanColumn extends DataCubeQue
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.GREATER_THAN,
+      ),
     );
-
-    if (value instanceof V1_AppliedProperty) {
-      filterConditionSnapshot.value = {
-        value: value.property,
-        type: DataCubeOperationAdvancedValueType.COLUMN,
-      } satisfies DataCubeOperationValue;
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanOrEqual.tsx

@@ -15,7 +15,7 @@
  */
 import {
   DataCubeQueryFilterOperation,
-  generateDefaultFilterConditionPrimitiveTypeValue,
+  _defaultPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
@@ -23,6 +23,7 @@ import {
   DataCubeColumnDataType,
   DataCubeFunction,
   DataCubeQueryFilterOperator,
+  isPrimitiveType,
   ofDataType,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
@@ -33,15 +34,8 @@ import {
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import {
-  V1_PrimitiveValueSpecification,
-  type V1_AppliedFunction,
-  type V1_AppliedProperty,
-} from '@finos/legend-graph';
-import {
-  _buildConditionSnapshotProperty,
-  _dataCubeOperationValue,
-} from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__GreaterThanOrEqual extends DataCubeQueryFilterOperation {
   override get label() {
@@ -70,12 +64,13 @@ export class DataCubeQueryFilterOperation__GreaterThanOrEqual extends DataCubeQu
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
+      value.value !== undefined &&
+      isPrimitiveType(value.type) &&
       ofDataType(value.type, [
         DataCubeColumnDataType.NUMBER,
         DataCubeColumnDataType.DATE,
         DataCubeColumnDataType.TIME,
       ]) &&
-      value.value !== undefined &&
       !Array.isArray(value.value)
     );
   }
@@ -83,20 +78,21 @@ export class DataCubeQueryFilterOperation__GreaterThanOrEqual extends DataCubeQu
   generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
-      value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+      value: _defaultPrimitiveTypeValue(column.type),
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.GREATER_THAN_OR_EQUAL,
+      ),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanOrEqualColumn.tsx

@@ -32,11 +32,8 @@ import {
   _var,
 } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable, isString } from '@finos/legend-shared';
-import {
-  V1_AppliedProperty,
-  type V1_AppliedFunction,
-} from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__GreaterThanOrEqualColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -65,8 +62,8 @@ export class DataCubeQueryFilterOperation__GreaterThanOrEqualColumn extends Data
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       value.value !== undefined &&
+      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       isString(value.value)
     );
   }
@@ -78,20 +75,17 @@ export class DataCubeQueryFilterOperation__GreaterThanOrEqualColumn extends Data
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.GREATER_THAN_OR_EQUAL,
+      ),
     );
-
-    if (value instanceof V1_AppliedProperty) {
-      filterConditionSnapshot.value = {
-        value: value.property,
-        type: DataCubeOperationAdvancedValueType.COLUMN,
-      } satisfies DataCubeOperationValue;
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__IsNotNull.tsx

@@ -19,6 +19,7 @@ import type { DataCubeColumn } from '../model/DataCubeColumn.js';
 import {
   DataCubeColumnDataType,
   DataCubeFunction,
+  DataCubeOperationAdvancedValueType,
   DataCubeQueryFilterOperator,
   ofDataType,
   type DataCubeOperationValue,
@@ -29,11 +30,12 @@ import {
   _not,
   _property,
 } from '../DataCubeQueryBuilderUtils.js';
-import type {
-  V1_AppliedFunction,
-  V1_AppliedProperty,
-} from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import {
+  _unwrapNotFilterCondition,
+  _baseFilterCondition,
+} from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { returnUndefOnError } from '@finos/legend-shared';
 
 export class DataCubeQueryFilterOperation__IsNotNull extends DataCubeQueryFilterOperation {
   override get label() {
@@ -63,28 +65,30 @@ export class DataCubeQueryFilterOperation__IsNotNull extends DataCubeQueryFilter
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      ofDataType(value.type, [
-        DataCubeColumnDataType.TEXT,
-        DataCubeColumnDataType.NUMBER,
-        DataCubeColumnDataType.DATE,
-        DataCubeColumnDataType.TIME,
-      ]) &&
-      value.value !== undefined &&
-      !Array.isArray(value.value)
+      value.value === undefined &&
+      value.type === DataCubeOperationAdvancedValueType.VOID
     );
   }
 
   generateDefaultValue(column: DataCubeColumn) {
-    return undefined;
+    return {
+      type: DataCubeOperationAdvancedValueType.VOID,
+    };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    const unwrapped = returnUndefOnError(() =>
+      _unwrapNotFilterCondition(expression),
+    );
+    if (!unwrapped) {
+      return undefined;
+    }
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(unwrapped, columnGetter, DataCubeFunction.IS_EMPTY),
     );
-    filterConditionSnapshot.value = undefined;
-    return filterConditionSnapshot;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__IsNull.tsx

@@ -19,6 +19,7 @@ import type { DataCubeColumn } from '../model/DataCubeColumn.js';
 import {
   DataCubeColumnDataType,
   DataCubeFunction,
+  DataCubeOperationAdvancedValueType,
   DataCubeQueryFilterOperator,
   ofDataType,
   type DataCubeOperationValue,
@@ -28,11 +29,8 @@ import {
   _functionName,
   _property,
 } from '../DataCubeQueryBuilderUtils.js';
-import type {
-  V1_AppliedFunction,
-  V1_AppliedProperty,
-} from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__IsNull extends DataCubeQueryFilterOperation {
   override get label() {
@@ -62,28 +60,24 @@ export class DataCubeQueryFilterOperation__IsNull extends DataCubeQueryFilterOpe
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      ofDataType(value.type, [
-        DataCubeColumnDataType.TEXT,
-        DataCubeColumnDataType.NUMBER,
-        DataCubeColumnDataType.DATE,
-        DataCubeColumnDataType.TIME,
-      ]) &&
-      value.value !== undefined &&
-      !Array.isArray(value.value)
+      value.value === undefined &&
+      value.type === DataCubeOperationAdvancedValueType.VOID
     );
   }
 
   generateDefaultValue(column: DataCubeColumn) {
-    return undefined;
+    return {
+      type: DataCubeOperationAdvancedValueType.VOID,
+    };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(expression, columnGetter, DataCubeFunction.IS_EMPTY),
     );
-    filterConditionSnapshot.value = undefined;
-    return filterConditionSnapshot;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__LessThan.tsx

@@ -16,7 +16,7 @@
 
 import {
   DataCubeQueryFilterOperation,
-  generateDefaultFilterConditionPrimitiveTypeValue,
+  _defaultPrimitiveTypeValue,
 } from './DataCubeQueryFilterOperation.js';
 import type { DataCubeQuerySnapshotFilterCondition } from '../DataCubeQuerySnapshot.js';
 import type { DataCubeColumn } from '../model/DataCubeColumn.js';
@@ -24,6 +24,7 @@ import {
   DataCubeColumnDataType,
   DataCubeFunction,
   DataCubeQueryFilterOperator,
+  isPrimitiveType,
   ofDataType,
   type DataCubeOperationValue,
 } from '../DataCubeQueryEngine.js';
@@ -34,15 +35,8 @@ import {
   _value,
 } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import {
-  V1_PrimitiveValueSpecification,
-  type V1_AppliedFunction,
-  type V1_AppliedProperty,
-} from '@finos/legend-graph';
-import {
-  _buildConditionSnapshotProperty,
-  _dataCubeOperationValue,
-} from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__LessThan extends DataCubeQueryFilterOperation {
   override get label() {
@@ -71,12 +65,13 @@ export class DataCubeQueryFilterOperation__LessThan extends DataCubeQueryFilterO
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
+      value.value !== undefined &&
+      isPrimitiveType(value.type) &&
       ofDataType(value.type, [
         DataCubeColumnDataType.NUMBER,
         DataCubeColumnDataType.DATE,
         DataCubeColumnDataType.TIME,
       ]) &&
-      value.value !== undefined &&
       !Array.isArray(value.value)
     );
   }
@@ -84,20 +79,21 @@ export class DataCubeQueryFilterOperation__LessThan extends DataCubeQueryFilterO
   generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
-      value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+      value: _defaultPrimitiveTypeValue(column.type),
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.LESS_THAN,
+      ),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__LessThanColumn.tsx

@@ -32,11 +32,8 @@ import {
   _var,
 } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable, isString } from '@finos/legend-shared';
-import {
-  V1_AppliedProperty,
-  type V1_AppliedFunction,
-} from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import { type V1_AppliedFunction } from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__LessThanColumn extends DataCubeQueryFilterOperation {
   override get label() {
@@ -65,8 +62,8 @@ export class DataCubeQueryFilterOperation__LessThanColumn extends DataCubeQueryF
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       value.value !== undefined &&
+      value.type === DataCubeOperationAdvancedValueType.COLUMN &&
       isString(value.value)
     );
   }
@@ -78,20 +75,17 @@ export class DataCubeQueryFilterOperation__LessThanColumn extends DataCubeQueryF
     };
   }
 
-  buildConditionSnapshot(expression: V1_AppliedFunction) {
-    const value = expression.parameters[1];
-    const filterConditionSnapshot = _buildConditionSnapshotProperty(
-      expression.parameters[0] as V1_AppliedProperty,
-      this.operator,
+  buildConditionSnapshot(
+    expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
+  ) {
+    return this._finalizeConditionSnapshot(
+      _baseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.LESS_THAN,
+      ),
     );
-
-    if (value instanceof V1_AppliedProperty) {
-      filterConditionSnapshot.value = {
-        value: value.property,
-        type: DataCubeOperationAdvancedValueType.COLUMN,
-      } satisfies DataCubeOperationValue;
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {