removed additional line break from code. (#989)

this fixes
insightsengineering/teal.gallery#113

---------

Signed-off-by: kartikeya kirar <[email protected]>
Co-authored-by: Aleksander Chlebowski <[email protected]>

R/get_rcode_utils.R

@@ -38,39 +38,38 @@ get_rcode_str_install <- function() {
 #' @param datasets (`FilteredData`) object
 #' @param hashes named (`list`) of hashes per dataset
 #'
-#' @return `character(3)` containing the following elements:
+#' @return Character string concatenated from the following elements:
 #'  - data pre-processing code (from `data` argument in `init`)
 #'  - hash check of loaded objects
-#'  - filter code
+#'  - filter code (if any)
 #'
 #' @keywords internal
 get_datasets_code <- function(datanames, datasets, hashes) {
+  # preprocessing code
   str_prepro <- teal.data:::get_code_dependency(attr(datasets, "preprocessing_code"), names = datanames)
   if (length(str_prepro) == 0) {
     str_prepro <- "message('Preprocessing is empty')"
-  } else if (length(str_prepro) > 0) {
-    str_prepro <- paste0(str_prepro, "\n\n")
+  } else {
+    str_prepro <- paste(str_prepro, collapse = "\n")
   }
 
-  str_hash <- paste(
-    paste0(
-      vapply(
-        datanames,
-        function(dataname) {
-          sprintf(
-            "stopifnot(%s == %s)",
-            deparse1(bquote(rlang::hash(.(as.name(dataname))))),
-            deparse1(hashes[[dataname]])
-          )
-        },
-        character(1)
-      ),
-      collapse = "\n"
-    ),
-    "\n\n"
-  )
+  # hash checks
+  str_hash <- vapply(datanames, function(dataname) {
+    sprintf(
+      "stopifnot(%s == %s)",
+      deparse1(bquote(rlang::hash(.(as.name(dataname))))),
+      deparse1(hashes[[dataname]])
+    )
+  }, character(1))
+  str_hash <- paste(str_hash, collapse = "\n")
 
+  # filter expressions
   str_filter <- teal.slice::get_filter_expr(datasets, datanames)
+  if (str_filter == "") {
+    str_filter <- character(0)
+  }
 
-  c(str_prepro, str_hash, str_filter)
+  # concatenate all code
+  str_code <- paste(c(str_prepro, str_hash, str_filter), collapse = "\n\n")
+  sprintf("%s\n", str_code)
 }

R/module_nested_tabs.R

@@ -290,8 +290,7 @@ srv_nested_tabs.teal_module <- function(id, datasets, modules, is_module_specifi
   code <- c(
     get_rcode_str_install(),
     get_rcode_libraries(),
-    get_datasets_code(datanames, datasets, hashes),
-    teal.slice::get_filter_expr(datasets, datanames)
+    get_datasets_code(datanames, datasets, hashes)
   )
 
   do.call(