@finos/legend-application-studio 19.1.0 → 20.0.1

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/sidebar-state/LocalChangesState.ts

@@ -14,7 +14,14 @@
  * limitations under the License.
  */
 
-import { action, makeAutoObservable, flowResult, flow } from 'mobx';
+import {
+  action,
+  makeObservable,
+  flowResult,
+  flow,
+  observable,
+  computed,
+} from 'mobx';
 import type { EditorStore } from '../EditorStore.js';
 import type { EditorSDLCState } from '../EditorSDLCState.js';
 import { CHANGE_DETECTION_EVENT } from '../ChangeDetectionEvent.js';
@@ -55,8 +62,8 @@ import { EntityChangeConflictEditorState } from '../editor-state/entity-diff-edi
 import { DATE_TIME_FORMAT } from '@finos/legend-graph';
 
 class PatchLoaderState {
-  editorStore: EditorStore;
-  sdlcState: EditorSDLCState;
+  readonly editorStore: EditorStore;
+  readonly sdlcState: EditorSDLCState;
 
   changes: EntityChange[] | undefined;
   currentChanges: EntityChange[] = [];
@@ -65,19 +72,37 @@ class PatchLoaderState {
   isValidPatch = false;
 
   constructor(editorStore: EditorStore, sdlcState: EditorSDLCState) {
-    makeAutoObservable(this, {
-      editorStore: false,
-      sdlcState: false,
+    makeObservable(this, {
+      changes: observable,
+      currentChanges: observable,
+      isLoadingChanges: observable,
+      showModal: observable,
+      isValidPatch: observable,
+      overiddingChanges: computed,
       openModal: action,
       closeModal: action,
+      setIsValidPatch: action,
+      setPatchChanges: action,
       deleteChange: action,
       loadPatchFile: flow,
+      applyChanges: flow,
     });
 
     this.editorStore = editorStore;
     this.sdlcState = sdlcState;
   }
 
+  get overiddingChanges(): EntityChange[] {
+    if (this.changes?.length) {
+      return this.changes.filter((change) =>
+        this.currentChanges.find(
+          (local) => local.entityPath === change.entityPath,
+        ),
+      );
+    }
+    return [];
+  }
+
   openModal(localChanges: EntityChange[]): void {
     this.currentChanges = localChanges;
     this.showModal = true;
@@ -103,17 +128,6 @@ class PatchLoaderState {
     }
   }
 
-  get overiddingChanges(): EntityChange[] {
-    if (this.changes?.length) {
-      return this.changes.filter((change) =>
-        this.currentChanges.find(
-          (local) => local.entityPath === change.entityPath,
-        ),
-      );
-    }
-    return [];
-  }
-
   *loadPatchFile(file: File): GeneratorFn<void> {
     try {
       this.setPatchChanges(undefined);
@@ -161,20 +175,21 @@ class PatchLoaderState {
 }
 
 export class LocalChangesState {
-  editorStore: EditorStore;
-  sdlcState: EditorSDLCState;
-  workspaceSyncState: WorkspaceSyncState;
-  pushChangesState = ActionState.create();
-  refreshLocalChangesDetectorState = ActionState.create();
-  patchLoaderState: PatchLoaderState;
-  refreshWorkspaceSyncStatusState = ActionState.create();
+  readonly editorStore: EditorStore;
+  readonly sdlcState: EditorSDLCState;
+  readonly workspaceSyncState: WorkspaceSyncState;
+  readonly pushChangesState = ActionState.create();
+  readonly refreshLocalChangesDetectorState = ActionState.create();
+  readonly refreshWorkspaceSyncStatusState = ActionState.create();
+  readonly patchLoaderState: PatchLoaderState;
 
   constructor(editorStore: EditorStore, sdlcState: EditorSDLCState) {
-    makeAutoObservable(this, {
-      editorStore: false,
-      sdlcState: false,
-      openLocalChange: action,
+    makeObservable(this, {
+      hasUnpushedChanges: computed,
+      openPotentialWorkspacePullConflict: action,
       refreshWorkspaceSyncStatus: flow,
+      refreshLocalChanges: flow,
+      pushLocalChanges: flow,
     });
 
     this.editorStore = editorStore;
@@ -190,6 +205,46 @@ export class LocalChangesState {
     );
   }
 
+  downloadLocalChanges(): void {
+    const fileName = `entityChanges_(${this.sdlcState.currentProject?.name}_${
+      this.sdlcState.activeWorkspace.workspaceId
+    })_${formatDate(new Date(Date.now()), DATE_TIME_FORMAT)}.json`;
+    const content = JSON.stringify(
+      {
+        message: '', // TODO?
+        entityChanges: this.editorStore.graphState.computeLocalEntityChanges(),
+        revisionId: this.sdlcState.activeRevision.id,
+      },
+      undefined,
+      TAB_SIZE,
+    );
+    downloadFileUsingDataURI(fileName, content, ContentType.APPLICATION_JSON);
+  }
+
+  alertUnsavedChanges(onProceed: () => void): void {
+    if (this.hasUnpushedChanges) {
+      this.editorStore.applicationStore.setActionAlertInfo({
+        message:
+          'Unsaved changes to your query will be lost if you continue. Do you still want to proceed?',
+        type: ActionAlertType.CAUTION,
+        actions: [
+          {
+            label: 'Proceed',
+            type: ActionAlertActionType.PROCEED_WITH_CAUTION,
+            handler: (): void => onProceed(),
+          },
+          {
+            label: 'Abort',
+            type: ActionAlertActionType.PROCEED,
+            default: true,
+          },
+        ],
+      });
+    } else {
+      onProceed();
+    }
+  }
+
   openLocalChange(diff: EntityDiff): void {
     const fromEntityGetter = (
       entityPath: string | undefined,
@@ -296,6 +351,53 @@ export class LocalChangesState {
     );
   }
 
+  openPotentialWorkspacePullConflict(conflict: EntityChangeConflict): void {
+    const baseEntityGetter = (
+      entityPath: string | undefined,
+    ): Entity | undefined =>
+      entityPath
+        ? this.editorStore.changeDetectionState.workspaceLocalLatestRevisionState.entities.find(
+            (e) => e.path === entityPath,
+          )
+        : undefined;
+    const currentChangeEntityGetter = (
+      entityPath: string | undefined,
+    ): Entity | undefined =>
+      entityPath
+        ? this.editorStore.graphManagerState.graph.allOwnElements
+            .map((element) =>
+              this.editorStore.graphManagerState.graphManager.elementToEntity(
+                element,
+              ),
+            )
+            .find((e) => e.path === entityPath)
+        : undefined;
+    const incomingChangeEntityGetter = (
+      entityPath: string | undefined,
+    ): Entity | undefined =>
+      entityPath
+        ? this.editorStore.changeDetectionState.workspaceRemoteLatestRevisionState.entities.find(
+            (e) => e.path === entityPath,
+          )
+        : undefined;
+    const conflictEditorState = new EntityChangeConflictEditorState(
+      this.editorStore,
+      this.editorStore.conflictResolutionState,
+      conflict.entityPath,
+      SPECIAL_REVISION_ALIAS.WORKSPACE_BASE,
+      SPECIAL_REVISION_ALIAS.LOCAL,
+      SPECIAL_REVISION_ALIAS.WORKSPACE_HEAD,
+      baseEntityGetter(conflict.entityPath),
+      currentChangeEntityGetter(conflict.entityPath),
+      incomingChangeEntityGetter(conflict.entityPath),
+      baseEntityGetter,
+      currentChangeEntityGetter,
+      incomingChangeEntityGetter,
+    );
+    conflictEditorState.setReadOnly(true);
+    this.editorStore.openEntityChangeConflict(conflictEditorState);
+  }
+
   *refreshLocalChanges(): GeneratorFn<void> {
     const startTime = Date.now();
     this.refreshLocalChangesDetectorState.inProgress();
@@ -386,69 +488,6 @@ export class LocalChangesState {
     }
   }
 
-  openPotentialWorkspacePullConflict(conflict: EntityChangeConflict): void {
-    const baseEntityGetter = (
-      entityPath: string | undefined,
-    ): Entity | undefined =>
-      entityPath
-        ? this.editorStore.changeDetectionState.workspaceLocalLatestRevisionState.entities.find(
-            (e) => e.path === entityPath,
-          )
-        : undefined;
-    const currentChangeEntityGetter = (
-      entityPath: string | undefined,
-    ): Entity | undefined =>
-      entityPath
-        ? this.editorStore.graphManagerState.graph.allOwnElements
-            .map((element) =>
-              this.editorStore.graphManagerState.graphManager.elementToEntity(
-                element,
-              ),
-            )
-            .find((e) => e.path === entityPath)
-        : undefined;
-    const incomingChangeEntityGetter = (
-      entityPath: string | undefined,
-    ): Entity | undefined =>
-      entityPath
-        ? this.editorStore.changeDetectionState.workspaceRemoteLatestRevisionState.entities.find(
-            (e) => e.path === entityPath,
-          )
-        : undefined;
-    const conflictEditorState = new EntityChangeConflictEditorState(
-      this.editorStore,
-      this.editorStore.conflictResolutionState,
-      conflict.entityPath,
-      SPECIAL_REVISION_ALIAS.WORKSPACE_BASE,
-      SPECIAL_REVISION_ALIAS.LOCAL,
-      SPECIAL_REVISION_ALIAS.WORKSPACE_HEAD,
-      baseEntityGetter(conflict.entityPath),
-      currentChangeEntityGetter(conflict.entityPath),
-      incomingChangeEntityGetter(conflict.entityPath),
-      baseEntityGetter,
-      currentChangeEntityGetter,
-      incomingChangeEntityGetter,
-    );
-    conflictEditorState.setReadOnly(true);
-    this.editorStore.openEntityChangeConflict(conflictEditorState);
-  }
-
-  downloadLocalChanges = (): void => {
-    const fileName = `entityChanges_(${this.sdlcState.currentProject?.name}_${
-      this.sdlcState.activeWorkspace.workspaceId
-    })_${formatDate(new Date(Date.now()), DATE_TIME_FORMAT)}.json`;
-    const content = JSON.stringify(
-      {
-        message: '', // TODO?
-        entityChanges: this.editorStore.graphState.computeLocalEntityChanges(),
-        revisionId: this.sdlcState.activeRevision.id,
-      },
-      undefined,
-      TAB_SIZE,
-    );
-    downloadFileUsingDataURI(fileName, content, ContentType.APPLICATION_JSON);
-  };
-
   *pushLocalChanges(pushMessage?: string): GeneratorFn<void> {
     if (
       this.pushChangesState.isInProgress ||
@@ -683,28 +722,4 @@ export class LocalChangesState {
       this.pushChangesState.complete();
     }
   }
-
-  alertUnsavedChanges(onProceed: () => void): void {
-    if (this.hasUnpushedChanges) {
-      this.editorStore.applicationStore.setActionAlertInfo({
-        message:
-          'Unsaved changes to your query will be lost if you continue. Do you still want to proceed?',
-        type: ActionAlertType.CAUTION,
-        actions: [
-          {
-            label: 'Proceed',
-            type: ActionAlertActionType.PROCEED_WITH_CAUTION,
-            handler: (): void => onProceed(),
-          },
-          {
-            label: 'Abort',
-            type: ActionAlertActionType.PROCEED,
-            default: true,
-          },
-        ],
-      });
-    } else {
-      onProceed();
-    }
-  }
 }

package/src/stores/sidebar-state/ProjectOverviewState.ts

@@ -16,7 +16,7 @@
 
 import type { EditorStore } from '../EditorStore.js';
 import type { EditorSDLCState } from '../EditorSDLCState.js';
-import { action, flowResult, makeAutoObservable } from 'mobx';
+import { action, flow, flowResult, makeObservable, observable } from 'mobx';
 import {
   type GeneratorFn,
   type PlainObject,
@@ -63,10 +63,25 @@ export class ProjectOverviewState {
   isFetchingCurrentProjectRevision = false;
 
   constructor(editorStore: EditorStore, sdlcState: EditorSDLCState) {
-    makeAutoObservable(this, {
-      editorStore: false,
-      sdlcState: false,
+    makeObservable(this, {
+      activityMode: observable,
+      releaseVersion: observable,
+      committedReviewsBetweenMostRecentVersionAndProjectLatest: observable,
+      latestProjectVersion: observable,
+      currentProjectRevision: observable,
+      projectWorkspaces: observable,
+      isCreatingVersion: observable,
+      isFetchingProjectWorkspaces: observable,
+      isDeletingWorkspace: observable,
+      isUpdatingProject: observable,
+      isFetchingLatestVersion: observable,
+      isFetchingCurrentProjectRevision: observable,
       setActivityMode: action,
+      fetchProjectWorkspaces: flow,
+      deleteWorkspace: flow,
+      updateProject: flow,
+      fetchLatestProjectVersion: flow,
+      createVersion: flow,
     });
 
     this.editorStore = editorStore;