fix: normalize decorators

averissimo · averissimo · commit 34bc4cd08022 · 2024-11-27T20:32:32.000Z
diff --git a/R/tm_a_pca.R b/R/tm_a_pca.R
@@ -186,7 +186,7 @@ tm_a_pca <- function(label = "Principal Component Analysis",
   checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
 
   available_decorators <- c("elbow_plot", "circle_plot", "biplot", "eigenvector_plot")
-  decorators <- normalize_decorators(decorators, available_decorators)
+  decorators <- normalize_decorators(decorators)
   assert_decorators(decorators, null.ok = TRUE, available_decorators)
   # End of assertions
 
diff --git a/R/tm_data_table.R b/R/tm_data_table.R
@@ -131,7 +131,7 @@ tm_data_table <- function(label = "Data Table",
   checkmate::assert_multi_class(pre_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
   checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
 
-  decorators <- normalize_decorators(decorators, "table")
+  decorators <- normalize_decorators(decorators)
   assert_decorators(decorators, null.ok = TRUE, "table")
   # End of assertions
 
diff --git a/R/tm_g_association.R b/R/tm_g_association.R
@@ -176,7 +176,7 @@ tm_g_association <- function(label = "Association",
   checkmate::assert_list(ggplot2_args, types = "ggplot2_args")
   checkmate::assert_subset(names(ggplot2_args), c("default", plot_choices))
 
-  decorators <- normalize_decorators(decorators, "plot")
+  decorators <- normalize_decorators(decorators)
   assert_decorators(decorators, null.ok = TRUE, "plot")
 
   # End of assertions
diff --git a/R/tm_g_bivariate.R b/R/tm_g_bivariate.R
@@ -276,7 +276,7 @@ tm_g_bivariate <- function(label = "Bivariate Plots",
   checkmate::assert_multi_class(pre_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
   checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
 
-  decorators <- normalize_decorators(decorators, "plot")
+  decorators <- normalize_decorators(decorators)
   assert_decorators(decorators, null.ok = TRUE, "plot")
   # End of assertions
 
diff --git a/R/tm_g_distribution.R b/R/tm_g_distribution.R
@@ -204,7 +204,7 @@ tm_g_distribution <- function(label = "Distribution Module",
   checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
 
   available_decorators <- c("histogram_plot", "qq_plot", "test_table", "summary_table")
-  decorators <- normalize_decorators(decorators, available_decorators)
+  decorators <- normalize_decorators(decorators)
   assert_decorators(decorators, null.ok = TRUE, names = available_decorators)
 
   # End of assertions
diff --git a/R/tm_g_response.R b/R/tm_g_response.R
@@ -201,7 +201,7 @@ tm_g_response <- function(label = "Response Plot",
   checkmate::assert_multi_class(pre_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
   checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
 
-  decorators <- normalize_decorators(decorators, "plot")
+  decorators <- normalize_decorators(decorators)
   assert_decorators(decorators, null.ok = TRUE, "plot")
   # End of assertions
 
diff --git a/R/tm_g_scatterplot.R b/R/tm_g_scatterplot.R
@@ -308,7 +308,7 @@ tm_g_scatterplot <- function(label = "Scatterplot",
   checkmate::assert_scalar(table_dec)
   checkmate::assert_class(ggplot2_args, "ggplot2_args")
 
-  decorators <- normalize_decorators(decorators, "plot")
+  decorators <- normalize_decorators(decorators)
   assert_decorators(decorators, null.ok = TRUE, "plot")
 
   # End of assertions
diff --git a/R/tm_g_scatterplotmatrix.R b/R/tm_g_scatterplotmatrix.R
@@ -203,7 +203,7 @@ tm_g_scatterplotmatrix <- function(label = "Scatterplot Matrix",
   checkmate::assert_multi_class(pre_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
   checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
 
-  decorators <- normalize_decorators(decorators, "plot")
+  decorators <- normalize_decorators(decorators)
   assert_decorators(decorators, null.ok = TRUE, "plot")
   # End of assertions
 
diff --git a/R/tm_missing_data.R b/R/tm_missing_data.R
@@ -153,7 +153,7 @@ tm_missing_data <- function(label = "Missing data",
   checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
 
   available_decorators <- c("summary_plot", "summary_plot", "combination_plot", "by_subject_plot", "summary_table")
-  decorators <- normalize_decorators(decorators, available_decorators)
+  decorators <- normalize_decorators(decorators)
   assert_decorators(decorators, null.ok = TRUE, names = available_decorators)
   # End of assertions
 
diff --git a/R/tm_outliers.R b/R/tm_outliers.R
@@ -197,7 +197,7 @@ tm_outliers <- function(label = "Outliers Module",
   checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
 
   available_decorators <- c("box_plot", "density_plot", "cumulative_plot", "table")
-  decorators <- normalize_decorators(decorators, available_decorators)
+  decorators <- normalize_decorators(decorators)
   assert_decorators(decorators, null.ok = TRUE, names = available_decorators)
   # End of assertions
 
diff --git a/R/tm_t_crosstable.R b/R/tm_t_crosstable.R
@@ -168,7 +168,7 @@ tm_t_crosstable <- function(label = "Cross Table",
   checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
   checkmate::assert_class(basic_table_args, classes = "basic_table_args")
 
-  decorators <- normalize_decorators(decorators, "plot")
+  decorators <- normalize_decorators(decorators)
   assert_decorators(decorators, null.ok = TRUE, "plot")
   # End of assertions
 
diff --git a/R/utils.R b/R/utils.R
@@ -394,18 +394,16 @@ subset_decorators <- function(scope, decorators) {
 #' Convert flat list of `teal_transform_module` to named lists
 #'
 #' @param decorators (list of `teal_transformodules`) to normalize.
-#' @param available_decorators (`character`) a character vector of available decorator names.
-#' When `NULL` it assumes that all decorators should be applied, which can be used
-#' when module only has 1 object.
 #' @return A named list of lists with `teal_transform_module` objects.
 #' @keywords internal
-normalize_decorators <- function(decorators, available_decorators = NULL) {
-  available_decorators <- union("default", available_decorators)
+normalize_decorators <- function(decorators) {
   if (checkmate::test_list(decorators, "teal_transform_module", null.ok = TRUE)) {
-    decorators <- if (checkmate::test_names(names(decorators), subset.of = available_decorators)) {
+    if (checkmate::test_names(names(decorators))) {
       lapply(decorators, list)
     } else {
       list(default = decorators)
     }
+  } else {
+    decorators
   }
 }
