feat(picks): migrate main (v2)

DESCRIPTION

@@ -83,8 +83,9 @@ VignetteBuilder:
     knitr,
     rmarkdown
 Remotes:
-    insightsengineering/teal,
-    insightsengineering/teal.reporter
+    insightsengineering/teal@redesign_extraction@main,
+    insightsengineering/teal.transform,
+    insightsengineering/teal.picks@redesign_extraction@main,
 Config/Needs/verdepcheck: insightsengineering/teal,
     insightsengineering/teal.slice, insightsengineering/teal.transform,
     insightsengineering/tern, tidymodels/broom, mllg/checkmate,

NAMESPACE

@@ -5,6 +5,8 @@ S3method(as_num,default)
 S3method(as_num,factor)
 S3method(as_num,logical)
 S3method(as_num,numeric)
+S3method(tm_a_mmrm,default)
+S3method(tm_a_mmrm,variables)
 export(add_expr)
 export(as_num)
 export(bracket_expr)

R/tm_a_mmrm.R

@@ -553,17 +553,13 @@ template_mmrm_plots <- function(fit_name,
 #' @export
 tm_a_mmrm <- function(label,
                       dataname,
-                      parentname = ifelse(
-                        inherits(arm_var, "data_extract_spec"),
-                        teal.transform::datanames_input(arm_var),
-                        "ADSL"
-                      ),
-                      aval_var,
+                      parentname,
+                      aval_var = teal.picks::variables(c("AVAL", "CHG")),
                       id_var,
                       arm_var,
                       visit_var,
                       cov_var,
-                      arm_ref_comp = NULL,
+                      arm_ref_comp,
                       paramcd,
                       method = teal.transform::choices_selected(
                         c("Satterthwaite", "Kenward-Roger", "Kenward-Roger-Linear"),
@@ -579,7 +575,41 @@ tm_a_mmrm <- function(label,
                       basic_table_args = teal.widgets::basic_table_args(),
                       ggplot2_args = teal.widgets::ggplot2_args(),
                       transformators = list(),
-                      decorators = list()) {
+                      decorators = list(),
+                      ...) {
+  UseMethod("tm_a_mmrm", aval_var)
+}
+
+#' @export
+tm_a_mmrm.default <- function(label,
+                              dataname,
+                              parentname = ifelse(
+                                inherits(arm_var, "data_extract_spec"),
+                                teal.transform::datanames_input(arm_var),
+                                "ADSL"
+                              ),
+                              aval_var,
+                              id_var,
+                              arm_var,
+                              visit_var,
+                              cov_var,
+                              arm_ref_comp = NULL,
+                              paramcd,
+                              method = teal.transform::choices_selected(
+                                c("Satterthwaite", "Kenward-Roger", "Kenward-Roger-Linear"),
+                                "Satterthwaite",
+                                keep_order = TRUE
+                              ),
+                              conf_level = teal.transform::choices_selected(c(0.95, 0.9, 0.8), 0.95, keep_order = TRUE),
+                              plot_height = c(700L, 200L, 2000L),
+                              plot_width = NULL,
+                              total_label = default_total_label(),
+                              pre_output = NULL,
+                              post_output = NULL,
+                              basic_table_args = teal.widgets::basic_table_args(),
+                              ggplot2_args = teal.widgets::ggplot2_args(),
+                              transformators = list(),
+                              decorators = list()) {
   message("Initializing tm_a_mmrm")
   cov_var <- teal.transform::add_no_selected_choices(cov_var, multiple = TRUE)
   checkmate::assert_string(label)
@@ -634,9 +664,9 @@ tm_a_mmrm <- function(label,
 
   module(
     label = label,
-    server = srv_mmrm,
-    ui = ui_mmrm,
-    ui_args = c(data_extract_list, args),
+    server = srv_mmrm.default,
+    ui = ui_mmrm.default,
+    ui_args = c(data_extract_list, args[!names(args) %in% names(data_extract_list)]),
     server_args = c(
       data_extract_list,
       list(
@@ -658,7 +688,7 @@ tm_a_mmrm <- function(label,
 }
 
 #' @keywords internal
-ui_mmrm <- function(id, ...) {
+ui_mmrm.default <- function(id, ...) {
   a <- list(...) # module args
   ns <- NS(id)
   is_single_dataset_value <- teal.transform::is_single_dataset(
@@ -893,8 +923,7 @@ ui_mmrm <- function(id, ...) {
   )
 }
 
-#' @keywords internal
-srv_mmrm <- function(id,
+srv_mmrm.default <- function(id,
                      data,
                      dataname,
                      parentname,
@@ -1034,6 +1063,7 @@ srv_mmrm <- function(id,
           teal.reporter::teal_card(obj),
           teal.reporter::teal_card("## Module's output(s)")
         )
+
       obj %>%
         teal.code::eval_code(code = as.expression(anl_inputs()$expr)) %>%
         teal.code::eval_code(code = as.expression(adsl_merge_inputs()$expr))
@@ -1520,19 +1550,13 @@ srv_mmrm <- function(id,
     })
 
     plot_r <- reactive({
-      if (is.null(plot_q())) {
-        NULL
-      } else {
-        decorated_objs_q[[obj_ix_r()]]()[[obj_ix_r()]]
-      }
+      req(!is.null(plot_q()))
+      decorated_objs_q[[obj_ix_r()]]()[[obj_ix_r()]]
     })
 
     table_r <- reactive({
-      if (is.null(table_q())) {
-        NULL
-      } else {
-        decorated_objs_q[[obj_ix_r()]]()[[obj_ix_r()]]
-      }
+      req(!is.null(table_q()))
+      decorated_objs_q[[obj_ix_r()]]()[[obj_ix_r()]]
     })
 
     pws <- teal.widgets::plot_with_settings_srv(