Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2e85653
use restoreInput in update functions
Mar 13, 2024
06c3a38
Merge branch 'main' into 898_save_app_state3@main
chlebowa Mar 15, 2024
b49a4b1
fix typo
Mar 15, 2024
8c37458
fix typo ctd.
Mar 15, 2024
a0e345d
styling
Mar 15, 2024
bcc5d75
fix typos 3
Mar 15, 2024
3612335
trigger
Mar 18, 2024
ef4ddc3
Merge branch 'main' into 898_save_app_state3@main
chlebowa Mar 20, 2024
64ef378
Merge branch 'main' into 898_save_app_state3@main
Mar 20, 2024
19cca0a
remove shiny prefixes
Mar 20, 2024
4c4b07c
bookmarkable flag: tm_g_barchart_simple
Mar 27, 2024
3f748ce
bookmarkable flag: tm_g_ci
Mar 27, 2024
c4833c5
bookmarkable flag: tm_a_gee
Mar 27, 2024
9a66b78
empty teal bookmarkable flags in all unverified modules
Mar 27, 2024
af65edc
[skip roxygen] [skip vbump] Roxygen Man Pages Auto Update
dependabot-preview[bot] Mar 27, 2024
403b09d
bookmarkable flag: tm_g_forest_rsp
Mar 27, 2024
7240d08
bookmarkable flag: tm_g_forest_tte
Mar 27, 2024
9f2cf30
add comment
Mar 27, 2024
0f9962e
bookmarkable flag: tm_g_ipp
Mar 27, 2024
71dbc68
bookmarkable flag: tm_g_km
Mar 27, 2024
6dfabb4
bookmarkable flag: tm_g_lineplot
Mar 27, 2024
2b1e1a7
bookmarkable flag: tm_g_pp_adverse_events
Mar 27, 2024
a977bbe
bookmarkable flag: tm_g_pp_patient_timeline
Mar 27, 2024
03424c1
bookmarkable flag: tm_g_pp_therapy
Mar 27, 2024
c16cb20
bookmarkable flag: tm_g_pp_vitals
Mar 27, 2024
160feb0
bookmarkable flag: tm_t_abnormality_by_worst_grade
Mar 27, 2024
d4e0970
bookmarkable flag: tm_t_abnormality
Mar 27, 2024
2c69de5
bookmarkable flag: tm_t_binary_outcome
Mar 27, 2024
d10badb
fix quotation marks
Mar 28, 2024
432996c
teal_bookmarkable flag: tm_t_acnova
Mar 28, 2024
6097eae
Merge branch '898_save_app_state3@main' of github.com:insightsenginee…
Mar 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions R/tm_a_gee.R
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ tm_a_gee <- function(label,
aval_var = cs_to_des_select(aval_var, dataname = dataname)
)

teal::module(
ans <- teal::module(
label = label,
server = srv_gee,
ui = ui_gee,
Expand All @@ -245,6 +245,8 @@ tm_a_gee <- function(label,
),
datanames = teal.transform::get_extract_datanames(data_extract_list)
)
attr(ans, "teal_bookmarkable") <- FALSE
ans
}

ui_gee <- function(id, ...) {
Expand Down Expand Up @@ -390,6 +392,8 @@ srv_gee <- function(id,
checkmate::assert_class(isolate(data()), "teal_data")

moduleServer(id, function(input, output, session) {
ns <- session$ns

## split_covariates ----
observeEvent(input[[extract_input("cov_var", dataname)]],
ignoreNULL = FALSE,
Expand All @@ -408,7 +412,7 @@ srv_gee <- function(id,
teal.widgets::updateOptionalSelectInput(
session,
inputId = extract_input("split_covariates", dataname),
selected = split_covariates_selected
selected = restoreInput(ns(extract_input("split_covariates", dataname)), split_covariates_selected)
)
}
)
Expand Down
8 changes: 6 additions & 2 deletions R/tm_a_mmrm.R
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ tm_a_mmrm <- function(label,
aval_var = cs_to_des_select(aval_var, dataname = dataname)
)

module(
ans <- module(
label = label,
server = srv_mmrm,
ui = ui_mmrm,
Expand All @@ -600,6 +600,8 @@ tm_a_mmrm <- function(label,
),
datanames = teal.transform::get_extract_datanames(data_extract_list)
)
attr(ans, "teal_bookmarkable") <- NULL
ans
}

#' @keywords internal
Expand Down Expand Up @@ -846,6 +848,8 @@ srv_mmrm <- function(id,
checkmate::assert_class(isolate(data()), "teal_data")

moduleServer(id, function(input, output, session) {
ns <- session$ns

# Reactive responsible for sending a disable/enable signal
# to show R code and debug info buttons
disable_r_code <- reactiveVal(FALSE)
Expand All @@ -863,7 +867,7 @@ srv_mmrm <- function(id,
teal.widgets::updateOptionalSelectInput(
session,
inputId = extract_input("split_covariates", dataname),
selected = split_covariates_selected
selected = restoreInput(ns(extract_input("split_covariates", dataname)), split_covariates_selected)
)
})

Expand Down
4 changes: 3 additions & 1 deletion R/tm_g_barchart_simple.R
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ tm_g_barchart_simple <- function(x = NULL,
)

ui_args <- as.list(environment())
module(
ans <- module(
label = label,
server = srv_g_barchart_simple,
ui = ui_g_barchart_simple,
Expand All @@ -190,6 +190,8 @@ tm_g_barchart_simple <- function(x = NULL,
),
datanames = "all"
)
attr(ans, "teal_bookmarkable") <- TRUE
ans
}

#' @keywords internal
Expand Down
4 changes: 3 additions & 1 deletion R/tm_g_ci.R
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ tm_g_ci <- function(label,

args <- as.list(environment())

module(
ans <- module(
label = label,
server = srv_g_ci,
server_args = list(
Expand All @@ -311,6 +311,8 @@ tm_g_ci <- function(label,
ui_args = args,
datanames = "all"
)
attr(ans, "teal_bookmarkable") <- TRUE
ans
}

#' @keywords internal
Expand Down
90 changes: 43 additions & 47 deletions R/tm_g_forest_rsp.R
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ tm_g_forest_rsp <- function(label,
strata_var = cs_to_des_select(strata_var, dataname = parentname, multiple = TRUE)
)

module(
ans <- module(
label = label,
ui = ui_g_forest_rsp,
ui_args = c(data_extract_list, args),
Expand All @@ -388,6 +388,10 @@ tm_g_forest_rsp <- function(label,
),
datanames = teal.transform::get_extract_datanames(data_extract_list)
)
# not bookmarkable b/c of arm_ref_comp_observer using teal.wigdets::draggable_buckets and JS therein
# https://github.com/insightsengineering/teal.widgets/issues/239
attr(ans, "teal_bookmarkable") <- FALSE
ans
}

#' @keywords internal
Expand Down Expand Up @@ -417,13 +421,7 @@ ui_g_forest_rsp <- function(id, ...) {
data_extract_spec = a$aval_var,
is_single_dataset = is_single_dataset_value
),
selectInput(
ns("responders"),
"Responders",
choices = c("CR", "PR"),
selected = c("CR", "PR"),
multiple = TRUE
),
uiOutput(ns("container_responders")),
teal.transform::data_extract_ui(
id = ns("arm_var"),
label = "Select Treatment Variable",
Expand Down Expand Up @@ -509,6 +507,8 @@ srv_g_forest_rsp <- function(id,
checkmate::assert_class(isolate(data()), "teal_data")

moduleServer(id, function(input, output, session) {
ns <- session$ns

# Setup arm variable selection, default reference arms, and default
# comparison arms for encoding panel
iv_arm_ref <- arm_ref_comp_observer(
Expand Down Expand Up @@ -567,52 +567,48 @@ srv_g_forest_rsp <- function(id,
teal.code::eval_code(code = as.expression(adsl_inputs()$expr))
})

observeEvent(
eventExpr = c(
input[[extract_input("aval_var", "ADRS")]],
input[[extract_input("paramcd", paramcd$filter[[1]]$dataname, filter = TRUE)]]
),
handlerExpr = {
req(anl_q())
anl <- anl_q()[["ANL"]]
aval_var <- anl_inputs()$columns_source$aval_var
paramcd_level <- unlist(anl_inputs()$filter_info$paramcd[[1]]$selected)
if (length(paramcd_level) == 0) {
return(NULL)
}
output$container_responders <- renderUI({
req(anl_q())

sel_param <- if (is.list(default_responses)) {
default_responses[[paramcd_level]]
} else {
default_responses
}
anl <- anl_q()[["ANL"]]
aval_var <- anl_inputs()$columns_source$aval_var
paramcd_level <- unlist(anl_inputs()$filter_info$paramcd[[1]]$selected)

req(length(paramcd_level) != 0)

common_rsp <- if (is.list(sel_param)) {
sel_param$rsp
} else {
sel_param
}
responder_choices <- if (length(aval_var) == 0) {
character(0)
} else {
if ("levels" %in% names(sel_param)) {
if (length(intersect(unique(anl[[aval_var]]), sel_param$levels)) > 1) {
sel_param$levels
} else {
union(anl[[aval_var]], sel_param$levels)
}
sel_param <- if (is.list(default_responses)) {
default_responses[[paramcd_level]]
} else {
default_responses
}

common_rsp <- if (is.list(sel_param)) {
sel_param$rsp
} else {
sel_param
}
responder_choices <- if (length(aval_var) == 0) {
character(0)
} else {
if ("levels" %in% names(sel_param)) {
if (length(intersect(unique(anl[[aval_var]]), sel_param$levels)) > 1) {
sel_param$levels
} else {
unique(anl[[aval_var]])
union(anl[[aval_var]], sel_param$levels)
}
} else {
unique(anl[[aval_var]])
}
updateSelectInput(
session, "responders",
choices = responder_choices,
selected = intersect(responder_choices, common_rsp)
)
}
)

selectInput(
ns("responders"),
"Responders",
choices = responder_choices,
selected = intersect(responder_choices, common_rsp),
multiple = TRUE
)
})

# Prepare the analysis environment (filter data, check data, populate envir).
validate_checks <- reactive({
Expand Down
6 changes: 5 additions & 1 deletion R/tm_g_forest_tte.R
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ tm_g_forest_tte <- function(label,
time_unit_var = cs_to_des_select(time_unit_var, dataname = dataname)
)

module(
ans <- module(
label = label,
server = srv_g_forest_tte,
ui = ui_g_forest_tte,
Expand All @@ -369,6 +369,10 @@ tm_g_forest_tte <- function(label,
),
datanames = teal.transform::get_extract_datanames(data_extract_list)
)
# pending https://github.com/insightsengineering/teal.transform/issues/210
# likely also https://github.com/insightsengineering/teal.widgets/issues/239
attr(ans, "teal_bookmarkable") <- NULL
ans
}

#' @keywords internal
Expand Down
4 changes: 3 additions & 1 deletion R/tm_g_ipp.R
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ tm_g_ipp <- function(label,
paramcd = cs_to_des_filter(paramcd, dataname = dataname)
)

module(
ans <- module(
label = label,
server = srv_g_ipp,
ui = ui_g_ipp,
Expand All @@ -355,6 +355,8 @@ tm_g_ipp <- function(label,
),
datanames = teal.transform::get_extract_datanames(data_extract_list)
)
attr(ans, "teal_bookmarkable") <- FALSE
ans
}

#' @keywords internal
Expand Down
6 changes: 5 additions & 1 deletion R/tm_g_km.R
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ tm_g_km <- function(label,
time_unit_var = cs_to_des_select(time_unit_var, dataname = dataname)
)

module(
ans <- module(
label = label,
server = srv_g_km,
ui = ui_g_km,
Expand All @@ -378,6 +378,10 @@ tm_g_km <- function(label,
),
datanames = teal.transform::get_extract_datanames(data_extract_list)
)
# pending https://github.com/insightsengineering/teal.transform/issues/210
# likely also https://github.com/insightsengineering/teal.widgets/issues/239
attr(ans, "teal_bookmarkable") <- NULL
ans
}

#' @keywords internal
Expand Down
5 changes: 4 additions & 1 deletion R/tm_g_lineplot.R
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ tm_g_lineplot <- function(label,
paramcd = cs_to_des_select(paramcd, dataname = dataname)
)

module(
ans <- module(
label = label,
server = srv_g_lineplot,
ui = ui_g_lineplot,
Expand All @@ -335,6 +335,9 @@ tm_g_lineplot <- function(label,
),
datanames = teal.transform::get_extract_datanames(data_extract_list)
)
# pending https://github.com/insightsengineering/teal.transform/issues/210
attr(ans, "teal_bookmarkable") <- NULL
ans
}

#' @keywords internal
Expand Down
Loading