@finos/legend-application-studio 23.1.6 → 23.1.8

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

@@ -80,7 +80,7 @@ import {
   ModelStore,
   reportGraphAnalytics,
 } from '@finos/legend-graph';
-import { ExecutionPlanState, TAB_SIZE } from '@finos/legend-application';
+import { TAB_SIZE } from '@finos/legend-application';
 import { flatData_setData } from '../../../shared/modifier/STO_FlatData_GraphModifierHelper.js';
 import {
   expectedOutputMappingTestAssert_setExpectedOutput,
@@ -99,6 +99,7 @@ import {
   LambdaEditorState,
   QueryBuilderTelemetryHelper,
   QUERY_BUILDER_EVENT,
+  ExecutionPlanState,
 } from '@finos/legend-query-builder';
 import { MappingEditorTabState } from './MappingTabManagerState.js';
 
@@ -393,8 +394,11 @@ export enum MAPPING_TEST_EDITOR_TAB_TYPE {
   SETUP = 'Test Setup',
   RESULT = 'Test Result',
 }
-
-export class MappingTestState extends MappingEditorTabState {
+/**
+ * TODO: Remove once migration from `MappingTest_Legacy` to `MappingTest` is complete
+ * @deprecated
+ */
+export class DEPRECATED__MappingTestState extends MappingEditorTabState {
   readonly editorStore: EditorStore;
   readonly mappingEditorState: MappingEditorState;
 
@@ -446,6 +450,8 @@ export class MappingTestState extends MappingEditorTabState {
       setQueryState: action,
       setInputDataState: action,
       setAssertionState: action,
+      handleError: action,
+      handleResult: action,
       setInputDataStateBasedOnSource: action,
       updateAssertion: action,
       generatePlan: flow,
@@ -725,36 +731,11 @@ export class MappingTestState extends MappingEditorTabState {
       this.setTestRunPromise(promise);
       const result = (yield promise) as ExecutionResult;
       if (this.testRunPromise === promise) {
-        this.testExecutionResultText = stringifyLosslessJSON(
-          extractExecutionResultValues(result),
-          undefined,
-          TAB_SIZE,
-        );
-        let assertionMatched = false;
-        if (
-          this.assertionState instanceof MappingTestExpectedOutputAssertionState
-        ) {
-          // TODO: this logic should probably be better handled in by engine mapping test runner
-          assertionMatched =
-            hashObject(extractExecutionResultValues(result)) ===
-            hashObject(parseLosslessJSON(this.assertionState.expectedResult));
-        } else {
-          throw new UnsupportedOperationError();
-        }
-        this.setResult(
-          assertionMatched ? TEST_RESULT.PASSED : TEST_RESULT.FAILED,
-        );
+        this.handleResult(result);
       }
     } catch (error) {
       assertErrorThrown(error);
-      this.editorStore.applicationStore.logService.error(
-        LogEvent.create(GRAPH_MANAGER_EVENT.EXECUTION_FAILURE),
-        error,
-      );
-      if (this.testRunPromise === promise) {
-        this.errorRunningTest = error;
-        this.setResult(TEST_RESULT.ERROR);
-      }
+      this.handleError(error, promise);
     } finally {
       this.isRunningTest = false;
       this.runTime = Date.now() - startTime;
@@ -769,6 +750,49 @@ export class MappingTestState extends MappingEditorTabState {
     }
   }
 
+  handleResult(result: ExecutionResult): void {
+    this.testExecutionResultText = stringifyLosslessJSON(
+      extractExecutionResultValues(result),
+      undefined,
+      TAB_SIZE,
+    );
+    let assertionMatched = false;
+    if (
+      this.assertionState instanceof MappingTestExpectedOutputAssertionState
+    ) {
+      // TODO: this logic should probably be better handled in by engine mapping test runner
+      assertionMatched =
+        hashObject(extractExecutionResultValues(result)) ===
+        hashObject(parseLosslessJSON(this.assertionState.expectedResult));
+    } else {
+      throw new UnsupportedOperationError();
+    }
+    this.setResult(assertionMatched ? TEST_RESULT.PASSED : TEST_RESULT.FAILED);
+    this.isExecutingTest = false;
+    this.isRunningTest = false;
+  }
+
+  handleError(
+    error: Error,
+    promise: Promise<ExecutionResult> | undefined,
+  ): void {
+    assertErrorThrown(error);
+    this.editorStore.applicationStore.logService.error(
+      LogEvent.create(GRAPH_MANAGER_EVENT.EXECUTION_FAILURE),
+      error,
+    );
+
+    if (
+      this.mappingEditorState.isRunningAllTests ||
+      this.testRunPromise === promise
+    ) {
+      this.errorRunningTest = error;
+      this.setResult(TEST_RESULT.ERROR);
+    }
+    this.isExecutingTest = false;
+    this.isRunningTest = false;
+  }
+
   *onTestStateOpen(openTab?: MAPPING_TEST_EDITOR_TAB_TYPE): GeneratorFn<void> {
     try {
       // extract test basic info out into state

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

@@ -38,6 +38,7 @@ import {
   PureSingleExecution,
   PureMultiExecution,
   PureExecution,
+  isStubbed_RawLambda,
 } from '@finos/legend-graph';
 import { ServiceTestableState } from './testable/ServiceTestableState.js';
 import { User } from '@finos/legend-server-sdlc';
@@ -54,7 +55,7 @@ export class ServiceEditorState extends ElementEditorState {
   executionState: ServiceExecutionState;
   registrationState: ServiceRegistrationState;
   testableState: ServiceTestableState;
-  selectedTab = SERVICE_TAB.GENERAL;
+  selectedTab: SERVICE_TAB;
 
   constructor(editorStore: EditorStore, element: PackageableElement) {
     super(editorStore, element);
@@ -79,6 +80,12 @@ export class ServiceEditorState extends ElementEditorState {
         editorStore.sdlcServerClient.features.canCreateVersion,
     );
     this.testableState = new ServiceTestableState(editorStore, this);
+    const query = this.executionState.serviceExecutionParameters?.query;
+    // default to execution tab if query is defined
+    this.selectedTab =
+      query && !isStubbed_RawLambda(query)
+        ? SERVICE_TAB.EXECUTION
+        : SERVICE_TAB.GENERAL;
   }
 
   setSelectedTab(tab: SERVICE_TAB): void {

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

@@ -34,7 +34,6 @@ import {
 import {
   DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
   DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH,
-  ExecutionPlanState,
   generateExtensionUrlPattern,
   generatePath,
   TAB_SIZE,
@@ -94,6 +93,7 @@ import {
   PARAMETER_SUBMIT_ACTION,
   QueryBuilderTelemetryHelper,
   QUERY_BUILDER_EVENT,
+  ExecutionPlanState,
 } from '@finos/legend-query-builder';
 
 enum DSL_SERVICE_PATH_PARAM_TOKEN {