@finos/legend-application-studio 19.0.0 → 20.0.0

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

@@ -39,14 +39,7 @@ import {
   ContentType,
 } from '@finos/legend-shared';
 import type { EditorStore } from '../../../EditorStore.js';
-import {
-  observable,
-  flow,
-  action,
-  makeObservable,
-  makeAutoObservable,
-  flowResult,
-} from 'mobx';
+import { observable, flow, action, makeObservable, flowResult } from 'mobx';
 import { createMockDataForMappingElementSource } from '../../../shared/MockDataUtils.js';
 import {
   type MappingTest,
@@ -393,9 +386,10 @@ export enum MAPPING_TEST_EDITOR_TAB_TYPE {
 
 export class MappingTestState {
   readonly uuid = uuid();
+  readonly editorStore: EditorStore;
+  readonly mappingEditorState: MappingEditorState;
+
   selectedTab = MAPPING_TEST_EDITOR_TAB_TYPE.SETUP;
-  editorStore: EditorStore;
-  mappingEditorState: MappingEditorState;
   result: TEST_RESULT = TEST_RESULT.NONE;
   test: MappingTest;
   runTime = 0;
@@ -416,13 +410,25 @@ export class MappingTestState {
     test: MappingTest,
     mappingEditorState: MappingEditorState,
   ) {
-    makeAutoObservable(this, {
-      uuid: false,
-      editorStore: false,
-      mappingEditorState: false,
-      executionPlanState: false,
+    makeObservable(this, {
+      selectedTab: observable,
+      result: observable,
+      test: observable,
+      runTime: observable,
+      isSkipped: observable,
+      errorRunningTest: observable,
+      testExecutionResultText: observable,
+      isRunningTest: observable,
+      isExecutingTest: observable,
+      queryState: observable,
+      inputDataState: observable,
+      assertionState: observable,
+      isGeneratingPlan: observable,
+      executionPlanState: observable,
+      testRunPromise: observable,
       setIsRunningTest: action,
       setSelectedTab: action,
+      setTestRunPromise: action,
       resetTestRunStatus: action,
       setResult: action,
       toggleSkipTest: action,
@@ -432,6 +438,9 @@ export class MappingTestState {
       setInputDataStateBasedOnSource: action,
       updateAssertion: action,
       generatePlan: flow,
+      regenerateExpectedResult: flow,
+      runTest: flow,
+      onTestStateOpen: flow,
     });
 
     this.editorStore = editorStore;
@@ -454,9 +463,9 @@ export class MappingTestState {
     this.selectedTab = val;
   }
 
-  setTestRunPromise = (promise: Promise<ExecutionResult> | undefined): void => {
+  setTestRunPromise(promise: Promise<ExecutionResult> | undefined): void {
     this.testRunPromise = promise;
-  };
+  }
 
   buildQueryState(): MappingTestQueryState {
     const queryState = new MappingTestQueryState(
@@ -518,21 +527,26 @@ export class MappingTestState {
     this.runTime = 0;
     this.setResult(TEST_RESULT.NONE);
   }
+
   setResult(result: TEST_RESULT): void {
     this.result = result;
   }
+
   toggleSkipTest(): void {
     this.isSkipped = !this.isSkipped;
   }
-  setQueryState = (queryState: MappingTestQueryState): void => {
+
+  setQueryState(queryState: MappingTestQueryState): void {
     this.queryState = queryState;
-  };
-  setInputDataState = (inputDataState: MappingTestInputDataState): void => {
+  }
+
+  setInputDataState(inputDataState: MappingTestInputDataState): void {
     this.inputDataState = inputDataState;
-  };
-  setAssertionState = (assertionState: MappingTestAssertionState): void => {
+  }
+
+  setAssertionState(assertionState: MappingTestAssertionState): void {
     this.assertionState = assertionState;
-  };
+  }
 
   setInputDataStateBasedOnSource(
     source: MappingElementSource | undefined,

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

@@ -300,9 +300,10 @@ export class ServicePureExecutionQueryState extends LambdaEditorState {
         // or any of its dependencies
         ...Array.from(
           (
-            (yield flowResult(
-              this.editorStore.graphState.getIndexedDependencyEntities(),
-            )) as Map<string, Entity[]>
+            (yield this.editorStore.graphState.getIndexedDependencyEntities()) as Map<
+              string,
+              Entity[]
+            >
           ).keys(),
         ).map((coordinatesInText) => {
           const { groupId, artifactId } = parseGACoordinates(coordinatesInText);

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { action, computed, makeAutoObservable } from 'mobx';
+import { action, computed, flow, makeObservable, observable } from 'mobx';
 import { MINIMUM_SERVICE_OWNERS } from '../../../editor-state/element-editor-state/service/ServiceEditorState.js';
 import type { EditorStore } from '../../../EditorStore.js';
 import {
@@ -89,7 +89,8 @@ export class ServiceRegistrationState {
   readonly editorStore: EditorStore;
   readonly service: Service;
   readonly registrationOptions: ServiceRegistrationEnvironmentConfig[] = [];
-  registrationState = ActionState.create();
+  readonly registrationState = ActionState.create();
+
   serviceEnv?: string | undefined;
   serviceExecutionMode?: ServiceExecutionMode | undefined;
   projectVersion?: Version | string | undefined;
@@ -103,16 +104,26 @@ export class ServiceRegistrationState {
     registrationOptions: ServiceRegistrationEnvironmentConfig[],
     enableModesWithVersioning: boolean,
   ) {
-    makeAutoObservable(this, {
-      editorStore: false,
+    makeObservable(this, {
+      serviceEnv: observable,
+      serviceExecutionMode: observable,
+      projectVersion: observable,
+      activatePostRegistration: observable,
+      enableModesWithVersioning: observable,
+      TEMPORARY__useStoreModel: observable,
       executionModes: computed,
-      updateVersion: action,
+      options: computed,
+      versionOptions: computed,
+      setServiceEnv: action,
+      setServiceExecutionMode: action,
       setProjectVersion: action,
+      setActivatePostRegistration: action,
       setUseStoreModelWithFullInteractive: action,
       initialize: action,
+      updateVersion: action,
       updateType: action,
       updateEnv: action,
-      setActivatePostRegistration: action,
+      registerService: flow,
     });
 
     this.editorStore = editorStore;
@@ -123,48 +134,6 @@ export class ServiceRegistrationState {
     this.registrationState.setMessageFormatter(prettyCONSTName);
   }
 
-  setServiceEnv(val: string | undefined): void {
-    this.serviceEnv = val;
-  }
-  setServiceExecutionMode(val: ServiceExecutionMode | undefined): void {
-    this.serviceExecutionMode = val;
-  }
-  setProjectVersion(val: Version | string | undefined): void {
-    this.projectVersion = val;
-  }
-  setActivatePostRegistration(val: boolean): void {
-    this.activatePostRegistration = val;
-  }
-  setUseStoreModelWithFullInteractive(val: boolean): void {
-    this.TEMPORARY__useStoreModel = val;
-  }
-
-  initialize(): void {
-    this.serviceEnv = getNullableFirstElement(this.registrationOptions)?.env;
-    this.serviceExecutionMode = this.executionModes[0];
-    this.updateVersion();
-  }
-
-  updateVersion(): void {
-    if (this.serviceExecutionMode === ServiceExecutionMode.SEMI_INTERACTIVE) {
-      this.projectVersion = LATEST_PROJECT_REVISION;
-    } else if (this.serviceExecutionMode === ServiceExecutionMode.PROD) {
-      this.projectVersion = this.editorStore.sdlcState.projectVersions[0];
-    } else {
-      this.projectVersion = undefined;
-    }
-  }
-
-  updateType(val: ServiceExecutionMode | undefined): void {
-    this.setServiceExecutionMode(val);
-    this.updateVersion();
-  }
-
-  updateEnv(val: string | undefined): void {
-    this.setServiceEnv(val);
-    this.setServiceExecutionMode(this.executionModes[0]);
-  }
-
   get options(): ServiceRegistrationEnvironmentConfig[] {
     if (this.enableModesWithVersioning) {
       return this.registrationOptions;
@@ -214,6 +183,52 @@ export class ServiceRegistrationState {
     return undefined;
   }
 
+  setServiceEnv(val: string | undefined): void {
+    this.serviceEnv = val;
+  }
+
+  setServiceExecutionMode(val: ServiceExecutionMode | undefined): void {
+    this.serviceExecutionMode = val;
+  }
+
+  setProjectVersion(val: Version | string | undefined): void {
+    this.projectVersion = val;
+  }
+
+  setActivatePostRegistration(val: boolean): void {
+    this.activatePostRegistration = val;
+  }
+
+  setUseStoreModelWithFullInteractive(val: boolean): void {
+    this.TEMPORARY__useStoreModel = val;
+  }
+
+  initialize(): void {
+    this.serviceEnv = getNullableFirstElement(this.registrationOptions)?.env;
+    this.serviceExecutionMode = this.executionModes[0];
+    this.updateVersion();
+  }
+
+  updateVersion(): void {
+    if (this.serviceExecutionMode === ServiceExecutionMode.SEMI_INTERACTIVE) {
+      this.projectVersion = LATEST_PROJECT_REVISION;
+    } else if (this.serviceExecutionMode === ServiceExecutionMode.PROD) {
+      this.projectVersion = this.editorStore.sdlcState.projectVersions[0];
+    } else {
+      this.projectVersion = undefined;
+    }
+  }
+
+  updateType(val: ServiceExecutionMode | undefined): void {
+    this.setServiceExecutionMode(val);
+    this.updateVersion();
+  }
+
+  updateEnv(val: string | undefined): void {
+    this.setServiceEnv(val);
+    this.setServiceExecutionMode(this.executionModes[0]);
+  }
+
   *registerService(): GeneratorFn<void> {
     try {
       this.registrationState.inProgress();

package/src/stores/project-viewer/ProjectViewerStore.ts

@@ -280,9 +280,11 @@ export class ProjectViewerStore {
     this.editorStore.graphManagerState.dependenciesBuildState.setMessage(
       `Fetching dependencies...`,
     );
-    const dependencyEntitiesIndex = (yield flowResult(
-      this.editorStore.graphState.getIndexedDependencyEntities(),
-    )) as Map<string, Entity[]>;
+    const dependencyEntitiesIndex =
+      (yield this.editorStore.graphState.getIndexedDependencyEntities()) as Map<
+        string,
+        Entity[]
+      >;
     stopWatch.record(GRAPH_MANAGER_EVENT.GRAPH_DEPENDENCIES_FETCHED);
 
     return {

package/src/stores/shared/PackageTreeUtils.ts

@@ -40,6 +40,7 @@ import {
   FileGenerationSpecification,
   GenerationSpecification,
   DataElement,
+  generateFunctionPrettyName,
 } from '@finos/legend-graph';
 
 const getElementProjectExplorerDnDType = (
@@ -105,6 +106,14 @@ export const getSelectedPackageTreeNodePackage = (
       : node.packageableElement.package
     : undefined;
 
+export const generatePackageableElementTreeNodeDataLabel = (
+  element: PackageableElement,
+  node?: PackageTreeNodeData,
+): string =>
+  element instanceof ConcreteFunctionDefinition
+    ? generateFunctionPrettyName(element, false)
+    : node?.label ?? element.name;
+
 export const getPackableElementTreeNodeData = (
   editorStore: EditorStore,
   element: PackageableElement,
@@ -112,7 +121,7 @@ export const getPackableElementTreeNodeData = (
 ): PackageTreeNodeData => ({
   id: element.path,
   dndType: getElementProjectExplorerDnDType(editorStore, element),
-  label: element.name,
+  label: generatePackageableElementTreeNodeDataLabel(element),
   childrenIds:
     element instanceof Package
       ? element.children