Keep order or datanames

Author: llrs-roche

R/tm_data_table.R

@@ -136,6 +136,7 @@ tm_data_table <- function(label = "Data Table",
     ui = ui_page_data_table,
     datanames = datanames,
     server_args = list(
+      datanames = datanames,
       variables_selected = variables_selected,
       dt_args = dt_args,
       dt_options = dt_options,
@@ -185,6 +186,7 @@ ui_page_data_table <- function(id, pre_output = NULL, post_output = NULL) {
 # Server page module
 srv_page_data_table <- function(id,
                                 data,
+                                datanames,
                                 variables_selected,
                                 dt_args,
                                 dt_options,
@@ -197,7 +199,6 @@ srv_page_data_table <- function(id,
     if_filtered <- reactive(as.logical(input$if_filtered))
     if_distinct <- reactive(as.logical(input$if_distinct))
 
-    datanames <- isolate(names(data()))
     datanames <- Filter(function(name) {
       is.data.frame(isolate(data())[[name]])
     }, datanames)

R/tm_missing_data.R

@@ -73,7 +73,7 @@
 #' app <- init(
 #'   data = data,
 #'   modules = modules(
-#'     tm_missing_data(parent_dataname  = "mtcars")
+#'     tm_missing_data(parent_dataname = "mtcars")
 #'   )
 #' )
 #' if (interactive()) {

R/tm_variable_browser.R

@@ -118,13 +118,19 @@ tm_variable_browser <- function(label = "Variable Browser",
   checkmate::assert_class(ggplot2_args, "ggplot2_args")
   # End of assertions
 
+  datanames <- if (identical(datanames, "all")) {
+    "all"
+  } else {
+    union(datanames, parent_dataname)
+  }
 
   ans <- module(
     label,
     server = srv_variable_browser,
     ui = ui_variable_browser,
-    datanames = if (identical(datanames, "all")) "all" else union(datanames, parent_dataname),
+    datanames = datanames,
     server_args = list(
+      datanames = datanames,
       parent_dataname = parent_dataname,
       ggplot2_args = ggplot2_args
     ),
@@ -231,7 +237,6 @@ srv_variable_browser <- function(id,
 
     varname_numeric_as_factor <- reactiveValues()
 
-    datanames <- isolate(names(data()))
     datanames <- Filter(function(name) {
       is.data.frame(isolate(data())[[name]])
     }, datanames)