npm - @finos/legend-query-builder - Versions diffs - 4.18.1 → 4.18.3 - Mend

@finos/legend-query-builder 4.18.1 → 4.18.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (122) hide show

package/src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts CHANGED Viewed

@@ -22,7 +22,6 @@ import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import {
   type ValueSpecification,
   type SimpleFunctionExpression,
-  type AbstractPropertyExpression,
   Enumeration,
   PRIMITIVE_TYPE,
 } from '@finos/legend-graph';
@@ -30,6 +29,7 @@ import { type Hashable, hashArray } from '@finos/legend-shared';
 import {
   buildFilterConditionState,
   buildFilterConditionExpression,
+  getFilterExpressionLeftSideTypePath,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
@@ -52,9 +52,7 @@ export class QueryBuilderFilterOperator_Equal
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
       (normalizedType !== undefined &&
@@ -84,17 +82,14 @@ export class QueryBuilderFilterOperator_Equal
         !filterConditionState.rightConditionValue.isCollection
         ? filterConditionState.rightConditionValue.type
         : undefined,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType,
+      filterConditionState.leftConditionType,
     );
   }
   getDefaultFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): ValueSpecification | undefined {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     return buildDefaultInstanceValue(
       filterConditionState.filterState.queryBuilderState.graphManagerState
         .graph,
@@ -111,8 +106,7 @@ export class QueryBuilderFilterOperator_Equal
   ): ValueSpecification {
     return buildFilterConditionExpression(
       filterConditionState,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      filterConditionState.leftConditionType.path === PRIMITIVE_TYPE.DATETIME &&
         filterConditionState.rightConditionValue?.type?.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_DAY
@@ -128,8 +122,8 @@ export class QueryBuilderFilterOperator_Equal
     return buildFilterConditionState(
       filterState,
       expression,
-      (expression.parametersValues[0] as AbstractPropertyExpression).func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      getFilterExpressionLeftSideTypePath(expression) ===
+        PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_DAY

package/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts CHANGED Viewed

@@ -22,7 +22,6 @@ import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import {
   type ValueSpecification,
   type SimpleFunctionExpression,
-  type AbstractPropertyExpression,
   PRIMITIVE_TYPE,
 } from '@finos/legend-graph';
 import {
@@ -33,6 +32,7 @@ import {
 import {
   buildFilterConditionState,
   buildFilterConditionExpression,
+  getFilterExpressionLeftSideTypePath,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
@@ -53,9 +53,7 @@ export class QueryBuilderFilterOperator_GreaterThan
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
       normalizedType !== undefined &&
@@ -81,17 +79,14 @@ export class QueryBuilderFilterOperator_GreaterThan
         !filterConditionState.rightConditionValue.isCollection
         ? filterConditionState.rightConditionValue.type
         : undefined,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType,
+      filterConditionState.leftConditionType,
     );
   }
   getDefaultFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): ValueSpecification | undefined {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.NUMBER:
       case PRIMITIVE_TYPE.DECIMAL:
@@ -122,8 +117,7 @@ export class QueryBuilderFilterOperator_GreaterThan
   ): ValueSpecification {
     return buildFilterConditionExpression(
       filterConditionState,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      filterConditionState.leftConditionType.path === PRIMITIVE_TYPE.DATETIME &&
         filterConditionState.rightConditionValue?.type?.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_AFTER_DAY
@@ -139,8 +133,8 @@ export class QueryBuilderFilterOperator_GreaterThan
     return buildFilterConditionState(
       filterState,
       expression,
-      (expression.parametersValues[0] as AbstractPropertyExpression).func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      getFilterExpressionLeftSideTypePath(expression) ===
+        PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_AFTER_DAY

package/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts CHANGED Viewed

@@ -23,7 +23,6 @@ import {
   PRIMITIVE_TYPE,
   type ValueSpecification,
   type SimpleFunctionExpression,
-  type AbstractPropertyExpression,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -33,6 +32,7 @@ import {
 import {
   buildFilterConditionState,
   buildFilterConditionExpression,
+  getFilterExpressionLeftSideTypePath,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
@@ -53,9 +53,7 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
       normalizedType !== undefined &&
@@ -81,17 +79,14 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
         !filterConditionState.rightConditionValue.isCollection
         ? filterConditionState.rightConditionValue.type
         : undefined,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType,
+      filterConditionState.leftConditionType,
     );
   }
   getDefaultFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): ValueSpecification | undefined {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.NUMBER:
       case PRIMITIVE_TYPE.DECIMAL:
@@ -122,8 +117,7 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
   ): ValueSpecification {
     return buildFilterConditionExpression(
       filterConditionState,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      filterConditionState.leftConditionType.path === PRIMITIVE_TYPE.DATETIME &&
         filterConditionState.rightConditionValue?.type?.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY
@@ -139,8 +133,8 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
     return buildFilterConditionState(
       filterState,
       expression,
-      (expression.parametersValues[0] as AbstractPropertyExpression).func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      getFilterExpressionLeftSideTypePath(expression) ===
+        PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY

package/src/stores/filter/operators/QueryBuilderFilterOperator_In.ts CHANGED Viewed

@@ -56,9 +56,7 @@ export class QueryBuilderFilterOperator_In
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
       (normalizedType !== undefined &&
@@ -82,9 +80,7 @@ export class QueryBuilderFilterOperator_In
   isCompatibleWithFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     const rightSide = filterConditionState.rightConditionValue;
     // `in`/`not in` does not support right hand value being column state as the multipliticy for columns are [0..1]
     if (rightSide instanceof FilterValueSpecConditionValueState) {
@@ -147,9 +143,7 @@ export class QueryBuilderFilterOperator_In
   getDefaultFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): ValueSpecification | undefined {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     return new CollectionInstanceValue(
       Multiplicity.ONE,
       GenericTypeExplicitReference.create(new GenericType(propertyType)),

package/src/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.ts CHANGED Viewed

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
-import type {
-  QueryBuilderFilterState,
-  FilterConditionState,
+import {
+  type QueryBuilderFilterState,
+  type FilterConditionState,
+  FilterPropertyExpressionSourceState,
 } from '../QueryBuilderFilterState.js';
 import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import {
@@ -50,11 +51,13 @@ export class QueryBuilderFilterOperator_IsEmpty
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     // First check if property is optional
     if (
+      !(
+        filterConditionState.sourceState instanceof
+        FilterPropertyExpressionSourceState
+      ) ||
       !isPropertyExpressionChainOptional(
         filterConditionState.propertyExpressionState.propertyExpression,
       )

package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts CHANGED Viewed

@@ -23,7 +23,6 @@ import {
   PRIMITIVE_TYPE,
   type ValueSpecification,
   type SimpleFunctionExpression,
-  type AbstractPropertyExpression,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -33,6 +32,7 @@ import {
 import {
   buildFilterConditionState,
   buildFilterConditionExpression,
+  getFilterExpressionLeftSideTypePath,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
@@ -53,9 +53,7 @@ export class QueryBuilderFilterOperator_LessThan
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
       normalizedType !== undefined &&
@@ -81,17 +79,14 @@ export class QueryBuilderFilterOperator_LessThan
         !filterConditionState.rightConditionValue.isCollection
         ? filterConditionState.rightConditionValue.type
         : undefined,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType,
+      filterConditionState.leftConditionType,
     );
   }
   getDefaultFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): ValueSpecification | undefined {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.NUMBER:
       case PRIMITIVE_TYPE.DECIMAL:
@@ -122,8 +117,7 @@ export class QueryBuilderFilterOperator_LessThan
   ): ValueSpecification {
     return buildFilterConditionExpression(
       filterConditionState,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      filterConditionState.leftConditionType.path === PRIMITIVE_TYPE.DATETIME &&
         filterConditionState.rightConditionValue?.type?.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_BEFORE_DAY
@@ -139,8 +133,8 @@ export class QueryBuilderFilterOperator_LessThan
     return buildFilterConditionState(
       filterState,
       expression,
-      (expression.parametersValues[0] as AbstractPropertyExpression).func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      getFilterExpressionLeftSideTypePath(expression) ===
+        PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_BEFORE_DAY

package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts CHANGED Viewed

@@ -23,7 +23,6 @@ import {
   PRIMITIVE_TYPE,
   type ValueSpecification,
   type SimpleFunctionExpression,
-  type AbstractPropertyExpression,
 } from '@finos/legend-graph';
 import {
   type Hashable,
@@ -33,6 +32,7 @@ import {
 import {
   buildFilterConditionState,
   buildFilterConditionExpression,
+  getFilterExpressionLeftSideTypePath,
 } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import {
@@ -53,9 +53,7 @@ export class QueryBuilderFilterOperator_LessThanEqual
   isCompatibleWithFilterConditionProperty(
     filterConditionState: FilterConditionState,
   ): boolean {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
     return (
       normalizedType !== undefined &&
@@ -81,17 +79,14 @@ export class QueryBuilderFilterOperator_LessThanEqual
         !filterConditionState.rightConditionValue.isCollection
         ? filterConditionState.rightConditionValue.type
         : undefined,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType,
+      filterConditionState.leftConditionType,
     );
   }
   getDefaultFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): ValueSpecification | undefined {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.NUMBER:
       case PRIMITIVE_TYPE.DECIMAL:
@@ -122,8 +117,7 @@ export class QueryBuilderFilterOperator_LessThanEqual
   ): ValueSpecification {
     return buildFilterConditionExpression(
       filterConditionState,
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      filterConditionState.leftConditionType.path === PRIMITIVE_TYPE.DATETIME &&
         filterConditionState.rightConditionValue?.type?.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY
@@ -139,8 +133,8 @@ export class QueryBuilderFilterOperator_LessThanEqual
     return buildFilterConditionState(
       filterState,
       expression,
-      (expression.parametersValues[0] as AbstractPropertyExpression).func.value
-        .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+      getFilterExpressionLeftSideTypePath(expression) ===
+        PRIMITIVE_TYPE.DATETIME &&
         expression.parametersValues[1]?.genericType?.value.rawType.path !==
           PRIMITIVE_TYPE.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY

package/src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts CHANGED Viewed

@@ -55,8 +55,7 @@ export class QueryBuilderFilterOperator_StartWith
   ): boolean {
     return (
       getStandardPrimitiveTypeEquivalent(
-        filterConditionState.propertyExpressionState.propertyExpression.func
-          .value.genericType.value.rawType,
+        filterConditionState.leftConditionType,
       ) === PRIMITIVE_TYPE.STRING
     );
   }
@@ -78,9 +77,7 @@ export class QueryBuilderFilterOperator_StartWith
   getDefaultFilterConditionValue(
     filterConditionState: FilterConditionState,
   ): ValueSpecification | undefined {
-    const propertyType =
-      filterConditionState.propertyExpressionState.propertyExpression.func.value
-        .genericType.value.rawType;
+    const propertyType = filterConditionState.leftConditionType;
     switch (propertyType.path) {
       case PRIMITIVE_TYPE.STRING: {
         return buildDefaultInstanceValue(

package/src/stores/milestoning/QueryBuilderMilestoningState.ts CHANGED Viewed

@@ -51,6 +51,7 @@ import { QueryBuilderAggregateColumnState } from '../fetch-structure/tds/aggrega
 import {
   QueryBuilderFilterTreeConditionNodeData,
   QueryBuilderFilterTreeExistsNodeData,
+  FilterPropertyExpressionSourceState,
 } from '../filter/QueryBuilderFilterState.js';
 export class QueryBuilderMilestoningState implements Hashable {
@@ -153,13 +154,18 @@ export class QueryBuilderMilestoningState implements Hashable {
       }
       this.queryBuilderState.filterState.nodes.forEach((node) => {
         if (node instanceof QueryBuilderFilterTreeConditionNodeData) {
-          node.condition.propertyExpressionState.derivedPropertyExpressionStates[0]?.parameterValues.forEach(
-            (p) => {
-              if (p instanceof INTERNAL__PropagatedValue) {
-                p.isPropagatedValue = false;
-              }
-            },
-          );
+          if (
+            node.condition.sourceState instanceof
+            FilterPropertyExpressionSourceState
+          ) {
+            node.condition.sourceState.propertyExpressionState.derivedPropertyExpressionStates[0]?.parameterValues.forEach(
+              (p) => {
+                if (p instanceof INTERNAL__PropagatedValue) {
+                  p.isPropagatedValue = false;
+                }
+              },
+            );
+          }
         } else if (node instanceof QueryBuilderFilterTreeExistsNodeData) {
           if (
             node.propertyExpressionState.derivedPropertyExpressionStates[0] &&

package/src/stores/workflows/accessor/AccessorQueryBuilderState.ts CHANGED Viewed

@@ -147,11 +147,9 @@ export class AccessorQueryBuilderState extends QueryBuilderState {
   }
   /**
-   * In accessor mode, the filter panel does not support relation columns,
-   * so we hide it and show the post-filter panel instead.
+   * In accessor mode, configure both filter and post-filter panels to be visible.
    */
   private configureFilterPanelsForAccessor(): void {
-    this.filterState.setShowPanel(false);
     const tdsState = this.fetchStructureState.implementation;
     if (tdsState instanceof QueryBuilderTDSState) {
       tdsState.setShowPostFilterPanel(true);