@finos/legend-query-builder 4.1.3 → 4.1.5

package/src/stores/QueryLoaderState.ts

@@ -24,12 +24,14 @@ import {
   type QueryInfo,
   type BasicGraphManagerState,
   type Query,
+  GRAPH_MANAGER_EVENT,
 } from '@finos/legend-graph';
 import {
   ActionState,
   type GeneratorFn,
   assertErrorThrown,
   guaranteeNonNullable,
+  LogEvent,
 } from '@finos/legend-shared';
 import { makeObservable, observable, action, flow } from 'mobx';
 import type { QueryBuilderState } from './QueryBuilderState.js';
@@ -62,6 +64,7 @@ export class QueryLoaderState {
   readonly isReadOnly?: boolean | undefined;
   readonly onQueryRenamed?: ((query: LightQuery) => void) | undefined;
   readonly onQueryDeleted?: ((query: LightQuery) => void) | undefined;
+  readonly handleFetchDefaultQueriesFailure?: (() => void) | undefined;
 
   queryBuilderState?: QueryBuilderState | undefined;
 
@@ -93,6 +96,7 @@ export class QueryLoaderState {
       isReadOnly?: boolean | undefined;
       onQueryRenamed?: ((query: LightQuery) => void) | undefined;
       onQueryDeleted?: ((query: LightQuery) => void) | undefined;
+      handleFetchDefaultQueriesFailure?: (() => void) | undefined;
     },
   ) {
     makeObservable(this, {
@@ -126,6 +130,8 @@ export class QueryLoaderState {
     this.isReadOnly = options.isReadOnly;
     this.onQueryRenamed = options.onQueryRenamed;
     this.onQueryDeleted = options.onQueryDeleted;
+    this.handleFetchDefaultQueriesFailure =
+      options.handleFetchDefaultQueriesFailure;
   }
 
   setSearchText(val: string): void {
@@ -190,7 +196,11 @@ export class QueryLoaderState {
         } catch (error) {
           this.searchQueriesState.fail();
           assertErrorThrown(error);
-          this.applicationStore.notificationService.notifyError(error);
+          this.applicationStore.logService.error(
+            LogEvent.create(GRAPH_MANAGER_EVENT.GET_QUERY_FAILURE),
+            error,
+          );
+          this.handleFetchDefaultQueriesFailure?.();
         }
       }
 

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

@@ -121,8 +121,6 @@ export class QueryBuilderTDSState
   isConvertDerivationProjectionObjects = false;
   showPostFilterPanel: boolean;
   showWindowFuncPanel = false;
-  draggedColumnIndex: number | undefined;
-  hoveredColumnIndex: number | undefined;
 
   postFilterOperators: QueryBuilderPostFilterOperator[] =
     getQueryBuilderCorePostFilterOperators();
@@ -144,14 +142,11 @@ export class QueryBuilderTDSState
       isConvertDerivationProjectionObjects: observable,
       showPostFilterPanel: observable,
       showWindowFuncPanel: observable,
-      draggedColumnIndex: observable,
-      hoveredColumnIndex: observable,
       TEMPORARY__showPostFetchStructurePanel: computed,
       derivations: computed,
       hasParserError: computed,
       addColumn: action,
       moveColumn: action,
-      setRearrangeColumnsIndex: action,
       replaceColumn: action,
       initialize: action,
       setShowPostFilterPanel: action,
@@ -159,9 +154,6 @@ export class QueryBuilderTDSState
       convertDerivationProjectionObjects: flow,
     });
 
-    this.draggedColumnIndex = undefined;
-    this.hoveredColumnIndex = undefined;
-
     this.resultSetModifierState = new QueryResultSetModifierState(this);
     this.postFilterState = new QueryBuilderPostFilterState(
       this,
@@ -182,14 +174,6 @@ export class QueryBuilderTDSState
       ) ?? false;
   }
 
-  setRearrangeColumnsIndex(
-    draggedColumnIndex: number | undefined,
-    hoveredColumnIndex: number | undefined,
-  ): void {
-    this.draggedColumnIndex = draggedColumnIndex;
-    this.hoveredColumnIndex = hoveredColumnIndex;
-  }
-
   get type(): string {
     return FETCH_STRUCTURE_IMPLEMENTATION.TABULAR_DATA_STRUCTURE;
   }
@@ -481,7 +465,9 @@ export class QueryBuilderTDSState
     // convert to grammar for display
     flowResult(
       derivationColumnState.derivationLambdaEditorState.convertLambdaObjectToGrammarString(
-        false,
+        {
+          pretty: false,
+        },
       ),
     ).catch(this.queryBuilderState.applicationStore.alertUnhandledError);
   }

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

@@ -81,9 +81,7 @@ export class QueryBuilderPostFilterOperator_EndWith
       }
       default:
         throw new UnsupportedOperationError(
-          `Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${
-            propertyType?.path
-          }'`,
+          `Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${propertyType?.path}'`,
         );
     }
   }

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

@@ -110,9 +110,7 @@ export class QueryBuilderPostFilterOperator_GreaterThan
       }
       default:
         throw new UnsupportedOperationError(
-          `Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${
-            propertyType?.path
-          }'`,
+          `Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${propertyType?.path}'`,
         );
     }
   }

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

@@ -110,9 +110,7 @@ export class QueryBuilderPostFilterOperator_LessThan
       }
       default:
         throw new UnsupportedOperationError(
-          `Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${
-            propertyType?.path
-          }'`,
+          `Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${propertyType?.path}'`,
         );
     }
   }

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

@@ -82,9 +82,7 @@ export class QueryBuilderPostFilterOperator_StartWith
       }
       default:
         throw new UnsupportedOperationError(
-          `Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${
-            propertyType?.path
-          }'`,
+          `Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${propertyType?.path}'`,
         );
     }
   }

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts

@@ -226,7 +226,10 @@ class QueryBuilderDerivationProjectionLambdaState extends LambdaEditorState {
     }
   }
 
-  *convertLambdaObjectToGrammarString(pretty: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+    preserveCompilationError?: boolean | undefined;
+  }): GeneratorFn<void> {
     if (this.derivationProjectionColumnState.lambda.body) {
       try {
         const lambdas = new Map<string, RawLambda>();
@@ -240,7 +243,7 @@ class QueryBuilderDerivationProjectionLambdaState extends LambdaEditorState {
         const isolatedLambdas =
           (yield this.queryBuilderState.graphManagerState.graphManager.lambdasToPureCode(
             lambdas,
-            pretty,
+            options?.pretty,
           )) as Map<string, string>;
         const grammarText = isolatedLambdas.get(this.lambdaId);
         this.setLambdaString(
@@ -248,7 +251,9 @@ class QueryBuilderDerivationProjectionLambdaState extends LambdaEditorState {
             ? this.extractLambdaString(grammarText)
             : '',
         );
-        this.clearErrors();
+        this.clearErrors({
+          preserveCompilationError: options?.preserveCompilationError,
+        });
       } catch (error) {
         assertErrorThrown(error);
         this.queryBuilderState.applicationStore.logService.error(

package/src/stores/shared/LambdaEditorState.ts

@@ -64,9 +64,15 @@ export abstract class LambdaEditorState {
     this.lambdaString = val;
   }
 
-  clearErrors(): void {
-    this.setCompilationError(undefined);
+  clearErrors(options?: {
+    preserveCompilationError?: boolean | undefined;
+  }): void {
     this.setParserError(undefined);
+    if (options?.preserveCompilationError && this.compilationError) {
+      this.compilationError.sourceInformation = undefined;
+    } else {
+      this.setCompilationError(undefined);
+    }
   }
 
   setCompilationError(compilationError: CompilationError | undefined): void {
@@ -113,7 +119,8 @@ export abstract class LambdaEditorState {
   }
 
   abstract convertLambdaGrammarStringToObject(): GeneratorFn<void>;
-  abstract convertLambdaObjectToGrammarString(
-    pretty: boolean,
-  ): GeneratorFn<void>;
+  abstract convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+    preserveCompilationError?: boolean | undefined;
+  }): GeneratorFn<void>;
 }