@finos/legend-application-studio 22.3.1 → 22.3.3

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

@@ -33,9 +33,11 @@ import { ServiceRegistrationState } from '../../../editor-state/element-editor-s
 import { ElementEditorState } from '../../../editor-state/element-editor-state/ElementEditorState.js';
 import {
   type PackageableElement,
+  type RawLambda,
   Service,
   PureSingleExecution,
   PureMultiExecution,
+  PureExecution,
 } from '@finos/legend-graph';
 import { ServiceTestableState } from './testable/ServiceTestableState.js';
 import { User } from '@finos/legend-server-sdlc';
@@ -126,6 +128,14 @@ export class ServiceEditorState extends ElementEditorState {
     );
   }
 
+  get serviceQuery(): RawLambda | undefined {
+    const execution = this.service.execution;
+    if (execution instanceof PureExecution) {
+      return execution.func;
+    }
+    return undefined;
+  }
+
   *searchUsers(name: string): GeneratorFn<User[]> {
     try {
       return (

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

@@ -34,6 +34,8 @@ import {
   DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
   DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH,
   ExecutionPlanState,
+  generateExtensionUrlPattern,
+  generatePath,
   TAB_SIZE,
 } from '@finos/legend-application';
 import {
@@ -64,7 +66,11 @@ import {
   stub_PackageableRuntime,
   stub_Mapping,
 } from '@finos/legend-graph';
-import { type Entity, parseGACoordinates } from '@finos/legend-storage';
+import {
+  type Entity,
+  parseGACoordinates,
+  generateGAVCoordinates,
+} from '@finos/legend-storage';
 import { runtime_addMapping } from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 import type { EditorStore } from '../../../EditorStore.js';
 import {
@@ -86,6 +92,22 @@ import {
   PARAMETER_SUBMIT_ACTION,
 } from '@finos/legend-query-builder';
 
+enum DSL_SERVICE_PATH_PARAM_TOKEN {
+  PROJECT_ID = 'projectId',
+  GROUP_WORKSPACE_ID = 'groupWorkspaceId',
+  SERVICE_PATH = 'servicePath',
+}
+
+enum LEGEND_QUERY_PATH_PARAM_TOKEN {
+  GAV = 'gav',
+  SERVICE_PATH = 'servicePath',
+}
+
+const QUERY_ROUTE_PATTERN = Object.freeze({
+  CREATE_FROM_SERVICE_QUERY: `/create-from-service/:${LEGEND_QUERY_PATH_PARAM_TOKEN.GAV}/:${LEGEND_QUERY_PATH_PARAM_TOKEN.SERVICE_PATH}`,
+  UPDATE_PROJECT_SERVICE_QUERY: `/update-project-service-query/:${DSL_SERVICE_PATH_PARAM_TOKEN.PROJECT_ID}/:${DSL_SERVICE_PATH_PARAM_TOKEN.GROUP_WORKSPACE_ID}/:${DSL_SERVICE_PATH_PARAM_TOKEN.SERVICE_PATH}`,
+});
+
 export class ServiceExecutionParameterState extends LambdaParametersState {
   executionState: ServicePureExecutionState;
 
@@ -712,6 +734,39 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
   updateExecutionQuery(): void {
     pureExecution_setFunction(this.execution, this.queryState.query);
   }
+
+  generateServiceQueryCreatorRoute = (
+    baseUrl: string,
+    groupId: string,
+    artifactId: string,
+    versionId: string,
+    servicePath: string,
+  ): string =>
+    baseUrl +
+    generatePath(QUERY_ROUTE_PATTERN.CREATE_FROM_SERVICE_QUERY, {
+      [LEGEND_QUERY_PATH_PARAM_TOKEN.GAV]: generateGAVCoordinates(
+        groupId,
+        artifactId,
+        versionId,
+      ),
+      [LEGEND_QUERY_PATH_PARAM_TOKEN.SERVICE_PATH]: servicePath,
+    });
+
+  generateProjectServiceQueryUpdaterRoute = (
+    projectId: string,
+    groupWorkspaceId: string,
+    servicePath: string,
+  ): string =>
+    generatePath(
+      generateExtensionUrlPattern(
+        QUERY_ROUTE_PATTERN.UPDATE_PROJECT_SERVICE_QUERY,
+      ),
+      {
+        [DSL_SERVICE_PATH_PARAM_TOKEN.PROJECT_ID]: projectId,
+        [DSL_SERVICE_PATH_PARAM_TOKEN.GROUP_WORKSPACE_ID]: groupWorkspaceId,
+        [DSL_SERVICE_PATH_PARAM_TOKEN.SERVICE_PATH]: servicePath,
+      },
+    );
 }
 
 export class InlineServicePureExecutionState extends ServicePureExecutionState {

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

@@ -18,13 +18,11 @@ import {
   type ServiceTest,
   type Service,
   type ValueSpecification,
-  type RawLambda,
   observe_ValueSpecification,
   ParameterValue,
   buildLambdaVariableExpressions,
   VariableExpression,
   PureMultiExecution,
-  PureExecution,
 } from '@finos/legend-graph';
 import { action, flow, makeObservable, observable } from 'mobx';
 import { TestableTestEditorState } from '../../testable/TestableEditorState.js';
@@ -183,18 +181,12 @@ export class ServiceTestSetupState {
     this.parameterValueStates = this.buildParameterStates();
   }
 
-  get serviceQuery(): RawLambda | undefined {
-    const execution = this.testState.testable.execution;
-    if (execution instanceof PureExecution) {
-      return execution.func;
-    }
-    return undefined;
-  }
-
   get queryVariableExpressions(): VariableExpression[] {
-    return this.serviceQuery
+    const query =
+      this.testState.suiteState.testableState.serviceEditorState.serviceQuery;
+    return query
       ? buildLambdaVariableExpressions(
-          this.serviceQuery,
+          query,
           this.editorStore.graphManagerState,
         ).filter(filterByType(VariableExpression))
       : [];

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

@@ -28,6 +28,7 @@ import {
   DEFAULT_TEST_PREFIX,
   TestError,
   MultiExecutionServiceTestResult,
+  isStubbed_RawLambda,
 } from '@finos/legend-graph';
 import {
   type GeneratorFn,
@@ -240,6 +241,7 @@ export class ServiceTestableState {
       selectedSuiteState: observable,
       suiteToRename: observable,
       initSuites: action,
+      init: action,
       addTestSuite: action,
       changeSuite: action,
       setSuiteToRename: action,
@@ -250,6 +252,19 @@ export class ServiceTestableState {
     this.initSuites();
   }
 
+  init(): void {
+    const service = this.serviceEditorState.service;
+    const query = this.serviceEditorState.serviceQuery;
+    if (
+      query &&
+      !isStubbed_RawLambda(query) &&
+      !service.tests.length &&
+      !service.test
+    ) {
+      this.addTestSuite();
+    }
+  }
+
   setSuiteToRename(testSuite: ServiceTestSuite | undefined): void {
     this.suiteToRename = testSuite;
   }

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

@@ -299,8 +299,9 @@ export class ProjectDependencyEditorState {
   flattenDependencyTreeData:
     | TreeData<ProjectDependencyTreeNodeData>
     | undefined;
-  conflictStates: ProjectDependencyConflictState[] = [];
+  conflictStates: ProjectDependencyConflictState[] | undefined;
   expandConflictsState = ActionState.create();
+  buildConflictPathState = ActionState.create();
 
   constructor(
     configState: ProjectConfigurationEditorState,
@@ -314,12 +315,14 @@ export class ProjectDependencyEditorState {
       conflictStates: observable,
       reportTab: observable,
       expandConflictsState: observable,
+      buildConflictPathState: observable,
       setDependencyReport: action,
       expandAllConflicts: action,
       setFlattenDependencyTreeData: action,
       clearTrees: action,
       setTreeData: action,
       setDependencyTreeData: action,
+      buildConflictPaths: action,
       setConflictStates: action,
       fetchDependencyReport: flow,
     });
@@ -329,15 +332,17 @@ export class ProjectDependencyEditorState {
   }
 
   expandAllConflicts(): void {
-    this.expandConflictsState.inProgress();
-    this.conflictStates.forEach((c) => {
-      const treeData = c.treeData;
-      Array.from(treeData.nodes.values()).forEach((n) => (n.isOpen = true));
-    });
-    this.conflictStates.forEach((c) => {
-      c.setTreeData({ ...c.treeData });
-    });
-    this.expandConflictsState.complete();
+    if (this.conflictStates) {
+      this.expandConflictsState.inProgress();
+      this.conflictStates.forEach((c) => {
+        const treeData = c.treeData;
+        Array.from(treeData.nodes.values()).forEach((n) => (n.isOpen = true));
+      });
+      this.conflictStates.forEach((c) => {
+        c.setTreeData({ ...c.treeData });
+      });
+      this.expandConflictsState.complete();
+    }
   }
 
   setTreeData(
@@ -361,7 +366,7 @@ export class ProjectDependencyEditorState {
     this.dependencyTreeData = tree;
   }
 
-  setConflictStates(val: ProjectDependencyConflictState[]): void {
+  setConflictStates(val: ProjectDependencyConflictState[] | undefined): void {
     this.conflictStates = val;
   }
 
@@ -380,6 +385,7 @@ export class ProjectDependencyEditorState {
       this.fetchingDependencyInfoState.inProgress();
       this.dependencyReport = undefined;
       this.clearTrees();
+      this.setConflictStates(undefined);
       if (this.projectConfiguration?.projectDependencies) {
         const dependencyCoordinates = (yield flowResult(
           this.editorStore.graphState.buildProjectDependencyCoordinates(
@@ -396,7 +402,10 @@ export class ProjectDependencyEditorState {
           RawProjectDependencyReport.serialization.fromJson(dependencyInfoRaw);
         const report = buildDependencyReport(rawdependencyReport);
         this.dependencyReport = report;
-        this.processReport(report);
+        this.setDependencyTreeData(buildDependencyTreeData(report));
+        this.setFlattenDependencyTreeData(
+          buildFlattenDependencyTreeData(report),
+        );
       }
       this.fetchingDependencyInfoState.complete();
     } catch (error) {
@@ -410,22 +419,27 @@ export class ProjectDependencyEditorState {
     }
   }
 
-  processReport(report: ProjectDependencyGraphReport): void {
-    this.setDependencyTreeData(buildDependencyTreeData(report));
-    this.setFlattenDependencyTreeData(buildFlattenDependencyTreeData(report));
-    this.setConflictStates([]);
-    try {
-      report.conflictInfo = buildConflictsPaths(report);
-      const conflictStates = Array.from(report.conflictInfo.entries()).map(
-        ([conflict, paths]) =>
-          new ProjectDependencyConflictState(report, conflict, paths),
-      );
-      this.setConflictStates(conflictStates);
-    } catch (error) {
-      assertErrorThrown(error);
-      this.editorStore.applicationStore.notifyError(
-        `Unable to build conflict paths ${error.message}`,
-      );
+  buildConflictPaths(): void {
+    const report = this.dependencyReport;
+    if (report) {
+      this.setConflictStates(undefined);
+      this.buildConflictPathState.inProgress();
+      try {
+        report.conflictInfo = buildConflictsPaths(report);
+        const conflictStates = Array.from(report.conflictInfo.entries()).map(
+          ([conflict, paths]) =>
+            new ProjectDependencyConflictState(report, conflict, paths),
+        );
+        this.setConflictStates(conflictStates);
+        this.buildConflictPathState.complete();
+      } catch (error) {
+        assertErrorThrown(error);
+        this.setConflictStates([]);
+        this.buildConflictPathState.fail();
+        this.editorStore.applicationStore.notifyError(
+          `Unable to build conflict paths ${error.message}`,
+        );
+      }
     }
   }
 

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

@@ -22,6 +22,12 @@ import {
 } from '../LegendStudioRouter.js';
 import { EditorMode } from '../editor/EditorMode.js';
 import type { ProjectViewerStore } from './ProjectViewerStore.js';
+import type { ProjectDependency } from '@finos/legend-server-sdlc';
+import {
+  MASTER_SNAPSHOT_ALIAS,
+  SNAPSHOT_VERSION_ALIAS,
+} from '@finos/legend-server-depot';
+import { guaranteeNonNullable } from '@finos/legend-shared';
 
 export class ProjectViewerEditorMode extends EditorMode {
   viewerStore: ProjectViewerStore;
@@ -56,4 +62,18 @@ export class ProjectViewerEditorMode extends EditorMode {
           elementPath,
         );
   }
+
+  generateDependencyElementLink(
+    elementPath: string,
+    dependencyProject: ProjectDependency,
+  ): string {
+    return generateViewProjectByGAVRoute(
+      guaranteeNonNullable(dependencyProject.groupId),
+      guaranteeNonNullable(dependencyProject.artifactId),
+      dependencyProject.versionId === MASTER_SNAPSHOT_ALIAS
+        ? SNAPSHOT_VERSION_ALIAS
+        : dependencyProject.versionId,
+      elementPath,
+    );
+  }
 }

package/src/stores/shared/PackageTreeUtils.ts

@@ -48,6 +48,17 @@ import {
   getElementRootPackage,
 } from '@finos/legend-graph';
 import { ExplorerTreeRootPackageLabel } from '../ExplorerTreeState.js';
+import { GAV_DELIMITER } from '@finos/legend-storage';
+
+/**
+ *
+ * Returns the explorer tree label for a dependency project. We return artifactId if
+ * the dependency is not a legacy dependency otherwise we return the projectId.
+ */
+const getDependecyElementLabelFromProjectId = (projectId: string): string =>
+  projectId.includes(GAV_DELIMITER)
+    ? guaranteeNonNullable(projectId.split(GAV_DELIMITER)[1])
+    : projectId;
 
 const getElementProjectExplorerDnDType = (
   editorStore: EditorStore,
@@ -226,7 +237,7 @@ export const getDependenciesPackableElementTreeData = (
       true,
       childFilter,
     );
-    childRootNode.label = _package.name;
+    childRootNode.label = getDependecyElementLabelFromProjectId(_package.name);
     childRootNode.id = _package.name;
     addUniqueEntry(rootIds, childRootNode.id);
     nodes.set(childRootNode.id, childRootNode);