Fix for fragment labels

TouK · Feb 25, 2025 · 7f6d894 · 7f6d894
1 parent eb1fb2e
commit 7f6d894
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 52 deletions.
diff --git a/designer/client/cypress/e2e/nodeWindow.cy.ts b/designer/client/cypress/e2e/nodeWindow.cy.ts
@@ -19,7 +19,7 @@ describe("Node window", () => {
             .should("exist")
             .scrollIntoView();
         cy.layoutScenario();
-        cy.get("[data-testid='component:event-generator']")
+        cy.get("[data-testid='component:event generator']")
             .should("be.visible")
             .drag("#nk-graph-main", {
                 target: {
@@ -29,7 +29,7 @@ describe("Node window", () => {
                 force: true,
             });
 
-        cy.getNode("event-generator").dblclick();
+        cy.getNode("event generator").dblclick();
 
         // TODO: fix validation display in node windows
         cy.intercept("POST", "/api/nodes/*/validation").as("validation");

diff --git a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/component/package.scala b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/component/package.scala
@@ -53,46 +53,6 @@ package object component {
 
   object ComponentListElement {
     def sortMethod(component: ComponentListElement): (String, String) = (component.name, component.id.value)
-
-    def apply(
-        id: DesignerWideComponentId,
-        name: String,
-        icon: String,
-        componentType: ComponentType,
-        componentGroupName: ComponentGroupName,
-        categories: List[String],
-        links: List[ComponentLink],
-        usageCount: Long,
-        allowedProcessingModes: AllowedProcessingModes
-    ): ComponentListElement = {
-      if (componentType == ComponentType.Fragment)
-        ComponentListElement(
-          id,
-          name,
-          icon,
-          componentType,
-          componentGroupName,
-          categories,
-          links,
-          usageCount,
-          allowedProcessingModes,
-          id.value
-        )
-      else
-        ComponentListElement(
-          id,
-          name,
-          icon,
-          componentType,
-          componentGroupName,
-          categories,
-          links,
-          usageCount,
-          allowedProcessingModes,
-          name
-        )
-    }
-
   }
 
   implicit val allowedProcessingModesEncoder: Encoder[AllowedProcessingModes] = Encoder.instance {

diff --git a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/definition/package.scala b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/definition/package.scala
@@ -70,8 +70,7 @@ package object definition {
       icon: String,
       docsUrl: Option[String],
       // This field is defined only for fragments
-      outputParameters: Option[List[String]],
-      label: String
+      outputParameters: Option[List[String]]
   )
 
   @JsonCodec final case class UISourceParameters(sourceId: String, parameters: List[UIParameter])

diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/DefinitionsService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/definition/DefinitionsService.scala
@@ -137,8 +137,7 @@ class DefinitionsService(
       docsUrl = componentDefinition.component.docsUrl,
       outputParameters = Option(componentDefinition.component.componentTypeSpecificData).collect {
         case FragmentSpecificData(outputNames) => outputNames
-      },
-      label = componentDefinition.component.label
+      }
     )
   }
 

diff --git a/.../test/scala/pl/touk/nussknacker/ui/definition/component/DefaultComponentServiceSpec.scala b/.../test/scala/pl/touk/nussknacker/ui/definition/component/DefaultComponentServiceSpec.scala
@@ -369,7 +369,8 @@ class DefaultComponentServiceSpec
       availableCategories,
       links,
       usageCount,
-      nonDefaultAllowedProcessingModes.getOrElse(AllowedProcessingModes.All)
+      nonDefaultAllowedProcessingModes.getOrElse(AllowedProcessingModes.All),
+      componentId.name
     )
   }
 
@@ -389,7 +390,8 @@ class DefaultComponentServiceSpec
         List(cat),
         links,
         0,
-        AllowedProcessingModes.SetOf(ProcessingMode.UnboundedStream)
+        AllowedProcessingModes.SetOf(ProcessingMode.UnboundedStream),
+        componentId.name
       )
     )
   }
@@ -409,7 +411,8 @@ class DefaultComponentServiceSpec
         List(cat),
         links,
         0,
-        AllowedProcessingModes.SetOf(ProcessingMode.UnboundedStream)
+        AllowedProcessingModes.SetOf(ProcessingMode.UnboundedStream),
+        componentId.name
       )
     )
   }
@@ -473,7 +476,8 @@ class DefaultComponentServiceSpec
       categories,
       links,
       usageCount,
-      nonDefaultAllowedProcessingModes.getOrElse(AllowedProcessingModes.All)
+      nonDefaultAllowedProcessingModes.getOrElse(AllowedProcessingModes.All),
+      componentId.name,
     )
   }
 

diff --git a/.../touk/nussknacker/engine/definition/component/ComponentDefinitionWithImplementation.scala b/.../touk/nussknacker/engine/definition/component/ComponentDefinitionWithImplementation.scala
@@ -32,7 +32,15 @@ trait ComponentDefinitionWithImplementation extends ObjectOperatingOnTypes {
 
   protected def uiDefinition: ComponentUiDefinition
 
-  final def label: String = uiDefinition.label.getOrElse(name)
+  final def label: String = {
+    uiDefinition.label.getOrElse {
+      if (componentType != ComponentType.Fragment) {
+        name
+      } else {
+        id.name
+      }
+    }
+  }
 
   final def designerWideId: DesignerWideComponentId = uiDefinition.designerWideId
 

diff --git a/...sknacker/engine/definition/component/defaultconfig/DefaultComponentConfigDeterminer.scala b/...sknacker/engine/definition/component/defaultconfig/DefaultComponentConfigDeterminer.scala
@@ -78,7 +78,7 @@ object DefaultComponentConfigDeterminer {
       icon = icon.getOrElse(DefaultsComponentIcon.FragmentIcon),
       docsUrl = docsUrl,
       designerWideId = designerWideId,
-      label = Option(designerWideId.value)
+      label = None
     )
   }