feat(validation): enhance error handling and rendering in validation …

…components
cheleb · Nov 29, 2024 · f30c392 · f30c392
1 parent ddb2489
commit f30c392
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 20 deletions.
diff --git a/examples/client/src/main/scala/samples/Validation.scala b/examples/client/src/main/scala/samples/Validation.scala
@@ -59,25 +59,10 @@ val validation = {
     )
   )
 
-  val errorBus = ironSampleVar.errorBus
-
   Sample(
     "Validation",
     div(
-      ironSampleVar.asForm(errorBus),
-      div(
-        child <-- errorBus.watch
-          .map { errors =>
-            div(
-              errors.collect {
-                case (field, ValidationStatus.Invalid(message, true)) =>
-                  div(
-                    s"$field: $message"
-                  )
-              }.toSeq
-            )
-          }
-      )
+      ironSampleVar.asForm
     ),
     div(
       child <-- ironSampleVar.signal.map { item =>

diff --git a/modules/core/src/main/scala/dev/cheleb/scalamigen/Form.scala b/modules/core/src/main/scala/dev/cheleb/scalamigen/Form.scala
@@ -13,13 +13,24 @@ import java.time.LocalDate
 import io.github.iltotore.iron.*
 
 import config.PanelConfig
+import com.raquo.airstream.core.Signal
 
+/** Extension method for path: List[Symbol]
+  */
 extension (path: List[Symbol])
+  /** Get the key of the path.
+    *
+    * This key is used to identify the field in the error bus.
+    */
   def key: String =
     path.map(_.name).mkString(".")
 
 extension (errorBus: EventBus[(String, ValidationEvent)])
-  def watch = errorBus.events
+  /** Watch the error bus and return a signal of the errors.
+    *
+    * @return
+    */
+  def watch: Signal[Map[String, ValidationStatus]] = errorBus.events
     .scanLeft(Map.empty[String, ValidationStatus]) {
       case (acc, (field, event)) =>
         event match
@@ -42,6 +53,21 @@ extension (errorBus: EventBus[(String, ValidationEvent)])
             }
     }
 
+  /** Render the errors.
+    *
+    * @param f
+    * @return
+    */
+  def errors(f: (String, String) => HtmlElement) =
+    errorBus.watch.map { errors =>
+      div(
+        errors.collect {
+          case (field, ValidationStatus.Invalid(message, true)) =>
+            f(field, message)
+        }.toSeq
+      )
+    }
+
 /** A form for a type A.
   */
 trait Form[A] { self =>

diff --git a/modules/core/src/main/scala/dev/cheleb/scalamigen/package.scala b/modules/core/src/main/scala/dev/cheleb/scalamigen/package.scala
@@ -143,9 +143,18 @@ extension [A](va: Var[A])
       Form[A]
   ): ReactiveHtmlElement[HTMLElement] = {
     val errorBus = new EventBus[(String, ValidationEvent)]()
-    Form
-      .renderVar(va, () => ())(using wf, errorBus)
-      .amend(cls := "srf-form")
+    div(
+      Form
+        .renderVar(va, () => ())(using wf, errorBus)
+        .amend(cls := "srf-form"),
+      child <-- errorBus
+        .errors((field, message) =>
+          div(
+            s"$field: $message"
+          )
+        )
+    )
+
   }
 
   /** Render a form for the variable.