{teal} module returns a teal_report object that extends from teal_data

R/tm_a_pca.R

@@ -1038,9 +1038,8 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
           data = q,
           decorators = select_decorators(decorators, obj_name),
           expr = reactive({
-            substitute(print(.plot), env = list(.plot = as.name(obj_name)))
-          }),
-          expr_is_reactive = TRUE
+            substitute(.plot, env = list(.plot = as.name(obj_name)))
+          })
         )
       },
       names(output_q),
@@ -1158,5 +1157,7 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
       teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun)
     }
     ###
+
+    decorated_output_q
   })
 }

R/tm_a_regression.R

@@ -462,9 +462,11 @@ srv_a_regression <- function(id,
       )
     })
 
-    qenv <- reactive(
-      teal.code::eval_code(data(), 'library("ggplot2");library("dplyr")') # nolint quotes
-    )
+    qenv <- reactive({
+      obj <- data()
+      teal.reporter::teal_card(obj) <- c(teal.reporter::teal_card(obj), "# Module's computation")
+      teal.code::eval_code(obj, 'library("ggplot2");library("dplyr")') # nolint quotes
+    })
 
     anl_merged_q <- reactive({
       req(anl_merged_input())
@@ -982,7 +984,7 @@ srv_a_regression <- function(id,
 
     output_q <- reactive({
       teal::validate_inputs(iv_r())
-      switch(input$plot_type,
+      obj <- switch(input$plot_type,
         "Response vs Regressor" = output_plot_0(),
         "Residuals vs Fitted" = output_plot_1(),
         "Normal Q-Q" = output_plot_2(),
@@ -991,21 +993,22 @@ 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(
       "decorator",
       data = output_q,
       decorators = select_decorators(decorators, "plot"),
-      expr = print(plot)
+      expr = quote(plot)
     )
 
     fitted <- reactive({
-      req(output_q())
+      req(decorated_output_q())
       decorated_output_q()[["fit"]]
     })
     plot_r <- reactive({
-      req(output_q())
+      req(decorated_output_q())
       decorated_output_q()[["plot"]]
     })
 
@@ -1055,5 +1058,7 @@ srv_a_regression <- function(id,
       teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun)
     }
     ###
+
+    decorated_output_q
   })
 }

R/tm_g_association.R

@@ -347,7 +347,7 @@ srv_tm_g_association <- function(id,
     )
 
     qenv <- reactive(
-      teal.code::eval_code(data(), 'library("ggplot2");library("dplyr");library("tern");library("ggmosaic")') # nolint quotes
+      teal.code::eval_code(data(), 'library("ggplot2");library("dplyr");library("ggmosaic")') # nolint quotes
     )
     anl_merged_q <- reactive({
       req(anl_merged_input())
@@ -506,9 +506,7 @@ srv_tm_g_association <- function(id,
           substitute(
             expr = {
               plots <- plot_calls
-              plot_top <- plots[[1]]
-              plot_bottom <- plots[[2]]
-              plot <- tern::stack_grobs(grobs = lapply(list(plot_top, plot_bottom), ggplot2::ggplotGrob))
+              plot <- grid.arrange(plots[[1]], plots[[2]], ncol = 1)
             },
             env = list(
               plot_calls = do.call(
@@ -525,10 +523,7 @@ srv_tm_g_association <- function(id,
       id = "decorator",
       data = output_q,
       decorators = select_decorators(decorators, "plot"),
-      expr = {
-        grid::grid.newpage()
-        grid::grid.draw(plot)
-      }
+      expr = quote(plot)
     )
 
     plot_r <- reactive({
@@ -576,6 +571,8 @@ srv_tm_g_association <- function(id,
       }
       teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun)
     }
+
+    decorated_output_grob_q
     ###
   })
 }

R/tm_g_bivariate.R

@@ -711,7 +711,7 @@ srv_g_bivariate <- function(id,
         without_facet <- (is.null(nulled_row_facet_name) && is.null(nulled_col_facet_name)) || !facetting
 
         print_call <- if (without_facet) {
-          quote(print(plot))
+          quote(plot)
         } else {
           substitute(
             expr = {
@@ -730,8 +730,7 @@ srv_g_bivariate <- function(id,
           )
         }
         print_call
-      }),
-      expr_is_reactive = TRUE
+      })
     )
 
     plot_r <- reactive(req(decorated_output_q_facets())[["plot"]])
@@ -774,6 +773,8 @@ srv_g_bivariate <- function(id,
       teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun)
     }
     ###
+
+    decorated_output_q_facets
   })
 }
 

R/tm_g_distribution.R

@@ -1297,28 +1297,28 @@ srv_distribution <- function(id,
       "d_density",
       data = output_dist_q,
       decorators = select_decorators(decorators, "histogram_plot"),
-      expr = print(histogram_plot)
+      expr = quote(histogram_plot)
     )
 
     decorated_output_qq_q <- srv_decorate_teal_data(
       "d_qq",
       data = output_qq_q,
       decorators = select_decorators(decorators, "qq_plot"),
-      expr = print(qq_plot)
+      expr = quote(qq_plot)
     )
 
     decorated_output_summary_q <- srv_decorate_teal_data(
       "d_summary",
       data = output_summary_q,
       decorators = select_decorators(decorators, "summary_table"),
-      expr = summary_table
+      expr = quote(summary_table)
     )
 
     decorated_output_test_q <- srv_decorate_teal_data(
       "d_test",
       data = output_test_q,
       decorators = select_decorators(decorators, "test_table"),
-      expr = test_table
+      expr = quote(test_table)
     )
 
     decorated_output_q <- reactive({
@@ -1417,5 +1417,12 @@ srv_distribution <- function(id,
       teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun)
     }
     ###
+    reactive(
+      if (input$tabs == "Histogram") {
+        decorated_output_dist_q()
+      } else if (input$tabs == "QQplot") {
+        decorated_output_qq_q()
+      }
+    )
   })
 }

R/tm_g_response.R

@@ -579,7 +579,7 @@ srv_g_response <- function(id,
       id = "decorator",
       data = output_q,
       decorators = select_decorators(decorators, "plot"),
-      expr = print(plot)
+      expr = quote(plot)
     )
 
     plot_r <- reactive(req(decorated_output_plot_q())[["plot"]])
@@ -622,5 +622,7 @@ srv_g_response <- function(id,
       teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun)
     }
     ###
+
+    decorated_output_plot_q
   })
 }

R/tm_g_scatterplot.R

@@ -1023,7 +1023,7 @@ srv_g_scatterplot <- function(id,
       id = "decorator",
       data = output_q,
       decorators = select_decorators(decorators, "plot"),
-      expr = print(plot)
+      expr = quote(plot)
     )
 
     plot_r <- reactive(req(decorated_output_plot_q())[["plot"]])
@@ -1095,5 +1095,7 @@ srv_g_scatterplot <- function(id,
       teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun)
     }
     ###
+
+    decorated_output_plot_q
   })
 }

R/tm_g_scatterplotmatrix.R

@@ -333,7 +333,9 @@ srv_g_scatterplotmatrix <- function(id,
 
     anl_merged_q <- reactive({
       req(anl_merged_input())
-      qenv <- teal.code::eval_code(data(), 'library("dplyr");library("lattice")') # nolint quotes
+      obj <- data()
+      teal.reporter::teal_card(obj) <- c(teal.reporter::teal_card(obj), "# Module's computation")
+      qenv <- teal.code::eval_code(obj, 'library("dplyr");library("lattice")') # nolint: quotes.
       teal.code::eval_code(qenv, as.expression(anl_merged_input()$expr))
     })
 
@@ -464,7 +466,7 @@ srv_g_scatterplotmatrix <- function(id,
       id = "decorator",
       data = output_q,
       decorators = select_decorators(decorators, "plot"),
-      expr = print(plot)
+      expr = quote(plot)
     )
 
     plot_r <- reactive(req(decorated_output_q())[["plot"]])
@@ -529,6 +531,7 @@ srv_g_scatterplotmatrix <- function(id,
       teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun)
     }
     ###
+    decorated_output_q
   })
 }
 

R/tm_missing_data.R

@@ -265,7 +265,7 @@ srv_page_missing_data <- function(id, data, reporter, filter_panel_api, dataname
       })
     })
 
-    lapply(
+    result <- sapply(
       datanames,
       function(x) {
         srv_missing_data(
@@ -280,8 +280,18 @@ srv_page_missing_data <- function(id, data, reporter, filter_panel_api, dataname
           ggplot2_args = ggplot2_args,
           decorators = decorators
         )
-      }
+      },
+      USE.NAMES = TRUE,
+      simplify = FALSE
     )
+
+    reactive({
+      if (is.null(input$dataname_tab)) {
+        teal.data::teal_data()
+      } else {
+        result[[input$dataname_tab]]()
+      }
+    })
   })
 }
 
@@ -521,7 +531,10 @@ srv_missing_data <- function(id,
 
       group_var <- input$group_by_var
       anl <- data_r()
-      qenv <- teal.code::eval_code(data(), {
+      obj <- data()
+      teal.reporter::teal_card(obj) <- c(teal.reporter::teal_card(obj), "# Module's computation")
+
+      qenv <- teal.code::eval_code(obj, {
         'library("dplyr");library("ggplot2");library("tidyr");library("gridExtra")' # nolint quotes
       })
 
@@ -1269,34 +1282,36 @@ srv_missing_data <- function(id,
       id = "dec_summary_plot",
       data = summary_plot_q,
       decorators = select_decorators(decorators, "summary_plot"),
-      expr = {
+      expr = quote({
         grid::grid.newpage()
         grid::grid.draw(summary_plot)
-      }
+        summary_plot
+      })
     )
 
     decorated_combination_plot_q <- srv_decorate_teal_data(
       id = "dec_combination_plot",
       data = combination_plot_q,
       decorators = select_decorators(decorators, "combination_plot"),
-      expr = {
+      expr = quote({
         grid::grid.newpage()
         grid::grid.draw(combination_plot)
-      }
+        combination_plot
+      })
     )
 
     decorated_summary_table_q <- srv_decorate_teal_data(
       id = "dec_summary_table",
       data = summary_table_q,
       decorators = select_decorators(decorators, "table"),
-      expr = table
+      expr = quote(table)
     )
 
     decorated_by_subject_plot_q <- srv_decorate_teal_data(
       id = "dec_by_subject_plot",
       data = by_subject_plot_q,
       decorators = select_decorators(decorators, "by_subject_plot"),
-      expr = print(by_subject_plot)
+      expr = quote(by_subject_plot)
     )
 
     # Plots & tables reactives
@@ -1417,5 +1432,7 @@ srv_missing_data <- function(id,
       teal.reporter::simple_reporter_srv("simple_reporter", reporter = reporter, card_fun = card_fun)
     }
     ###
+
+    decorated_final_q
   })
 }

R/tm_outliers.R

@@ -1037,8 +1037,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
               },
               env = list(table_columns = input$table_ui_columns, .plot = as.name(obj_name))
             )
-          }),
-          expr_is_reactive = TRUE
+          })
         )
       },
       stats::setNames(nm = c("box_plot", "density_plot", "cumulative_plot")),
@@ -1051,7 +1050,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
       "d_table",
       data = decorated_final_q_no_table,
       decorators = select_decorators(decorators, "table"),
-      expr = table
+      expr = quote(table)
     )
 
     output$summary_table <- DT::renderDataTable(

R/tm_t_crosstable.R

@@ -427,7 +427,7 @@ srv_t_crosstable <- function(id, data, reporter, filter_panel_api, label, x, y,
       id = "decorator",
       data = output_q,
       decorators = select_decorators(decorators, "table"),
-      expr = table
+      expr = quote(table)
     )
 
     output$title <- renderText(req(decorated_output_q())[["title"]])