@finos/legend-application-studio 27.1.2 → 27.1.3

package/src/components/editor/editor-group/uml-editor/EnumerationEditor.tsx

@@ -42,7 +42,7 @@ import {
   LockIcon,
   FireIcon,
   StickArrowCircleRightIcon,
-  PanelDnDEntryDragHandle,
+  PanelEntryDragHandle,
   DragPreviewLayer,
   useDragPreviewLayer,
   PanelDropZone,
@@ -165,9 +165,9 @@ const EnumBasicEditor = observer(
         placeholder={<div className="dnd__placeholder--light"></div>}
         className="enum-basic-editor__container"
       >
-        <PanelDnDEntryDragHandle
-          dropTargetConnector={handleRef}
-          isBeingDragged={isBeingDragged}
+        <PanelEntryDragHandle
+          dragSourceConnector={handleRef}
+          isDragging={isBeingDragged}
         />
 
         <div className="enum-basic-editor">

package/src/components/editor/editor-group/uml-editor/ProfileEditor.tsx

@@ -26,7 +26,7 @@ import {
   PlusIcon,
   TimesIcon,
   LockIcon,
-  PanelDnDEntryDragHandle,
+  PanelEntryDragHandle,
   DragPreviewLayer,
   useDragPreviewLayer,
   Panel,
@@ -126,9 +126,9 @@ const TagBasicEditor = observer(
         placeholder={<div className="dnd__placeholder--light"></div>}
         showPlaceholder={isBeingDragged}
       >
-        <PanelDnDEntryDragHandle
-          dropTargetConnector={handleRef}
-          isBeingDragged={isBeingDragged}
+        <PanelEntryDragHandle
+          dragSourceConnector={handleRef}
+          isDragging={isBeingDragged}
         />
         <div className="tag-basic-editor">
           <InputWithInlineValidation
@@ -229,9 +229,9 @@ const StereotypeBasicEditor = observer(
         className="stereotype-basic-editor__container"
         showPlaceholder={isBeingDragged}
       >
-        <PanelDnDEntryDragHandle
-          dropTargetConnector={handleRef}
-          isBeingDragged={isBeingDragged}
+        <PanelEntryDragHandle
+          dragSourceConnector={handleRef}
+          isDragging={isBeingDragged}
         />
         <div className="stereotype-basic-editor">
           <InputWithInlineValidation

package/src/components/editor/editor-group/uml-editor/StereotypeSelector.tsx

@@ -21,7 +21,7 @@ import {
   createFilter,
   TimesIcon,
   ArrowCircleRightIcon,
-  PanelDnDEntryDragHandle,
+  PanelEntryDragHandle,
   PanelDnDEntry,
   DragPreviewLayer,
   useDragPreviewLayer,
@@ -179,9 +179,9 @@ export const StereotypeSelector = observer(
         placeholder={<div className="dnd__placeholder--light"></div>}
         showPlaceholder={isBeingDragged}
       >
-        <PanelDnDEntryDragHandle
-          dropTargetConnector={handleRef}
-          isBeingDragged={isBeingDragged}
+        <PanelEntryDragHandle
+          dragSourceConnector={handleRef}
+          isDragging={isBeingDragged}
         />
         <div
           className={clsx('stereotype-selector', {

package/src/components/editor/editor-group/uml-editor/TaggedValueEditor.tsx

@@ -24,7 +24,7 @@ import {
   TimesIcon,
   ArrowCircleRightIcon,
   LongArrowAltUpIcon,
-  PanelDnDEntryDragHandle,
+  PanelEntryDragHandle,
   PanelDnDEntry,
   DragPreviewLayer,
   useDragPreviewLayer,
@@ -189,9 +189,9 @@ export const TaggedValueEditor = observer(
         showPlaceholder={isBeingDragged}
         placeholder={<div className="dnd__placeholder--light"></div>}
       >
-        <PanelDnDEntryDragHandle
-          dropTargetConnector={handleRef}
-          isBeingDragged={isBeingDragged}
+        <PanelEntryDragHandle
+          dragSourceConnector={handleRef}
+          isDragging={isBeingDragged}
         />
         <div
           className={clsx('tagged-value-editor', {

package/src/components/editor/side-bar/ProjectOverview.tsx

@@ -801,6 +801,8 @@ interface ProjectOverviewActivityDisplay {
 export const ProjectOverviewActivityBar = observer(() => {
   const editorStore = useEditorStore();
   const projectOverviewState = editorStore.projectOverviewState;
+  const isInEmbeddedMode =
+    editorStore.projectConfigurationEditorState.isInEmbeddedMode;
   const changeActivity =
     (activity: PROJECT_OVERVIEW_ACTIVITY_MODE): (() => void) =>
     (): void =>
@@ -813,9 +815,18 @@ export const ProjectOverviewActivityBar = observer(() => {
     },
     { mode: PROJECT_OVERVIEW_ACTIVITY_MODE.VERSIONS, title: 'Versions' },
     { mode: PROJECT_OVERVIEW_ACTIVITY_MODE.WORKSPACES, title: 'Workspaces' },
-  ].filter((activity): activity is ProjectOverviewActivityDisplay =>
-    Boolean(activity),
-  );
+  ]
+    .filter((activity): activity is ProjectOverviewActivityDisplay =>
+      Boolean(activity),
+    )
+    .filter(
+      (act) =>
+        // releasing not supported in embedded mode
+        !(
+          act.mode === PROJECT_OVERVIEW_ACTIVITY_MODE.RELEASE &&
+          isInEmbeddedMode
+        ),
+    );
 
   return (
     <div

package/src/stores/editor/editor-state/element-editor-state/FunctionEditorState.ts

@@ -417,7 +417,7 @@ export class FunctionEditorState extends ElementEditorState {
             rawPlan,
             this.editorStore.graphManagerState.graph,
           );
-        this.executionPlanState.setPlan(plan);
+        this.executionPlanState.initialize(plan);
       } catch {
         // do nothing
       }

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

@@ -890,7 +890,7 @@ export class DEPRECATED__MappingTestState extends MappingEditorTabState {
             rawPlan,
             this.editorStore.graphManagerState.graph,
           );
-        this.executionPlanState.setPlan(plan);
+        this.executionPlanState.initialize(plan);
       } catch {
         // do nothing
       }

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

@@ -144,7 +144,7 @@ export const generateMappingTestName = (mapping: Mapping): string => {
 
 export enum MAPPING_EDITOR_TAB {
   CLASS_MAPPINGS = 'CLASS_MAPPINGS',
-  BETA_TEST_SUITES = 'TEST_SUITES',
+  TEST_SUITES = 'TEST_SUITES',
 }
 
 export enum MAPPING_ELEMENT_SOURCE_ID_LABEL {
@@ -615,7 +615,7 @@ export interface MappingElementSpec {
 }
 
 export class MappingEditorState extends ElementEditorState {
-  selectedTab = MAPPING_EDITOR_TAB.BETA_TEST_SUITES;
+  selectedTab = MAPPING_EDITOR_TAB.CLASS_MAPPINGS;
   currentTabState?: MappingEditorTabState | undefined;
   openedTabStates: MappingEditorTabState[] = [];
 

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

@@ -903,7 +903,7 @@ export class MappingExecutionState extends MappingEditorTabState {
               rawPlan,
               this.editorStore.graphManagerState.graph,
             );
-          this.executionPlanState.setPlan(plan);
+          this.executionPlanState.initialize(plan);
         } catch {
           // do nothing
         }

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

@@ -543,7 +543,7 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
             rawPlan,
             this.editorStore.graphManagerState.graph,
           );
-        this.executionPlanState.setPlan(plan);
+        this.executionPlanState.initialize(plan);
       } catch {
         // do nothing
       }

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 {