@finos/legend-data-cube 0.0.40 → 0.0.42

package/src/stores/core/filter/DataCubeQueryFilterEditorState.ts

@@ -64,13 +64,13 @@ export abstract class DataCubeFilterEditorTreeNode {
 export class DataCubeFilterEditorConditionTreeNode extends DataCubeFilterEditorTreeNode {
   column: DataCubeColumn;
   operation: DataCubeQueryFilterOperation;
-  value: DataCubeOperationValue | undefined;
+  value!: DataCubeOperationValue;
 
   constructor(
     parent: DataCubeFilterEditorConditionGroupTreeNode | undefined,
     column: DataCubeColumn,
     operation: DataCubeQueryFilterOperation,
-    value: DataCubeOperationValue | undefined,
+    value: DataCubeOperationValue,
     not: boolean | undefined,
   ) {
     super(parent, not);
@@ -100,18 +100,14 @@ export class DataCubeFilterEditorConditionTreeNode extends DataCubeFilterEditorT
     this.operation = operation;
   }
 
-  setValue(value: DataCubeOperationValue | undefined) {
-    this.value = value
-      ? isObservable(value)
-        ? value
-        : makeObservable(value, { value: observable })
-      : undefined;
+  setValue(value: DataCubeOperationValue) {
+    this.value = isObservable(value)
+      ? value
+      : makeObservable(value, { value: observable });
   }
 
   updateValue(value: unknown) {
-    if (this.value) {
-      this.value.value = value;
-    }
+    this.value.value = value;
   }
 }
 

package/src/stores/core/filter/DataCubeQueryFilterOperation.ts

@@ -31,9 +31,7 @@ import {
 
 // --------------------------------- UTILITIES ---------------------------------
 
-export function generateDefaultFilterConditionPrimitiveTypeValue(
-  type: string,
-): unknown {
+export function _defaultPrimitiveTypeValue(type: string): unknown {
   switch (type) {
     case PRIMITIVE_TYPE.STRING:
       return '';
@@ -80,14 +78,38 @@ export abstract class DataCubeQueryFilterOperation {
   abstract isCompatibleWithColumn(column: DataCubeColumn): boolean;
   abstract isCompatibleWithValue(value: DataCubeOperationValue): boolean;
 
-  abstract generateDefaultValue(
-    column: DataCubeColumn,
-  ): DataCubeOperationValue | undefined;
+  abstract generateDefaultValue(column: DataCubeColumn): DataCubeOperationValue;
 
   abstract buildConditionSnapshot(
     expression: V1_AppliedFunction,
+    columnGetter: (name: string) => DataCubeColumn,
   ): DataCubeQuerySnapshotFilterCondition | undefined;
 
+  protected _finalizeConditionSnapshot(
+    data:
+      | {
+          column: DataCubeColumn;
+          value: DataCubeOperationValue;
+        }
+      | undefined,
+  ): DataCubeQuerySnapshotFilterCondition | undefined {
+    if (!data) {
+      return undefined;
+    }
+    const { column, value } = data;
+    if (
+      !this.isCompatibleWithColumn(column) ||
+      !this.isCompatibleWithValue(value)
+    ) {
+      return undefined;
+    }
+    return {
+      ...column,
+      operator: this.operator,
+      value,
+    };
+  }
+
   abstract buildConditionExpression(
     condition: DataCubeQuerySnapshotFilterCondition,
   ): V1_AppliedFunction | undefined;

package/src/stores/core/filter/DataCubeQueryFilterOperation__Contain.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__Contain extends DataCubeQueryFilterOperation {
   override get label() {
@@ -66,8 +60,9 @@ export class DataCubeQueryFilterOperation__Contain extends DataCubeQueryFilterOp
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       value.value !== undefined &&
+      isPrimitiveType(value.type) &&
+      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       !Array.isArray(value.value)
     );
   }
@@ -75,20 +70,17 @@ export class DataCubeQueryFilterOperation__Contain extends DataCubeQueryFilterOp
   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.CONTAINS),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__ContainCaseInsensitive.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';
@@ -34,15 +35,8 @@ import {
   _var,
 } 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 { _caseSensitiveBaseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__ContainCaseInsensitive extends DataCubeQueryFilterOperation {
   override get label() {
@@ -67,8 +61,9 @@ export class DataCubeQueryFilterOperation__ContainCaseInsensitive extends DataCu
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       value.value !== undefined &&
+      isPrimitiveType(value.type) &&
+      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       !Array.isArray(value.value)
     );
   }
@@ -76,20 +71,21 @@ export class DataCubeQueryFilterOperation__ContainCaseInsensitive extends DataCu
   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(
+      _caseSensitiveBaseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.CONTAINS,
+      ),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__EndWith.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__EndWith extends DataCubeQueryFilterOperation {
   override get label() {
@@ -66,8 +60,9 @@ export class DataCubeQueryFilterOperation__EndWith extends DataCubeQueryFilterOp
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       value.value !== undefined &&
+      isPrimitiveType(value.type) &&
+      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       !Array.isArray(value.value)
     );
   }
@@ -75,20 +70,21 @@ export class DataCubeQueryFilterOperation__EndWith extends DataCubeQueryFilterOp
   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.ENDS_WITH,
+      ),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__EndWithCaseInsensitive.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';
@@ -34,15 +35,8 @@ import {
   _var,
 } 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 { _caseSensitiveBaseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__EndWithCaseInsensitive extends DataCubeQueryFilterOperation {
   override get label() {
@@ -67,8 +61,9 @@ export class DataCubeQueryFilterOperation__EndWithCaseInsensitive extends DataCu
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       value.value !== undefined &&
+      isPrimitiveType(value.type) &&
+      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       !Array.isArray(value.value)
     );
   }
@@ -76,20 +71,21 @@ export class DataCubeQueryFilterOperation__EndWithCaseInsensitive extends DataCu
   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(
+      _caseSensitiveBaseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.ENDS_WITH,
+      ),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__Equal.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__Equal extends DataCubeQueryFilterOperation {
   override get label() {
@@ -71,13 +65,14 @@ export class DataCubeQueryFilterOperation__Equal extends DataCubeQueryFilterOper
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
+      value.value !== undefined &&
+      isPrimitiveType(value.type) &&
       ofDataType(value.type, [
         DataCubeColumnDataType.TEXT,
         DataCubeColumnDataType.NUMBER,
         DataCubeColumnDataType.DATE,
         DataCubeColumnDataType.TIME,
       ]) &&
-      value.value !== undefined &&
       !Array.isArray(value.value)
     );
   }
@@ -85,97 +80,17 @@ export class DataCubeQueryFilterOperation__Equal extends DataCubeQueryFilterOper
   generateDefaultValue(column: DataCubeColumn) {
     return {
       type: column.type,
-      value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+      value: _defaultPrimitiveTypeValue(column.type),
     };
   }
 
-  // buildConditionSnapshot(expression: V1_AppliedFunction) {
-  /** TODO: @datacube roundtrip */
-  // export const buildPostFilterConditionState = (
-  //   postFilterState: QueryBuilderPostFilterState,
-  //   expression: FunctionExpression,
-  //   operatorFunctionFullPath | undefined,
-  //   operator: QueryBuilderPostFilterOperator,
-  // ): PostFilterConditionState | undefined => {
-  //   let postConditionState: PostFilterConditionState | undefined;
-  //   const tdsColumnGetter = operator.getTDSColumnGetter();
-  //   if (
-  //     tdsColumnGetter &&
-  //     expression instanceof AbstractPropertyExpression &&
-  //     expression.func.value.name === tdsColumnGetter
-  //   ) {
-  //     const columnState = findProjectionColumnState(expression, postFilterState);
-  //     postConditionState = new PostFilterConditionState(
-  //       postFilterState,
-  //       columnState,
-  //       operator,
-  //     );
-  //     return postConditionState;
-  //   } else if (
-  //     operatorFunctionFullPath &&
-  //     matchFunctionName(expression.functionName, operatorFunctionFullPath)
-  //   ) {
-  //     assertTrue(
-  //       expression.parametersValues.length === 2,
-  //       `Can't process ${extractElementNameFromPath(
-  //         operatorFunctionFullPath,
-  //       )}() expression: ${extractElementNameFromPath(
-  //         operatorFunctionFullPath,
-  //       )}() expects '1 argument'`,
-  //     );
-
-  //     // get projection column
-  //     const tdsColumnPropertyExpression = guaranteeType(
-  //       expression.parametersValues[0],
-  //       AbstractPropertyExpression,
-  //       `Can't process ${extractElementNameFromPath(
-  //         operatorFunctionFullPath,
-  //       )}() expression: expects property expression in lambda body`,
-  //     );
-  //     const columnState = findProjectionColumnState(
-  //       tdsColumnPropertyExpression,
-  //       postFilterState,
-  //     );
-
-  //     // get operation value specification
-  //     const rightSide = expression.parametersValues[1];
-
-  //     // create state
-  //     postConditionState = new PostFilterConditionState(
-  //       postFilterState,
-  //       columnState,
-  //       operator,
-  //     );
-
-  //     buildPostFilterConditionValueState(rightSide, postConditionState);
-
-  //     //post checks
-  //     assertTrue(
-  //       operator.isCompatibleWithPostFilterColumn(postConditionState),
-  //       `Can't process ${extractElementNameFromPath(
-  //         operatorFunctionFullPath,
-  //       )}() expression: property is not compatible with post-filter operator`,
-  //     );
-  //     assertTrue(
-  //       operator.isCompatibleWithConditionValue(postConditionState),
-  //       `Operator '${operator.getLabel()}' not compatible with value specification ${rightSide?.toString()}`,
-  //     );
-  //   }
-  //   return postConditionState;
-  // };
-  //   return undefined;
-  // }
-
-  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_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {

package/src/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitive.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';
@@ -34,15 +35,8 @@ import {
   _var,
 } 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 { _caseSensitiveBaseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 
 export class DataCubeQueryFilterOperation__EqualCaseInsensitive extends DataCubeQueryFilterOperation {
   override get label() {
@@ -67,8 +61,9 @@ export class DataCubeQueryFilterOperation__EqualCaseInsensitive extends DataCube
 
   isCompatibleWithValue(value: DataCubeOperationValue) {
     return (
-      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       value.value !== undefined &&
+      isPrimitiveType(value.type) &&
+      ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
       !Array.isArray(value.value)
     );
   }
@@ -76,20 +71,21 @@ export class DataCubeQueryFilterOperation__EqualCaseInsensitive extends DataCube
   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(
+      _caseSensitiveBaseFilterCondition(
+        expression,
+        columnGetter,
+        DataCubeFunction.EQUAL,
+      ),
     );
-    if (value instanceof V1_PrimitiveValueSpecification) {
-      filterConditionSnapshot.value = _dataCubeOperationValue(value);
-    }
-    return filterConditionSnapshot satisfies DataCubeQuerySnapshotFilterCondition;
   }
 
   buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition) {