271: Removed dataset name displayed in dropdown menus (#279)

fixes: #271

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

R/tm_g_gh_boxplot.R

@@ -251,15 +251,15 @@ ui_g_boxplot <- function(id, ...) {
       teal.widgets::optionalSelectInput(
         ns("trt_group"),
         label = "Select Treatment Variable",
-        choices = a$trt_group$choices,
+        choices = get_choices(a$trt_group$choices),
         selected = a$trt_group$selected,
         multiple = FALSE
       ),
       uiOutput(ns("axis_selections")),
       teal.widgets::optionalSelectInput(
         ns("facet_var"),
         label = "Facet by",
-        choices = a$facet_var$choices,
+        choices = get_choices(a$facet_var$choices),
         selected = a$facet_var$selected,
         multiple = FALSE
       ),

R/tm_g_gh_correlationplot.R

@@ -286,7 +286,7 @@ ui_g_correlationplot <- function(id, ...) {
       teal.widgets::optionalSelectInput(
         ns("trt_group"),
         label = "Select Treatment Variable",
-        choices = a$trt_group$choices,
+        choices = get_choices(a$trt_group$choices),
         selected = a$trt_group$selected,
         multiple = FALSE
       ),

R/tm_g_gh_density_distribution_plot.R

@@ -199,7 +199,7 @@ ui_g_density_distribution_plot <- function(id, ...) {
       teal.widgets::optionalSelectInput(
         ns("trt_group"),
         label = "Select Treatment Variable",
-        choices = a$trt_group$choices,
+        choices = get_choices(a$trt_group$choices),
         selected = a$trt_group$selected,
         multiple = FALSE
       ),

R/tm_g_gh_lineplot.R

@@ -243,7 +243,7 @@ ui_lineplot <- function(id, ...) {
         teal.widgets::optionalSelectInput(
           ns("trt_group"),
           label = "Select Treatment Variable",
-          choices = a$trt_group$choices,
+          choices = get_choices(a$trt_group$choices),
           selected = a$trt_group$selected,
           multiple = FALSE
         ),
@@ -380,7 +380,7 @@ srv_lineplot <- function(id,
     output$shape_ui <- renderUI({
       if (!is.null(shape_choices)) {
         if (methods::is(shape_choices, "choices_selected")) {
-          choices <- shape_choices$choices
+          choices <- get_choices(shape_choices$choices)
           selected <- shape_choices$selected
         } else {
           choices <- shape_choices

R/tm_g_gh_scatterplot.R

@@ -199,7 +199,7 @@ ui_g_scatterplot <- function(id, ...) {
       teal.widgets::optionalSelectInput(
         ns("trt_group"),
         label = "Select Treatment Variable",
-        choices = a$trt_group$choices,
+        choices = get_choices(a$trt_group$choices),
         selected = a$trt_group$selected,
         multiple = FALSE
       ),

R/tm_g_gh_spaghettiplot.R

@@ -281,7 +281,7 @@ g_ui_spaghettiplot <- function(id, ...) {
         teal.widgets::optionalSelectInput(
           ns("trt_group"),
           label = "Select Treatment Variable",
-          choices = a$trt_group$choices,
+          choices = get_choices(a$trt_group$choices),
           selected = a$trt_group$selected,
           multiple = FALSE
         ),

R/utils.R

@@ -82,3 +82,20 @@ report_card_template_goshawk <- function(title,
   )
   card
 }
+
+#' Get Choices
+#'
+#' This function returns choices based on the class of the input.
+#' If the input is of class `delayed_data`, it returns the `subset` of the input.
+#' Otherwise, it returns the input as is.
+#'
+#' @param choices An object that contains choices.
+#' @return A vector of choices.
+#' @keywords internal
+get_choices <- function(choices) {
+  if (inherits(choices, "delayed_data")) {
+    choices$subset
+  } else {
+    choices
+  }
+}