Simpify design of tm_g_events_term_id, fix failing CI fixes

NAMESPACE

@@ -8,7 +8,6 @@ export(tm_g_ae_oview)
 export(tm_g_ae_sub)
 export(tm_g_butterfly)
 export(tm_g_events_term_id)
-export(tm_g_events_term_id.picks)
 export(tm_g_heat_bygrade)
 export(tm_g_patient_profile)
 export(tm_g_spiderplot)

R/teal.osprey.R

@@ -4,6 +4,6 @@
 #' the analysis functions from `osprey` package. See package [website](https://insightsengineering.github.io/osprey/).
 #' This enables `teal` app developers to easily create applications making use of the `osprey` analysis functions.
 #'
-#' @import dplyr osprey shiny teal formatters teal.picks teal.transform
+#' @import dplyr osprey shiny teal formatters teal.transform teal.picks
 #' @keywords internal
 "_PACKAGE"

R/tm_g_butterfly.R

@@ -116,7 +116,7 @@ tm_g_butterfly <- function(label,
                            color_by_var,
                            count_by_var,
                            facet_var = NULL,
-                           sort_by_var = values(
+                           sort_by_var = teal.picks::values(
                              choices = c("count", "alphabetical"),
                              selected = "count"
                            ),
@@ -478,6 +478,12 @@ srv_g_butterfly <- function(
           })
         )
 
+        # This is redundant, only added to avoid NOTE in R CMD check
+        right <- q1[["right"]]
+        right_name <- q1[["right_name"]]
+        left <- q1[["left"]]
+        left_name <- q1[["left_name"]]
+
         teal.reporter::teal_card(q1) <- c(teal.reporter::teal_card(q1), "### Plot")
 
         if (!is.null(filter_var_name) || !is.null(facet_var_name) || !is.null(sort_by_var_name)) {