Review fixes

TouK · Oct 28, 2024 · b393946 · b393946
1 parent cd38bee
commit b393946
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 40 deletions.
diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuResourcesTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuResourcesTest.scala
@@ -141,7 +141,7 @@ trait NuResourcesTest
         deploymentManagerProvider.defaultEngineSetupName,
         processingTypeConfig.deploymentConfig,
         processingTypeConfig.category,
-        ComponentDefinitionExtractionMode.FinalDefinition
+        modelDependencies.componentDefinitionExtractionMode
       )
     )
 

diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestFactory.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestFactory.scala
@@ -126,7 +126,7 @@ object TestFactory {
       componentId => DesignerWideComponentId(componentId.toString),
       workingDirectoryOpt = None,
       _ => true,
-      ComponentDefinitionExtractionMode.FinalDefinition
+      ComponentDefinitionExtractionMode.FinalAndBasicDefinitions
     )
 
   val deploymentManagerDependencies: DeploymentManagerDependencies = {

diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DefinitionResourcesSpec.scala b/designer/server/src/test/scala/pl/touk/nussknacker/ui/api/DefinitionResourcesSpec.scala
@@ -28,9 +28,6 @@ import pl.touk.nussknacker.ui.definition.{
 }
 import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter
 
-import scala.concurrent.Await
-import scala.concurrent.duration._
-
 class DefinitionResourcesSpec
     extends AnyFunSpec
     with ScalatestRouteTest

diff --git a/...la/pl/touk/nussknacker/engine/definition/component/ComponentsFromProvidersExtractor.scala b/...la/pl/touk/nussknacker/engine/definition/component/ComponentsFromProvidersExtractor.scala
@@ -68,11 +68,11 @@ object Components {
     }
   )
 
-  sealed trait ComponentDefinitionExtractionMode
+  sealed abstract class ComponentDefinitionExtractionMode(val extractBasicDefinitions: Boolean)
 
   object ComponentDefinitionExtractionMode {
-    case object FinalDefinition          extends ComponentDefinitionExtractionMode
-    case object FinalAndBasicDefinitions extends ComponentDefinitionExtractionMode
+    case object FinalDefinition          extends ComponentDefinitionExtractionMode(false)
+    case object FinalAndBasicDefinitions extends ComponentDefinitionExtractionMode(true)
   }
 
   def withComponent(
@@ -100,17 +100,14 @@ object Components {
         )
     }
 
-    val finalDefinitions = extractComponentDefinition(componentsUiConfig, additionalConfigsFromProvider)
-    componentDefinitionExtractionMode match {
-      case ComponentDefinitionExtractionMode.FinalDefinition =>
-        Components(components = finalDefinitions.toList, basicComponents = None)
-      case ComponentDefinitionExtractionMode.FinalAndBasicDefinitions =>
-        Components(
-          components = finalDefinitions.toList,
-          basicComponents =
-            Some(extractComponentDefinition(uiConfig = ComponentsUiConfig.Empty, configFromProvider = Map.empty).toList)
-        )
-    }
+    Components(
+      components = extractComponentDefinition(componentsUiConfig, additionalConfigsFromProvider).toList,
+      basicComponents =
+        if (componentDefinitionExtractionMode.extractBasicDefinitions)
+          Some(extractComponentDefinition(uiConfig = ComponentsUiConfig.Empty, configFromProvider = Map.empty).toList)
+        else
+          None
+    )
   }
 
   def forList(
@@ -120,28 +117,29 @@ object Components {
       additionalConfigsFromProvider: Map[DesignerWideComponentId, ComponentAdditionalConfig],
       componentDefinitionExtractionMode: ComponentDefinitionExtractionMode
   ): Components = {
-    val componentsWithAdditionalConfig = ComponentDefinitionWithImplementation.forList(
-      components,
-      componentsUiConfig,
-      determineDesignerWideId,
-      additionalConfigsFromProvider
-    )
-    componentDefinitionExtractionMode match {
-      case ComponentDefinitionExtractionMode.FinalDefinition =>
-        Components(components = componentsWithAdditionalConfig, basicComponents = None)
-      case ComponentDefinitionExtractionMode.FinalAndBasicDefinitions =>
-        Components(
-          components = componentsWithAdditionalConfig,
-          basicComponents = Some(
-            ComponentDefinitionWithImplementation.forList(
-              components,
-              componentsUiConfig,
-              determineDesignerWideId,
-              additionalConfigsFromProvider = Map.empty
-            )
-          )
-        )
+
+    def extractComponentDefinitions(
+        uiConfig: ComponentsUiConfig,
+        configFromProvider: Map[DesignerWideComponentId, ComponentAdditionalConfig]
+    ) = {
+      ComponentDefinitionWithImplementation.forList(
+        components,
+        uiConfig,
+        determineDesignerWideId,
+        configFromProvider
+      )
     }
+
+    Components(
+      components = extractComponentDefinitions(componentsUiConfig, additionalConfigsFromProvider).toList,
+      basicComponents =
+        if (componentDefinitionExtractionMode.extractBasicDefinitions)
+          Some(
+            extractComponentDefinitions(uiConfig = ComponentsUiConfig.Empty, configFromProvider = Map.empty).toList
+          )
+        else
+          None
+    )
   }
 
   def combine(x: Components, y: Components): Components = {