@finos/legend-application-studio 21.0.1 → 22.1.0

package/src/components/editor/edit-panel/service-editor/ServiceEditor.tsx

@@ -46,13 +46,13 @@ import {
   service_setPattern,
   service_updateOwner,
 } from '../../../../stores/shared/modifier/DSL_Service_GraphModifierHelper.js';
-import { validate_ServicePattern } from '@finos/legend-graph';
-import { ServiceTestableEditor } from './testable/ServiceTestableEditor.js';
 import {
   LEGEND_APPLICATION_DOCUMENTATION_KEY,
   useApplicationNavigationContext,
   useApplicationStore,
 } from '@finos/legend-application';
+import { validate_ServicePattern } from '@finos/legend-graph';
+import { ServiceTestableWrapperEditor } from './testable/ServiceTestableEditor.js';
 import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../../stores/LegendStudioApplicationNavigationContext.js';
 
 const ServiceGeneralEditor = observer(() => {
@@ -475,8 +475,9 @@ export const ServiceEditor = observer(() => {
             <ServiceRegistrationEditor />
           )}
           {selectedTab === SERVICE_TAB.TEST && (
-            <ServiceTestableEditor
+            <ServiceTestableWrapperEditor
               serviceTestableState={serviceState.testableState}
+              serviceExecution={service.execution}
             />
           )}
         </div>

package/src/components/editor/edit-panel/service-editor/ServiceExecutionEditor.tsx

@@ -64,7 +64,6 @@ import { useEditorStore } from '../../EditorStoreProvider.js';
 import {
   type KeyedExecutionParameter,
   type Runtime,
-  type ServiceTest,
   Mapping,
   RuntimePointer,
   PackageableRuntime,
@@ -778,10 +777,6 @@ const ServicePureExecutionEditor = observer(
       servicePureExecutionState instanceof MultiServicePureExecutionState;
     const showChangeExecutionModal = (): void => {
       if (servicePureExecutionState instanceof MultiServicePureExecutionState) {
-        servicePureExecutionState.serviceEditorState.service.tests.forEach(
-          (suite) =>
-            suite.tests.forEach((st) => ((st as ServiceTest).keys = [])),
-        );
         servicePureExecutionState.setSingleExecutionKey(
           servicePureExecutionState.execution.executionParameters[0],
         );

package/src/components/editor/edit-panel/service-editor/ServiceExecutionQueryEditor.tsx

@@ -257,7 +257,12 @@ export const ServiceExecutionQueryEditor = observer(
         const service = executionState.serviceEditorState.service;
         const selectedExecutionState =
           executionState.selectedExecutionContextState;
-        if (selectedExecutionState) {
+        if (selectedExecutionState?.executionContext.mapping === undefined) {
+          applicationStore.notifyError(
+            'Editing query without runtime and mapping is unsupported via query builder, please leverage the text mode to edit query',
+          );
+          executionState.setOpeningQueryEditor(false);
+        } else {
           const mapping = selectedExecutionState.executionContext.mapping.value;
           if (!isStubbed_PackageableElement(mapping)) {
             await flowResult(
@@ -327,11 +332,11 @@ export const ServiceExecutionQueryEditor = observer(
             executionState.setOpeningQueryEditor(false);
             return;
           }
+          applicationStore.notifyWarning(
+            'Please specify a mapping and a runtime for the execution context to edit with query builder',
+          );
+          executionState.setOpeningQueryEditor(false);
         }
-        applicationStore.notifyWarning(
-          'Please specify a mapping and a runtime for the execution context to edit with query builder',
-        );
-        executionState.setOpeningQueryEditor(false);
       },
     );
     const importQuery = (): void => {

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

@@ -24,10 +24,16 @@ import {
   ContextMenu,
   Dialog,
   BlankPanelPlaceholder,
+  Panel,
+  LockIcon,
   ModalTitle,
 } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
-import type { ServiceTestSuite } from '@finos/legend-graph';
+import {
+  PureSingleExecution,
+  type ServiceExecution,
+  type ServiceTestSuite,
+} from '@finos/legend-graph';
 import { ServiceTestDataEditor } from './ServiceTestDataEditor.js';
 import { ServiceTestsEditor } from './ServiceTestsEditor.js';
 import { forwardRef, useState } from 'react';
@@ -39,6 +45,7 @@ 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 +150,7 @@ export const RenameModal = observer(
   },
 );
 
-export const ServiceTestableEditor = observer(
+const ServiceTestableEditor = observer(
   (props: { serviceTestableState: ServiceTestableState }) => {
     const { serviceTestableState } = props;
     const serviceEditorState = serviceTestableState.serviceEditorState;
@@ -238,3 +245,57 @@ export 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
+    ) {
+      return (
+        <ServiceTestableEditor
+          serviceTestableState={props.serviceTestableState}
+        />
+      );
+    } else {
+      return (
+        <ServiceTestableUnsupportedEditor
+          serviceTestableState={props.serviceTestableState}
+        />
+      );
+    }
+  },
+);

package/src/stores/DSL_Data_LegendStudioApplicationPlugin_Extension.ts

@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
+import type { ElementEmbeddedContentSnippetSuggestion } from '@finos/legend-application';
 import type { EmbeddedData } from '@finos/legend-graph';
 import type { EmbeddedDataTypeOption } from './editor-state/element-editor-state/data/DataEditorState.js';
 import type { EmbeddedDataState } from './editor-state/element-editor-state/data/EmbeddedDataState.js';
 import type { EditorStore } from './EditorStore.js';
-import type {
-  DSL_LegendStudioApplicationPlugin_Extension,
-  ElementEmbeddedContentSnippetSuggestion,
-} from './LegendStudioApplicationPlugin.js';
+import type { DSL_LegendStudioApplicationPlugin_Extension } from './LegendStudioApplicationPlugin.js';
 
 export type EmbeddedDataEditorStateBuilder = (
   editorStore: EditorStore,

package/src/stores/EditorGraphState.ts

@@ -53,10 +53,12 @@ import {
   applyEntityChanges,
 } from '@finos/legend-server-sdlc';
 import {
+  type ProjectDependencyGraphReport,
   ProjectVersionEntities,
   ProjectData,
   ProjectDependencyCoordinates,
-  ProjectDependencyInfo,
+  RawProjectDependencyReport,
+  buildDependencyReport,
 } from '@finos/legend-server-depot';
 import {
   GRAPH_MANAGER_EVENT,
@@ -96,10 +98,7 @@ import {
   ActionAlertActionType,
   ActionAlertType,
 } from '@finos/legend-application';
-import {
-  CONFIGURATION_EDITOR_TAB,
-  getConflictsString,
-} from './editor-state/ProjectConfigurationEditorState.js';
+import { CONFIGURATION_EDITOR_TAB } from './editor-state/ProjectConfigurationEditorState.js';
 import { graph_dispose } from './shared/modifier/GraphModifierHelper.js';
 import { PACKAGEABLE_ELEMENT_TYPE } from './shared/ModelClassifierUtils.js';
 import { GlobalTestRunnerState } from './sidebar-state/testable/GlobalTestRunnerState.js';
@@ -1179,7 +1178,7 @@ export class EditorGraphState {
           ([k, v]) => v.size > 1,
         );
         if (hasConflicts) {
-          let dependencyInfo: ProjectDependencyInfo | undefined;
+          let dependencyInfo: ProjectDependencyGraphReport | undefined;
           try {
             const dependencyTree =
               await this.editorStore.depotServerClient.analyzeDependencyTree(
@@ -1187,8 +1186,9 @@ export class EditorGraphState {
                   ProjectDependencyCoordinates.serialization.toJson(e),
                 ),
               );
-            dependencyInfo =
-              ProjectDependencyInfo.serialization.fromJson(dependencyTree);
+            const rawReport =
+              RawProjectDependencyReport.serialization.fromJson(dependencyTree);
+            dependencyInfo = buildDependencyReport(rawReport);
           } catch (error) {
             assertErrorThrown(error);
             this.editorStore.applicationStore.log.error(
@@ -1198,9 +1198,15 @@ export class EditorGraphState {
           }
           const startErrorMessage =
             'Depending on multiple versions of a project is not supported. Found conflicts:\n';
-          if (dependencyInfo?.conflicts) {
+          if (dependencyInfo?.conflicts.length) {
+            const conflictingProjects = dependencyInfo.conflicts.map(
+              (c) =>
+                `project: ${c.groupId}:${c.artifactId}\nverions:[${c.versions
+                  .map((v) => v.versionId)
+                  .join(',')}]`,
+            );
             throw new UnsupportedOperationError(
-              startErrorMessage + getConflictsString(dependencyInfo),
+              startErrorMessage + conflictingProjects,
             );
           } else {
             const conflictMessages = Array.from(dependencyProjects.entries())

package/src/stores/EditorTabManagerState.ts

@@ -16,12 +16,7 @@
 
 import { TabManagerState } from '@finos/legend-application';
 import { Package, type PackageableElement } from '@finos/legend-graph';
-import {
-  assertTrue,
-  type Clazz,
-  guaranteeType,
-  isNonNullable,
-} from '@finos/legend-shared';
+import { type Clazz, guaranteeType, isNonNullable } from '@finos/legend-shared';
 import { makeObservable, action } from 'mobx';
 import type { EditorState } from './editor-state/EditorState.js';
 import { ElementEditorState } from './editor-state/element-editor-state/ElementEditorState.js';
@@ -53,40 +48,6 @@ export class EditorTabManagerState extends TabManagerState {
     return 'editor.tab-manager.tab';
   }
 
-  closeTab(tab: EditorState): void {
-    const elementIndex = this.tabs.findIndex((e) => e === tab);
-    assertTrue(elementIndex !== -1, `Can't close a tab which is not opened`);
-    this.tabs.splice(elementIndex, 1);
-    if (this.currentTab === tab) {
-      if (this.tabs.length) {
-        const openIndex = elementIndex - 1;
-        this.setCurrentTab(
-          openIndex >= 0 ? this.tabs[openIndex] : this.tabs[0],
-        );
-      } else {
-        this.setCurrentTab(undefined);
-      }
-    }
-  }
-
-  openTab(tab: EditorState): void {
-    const existingTab = this.tabs.find((t) => t.match(tab));
-    if (!existingTab) {
-      if (this.currentTab) {
-        const currIndex = this.tabs.findIndex((e) => e === this.currentTab);
-        this.tabs.splice(currIndex + 1, 0, tab);
-      } else {
-        this.tabs.push(tab);
-      }
-    }
-    this.setCurrentTab(tab);
-
-    if (tab instanceof ElementEditorState) {
-      // expand tree node
-      this.editorStore.explorerTreeState.openNode(tab.element);
-    }
-  }
-
   getCurrentEditorState<T extends EditorState>(clazz: Clazz<T>): T {
     return guaranteeType(
       this.currentTab,

package/src/stores/LegendStudioApplicationPlugin.ts

@@ -24,6 +24,7 @@ import type {
 import type { Class, PackageableElement, Testable } from '@finos/legend-graph';
 import {
   type DocumentationEntry,
+  type PureGrammarTextSuggestion,
   LegendApplicationPlugin,
 } from '@finos/legend-application';
 import type { TestableMetadata } from './sidebar-state/testable/GlobalTestRunnerState.js';
@@ -180,55 +181,6 @@ export type PureGrammarParserElementDocumentationGetter = (
   elementKeyword: string,
 ) => DocumentationEntry | undefined;
 
-/**
- * This snippet suggestion is meant for an embedded content of an element
- * In other words, it is used to construct element snippet suggestions
- *
- * Because of that, it is expected that there are text content wrapping around
- * this snippet, so the first suggestion might not start from index 1.
- */
-export interface ElementEmbeddedContentSnippetSuggestion {
-  /**
-   * Brief description about the suggestion item to enable the users to quickly
-   * differentiate between one suggestions from another
-   */
-  description?: string | undefined;
-  /**
-   * The snippet text to be embedded in the full snippet suggestion text for the element
-   *
-   * NOTE: The snippet syntax follows that of `monaco-editor`
-   * See https://code.visualstudio.com/docs/editor/userdefinedsnippets#_create-your-own-snippets
-   */
-  text: string;
-}
-
-/**
- * This mirrors `monaco-editor` completion item structure
- * See https://microsoft.github.io/monaco-editor/api/interfaces/monaco.languages.CompletionItem.html
- */
-export interface PureGrammarTextSuggestion {
-  /**
-   * The text label of the suggestion.
-   */
-  text: string;
-  /**
-   * Brief description about the suggestion item to enable the users to quickly
-   * differentiate between one suggestions from another
-   */
-  description?: string | undefined;
-  /**
-   * Detailed documentation that explains/elaborates the suggestion item.
-   */
-  documentation?: DocumentationEntry | undefined;
-  /**
-   * A string or snippet that should be inserted when selecting this suggestion.
-   *
-   * NOTE: The snippet syntax follows that of `monaco-editor`
-   * See https://code.visualstudio.com/docs/editor/userdefinedsnippets#_create-your-own-snippets
-   */
-  insertText: string;
-}
-
 export type PureGrammarParserKeywordSuggestionGetter = (
   editorStore: EditorStore,
 ) => PureGrammarTextSuggestion[];

package/src/stores/STO_Relational_LegendStudioApplicationPlugin_Extension.ts

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import type {
-  DSL_LegendStudioApplicationPlugin_Extension,
-  ElementEmbeddedContentSnippetSuggestion,
-} from './LegendStudioApplicationPlugin.js';
+import type { DSL_LegendStudioApplicationPlugin_Extension } from './LegendStudioApplicationPlugin.js';
 import type {
   DatasourceSpecification,
   AuthenticationStrategy,
@@ -26,6 +23,7 @@ import type {
 } from '@finos/legend-graph';
 import type { RelationalDatabaseConnectionValueState } from './editor-state/element-editor-state/connection/ConnectionEditorState.js';
 import type { PostProcessorEditorState } from './editor-state/element-editor-state/connection/PostProcessorEditorState.js';
+import type { ElementEmbeddedContentSnippetSuggestion } from '@finos/legend-application';
 
 /**
  * NOTE: The tab-stop index of the snippet must start from 6

package/src/stores/editor-state/EditorState.ts

@@ -24,10 +24,4 @@ export abstract class EditorState extends TabState {
     super();
     this.editorStore = editorStore;
   }
-
-  /**
-   * Check if the specified tab this tab or not.
-   * This is often used when checking if a tab is already opened.
-   */
-  abstract match(tab: EditorState): boolean;
 }

package/src/stores/editor-state/FileGenerationViewerState.ts

@@ -68,7 +68,7 @@ export class FileGenerationViewerState extends EditorState {
     return this.file.name;
   }
 
-  match(tab: EditorState): boolean {
+  override match(tab: EditorState): boolean {
     return tab instanceof FileGenerationViewerState && tab.file === this.file;
   }
 }

package/src/stores/editor-state/ModelImporterState.ts

@@ -477,7 +477,7 @@ export class ModelImporterState extends EditorState {
     return 'Model Importer';
   }
 
-  match(tab: EditorState): boolean {
+  override match(tab: EditorState): boolean {
     return tab instanceof ModelImporterEditorState;
   }