Finished refactor for ScenarioPropertiesConfig as domain object

TouK · Aug 13, 2024 · ff3f437 · ff3f437
1 parent 9ed401a
commit ff3f437
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 13 deletions.
diff --git a/...i/src/main/scala/pl/touk/nussknacker/engine/api/properties/ScenarioPropertiesConfig.scala b/...i/src/main/scala/pl/touk/nussknacker/engine/api/properties/ScenarioPropertiesConfig.scala
@@ -6,7 +6,14 @@ import pl.touk.nussknacker.engine.api.component.ScenarioPropertiesParameterConfi
 @JsonCodec case class ScenarioPropertiesConfig(
     parameterConfig: Map[String, ScenarioPropertiesParameterConfig],
     docsIconConfig: Option[ScenarioPropertiesDocsUrlConfig]
-)
+) {
+
+  // it will overwrite docsIcon, with the approach that the latest config is the proper one.
+  def ++(newConfig: ScenarioPropertiesConfig): ScenarioPropertiesConfig = {
+    this.copy(parameterConfig = this.parameterConfig ++ newConfig.parameterConfig, newConfig.docsIconConfig)
+  }
+
+}
 
 object ScenarioPropertiesConfig {
   def empty(): ScenarioPropertiesConfig = { ScenarioPropertiesConfig(Map.empty, None) }

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
@@ -78,7 +78,7 @@ class DefinitionsService(
           (if (forFragment) FragmentPropertiesConfig.properties else finalizedScenarioPropertiesConfig.parameterConfig)
             .mapValuesNow(createUIScenarioAdditionalFieldConfig),
         docsUrlIconConfig = finalizedScenarioPropertiesConfig.docsIconConfig.map(config =>
-          ScenarioPropertiesDocsUrlIconConfig(config.docsUrl, config.docsIconPath)
+          ScenarioPropertiesDocsUrlIconConfig(config.docsUrl, config.docsUrl)
         )
       ),
       edgesForNodes = EdgeTypesPreparer.prepareEdgeTypes(components.map(_.component)),

diff --git a/...ver/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/ProcessingTypeData.scala b/...ver/src/main/scala/pl/touk/nussknacker/ui/process/processingtype/ProcessingTypeData.scala
@@ -1,6 +1,7 @@
 package pl.touk.nussknacker.ui.process.processingtype
 
 import com.typesafe.config.Config
+import net.ceedubs.ficus.readers.ArbitraryTypeReader.arbitraryTypeValueReader
 import pl.touk.nussknacker.engine._
 import pl.touk.nussknacker.engine.api.component.ScenarioPropertiesParameterConfig
 import pl.touk.nussknacker.engine.api.deployment.cache.ScenarioStateCachingConfig
@@ -98,15 +99,16 @@ object ProcessingTypeData {
         deploymentConfig,
         scenarioStateCacheTTL
       )
-    val scenarioProperties = ScenarioPropertiesConfig(
-      deploymentManagerProvider.scenarioPropertiesConfig(deploymentConfig) ++ modelData.modelConfig
-        .getOrElse[Map[ProcessingType, ScenarioPropertiesConfig]]("scenarioPropertiesConfig", Map.empty),
-      modelData.)
 
+    val modelScenarioProps = modelData.modelConfig
+      .getOrElse[ScenarioPropertiesConfig]("scenarioPropertiesConfig", ScenarioPropertiesConfig.empty())
+
+    val runtimeScenarioProps =
+      deploymentManagerProvider.scenarioPropertiesConfig(deploymentConfig) ++ modelScenarioProps
     DeploymentData(
       validDeploymentManager,
       metaDataInitializer,
-      scenarioProperties,
+      runtimeScenarioProps,
       deploymentManagerProvider.additionalValidators(deploymentConfig),
       DeploymentManagerType(deploymentManagerProvider.name),
       engineSetupName

diff --git a/...gner/server/src/main/scala/pl/touk/nussknacker/ui/server/AkkaHttpBasedRouteProvider.scala b/...gner/server/src/main/scala/pl/touk/nussknacker/ui/server/AkkaHttpBasedRouteProvider.scala
@@ -160,7 +160,7 @@ class AkkaHttpBasedRouteProvider(
         val validator = new UIProcessValidator(
           processingTypeData.name,
           ProcessValidator.default(processingTypeData.designerModelData.modelData),
-          processingTypeData.deploymentData.scenarioPropertiesConfig,
+          processingTypeData.deploymentData.scenarioPropertiesConfig.parameterConfig,
           new ScenarioPropertiesConfigFinalizer(additionalUIConfigProvider, processingTypeData.name),
           processingTypeData.deploymentData.additionalValidators,
           fragmentResolver
@@ -237,7 +237,7 @@ class AkkaHttpBasedRouteProvider(
       val newProcessPreparer = processingTypeDataProvider.mapValues { processingTypeData =>
         new NewProcessPreparer(
           processingTypeData.deploymentData.metaDataInitializer,
-          processingTypeData.deploymentData.scenarioPropertiesConfig,
+          processingTypeData.deploymentData.scenarioPropertiesConfig.parameterConfig,
           new ScenarioPropertiesConfigFinalizer(additionalUIConfigProvider, processingTypeData.name),
         )
       }
@@ -336,10 +336,16 @@ class AkkaHttpBasedRouteProvider(
           new NodeValidator(v.designerModelData.modelData, fragmentRepository)
         ),
         processingTypeToExpressionSuggester = processingTypeDataProvider.mapValues(v =>
-          ExpressionSuggester(v.designerModelData.modelData, v.deploymentData.scenarioPropertiesConfig.keys)
+          ExpressionSuggester(
+            v.designerModelData.modelData,
+            v.deploymentData.scenarioPropertiesConfig.parameterConfig.keys
+          )
         ),
         processingTypeToParametersValidator = processingTypeDataProvider.mapValues(v =>
-          new ParametersValidator(v.designerModelData.modelData, v.deploymentData.scenarioPropertiesConfig.keys)
+          new ParametersValidator(
+            v.designerModelData.modelData,
+            v.deploymentData.scenarioPropertiesConfig.parameterConfig.keys
+          )
         ),
         scenarioService = processService
       )

diff --git a/...gner/server/src/test/scala/pl/touk/nussknacker/ui/definition/DefinitionsServiceSpec.scala b/...gner/server/src/test/scala/pl/touk/nussknacker/ui/definition/DefinitionsServiceSpec.scala
@@ -10,6 +10,7 @@ import pl.touk.nussknacker.engine.api.definition._
 import pl.touk.nussknacker.engine.api.editor._
 import pl.touk.nussknacker.engine.api.parameter.ParameterName
 import pl.touk.nussknacker.engine.api.process.{EmptyProcessConfigCreator, ProcessObjectDependencies, WithCategories}
+import pl.touk.nussknacker.engine.api.properties.ScenarioPropertiesConfig
 import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess
 import pl.touk.nussknacker.engine.definition.component.bultin.BuiltInComponentsDefinitionsPreparer
 import pl.touk.nussknacker.engine.definition.fragment.FragmentComponentDefinitionExtractor
@@ -280,7 +281,7 @@ class DefinitionsServiceSpec extends AnyFunSuite with Matchers with PatientScala
     new DefinitionsService(
       modelData = model,
       staticDefinitionForDynamicComponents = Map.empty,
-      scenarioPropertiesConfig = Map.empty,
+      scenarioPropertiesConfig = ScenarioPropertiesConfig.empty(),
       deploymentManager = new MockDeploymentManager,
       alignedComponentsDefinitionProvider = alignedComponentsDefinitionProvider,
       scenarioPropertiesConfigFinalizer =

diff --git a/...st/scala/pl/touk/nussknacker/ui/process/processingtype/ProcessingTypeDataReaderSpec.scala b/...st/scala/pl/touk/nussknacker/ui/process/processingtype/ProcessingTypeDataReaderSpec.scala
@@ -8,6 +8,7 @@ import pl.touk.nussknacker.engine._
 import pl.touk.nussknacker.engine.api.StreamMetaData
 import pl.touk.nussknacker.engine.api.component.ProcessingMode
 import pl.touk.nussknacker.engine.api.process.ProcessingType
+import pl.touk.nussknacker.engine.api.properties.ScenarioPropertiesConfig
 import pl.touk.nussknacker.engine.deployment.EngineSetupName
 import pl.touk.nussknacker.engine.testing.LocalModelData
 import pl.touk.nussknacker.engine.util.Implicits.RichScalaMap
@@ -118,7 +119,7 @@ class ProcessingTypeDataReaderSpec extends AnyFunSuite with Matchers {
         DeploymentData(
           valid(new MockDeploymentManager),
           MetaDataInitializer(StreamMetaData.typeName),
-          Map.empty,
+          ScenarioPropertiesConfig.empty(),
           List.empty,
           DeploymentManagerType(deploymentManagerProvider.name),
           engineSetupName