@finos/legend-application-studio 22.3.1 → 22.3.2

package/src/components/editor/side-bar/Explorer.tsx

@@ -91,6 +91,7 @@ import {
   isMainGraphElement,
   getFunctionSignature,
   getFunctionNameWithPath,
+  getElementRootPackage,
 } from '@finos/legend-graph';
 import { useApplicationStore } from '@finos/legend-application';
 import { PACKAGEABLE_ELEMENT_TYPE } from '../../../stores/shared/ModelClassifierUtils.js';
@@ -236,6 +237,12 @@ const ExplorerContextMenu = observer(
       ));
     const projectId = editorStore.sdlcState.currentProject?.projectId;
     const isReadOnly = editorStore.isInViewerMode || Boolean(nodeIsImmutable);
+    const isDependencyProjectElement =
+      node &&
+      isDependencyElement(
+        node.packageableElement,
+        editorStore.graphManagerState.graph,
+      );
     const _package = node
       ? node.packageableElement instanceof Package
         ? node.packageableElement
@@ -283,20 +290,74 @@ const ExplorerContextMenu = observer(
     };
     const copyWorkspaceElementLink = (): void => {
       if (node) {
-        applicationStore
-          .copyTextToClipboard(
-            applicationStore.navigator.generateAddress(
-              editorStore.editorMode.generateElementLink(
-                node.packageableElement.path,
+        const dependency =
+          editorStore.projectConfigurationEditorState.projectConfiguration?.projectDependencies.find(
+            (dep) =>
+              dep.projectId ===
+              getElementRootPackage(node.packageableElement).name,
+          );
+        if (dependency) {
+          applicationStore
+            .copyTextToClipboard(
+              applicationStore.navigator.generateAddress(
+                editorStore.editorMode.generateDependencyElementLink(
+                  node.packageableElement.path,
+                  dependency,
+                ),
               ),
-            ),
-          )
-          .then(() =>
-            applicationStore.notifySuccess(
-              'Copied workspace element link to clipboard',
-            ),
-          )
-          .catch(applicationStore.alertUnhandledError);
+            )
+            .then(() =>
+              applicationStore.notifySuccess(
+                'Copied workspace element link to clipboard',
+              ),
+            )
+            .catch(applicationStore.alertUnhandledError);
+        } else {
+          applicationStore
+            .copyTextToClipboard(
+              applicationStore.navigator.generateAddress(
+                editorStore.editorMode.generateElementLink(
+                  node.packageableElement.path,
+                ),
+              ),
+            )
+            .then(() =>
+              applicationStore.notifySuccess(
+                'Copied workspace element link to clipboard',
+              ),
+            )
+            .catch(applicationStore.alertUnhandledError);
+        }
+      }
+    };
+    const copySDLCProjectLink = (): void => {
+      if (node) {
+        const dependency =
+          editorStore.projectConfigurationEditorState.projectConfiguration?.projectDependencies.find(
+            (dep) =>
+              dep.projectId ===
+              getElementRootPackage(node.packageableElement).name,
+          );
+        if (dependency) {
+          applicationStore
+            .copyTextToClipboard(
+              applicationStore.navigator.generateAddress(
+                generateViewProjectByGAVRoute(
+                  guaranteeNonNullable(dependency.groupId),
+                  guaranteeNonNullable(dependency.artifactId),
+                  dependency.versionId === MASTER_SNAPSHOT_ALIAS
+                    ? SNAPSHOT_VERSION_ALIAS
+                    : dependency.versionId,
+                ),
+              ),
+            )
+            .then(() =>
+              applicationStore.notifySuccess(
+                'Copied SDLC project link to clipboard',
+              ),
+            )
+            .catch(applicationStore.alertUnhandledError);
+        }
       }
     };
     const createNewElement =
@@ -311,7 +372,7 @@ const ExplorerContextMenu = observer(
     const viewProject = (): void => {
       const projectDependency =
         editorStore.projectConfigurationEditorState.projectConfiguration?.projectDependencies.find(
-          (dep) => dep.projectId === node?.label,
+          (dep) => dep.projectId === node?.packageableElement.name,
         );
       if (projectDependency && !projectDependency.isLegacyDependency) {
         applicationStore.navigator.visitAddress(
@@ -330,7 +391,7 @@ const ExplorerContextMenu = observer(
     const viewSDLCProject = (): void => {
       const dependency =
         editorStore.projectConfigurationEditorState.projectConfiguration?.projectDependencies.find(
-          (dep) => dep.projectId === node?.label,
+          (dep) => dep.projectId === node?.packageableElement.name,
         );
       if (dependency) {
         createViewSDLCProjectHandler(
@@ -397,7 +458,7 @@ const ExplorerContextMenu = observer(
         )}
         {node && (
           <>
-            {!editorStore.isInViewerMode && (
+            {!editorStore.isInViewerMode && !isDependencyProjectElement && (
               <MenuContentItem onClick={openElementInViewerMode}>
                 View in Project
               </MenuContentItem>
@@ -405,6 +466,11 @@ const ExplorerContextMenu = observer(
             <MenuContentItem onClick={copyWorkspaceElementLink}>
               Copy Link
             </MenuContentItem>
+            {isDependencyProjectElement && (
+              <MenuContentItem onClick={copySDLCProjectLink}>
+                Copy SDLC Project Link
+              </MenuContentItem>
+            )}
           </>
         )}
       </MenuContent>

package/src/index.ts

@@ -95,7 +95,10 @@ export * from './stores/DSL_Generation_LegendStudioApplicationPlugin_Extension.j
 export * from './stores/STO_Relational_LegendStudioApplicationPlugin_Extension.js';
 
 export { MINIMUM_SERVICE_OWNERS } from './stores/editor-state/element-editor-state/service/ServiceEditorState.js';
-export { generateServiceManagementUrl } from './stores/editor-state/element-editor-state/service/ServiceRegistrationState.js';
+export {
+  LATEST_PROJECT_REVISION,
+  generateServiceManagementUrl,
+} from './stores/editor-state/element-editor-state/service/ServiceRegistrationState.js';
 export { ServicePureExecutionState } from './stores/editor-state/element-editor-state/service/ServiceExecutionState.js';
 export { NewServiceModal } from './components/editor/edit-panel/service-editor/NewServiceModal.js';
 export { FileSystem_File as GenerationFile } from './stores/shared/FileSystemTreeUtils.js';

package/src/stores/editor/EditorMode.ts

@@ -14,9 +14,19 @@
  * limitations under the License.
  */
 
+import type { ProjectDependency } from '@finos/legend-server-sdlc';
+
 export abstract class EditorMode {
   /**
    * Using information about the current project to generate a sharable link to the element.
    */
   abstract generateElementLink(elementPath: string): string;
+
+  /**
+   * Using information about the dependency project to generate a sharable link to the element.
+   */
+  abstract generateDependencyElementLink(
+    elementPath: string,
+    dependencyProject: ProjectDependency,
+  ): string;
 }

package/src/stores/editor/StandardEditorMode.ts

@@ -14,8 +14,17 @@
  * limitations under the License.
  */
 
+import {
+  MASTER_SNAPSHOT_ALIAS,
+  SNAPSHOT_VERSION_ALIAS,
+} from '@finos/legend-server-depot';
+import type { ProjectDependency } from '@finos/legend-server-sdlc';
+import { guaranteeNonNullable } from '@finos/legend-shared';
 import type { EditorStore } from '../EditorStore.js';
-import { generateEditorRoute } from '../LegendStudioRouter.js';
+import {
+  generateEditorRoute,
+  generateViewProjectByGAVRoute,
+} from '../LegendStudioRouter.js';
 import { EditorMode } from './EditorMode.js';
 
 export class StandardEditorMode extends EditorMode {
@@ -34,4 +43,18 @@ export class StandardEditorMode 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/editor-state/GrammarTextEditorState.ts

@@ -63,7 +63,7 @@ export class GrammarTextEditorState {
 
   graphGrammarText = '';
   currentElementLabelRegexString?: string | undefined;
-  wrapText = false;
+  wrapText = true;
   forcedCursorPosition?: TextEditorPosition | undefined;
 
   constructor(editorStore: EditorStore) {

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/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/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);