Skip to content

736 Allow pure card functions in modules #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

736 Allow pure card functions in modules #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8688465
add env argument
chlebowa Apr 23, 2024
0d4570c
allow ellipsis in card_fun
chlebowa Apr 23, 2024
45faca2
no need for ... in card function
chlebowa Apr 24, 2024
6309630
Merge branch 'main' into in_teal.reporter@custom_card_functions@main
chlebowa Apr 24, 2024
87e6a6e
clear white space
chlebowa Apr 24, 2024
efaac21
Merge branch 'main' into in_teal.reporter@custom_card_functions@main
chlebowa May 2, 2024
25ee2d9
Merge branch 'main' into in_teal.reporter@custom_card_functions@main
chlebowa May 29, 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
9 changes: 7 additions & 2 deletions R/AddCardModule.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,11 @@ add_card_button_ui <- function(id) {

#' @rdname add_card_button
#' @export
add_card_button_srv <- function(id, reporter, card_fun) {
add_card_button_srv <- function(id, reporter, card_fun, env) {
checkmate::assert_function(card_fun)
checkmate::assert_class(reporter, "Reporter")
checkmate::assert_subset(names(formals(card_fun)), c("card", "comment", "label"), empty.ok = TRUE)
checkmate::assert_subset(names(formals(card_fun)), c("card", "comment", "label", "env"), empty.ok = TRUE)
checkmate::assert_environment(env, null.ok = TRUE)

shiny::moduleServer(id, function(input, output, session) {
shiny::setBookmarkExclude(c(
Expand Down Expand Up @@ -160,6 +161,7 @@ add_card_button_srv <- function(id, reporter, card_fun) {
has_card_arg <- "card" %in% card_fun_args_nams
has_comment_arg <- "comment" %in% card_fun_args_nams
has_label_arg <- "label" %in% card_fun_args_nams
has_env_arg <- "label" %in% card_fun_args_nams

arg_list <- list()

Expand All @@ -169,6 +171,9 @@ add_card_button_srv <- function(id, reporter, card_fun) {
if (has_label_arg) {
arg_list <- c(arg_list, list(label = input$label))
}
if (has_env_arg && !is.null(env)) {
arg_list <- c(arg_list, env = env)
}

if (has_card_arg) {
# The default_card is defined here because formals() returns a pairedlist object
Expand Down
18 changes: 12 additions & 6 deletions R/SimpleReporter.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,24 @@ simple_reporter_srv <- function(
card_fun,
global_knitr = getOption("teal.reporter.global_knitr"),
rmd_output = c(
"html" = "html_document", "pdf" = "pdf_document",
"powerpoint" = "powerpoint_presentation", "word" = "word_document"
"html" = "html_document",
"pdf" = "pdf_document",
"powerpoint" = "powerpoint_presentation",
"word" = "word_document"
),
rmd_yaml_args = list(
author = "NEST", title = "Report",
date = as.character(Sys.Date()), output = "html_document",
author = "NEST",
title = "Report",
date = as.character(Sys.Date()),
output = "html_document",
toc = FALSE
)) {
),
env
) {
shiny::moduleServer(
id,
function(input, output, session) {
add_card_button_srv("add_report_card_simple", reporter = reporter, card_fun = card_fun)
add_card_button_srv("add_report_card_simple", reporter = reporter, card_fun = card_fun, env = env)
download_report_button_srv(
"download_button_simple",
reporter = reporter,
Expand Down