Show only datasets used

R/tm_g_barchart_simple.R

@@ -189,6 +189,10 @@ tm_g_barchart_simple <- function(x = NULL,
   )
 
   ui_args <- as.list(environment())
+
+  data_extract_list <- list(x = x, fill = fill,
+                            x_facet = x_facet, y_facet = y_facet)
+
   module(
     label = label,
     server = srv_g_barchart_simple,
@@ -204,7 +208,7 @@ tm_g_barchart_simple <- function(x = NULL,
       ggplot2_args = ggplot2_args,
       decorators = decorators
     ),
-    datanames = "all"
+    datanames = teal.transform::get_extract_datanames(data_extract_list)
   )
 }
 

R/tm_g_ci.R

@@ -290,6 +290,13 @@ tm_g_ci <- function(label,
   checkmate::assert_class(y_var, classes = "data_extract_spec")
   checkmate::assert_class(x_var, classes = "data_extract_spec")
   checkmate::assert_class(color, classes = "data_extract_spec")
+  x_var <- teal.transform::list_extract_spec(x_var, allow_null = TRUE)
+  y_var <- teal.transform::list_extract_spec(y_var, allow_null = TRUE)
+  color <- teal.transform::list_extract_spec(color, allow_null = TRUE)
+  teal.transform::check_no_multiple_selection(x_var)
+  teal.transform::check_no_multiple_selection(y_var)
+  teal.transform::check_no_multiple_selection(color)
+
   checkmate::assert_class(conf_level, "choices_selected")
   checkmate::assert_numeric(plot_height, len = 3, any.missing = FALSE, finite = TRUE)
   checkmate::assert_numeric(plot_height[1], lower = plot_height[2], upper = plot_height[3], .var.name = "plot_height")
@@ -306,6 +313,8 @@ tm_g_ci <- function(label,
 
   args <- as.list(environment())
 
+  data_extract_list <- list(x_var = x_var, y_var = y_var, color = color)
+
   module(
     label = label,
     server = srv_g_ci,
@@ -321,7 +330,7 @@ tm_g_ci <- function(label,
     ),
     ui = ui_g_ci,
     ui_args = args,
-    datanames = "all"
+    datanames = teal.transform::get_extract_datanames(data_extract_list)
   )
 }
 

R/utils.R

@@ -1068,7 +1068,7 @@ select_decorators <- function(decorators, scope) {
 
 #' Convert flat list of `teal_transform_module` to named lists
 #'
-#' @param decorators (list of `teal_transformodules`) to normalize.
+#' @param decorators (list of `teal_transform_module`) to normalize.
 #' @return A named list of lists with `teal_transform_module` objects.
 #' @keywords internal
 normalize_decorators <- function(decorators) {

teal.modules.clinical.Rproj

@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 49921c94-1294-43d5-b84e-1d82b33146b1
 
 RestoreWorkspace: No
 SaveWorkspace: No