@finos/legend-application-studio 22.2.1 → 22.3.0

package/src/components/editor/edit-panel/service-editor/testable/ServiceTestableEditor.tsx

@@ -24,19 +24,12 @@ import {
   ContextMenu,
   Dialog,
   BlankPanelPlaceholder,
-  Panel,
-  LockIcon,
   ModalTitle,
   MenuContent,
   MenuContentItem,
 } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
-import {
-  PureMultiExecution,
-  PureSingleExecution,
-  type ServiceExecution,
-  type ServiceTestSuite,
-} from '@finos/legend-graph';
+import type { ServiceTestSuite } from '@finos/legend-graph';
 import { ServiceTestDataEditor } from './ServiceTestDataEditor.js';
 import { ServiceTestsEditor } from './ServiceTestsEditor.js';
 import { forwardRef, useState } from 'react';
@@ -48,7 +41,6 @@ import type {
 } from '../../../../../stores/editor-state/element-editor-state/service/testable/ServiceTestableState.js';
 import { useApplicationNavigationContext } from '@finos/legend-application';
 import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../../../stores/LegendStudioApplicationNavigationContext.js';
-import { UnsupportedEditorPanel } from '../../UnsupportedElementEditor.js';
 
 export const ServiceTestSuiteEditor = observer(
   (props: { serviceTestSuiteState: ServiceTestSuiteState }) => {
@@ -143,7 +135,7 @@ export const RenameModal = observer(
   },
 );
 
-const ServiceTestableEditor = observer(
+export const ServiceTestableEditor = observer(
   (props: { serviceTestableState: ServiceTestableState }) => {
     const { serviceTestableState } = props;
     const serviceEditorState = serviceTestableState.serviceEditorState;
@@ -238,58 +230,3 @@ const ServiceTestableEditor = observer(
     );
   },
 );
-
-const ServiceTestableUnsupportedEditor = observer(
-  (props: { serviceTestableState: ServiceTestableState }) => {
-    const { serviceTestableState } = props;
-    const serviceEditorState = serviceTestableState.serviceEditorState;
-    const isReadOnly = serviceEditorState.isReadOnly;
-    return (
-      <div className="unsupported-element-editor">
-        <Panel>
-          <div className="panel__header">
-            <div className="panel__header__title">
-              {isReadOnly && (
-                <div className="uml-element-editor__header__lock">
-                  <LockIcon />
-                </div>
-              )}
-              <div className="panel__header__title__label">Service Tests</div>
-            </div>
-          </div>
-          <div className="panel__content unsupported-element-editor__content">
-            <UnsupportedEditorPanel
-              text="Service Test Editor does not support services with no mapping and runtime. Please edit in text mode."
-              isReadOnly={isReadOnly}
-            />
-          </div>
-        </Panel>
-      </div>
-    );
-  },
-);
-
-export const ServiceTestableWrapperEditor = observer(
-  (props: {
-    serviceTestableState: ServiceTestableState;
-    serviceExecution: ServiceExecution;
-  }) => {
-    if (
-      (props.serviceExecution instanceof PureSingleExecution &&
-        props.serviceExecution.runtime) ||
-      props.serviceExecution instanceof PureMultiExecution
-    ) {
-      return (
-        <ServiceTestableEditor
-          serviceTestableState={props.serviceTestableState}
-        />
-      );
-    } else {
-      return (
-        <ServiceTestableUnsupportedEditor
-          serviceTestableState={props.serviceTestableState}
-        />
-      );
-    }
-  },
-);

package/src/components/editor/edit-panel/uml-editor/ClassEditor.tsx

@@ -322,7 +322,9 @@ const PropertyBasicEditor = observer(
                 value={selectedPropertyType}
                 placeholder="Choose a type..."
                 filterOption={filterOption}
-                formatOptionLabel={getPackageableElementOptionFormatter({})}
+                formatOptionLabel={getPackageableElementOptionFormatter({
+                  pureModel: editorStore.graphManagerState.graph,
+                })}
               />
             )}
             {!isIndirectProperty && !isReadOnly && !isEditingType && (
@@ -681,7 +683,9 @@ const DerivedPropertyBasicEditor = observer(
                   value={selectedPropertyType}
                   placeholder="Choose a type..."
                   filterOption={filterOption}
-                  formatOptionLabel={getPackageableElementOptionFormatter({})}
+                  formatOptionLabel={getPackageableElementOptionFormatter({
+                    pureModel: editorStore.graphManagerState.graph,
+                  })}
                 />
               )}
               {!isInheritedProperty && !isReadOnly && !isEditingType && (
@@ -1086,7 +1090,9 @@ const SuperTypeEditor = observer(
               value={selectedType}
               placeholder="Choose a class"
               filterOption={filterOption}
-              formatOptionLabel={getPackageableElementOptionFormatter({})}
+              formatOptionLabel={getPackageableElementOptionFormatter({
+                pureModel: editorStore.graphManagerState.graph,
+              })}
             />
             <button
               className="uml-element-editor__basic__detail-btn"

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

@@ -233,6 +233,7 @@ const NewPureModelConnectionDriverEditor = observer(
             darkMode={true}
             formatOptionLabel={getPackageableElementOptionFormatter({
               darkMode: true,
+              pureModel: editorStore.graphManagerState.graph,
             })}
           />
         </div>

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

@@ -61,12 +61,19 @@ import {
 } from '../../../stores/shared/PackageTreeUtils.js';
 import type { PackageTreeNodeData } from '../../../stores/shared/TreeUtils.js';
 import {
-  type GenerationTreeNodeData,
-  getFileGenerationChildNodes,
-} from '../../../stores/shared/FileGenerationTreeUtils.js';
-import { FileGenerationTree } from '../../editor/edit-panel/element-generation-editor/FileGenerationEditor.js';
-import { generateViewEntityRoute } from '../../../stores/LegendStudioRouter.js';
-import { toTitleCase } from '@finos/legend-shared';
+  type FileSystemTreeNodeData,
+  getFileSystemChildNodes,
+} from '../../../stores/shared/FileSystemTreeUtils.js';
+import { FileSystemTree } from '../edit-panel/element-generation-editor/FileSystemViewer.js';
+import {
+  generateViewEntityRoute,
+  generateViewProjectByGAVRoute,
+} from '../../../stores/LegendStudioRouter.js';
+import {
+  guaranteeNonEmptyString,
+  guaranteeNonNullable,
+  toTitleCase,
+} from '@finos/legend-shared';
 import { flowResult } from 'mobx';
 import { useEditorStore } from '../EditorStoreProvider.js';
 import {
@@ -89,6 +96,11 @@ import { useApplicationStore } from '@finos/legend-application';
 import { PACKAGEABLE_ELEMENT_TYPE } from '../../../stores/shared/ModelClassifierUtils.js';
 import { useLegendStudioApplicationStore } from '../../LegendStudioBaseStoreProvider.js';
 import { queryClass } from '../edit-panel/uml-editor/ClassQueryBuilder.js';
+import { createViewSDLCProjectHandler } from '../../../stores/DependencyProjectViewerHelper.js';
+import {
+  MASTER_SNAPSHOT_ALIAS,
+  SNAPSHOT_VERSION_ALIAS,
+} from '@finos/legend-server-depot';
 
 const ElementRenamer = observer(() => {
   const editorStore = useEditorStore();
@@ -291,6 +303,60 @@ const ExplorerContextMenu = observer(
       (type: string): (() => void) =>
       (): void =>
         editorStore.newElementState.openModal(type, _package);
+    const isDependencyProjectRoot = (): boolean =>
+      node?.packageableElement instanceof Package &&
+      editorStore.graphManagerState.graph.dependencyManager.roots.includes(
+        node.packageableElement,
+      );
+    const viewProject = (): void => {
+      const projectDependency =
+        editorStore.projectConfigurationEditorState.projectConfiguration?.projectDependencies.find(
+          (dep) => dep.projectId === node?.label,
+        );
+      if (projectDependency && !projectDependency.isLegacyDependency) {
+        applicationStore.navigator.visitAddress(
+          applicationStore.navigator.generateAddress(
+            generateViewProjectByGAVRoute(
+              guaranteeNonNullable(projectDependency.groupId),
+              guaranteeNonNullable(projectDependency.artifactId),
+              projectDependency.versionId === MASTER_SNAPSHOT_ALIAS
+                ? SNAPSHOT_VERSION_ALIAS
+                : projectDependency.versionId,
+            ),
+          ),
+        );
+      }
+    };
+    const viewSDLCProject = (): void => {
+      const dependency =
+        editorStore.projectConfigurationEditorState.projectConfiguration?.projectDependencies.find(
+          (dep) => dep.projectId === node?.label,
+        );
+      if (dependency) {
+        createViewSDLCProjectHandler(
+          applicationStore,
+          editorStore.depotServerClient,
+        )(
+          guaranteeNonEmptyString(dependency.groupId),
+          guaranteeNonEmptyString(dependency.artifactId),
+        ).catch(applicationStore.alertUnhandledError);
+      }
+    };
+
+    if (isDependencyProjectRoot()) {
+      return (
+        <MenuContent data-testid={LEGEND_STUDIO_TEST_ID.EXPLORER_CONTEXT_MENU}>
+          <MenuContentItem onClick={viewProject}>
+            <MenuContentItemLabel>View Project</MenuContentItemLabel>
+          </MenuContentItem>
+          {node && (
+            <MenuContentItem onClick={viewSDLCProject}>
+              <MenuContentItemLabel>View SDLC Project</MenuContentItemLabel>
+            </MenuContentItem>
+          )}
+        </MenuContent>
+      );
+    }
 
     if (_package && !isReadOnly) {
       return (
@@ -414,7 +480,10 @@ const PackageTreeNodeContainer = observer(
       ? 'color--generated'
       : isSystemElement(node.packageableElement)
       ? 'color--system'
-      : isDependencyElement(node.packageableElement)
+      : isDependencyElement(
+          node.packageableElement,
+          editorStore.graphManagerState.graph,
+        )
       ? 'color--dependency'
       : '';
 
@@ -562,15 +631,15 @@ const ExplorerTrees = observer(() => {
   // Generated Files Tree
   const generationFileTreeData =
     editorStore.explorerTreeState.getFileGenerationTreeData();
-  const onGenerationFileTreeNodeSelect = (node: GenerationTreeNodeData): void =>
+  const onGenerationFileTreeNodeSelect = (node: FileSystemTreeNodeData): void =>
     editorStore.graphState.graphGenerationState.onTreeNodeSelect(
       node,
       generationFileTreeData,
     );
   const getGenerationFileTreeChildNodes = (
-    node: GenerationTreeNodeData,
-  ): GenerationTreeNodeData[] =>
-    getFileGenerationChildNodes(node, generationFileTreeData);
+    node: FileSystemTreeNodeData,
+  ): FileSystemTreeNodeData[] =>
+    getFileSystemChildNodes(node, generationFileTreeData);
 
   // System Tree
   const systemTreeData = editorStore.explorerTreeState.getTreeData(
@@ -600,7 +669,7 @@ const ExplorerTrees = observer(() => {
   const getDependencyTreeChildNodes = (
     node: PackageTreeNodeData,
   ): PackageTreeNodeData[] =>
-    getTreeChildNodes(editorStore, node, dependencyTreeData);
+    getTreeChildNodes(editorStore, node, dependencyTreeData, true);
   const showPackageTrees =
     treeData.nodes.size || graph.dependencyManager.hasDependencies;
 
@@ -684,7 +753,7 @@ const ExplorerTrees = observer(() => {
               ) && (
                 <>
                   <div className="explorer__content__separator" />
-                  <FileGenerationTree
+                  <FileSystemTree
                     selectedNode={editorStore.explorerTreeState.selectedNode}
                     directoryTreeData={generationFileTreeData}
                     onNodeSelect={onGenerationFileTreeNodeSelect}

package/src/components/editor/side-bar/testable/GlobalTestRunner.tsx

@@ -42,6 +42,7 @@ import {
 } from '@finos/legend-art';
 import {
   AssertFail,
+  AssertionStatus,
   EqualToJsonAssertFail,
   PackageableElement,
   TestError,
@@ -122,7 +123,7 @@ export const getTestableResultIcon = (
 const getOptionalError = (
   node: TestableExplorerTreeNodeData,
   testableState: TestableState,
-): TestError | AssertFail | undefined => {
+): TestError | AssertFail | Map<string, AssertFail> | undefined => {
   if (node instanceof AtomicTestTreeNodeData) {
     const result = getAtomicTest_TestResult(
       node.atomicTest,
@@ -135,6 +136,14 @@ const getOptionalError = (
     const status = getAssertionStatus(node.assertion, testableState.results);
     if (status instanceof AssertFail) {
       return status;
+    } else if (status && !(status instanceof AssertionStatus)) {
+      const errorState = new Map<string, AssertFail>();
+      Array.from(status.entries()).forEach(([key, assertionStatus]) => {
+        if (assertionStatus instanceof AssertFail) {
+          errorState.set(key, assertionStatus);
+        }
+      });
+      return errorState;
     }
   }
   return undefined;
@@ -215,15 +224,15 @@ const TestableExplorerContextMenu = observer(
       testableState: TestableState;
       node: TestableExplorerTreeNodeData;
       treeData: TreeData<TestableExplorerTreeNodeData>;
-      error?: TestError | AssertFail | undefined;
+      error?: TestError | AssertFail | Map<string, AssertFail> | undefined;
     }
   >(function TestableExplorerContextMenu(props, ref) {
     const { node, error, globalTestRunnerState, testableState } = props;
     const runTest = (): void => {
       testableState.run(node);
     };
-    const viewError = (): void =>
-      globalTestRunnerState.setFailureViewing(error);
+    const viewError = (err: TestError | AssertFail): void =>
+      globalTestRunnerState.setFailureViewing(err);
     return (
       <MenuContent data-testid={LEGEND_STUDIO_TEST_ID.EXPLORER_CONTEXT_MENU}>
         <MenuContentItem
@@ -232,11 +241,24 @@ const TestableExplorerContextMenu = observer(
         >
           Run
         </MenuContentItem>
-        {error && (
-          <MenuContentItem onClick={viewError}>
-            {error instanceof TestError ? 'View Error' : 'View assert fail'}
-          </MenuContentItem>
-        )}
+        {error &&
+          (error instanceof TestError || error instanceof AssertFail) && (
+            <MenuContentItem onClick={(): void => viewError(error)}>
+              {error instanceof TestError ? 'View Error' : 'View assert fail'}
+            </MenuContentItem>
+          )}
+        {error &&
+          !(error instanceof TestError || error instanceof AssertFail) &&
+          Array.from(error.entries()).map(([key, testError]) => (
+            <MenuContentItem
+              key={key}
+              onClick={(): void => viewError(testError)}
+            >
+              {testError instanceof TestError
+                ? `View Error for ${key}`
+                : `View assert fail for ${key}`}
+            </MenuContentItem>
+          ))}
       </MenuContent>
     );
   }),

package/src/index.ts

@@ -98,8 +98,11 @@ export { MINIMUM_SERVICE_OWNERS } from './stores/editor-state/element-editor-sta
 export { 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 { GenerationFile } from './stores/shared/FileGenerationTreeUtils.js';
-export { FileGenerationState } from './stores/editor-state/FileGenerationState.js';
+export { FileSystem_File as GenerationFile } from './stores/shared/FileSystemTreeUtils.js';
+export {
+  FileGenerationState,
+  GeneratedFileStructureState,
+} from './stores/editor-state/FileGenerationState.js';
 export { DSL_ExternalFormat_LegendStudioApplicationPlugin } from './components/DSL_ExternalFormat_LegendStudioApplicationPlugin.js';
 export {
   externalFormatData_setData,

package/src/stores/DSL_Generation_LegendStudioApplicationPlugin_Extension.ts

@@ -15,13 +15,13 @@
  */
 
 import type { PackageableElement } from '@finos/legend-graph';
-import type { FileGenerationState } from './editor-state/FileGenerationState.js';
+import type { GeneratedFileStructureState } from './editor-state/FileGenerationState.js';
 import type { DSL_LegendStudioApplicationPlugin_Extension } from './LegendStudioApplicationPlugin.js';
 
 export type FileGenerationResultViewerActionConfiguration = {
   key: string;
   renderer: (
-    fileGenerationState: FileGenerationState,
+    fileGenerationState: GeneratedFileStructureState,
   ) => React.ReactNode | undefined;
 };
 

package/src/stores/DependencyProjectViewerHelper.ts

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  type DepotServerClient,
+  ProjectData,
+} from '@finos/legend-server-depot';
+import type { LegendStudioApplicationStore } from './LegendStudioBaseStore.js';
+import { generateViewProjectRoute } from './LegendStudioRouter.js';
+
+export const createViewSDLCProjectHandler =
+  (
+    applicationStore: LegendStudioApplicationStore,
+    depotServerClient: DepotServerClient,
+  ) =>
+  async (groupId: string, artifactId: string): Promise<void> => {
+    // fetch project data
+    const project = ProjectData.serialization.fromJson(
+      await depotServerClient.getProject(groupId, artifactId),
+    );
+    applicationStore.navigator.visitAddress(
+      applicationStore.navigator.generateAddress(
+        generateViewProjectRoute(project.projectId),
+      ),
+    );
+  };