@finos/legend-data-cube 0.0.41 → 0.0.43

package/lib/stores/core/filter/DataCubeQueryFilterOperation__Equal.js

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { DataCubeQueryFilterOperation, generateDefaultFilterConditionPrimitiveTypeValue, } from './DataCubeQueryFilterOperation.js';
-import { DataCubeColumnDataType, DataCubeFunction, DataCubeQueryFilterOperator, ofDataType, } from '../DataCubeQueryEngine.js';
+import { DataCubeQueryFilterOperation, _defaultPrimitiveTypeValue, } from './DataCubeQueryFilterOperation.js';
+import { DataCubeColumnDataType, DataCubeFunction, DataCubeQueryFilterOperator, isPrimitiveType, ofDataType, } from '../DataCubeQueryEngine.js';
 import { _function, _functionName, _property, _value, } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import { V1_PrimitiveValueSpecification, } from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty, _dataCubeOperationValue, } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import {} from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 export class DataCubeQueryFilterOperation__Equal extends DataCubeQueryFilterOperation {
     get label() {
         return '=';
@@ -41,99 +41,24 @@ export class DataCubeQueryFilterOperation__Equal extends DataCubeQueryFilterOper
         ]);
     }
     isCompatibleWithValue(value) {
-        return (ofDataType(value.type, [
-            DataCubeColumnDataType.TEXT,
-            DataCubeColumnDataType.NUMBER,
-            DataCubeColumnDataType.DATE,
-            DataCubeColumnDataType.TIME,
-        ]) &&
-            value.value !== undefined &&
+        return (value.value !== undefined &&
+            isPrimitiveType(value.type) &&
+            ofDataType(value.type, [
+                DataCubeColumnDataType.TEXT,
+                DataCubeColumnDataType.NUMBER,
+                DataCubeColumnDataType.DATE,
+                DataCubeColumnDataType.TIME,
+            ]) &&
             !Array.isArray(value.value));
     }
     generateDefaultValue(column) {
         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) {
-        const value = expression.parameters[1];
-        const filterConditionSnapshot = _buildConditionSnapshotProperty(expression.parameters[0], this.operator);
-        if (value instanceof V1_PrimitiveValueSpecification) {
-            filterConditionSnapshot.value = _dataCubeOperationValue(value);
-        }
-        return filterConditionSnapshot;
+    buildConditionSnapshot(expression, columnGetter) {
+        return this._finalizeConditionSnapshot(_baseFilterCondition(expression, columnGetter, DataCubeFunction.EQUAL));
     }
     buildConditionExpression(condition) {
         return _function(_functionName(DataCubeFunction.EQUAL), [

package/lib/stores/core/filter/DataCubeQueryFilterOperation__Equal.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryFilterOperation__Equal.js","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__Equal.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataCubeQueryFilterOperation__Equal.js","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__Equal.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,4BAA4B,EAC5B,0BAA0B,GAC3B,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,2BAA2B,EAC3B,eAAe,EACf,UAAU,GAEX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,aAAa,EACb,SAAS,EACT,MAAM,GACP,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAA2B,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAE/E,MAAM,OAAO,mCAAoC,SAAQ,4BAA4B;IACnF,IAAa,KAAK;QAChB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAa,SAAS;QACpB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,2BAA2B,CAAC,KAAK,CAAC;IAC3C,CAAC;IAED,sBAAsB,CAAC,MAAsB;QAC3C,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE;YAC7B,sBAAsB,CAAC,IAAI;YAC3B,sBAAsB,CAAC,MAAM;YAC7B,sBAAsB,CAAC,IAAI;YAC3B,sBAAsB,CAAC,IAAI;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB,CAAC,KAA6B;QACjD,OAAO,CACL,KAAK,CAAC,KAAK,KAAK,SAAS;YACzB,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC;YAC3B,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE;gBACrB,sBAAsB,CAAC,IAAI;gBAC3B,sBAAsB,CAAC,MAAM;gBAC7B,sBAAsB,CAAC,IAAI;gBAC3B,sBAAsB,CAAC,IAAI;aAC5B,CAAC;YACF,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAC5B,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,MAAsB;QACzC,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,0BAA0B,CAAC,MAAM,CAAC,IAAI,CAAC;SAC/C,CAAC;IACJ,CAAC;IAED,sBAAsB,CACpB,UAA8B,EAC9B,YAA8C;QAE9C,OAAO,IAAI,CAAC,0BAA0B,CACpC,oBAAoB,CAAC,UAAU,EAAE,YAAY,EAAE,gBAAgB,CAAC,KAAK,CAAC,CACvE,CAAC;IACJ,CAAC;IAED,wBAAwB,CAAC,SAA+C;QACtE,OAAO,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;YACtD,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;YACzB,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SAC9C,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitive.d.ts

@@ -29,7 +29,7 @@ export declare class DataCubeQueryFilterOperation__EqualCaseInsensitive extends
         type: string;
         value: unknown;
     };
-    buildConditionSnapshot(expression: V1_AppliedFunction): DataCubeQuerySnapshotFilterCondition;
+    buildConditionSnapshot(expression: V1_AppliedFunction, columnGetter: (name: string) => DataCubeColumn): DataCubeQuerySnapshotFilterCondition | undefined;
     buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition): V1_AppliedFunction;
 }
 //# sourceMappingURL=DataCubeQueryFilterOperation__EqualCaseInsensitive.d.ts.map

package/lib/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryFilterOperation__EqualCaseInsensitive.d.ts","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitive.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,4BAA4B,EAE7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,2BAA2B,EAE3B,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AASnC,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,qBAAqB,CAAC;AAM7B,qBAAa,kDAAmD,SAAQ,4BAA4B;IAClG,IAAa,KAAK,WAEjB;IAED,IAAa,SAAS,WAErB;IAED,IAAa,WAAW,WAEvB;IAED,IAAa,QAAQ,gCAEpB;IAED,sBAAsB,CAAC,MAAM,EAAE,cAAc;IAI7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB;IAQnD,oBAAoB,CAAC,MAAM,EAAE,cAAc;;;;IAO3C,sBAAsB,CAAC,UAAU,EAAE,kBAAkB;IAYrD,wBAAwB,CAAC,SAAS,EAAE,oCAAoC;CAWzE"}
+{"version":3,"file":"DataCubeQueryFilterOperation__EqualCaseInsensitive.d.ts","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitive.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,4BAA4B,EAE7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,2BAA2B,EAG3B,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AASnC,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,qBAAa,kDAAmD,SAAQ,4BAA4B;IAClG,IAAa,KAAK,WAEjB;IAED,IAAa,SAAS,WAErB;IAED,IAAa,WAAW,WAEvB;IAED,IAAa,QAAQ,gCAEpB;IAED,sBAAsB,CAAC,MAAM,EAAE,cAAc;IAI7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB;IASnD,oBAAoB,CAAC,MAAM,EAAE,cAAc;;;;IAO3C,sBAAsB,CACpB,UAAU,EAAE,kBAAkB,EAC9B,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,cAAc;IAWhD,wBAAwB,CAAC,SAAS,EAAE,oCAAoC;CAWzE"}

package/lib/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitive.js

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { DataCubeQueryFilterOperation, generateDefaultFilterConditionPrimitiveTypeValue, } from './DataCubeQueryFilterOperation.js';
-import { DataCubeColumnDataType, DataCubeFunction, DataCubeQueryFilterOperator, ofDataType, } from '../DataCubeQueryEngine.js';
+import { DataCubeQueryFilterOperation, _defaultPrimitiveTypeValue, } from './DataCubeQueryFilterOperation.js';
+import { DataCubeColumnDataType, DataCubeFunction, DataCubeQueryFilterOperator, isPrimitiveType, ofDataType, } from '../DataCubeQueryEngine.js';
 import { _function, _functionName, _property, _value, _var, } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import { V1_PrimitiveValueSpecification, } from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty, _dataCubeOperationValue, } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import {} from '@finos/legend-graph';
+import { _caseSensitiveBaseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 export class DataCubeQueryFilterOperation__EqualCaseInsensitive extends DataCubeQueryFilterOperation {
     get label() {
         return '= (case-insensitive)';
@@ -36,23 +36,19 @@ export class DataCubeQueryFilterOperation__EqualCaseInsensitive extends DataCube
         return ofDataType(column.type, [DataCubeColumnDataType.TEXT]);
     }
     isCompatibleWithValue(value) {
-        return (ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
-            value.value !== undefined &&
+        return (value.value !== undefined &&
+            isPrimitiveType(value.type) &&
+            ofDataType(value.type, [DataCubeColumnDataType.TEXT]) &&
             !Array.isArray(value.value));
     }
     generateDefaultValue(column) {
         return {
             type: column.type,
-            value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+            value: _defaultPrimitiveTypeValue(column.type),
         };
     }
-    buildConditionSnapshot(expression) {
-        const value = expression.parameters[1];
-        const filterConditionSnapshot = _buildConditionSnapshotProperty(expression.parameters[0], this.operator);
-        if (value instanceof V1_PrimitiveValueSpecification) {
-            filterConditionSnapshot.value = _dataCubeOperationValue(value);
-        }
-        return filterConditionSnapshot;
+    buildConditionSnapshot(expression, columnGetter) {
+        return this._finalizeConditionSnapshot(_caseSensitiveBaseFilterCondition(expression, columnGetter, DataCubeFunction.EQUAL));
     }
     buildConditionExpression(condition) {
         const variable = _var();

package/lib/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitive.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryFilterOperation__EqualCaseInsensitive.js","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitive.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,4BAA4B,EAC5B,gDAAgD,GACjD,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,2BAA2B,EAC3B,UAAU,GAEX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,aAAa,EACb,SAAS,EACT,MAAM,EACN,IAAI,GACL,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EACL,8BAA8B,GAG/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,+BAA+B,EAC/B,uBAAuB,GACxB,MAAM,yCAAyC,CAAC;AAEjD,MAAM,OAAO,kDAAmD,SAAQ,4BAA4B;IAClG,IAAa,KAAK;QAChB,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,IAAa,SAAS;QACpB,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,2BAA2B,CAAC,sBAAsB,CAAC;IAC5D,CAAC;IAED,sBAAsB,CAAC,MAAsB;QAC3C,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,qBAAqB,CAAC,KAA6B;QACjD,OAAO,CACL,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;YACrD,KAAK,CAAC,KAAK,KAAK,SAAS;YACzB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAC5B,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,MAAsB;QACzC,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,gDAAgD,CAAC,MAAM,CAAC,IAAI,CAAC;SACrE,CAAC;IACJ,CAAC;IAED,sBAAsB,CAAC,UAA8B;QACnD,MAAM,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,uBAAuB,GAAG,+BAA+B,CAC7D,UAAU,CAAC,UAAU,CAAC,CAAC,CAAuB,EAC9C,IAAI,CAAC,QAAQ,CACd,CAAC;QACF,IAAI,KAAK,YAAY,8BAA8B,EAAE,CAAC;YACpD,uBAAuB,CAAC,KAAK,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,uBAAsE,CAAC;IAChF,CAAC;IAED,wBAAwB,CAAC,SAA+C;QACtE,MAAM,QAAQ,GAAG,IAAI,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;YACtD,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;gBACtD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC;aACpC,CAAC;YACF,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;gBACtD,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;aACxD,CAAC;SACH,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"DataCubeQueryFilterOperation__EqualCaseInsensitive.js","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitive.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,4BAA4B,EAC5B,0BAA0B,GAC3B,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,2BAA2B,EAC3B,eAAe,EACf,UAAU,GAEX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,aAAa,EACb,SAAS,EACT,MAAM,EACN,IAAI,GACL,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAA2B,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,iCAAiC,EAAE,MAAM,yCAAyC,CAAC;AAE5F,MAAM,OAAO,kDAAmD,SAAQ,4BAA4B;IAClG,IAAa,KAAK;QAChB,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,IAAa,SAAS;QACpB,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,2BAA2B,CAAC,sBAAsB,CAAC;IAC5D,CAAC;IAED,sBAAsB,CAAC,MAAsB;QAC3C,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,qBAAqB,CAAC,KAA6B;QACjD,OAAO,CACL,KAAK,CAAC,KAAK,KAAK,SAAS;YACzB,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC;YAC3B,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;YACrD,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAC5B,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,MAAsB;QACzC,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,0BAA0B,CAAC,MAAM,CAAC,IAAI,CAAC;SAC/C,CAAC;IACJ,CAAC;IAED,sBAAsB,CACpB,UAA8B,EAC9B,YAA8C;QAE9C,OAAO,IAAI,CAAC,0BAA0B,CACpC,iCAAiC,CAC/B,UAAU,EACV,YAAY,EACZ,gBAAgB,CAAC,KAAK,CACvB,CACF,CAAC;IACJ,CAAC;IAED,wBAAwB,CAAC,SAA+C;QACtE,MAAM,QAAQ,GAAG,IAAI,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;YACtD,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;gBACtD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC;aACpC,CAAC;YACF,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;gBACtD,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;aACxD,CAAC;SACH,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.d.ts

@@ -29,7 +29,7 @@ export declare class DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn ex
         type: DataCubeOperationAdvancedValueType;
         value: string;
     };
-    buildConditionSnapshot(expression: V1_AppliedFunction): DataCubeQuerySnapshotFilterCondition;
+    buildConditionSnapshot(expression: V1_AppliedFunction, columnGetter: (name: string) => DataCubeColumn): DataCubeQuerySnapshotFilterCondition | undefined;
     buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition): V1_AppliedFunction;
 }
 //# sourceMappingURL=DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.d.ts.map

package/lib/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.d.ts","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,kCAAkC,EAClC,2BAA2B,EAE3B,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AASnC,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,qBAAqB,CAAC;AAG7B,qBAAa,wDAAyD,SAAQ,4BAA4B;IACxG,IAAa,KAAK,WAEjB;IAED,IAAa,SAAS,WAErB;IAED,IAAa,WAAW,WAEvB;IAED,IAAa,QAAQ,gCAEpB;IAED,sBAAsB,CAAC,MAAM,EAAE,cAAc;IAI7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB;IAQnD,oBAAoB,CAAC,MAAM,EAAE,cAAc;;;;IAO3C,sBAAsB,CAAC,UAAU,EAAE,kBAAkB;IAgBrD,wBAAwB,CAAC,SAAS,EAAE,oCAAoC;CAWzE"}
+{"version":3,"file":"DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.d.ts","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,kCAAkC,EAClC,2BAA2B,EAE3B,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AASnC,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,qBAAa,wDAAyD,SAAQ,4BAA4B;IACxG,IAAa,KAAK,WAEjB;IAED,IAAa,SAAS,WAErB;IAED,IAAa,WAAW,WAEvB;IAED,IAAa,QAAQ,gCAEpB;IAED,sBAAsB,CAAC,MAAM,EAAE,cAAc;IAI7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB;IAQnD,oBAAoB,CAAC,MAAM,EAAE,cAAc;;;;IAO3C,sBAAsB,CACpB,UAAU,EAAE,kBAAkB,EAC9B,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,cAAc;IAWhD,wBAAwB,CAAC,SAAS,EAAE,oCAAoC;CAWzE"}

package/lib/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.js

@@ -17,8 +17,8 @@ import { DataCubeQueryFilterOperation } from './DataCubeQueryFilterOperation.js'
 import { DataCubeColumnDataType, DataCubeFunction, DataCubeOperationAdvancedValueType, DataCubeQueryFilterOperator, ofDataType, } from '../DataCubeQueryEngine.js';
 import { _function, _functionName, _property, _value, _var, } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable, isString } from '@finos/legend-shared';
-import { V1_AppliedProperty, } from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import {} from '@finos/legend-graph';
+import { _caseSensitiveBaseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 export class DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn extends DataCubeQueryFilterOperation {
     get label() {
         return '= (case-insensitive) value in column';
@@ -36,8 +36,8 @@ export class DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn extends Da
         return ofDataType(column.type, [DataCubeColumnDataType.TEXT]);
     }
     isCompatibleWithValue(value) {
-        return (value.type === DataCubeOperationAdvancedValueType.COLUMN &&
-            value.value !== undefined &&
+        return (value.value !== undefined &&
+            value.type === DataCubeOperationAdvancedValueType.COLUMN &&
             isString(value.value));
     }
     generateDefaultValue(column) {
@@ -46,16 +46,8 @@ export class DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn extends Da
             value: column.name,
         };
     }
-    buildConditionSnapshot(expression) {
-        const value = expression.parameters[1];
-        const filterConditionSnapshot = _buildConditionSnapshotProperty(expression.parameters[0], this.operator);
-        if (value instanceof V1_AppliedProperty) {
-            filterConditionSnapshot.value = {
-                value: value.property,
-                type: DataCubeOperationAdvancedValueType.COLUMN,
-            };
-        }
-        return filterConditionSnapshot;
+    buildConditionSnapshot(expression, columnGetter) {
+        return this._finalizeConditionSnapshot(_caseSensitiveBaseFilterCondition(expression, columnGetter, DataCubeFunction.EQUAL));
     }
     buildConditionExpression(condition) {
         const variable = _var();

package/lib/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.js","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAGjF,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,kCAAkC,EAClC,2BAA2B,EAC3B,UAAU,GAEX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,aAAa,EACb,SAAS,EACT,MAAM,EACN,IAAI,GACL,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EACL,kBAAkB,GAEnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAE1F,MAAM,OAAO,wDAAyD,SAAQ,4BAA4B;IACxG,IAAa,KAAK;QAChB,OAAO,sCAAsC,CAAC;IAChD,CAAC;IAED,IAAa,SAAS;QACpB,OAAO,sCAAsC,CAAC;IAChD,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,8CAA8C,CAAC;IACxD,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,2BAA2B,CAAC,6BAA6B,CAAC;IACnE,CAAC;IAED,sBAAsB,CAAC,MAAsB;QAC3C,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,qBAAqB,CAAC,KAA6B;QACjD,OAAO,CACL,KAAK,CAAC,IAAI,KAAK,kCAAkC,CAAC,MAAM;YACxD,KAAK,CAAC,KAAK,KAAK,SAAS;YACzB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CACtB,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,MAAsB;QACzC,OAAO;YACL,IAAI,EAAE,kCAAkC,CAAC,MAAM;YAC/C,KAAK,EAAE,MAAM,CAAC,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,sBAAsB,CAAC,UAA8B;QACnD,MAAM,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,uBAAuB,GAAG,+BAA+B,CAC7D,UAAU,CAAC,UAAU,CAAC,CAAC,CAAuB,EAC9C,IAAI,CAAC,QAAQ,CACd,CAAC;QAEF,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;YACxC,uBAAuB,CAAC,KAAK,GAAG;gBAC9B,KAAK,EAAE,KAAK,CAAC,QAAQ;gBACrB,IAAI,EAAE,kCAAkC,CAAC,MAAM;aACf,CAAC;QACrC,CAAC;QACD,OAAO,uBAAsE,CAAC;IAChF,CAAC;IAED,wBAAwB,CAAC,SAA+C;QACtE,MAAM,QAAQ,GAAG,IAAI,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;YACtD,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;gBACtD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC;aACpC,CAAC;YACF,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;gBACtD,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;aACxD,CAAC;SACH,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.js","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__EqualCaseInsensitiveColumn.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAGjF,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,kCAAkC,EAClC,2BAA2B,EAC3B,UAAU,GAEX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,aAAa,EACb,SAAS,EACT,MAAM,EACN,IAAI,GACL,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAA2B,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,iCAAiC,EAAE,MAAM,yCAAyC,CAAC;AAE5F,MAAM,OAAO,wDAAyD,SAAQ,4BAA4B;IACxG,IAAa,KAAK;QAChB,OAAO,sCAAsC,CAAC;IAChD,CAAC;IAED,IAAa,SAAS;QACpB,OAAO,sCAAsC,CAAC;IAChD,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,8CAA8C,CAAC;IACxD,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,2BAA2B,CAAC,6BAA6B,CAAC;IACnE,CAAC;IAED,sBAAsB,CAAC,MAAsB;QAC3C,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,qBAAqB,CAAC,KAA6B;QACjD,OAAO,CACL,KAAK,CAAC,KAAK,KAAK,SAAS;YACzB,KAAK,CAAC,IAAI,KAAK,kCAAkC,CAAC,MAAM;YACxD,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CACtB,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,MAAsB;QACzC,OAAO;YACL,IAAI,EAAE,kCAAkC,CAAC,MAAM;YAC/C,KAAK,EAAE,MAAM,CAAC,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,sBAAsB,CACpB,UAA8B,EAC9B,YAA8C;QAE9C,OAAO,IAAI,CAAC,0BAA0B,CACpC,iCAAiC,CAC/B,UAAU,EACV,YAAY,EACZ,gBAAgB,CAAC,KAAK,CACvB,CACF,CAAC;IACJ,CAAC;IAED,wBAAwB,CAAC,SAA+C;QACtE,MAAM,QAAQ,GAAG,IAAI,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;YACtD,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;gBACtD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC;aACpC,CAAC;YACF,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;gBACtD,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;aACxD,CAAC;SACH,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/stores/core/filter/DataCubeQueryFilterOperation__EqualColumn.d.ts

@@ -29,7 +29,7 @@ export declare class DataCubeQueryFilterOperation__EqualColumn extends DataCubeQ
         type: DataCubeOperationAdvancedValueType;
         value: string;
     };
-    buildConditionSnapshot(expression: V1_AppliedFunction): DataCubeQuerySnapshotFilterCondition;
+    buildConditionSnapshot(expression: V1_AppliedFunction, columnGetter: (name: string) => DataCubeColumn): DataCubeQuerySnapshotFilterCondition | undefined;
     buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition): V1_AppliedFunction;
 }
 //# sourceMappingURL=DataCubeQueryFilterOperation__EqualColumn.d.ts.map

package/lib/stores/core/filter/DataCubeQueryFilterOperation__EqualColumn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryFilterOperation__EqualColumn.d.ts","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__EqualColumn.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,kCAAkC,EAClC,2BAA2B,EAE3B,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AASnC,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,qBAAqB,CAAC;AAG7B,qBAAa,yCAA0C,SAAQ,4BAA4B;IACzF,IAAa,KAAK,WAEjB;IAED,IAAa,SAAS,WAErB;IAED,IAAa,WAAW,WAEvB;IAED,IAAa,QAAQ,gCAEpB;IAED,sBAAsB,CAAC,MAAM,EAAE,cAAc;IAS7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB;IAQnD,oBAAoB,CAAC,MAAM,EAAE,cAAc;;;;IAO3C,sBAAsB,CAAC,UAAU,EAAE,kBAAkB;IAgBrD,wBAAwB,CAAC,SAAS,EAAE,oCAAoC;CAOzE"}
+{"version":3,"file":"DataCubeQueryFilterOperation__EqualColumn.d.ts","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__EqualColumn.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,kCAAkC,EAClC,2BAA2B,EAE3B,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AASnC,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,qBAAa,yCAA0C,SAAQ,4BAA4B;IACzF,IAAa,KAAK,WAEjB;IAED,IAAa,SAAS,WAErB;IAED,IAAa,WAAW,WAEvB;IAED,IAAa,QAAQ,gCAEpB;IAED,sBAAsB,CAAC,MAAM,EAAE,cAAc;IAS7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB;IAQnD,oBAAoB,CAAC,MAAM,EAAE,cAAc;;;;IAO3C,sBAAsB,CACpB,UAAU,EAAE,kBAAkB,EAC9B,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,cAAc;IAOhD,wBAAwB,CAAC,SAAS,EAAE,oCAAoC;CAOzE"}

package/lib/stores/core/filter/DataCubeQueryFilterOperation__EqualColumn.js

@@ -17,8 +17,8 @@ import { DataCubeQueryFilterOperation } from './DataCubeQueryFilterOperation.js'
 import { DataCubeColumnDataType, DataCubeFunction, DataCubeOperationAdvancedValueType, DataCubeQueryFilterOperator, ofDataType, } from '../DataCubeQueryEngine.js';
 import { _function, _functionName, _property, _value, _var, } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable, isString } from '@finos/legend-shared';
-import { V1_AppliedProperty, } from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import {} from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 export class DataCubeQueryFilterOperation__EqualColumn extends DataCubeQueryFilterOperation {
     get label() {
         return '= value in column';
@@ -41,8 +41,8 @@ export class DataCubeQueryFilterOperation__EqualColumn extends DataCubeQueryFilt
         ]);
     }
     isCompatibleWithValue(value) {
-        return (value.type === DataCubeOperationAdvancedValueType.COLUMN &&
-            value.value !== undefined &&
+        return (value.value !== undefined &&
+            value.type === DataCubeOperationAdvancedValueType.COLUMN &&
             isString(value.value));
     }
     generateDefaultValue(column) {
@@ -51,16 +51,8 @@ export class DataCubeQueryFilterOperation__EqualColumn extends DataCubeQueryFilt
             value: column.name,
         };
     }
-    buildConditionSnapshot(expression) {
-        const value = expression.parameters[1];
-        const filterConditionSnapshot = _buildConditionSnapshotProperty(expression.parameters[0], this.operator);
-        if (value instanceof V1_AppliedProperty) {
-            filterConditionSnapshot.value = {
-                value: value.property,
-                type: DataCubeOperationAdvancedValueType.COLUMN,
-            };
-        }
-        return filterConditionSnapshot;
+    buildConditionSnapshot(expression, columnGetter) {
+        return this._finalizeConditionSnapshot(_baseFilterCondition(expression, columnGetter, DataCubeFunction.EQUAL));
     }
     buildConditionExpression(condition) {
         const variable = _var();

package/lib/stores/core/filter/DataCubeQueryFilterOperation__EqualColumn.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryFilterOperation__EqualColumn.js","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__EqualColumn.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAGjF,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,kCAAkC,EAClC,2BAA2B,EAC3B,UAAU,GAEX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,aAAa,EACb,SAAS,EACT,MAAM,EACN,IAAI,GACL,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EACL,kBAAkB,GAEnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAE1F,MAAM,OAAO,yCAA0C,SAAQ,4BAA4B;IACzF,IAAa,KAAK;QAChB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,IAAa,SAAS;QACpB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,2BAA2B,CAAC,YAAY,CAAC;IAClD,CAAC;IAED,sBAAsB,CAAC,MAAsB;QAC3C,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE;YAC7B,sBAAsB,CAAC,IAAI;YAC3B,sBAAsB,CAAC,MAAM;YAC7B,sBAAsB,CAAC,IAAI;YAC3B,sBAAsB,CAAC,IAAI;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB,CAAC,KAA6B;QACjD,OAAO,CACL,KAAK,CAAC,IAAI,KAAK,kCAAkC,CAAC,MAAM;YACxD,KAAK,CAAC,KAAK,KAAK,SAAS;YACzB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CACtB,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,MAAsB;QACzC,OAAO;YACL,IAAI,EAAE,kCAAkC,CAAC,MAAM;YAC/C,KAAK,EAAE,MAAM,CAAC,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,sBAAsB,CAAC,UAA8B;QACnD,MAAM,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,uBAAuB,GAAG,+BAA+B,CAC7D,UAAU,CAAC,UAAU,CAAC,CAAC,CAAuB,EAC9C,IAAI,CAAC,QAAQ,CACd,CAAC;QAEF,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;YACxC,uBAAuB,CAAC,KAAK,GAAG;gBAC9B,KAAK,EAAE,KAAK,CAAC,QAAQ;gBACrB,IAAI,EAAE,kCAAkC,CAAC,MAAM;aACf,CAAC;QACrC,CAAC;QACD,OAAO,uBAAsE,CAAC;IAChF,CAAC;IAED,wBAAwB,CAAC,SAA+C;QACtE,MAAM,QAAQ,GAAG,IAAI,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;YACtD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC;YACnC,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;SACxD,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"DataCubeQueryFilterOperation__EqualColumn.js","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__EqualColumn.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAGjF,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,kCAAkC,EAClC,2BAA2B,EAC3B,UAAU,GAEX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,aAAa,EACb,SAAS,EACT,MAAM,EACN,IAAI,GACL,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAA2B,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAE/E,MAAM,OAAO,yCAA0C,SAAQ,4BAA4B;IACzF,IAAa,KAAK;QAChB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,IAAa,SAAS;QACpB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,2BAA2B,CAAC,YAAY,CAAC;IAClD,CAAC;IAED,sBAAsB,CAAC,MAAsB;QAC3C,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE;YAC7B,sBAAsB,CAAC,IAAI;YAC3B,sBAAsB,CAAC,MAAM;YAC7B,sBAAsB,CAAC,IAAI;YAC3B,sBAAsB,CAAC,IAAI;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB,CAAC,KAA6B;QACjD,OAAO,CACL,KAAK,CAAC,KAAK,KAAK,SAAS;YACzB,KAAK,CAAC,IAAI,KAAK,kCAAkC,CAAC,MAAM;YACxD,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CACtB,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,MAAsB;QACzC,OAAO;YACL,IAAI,EAAE,kCAAkC,CAAC,MAAM;YAC/C,KAAK,EAAE,MAAM,CAAC,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,sBAAsB,CACpB,UAA8B,EAC9B,YAA8C;QAE9C,OAAO,IAAI,CAAC,0BAA0B,CACpC,oBAAoB,CAAC,UAAU,EAAE,YAAY,EAAE,gBAAgB,CAAC,KAAK,CAAC,CACvE,CAAC;IACJ,CAAC;IAED,wBAAwB,CAAC,SAA+C;QACtE,MAAM,QAAQ,GAAG,IAAI,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;YACtD,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC;YACnC,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;SACxD,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/stores/core/filter/DataCubeQueryFilterOperation__GreaterThan.d.ts

@@ -29,7 +29,7 @@ export declare class DataCubeQueryFilterOperation__GreaterThan extends DataCubeQ
         type: string;
         value: unknown;
     };
-    buildConditionSnapshot(expression: V1_AppliedFunction): DataCubeQuerySnapshotFilterCondition;
+    buildConditionSnapshot(expression: V1_AppliedFunction, columnGetter: (name: string) => DataCubeColumn): DataCubeQuerySnapshotFilterCondition | undefined;
     buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition): V1_AppliedFunction;
 }
 //# sourceMappingURL=DataCubeQueryFilterOperation__GreaterThan.d.ts.map

package/lib/stores/core/filter/DataCubeQueryFilterOperation__GreaterThan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryFilterOperation__GreaterThan.d.ts","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThan.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,4BAA4B,EAE7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,2BAA2B,EAE3B,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AAQnC,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,qBAAqB,CAAC;AAM7B,qBAAa,yCAA0C,SAAQ,4BAA4B;IACzF,IAAa,KAAK,WAEjB;IAED,IAAa,SAAS,WAErB;IAED,IAAa,WAAW,WAEvB;IAED,IAAa,QAAQ,gCAEpB;IAED,sBAAsB,CAAC,MAAM,EAAE,cAAc;IAQ7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB;IAYnD,oBAAoB,CAAC,MAAM,EAAE,cAAc;;;;IAO3C,sBAAsB,CAAC,UAAU,EAAE,kBAAkB;IAYrD,wBAAwB,CAAC,SAAS,EAAE,oCAAoC;CAMzE"}
+{"version":3,"file":"DataCubeQueryFilterOperation__GreaterThan.d.ts","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThan.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,4BAA4B,EAE7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,2BAA2B,EAG3B,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AAQnC,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,qBAAa,yCAA0C,SAAQ,4BAA4B;IACzF,IAAa,KAAK,WAEjB;IAED,IAAa,SAAS,WAErB;IAED,IAAa,WAAW,WAEvB;IAED,IAAa,QAAQ,gCAEpB;IAED,sBAAsB,CAAC,MAAM,EAAE,cAAc;IAQ7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB;IAanD,oBAAoB,CAAC,MAAM,EAAE,cAAc;;;;IAO3C,sBAAsB,CACpB,UAAU,EAAE,kBAAkB,EAC9B,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,cAAc;IAWhD,wBAAwB,CAAC,SAAS,EAAE,oCAAoC;CAMzE"}

package/lib/stores/core/filter/DataCubeQueryFilterOperation__GreaterThan.js

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { DataCubeQueryFilterOperation, generateDefaultFilterConditionPrimitiveTypeValue, } from './DataCubeQueryFilterOperation.js';
-import { DataCubeColumnDataType, DataCubeFunction, DataCubeQueryFilterOperator, ofDataType, } from '../DataCubeQueryEngine.js';
+import { DataCubeQueryFilterOperation, _defaultPrimitiveTypeValue, } from './DataCubeQueryFilterOperation.js';
+import { DataCubeColumnDataType, DataCubeFunction, DataCubeQueryFilterOperator, isPrimitiveType, ofDataType, } from '../DataCubeQueryEngine.js';
 import { _function, _functionName, _property, _value, } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import { V1_PrimitiveValueSpecification, } from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty, _dataCubeOperationValue, } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import {} from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 export class DataCubeQueryFilterOperation__GreaterThan extends DataCubeQueryFilterOperation {
     get label() {
         return '>';
@@ -40,27 +40,23 @@ export class DataCubeQueryFilterOperation__GreaterThan extends DataCubeQueryFilt
         ]);
     }
     isCompatibleWithValue(value) {
-        return (ofDataType(value.type, [
-            DataCubeColumnDataType.NUMBER,
-            DataCubeColumnDataType.DATE,
-            DataCubeColumnDataType.TIME,
-        ]) &&
-            value.value !== undefined &&
+        return (value.value !== undefined &&
+            isPrimitiveType(value.type) &&
+            ofDataType(value.type, [
+                DataCubeColumnDataType.NUMBER,
+                DataCubeColumnDataType.DATE,
+                DataCubeColumnDataType.TIME,
+            ]) &&
             !Array.isArray(value.value));
     }
     generateDefaultValue(column) {
         return {
             type: column.type,
-            value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+            value: _defaultPrimitiveTypeValue(column.type),
         };
     }
-    buildConditionSnapshot(expression) {
-        const value = expression.parameters[1];
-        const filterConditionSnapshot = _buildConditionSnapshotProperty(expression.parameters[0], this.operator);
-        if (value instanceof V1_PrimitiveValueSpecification) {
-            filterConditionSnapshot.value = _dataCubeOperationValue(value);
-        }
-        return filterConditionSnapshot;
+    buildConditionSnapshot(expression, columnGetter) {
+        return this._finalizeConditionSnapshot(_baseFilterCondition(expression, columnGetter, DataCubeFunction.GREATER_THAN));
     }
     buildConditionExpression(condition) {
         return _function(_functionName(DataCubeFunction.GREATER_THAN), [

package/lib/stores/core/filter/DataCubeQueryFilterOperation__GreaterThan.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryFilterOperation__GreaterThan.js","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThan.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,4BAA4B,EAC5B,gDAAgD,GACjD,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,2BAA2B,EAC3B,UAAU,GAEX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,aAAa,EACb,SAAS,EACT,MAAM,GACP,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EACL,8BAA8B,GAG/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,+BAA+B,EAC/B,uBAAuB,GACxB,MAAM,yCAAyC,CAAC;AAEjD,MAAM,OAAO,yCAA0C,SAAQ,4BAA4B;IACzF,IAAa,KAAK;QAChB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAa,SAAS;QACpB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,2BAA2B,CAAC,YAAY,CAAC;IAClD,CAAC;IAED,sBAAsB,CAAC,MAAsB;QAC3C,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE;YAC7B,sBAAsB,CAAC,MAAM;YAC7B,sBAAsB,CAAC,IAAI;YAC3B,sBAAsB,CAAC,IAAI;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB,CAAC,KAA6B;QACjD,OAAO,CACL,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE;YACrB,sBAAsB,CAAC,MAAM;YAC7B,sBAAsB,CAAC,IAAI;YAC3B,sBAAsB,CAAC,IAAI;SAC5B,CAAC;YACF,KAAK,CAAC,KAAK,KAAK,SAAS;YACzB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAC5B,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,MAAsB;QACzC,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,gDAAgD,CAAC,MAAM,CAAC,IAAI,CAAC;SACrE,CAAC;IACJ,CAAC;IAED,sBAAsB,CAAC,UAA8B;QACnD,MAAM,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,uBAAuB,GAAG,+BAA+B,CAC7D,UAAU,CAAC,UAAU,CAAC,CAAC,CAAuB,EAC9C,IAAI,CAAC,QAAQ,CACd,CAAC;QACF,IAAI,KAAK,YAAY,8BAA8B,EAAE,CAAC;YACpD,uBAAuB,CAAC,KAAK,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,uBAAsE,CAAC;IAChF,CAAC;IAED,wBAAwB,CAAC,SAA+C;QACtE,OAAO,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;YAC7D,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;YACzB,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SAC9C,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"DataCubeQueryFilterOperation__GreaterThan.js","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThan.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,4BAA4B,EAC5B,0BAA0B,GAC3B,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,2BAA2B,EAC3B,eAAe,EACf,UAAU,GAEX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,aAAa,EACb,SAAS,EACT,MAAM,GACP,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAA2B,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAE/E,MAAM,OAAO,yCAA0C,SAAQ,4BAA4B;IACzF,IAAa,KAAK;QAChB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAa,SAAS;QACpB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,2BAA2B,CAAC,YAAY,CAAC;IAClD,CAAC;IAED,sBAAsB,CAAC,MAAsB;QAC3C,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE;YAC7B,sBAAsB,CAAC,MAAM;YAC7B,sBAAsB,CAAC,IAAI;YAC3B,sBAAsB,CAAC,IAAI;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB,CAAC,KAA6B;QACjD,OAAO,CACL,KAAK,CAAC,KAAK,KAAK,SAAS;YACzB,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC;YAC3B,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE;gBACrB,sBAAsB,CAAC,MAAM;gBAC7B,sBAAsB,CAAC,IAAI;gBAC3B,sBAAsB,CAAC,IAAI;aAC5B,CAAC;YACF,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAC5B,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,MAAsB;QACzC,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,0BAA0B,CAAC,MAAM,CAAC,IAAI,CAAC;SAC/C,CAAC;IACJ,CAAC;IAED,sBAAsB,CACpB,UAA8B,EAC9B,YAA8C;QAE9C,OAAO,IAAI,CAAC,0BAA0B,CACpC,oBAAoB,CAClB,UAAU,EACV,YAAY,EACZ,gBAAgB,CAAC,YAAY,CAC9B,CACF,CAAC;IACJ,CAAC;IAED,wBAAwB,CAAC,SAA+C;QACtE,OAAO,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;YAC7D,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;YACzB,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SAC9C,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanColumn.d.ts

@@ -29,7 +29,7 @@ export declare class DataCubeQueryFilterOperation__GreaterThanColumn extends Dat
         type: DataCubeOperationAdvancedValueType;
         value: string;
     };
-    buildConditionSnapshot(expression: V1_AppliedFunction): DataCubeQuerySnapshotFilterCondition;
+    buildConditionSnapshot(expression: V1_AppliedFunction, columnGetter: (name: string) => DataCubeColumn): DataCubeQuerySnapshotFilterCondition | undefined;
     buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition): V1_AppliedFunction;
 }
 //# sourceMappingURL=DataCubeQueryFilterOperation__GreaterThanColumn.d.ts.map

package/lib/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanColumn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryFilterOperation__GreaterThanColumn.d.ts","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanColumn.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,kCAAkC,EAClC,2BAA2B,EAE3B,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AASnC,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,qBAAqB,CAAC;AAG7B,qBAAa,+CAAgD,SAAQ,4BAA4B;IAC/F,IAAa,KAAK,WAEjB;IAED,IAAa,SAAS,WAErB;IAED,IAAa,WAAW,WAEvB;IAED,IAAa,QAAQ,gCAEpB;IAED,sBAAsB,CAAC,MAAM,EAAE,cAAc;IAQ7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB;IAQnD,oBAAoB,CAAC,MAAM,EAAE,cAAc;;;;IAO3C,sBAAsB,CAAC,UAAU,EAAE,kBAAkB;IAgBrD,wBAAwB,CAAC,SAAS,EAAE,oCAAoC;CAOzE"}
+{"version":3,"file":"DataCubeQueryFilterOperation__GreaterThanColumn.d.ts","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanColumn.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,kCAAkC,EAClC,2BAA2B,EAE3B,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AASnC,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,qBAAa,+CAAgD,SAAQ,4BAA4B;IAC/F,IAAa,KAAK,WAEjB;IAED,IAAa,SAAS,WAErB;IAED,IAAa,WAAW,WAEvB;IAED,IAAa,QAAQ,gCAEpB;IAED,sBAAsB,CAAC,MAAM,EAAE,cAAc;IAQ7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB;IAQnD,oBAAoB,CAAC,MAAM,EAAE,cAAc;;;;IAO3C,sBAAsB,CACpB,UAAU,EAAE,kBAAkB,EAC9B,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,cAAc;IAWhD,wBAAwB,CAAC,SAAS,EAAE,oCAAoC;CAOzE"}

package/lib/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanColumn.js

@@ -17,8 +17,8 @@ import { DataCubeQueryFilterOperation } from './DataCubeQueryFilterOperation.js'
 import { DataCubeColumnDataType, DataCubeFunction, DataCubeOperationAdvancedValueType, DataCubeQueryFilterOperator, ofDataType, } from '../DataCubeQueryEngine.js';
 import { _function, _functionName, _property, _value, _var, } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable, isString } from '@finos/legend-shared';
-import { V1_AppliedProperty, } from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import {} from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 export class DataCubeQueryFilterOperation__GreaterThanColumn extends DataCubeQueryFilterOperation {
     get label() {
         return '> value in column';
@@ -40,8 +40,8 @@ export class DataCubeQueryFilterOperation__GreaterThanColumn extends DataCubeQue
         ]);
     }
     isCompatibleWithValue(value) {
-        return (value.type === DataCubeOperationAdvancedValueType.COLUMN &&
-            value.value !== undefined &&
+        return (value.value !== undefined &&
+            value.type === DataCubeOperationAdvancedValueType.COLUMN &&
             isString(value.value));
     }
     generateDefaultValue(column) {
@@ -50,16 +50,8 @@ export class DataCubeQueryFilterOperation__GreaterThanColumn extends DataCubeQue
             value: column.name,
         };
     }
-    buildConditionSnapshot(expression) {
-        const value = expression.parameters[1];
-        const filterConditionSnapshot = _buildConditionSnapshotProperty(expression.parameters[0], this.operator);
-        if (value instanceof V1_AppliedProperty) {
-            filterConditionSnapshot.value = {
-                value: value.property,
-                type: DataCubeOperationAdvancedValueType.COLUMN,
-            };
-        }
-        return filterConditionSnapshot;
+    buildConditionSnapshot(expression, columnGetter) {
+        return this._finalizeConditionSnapshot(_baseFilterCondition(expression, columnGetter, DataCubeFunction.GREATER_THAN));
     }
     buildConditionExpression(condition) {
         const variable = _var();

package/lib/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanColumn.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryFilterOperation__GreaterThanColumn.js","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanColumn.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAGjF,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,kCAAkC,EAClC,2BAA2B,EAC3B,UAAU,GAEX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,aAAa,EACb,SAAS,EACT,MAAM,EACN,IAAI,GACL,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EACL,kBAAkB,GAEnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAE1F,MAAM,OAAO,+CAAgD,SAAQ,4BAA4B;IAC/F,IAAa,KAAK;QAChB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,IAAa,SAAS;QACpB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,iCAAiC,CAAC;IAC3C,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,2BAA2B,CAAC,mBAAmB,CAAC;IACzD,CAAC;IAED,sBAAsB,CAAC,MAAsB;QAC3C,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE;YAC7B,sBAAsB,CAAC,MAAM;YAC7B,sBAAsB,CAAC,IAAI;YAC3B,sBAAsB,CAAC,IAAI;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB,CAAC,KAA6B;QACjD,OAAO,CACL,KAAK,CAAC,IAAI,KAAK,kCAAkC,CAAC,MAAM;YACxD,KAAK,CAAC,KAAK,KAAK,SAAS;YACzB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CACtB,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,MAAsB;QACzC,OAAO;YACL,IAAI,EAAE,kCAAkC,CAAC,MAAM;YAC/C,KAAK,EAAE,MAAM,CAAC,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,sBAAsB,CAAC,UAA8B;QACnD,MAAM,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,uBAAuB,GAAG,+BAA+B,CAC7D,UAAU,CAAC,UAAU,CAAC,CAAC,CAAuB,EAC9C,IAAI,CAAC,QAAQ,CACd,CAAC;QAEF,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;YACxC,uBAAuB,CAAC,KAAK,GAAG;gBAC9B,KAAK,EAAE,KAAK,CAAC,QAAQ;gBACrB,IAAI,EAAE,kCAAkC,CAAC,MAAM;aACf,CAAC;QACrC,CAAC;QACD,OAAO,uBAAsE,CAAC;IAChF,CAAC;IAED,wBAAwB,CAAC,SAA+C;QACtE,MAAM,QAAQ,GAAG,IAAI,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;YAC7D,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC;YACnC,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;SACxD,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"DataCubeQueryFilterOperation__GreaterThanColumn.js","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanColumn.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAGjF,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,kCAAkC,EAClC,2BAA2B,EAC3B,UAAU,GAEX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,aAAa,EACb,SAAS,EACT,MAAM,EACN,IAAI,GACL,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAA2B,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAE/E,MAAM,OAAO,+CAAgD,SAAQ,4BAA4B;IAC/F,IAAa,KAAK;QAChB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,IAAa,SAAS;QACpB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,iCAAiC,CAAC;IAC3C,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,2BAA2B,CAAC,mBAAmB,CAAC;IACzD,CAAC;IAED,sBAAsB,CAAC,MAAsB;QAC3C,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE;YAC7B,sBAAsB,CAAC,MAAM;YAC7B,sBAAsB,CAAC,IAAI;YAC3B,sBAAsB,CAAC,IAAI;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB,CAAC,KAA6B;QACjD,OAAO,CACL,KAAK,CAAC,KAAK,KAAK,SAAS;YACzB,KAAK,CAAC,IAAI,KAAK,kCAAkC,CAAC,MAAM;YACxD,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CACtB,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,MAAsB;QACzC,OAAO;YACL,IAAI,EAAE,kCAAkC,CAAC,MAAM;YAC/C,KAAK,EAAE,MAAM,CAAC,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,sBAAsB,CACpB,UAA8B,EAC9B,YAA8C;QAE9C,OAAO,IAAI,CAAC,0BAA0B,CACpC,oBAAoB,CAClB,UAAU,EACV,YAAY,EACZ,gBAAgB,CAAC,YAAY,CAC9B,CACF,CAAC;IACJ,CAAC;IAED,wBAAwB,CAAC,SAA+C;QACtE,MAAM,QAAQ,GAAG,IAAI,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE;YAC7D,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC;YACnC,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;SACxD,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanOrEqual.d.ts

@@ -29,7 +29,7 @@ export declare class DataCubeQueryFilterOperation__GreaterThanOrEqual extends Da
         type: string;
         value: unknown;
     };
-    buildConditionSnapshot(expression: V1_AppliedFunction): DataCubeQuerySnapshotFilterCondition;
+    buildConditionSnapshot(expression: V1_AppliedFunction, columnGetter: (name: string) => DataCubeColumn): DataCubeQuerySnapshotFilterCondition | undefined;
     buildConditionExpression(condition: DataCubeQuerySnapshotFilterCondition): V1_AppliedFunction;
 }
 //# sourceMappingURL=DataCubeQueryFilterOperation__GreaterThanOrEqual.d.ts.map

package/lib/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanOrEqual.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryFilterOperation__GreaterThanOrEqual.d.ts","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanOrEqual.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,4BAA4B,EAE7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,2BAA2B,EAE3B,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AAQnC,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,qBAAqB,CAAC;AAM7B,qBAAa,gDAAiD,SAAQ,4BAA4B;IAChG,IAAa,KAAK,WAEjB;IAED,IAAa,SAAS,WAErB;IAED,IAAa,WAAW,WAEvB;IAED,IAAa,QAAQ,gCAEpB;IAED,sBAAsB,CAAC,MAAM,EAAE,cAAc;IAQ7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB;IAYnD,oBAAoB,CAAC,MAAM,EAAE,cAAc;;;;IAO3C,sBAAsB,CAAC,UAAU,EAAE,kBAAkB;IAYrD,wBAAwB,CAAC,SAAS,EAAE,oCAAoC;CAMzE"}
+{"version":3,"file":"DataCubeQueryFilterOperation__GreaterThanOrEqual.d.ts","sourceRoot":"","sources":["../../../../src/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanOrEqual.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,4BAA4B,EAE7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,2BAA2B,EAG3B,KAAK,sBAAsB,EAC5B,MAAM,2BAA2B,CAAC;AAQnC,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,qBAAa,gDAAiD,SAAQ,4BAA4B;IAChG,IAAa,KAAK,WAEjB;IAED,IAAa,SAAS,WAErB;IAED,IAAa,WAAW,WAEvB;IAED,IAAa,QAAQ,gCAEpB;IAED,sBAAsB,CAAC,MAAM,EAAE,cAAc;IAQ7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB;IAanD,oBAAoB,CAAC,MAAM,EAAE,cAAc;;;;IAO3C,sBAAsB,CACpB,UAAU,EAAE,kBAAkB,EAC9B,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,cAAc;IAWhD,wBAAwB,CAAC,SAAS,EAAE,oCAAoC;CAMzE"}

package/lib/stores/core/filter/DataCubeQueryFilterOperation__GreaterThanOrEqual.js

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { DataCubeQueryFilterOperation, generateDefaultFilterConditionPrimitiveTypeValue, } from './DataCubeQueryFilterOperation.js';
-import { DataCubeColumnDataType, DataCubeFunction, DataCubeQueryFilterOperator, ofDataType, } from '../DataCubeQueryEngine.js';
+import { DataCubeQueryFilterOperation, _defaultPrimitiveTypeValue, } from './DataCubeQueryFilterOperation.js';
+import { DataCubeColumnDataType, DataCubeFunction, DataCubeQueryFilterOperator, isPrimitiveType, ofDataType, } from '../DataCubeQueryEngine.js';
 import { _function, _functionName, _property, _value, } from '../DataCubeQueryBuilderUtils.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import { V1_PrimitiveValueSpecification, } from '@finos/legend-graph';
-import { _buildConditionSnapshotProperty, _dataCubeOperationValue, } from '../DataCubeQuerySnapshotBuilderUtils.js';
+import {} from '@finos/legend-graph';
+import { _baseFilterCondition } from '../DataCubeQuerySnapshotBuilderUtils.js';
 export class DataCubeQueryFilterOperation__GreaterThanOrEqual extends DataCubeQueryFilterOperation {
     get label() {
         return '>=';
@@ -40,27 +40,23 @@ export class DataCubeQueryFilterOperation__GreaterThanOrEqual extends DataCubeQu
         ]);
     }
     isCompatibleWithValue(value) {
-        return (ofDataType(value.type, [
-            DataCubeColumnDataType.NUMBER,
-            DataCubeColumnDataType.DATE,
-            DataCubeColumnDataType.TIME,
-        ]) &&
-            value.value !== undefined &&
+        return (value.value !== undefined &&
+            isPrimitiveType(value.type) &&
+            ofDataType(value.type, [
+                DataCubeColumnDataType.NUMBER,
+                DataCubeColumnDataType.DATE,
+                DataCubeColumnDataType.TIME,
+            ]) &&
             !Array.isArray(value.value));
     }
     generateDefaultValue(column) {
         return {
             type: column.type,
-            value: generateDefaultFilterConditionPrimitiveTypeValue(column.type),
+            value: _defaultPrimitiveTypeValue(column.type),
         };
     }
-    buildConditionSnapshot(expression) {
-        const value = expression.parameters[1];
-        const filterConditionSnapshot = _buildConditionSnapshotProperty(expression.parameters[0], this.operator);
-        if (value instanceof V1_PrimitiveValueSpecification) {
-            filterConditionSnapshot.value = _dataCubeOperationValue(value);
-        }
-        return filterConditionSnapshot;
+    buildConditionSnapshot(expression, columnGetter) {
+        return this._finalizeConditionSnapshot(_baseFilterCondition(expression, columnGetter, DataCubeFunction.GREATER_THAN_OR_EQUAL));
     }
     buildConditionExpression(condition) {
         return _function(_functionName(DataCubeFunction.GREATER_THAN_OR_EQUAL), [