WIP: Modular validation in teal and teal_modules

DESCRIPTION

@@ -116,10 +116,10 @@ Collate:
     'module_session_info.R'
     'module_snapshot_manager.R'
     'module_teal.R'
-    'module_teal_data.R'
     'module_teal_lockfile.R'
     'module_teal_with_splash.R'
     'module_transform_data.R'
+    'module_validate.R'
     'reporter_previewer_module.R'
     'show_rcode_modal.R'
     'tdata.R'

R/module_init_data.R

@@ -20,7 +20,7 @@
 #' lies in data control: the first method involves external control, while the second method
 #' involves control from a custom module within the app.
 #'
-#' For more details, see [`module_teal_data`].
+#' For more details, see [`teal_data_module`].
 #'
 #' @inheritParams module_teal
 #'

R/module_nested_tabs.R

@@ -95,22 +95,9 @@ ui_teal_module.teal_module <- function(id, modules, depth = 0L) {
   args <- c(list(id = ns("module")), modules$ui_args)
 
   ui_teal <- tags$div(
-    shinyjs::hidden(
-      tags$div(
-        id = ns("transform_failure_info"),
-        class = "teal_validated",
-        div(
-          class = "teal-output-warning",
-          "One of transformators failed. Please check its inputs."
-        )
-      )
-    ),
+    ui_module_validate(ns("validation")),
     tags$div(
       id = ns("teal_module_ui"),
-      tags$div(
-        class = "teal_validated",
-        ui_check_module_datanames(ns("validate_datanames"))
-      ),
       do.call(what = modules$ui, args = args, quote = TRUE)
     )
   )
@@ -348,29 +335,27 @@ srv_teal_module.teal_module <- function(id,
         any(unlist(reactiveValuesToList(is_transform_failed)))
       })
 
-      observeEvent(any_transform_failed(), {
-        if (isTRUE(any_transform_failed())) {
-          shinyjs::hide("teal_module_ui")
-          shinyjs::show("transform_failure_info")
-        } else {
-          shinyjs::show("teal_module_ui")
-          shinyjs::hide("transform_failure_info")
-        }
-      })
-
       module_teal_data <- reactive({
         req(inherits(transformed_teal_data(), "teal_data"))
         all_teal_data <- transformed_teal_data()
         module_datanames <- .resolve_module_datanames(data = all_teal_data, modules = modules)
         all_teal_data[c(module_datanames, ".raw_data")]
       })
 
-      srv_check_module_datanames(
-        "validate_datanames",
-        data = module_teal_data,
-        modules = modules
+      srv_module_validate_datanames(
+        "validation",
+        x = module_teal_data,
+        modules = modules,
+        show_warn = any_transform_failed,
+        message_warn = "One of the transformators failed. Please check its inputs."
       )
 
+      observe({ # Blur and disable main module UI when there are errors with reactive teal_data
+        shinyjs::show("teal_module_ui")
+        shinyjs::toggleClass("teal_module_ui", "blurred", condition = any_transform_failed())
+        shinyjs::toggleState("teal_module_ui", condition = !any_transform_failed())
+      })
+
       summary_table <- srv_data_summary("data_summary", module_teal_data)
 
       observeEvent(input$data_summary_toggle, {

R/module_teal.R

@@ -136,16 +136,10 @@ srv_teal <- function(id, data, modules, filter = teal_slices()) {
 
     data_handled <- srv_init_data("data", data = data)
 
-    validate_ui <- tags$div(
-      id = session$ns("validate_messages"),
-      class = "teal_validated",
-      ui_check_class_teal_data(session$ns("class_teal_data")),
-      ui_validate_error(session$ns("silent_error")),
-      ui_check_module_datanames(session$ns("datanames_warning"))
+    validate_ui <- ui_module_validate(session$ns("validation"))
+    srv_module_validate_teal_module(
+      "validation", x = data_handled, validate_shiny_silent_error = FALSE, modules = modules
     )
-    srv_check_class_teal_data("class_teal_data", data_handled)
-    srv_validate_error("silent_error", data_handled, validate_shiny_silent_error = FALSE)
-    srv_check_module_datanames("datanames_warning", data_handled, modules)
 
     data_validated <- .trigger_on_success(data_handled)
 
@@ -181,8 +175,6 @@ srv_teal <- function(id, data, modules, filter = teal_slices()) {
       })
     }
 
-
-
     if (inherits(data, "teal_data_module")) {
       setBookmarkExclude(c("teal_modules-active_tab"))
       bslib::nav_insert(
@@ -192,10 +184,7 @@ srv_teal <- function(id, data, modules, filter = teal_slices()) {
         bslib::nav_panel(
           title = icon("fas fa-database"),
           value = "teal_data_module",
-          tags$div(
-            ui_init_data(session$ns("data")),
-            validate_ui
-          )
+          tags$div(validate_ui, ui_init_data(session$ns("data")))
         )
       )
 
@@ -234,3 +223,15 @@ srv_teal <- function(id, data, modules, filter = teal_slices()) {
 
   invisible(NULL)
 }
+
+.trigger_on_success <- function(data) {
+  out <- reactiveVal(NULL)
+  observeEvent(data(), {
+    if (inherits(data(), "teal_data")) {
+      if (!identical(data(), out())) {
+        out(data())
+      }
+    }
+  })
+  out
+}