Transformer called too early

R/module_nested_tabs.R

@@ -252,7 +252,7 @@ srv_teal_module.teal_module <- function(id,
     #   and if it is not set, then it won't be available in the srv_filter_panel
     srv_module_filter_manager(modules$label, module_fd = datasets, slices_global = slices_global)
 
-    call_once_when(is_active(), {
+    .call_once_when(is_active(), {
       filtered_teal_data <- srv_filter_data(
         "filter_panel",
         datasets = datasets,
@@ -299,7 +299,7 @@ srv_teal_module.teal_module <- function(id,
 
       # Call modules.
       if (!inherits(modules, "teal_module_previewer")) {
-        obs_module <- call_once_when(
+        obs_module <- .call_once_when(
           !is.null(module_teal_data()),
           ignoreNULL = TRUE,
           handlerExpr = {
@@ -372,11 +372,11 @@ srv_teal_module.teal_module <- function(id,
 #' @return An observer.
 #'
 #' @keywords internal
-call_once_when <- function(eventExpr, # nolint: object_name.
-                           handlerExpr, # nolint: object_name.
-                           event.env = parent.frame(), # nolint: object_name.
-                           handler.env = parent.frame(), # nolint: object_name.
-                           ...) {
+.call_once_when <- function(eventExpr, # nolint: object_name.
+                            handlerExpr, # nolint: object_name.
+                            event.env = parent.frame(), # nolint: object_name.
+                            handler.env = parent.frame(), # nolint: object_name.
+                            ...) {
   event_quo <- rlang::new_quosure(substitute(eventExpr), env = event.env)
   handler_quo <- rlang::new_quosure(substitute(handlerExpr), env = handler.env)
 

R/module_transform_data.R

@@ -91,59 +91,77 @@ srv_transform_teal_data <- function(id, data, transformators, modules = NULL, is
     module_output <- Reduce(
       function(data_previous, name) {
         moduleServer(name, function(input, output, session) {
-          logger::log_debug("srv_transform_teal_data initializing for { name }.")
-          is_transform_failed[[name]] <- FALSE
-          data_out <- transformators[[name]]$server("transform", data = data_previous)
-          data_handled <- reactive(tryCatch(data_out(), error = function(e) e))
-          observeEvent(data_handled(), {
-            if (inherits(data_handled(), "teal_data")) {
-              is_transform_failed[[name]] <- FALSE
-            } else {
-              is_transform_failed[[name]] <- TRUE
-            }
-          })
+          logger::log_debug("srv_transform_teal_data@1 initializing module for { name }.")
 
-          is_previous_failed <- reactive({
-            idx_this <- which(names(is_transform_failed) == name)
-            is_transform_failed_list <- reactiveValuesToList(is_transform_failed)
-            idx_failures <- which(unlist(is_transform_failed_list))
-            any(idx_failures < idx_this)
-          })
+          data_out <- reactiveVal()
+          .call_once_when(inherits(data_previous(), "teal_data"), {
+            logger::log_debug("srv_teal_transform_teal_data@2 triggering a transform module call for { name }.")
+            data_unhandled <- transformators[[name]]$server("transform", data = data_previous)
+            data_handled <- reactive(tryCatch(data_unhandled(), error = function(e) e))
 
-          srv_validate_error("silent_error", data_handled, validate_shiny_silent_error = FALSE)
-          srv_check_class_teal_data("class_teal_data", data_handled)
-          if (!is.null(modules)) {
-            srv_check_module_datanames("datanames_warning", data_handled, modules)
-          }
+            observeEvent(data_handled(), {
+              if (inherits(data_handled(), "teal_data")) {
+                if (!identical(data_handled(), data_out())) {
+                  data_out(data_handled())
+                }
+              }
+            })
 
-          # When there is no UI (`ui = NULL`) it should still show the errors
-          observe({
-            if (!inherits(data_handled(), "teal_data") && !is_previous_failed()) {
-              shinyjs::show("wrapper")
-            }
-          })
+            is_transform_failed[[name]] <- FALSE
+            observeEvent(data_handled(), {
+              if (inherits(data_handled(), "teal_data")) {
+                is_transform_failed[[name]] <- FALSE
+              } else {
+                is_transform_failed[[name]] <- TRUE
+              }
+            })
 
-          transform_wrapper_id <- sprintf("wrapper_%s", name)
-          output$error_wrapper <- renderUI({
-            if (is_previous_failed()) {
-              shinyjs::disable(transform_wrapper_id)
-              tags$div("One of previous transformators failed. Please check its inputs.", class = "teal-output-warning")
-            } else {
-              shinyjs::enable(transform_wrapper_id)
-              shiny::tagList(
-                ui_validate_error(session$ns("silent_error")),
-                ui_check_class_teal_data(session$ns("class_teal_data")),
-                ui_check_module_datanames(session$ns("datanames_warning"))
-              )
+            is_previous_failed <- reactive({
+              idx_this <- which(names(is_transform_failed) == name)
+              is_transform_failed_list <- reactiveValuesToList(is_transform_failed)
+              idx_failures <- which(unlist(is_transform_failed_list))
+              any(idx_failures < idx_this)
+            })
+
+            srv_validate_error("silent_error", data_handled, validate_shiny_silent_error = FALSE)
+            srv_check_class_teal_data("class_teal_data", data_handled)
+            if (!is.null(modules)) {
+              srv_check_module_datanames("datanames_warning", data_handled, modules)
             }
+
+            # When there is no UI (`ui = NULL`) it should still show the errors
+            observe({
+              if (!inherits(data_handled(), "teal_data") && !is_previous_failed()) {
+                shinyjs::show("wrapper")
+              }
+            })
+
+            transform_wrapper_id <- sprintf("wrapper_%s", name)
+            output$error_wrapper <- renderUI({
+              if (is_previous_failed()) {
+                shinyjs::disable(transform_wrapper_id)
+                tags$div(
+                  "One of previous transformators failed. Please check its inputs.",
+                  class = "teal-output-warning"
+                )
+              } else {
+                shinyjs::enable(transform_wrapper_id)
+                shiny::tagList(
+                  ui_validate_error(session$ns("silent_error")),
+                  ui_check_class_teal_data(session$ns("class_teal_data")),
+                  ui_check_module_datanames(session$ns("datanames_warning"))
+                )
+              }
+            })
           })
 
-          .trigger_on_success(data_handled)
+          data_out
         })
       },
       x = names(transformators),
       init = data
     )
+
     module_output
   })
 }