@finos/legend-application-studio 27.1.2 → 27.1.4

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;
   }
 }
 

package/src/stores/editor/editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.ts

@@ -32,6 +32,7 @@ import {
   guaranteeNonNullable,
   hashArray,
   ActionState,
+  prettyCONSTName,
 } from '@finos/legend-shared';
 import type { EditorSDLCState } from '../../EditorSDLCState.js';
 import {
@@ -39,6 +40,7 @@ import {
   ProjectStructureVersion,
   UpdateProjectConfigurationCommand,
   UpdatePlatformConfigurationsCommand,
+  ProjectType,
 } from '@finos/legend-server-sdlc';
 import { LEGEND_STUDIO_APP_EVENT } from '../../../../__lib__/LegendStudioEvent.js';
 import { SNAPSHOT_ALIAS, StoreProjectData } from '@finos/legend-server-depot';
@@ -48,8 +50,22 @@ export enum CONFIGURATION_EDITOR_TAB {
   PROJECT_STRUCTURE = 'PROJECT_STRUCTURE',
   PROJECT_DEPENDENCIES = 'PROJECT_DEPENDENCIES',
   PLATFORM_CONFIGURATIONS = 'PLATFORM_CONFIGURATIONS',
+  ADVANCED = 'ADVANCED',
 }
 
+export const projectTypeTabFilter = (
+  mode: ProjectType,
+  tab: CONFIGURATION_EDITOR_TAB,
+): boolean => {
+  if (
+    mode === ProjectType.EMBEDDED &&
+    tab === CONFIGURATION_EDITOR_TAB.PLATFORM_CONFIGURATIONS
+  ) {
+    return false;
+  }
+  return true;
+};
+
 export class ProjectConfigurationEditorState extends EditorState {
   readonly sdlcState: EditorSDLCState;
   readonly updatingConfigurationState = ActionState.create();
@@ -95,6 +111,7 @@ export class ProjectConfigurationEditorState extends EditorState {
       updateToLatestStructure: flow,
       updateConfigs: flow,
       fetchLatestProjectStructureVersion: flow,
+      changeProjectType: flow,
     });
 
     this.projectDependencyEditorState = new ProjectDependencyEditorState(
@@ -168,6 +185,12 @@ export class ProjectConfigurationEditorState extends EditorState {
     );
   }
 
+  get isInEmbeddedMode(): boolean {
+    return (
+      this.originalProjectConfiguration?.projectType === ProjectType.EMBEDDED
+    );
+  }
+
   *fectchAssociatedProjectsAndVersions(): GeneratorFn<void> {
     this.fetchingProjectVersionsState.inProgress();
     try {
@@ -268,11 +291,20 @@ export class ProjectConfigurationEditorState extends EditorState {
   *updateToLatestStructure(): GeneratorFn<void> {
     if (this.latestProjectStructureVersion) {
       try {
+        let latestStructure = this.latestProjectStructureVersion;
+        if (this.isInEmbeddedMode) {
+          const projectStructureVersion = new ProjectStructureVersion();
+          projectStructureVersion.version =
+            this.latestProjectStructureVersion.version;
+          // extension version does not exists in embedded mode
+          projectStructureVersion.extensionVersion = undefined;
+          latestStructure = projectStructureVersion;
+        }
         const updateCommand = new UpdateProjectConfigurationCommand(
           this.currentProjectConfiguration.groupId,
           this.currentProjectConfiguration.artifactId,
-          this.latestProjectStructureVersion,
-          `update project configuration from ${this.editorStore.applicationStore.config.appName}`,
+          latestStructure,
+          `update project configuration from ${this.editorStore.applicationStore.config.appName}: update to latest project structure`,
         );
         yield flowResult(this.updateProjectConfiguration(updateCommand));
       } catch (error) {
@@ -288,6 +320,31 @@ export class ProjectConfigurationEditorState extends EditorState {
     }
   }
 
+  *changeProjectType(): GeneratorFn<void> {
+    try {
+      const newProjectType = this.isInEmbeddedMode
+        ? ProjectType.MANAGED
+        : ProjectType.EMBEDDED;
+      const updateCommand = new UpdateProjectConfigurationCommand(
+        this.currentProjectConfiguration.groupId,
+        this.currentProjectConfiguration.artifactId,
+        undefined,
+        `update project configuration from ${
+          this.editorStore.applicationStore.config.appName
+        }: changed project type to ${prettyCONSTName(newProjectType)}`,
+      );
+      updateCommand.projectType = newProjectType;
+      yield flowResult(this.updateProjectConfiguration(updateCommand));
+    } catch (error) {
+      assertErrorThrown(error);
+      this.editorStore.applicationStore.logService.error(
+        LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE),
+        error,
+      );
+      this.editorStore.applicationStore.notificationService.notifyError(error);
+    }
+  }
+
   // TODO: we will probably need to remove this in the future when we have a better strategy for change detection and persistence of project config
   // See https://github.com/finos/legend-studio/issues/952
   *updateConfigs(): GeneratorFn<void> {

package/src/stores/editor/utils/TestableUtils.ts

@@ -74,7 +74,7 @@ export const validateTestableId = (
   if (!id) {
     return 'ID is required';
   } else if (id.includes(' ')) {
-    return `ID can't contain space`;
+    return `ID can't contain spaces`;
   } else if (possibleIds?.includes(id)) {
     return `ID '${id}' already exists`;
   }
@@ -138,7 +138,7 @@ export class EmbeddedDataCreatorFromEmbeddedData
   visit_ExternalFormatData(data: ExternalFormatData): EmbeddedData {
     const val = new ExternalFormatData();
     val.contentType = data.contentType;
-    val.data = '';
+    val.data = data.data;
     return val;
   }
   visit_ModelStoreData(data: ModelStoreData): EmbeddedData {