@finos/legend-application-studio 28.1.4 → 28.2.0

package/src/stores/editor/EditorGraphState.ts

@@ -42,11 +42,7 @@ import { ElementEditorState } from './editor-state/element-editor-state/ElementE
 import { GraphGenerationState } from './editor-state/GraphGenerationState.js';
 import { MODEL_IMPORT_NATIVE_INPUT_TYPE } from './editor-state/ModelImporterState.js';
 import type { DSL_LegendStudioApplicationPlugin_Extension } from '../LegendStudioApplicationPlugin.js';
-import {
-  type Entity,
-  EntitiesWithOrigin,
-  generateGAVCoordinates,
-} from '@finos/legend-storage';
+import { type Entity, EntitiesWithOrigin } from '@finos/legend-storage';
 import {
   type EntityChange,
   type ProjectDependency,
@@ -59,7 +55,6 @@ import {
   ProjectDependencyCoordinates,
   RawProjectDependencyReport,
   buildDependencyReport,
-  StoreProjectData,
 } from '@finos/legend-server-depot';
 import {
   GRAPH_MANAGER_EVENT,
@@ -752,53 +747,15 @@ export class EditorGraphState {
     projectDependencies: ProjectDependency[],
   ): Promise<ProjectDependencyCoordinates[]> {
     return Promise.all(
-      projectDependencies.map(async (dep) => {
-        /**
-         * We expect current dependency ids to be in the format of {groupId}:{artifactId}.
-         * For the legacy dependency we must fetch the corresponding coordinates (group, artifact ids) from the depot server
-         *
-         * @backwardCompatibility
-         */
-        if (dep.isLegacyDependency) {
-          return this.editorStore.depotServerClient
-            .getProjectById(dep.projectId)
-            .then((projects) => {
-              const projectsData = projects.map((p) =>
-                StoreProjectData.serialization.fromJson(p),
-              );
-              if (projectsData.length !== 1) {
-                throw new Error(
-                  `Expected 1 project for project ID '${dep.projectId}'. Got ${
-                    projectsData.length
-                  } projects with coordinates ${projectsData
-                    .map(
-                      (i) =>
-                        `'${generateGAVCoordinates(
-                          i.groupId,
-                          i.artifactId,
-                          undefined,
-                        )}'`,
-                    )
-                    .join(', ')}.`,
-                );
-              }
-              const project = projectsData[0] as StoreProjectData;
-              return new ProjectDependencyCoordinates(
-                project.groupId,
-                project.artifactId,
-                dep.versionId,
-              );
-            });
-        } else {
-          return Promise.resolve(
-            new ProjectDependencyCoordinates(
-              guaranteeNonNullable(dep.groupId),
-              guaranteeNonNullable(dep.artifactId),
-              dep.versionId,
-            ),
-          );
-        }
-      }),
+      projectDependencies.map(async (dep) =>
+        Promise.resolve(
+          new ProjectDependencyCoordinates(
+            guaranteeNonNullable(dep.groupId),
+            guaranteeNonNullable(dep.artifactId),
+            dep.versionId,
+          ),
+        ),
+      ),
     );
   }
 

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

@@ -32,6 +32,7 @@ import {
   assertType,
   StopWatch,
   filterByType,
+  assertTrue,
 } from '@finos/legend-shared';
 import { ElementEditorState } from './ElementEditorState.js';
 import {
@@ -51,6 +52,7 @@ import {
   VariableExpression,
   observe_ValueSpecification,
   generateFunctionPrettyName,
+  RawVariableExpression,
 } from '@finos/legend-graph';
 import {
   ExecutionPlanState,
@@ -271,6 +273,7 @@ export class FunctionEditorState extends ElementEditorState {
       generatePlan: flow,
       handleRunFunc: flow,
       cancelFuncRun: flow,
+      updateFunctionWithQuery: flow,
     });
 
     assertType(
@@ -335,6 +338,32 @@ export class FunctionEditorState extends ElementEditorState {
     this.functionDefinitionEditorState.setCompilationError(undefined);
   }
 
+  *updateFunctionWithQuery(val: RawLambda): GeneratorFn<void> {
+    const lambdaParam = val.parameters ? (val.parameters as object[]) : [];
+    const parameters = lambdaParam
+      .map((param) =>
+        this.editorStore.graphManagerState.graphManager.buildRawValueSpecification(
+          param,
+          this.editorStore.graphManagerState.graph,
+        ),
+      )
+      .map((rawValueSpec) =>
+        guaranteeType(rawValueSpec, RawVariableExpression),
+      );
+    assertTrue(
+      Array.isArray(val.body),
+      `Query body expected to be a list of expressions`,
+    );
+    this.functionElement.expressionSequence = val.body as object[];
+    this.functionElement.parameters = parameters;
+    yield flowResult(
+      this.functionDefinitionEditorState.convertLambdaObjectToGrammarString({
+        pretty: true,
+        firstLoad: true,
+      }),
+    );
+  }
+
   reprocess(
     newElement: ConcreteFunctionDefinition,
     editorStore: EditorStore,

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

@@ -31,9 +31,8 @@ export class MappingExecutionQueryBuilderState extends QueryBuilderState {
     mapping: Mapping,
   ) {
     super(applicationStore, graphManagerState);
-
     this.executionMapping = mapping;
-    this.mapping = mapping;
+    this.executionContextState.mapping = mapping;
   }
 
   override get isMappingReadOnly(): boolean {

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

@@ -42,6 +42,7 @@ import {
   getValueSpecificationReturnType,
   type Type,
   resolveServiceQueryRawLambda,
+  PureExecution,
 } from '@finos/legend-graph';
 import { ServiceTestableState } from './testable/ServiceTestableState.js';
 import { User } from '@finos/legend-server-sdlc';
@@ -132,10 +133,13 @@ export class ServiceEditorState extends ElementEditorState {
         editorStore.sdlcServerClient.features.canCreateVersion,
     );
     this.testableState = new ServiceTestableState(editorStore, this);
-    const query = this.executionState.serviceExecutionParameters?.query;
+    const executionQuery =
+      this.service.execution instanceof PureExecution
+        ? this.service.execution.func
+        : undefined;
     // default to execution tab if query is defined
     this.selectedTab =
-      query && !isStubbed_RawLambda(query)
+      executionQuery && !isStubbed_RawLambda(executionQuery)
         ? SERVICE_TAB.EXECUTION
         : SERVICE_TAB.GENERAL;
     this.postValidationState = new ServicePostValidationsState(this);

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

@@ -200,22 +200,6 @@ export class ProjectConfigurationEditorState extends EditorState {
         .map((v) => StoreProjectData.serialization.fromJson(v))
         .forEach((project) => this.projects.set(project.coordinates, project));
 
-      // Update the legacy dependency to newer format (using group ID and artifact ID instead of just project ID)
-      this.projectConfiguration?.projectDependencies.forEach(
-        (dependency): void => {
-          if (!dependency.isLegacyDependency) {
-            return;
-          }
-          const project = Array.from(this.projects.values()).find(
-            (e) => e.projectId === dependency.projectId,
-          );
-          // re-write to new format
-          if (project) {
-            dependency.setProjectId(project.coordinates);
-          }
-        },
-      );
-
       // fetch the versions for the dependency projects
       for (const dep of this.projectConfiguration?.projectDependencies ?? []) {
         const project = this.projects.get(dep.projectId);