Fix the datanames bug causing teal app to crash when teal_data has non standard object names

R/module_init_data.R

@@ -111,6 +111,9 @@ srv_init_data <- function(id, data) {
   )
 
   tdata@verified <- data@verified
+  if (length(datanames(data))) {
+    datanames(tdata) <- datanames(data)
+  }
   tdata
 }
 

R/module_nested_tabs.R

@@ -359,7 +359,9 @@ srv_teal_module.teal_module <- function(id,
 
 .resolve_module_datanames <- function(data, modules) {
   stopifnot("data_rv must be teal_data object." = inherits(data, "teal_data"))
-  if (is.null(modules$datanames) || identical(modules$datanames, "all")) {
+  if (length(datanames(data))) {
+    .topologically_sort_datanames(datanames(data), teal.data::join_keys(data))
+  } else if (is.null(modules$datanames) || identical(modules$datanames, "all")) {
     .topologically_sort_datanames(ls(teal.code::get_env(data)), teal.data::join_keys(data))
   } else {
     intersect(

R/utils.R

@@ -74,10 +74,13 @@ get_teal_bs_theme <- function() {
 #' @param datanames (`character`) vector of data set names to include; must be subset of `datanames(x)`
 #' @return A `FilteredData` object.
 #' @keywords internal
-teal_data_to_filtered_data <- function(x, datanames = ls(teal.code::get_env(x))) {
+teal_data_to_filtered_data <- function(x, datanames = teal.data::datanames(data)) {
   checkmate::assert_class(x, "teal_data")
   checkmate::assert_character(datanames, min.chars = 1L, any.missing = FALSE)
   # Otherwise, FilteredData will be created in the modules' scope later
+  if (!length(datanames)) {
+    datanames <- ls(teal.code::get_env(x))
+  }
   teal.slice::init_filtered_data(
     x = Filter(
       length,