update tm_g_forest_tte (#1336)

# Pull Request

<!--- Replace `#nnn` with your issue link for reference. -->

Fixes #nnn

---------

Signed-off-by: Lluís Revilla <[email protected]>
Co-authored-by: Lluís Revilla <[email protected]>

NEWS.md

@@ -19,6 +19,7 @@
 
 ### Bug fixes
 * Fixed bug in creating modules with `delayed_data` and `teal.transform::all_choices`.
+* Fixed bug in `tm_g_forest_tte` and `tm_g_forest_rsp` to resolve delayed data loading variables. 
 
 # teal.modules.clinical 0.9.1
 

R/tm_g_forest_rsp.R

@@ -752,8 +752,8 @@ srv_g_forest_rsp <- function(id,
 
       strata_var <- as.vector(anl_m$columns_source$strata_var)
       subgroup_var <- as.vector(anl_m$columns_source$subgroup_var)
-
-      obj_var_name <- get_g_forest_obj_var_name(paramcd, input)
+      resolved_paramcd <- teal.transform::resolve_delayed(paramcd, as.list(data()))
+      obj_var_name <- get_g_forest_obj_var_name(resolved_paramcd, input)
 
       my_calls <- template_forest_rsp(
         dataname = "ANL",

R/tm_g_forest_tte.R

@@ -581,7 +581,9 @@ srv_g_forest_tte <- function(id,
         cnsr_var = shinyvalidate::sv_required("A censor variable is required"),
         arm_var = shinyvalidate::sv_required("A treatment variable is required")
       ),
-      filter_validation_rule = list(paramcd = shinyvalidate::sv_required(message = "Please select Endpoint filter."))
+      filter_validation_rule = list(
+        paramcd = shinyvalidate::sv_required(message = "Please select Endpoint filter.")
+      )
     )
 
     iv_r <- reactive({
@@ -592,7 +594,7 @@ srv_g_forest_tte <- function(id,
         shinyvalidate::sv_between(0, 1, message_fmt = "Confidence level must be between 0 and 1")
       )
       iv$add_validator(iv_arm_ref)
-      teal.transform::compose_and_enable_validators(iv, selector_list)
+      teal.transform::compose_and_enable_validators(iv, selector_list, c("arm_var", "aval_var", "paramcd"))
     })
 
     anl_inputs <- teal.transform::merge_expression_srv(
@@ -681,8 +683,8 @@ srv_g_forest_tte <- function(id,
 
       strata_var <- as.vector(anl_m$columns_source$strata_var)
       subgroup_var <- as.vector(anl_m$columns_source$subgroup_var)
-
-      obj_var_name <- get_g_forest_obj_var_name(paramcd, input)
+      resolved_paramcd <- teal.transform::resolve_delayed(paramcd, as.list(data()))
+      obj_var_name <- get_g_forest_obj_var_name(resolved_paramcd, input)
 
       my_calls <- template_forest_tte(
         dataname = "ANL",

R/utils.R

@@ -844,12 +844,13 @@ clean_description <- function(x) {
 #' @keywords internal
 #'
 get_g_forest_obj_var_name <- function(paramcd, input, filter_idx = 1) {
-  choices <- paramcd$filter[[filter_idx]]$choices
   input_obj <- paste0(
     "paramcd-dataset_", paramcd$dataname,
     "_singleextract-filter", filter_idx, "-vals"
   )
+
   current_selected <- input[[input_obj]]
+  choices <- paramcd$filter[[filter_idx]]$choices
   obj_var_name <- names(choices)[choices == current_selected]
   obj_var_name
 }