1299 extend extra_datanames check with names from transformers

R/init.R

@@ -219,8 +219,8 @@ init <- function(data,
     }
 
     is_modules_ok <- check_modules_datanames(modules, .teal_data_datanames(data))
-    if (!isTRUE(is_modules_ok)) {
-      lapply(is_modules_ok$string, logger::log_warn)
+    if (!isTRUE(is_modules_ok) && length(unlist(extract_transformers(modules))) == 0) {
+      lapply(is_modules_ok$string, warning, call. = FALSE)
     }
 
     is_filter_ok <- check_filter_datanames(filter, .teal_data_datanames(data))

R/module_teal_data.R

@@ -162,7 +162,7 @@ srv_validate_reactive_teal_data <- function(id, # nolint: object_length
     output$shiny_warnings <- renderUI({
       if (inherits(data_out_rv(), "teal_data")) {
         is_modules_ok <- check_modules_datanames(modules = modules, datanames = .teal_data_ls(data_validated()))
-        if (!isTRUE(is_modules_ok)) {
+        if (!isTRUE(is_modules_ok) && length(unlist(extract_transformers(modules))) == 0) {
           tags$div(
             is_modules_ok$html(
               # Show modules prefix on message only in teal_data_module tab

R/teal_data_module.R

@@ -129,3 +129,17 @@ teal_transform_module <- function(ui, server, label = "transform module") {
     class = c("teal_transform_module", "teal_data_module")
   )
 }
+
+
+#' Extract all `transformers` from `modules`.
+#'
+#' @param modules `teal_modules` or `teal_module`
+#' @return A list of `teal_transform_module` nested in the same way as input `modules`.
+#' @keywords internal
+extract_transformers <- function(modules) {
+  if (inherits(modules, "teal_module")) {
+    modules$transformers
+  } else if (inherits(modules, "teal_modules")) {
+    lapply(modules$children, extract_transformers)
+  }
+}

R/utils.R

@@ -140,7 +140,10 @@ check_modules_datanames <- function(modules, datanames) {
         }
       )
     } else {
-      extra_datanames <- setdiff(modules$datanames, c("all", datanames))
+      extra_datanames <- unique(c(
+        setdiff(modules$datanames, c("all", datanames)),
+        setdiff(unlist(lapply(modules$transformers, function(x) x$datanames)), c("all", datanames))
+      ))
       if (length(extra_datanames)) {
         list(
           string = build_datanames_error_message(

tests/testthat/test-init.R

@@ -56,17 +56,44 @@ testthat::test_that("init throws when an empty `data` is used", {
   )
 })
 
-testthat::test_that("init throws warning when datanames in modules incompatible w/ datanames in data", {
-  testthat::local_mocked_bindings(log_warn = warning, .package = "logger")
+testthat::test_that(
+  "init throws warning when datanames in modules incompatible w/ datanames in data and there is no transformers",
+  {
+    testthat::expect_warning(
+      init(
+        data = teal.data::teal_data(mtcars = mtcars),
+        modules = list(example_module(datanames = "iris"))
+      ),
+      "Dataset \"iris\" is missing for tab 'example teal module'. Dataset available in data: \"mtcars\"."
+    )
+  }
+)
 
-  testthat::expect_warning(
-    init(
-      data = teal.data::teal_data(mtcars = mtcars),
-      modules = list(example_module(datanames = "iris"))
-    ),
-    "Dataset \"iris\" is missing for tab 'example teal module'. Dataset available in data: \"mtcars\"."
-  )
-})
+testthat::test_that(
+  "init does not throw warning when datanames in modules incompatible w/ datanames in data and there are transformers",
+  {
+    testthat::expect_no_warning(
+      init(
+        data = teal.data::teal_data(mtcars = mtcars),
+        modules = list(
+          example_module(
+            datanames = "iris",
+            transformers = list(
+              teal_transform_module(
+                ui = function(id) NULL,
+                server = function(id, data) {
+                  moduleServer(id, function(input, output, session) {
+                    NULL
+                  })
+                }
+              )
+            )
+          )
+        )
+      )
+    )
+  }
+)
 
 testthat::test_that("init throws when dataname in filter incompatible w/ datanames in data", {
   testthat::expect_warning(

tests/testthat/test-module_teal.R

@@ -520,6 +520,42 @@ testthat::describe("srv_teal teal_modules", {
     )
   })
 
+  testthat::it("does not throw a warning when datanames are insufficient but transformers are provided", {
+    testthat::skip_if_not_installed("rvest")
+    shiny::testServer(
+      app = srv_teal,
+      args = list(
+        id = "test",
+        data = teal_data(mtcars = mtcars),
+        modules = modules(
+          module(
+            "module_1",
+            server = function(id, data) data,
+            datanames = c("iris"),
+            transformers = list(
+              teal_transform_module(
+                ui = function(id) NULL,
+                server = function(id, data) {
+                  moduleServer(id, function(input, output, session) {
+                    reactive({
+                      NULL
+                    })
+                  })
+                }
+              )
+            )
+          )
+        )
+      ),
+      expr = {
+        session$setInputs(`teal_modules-active_tab` = "module_1")
+        testthat::expect_null(
+          output[["teal_modules-module_1-validate_datanames-shiny_warnings"]]
+        )
+      }
+    )
+  })
+
   testthat::it("is called and receives data even if datanames in `teal_data` are not sufficient", {
     data <- teal_data(iris = iris)
     teal.data::datanames(data) <- "iris"