8181# ' @export
8282# '
8383tm_variable_browser <- function (label = " Variable Browser" ,
84- datasets_selected = " all " ,
85- datanames = datasets_selected ,
84+ datasets_selected = character ( 0 ) ,
85+ datanames = if (length( datasets_selected ) == 0 ) " all " else datasets_selected ,
8686 parent_dataname = " ADSL" ,
8787 pre_output = NULL ,
8888 post_output = NULL ,
@@ -102,11 +102,14 @@ tm_variable_browser <- function(label = "Variable Browser",
102102
103103 # Start of assertions
104104 checkmate :: assert_string(label )
105- if (! is.null (datasets_selected )) {
105+ if (! missing (datasets_selected )) {
106106 lifecycle :: deprecate_soft(
107107 when = " 0.4.0" ,
108- what = " tm_variable_browser(datasets_selected" ,
109- with = " tm_variable_browser(datanames)"
108+ what = " tm_variable_browser(datasets_selected)" ,
109+ with = " tm_variable_browser(datanames)" ,
110+ details = c(
111+ " If both `datasets_selected` and `datanames` are set `datasets_selected` will be silently ignored." ,
112+ i = ' Use `tm_variable_browser(datanames = "all")` to keep the previous behavior and avoid this warning.' )
110113 )
111114 }
112115 checkmate :: assert_character(datanames , min.len = 0 , min.chars = 1 , null.ok = TRUE )
@@ -121,7 +124,7 @@ tm_variable_browser <- function(label = "Variable Browser",
121124 label ,
122125 server = srv_variable_browser ,
123126 ui = ui_variable_browser ,
124- datanames = datanames ,
127+ datanames = union( datanames , parent_dataname ) ,
125128 server_args = list (
126129 datanames = datanames ,
127130 parent_dataname = parent_dataname ,
@@ -235,12 +238,6 @@ srv_variable_browser <- function(id,
235238 is.data.frame(isolate(data())[[name ]])
236239 }, datanames )
237240
238- checkmate :: assert_character(datanames )
239- checkmate :: assert_subset(datanames , datanames )
240- if (! identical(datanames , character (0 ))) {
241- checkmate :: assert_subset(datanames , datanames )
242- }
243-
244241 output $ ui_variable_browser <- renderUI({
245242 ns <- session $ ns
246243 do.call(
0 commit comments