Merge branch 'main' into strict_tests

insightsengineering · Mar 8, 2024 · 150813c · 150813c
2 parents 4be0f84 + 3843e16
commit 150813c
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: teal.transform
 Title: Functions for Extracting and Merging Data in the 'teal' Framework
-Version: 0.5.0.9000
-Date: 2024-02-18
+Version: 0.5.0.9001
+Date: 2024-03-07
 Authors@R: c(
     person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
     person("Pawel", "Rucki", , "[email protected]", role = "aut"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# teal.transform 0.5.0.9000
+# teal.transform 0.5.0.9001
 
 # teal.transform 0.5.0
 

diff --git a/R/data_extract_filter_module.R b/R/data_extract_filter_module.R
@@ -34,7 +34,7 @@ data_extract_filter_ui <- function(filter, id = "filter") {
     fixed = filter$fixed
   )
 
-  div(
+  tags$div(
     class = "filter_spec",
     if (filter$vars_fixed) shinyjs::hidden(html_col) else html_col,
     html_vals

diff --git a/R/data_extract_module.R b/R/data_extract_module.R
@@ -111,7 +111,7 @@ cond_data_extract_single_ui <- function(ns, single_data_extract_spec) {
 #' # Call to use inside your teal module UI function
 #' standard_layout(
 #'   output = tableOutput("table"),
-#'   encoding = div(
+#'   encoding = tags$div(
 #'     data_extract_ui(
 #'       id = "regressor",
 #'       label = "Regressor Variable",
@@ -171,7 +171,7 @@ data_extract_ui <- function(id, label, data_extract_spec, is_single_dataset = FA
   }
   tagList(
     include_css_files(pattern = "data_extract"),
-    div(
+    tags$div(
       class = "data-extract",
       tags$label(label),
       dataset_input,

diff --git a/R/data_extract_single_module.R b/R/data_extract_single_module.R
@@ -19,7 +19,7 @@ data_extract_single_ui <- function(id = NULL, single_data_extract_spec) {
   ## filter input
   extract_spec_filter <- single_data_extract_spec$filter
   filter_display <- do.call(
-    div,
+    tags$div,
     lapply(
       seq_along(extract_spec_filter),
       function(idx) {
@@ -57,7 +57,7 @@ data_extract_single_ui <- function(id = NULL, single_data_extract_spec) {
   if (!extract_spec_reshape) reshape_display <- shinyjs::hidden(reshape_display)
 
   ## all combined
-  div(filter_display, select_display, reshape_display)
+  tags$div(filter_display, select_display, reshape_display)
 }
 
 #' The server function for a single `data_extract_spec` object

diff --git a/R/merge_expression_module.R b/R/merge_expression_module.R
@@ -82,7 +82,7 @@
 #'
 #' ui <- fluidPage(
 #'   standard_layout(
-#'     output = div(
+#'     output = tags$div(
 #'       verbatimTextOutput("expr"),
 #'       dataTableOutput("data")
 #'     ),
@@ -280,7 +280,7 @@ merge_expression_module.list <- function(datasets,
 #'
 #' ui <- fluidPage(
 #'   standard_layout(
-#'     output = div(
+#'     output = tags$div(
 #'       verbatimTextOutput("expr"),
 #'       dataTableOutput("data")
 #'     ),

diff --git a/man/data_extract_ui.Rd b/man/data_extract_ui.Rd
diff --git a/man/merge_expression_module.Rd b/man/merge_expression_module.Rd
diff --git a/man/merge_expression_srv.Rd b/man/merge_expression_srv.Rd
diff --git a/vignettes/data-extract-merge.Rmd b/vignettes/data-extract-merge.Rmd
@@ -110,7 +110,7 @@ merge_ui <- function(id, data_extracts) {
   sidebarLayout(
     sidebarPanel(
       h3("Encoding"),
-      div(
+      tags$div(
         data_extract_ui(
           ns("adsl_extract"), # must correspond with data_extracts list names
           label = "ADSL extract",

diff --git a/vignettes/data-merge.Rmd b/vignettes/data-merge.Rmd
@@ -94,7 +94,7 @@ merge_ui <- function(id, data_extracts) {
   sidebarLayout(
     sidebarPanel(
       h3("Encoding"),
-      div(
+      tags$div(
         data_extract_ui(
           ns("adsl_extract"), # must correspond with data_extracts list names
           label = "ADSL extract",