Skip to content

Commit

Permalink
Merge branch 'main' into 239_log_shiny_input_change@main
Browse files Browse the repository at this point in the history
  • Loading branch information
m7pr authored May 10, 2024
2 parents 0ea6619 + a6c567b commit 6b88619
Show file tree
Hide file tree
Showing 11 changed files with 5 additions and 75 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: teal.osprey
Title: 'teal' Modules for TLG Functions in Osprey
Version: 0.1.16.9017
Date: 2024-04-29
Version: 0.1.16.9018
Date: 2024-05-10
Authors@R: c(
person("Nina", "Qi", , "[email protected]", role = c("aut", "cre")),
person("Dawid", "Kaledkowski", , "[email protected]", role = "aut"),
Expand Down
4 changes: 3 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# teal.osprey 0.1.16.9017
# teal.osprey 0.1.16.9018

* Removed `Show Warnings` modals from modules.

### Breaking Changes
* Adapted all modules to use `teal_data` objects.
Expand Down
8 changes: 0 additions & 8 deletions R/tm_g_ae_oview.R
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ ui_g_ae_oview <- function(id, ...) {
)
),
forms = tagList(
teal.widgets::verbatim_popup_ui(ns("warning"), "Show Warnings"),
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
)
)
Expand Down Expand Up @@ -334,13 +333,6 @@ srv_g_ae_oview <- function(id,

plot_r <- reactive(output_q()[["plot"]])

teal.widgets::verbatim_popup_srv(
id = "warning",
verbatim_content = reactive(teal.code::get_warnings(output_q())),
title = "Warning",
disabled = reactive(is.null(teal.code::get_warnings(output_q())))
)

teal.widgets::verbatim_popup_srv(
id = "rcode",
verbatim_content = reactive(teal.code::get_code(output_q())),
Expand Down
8 changes: 0 additions & 8 deletions R/tm_g_ae_sub.R
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ ui_g_ae_sub <- function(id, ...) {
)
),
forms = tagList(
teal.widgets::verbatim_popup_ui(ns("warning"), "Show Warnings"),
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
)
)
Expand Down Expand Up @@ -375,13 +374,6 @@ srv_g_ae_sub <- function(id,

plot_r <- reactive(output_q()[["plot"]])

teal.widgets::verbatim_popup_srv(
id = "warning",
verbatim_content = reactive(teal.code::get_warnings(output_q())),
title = "Warning",
disabled = reactive(is.null(teal.code::get_warnings(output_q())))
)

teal.widgets::verbatim_popup_srv(
id = "rcode",
verbatim_content = reactive(teal.code::get_code(output_q())),
Expand Down
8 changes: 0 additions & 8 deletions R/tm_g_butterfly.R
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@ ui_g_butterfly <- function(id, ...) {
)
),
forms = tagList(
teal.widgets::verbatim_popup_ui(ns("warning"), "Show Warnings"),
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
),
pre_output = a$pre_output,
Expand Down Expand Up @@ -505,13 +504,6 @@ srv_g_butterfly <- function(id, data, filter_panel_api, reporter, dataname, labe
width = plot_width
)

teal.widgets::verbatim_popup_srv(
id = "warning",
verbatim_content = reactive(teal.code::get_warnings(output_q())),
title = "Warning",
disabled = reactive(is.null(teal.code::get_warnings(output_q())))
)

teal.widgets::verbatim_popup_srv(
id = "rcode",
title = paste("R code for", label),
Expand Down
8 changes: 0 additions & 8 deletions R/tm_g_events_term_id.R
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ ui_g_events_term_id <- function(id, ...) {
)
),
forms = tagList(
teal.widgets::verbatim_popup_ui(ns("warning"), "Show Warnings"),
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
)
)
Expand Down Expand Up @@ -365,13 +364,6 @@ srv_g_events_term_id <- function(id,

plot_r <- reactive(output_q()[["plot"]])

teal.widgets::verbatim_popup_srv(
id = "warning",
verbatim_content = reactive(teal.code::get_warnings(output_q())),
title = "Warning",
disabled = reactive(is.null(teal.code::get_warnings(output_q())))
)

teal.widgets::verbatim_popup_srv(
id = "rcode",
title = paste("R code for", label),
Expand Down
8 changes: 0 additions & 8 deletions R/tm_g_heat_bygrade.R
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@ ui_g_heatmap_bygrade <- function(id, ...) {
)
),
forms = tagList(
teal.widgets::verbatim_popup_ui(ns("warning"), "Show Warnings"),
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
)
)
Expand Down Expand Up @@ -458,13 +457,6 @@ srv_g_heatmap_bygrade <- function(id,

plot_r <- reactive(output_q()[["plot"]])

teal.widgets::verbatim_popup_srv(
id = "warning",
verbatim_content = reactive(teal.code::get_warnings(output_q())),
title = "Warning",
disabled = reactive(is.null(teal.code::get_warnings(output_q())))
)

teal.widgets::verbatim_popup_srv(
id = "rcode",
title = paste("R code for", label),
Expand Down
8 changes: 0 additions & 8 deletions R/tm_g_patient_profile.R
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,6 @@ ui_g_patient_profile <- function(id, ...) {
)
),
forms = tagList(
teal.widgets::verbatim_popup_ui(ns("warning"), "Show Warnings"),
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
),
pre_output = a$pre_output,
Expand Down Expand Up @@ -898,13 +897,6 @@ srv_g_patient_profile <- function(id,
width = plot_width
)

teal.widgets::verbatim_popup_srv(
id = "warning",
verbatim_content = reactive(teal.code::get_warnings(output_q())),
title = "Warning",
disabled = reactive(is.null(teal.code::get_warnings(output_q())))
)

teal.widgets::verbatim_popup_srv(
id = "rcode",
title = paste("R code for", label),
Expand Down
8 changes: 0 additions & 8 deletions R/tm_g_spiderplot.R
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ ui_g_spider <- function(id, ...) {
)
),
forms = tagList(
teal.widgets::verbatim_popup_ui(ns("warning"), "Show Warnings"),
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
),
pre_output = a$pre_output,
Expand Down Expand Up @@ -421,13 +420,6 @@ srv_g_spider <- function(id, data, filter_panel_api, reporter, dataname, label,
width = plot_width
)

teal.widgets::verbatim_popup_srv(
id = "warning",
verbatim_content = reactive(teal.code::get_warnings(output_q())),
title = "Warning",
disabled = reactive(is.null(teal.code::get_warnings(output_q())))
)

teal.widgets::verbatim_popup_srv(
id = "rcode",
title = paste("R code for", label),
Expand Down
8 changes: 0 additions & 8 deletions R/tm_g_swimlane.R
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@ ui_g_swimlane <- function(id, ...) {
)
),
forms = tagList(
teal.widgets::verbatim_popup_ui(ns("warning"), "Show Warnings"),
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
),
pre_output = a$pre_output,
Expand Down Expand Up @@ -518,13 +517,6 @@ srv_g_swimlane <- function(id,
width = plot_width
)

teal.widgets::verbatim_popup_srv(
id = "warning",
verbatim_content = reactive(teal.code::get_warnings(output_q())),
title = "Warning",
disabled = reactive(is.null(teal.code::get_warnings(output_q())))
)

teal.widgets::verbatim_popup_srv(
id = "rcode",
title = paste("R code for", label),
Expand Down
8 changes: 0 additions & 8 deletions R/tm_g_waterfall.R
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ ui_g_waterfall <- function(id, ...) {
)
),
forms = tagList(
teal.widgets::verbatim_popup_ui(ns("warning"), "Show Warnings"),
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
),
pre_output = a$pre_output,
Expand Down Expand Up @@ -542,13 +541,6 @@ srv_g_waterfall <- function(id,
width = plot_width
)

teal.widgets::verbatim_popup_srv(
id = "warning",
verbatim_content = reactive(teal.code::get_warnings(output_q())),
title = "Warning",
disabled = reactive(is.null(teal.code::get_warnings(output_q())))
)

# Show R Code
teal.widgets::verbatim_popup_srv(
id = "rcode",
Expand Down

0 comments on commit 6b88619

Please sign in to comment.