picks

DESCRIPTION

@@ -48,6 +48,7 @@ Imports:
     lattice (>= 0.18-4),
     lifecycle (>= 0.2.0),
     MASS (>= 7.3-60),
+    rlang,
     rtables (>= 0.6.11),
     scales (>= 1.3.0),
     shinyjs (>= 2.1.0),
@@ -72,8 +73,6 @@ Suggests:
     logger (>= 0.4.0),
     nestcolor (>= 0.1.0),
     pkgload,
-    rlang (>= 1.0.0),
-    rmarkdown (>= 2.23),
     roxy.shinylive,
     rvest,
     shinytest2,
@@ -83,8 +82,8 @@ VignetteBuilder:
     knitr,
     rmarkdown
 Remotes:
-    insightsengineering/teal,
-    insightsengineering/teal.reporter
+    insightsengineering/teal@redesign_extraction@main,
+    insightsengineering/teal.transform@redesign_extraction@main
 Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2,
     rstudio/shiny, insightsengineering/teal,
     insightsengineering/teal.transform, mllg/checkmate, tidyverse/dplyr,

NAMESPACE

@@ -8,6 +8,24 @@ S3method(create_sparklines,default)
 S3method(create_sparklines,factor)
 S3method(create_sparklines,logical)
 S3method(create_sparklines,numeric)
+S3method(tm_a_pca,default)
+S3method(tm_a_pca,picks)
+S3method(tm_a_regression,default)
+S3method(tm_a_regression,picks)
+S3method(tm_g_association,default)
+S3method(tm_g_association,picks)
+S3method(tm_g_bivariate,default)
+S3method(tm_g_bivariate,picks)
+S3method(tm_g_distribution,default)
+S3method(tm_g_distribution,picks)
+S3method(tm_g_response,default)
+S3method(tm_g_response,picks)
+S3method(tm_g_scatterplot,default)
+S3method(tm_g_scatterplot,picks)
+S3method(tm_g_scatterplotmatrix,default)
+S3method(tm_g_scatterplotmatrix,picks)
+S3method(tm_t_crosstable,default)
+S3method(tm_t_crosstable,picks)
 export(add_facet_labels)
 export(get_scatterplotmatrix_stats)
 export(tm_a_pca)
@@ -31,3 +49,4 @@ import(teal)
 import(teal.transform)
 importFrom(dplyr,"%>%")
 importFrom(lifecycle,deprecated)
+importFrom(rlang,":=")

R/picks-datanames.R

@@ -0,0 +1,16 @@
+.picks_datanames <- function(x) {
+  checkmate::assert_list(x, c("picks", "NULL"))
+  datanames_list <- lapply(x, function(x) {
+    if (is.character(x$datasets$choices)) {
+      x$datasets$choices
+    } else {
+      NULL
+    }
+  })
+
+  if (any(vapply(datanames_list, is.null, logical(1)))) {
+    "all"
+  } else {
+    unique(unlist(datanames_list))
+  }
+}

R/tm_a_pca.R

@@ -7,8 +7,7 @@
 #'
 #' @inheritParams teal::module
 #' @inheritParams shared_params
-#' @param dat (`data_extract_spec` or `list` of multiple `data_extract_spec`)
-#' specifying columns used to compute PCA.
+#' @param dat (`picks`) specifying columns used to compute PCA.
 #' @param font_size (`numeric`) optional, specifies font size.
 #' It controls the font size for plot titles, axis labels, and legends.
 #' - If vector of `length == 1` then the font sizes will have a fixed size.
@@ -67,16 +66,13 @@
 #'   modules = modules(
 #'     tm_a_pca(
 #'       "PCA",
-#'       dat = data_extract_spec(
-#'         dataname = "USArrests",
-#'         select = select_spec(
-#'           choices = variable_choices(
-#'             data = data[["USArrests"]], c("Murder", "Assault", "UrbanPop", "Rape")
-#'           ),
+#'       dat = teal.transform::picks(
+#'         datasets("USArrests"),
+#'         teal.transform::variables(
+#'           choices = c("Murder", "Assault", "UrbanPop", "Rape"),
 #'           selected = c("Murder", "Assault"),
 #'           multiple = TRUE
-#'         ),
-#'         filter = NULL
+#'         )
 #'       )
 #'     )
 #'   )
@@ -103,17 +99,13 @@
 #'   data = data,
 #'   modules = modules(
 #'     tm_a_pca(
-#'       "PCA",
-#'       dat = data_extract_spec(
-#'         dataname = "ADSL",
-#'         select = select_spec(
-#'           choices = variable_choices(
-#'             data = data[["ADSL"]], c("BMRKR1", "AGE", "EOSDY")
-#'           ),
+#'       dat = teal.transform::picks(
+#'         datasets("ADSL"),
+#'         teal.transform::variables(
+#'           choices = c("BMRKR1", "AGE", "EOSDY"),
 #'           selected = c("BMRKR1", "AGE"),
 #'           multiple = TRUE
-#'         ),
-#'         filter = NULL
+#'         )
 #'       )
 #'     )
 #'   )
@@ -125,7 +117,14 @@
 #' @export
 #'
 tm_a_pca <- function(label = "Principal Component Analysis",
-                     dat,
+                     dat = teal.transform::picks(
+                       teal.transform::datasets(),
+                       teal.transform::variables(
+                         choices = tidyselect::where(~ is.numeric(.x) && all(!is.na(.x))),
+                         selected = tidyselect::everything(),
+                         multiple = TRUE
+                       )
+                     ),
                      plot_height = c(600, 200, 2000),
                      plot_width = NULL,
                      ggtheme = c("gray", "bw", "linedraw", "light", "dark", "minimal", "classic", "void"),
@@ -138,6 +137,24 @@
                      post_output = NULL,
                      transformators = list(),
                      decorators = list()) {
+  UseMethod("tm_a_pca", dat)
+}
+
+#' @export
+tm_a_pca.default <- function(label = "Principal Component Analysis",
+                             dat,
+                             plot_height = c(600, 200, 2000),
+                             plot_width = NULL,
+                             ggtheme = c("gray", "bw", "linedraw", "light", "dark", "minimal", "classic", "void"),
+                             ggplot2_args = teal.widgets::ggplot2_args(),
+                             rotate_xaxis_labels = FALSE,
+                             font_size = c(12, 8, 20),
+                             alpha = c(1, 0, 1),
+                             size = c(2, 1, 8),
+                             pre_output = NULL,
+                             post_output = NULL,
+                             transformators = list(),
+                             decorators = list()) {
   message("Initializing tm_a_pca")
 
   # Normalize the parameters
@@ -198,8 +215,8 @@
 
   ans <- module(
     label = label,
-    server = srv_a_pca,
-    ui = ui_a_pca,
+    server = srv_a_pca.default,
+    ui = ui_a_pca.default,
     ui_args = args,
     server_args = c(
       data_extract_list,
@@ -218,7 +235,7 @@
 }
 
 # UI function for the PCA module
-ui_a_pca <- function(id, ...) {
+ui_a_pca.default <- function(id, ...) {
   ns <- NS(id)
   args <- list(...)
   is_single_dataset_value <- teal.transform::is_single_dataset(args$dat)
@@ -347,7 +364,7 @@
 }
 
 # Server function for the PCA module
-srv_a_pca <- function(id, data, dat, plot_height, plot_width, ggplot2_args, decorators) {
+srv_a_pca.default <- function(id, data, dat, plot_height, plot_width, ggplot2_args, decorators) {
   checkmate::assert_class(data, "reactive")
   checkmate::assert_class(isolate(data()), "teal_data")
   moduleServer(id, function(input, output, session) {