@finos/legend-query-builder 4.14.40 → 4.14.43

package/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts

@@ -146,7 +146,6 @@ export class QueryBuilderTDSState
       TEMPORARY__showPostFetchStructurePanel: computed,
       derivations: computed,
       hasParserError: computed,
-      isQueryOptionsSet: computed,
       addColumn: action,
       moveColumn: action,
       removeAllColumns: action,
@@ -357,16 +356,6 @@ export class QueryBuilderTDSState
     return fetchStructureValidationIssues;
   }
 
-  get isQueryOptionsSet(): boolean {
-    return (
-      this.resultSetModifierState.limit !== undefined ||
-      this.queryBuilderState.milestoningState.isMilestonedQuery ||
-      this.resultSetModifierState.slice !== undefined ||
-      this.resultSetModifierState.sortColumns.length > 0 ||
-      this.resultSetModifierState.distinct
-    );
-  }
-
   get tdsColumns(): QueryBuilderTDSColumnState[] {
     const aggregationStateCols = this.aggregationState.columns.map(
       (c) => c.projectionColumnState,

package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.ts

@@ -53,7 +53,7 @@ export class QueryBuilderPostFilterOperator_In
   implements Hashable
 {
   getLabel(): string {
-    return 'is in';
+    return 'is in list of';
   }
 
   isCompatibleWithType(type: Type): boolean {
@@ -168,7 +168,7 @@ export class QueryBuilderPostFilterOperator_In
 
 export class QueryBuilderPostFilterOperator_NotIn extends QueryBuilderPostFilterOperator_In {
   override getLabel(): string {
-    return `is not in`;
+    return `is not in list of`;
   }
 
   override buildPostFilterConditionExpression(

package/src/stores/filter/QueryBuilderFilterState.ts

@@ -128,17 +128,20 @@ export class FilterConditionState implements Hashable {
     );
   }
 
-  *handleTypeaheadSearch(): GeneratorFn<void> {
+  *handleTypeaheadSearch(
+    searchValue?: ValueSpecification | undefined,
+  ): GeneratorFn<void> {
+    const value = searchValue ?? this.value;
     try {
       this.typeaheadSearchState.inProgress();
       this.typeaheadSearchResults = undefined;
-      if (performTypeahead(this.value)) {
+      if (performTypeahead(value)) {
         const result =
           (yield this.filterState.queryBuilderState.graphManagerState.graphManager.runQuery(
             buildPropertyTypeaheadQuery(
               this.filterState.queryBuilderState,
               this.propertyExpressionState.propertyExpression,
-              this.value,
+              value,
             ),
             guaranteeNonNullable(
               this.filterState.queryBuilderState.executionContextState.mapping,

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

@@ -48,7 +48,7 @@ export class QueryBuilderFilterOperator_In
   implements Hashable
 {
   getLabel(filterConditionState: FilterConditionState): string {
-    return 'is in';
+    return 'is in list of';
   }
 
   isCompatibleWithFilterConditionProperty(
@@ -172,7 +172,7 @@ export class QueryBuilderFilterOperator_In
 
 export class QueryBuilderFilterOperator_NotIn extends QueryBuilderFilterOperator_In {
   override getLabel(filterConditionState: FilterConditionState): string {
-    return `is not in`;
+    return `is not in list of`;
   }
 
   override buildFilterConditionExpression(

package/src/stores/milestoning/QueryBuilderMilestoningState.ts

@@ -75,7 +75,7 @@ export class QueryBuilderMilestoningState implements Hashable {
       startDate: observable,
       endDate: observable,
       showMilestoningEditor: observable,
-
+      isMilestonedQuery: computed,
       setProcessingDate: action,
       setBusinessDate: action,
       setStartDate: action,
@@ -87,10 +87,6 @@ export class QueryBuilderMilestoningState implements Hashable {
       initializeAllVersionsInRangeParameters: action,
       clearAllVersionsInRangeParameters: action,
       clearGetAllParameters: action,
-
-      isAllVersionsEnabled: computed,
-      isAllVersionsInRangeEnabled: computed,
-      isMilestonedQuery: computed,
       hashCode: computed,
     });
 
@@ -384,9 +380,9 @@ export class QueryBuilderMilestoningState implements Hashable {
         this.queryBuilderState.parametersState.parameterStates.find(
           (p) => p.parameter === this.startDate,
         );
-      if (paramState) {
-        this.queryBuilderState.parametersState.removeParameter(paramState);
-      }
+      this.queryBuilderState.parametersState.removeParameter(
+        guaranteeNonNullable(paramState),
+      );
     }
     if (
       this.endDate instanceof VariableExpression &&
@@ -398,9 +394,9 @@ export class QueryBuilderMilestoningState implements Hashable {
         this.queryBuilderState.parametersState.parameterStates.find(
           (p) => p.parameter === this.endDate,
         );
-      if (paramState) {
-        this.queryBuilderState.parametersState.removeParameter(paramState);
-      }
+      this.queryBuilderState.parametersState.removeParameter(
+        guaranteeNonNullable(paramState),
+      );
     }
     this.setStartDate(undefined);
     this.setEndDate(undefined);

package/src/stores/shared/ValueSpecificationEditorHelper.ts

@@ -321,3 +321,66 @@ export const valueSpecReturnTDS = (
     retunType && tdsType && (retunType === tdsType || retunType === tdsRowType),
   );
 };
+
+export const convertTextToPrimitiveInstanceValue = (
+  expectedType: Type,
+  value: string,
+  obseverContext: ObserverContext,
+): PrimitiveInstanceValue | null => {
+  let result = null;
+  if (expectedType instanceof PrimitiveType) {
+    switch (expectedType.path) {
+      case PRIMITIVE_TYPE.STRING: {
+        result = new PrimitiveInstanceValue(
+          GenericTypeExplicitReference.create(new GenericType(expectedType)),
+        );
+        instanceValue_setValues(result, [value.toString()], obseverContext);
+        break;
+      }
+      case PRIMITIVE_TYPE.NUMBER:
+      case PRIMITIVE_TYPE.FLOAT:
+      case PRIMITIVE_TYPE.DECIMAL:
+      case PRIMITIVE_TYPE.INTEGER: {
+        if (isNaN(Number(value))) {
+          return null;
+        }
+        result = new PrimitiveInstanceValue(
+          GenericTypeExplicitReference.create(new GenericType(expectedType)),
+        );
+        instanceValue_setValues(result, [Number(value)], obseverContext);
+        break;
+      }
+      case PRIMITIVE_TYPE.DATE:
+      case PRIMITIVE_TYPE.STRICTDATE: {
+        if (isNaN(Date.parse(value))) {
+          return null;
+        }
+        result = new PrimitiveInstanceValue(
+          GenericTypeExplicitReference.create(new GenericType(expectedType)),
+        );
+        instanceValue_setValues(result, [value], obseverContext);
+        break;
+      }
+      case PRIMITIVE_TYPE.DATETIME: {
+        if (
+          isNaN(Date.parse(value)) ||
+          !new Date(value).getTime() ||
+          (value.includes('%') &&
+            (isNaN(Date.parse(value.slice(1))) ||
+              !new Date(value.slice(1)).getTime()))
+        ) {
+          return null;
+        }
+        result = new PrimitiveInstanceValue(
+          GenericTypeExplicitReference.create(new GenericType(expectedType)),
+        );
+        instanceValue_setValues(result, [value], obseverContext);
+        break;
+      }
+      default:
+        // unsupported expected type, just escape
+        return null;
+    }
+  }
+  return result;
+};