Skip to content

Commit 706061a

Browse files
committed
NodeValidator: removed MissingParameters handling
1 parent d714b60 commit 706061a

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
lines changed

designer/server/src/main/scala/pl/touk/nussknacker/ui/validation/NodeValidator.scala

+2-12
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import cats.effect.SyncIO
44
import cats.effect.kernel.Resource
55
import pl.touk.nussknacker.engine.{ModelData, ScenarioCompilationDependencies}
66
import pl.touk.nussknacker.engine.api.{JobData, ProcessVersion}
7-
import pl.touk.nussknacker.engine.api.context.{ProcessCompilationError, ValidationContext}
8-
import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.MissingParameters
7+
import pl.touk.nussknacker.engine.api.context.ValidationContext
98
import pl.touk.nussknacker.engine.api.definition.EngineScenarioCompilationDependencies
109
import pl.touk.nussknacker.engine.api.typed.typing.TypingResult
1110
import pl.touk.nussknacker.engine.compile.FragmentResolver
@@ -67,16 +66,7 @@ class NodeValidator(
6766
)
6867
case ValidationPerformed(errors, parameters, expressionType) =>
6968
val uiParams = parameters.map(_.map(DefinitionsService.createUIParameter))
70-
71-
// We don't return MissingParameter error when we are returning those missing parameters to be added - since
72-
// it's not really exception ATM
73-
def shouldIgnoreError(pce: ProcessCompilationError): Boolean = pce match {
74-
case MissingParameters(params, _) =>
75-
params.forall(missing => uiParams.exists(_.exists(_.name == missing.value)))
76-
case _ => false
77-
}
78-
79-
val uiErrors = errors.filterNot(shouldIgnoreError).map(PrettyValidationErrors.formatErrorMessage)
69+
val uiErrors = errors.map(PrettyValidationErrors.formatErrorMessage)
8070
NodeValidationResult(
8171
parameters = uiParams,
8272
expressionType = expressionType,

scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/NodeParametersAdjuster.scala

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package pl.touk.nussknacker.engine.compile
22

33
import cats.Id
4-
import cats.data.{NonEmptySet, WriterT}
5-
import cats.data.Validated.valid
4+
import cats.data.WriterT
65
import cats.implicits.toTraverseOps
7-
import cats.instances.set
86
import com.typesafe.scalalogging.LazyLogging
97
import pl.touk.nussknacker.engine.api.{JobData, NodeId}
10-
import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.MissingParameters
118
import pl.touk.nussknacker.engine.api.definition.{Parameter => ParameterDefinition}
129
import pl.touk.nussknacker.engine.api.parameter.ParameterName
1310
import pl.touk.nussknacker.engine.graph.evaluatedparam.{Parameter => NodeParameter}

scenario-compiler/src/main/scala/pl/touk/nussknacker/engine/compile/nodecompilation/DynamicNodeValidator.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import cats.data.ValidatedNel
55
import cats.instances.list._
66
import com.typesafe.scalalogging.LazyLogging
77
import pl.touk.nussknacker.engine.{ModelData, ScenarioCompilationDependencies}
8-
import pl.touk.nussknacker.engine.api.{JobData, NodeId}
8+
import pl.touk.nussknacker.engine.api.NodeId
99
import pl.touk.nussknacker.engine.api.component.ParameterConfig
1010
import pl.touk.nussknacker.engine.api.context._
1111
import pl.touk.nussknacker.engine.api.context.ProcessCompilationError.MissingParameters

0 commit comments

Comments
 (0)