use expression when loading libraries

Signed-off-by: Marcin <[email protected]>

Author: m7pr

R/tm_a_pca.R

@@ -440,7 +440,7 @@ srv_a_pca <- function(id, data, dat, plot_height, plot_width, ggplot2_args, deco
           teal.reporter::teal_card(obj),
           teal.reporter::teal_card("## Module's code")
         )
-      teal.code::eval_code(obj, 'library("ggplot2");library("dplyr");library("tidyr")') # nolint: quotes.
+    teal.code::eval_code(obj, expression(library("ggplot2"), library("dplyr"), library("tidyr"))
     })
     anl_merged_q <- reactive({
       req(anl_merged_input())

R/tm_a_regression.R

@@ -465,7 +465,7 @@ srv_a_regression <- function(id,
           teal.reporter::teal_card(obj),
           teal.reporter::teal_card("## Module's code")
         )
-      teal.code::eval_code(obj, 'library("ggplot2");library("dplyr")') # nolint: quotes.
+      teal.code::eval_code(obj, expression(library("ggplot2"), library("dplyr")))
     })
 
     anl_merged_q <- reactive({
@@ -986,7 +986,7 @@ srv_a_regression <- function(id,
 
     output_q <- reactive({
       teal::validate_inputs(iv_r())
-      obj <- switch(input$plot_type,
+      switch(input$plot_type,
         "Response vs Regressor" = output_plot_0(),
         "Residuals vs Fitted" = output_plot_1(),
         "Normal Q-Q" = output_plot_2(),
@@ -995,7 +995,6 @@ srv_a_regression <- function(id,
         "Residuals vs Leverage" = output_plot_5(),
         "Cook's dist vs Leverage" = output_plot_6()
       )
-      obj
     })
 
     decorated_output_q <- srv_decorate_teal_data(

R/tm_data_table.R

@@ -309,7 +309,7 @@ srv_data_table <- function(id,
       teal::validate_has_data(df, min_nrow = 1L, msg = paste("data", dataname, "is empty"))
       qenv <- teal.code::eval_code(
         data(),
-        'library("dplyr");library("DT")' # nolint: quotes.
+        expression(library("dplyr"), library("DT"))
       )
       teal.code::eval_code(
         qenv,

R/tm_g_association.R

@@ -349,7 +349,7 @@ srv_tm_g_association <- function(id,
           teal.reporter::teal_card(obj),
           teal.reporter::teal_card("## Module's code")
         )
-      teal.code::eval_code(obj, 'library("ggplot2");library("dplyr");library("ggmosaic")') # nolint: quotes.
+      teal.code::eval_code(obj, expression(library("ggplot2"), library("dplyr"), library("ggmosaic")))
     })
     anl_merged_q <- reactive({
       req(anl_merged_input())

R/tm_g_distribution.R

@@ -524,7 +524,7 @@ srv_distribution <- function(id,
     )
 
     qenv <- reactive(
-      teal.code::eval_code(data(), 'library("ggplot2");library("dplyr")') # nolint: quotes.
+      teal.code::eval_code(data(), expression(library("ggplot2"), library("dplyr")))
     )
 
     anl_merged_q <- reactive({
@@ -665,7 +665,7 @@ srv_distribution <- function(id,
             "Group by variable must be `factor`, `character`, or `integer`"
           )
         )
-        qenv <- teal.code::eval_code(qenv, 'library("forcats")') # nolint: quotes.
+        qenv <- teal.code::eval_code(qenv, expression(library("forcats")))
         qenv <- teal.code::eval_code(
           qenv,
           substitute(
@@ -683,7 +683,7 @@ srv_distribution <- function(id,
           )
         )
 
-        qenv <- teal.code::eval_code(qenv, 'library("forcats")') # nolint: quotes.
+        qenv <- teal.code::eval_code(qenv, expression(library("forcats")))
         qenv <- teal.code::eval_code(
           qenv,
           substitute(
@@ -893,7 +893,7 @@ srv_distribution <- function(id,
         }
 
         if (length(t_dist) != 0 && main_type_var == "Density" && length(g_var) == 0 && length(s_var) == 0) {
-          qenv <- teal.code::eval_code(qenv, 'library("ggpp")') # nolint: quotes.
+          qenv <- teal.code::eval_code(qenv, expression(library("ggpp")))
           qenv <- teal.code::eval_code(
             qenv,
             substitute(
@@ -1039,7 +1039,7 @@ srv_distribution <- function(id,
         )
 
         if (length(t_dist) != 0 && length(g_var) == 0 && length(s_var) == 0) {
-          qenv <- teal.code::eval_code(qenv, 'library("ggpp")') # nolint: quotes.
+          qenv <- teal.code::eval_code(qenv, expression(library("ggpp")))
           qenv <- teal.code::eval_code(
             qenv,
             substitute(
@@ -1235,7 +1235,7 @@ srv_distribution <- function(id,
         qenv <- common_q()
 
         if (length(s_var) == 0 && length(g_var) == 0) {
-          qenv <- teal.code::eval_code(qenv, 'library("generics")') # nolint: quotes.
+          qenv <- teal.code::eval_code(qenv, expression(library("generics")))
           qenv <- teal.code::eval_code(
             qenv,
             substitute(
@@ -1249,7 +1249,7 @@ srv_distribution <- function(id,
             )
           )
         } else {
-          qenv <- teal.code::eval_code(qenv, 'library("tidyr")') # nolint: quotes.
+          qenv <- teal.code::eval_code(qenv, expression(library("tidyr")))
           qenv <- teal.code::eval_code(
             qenv,
             substitute(

R/tm_g_response.R

@@ -390,7 +390,7 @@ srv_g_response <- function(id,
     )
 
     qenv <- reactive(
-      teal.code::eval_code(data(), 'library("ggplot2");library("dplyr")') # nolint: quotes.
+      teal.code::eval_code(data(), expression(library("ggplot2"), library("dplyr")))
     )
 
     anl_merged_q <- reactive({

R/tm_g_scatterplot.R

@@ -591,7 +591,7 @@ srv_g_scatterplot <- function(id,
         teal.reporter::teal_card(obj),
         teal.reporter::teal_card("## Module's code")
       )
-      teal.code::eval_code(obj, 'library("ggplot2");library("dplyr")') # nolint: quotes.
+      teal.code::eval_code(data(), expression(library("ggplot2"), library("dplyr")))
     })
 
     anl_merged_q <- reactive({

R/tm_g_scatterplotmatrix.R

@@ -334,7 +334,7 @@ srv_g_scatterplotmatrix <- function(id,
         teal.reporter::teal_card(obj),
         teal.reporter::teal_card("## Module's code")
       )
-      qenv <- teal.code::eval_code(obj, 'library("dplyr");library("lattice")') # nolint: quotes.
+      qenv <- teal.code::eval_code(obj, expression(library("dplyr"),library("lattice")))
       teal.code::eval_code(qenv, as.expression(anl_merged_input()$expr))
     })
 
@@ -371,7 +371,6 @@ srv_g_scatterplotmatrix <- function(id,
 
       # check character columns. If any, then those are converted to factors
       check_char <- vapply(ANL[, cols_names], is.character, logical(1))
-      qenv <- teal.code::eval_code(qenv, 'library("dplyr")') # nolint: quotes.
       if (any(check_char)) {
         qenv <- teal.code::eval_code(
           qenv,

R/tm_missing_data.R

@@ -529,7 +529,7 @@ srv_missing_data <- function(id,
       )
 
       qenv <- teal.code::eval_code(obj, {
-        'library("dplyr");library("ggplot2");library("tidyr");library("gridExtra")' # nolint: quotes.
+        expression(library("dplyr"),library("ggplot2"),library("tidyr"),library("gridExtra"))
       })
 
       qenv <- if (!is.null(selected_vars()) && length(selected_vars()) != ncol(anl)) {
@@ -1115,7 +1115,7 @@ srv_missing_data <- function(id,
       qenv <- if (!is.null(group_var)) {
         common_code_libraries_q <- teal.code::eval_code(
           qenv,
-          'library("forcats");library("glue");' # nolint: quotes.
+          expression(library("forcats"), library("glue"))
         )
         teal.code::eval_code(
           common_code_libraries_q,

R/tm_t_crosstable.R

@@ -335,7 +335,7 @@ srv_t_crosstable <- function(id, data, label, x, y, remove_zero_columns, basic_t
           teal.reporter::teal_card(obj),
           teal.reporter::teal_card("## Module's code")
         )
-      teal.code::eval_code(obj, 'library("rtables");library("tern");library("dplyr")') # nolint: quotes.
+      teal.code::eval_code(obj, expression(library("rtables"), library("tern"), library("dplyr")))
     })
     anl_merged_q <- reactive({
       req(anl_merged_input())