remove FILTERED (#87)

* remnove FILTERED * git expression tree issue in tests Co-authored-by: Dawid Kałędkowski <dawid.kaledkowski@gmail.com>
insightsengineering · Jul 26, 2022 · ce97768 · ce97768
1 parent 87857c4
commit ce97768
Show file tree

Hide file tree

Showing 6 changed files with 130 additions and 127 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,9 @@
 # teal.transform 0.1.1.9009
 
+### Breaking changes
+
+* Following changes to the output of `teal.slice::FilteredData$get_call()` the data merge functionality no longer expects input datanames to have the suffix `_FILTERED`.
+
 ### New features
 
 * `data_extract_ui`, `data_extract_srv`, `data_extract_multiple_srv` can be initialized by the list of (optionally `reactive`) `data.frame` objects.

diff --git a/R/data_merge_module.R b/R/data_merge_module.R
@@ -259,7 +259,6 @@ data_merge_srv <- function(id = "merge_id",
         )
         ch <- teal.code::chunks_new()
         datasets_list_nr <- sapply(datasets$datanames(), simplify = FALSE, datasets$get_data, filtered = TRUE)
-        names(datasets_list_nr) <- paste0(names(datasets_list_nr), "_FILTERED")
 
         teal.code::chunks_reset(envir = list2env(datasets_list_nr), chunks = ch)
         for (chunk in merged_data$expr) teal.code::chunks_push(expression = chunk, chunks = ch)

diff --git a/R/get_dplyr_call.R b/R/get_dplyr_call.R
@@ -216,7 +216,7 @@ get_dplyr_call <- function(selector_list,
 
   n_selectors <- length(selector_list)
 
-  dataname_filtered <- as.name(paste0(selector_list[[idx]]$dataname, "_FILTERED"))
+  dataname_filtered <- as.name(selector_list[[idx]]$dataname)
 
   filter_call <- get_filter_call(selector_list[[idx]]$filters, selector_list[[idx]]$dataname, datasets)