diff --git a/DESCRIPTION b/DESCRIPTION index 834db17fa1..beeab49243 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -51,7 +51,8 @@ Suggests: scda.2021 (>= 0.1.3), teal.widgets (>= 0.1.1), testthat (>= 2.0), - withr + withr, + yaml VignetteBuilder: knitr RdMacros: diff --git a/NEWS.md b/NEWS.md index f02ffdf553..e30935f4bf 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,7 @@ ### Enhancements * Enhanced the initial shiny input cycle, all encoding inputs are available from the beginning when each module server is executed. +* Updated the internals of `module_teal` to reflect changes in `teal.slice`. # teal 0.11.1 diff --git a/R/dummy_functions.R b/R/dummy_functions.R index b06ff82a1e..373bf3650d 100644 --- a/R/dummy_functions.R +++ b/R/dummy_functions.R @@ -92,11 +92,7 @@ get_dummy_cdisc_data <- function() { # nolint #' @keywords internal get_dummy_datasets <- function() { # nolint dummy_cdisc_data <- get_dummy_cdisc_data() - datasets <- teal.slice:::filtered_data_new(dummy_cdisc_data) - isolate({ - teal.slice:::filtered_data_set(dummy_cdisc_data, datasets) - }) - return(datasets) + return(teal.slice::init_filtered_data(dummy_cdisc_data)) } #' Get dummy modules diff --git a/R/module_teal.R b/R/module_teal.R index 2c65a9c82d..08bbd26da3 100644 --- a/R/module_teal.R +++ b/R/module_teal.R @@ -184,9 +184,8 @@ srv_teal <- function(id, modules, raw_data, filter = list()) { env$progress$set(0.25, message = "Setting data") # create the FilteredData object (here called 'datasets') whose class depends on the class of raw_data() # this is placed in the module scope so that bookmarking can be used with FilteredData object - datasets <- teal.slice:::filtered_data_new(raw_data()) - # transfer the datasets from raw_data() into the FilteredData object - teal.slice:::filtered_data_set(raw_data(), datasets) + datasets <- teal.slice::init_filtered_data(raw_data()) + logger::log_trace("srv_teal@4 Raw Data transferred to FilteredData.") datasets }) diff --git a/tests/testthat/test-module_nested_tabs.R b/tests/testthat/test-module_nested_tabs.R index 49d6b92c90..2194e7103a 100644 --- a/tests/testthat/test-module_nested_tabs.R +++ b/tests/testthat/test-module_nested_tabs.R @@ -1,5 +1,6 @@ -filtered_data <- teal.slice:::FilteredData$new() -filtered_data$set_dataset(teal.data::dataset(dataname = "iris", x = head(iris))) +filtered_data <- teal.slice::init_filtered_data( + list(iris = list(dataset = head(iris))) +) test_module1 <- module( label = "test1", diff --git a/tests/testthat/test-module_tabs_with_filters.R b/tests/testthat/test-module_tabs_with_filters.R index e84e1cf8ad..91a6bb853a 100644 --- a/tests/testthat/test-module_tabs_with_filters.R +++ b/tests/testthat/test-module_tabs_with_filters.R @@ -1,6 +1,9 @@ -filtered_data <- teal.slice:::FilteredData$new() -filtered_data$set_dataset(teal.data::dataset(dataname = "iris", x = head(iris))) -filtered_data$set_dataset(teal.data::dataset(dataname = "mtcars", x = head(mtcars))) +filtered_data <- teal.slice::init_filtered_data( + list( + iris = list(dataset = head(iris)), + mtcars = list(dataset = head(mtcars)) + ) +) test_module1 <- module( label = "iris tab", diff --git a/tests/testthat/test-module_teal.R b/tests/testthat/test-module_teal.R index d5f3ee21f6..3d41e2db10 100644 --- a/tests/testthat/test-module_teal.R +++ b/tests/testthat/test-module_teal.R @@ -43,8 +43,7 @@ testthat::test_that("srv_teal initializes the data when raw_data changes", { }) testthat::test_that("srv_teal initialized FilteredData based on the raw_data input", { - filtered_data <- teal.slice:::filtered_data_new(data) - teal.slice:::filtered_data_set(data, filtered_data) + filtered_data <- teal.slice::init_filtered_data(data) shiny::testServer( app = srv_teal,