@finos/legend-application-studio 27.1.3 → 27.1.5

package/src/stores/editor/editor-state/element-editor-state/mapping/FlatDataInstanceSetImplementationState.ts

@@ -109,7 +109,10 @@ export class FlatDataPropertyMappingState extends PropertyMappingState {
     }
   }
 
-  *convertLambdaObjectToGrammarString(pretty: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+    preserveCompilationError?: boolean | undefined;
+  }): GeneratorFn<void> {
     if (this.propertyMapping instanceof FlatDataPropertyMapping) {
       if (!isStubbed_RawLambda(this.propertyMapping.transform)) {
         try {
@@ -118,7 +121,7 @@ export class FlatDataPropertyMappingState extends PropertyMappingState {
           const isolatedLambdas =
             (yield this.editorStore.graphManagerState.graphManager.lambdasToPureCode(
               lambdas,
-              pretty,
+              options?.pretty,
             )) as Map<string, string>;
           const grammarText = isolatedLambdas.get(this.lambdaId);
           this.setLambdaString(
@@ -126,7 +129,9 @@ export class FlatDataPropertyMappingState extends PropertyMappingState {
               ? this.extractLambdaString(grammarText)
               : '',
           );
-          this.clearErrors();
+          this.clearErrors({
+            preserveCompilationError: options?.preserveCompilationError,
+          });
         } catch (error) {
           assertErrorThrown(error);
           this.editorStore.applicationStore.logService.error(
@@ -347,14 +352,18 @@ export class EmbeddedFlatDataInstanceSetImplementationState
   extractLambdaString(fullLambdaString: string): string {
     throw new UnsupportedOperationError();
   }
-  clearErrors(): void {
+  clearErrors(options?: {
+    preserveCompilationError?: boolean | undefined;
+  }): void {
     // TODO
     return;
   }
   *convertLambdaGrammarStringToObject(): GeneratorFn<void> {
     throw new UnsupportedOperationError();
   }
-  *convertLambdaObjectToGrammarString(pretty: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+  }): GeneratorFn<void> {
     throw new UnsupportedOperationError();
   }
 }

package/src/stores/editor/editor-state/element-editor-state/mapping/MappingExecutionState.ts

@@ -164,10 +164,12 @@ export class MappingExecutionQueryState extends LambdaEditorState {
 
   *updateLamba(val: RawLambda): GeneratorFn<void> {
     this.query = val;
-    yield flowResult(this.convertLambdaObjectToGrammarString(true));
+    yield flowResult(this.convertLambdaObjectToGrammarString({ pretty: true }));
   }
 
-  *convertLambdaObjectToGrammarString(pretty?: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+  }): GeneratorFn<void> {
     if (!isStubbed_RawLambda(this.query)) {
       try {
         const lambdas = new Map<string, RawLambda>();
@@ -175,7 +177,7 @@ export class MappingExecutionQueryState extends LambdaEditorState {
         const isolatedLambdas =
           (yield this.editorStore.graphManagerState.graphManager.lambdasToPureCode(
             lambdas,
-            pretty,
+            options?.pretty,
           )) as Map<string, string>;
         const grammarText = isolatedLambdas.get(this.lambdaId);
         this.setLambdaString(

package/src/stores/editor/editor-state/element-editor-state/mapping/PureInstanceSetImplementationState.ts

@@ -97,7 +97,10 @@ export class PurePropertyMappingState extends PropertyMappingState {
     }
   }
 
-  *convertLambdaObjectToGrammarString(pretty: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+    preserveCompilationError?: boolean | undefined;
+  }): GeneratorFn<void> {
     if (!isStubbed_RawLambda(this.propertyMapping.transform)) {
       try {
         const lambdas = new Map<string, RawLambda>();
@@ -105,7 +108,7 @@ export class PurePropertyMappingState extends PropertyMappingState {
         const isolatedLambdas =
           (yield this.editorStore.graphManagerState.graphManager.lambdasToPureCode(
             lambdas,
-            pretty,
+            options?.pretty,
           )) as Map<string, string>;
         const grammarText = isolatedLambdas.get(this.lambdaId);
         this.setLambdaString(
@@ -113,7 +116,9 @@ export class PurePropertyMappingState extends PropertyMappingState {
             ? this.extractLambdaString(grammarText)
             : '',
         );
-        this.clearErrors();
+        this.clearErrors({
+          preserveCompilationError: options?.preserveCompilationError,
+        });
       } catch (error) {
         assertErrorThrown(error);
         this.editorStore.applicationStore.logService.error(
@@ -190,16 +195,21 @@ export class PureInstanceSetImplementationFilterState extends LambdaEditorState
     }
   }
 
-  *convertLambdaObjectToGrammarString(pretty: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+    preserveCompilationError?: boolean | undefined;
+  }): GeneratorFn<void> {
     if (this.instanceSetImplementation.filter) {
       try {
         const grammarText =
           (yield this.editorStore.graphManagerState.graphManager.lambdaToPureCode(
             this.instanceSetImplementation.filter,
-            pretty,
+            options?.pretty,
           )) as string;
         this.setLambdaString(this.extractLambdaString(grammarText));
-        this.clearErrors();
+        this.clearErrors({
+          preserveCompilationError: options?.preserveCompilationError,
+        });
       } catch (error) {
         assertErrorThrown(error);
         this.editorStore.applicationStore.logService.error(

package/src/stores/editor/editor-state/element-editor-state/mapping/relational/RelationalInstanceSetImplementationState.ts

@@ -109,7 +109,10 @@ export class RelationalPropertyMappingState extends PropertyMappingState {
     }
   }
 
-  *convertLambdaObjectToGrammarString(pretty: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+    preserveCompilationError?: boolean | undefined;
+  }): GeneratorFn<void> {
     if (this.propertyMapping instanceof RelationalPropertyMapping) {
       if (!isStubbed_RawRelationalOperationElement(this.propertyMapping)) {
         try {
@@ -128,7 +131,9 @@ export class RelationalPropertyMappingState extends PropertyMappingState {
               ? this.extractLambdaString(grammarText)
               : '',
           );
-          this.clearErrors();
+          this.clearErrors({
+            preserveCompilationError: options?.preserveCompilationError,
+          });
         } catch (error) {
           assertErrorThrown(error);
           this.editorStore.applicationStore.logService.error(
@@ -214,14 +219,19 @@ export class EmbeddedRelationalInstanceSetImplementationState
   extractLambdaString(fullLambdaString: string): string {
     throw new UnsupportedOperationError();
   }
-  clearErrors(): void {
+  clearErrors(options?: {
+    preserveCompilationError?: boolean | undefined;
+  }): void {
     // TODO
     return;
   }
   *convertLambdaGrammarStringToObject(): GeneratorFn<void> {
     throw new UnsupportedOperationError();
   }
-  *convertLambdaObjectToGrammarString(pretty: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+    preserveCompilationError?: boolean | undefined;
+  }): GeneratorFn<void> {
     throw new UnsupportedOperationError();
   }
 }

package/src/stores/editor/editor-state/element-editor-state/mapping/testable/MappingTestableState.ts

@@ -291,10 +291,12 @@ export class MappingTestSuiteQueryState extends LambdaEditorState {
   *updateLamba(val: RawLambda): GeneratorFn<void> {
     this.query = val;
     mappingTestable_setQuery(this.parent, val);
-    yield flowResult(this.convertLambdaObjectToGrammarString(true));
+    yield flowResult(this.convertLambdaObjectToGrammarString({ pretty: true }));
   }
 
-  *convertLambdaObjectToGrammarString(pretty?: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+  }): GeneratorFn<void> {
     if (!isStubbed_RawLambda(this.query)) {
       try {
         const lambdas = new Map<string, RawLambda>();
@@ -302,7 +304,7 @@ export class MappingTestSuiteQueryState extends LambdaEditorState {
         const isolatedLambdas =
           (yield this.editorStore.graphManagerState.graphManager.lambdasToPureCode(
             lambdas,
-            pretty,
+            options?.pretty,
           )) as Map<string, string>;
         const grammarText = isolatedLambdas.get(this.lambdaId);
         this.setLambdaString(

package/src/stores/editor/editor-state/element-editor-state/service/ServiceExecutionState.ts

@@ -292,10 +292,12 @@ export class ServicePureExecutionQueryState extends LambdaEditorState {
 
   *updateLamba(val: RawLambda): GeneratorFn<void> {
     this.setLambda(val);
-    yield flowResult(this.convertLambdaObjectToGrammarString(true));
+    yield flowResult(this.convertLambdaObjectToGrammarString({ pretty: true }));
   }
 
-  *convertLambdaObjectToGrammarString(pretty?: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+  }): GeneratorFn<void> {
     if (this.execution.func.body) {
       try {
         const lambdas = new Map<string, RawLambda>();
@@ -309,7 +311,7 @@ export class ServicePureExecutionQueryState extends LambdaEditorState {
         const isolatedLambdas =
           (yield this.editorStore.graphManagerState.graphManager.lambdasToPureCode(
             lambdas,
-            pretty,
+            options?.pretty,
           )) as Map<string, string>;
         const grammarText = isolatedLambdas.get(this.lambdaId);
         this.setLambdaString(

package/src/stores/editor/editor-state/element-editor-state/service/ServicePostValidationState.ts

@@ -100,9 +100,10 @@ export class PostValidationAssertionState extends LambdaEditorState {
     }
   }
 
-  override *convertLambdaObjectToGrammarString(
-    pretty: boolean,
-  ): GeneratorFn<void> {
+  override *convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+    preserveCompilationError?: boolean | undefined;
+  }): GeneratorFn<void> {
     if (!isStubbed_RawLambda(this.assertion.assertion)) {
       try {
         const lambdas = new Map<string, RawLambda>();
@@ -110,11 +111,13 @@ export class PostValidationAssertionState extends LambdaEditorState {
         const isolatedLambdas =
           (yield this.editorStore.graphManagerState.graphManager.lambdasToPureCode(
             lambdas,
-            pretty,
+            options?.pretty,
           )) as Map<string, string>;
         const grammarText = isolatedLambdas.get(this.lambdaId);
         this.setLambdaString(grammarText ?? '');
-        this.clearErrors();
+        this.clearErrors({
+          preserveCompilationError: options?.preserveCompilationError,
+        });
       } catch (error) {
         assertErrorThrown(error);
         this.editorStore.applicationStore.logService.error(
@@ -200,7 +203,10 @@ export class PostValidationParameterState extends LambdaEditorState {
     }
   }
 
-  *convertLambdaObjectToGrammarString(pretty: boolean): GeneratorFn<void> {
+  *convertLambdaObjectToGrammarString(options?: {
+    pretty?: boolean | undefined;
+    preserveCompilationError?: boolean | undefined;
+  }): GeneratorFn<void> {
     if (this.lambda.body) {
       try {
         const lambdas = new Map<string, RawLambda>();
@@ -211,11 +217,13 @@ export class PostValidationParameterState extends LambdaEditorState {
         const isolatedLambdas =
           (yield this.editorStore.graphManagerState.graphManager.lambdasToPureCode(
             lambdas,
-            pretty,
+            options?.pretty,
           )) as Map<string, string>;
         const grammarText = isolatedLambdas.get(this.lambdaId);
         this.setLambdaString(grammarText ?? '');
-        this.clearErrors();
+        this.clearErrors({
+          preserveCompilationError: options?.preserveCompilationError,
+        });
       } catch (error) {
         assertErrorThrown(error);
         this.editorStore.applicationStore.logService.error(
@@ -372,7 +380,9 @@ export class PostValidationState {
       this.servicePostValidationState.editorStore,
     );
     this.parametersState.push(_paramState);
-    yield flowResult(_paramState.convertLambdaObjectToGrammarString(false));
+    yield flowResult(
+      _paramState.convertLambdaObjectToGrammarString({ pretty: false }),
+    );
   }
 
   deleteParam(paramState: PostValidationParameterState): void {
@@ -402,7 +412,9 @@ export class PostValidationState {
       this.servicePostValidationState.editorStore,
     );
     this.assertionStates.push(aState);
-    yield flowResult(aState.convertLambdaObjectToGrammarString(false));
+    yield flowResult(
+      aState.convertLambdaObjectToGrammarString({ pretty: false }),
+    );
   }
 
   deleteAssertion(assertion: PostValidationAssertion): void {

package/src/stores/editor/editor-state/element-editor-state/service/testable/ServiceTestableState.ts

@@ -127,7 +127,7 @@ export class ServiceTestSuiteState {
   selectedTestState: ServiceTestState | undefined;
   testStates: ServiceTestState[] = [];
   testToRename: ServiceTest | undefined;
-  isRunningTest = ActionState.create();
+  runningTestState = ActionState.create();
 
   constructor(suite: ServiceTestSuite, testableState: ServiceTestableState) {
     makeObservable(this, {
@@ -188,7 +188,7 @@ export class ServiceTestSuiteState {
 
   *runSuite(): GeneratorFn<void> {
     try {
-      this.isRunningTest.inProgress();
+      this.runningTestState.inProgress();
       this.testStates.forEach((t) => t.resetResult());
       this.testStates.forEach((t) => t.runningTestAction.inProgress());
       const service = this.testableState.serviceEditorState.service;
@@ -205,11 +205,11 @@ export class ServiceTestSuiteState {
         const state = this.testStates.find((t) => t.test === result.atomicTest);
         state?.handleTestResult(result);
       });
-      this.isRunningTest.complete();
+      this.runningTestState.complete();
     } catch (error) {
       assertErrorThrown(error);
       this.editorStore.applicationStore.notificationService.notifyError(error);
-      this.isRunningTest.fail();
+      this.runningTestState.fail();
     } finally {
       this.testStates.forEach((t) => t.runningTestAction.complete());
     }
@@ -217,7 +217,7 @@ export class ServiceTestSuiteState {
 
   *runFailingTests(): GeneratorFn<void> {
     try {
-      this.isRunningTest.inProgress();
+      this.runningTestState.inProgress();
       const service = this.testableState.serviceEditorState.service;
       const input = new RunTestsTestableInput(service);
       input.unitTestIds = this.testStates
@@ -243,11 +243,11 @@ export class ServiceTestSuiteState {
         const state = this.testStates.find((t) => t.test === result.atomicTest);
         state?.handleTestResult(result);
       });
-      this.isRunningTest.complete();
+      this.runningTestState.complete();
     } catch (error) {
       assertErrorThrown(error);
       this.editorStore.applicationStore.notificationService.notifyError(error);
-      this.isRunningTest.fail();
+      this.runningTestState.fail();
     } finally {
       this.testStates.forEach((t) => t.runningTestAction.complete());
     }
@@ -275,7 +275,20 @@ export class ServiceTestSuiteState {
   }
 
   get testFailed(): number {
-    return this.testCount - this.testPassed;
+    return this.testStates.filter(
+      (e) =>
+        (e.testResultState.result instanceof TestExecuted &&
+          e.testResultState.result.testExecutionStatus !==
+            TestExecutionStatus.PASS) ||
+        (e.testResultState.result instanceof MultiExecutionServiceTestResult &&
+          Array.from(
+            e.testResultState.result.keyIndexedTestResults.values(),
+          ).every(
+            (kv) =>
+              kv instanceof TestExecuted &&
+              kv.testExecutionStatus !== TestExecutionStatus.PASS,
+          )),
+    ).length;
   }
 }