@finos/legend-application-studio 28.21.16 → 28.21.18

package/src/components/editor/editor-group/function-activator/testable/FunctionTestableEditor.tsx

@@ -861,20 +861,9 @@ const FunctionTestDataPanel = observer(
   (props: { functionTestSuiteState: FunctionTestSuiteState }) => {
     const { functionTestSuiteState } = props;
     const dataState = functionTestSuiteState.dataState;
-    const hasIngestOrDataProductAccessors =
-      functionTestSuiteState.functionTestableState
-        .resolvedIngestOrDataProductAccessors.length > 0;
     const hasTestData = Boolean(dataState.dataHolder.testData?.length);
 
     const addStoreTestData = (): void => {
-      if (!dataState.availableElementsToAdd.length) {
-        functionTestSuiteState.editorStore.applicationStore.notificationService.notifyWarning(
-          hasIngestOrDataProductAccessors
-            ? `All referenced elements' data is already present`
-            : `No elements available to add`,
-        );
-        return;
-      }
       dataState.setShowAddElementModal(true);
     };
 
@@ -923,7 +912,9 @@ const FunctionTestDataPanel = observer(
                         tabIndex={-1}
                       >
                         <div className="testable-test-explorer__item__label__text">
-                          {td.element.value.path}
+                          <span title={td.element.value.path}>
+                            {td.element.value.name}
+                          </span>
                         </div>
                         <div className="mapping-test-explorer__item__actions">
                           <button
@@ -1076,26 +1067,6 @@ const FunctionTestsPanel = observer(
 const FunctionTestSuiteEditor = observer(
   (props: { functionTestSuiteState: FunctionTestSuiteState }) => {
     const { functionTestSuiteState } = props;
-    const hasTestData = Boolean(
-      functionTestSuiteState.dataState.dataHolder.testData?.length,
-    );
-    const hasIngestOrDataProductAccessors =
-      functionTestSuiteState.functionTestableState
-        .resolvedIngestOrDataProductAccessors.length > 0;
-    const showTestDataPanel =
-      functionTestSuiteState.functionTestableState.containsRuntime ||
-      hasIngestOrDataProductAccessors ||
-      hasTestData;
-
-    if (!showTestDataPanel) {
-      // No test data — just show the tests panel full width
-      return (
-        <div className="service-test-suite-editor">
-          <FunctionTestsPanel functionTestSuiteState={functionTestSuiteState} />
-        </div>
-      );
-    }
-
     return (
       <div className="service-test-suite-editor">
         <ResizablePanelGroup orientation="horizontal">

package/src/components/editor/editor-group/project-configuration-editor/ProjectConfigurationEditor.tsx

@@ -67,6 +67,7 @@ import {
   DocumentationPreview,
 } from '@finos/legend-lego/application';
 import type { StoreProjectData } from '@finos/legend-server-depot';
+import { generateGAVCoordinates } from '@finos/legend-storage';
 
 const isProjectConfigurationVersionOutdated = (
   projectConfig: ProjectConfiguration,
@@ -715,7 +716,16 @@ export const ProjectConfigurationEditor = observer(() => {
     async (): Promise<void> => {
       if (!isReadOnly) {
         if (selectedTab === CONFIGURATION_EDITOR_TAB.PROJECT_DEPENDENCIES) {
-          const currentProjects = Array.from(configState.projects.values());
+          const currentProjectCoordinates = generateGAVCoordinates(
+            currentProjectConfiguration.groupId,
+            currentProjectConfiguration.artifactId,
+            undefined,
+          );
+          const currentProjects = Array.from(
+            configState.projects.values(),
+          ).filter(
+            (project) => project.coordinates !== currentProjectCoordinates,
+          );
           if (currentProjects.length) {
             const projectToAdd = currentProjects[0] as StoreProjectData;
             const dependencyToAdd = new ProjectDependency(

package/src/components/editor/editor-group/project-configuration-editor/ProjectDependencyEditor.tsx

@@ -1068,6 +1068,13 @@ const ProjectDependencyInlineExclusionsSelector = observer(
           );
 
         const visitedNodes = new Set<string>();
+        const currentProjectCoordinate = generateGAVCoordinates(
+          editorStore.projectConfigurationEditorState
+            .currentProjectConfiguration.groupId,
+          editorStore.projectConfigurationEditorState
+            .currentProjectConfiguration.artifactId,
+          undefined,
+        );
         const traverseNode = (nodeId: string) => {
           if (visitedNodes.has(nodeId)) {
             return;
@@ -1090,7 +1097,8 @@ const ProjectDependencyInlineExclusionsSelector = observer(
               if (
                 existingExclusionCoordinates.indexOf(coordinate) === -1 &&
                 coordinate !==
-                  `${projectDependency.groupId}:${projectDependency.artifactId}`
+                  `${projectDependency.groupId}:${projectDependency.artifactId}` &&
+                coordinate !== currentProjectCoordinate
               ) {
                 transitiveDeps.set(coordinate, {
                   label: generateGAVCoordinates(
@@ -1125,6 +1133,10 @@ const ProjectDependencyInlineExclusionsSelector = observer(
         projectDependency.groupId,
         projectDependency.artifactId,
         projectDependency.versionId,
+        editorStore.projectConfigurationEditorState.currentProjectConfiguration
+          .groupId,
+        editorStore.projectConfigurationEditorState.currentProjectConfiguration
+          .artifactId,
       ]);
 
     useEffect(() => {
@@ -1141,7 +1153,6 @@ const ProjectDependencyInlineExclusionsSelector = observer(
       if (!option) {
         return;
       }
-
       try {
         dependencyEditorState.addExclusionByCoordinate(
           projectDependency.projectId,
@@ -1310,7 +1321,13 @@ const ProjectVersionDependencyEditor = observer(
     const projectDisabled =
       !configState.associatedProjectsAndVersionsFetched ||
       configState.isReadOnly;
+    const currentProjectCoordinates = generateGAVCoordinates(
+      configState.currentProjectConfiguration.groupId,
+      configState.currentProjectConfiguration.artifactId,
+      undefined,
+    );
     const projectsOptions = Array.from(configState.projects.values())
+      .filter((project) => project.coordinates !== currentProjectCoordinates)
       .map(buildProjectOption)
       .sort(compareLabelFn);
     const onProjectSelectionChange = async (

package/src/components/editor/editor-group/uml-editor/ClassEditor.tsx

@@ -159,6 +159,7 @@ const PropertyBasicEditor = observer(
     const { property, _class, editorState, deleteProperty, isReadOnly } = props;
 
     const editorStore = useEditorStore();
+    const applicationStore = useApplicationStore();
     const isInheritedProperty =
       property._OWNER instanceof Class && property._OWNER !== _class;
     const isPropertyFromAssociation = property._OWNER instanceof Association;
@@ -340,6 +341,10 @@ const PropertyBasicEditor = observer(
               placeholder="Choose a type..."
               filterOption={filterOption}
               formatOptionLabel={getPackageableElementOptionFormatter({})}
+              darkMode={
+                !applicationStore.layoutService
+                  .TEMPORARY__isLightColorThemeEnabled
+              }
             />
           )}
           {!isIndirectProperty && !isReadOnly && !isEditingType && (
@@ -713,6 +718,10 @@ const DerivedPropertyBasicEditor = observer(
                 placeholder="Choose a type..."
                 filterOption={filterOption}
                 formatOptionLabel={getPackageableElementOptionFormatter({})}
+                darkMode={
+                  !applicationStore.layoutService
+                    .TEMPORARY__isLightColorThemeEnabled
+                }
               />
             )}
             {!isInheritedProperty && !isReadOnly && !isEditingType && (
@@ -1044,6 +1053,7 @@ const SuperTypeEditor = observer(
 
     const { superType, _class, deleteSuperType, isReadOnly } = props;
     const editorStore = useEditorStore();
+    const applicationStore = useApplicationStore();
     // Type
     const superTypeOptions = editorStore.graphManagerState.usableClasses
       .filter(
@@ -1136,6 +1146,10 @@ const SuperTypeEditor = observer(
             placeholder="Choose a class"
             filterOption={filterOption}
             formatOptionLabel={getPackageableElementOptionFormatter({})}
+            darkMode={
+              !applicationStore.layoutService
+                .TEMPORARY__isLightColorThemeEnabled
+            }
           />
           <button
             className="uml-element-editor__basic__detail-btn"
@@ -1472,6 +1486,7 @@ const SupertypesEditor = observer(
 const TaggedValuesEditor = observer(
   (props: { _class: Class; editorState: ClassEditorState }) => {
     const { _class, editorState } = props;
+    const applicationStore = useApplicationStore();
     const isReadOnly = editorState.isReadOnly;
 
     const deleteTaggedValue =
@@ -1519,6 +1534,10 @@ const TaggedValuesEditor = observer(
               taggedValue={taggedValue}
               deleteValue={deleteTaggedValue(taggedValue)}
               isReadOnly={isReadOnly}
+              darkTheme={
+                !applicationStore.layoutService
+                  .TEMPORARY__isLightColorThemeEnabled
+              }
             />
           ))}
         </PanelContentLists>
@@ -1530,6 +1549,7 @@ const TaggedValuesEditor = observer(
 const StereotypesEditor = observer(
   (props: { _class: Class; editorState: ClassEditorState }) => {
     const { _class, editorState } = props;
+    const applicationStore = useApplicationStore();
     const isReadOnly = editorState.isReadOnly;
 
     const deleteStereotype =
@@ -1579,6 +1599,10 @@ const StereotypesEditor = observer(
               stereotype={stereotype}
               deleteStereotype={deleteStereotype(stereotype)}
               isReadOnly={isReadOnly}
+              darkTheme={
+                !applicationStore.layoutService
+                  .TEMPORARY__isLightColorThemeEnabled
+              }
             />
           ))}
         </PanelContentLists>

package/src/components/editor/editor-group/uml-editor/PropertyEditor.tsx

@@ -45,6 +45,7 @@ import {
 import { LEGEND_STUDIO_TEST_ID } from '../../../../__lib__/LegendStudioTesting.js';
 import { isNonNullable, prettyCONSTName } from '@finos/legend-shared';
 import { UML_EDITOR_TAB } from '../../../../stores/editor/editor-state/element-editor-state/UMLEditorState.js';
+import { useApplicationStore } from '@finos/legend-application';
 import {
   type AbstractProperty,
   type StereotypeReference,
@@ -81,6 +82,9 @@ export const PropertyEditor = observer(
     isReadOnly: boolean;
   }) => {
     const { property, deselectProperty, isReadOnly } = props;
+    const applicationStore = useApplicationStore();
+    const darkMode =
+      !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled;
     // Tab
     const [selectedTab, setSelectedTab] = useState<UML_EDITOR_TAB>(
       property instanceof Property
@@ -272,6 +276,7 @@ export const PropertyEditor = observer(
                       escapeClearsValue={true}
                       isClearable={true}
                       disabled={isReadOnly}
+                      darkMode={darkMode}
                     />
                   </PanelFormSection>
                 </PanelForm>
@@ -290,6 +295,7 @@ export const PropertyEditor = observer(
                       taggedValue={taggedValue}
                       deleteValue={_deleteTaggedValue(taggedValue)}
                       isReadOnly={isReadOnly}
+                      darkTheme={darkMode}
                     />
                   ))}
                 </PanelContentLists>
@@ -309,6 +315,7 @@ export const PropertyEditor = observer(
                       stereotype={stereotype}
                       deleteStereotype={_deleteStereotype(stereotype)}
                       isReadOnly={isReadOnly}
+                      darkTheme={darkMode}
                     />
                   ))}
                 </PanelContentLists>

package/src/stores/editor/editor-state/element-editor-state/function-activator/testable/FunctionTestableState.ts

@@ -14,7 +14,14 @@
  * limitations under the License.
  */
 
-import { action, flow, flowResult, makeObservable, observable } from 'mobx';
+import {
+  action,
+  flow,
+  flowResult,
+  makeObservable,
+  observable,
+  runInAction,
+} from 'mobx';
 import type { EditorStore } from '../../../../EditorStore.js';
 import type { FunctionEditorState } from '../../FunctionEditorState.js';
 import {
@@ -43,6 +50,8 @@ import {
   type ValueSpecification,
   type TestAssertion,
   type AccessorOwner,
+  type AbstractPureGraphManager,
+  type PackageableElement,
   FunctionParameterValue,
   VariableExpression,
   FunctionTest,
@@ -57,8 +66,11 @@ import {
   InstanceValue,
   PackageableElementReference,
   Database,
+  DataProduct,
+  IngestDefinition,
   PackageableElementExplicitReference,
   observe_ValueSpecification,
+  observe_RelationElementsData,
   buildLambdaVariableExpressions,
   EqualTo,
   EqualToRelation,
@@ -72,7 +84,7 @@ import {
   type Accessor,
   DataProductAccessor,
   IngestionAccessor,
-  RelationalStoreAccessor,
+  getAccessorItemLabelForElement,
   V1_buildRelationElementsDataFromAccessors,
 } from '@finos/legend-graph';
 import {
@@ -191,6 +203,28 @@ const resolveRuntimesFromQuery = (
   }
 };
 
+interface ElementDataItem {
+  id: string;
+  label: string;
+}
+
+const getElementDataItems = (
+  element: PackageableElement,
+  graphManager: AbstractPureGraphManager,
+): ElementDataItem[] => {
+  if (element instanceof DataProduct) {
+    return element.accessPointGroups
+      .flatMap((g) => g.accessPoints)
+      .map((ap) => ({ id: ap.id, label: ap.id }));
+  }
+  if (element instanceof IngestDefinition) {
+    return graphManager
+      .getIngestDefinitionDatasetNames(element)
+      .map((name) => ({ id: name, label: name }));
+  }
+  return [];
+};
+
 export class FunctionStoreTestDataState {
   readonly editorStore: EditorStore;
   readonly testDataState: FunctionTestDataState;
@@ -239,51 +273,69 @@ export class FunctionStoreTestDataState {
     embeddedDataState: RelationElementsDataState,
   ): Promise<void> {
     const parentElement = this.storeTestData.element.value;
-    const accessors =
-      this.testDataState.functionTestableState
-        .resolvedIngestOrDataProductAccessors;
-    const parentAccessors = accessors.filter(
-      (a) => a.accessorOwner === parentElement.path,
-    );
-    if (!parentAccessors.length) {
+    const graphManager = this.editorStore.graphManagerState.graphManager;
+    const graph = this.editorStore.graphManagerState.graph;
+
+    // For Database parents, fall back to the schema+table form
+    if (parentElement instanceof Database) {
       embeddedDataState.setAccessorOptions(undefined, undefined);
       return;
     }
-    const firstAccessor = parentAccessors[0];
-    if (!firstAccessor) {
+
+    const items = getElementDataItems(parentElement, graphManager);
+    if (items.length === 0) {
       embeddedDataState.setAccessorOptions(undefined, undefined);
       return;
     }
-
-    const columnOverrides = new Map<string, string[]>();
-    for (const accessor of parentAccessors) {
-      const cols = accessor.relationType.columns.map((col) => col.name);
-      if (cols.length > 0) {
-        columnOverrides.set(accessor.accessor, cols);
-      }
-    }
-
-    const typeLabel = firstAccessor.accessorLabel;
-    const options = parentAccessors.map((a) => ({
-      label: a.accessor,
-      value: a.accessor,
-      columns: columnOverrides.get(a.accessor) ?? [],
-    }));
-
-    if (columnOverrides.size > 0) {
+    const typeLabel = getAccessorItemLabelForElement(
+      parentElement as AccessorOwner,
+    );
+    const options = await Promise.all(
+      items.map(async (item) => {
+        let columns: string[] = [];
+        try {
+          if (parentElement instanceof IngestDefinition) {
+            const accessor =
+              await graphManager.createAccessorFromPackageableElement(
+                parentElement,
+                graph,
+                { schemaName: undefined, tableName: item.id },
+              );
+            if (accessor) {
+              columns = accessor.relationType.columns.map((c) => c.name);
+            }
+          } else if (parentElement instanceof DataProduct) {
+            const accessor = await graphManager.buildDataProductAccessor(
+              parentElement,
+              graph,
+              { tableName: item.id },
+            );
+            if (accessor) {
+              columns = accessor.relationType.columns.map((c) => c.name);
+            }
+          }
+        } catch {}
+        return { label: item.label, value: item.id, columns };
+      }),
+    );
+    runInAction(() => {
+      embeddedDataState.setAccessorOptions(options, typeLabel);
+      const columnsByItem = new Map(
+        options
+          .filter((o) => o.columns.length > 0)
+          .map((o) => [o.value, o.columns]),
+      );
       for (const relState of embeddedDataState.relationElementStates) {
         const rel = relState.relationElement;
         if (rel.columns.length === 0) {
           const key = rel.paths[rel.paths.length - 1];
-          const cols = key ? columnOverrides.get(key) : undefined;
+          const cols = key ? columnsByItem.get(key) : undefined;
           if (cols) {
             rel.columns = cols;
           }
         }
       }
-    }
-
-    embeddedDataState.setAccessorOptions(options, typeLabel);
+    });
   }
 
   setDataElementModal(val: boolean): void {
@@ -655,34 +707,38 @@ class FunctionTestDataState {
     return (this.dataHolder.testData ?? []).map((td) => td.element.value.path);
   }
 
-  get availableElementsToAdd(): { path: string }[] {
-    const accessors =
-      this.functionTestableState.resolvedIngestOrDataProductAccessors;
+  get availableElementsToAdd(): PackageableElement[] {
+    const graph = this.editorStore.graphManagerState.graph;
     const existingPaths = new Set(this.existingElementPaths);
-    const parentPaths = new Set<string>();
-    for (const accessor of accessors) {
-      const parentPath = accessor.path[0];
-      if (parentPath && !existingPaths.has(parentPath)) {
-        parentPaths.add(parentPath);
-      }
-    }
-    return Array.from(parentPaths).map((path) => ({ path }));
+    const candidates: PackageableElement[] = [
+      ...graph.ingests,
+      ...graph.dataProducts,
+      ...graph.databases,
+    ];
+    return candidates.filter((e) => !existingPaths.has(e.path));
   }
 
   addDataElement(elementPath: string): void {
-    const accessors =
-      this.functionTestableState.resolvedIngestOrDataProductAccessors;
-    const group = accessors.filter((a) => a.path[0] === elementPath);
-    if (!group.length) {
+    const element =
+      this.editorStore.graphManagerState.graph.getNullableElement(elementPath);
+    if (!element) {
       return;
     }
-    const element =
-      this.editorStore.graphManagerState.graph.getElement(elementPath);
     const data = new FunctionTestData();
     data.element = PackageableElementExplicitReference.create(
       element as AccessorOwner,
     );
-    data.data = V1_buildRelationElementsDataFromAccessors(group);
+    const matchingAccessors = this.functionTestableState.cachedAccessors.filter(
+      (a) => a.accessorOwner === elementPath,
+    );
+    if (matchingAccessors.length) {
+      data.data = V1_buildRelationElementsDataFromAccessors(matchingAccessors);
+    } else {
+      const relData = new RelationElementsData();
+      relData.relationElements = [];
+      data.data = relData;
+    }
+    observe_RelationElementsData(data.data as RelationElementsData);
     if (!this.dataHolder.testData) {
       this.dataHolder.testData = [];
     }
@@ -966,36 +1022,9 @@ export class FunctionTestableState extends TestablePackageableElementEditorState
 
     const ingestOrDataProductAccessors =
       this.resolvedIngestOrDataProductAccessors;
-    const databaseAccessors = this.cachedAccessors.filter(
-      (a) => a instanceof RelationalStoreAccessor,
-    );
 
     try {
-      if (ingestOrDataProductAccessors.length) {
-        // Group by parent element path and create test data per parent
-        const parentElementMap = new Map<string, Accessor[]>();
-        for (const accessor of ingestOrDataProductAccessors) {
-          const key = accessor.accessorOwner;
-          if (key) {
-            const group = parentElementMap.get(key) ?? [];
-            group.push(accessor);
-            parentElementMap.set(key, group);
-          }
-        }
-        functionSuite.testData = Array.from(parentElementMap.entries()).map(
-          ([parentPath, group]) => {
-            const data = new FunctionTestData();
-            const element =
-              this.editorStore.graphManagerState.graph.getElement(parentPath);
-            data.element = PackageableElementExplicitReference.create(
-              element as AccessorOwner,
-            );
-            data.data = V1_buildRelationElementsDataFromAccessors(group);
-            return data;
-          },
-        );
-      } else {
-        // No ingest/data product accessors found — try runtime-based approach
+      if (!ingestOrDataProductAccessors.length) {
         const engineRuntimes = this.associatedRuntimes;
         if (engineRuntimes?.length) {
           assertTrue(
@@ -1047,10 +1076,44 @@ export class FunctionTestableState extends TestablePackageableElementEditorState
             type.path === CORE_PURE_PATH.RELATION ||
             type.path === CORE_PURE_PATH.TABULAR_DATASET
           ) {
-            this.editorStore.applicationStore.notificationService.notifyError(
-              `Unable to create function test suite: no runtime or accessors found, or they could not be resolved`,
+            this.editorStore.applicationStore.notificationService.notifyWarning(
+              `No runtime or accessors found, or they could not be resolved. For Relational (non-Lakehouse) function testing, please ensure that your query is bound to a runtime`,
+            );
+            // continue: still allow the user to create the suite/test and
+            // add test data manually
+          }
+        }
+      }
+
+      if (this.cachedAccessors.length) {
+        const accessorsByOwner = new Map<string, Accessor[]>();
+        for (const accessor of this.cachedAccessors) {
+          const key = accessor.accessorOwner;
+          if (key) {
+            const group = accessorsByOwner.get(key) ?? [];
+            group.push(accessor);
+            accessorsByOwner.set(key, group);
+          }
+        }
+        if (!functionSuite.testData) {
+          functionSuite.testData = [];
+        }
+        for (const [parentPath, group] of accessorsByOwner.entries()) {
+          const builtData = V1_buildRelationElementsDataFromAccessors(group);
+          const existing = functionSuite.testData.find(
+            (td) => td.element.value.path === parentPath,
+          );
+          if (existing) {
+            existing.data = builtData;
+          } else {
+            const element =
+              this.editorStore.graphManagerState.graph.getElement(parentPath);
+            const data = new FunctionTestData();
+            data.element = PackageableElementExplicitReference.create(
+              element as AccessorOwner,
             );
-            return;
+            data.data = builtData;
+            functionSuite.testData.push(data);
           }
         }
       }
@@ -1062,10 +1125,7 @@ export class FunctionTestableState extends TestablePackageableElementEditorState
       return;
     }
 
-    const hasTestData =
-      this.containsRuntime ||
-      ingestOrDataProductAccessors.length > 0 ||
-      databaseAccessors.length > 0;
+    const hasTestData = this.containsRuntime || this.cachedAccessors.length > 0;
     yield createFunctionTest(
       testName,
       this.editorStore.changeDetectionState.observerContext,

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

@@ -444,6 +444,23 @@ export class ProjectDependencyEditorState {
       return;
     }
 
+    const currentProjectCoordinate = generateGAVCoordinates(
+      this.configState.currentProjectConfiguration.groupId,
+      this.configState.currentProjectConfiguration.artifactId,
+      undefined,
+    );
+    const exclusionCoordinate = generateGAVCoordinates(
+      guaranteeNonNullable(exclusion.groupId),
+      guaranteeNonNullable(exclusion.artifactId),
+      undefined,
+    );
+    if (exclusionCoordinate === currentProjectCoordinate) {
+      this.editorStore.applicationStore.notificationService.notifyWarning(
+        'You cannot exclude your own project from a dependency',
+      );
+      return;
+    }
+
     const existingExclusion = this.findExistingExclusion(
       dependencyId,
       generateGAVCoordinates(