@finos/legend-application-studio 22.2.0 → 22.3.0

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

@@ -760,7 +760,7 @@ export class MappingExecutionState extends MappingEditorTabState {
       ) {
         this.isExecuting = true;
         const result =
-          (yield this.editorStore.graphManagerState.graphManager.executeMapping(
+          (yield this.editorStore.graphManagerState.graphManager.runQuery(
             query,
             this.mappingEditorState.mapping,
             runtime,

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

@@ -647,7 +647,7 @@ export class MappingTestState extends MappingEditorTabState {
       const runtime = this.inputDataState.runtime;
       this.isExecutingTest = true;
       const result =
-        (yield this.editorStore.graphManagerState.graphManager.executeMapping(
+        (yield this.editorStore.graphManagerState.graphManager.runQuery(
           query,
           this.mappingEditorState.mapping,
           runtime,
@@ -707,7 +707,7 @@ export class MappingTestState extends MappingEditorTabState {
     try {
       const runtime = this.inputDataState.runtime;
       this.isRunningTest = true;
-      promise = this.editorStore.graphManagerState.graphManager.executeMapping(
+      promise = this.editorStore.graphManagerState.graphManager.runQuery(
         this.test.query,
         this.mappingEditorState.mapping,
         runtime,

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

@@ -14,8 +14,13 @@
  * limitations under the License.
  */
 
-import { observable, computed, action, makeObservable } from 'mobx';
-import { guaranteeType } from '@finos/legend-shared';
+import { observable, computed, action, makeObservable, flow } from 'mobx';
+import {
+  type GeneratorFn,
+  type PlainObject,
+  assertErrorThrown,
+  guaranteeType,
+} from '@finos/legend-shared';
 import type { EditorStore } from '../../../EditorStore.js';
 import {
   type ServiceExecutionState,
@@ -33,6 +38,7 @@ import {
   PureMultiExecution,
 } from '@finos/legend-graph';
 import { ServiceTestableState } from './testable/ServiceTestableState.js';
+import { User } from '@finos/legend-server-sdlc';
 
 export enum SERVICE_TAB {
   GENERAL = 'GENERAL',
@@ -59,6 +65,7 @@ export class ServiceEditorState extends ElementEditorState {
       resetExecutionState: action,
       service: computed,
       reprocess: action,
+      searchUsers: flow,
     });
 
     this.executionState = this.buildExecutionState();
@@ -119,6 +126,20 @@ export class ServiceEditorState extends ElementEditorState {
     );
   }
 
+  *searchUsers(name: string): GeneratorFn<User[]> {
+    try {
+      return (
+        (yield this.editorStore.sdlcServerClient.getUsers(
+          name,
+        )) as PlainObject<User>[]
+      ).map((p) => User.serialization.fromJson(p));
+    } catch (error) {
+      assertErrorThrown(error);
+      this.editorStore.applicationStore.notifyError(error);
+      return [];
+    }
+  }
+
   reprocess(
     newElement: PackageableElement,
     editorStore: EditorStore,

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

@@ -379,69 +379,70 @@ export interface ServiceExecutionContext {
 }
 
 export abstract class ServiceExecutionContextState {
-  executionContext: ServiceExecutionContext;
   executionState: ServiceExecutionState;
 
-  constructor(
-    executionContext: ServiceExecutionContext,
-    executionState: ServiceExecutionState,
-  ) {
-    this.executionContext = executionContext;
+  constructor(executionState: ServiceExecutionState) {
     this.executionState = executionState;
   }
 
+  abstract get executionContext(): ServiceExecutionContext;
   abstract setMapping(value: Mapping): void;
   abstract setRuntime(value: Runtime): void;
 }
 
 export class SingleExecutionContextState extends ServiceExecutionContextState {
-  declare executionContext1: PureSingleExecution;
+  declare executionState: SingleServicePureExecutionState;
 
-  constructor(
-    executionContext: PureSingleExecution,
-    executionState: ServiceExecutionState,
-  ) {
-    super(
-      {
-        mapping:
-          executionContext.mapping as PackageableElementReference<Mapping>,
-        runtime: executionContext.runtime as Runtime,
-      },
-      executionState,
-    );
-    this.executionContext1 = executionContext;
+  constructor(executionState: SingleServicePureExecutionState) {
+    super(executionState);
     makeObservable(this, {
-      executionContext: observable,
       setMapping: action,
       setRuntime: action,
     });
+    this.executionState = executionState;
   }
 
   setMapping(value: Mapping): void {
-    this.executionContext.mapping =
-      PackageableElementExplicitReference.create(value);
     pureSingleExecution_setMapping(
-      this.executionContext1,
+      this.executionState.execution,
       value,
       this.executionState.editorStore.changeDetectionState.observerContext,
     );
   }
   setRuntime(value: Runtime): void {
-    this.executionContext.runtime = value;
     pureSingleExecution_setRuntime(
-      this.executionContext1,
+      this.executionState.execution,
       value,
       this.executionState.editorStore.changeDetectionState.observerContext,
     );
   }
+
+  get executionContext(): ServiceExecutionContext {
+    return {
+      mapping: guaranteeNonNullable(this.executionState.execution.mapping),
+      runtime: guaranteeNonNullable(this.executionState.execution.runtime),
+    };
+  }
 }
 
 export class KeyedExecutionContextState extends ServiceExecutionContextState {
-  declare executionContext: KeyedExecutionParameter;
+  keyedExecutionParameter: KeyedExecutionParameter;
+
+  constructor(
+    keyedExecutionParameter: KeyedExecutionParameter,
+    executionState: MultiServicePureExecutionState,
+  ) {
+    super(executionState);
+    makeObservable(this, {
+      setMapping: action,
+      setRuntime: action,
+    });
+    this.keyedExecutionParameter = keyedExecutionParameter;
+  }
 
   setMapping(value: Mapping): void {
     pureSingleExecution_setMapping(
-      this.executionContext,
+      this.keyedExecutionParameter,
       value,
       this.executionState.editorStore.changeDetectionState.observerContext,
     );
@@ -449,11 +450,15 @@ export class KeyedExecutionContextState extends ServiceExecutionContextState {
 
   setRuntime(value: Runtime): void {
     pureSingleExecution_setRuntime(
-      this.executionContext,
+      this.keyedExecutionParameter,
       value,
       this.executionState.editorStore.changeDetectionState.observerContext,
     );
   }
+
+  get executionContext(): ServiceExecutionContext {
+    return this.keyedExecutionParameter;
+  }
 }
 
 export abstract class ServicePureExecutionState extends ServiceExecutionState {
@@ -522,7 +527,7 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
   };
 
   *generatePlan(debug: boolean): GeneratorFn<void> {
-    if (!this.selectedExecutionContextState || this.isGeneratingPlan) {
+    if (this.isGeneratingPlan) {
       return;
     }
     try {
@@ -533,8 +538,8 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
         const debugResult =
           (yield this.editorStore.graphManagerState.graphManager.debugExecutionPlanGeneration(
             query,
-            this.selectedExecutionContextState.executionContext.mapping.value,
-            this.selectedExecutionContextState.executionContext.runtime,
+            this.selectedExecutionContextState?.executionContext.mapping.value,
+            this.selectedExecutionContextState?.executionContext.runtime,
             this.editorStore.graphManagerState.graph,
           )) as { plan: RawExecutionPlan; debug: string };
         rawPlan = debugResult.plan;
@@ -543,8 +548,8 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
         rawPlan =
           (yield this.editorStore.graphManagerState.graphManager.generateExecutionPlan(
             query,
-            this.selectedExecutionContextState.executionContext.mapping.value,
-            this.selectedExecutionContextState.executionContext.runtime,
+            this.selectedExecutionContextState?.executionContext.mapping.value,
+            this.selectedExecutionContextState?.executionContext.runtime,
             this.editorStore.graphManagerState.graph,
           )) as object;
       }
@@ -571,8 +576,8 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
     }
   }
 
-  *handleExecute(): GeneratorFn<void> {
-    if (!this.selectedExecutionContextState || this.isRunningQuery) {
+  *handleRunQuery(): GeneratorFn<void> {
+    if (this.isRunningQuery) {
       return;
     }
     const query = this.queryState.query;
@@ -585,25 +590,24 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
   }
 
   *runQuery(): GeneratorFn<void> {
-    if (!this.selectedExecutionContextState || this.isRunningQuery) {
+    if (this.isRunningQuery) {
       return;
     }
     try {
       this.isRunningQuery = true;
-      const promise =
-        this.editorStore.graphManagerState.graphManager.executeMapping(
-          this.getExecutionQuery(),
-          this.selectedExecutionContextState.executionContext.mapping.value,
-          this.selectedExecutionContextState.executionContext.runtime,
-          this.editorStore.graphManagerState.graph,
-          {
-            useLosslessParse: true,
-            parameterValues: buildExecutionParameterValues(
-              this.parameterState.parameterStates,
-              this.editorStore.graphManagerState,
-            ),
-          },
-        );
+      const promise = this.editorStore.graphManagerState.graphManager.runQuery(
+        this.getExecutionQuery(),
+        this.selectedExecutionContextState?.executionContext.mapping.value,
+        this.selectedExecutionContextState?.executionContext.runtime,
+        this.editorStore.graphManagerState.graph,
+        {
+          useLosslessParse: true,
+          parameterValues: buildExecutionParameterValues(
+            this.parameterState.parameterStates,
+            this.editorStore.graphManagerState,
+          ),
+        },
+      );
       this.setQueryRunPromise(promise);
       const result = (yield promise) as ExecutionResult;
       if (this.queryRunPromise === promise) {
@@ -734,7 +738,7 @@ export class InlineServicePureExecutionState extends ServicePureExecutionState {
       updateExecutionQuery: action,
       setOpeningQueryEditor: action,
       generatePlan: flow,
-      handleExecute: flow,
+      handleRunQuery: flow,
       runQuery: flow,
     });
     this.selectedExecutionContextState =
@@ -767,6 +771,7 @@ export class SingleServicePureExecutionState extends ServicePureExecutionState {
     makeObservable(this, {
       queryState: observable,
       getInitiallySelectedExecutionContextState: observable,
+      selectedExecutionContextState: observable,
       runtimeEditorState: observable,
       isRunningQuery: observable,
       isGeneratingPlan: observable,
@@ -789,7 +794,7 @@ export class SingleServicePureExecutionState extends ServicePureExecutionState {
       setShowChangeExecModal: action,
       setIsRunningQuery: action,
       generatePlan: flow,
-      handleExecute: flow,
+      handleRunQuery: flow,
       runQuery: flow,
     });
     this.selectedExecutionContextState =
@@ -801,7 +806,7 @@ export class SingleServicePureExecutionState extends ServicePureExecutionState {
   }
 
   getInitiallySelectedExecutionContextState(): ServiceExecutionContextState {
-    return new SingleExecutionContextState(this.execution, this);
+    return new SingleExecutionContextState(this);
   }
 
   setMultiExecutionKey(val: string): void {
@@ -877,7 +882,7 @@ export class MultiServicePureExecutionState extends ServicePureExecutionState {
       setIsRunningQuery: action,
       changeExecution: action,
       generatePlan: flow,
-      handleExecute: flow,
+      handleRunQuery: flow,
       runQuery: flow,
     });
 

package/src/stores/editor-state/element-editor-state/service/testable/ServiceTestEditorState.ts

@@ -24,6 +24,7 @@ import {
   buildLambdaVariableExpressions,
   VariableExpression,
   PureMultiExecution,
+  PureExecution,
 } from '@finos/legend-graph';
 import { action, flow, makeObservable, observable } from 'mobx';
 import { TestableTestEditorState } from '../../testable/TestableEditorState.js';
@@ -183,8 +184,11 @@ export class ServiceTestSetupState {
   }
 
   get serviceQuery(): RawLambda | undefined {
-    return this.testState.suiteState.testableState.serviceEditorState
-      .executionState.serviceExecutionParameters?.query;
+    const execution = this.testState.testable.execution;
+    if (execution instanceof PureExecution) {
+      return execution.func;
+    }
+    return undefined;
   }
 
   get queryVariableExpressions(): VariableExpression[] {

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

@@ -269,7 +269,9 @@ export class ProjectDependencyConflictState {
   ) {
     makeObservable(this, {
       treeData: observable.ref,
+      setTreeData: action,
     });
+
     this.report = report;
     this.conflict = conflict;
     this.paths = paths;

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

@@ -474,7 +474,9 @@ export class ProjectViewerStore {
           });
           return false;
         }
-        this.editorStore.setGraphEditMode(GRAPH_EDITOR_MODE.GRAMMAR_TEXT);
+        yield flowResult(
+          this.editorStore.setGraphEditMode(GRAPH_EDITOR_MODE.GRAMMAR_TEXT),
+        );
         yield flowResult(
           this.editorStore.graphState.globalCompileInTextMode({
             ignoreBlocking: true,