1304 handover error@main

NAMESPACE

@@ -10,7 +10,6 @@ S3method(srv_teal_module,default)
 S3method(srv_teal_module,teal_module)
 S3method(srv_teal_module,teal_modules)
 S3method(ui_teal_module,default)
-S3method(ui_teal_module,shiny.tag)
 S3method(ui_teal_module,teal_module)
 S3method(ui_teal_module,teal_modules)
 S3method(within,teal_data_module)

R/init.R

@@ -238,7 +238,6 @@ init <- function(data,
     ui = function(request) {
       ui_teal(
         id = ns("teal"),
-        data = if (inherits(data, "teal_data_module")) data,
         modules = modules,
         title = title,
         header = header,

R/module_filter_data.R

@@ -61,7 +61,7 @@ srv_filter_data <- function(id, datasets, active_datanames, data_rv, is_active)
       "lockEnvironment(.raw_data) #@linksto .raw_data" # this is environment and it is shared by qenvs. CAN'T MODIFY!
     )
   )
-  filtered_code <- teal.slice::get_filter_expr(datasets = datasets, datanames = datanames)
+  filtered_code <- .get_filter_expr(datasets = datasets, datanames = datanames)
   filtered_teal_data <- .append_evaluated_code(data, filtered_code)
   filtered_datasets <- sapply(datanames, function(x) datasets$get_data(x, filtered = TRUE), simplify = FALSE)
   filtered_teal_data <- .append_modified_data(filtered_teal_data, filtered_datasets)
@@ -75,7 +75,7 @@ srv_filter_data <- function(id, datasets, active_datanames, data_rv, is_active)
     req(inherits(datasets(), "FilteredData"))
     new_signature <- c(
       teal.data::get_code(data_rv()),
-      teal.slice::get_filter_expr(datasets = datasets(), datanames = active_datanames())
+      .get_filter_expr(datasets = datasets(), datanames = active_datanames())
     )
     if (!identical(previous_signature(), new_signature)) {
       previous_signature(new_signature)
@@ -100,3 +100,12 @@ srv_filter_data <- function(id, datasets, active_datanames, data_rv, is_active)
 
   trigger_data
 }
+
+#' @rdname module_filter_data
+.get_filter_expr <- function(datasets, datanames) {
+  if (length(datanames)) {
+    teal.slice::get_filter_expr(datasets = datasets, datanames = datanames)
+  } else {
+    NULL
+  }
+}

R/module_init_data.R

@@ -25,119 +25,67 @@
 #' @inheritParams init
 #'
 #' @param data (`teal_data`, `teal_data_module`, or `reactive` returning `teal_data`)
-#' The `ui` component of this module does not require `data` if `teal_data_module` is not provided.
-#' The `data` argument in the `ui` is included solely for the `$ui` function of the
-#' `teal_data_module`. Otherwise, it can be disregarded, ensuring that `ui_teal` does not depend on
-#' the reactive data of the enclosing application.
+#' The data which application will depend on.
 #'
 #' @return A `reactive` object that returns:
-#' - `teal_data` when the object is validated
-#' - `shiny.silent.error` when not validated.
+#' Output of the `data`. If `data` fails then returned error is handled (after [tryCatch()]) so that
+#' rest of the application can respond to this respectively.
 #'
 #' @rdname module_init_data
 #' @name module_init_data
 #' @keywords internal
 NULL
 
 #' @rdname module_init_data
-ui_init_data <- function(id, data) {
+ui_init_data <- function(id) {
   ns <- shiny::NS(id)
   shiny::div(
     id = ns("content"),
-    style = "display: inline-block;",
-    if (inherits(data, "teal_data_module")) {
-      ui_teal_data(ns("teal_data_module"), data_module = data)
-    } else {
-      NULL
-    }
+    style = "display: inline-block; width: 100%;",
+    uiOutput(ns("data"))
   )
 }
 
 #' @rdname module_init_data
-srv_init_data <- function(id, data, modules, filter = teal_slices()) {
+srv_init_data <- function(id, data) {
   checkmate::assert_character(id, max.len = 1, any.missing = FALSE)
-  checkmate::assert_multi_class(data, c("teal_data", "teal_data_module", "reactive", "reactiveVal"))
-  checkmate::assert_class(modules, "teal_modules")
-  checkmate::assert_class(filter, "teal_slices")
+  checkmate::assert_multi_class(data, c("teal_data", "teal_data_module", "reactive"))
 
   moduleServer(id, function(input, output, session) {
     logger::log_debug("srv_data initializing.")
-
-    if (getOption("teal.show_js_log", default = FALSE)) {
-      shinyjs::showLog()
-    }
-
     # data_rv contains teal_data object
     # either passed to teal::init or returned from teal_data_module
-    data_validated <- if (inherits(data, "teal_data_module")) {
-      srv_teal_data(
-        "teal_data_module",
-        data = reactive(req(FALSE)), # to .fallback_on_failure to shiny.silent.error
-        data_module = data,
-        modules = modules,
-        validate_shiny_silent_error = FALSE
-      )
+    data_out <- if (inherits(data, "teal_data_module")) {
+      output$data <- renderUI(data$ui(id = session$ns("teal_data_module")))
+      data$server("teal_data_module")
     } else if (inherits(data, "teal_data")) {
       reactiveVal(data)
     } else if (test_reactive(data)) {
-      .fallback_on_failure(this = data, that = reactive(req(FALSE)), label = "Reactive data")
-    }
-
-    if (inherits(data, "teal_data_module")) {
-      shinyjs::disable(selector = sprintf(".teal-body:has('#%s') .nav li a", session$ns("content")))
+      data
     }
 
-    observeEvent(data_validated(), {
-      showNotification("Data loaded successfully.", duration = 5)
-      shinyjs::enable(selector = sprintf(".teal-body:has('#%s') .nav li a", session$ns("content")))
-      if (isTRUE(attr(data, "once"))) {
-        # Hiding the data module tab.
-        shinyjs::hide(
-          selector = sprintf(
-            ".teal-body:has('#%s') a[data-value='teal_data_module']",
-            session$ns("content")
-          )
-        )
-        # Clicking the second tab, which is the first module.
-        shinyjs::runjs(
-          sprintf(
-            "document.querySelector('.teal-body:has(#%s) .nav li:nth-child(2) a').click();",
-            session$ns("content")
-          )
-        )
-      }
+    data_handled <- reactive({
+      tryCatch(data_out(), error = function(e) e)
+    })
 
-      is_filter_ok <- check_filter_datanames(filter, ls(teal.code::get_env(data_validated())))
-      if (!isTRUE(is_filter_ok)) {
-        showNotification(
-          "Some filters were not applied because of incompatibility with data. Contact app developer.",
-          type = "warning",
-          duration = 10
+    # We want to exclude teal_data_module elements from bookmarking as they might have some secrets
+    observeEvent(data_handled(), {
+      if (inherits(data_handled(), "teal_data")) {
+        app_session <- .subset2(shiny::getDefaultReactiveDomain(), "parent")
+        setBookmarkExclude(
+          session$ns(
+            grep(
+              pattern = "teal_data_module-",
+              x = names(reactiveValuesToList(input)),
+              value = TRUE
+            )
+          ),
+          session = app_session
         )
-        warning(is_filter_ok)
       }
     })
 
-    observeEvent(data_validated(), once = TRUE, {
-      # Excluding the ids from teal_data_module using full namespace and global shiny app session.
-      app_session <- .subset2(shiny::getDefaultReactiveDomain(), "parent")
-      setBookmarkExclude(
-        session$ns(
-          grep(
-            pattern = "teal_data_module-",
-            x = names(reactiveValuesToList(input)),
-            value = TRUE
-          )
-        ),
-        session = app_session
-      )
-    })
-
-    # Adds signature protection to the datanames in the data
-    reactive({
-      req(data_validated())
-      .add_signature_to_data(data_validated())
-    })
+    data_handled
   })
 }