@finos/legend-application-studio 26.1.5 → 26.1.7

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

@@ -101,6 +101,7 @@ import {
   PackageableConnection,
   RelationalDatabaseConnection,
   guaranteeRelationalDatabaseConnection,
+  extractDependencyGACoordinateFromRootPackageName,
 } from '@finos/legend-graph';
 import { useApplicationStore } from '@finos/legend-application';
 import {
@@ -895,7 +896,8 @@ const PackageTreeNodeContainer = observer(
             tabIndex={-1}
             title={node.packageableElement.path}
           >
-            {node.label}
+            {extractDependencyGACoordinateFromRootPackageName(node.label) ??
+              node.label}
           </button>
         </div>
       </ContextMenu>

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

@@ -15,6 +15,7 @@
  */
 
 import {
+  type Binding,
   type ServiceTest,
   type Service,
   type ValueSpecification,
@@ -23,6 +24,13 @@ import {
   buildLambdaVariableExpressions,
   VariableExpression,
   PureMultiExecution,
+  PackageableElementImplicitReference,
+  matchFunctionName,
+  isStubbed_RawLambda,
+  InstanceValue,
+  LambdaFunctionInstanceValue,
+  SimpleFunctionExpression,
+  CollectionInstanceValue,
 } from '@finos/legend-graph';
 import { action, flow, makeObservable, observable } from 'mobx';
 import { TestableTestEditorState } from '../../testable/TestableEditorState.js';
@@ -37,6 +45,7 @@ import {
   service_setSerializationFormat,
 } from '../../../../../graph-modifier/DSL_Service_GraphModifierHelper.js';
 import {
+  type PlainObject,
   assertErrorThrown,
   deleteEntry,
   filterByType,
@@ -44,10 +53,15 @@ import {
   isNonNullable,
   returnUndefOnError,
   uuid,
-  type PlainObject,
+  getNullableFirstEntry,
+  LogEvent,
 } from '@finos/legend-shared';
 import type { EditorStore } from '../../../../EditorStore.js';
-import { generateVariableExpressionMockValue } from '@finos/legend-query-builder';
+import {
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+  generateVariableExpressionMockValue,
+} from '@finos/legend-query-builder';
+import { LEGEND_STUDIO_APP_EVENT } from '../../../../../../__lib__/LegendStudioEvent.js';
 
 export enum SERIALIZATION_FORMAT {
   PURE = 'PURE',
@@ -180,6 +194,7 @@ export class ServiceTestSetupState {
       addServiceTestAssertKeys: action,
       syncWithQuery: action,
       removeParamValueState: action,
+      getBindingWithParamFromQuery: action,
     });
     this.parameterValueStates = this.buildParameterStates();
   }
@@ -221,6 +236,103 @@ export class ServiceTestSetupState {
     }));
   }
 
+  getBindingWithParamFromQuery(): {
+    binding: Binding;
+    param: string;
+  }[] {
+    const query =
+      this.testState.suiteState.testableState.serviceEditorState.serviceQuery;
+    if (query && !isStubbed_RawLambda(query)) {
+      // safely pass unsupported funtions when building ValueSpecification from Rawlambda
+      try {
+        const valueSpec =
+          this.editorStore.graphManagerState.graphManager.buildValueSpecification(
+            this.editorStore.graphManagerState.graphManager.serializeRawValueSpecification(
+              query,
+            ),
+            this.editorStore.graphManagerState.graph,
+          );
+
+        if (valueSpec instanceof LambdaFunctionInstanceValue) {
+          return this.getBindingWithParamRecursively(
+            valueSpec.values[0]?.expressionSequence[0],
+          );
+        }
+      } catch (error) {
+        this.editorStore.applicationStore.logService.error(
+          LogEvent.create(LEGEND_STUDIO_APP_EVENT.SERVICE_TEST_SETUP_FAILURE),
+          error,
+        );
+      }
+    }
+    return [];
+  }
+
+  getBindingWithParamRecursively(expression: ValueSpecification | undefined): {
+    binding: Binding;
+    param: string;
+  }[] {
+    let currentExpression = expression;
+    const res: {
+      binding: Binding;
+      param: string;
+    }[] = [];
+    // use if statement to safely scan service query without breaking the app
+    while (currentExpression instanceof SimpleFunctionExpression) {
+      if (
+        matchFunctionName(
+          currentExpression.functionName,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.INTERNALIZE,
+        ) ||
+        matchFunctionName(
+          currentExpression.functionName,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.GET_RUNTIME_WITH_MODEL_QUERY_CONNECTION,
+        )
+      ) {
+        if (currentExpression.parametersValues[1] instanceof InstanceValue) {
+          if (
+            currentExpression.parametersValues[1].values[0] instanceof
+              PackageableElementImplicitReference<Binding> &&
+            currentExpression.parametersValues[2] instanceof VariableExpression
+          ) {
+            res.push({
+              binding: currentExpression.parametersValues[1].values[0]
+                .value as Binding,
+              param: currentExpression.parametersValues[2].name,
+            });
+          }
+        }
+        currentExpression = currentExpression.parametersValues[1];
+      } else if (
+        matchFunctionName(
+          currentExpression.functionName,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.FROM,
+        )
+      ) {
+        currentExpression = currentExpression.parametersValues[2];
+      } else if (
+        matchFunctionName(
+          currentExpression.functionName,
+          QUERY_BUILDER_SUPPORTED_FUNCTIONS.MERGERUNTIMES,
+        )
+      ) {
+        const collection = currentExpression.parametersValues[0];
+        if (collection instanceof CollectionInstanceValue) {
+          collection.values
+            .map((v) => this.getBindingWithParamRecursively(v))
+            .flat()
+            .map((p) => res.push(p));
+        }
+        currentExpression = collection;
+      } else {
+        currentExpression = getNullableFirstEntry(
+          currentExpression.parametersValues,
+        );
+      }
+    }
+    return res;
+  }
+
   addServiceTestAssertKeys(val: string[]): void {
     service_addAssertKeyForTest(this.testState.test, val);
   }

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

@@ -63,7 +63,7 @@ export class ProjectConfigurationEditorState extends EditorState {
   projects = new Map<string, StoreProjectData>();
   versions = new Map<string, string[]>();
   latestProjectStructureVersion: ProjectStructureVersion | undefined;
-
+  manualOverwrite = false;
   associatedProjectsAndVersionsFetched = false;
 
   constructor(editorStore: EditorStore, sdlcState: EditorSDLCState) {
@@ -75,6 +75,7 @@ export class ProjectConfigurationEditorState extends EditorState {
       projectConfiguration: observable,
       selectedTab: observable,
       isReadOnly: observable,
+      manualOverwrite: observable,
       projects: observable,
       versions: observable,
       associatedProjectsAndVersionsFetched: observable,
@@ -88,6 +89,7 @@ export class ProjectConfigurationEditorState extends EditorState {
       setOriginalProjectConfiguration: action,
       setProjectConfiguration: action,
       setSelectedTab: action,
+      setManualOverwrite: action,
       fectchAssociatedProjectsAndVersions: flow,
       updateProjectConfiguration: flow,
       updateToLatestStructure: flow,
@@ -118,6 +120,10 @@ export class ProjectConfigurationEditorState extends EditorState {
     this.selectedTab = tab;
   }
 
+  setManualOverwrite(value: boolean): void {
+    this.manualOverwrite = value;
+  }
+
   get label(): string {
     return 'config';
   }

package/src/stores/editor/utils/PackageTreeUtils.ts

@@ -47,6 +47,7 @@ import {
   generateFunctionPrettyName,
   getElementRootPackage,
   extractDependencyGACoordinateFromRootPackageName,
+  generateDependencyRootPackageName,
 } from '@finos/legend-graph';
 import { ExplorerTreeRootPackageLabel } from '../ExplorerTreeState.js';
 
@@ -229,8 +230,12 @@ export const getDependenciesPackableElementTreeData = (
     const dependencyGACoordinates =
       extractDependencyGACoordinateFromRootPackageName(_package.name) ??
       _package.name;
-    childRootNode.label = dependencyGACoordinates;
-    childRootNode.id = dependencyGACoordinates;
+    childRootNode.label = generateDependencyRootPackageName(
+      dependencyGACoordinates,
+    );
+    childRootNode.id = generateDependencyRootPackageName(
+      dependencyGACoordinates,
+    );
     addUniqueEntry(rootIds, childRootNode.id);
     nodes.set(childRootNode.id, childRootNode);
     root.children.push(_package);