From 1d5f0d2270dcd6cc54a0c11ca5c38bd188c8c997 Mon Sep 17 00:00:00 2001 From: Marcin <133694481+m7pr@users.noreply.github.com> Date: Fri, 10 May 2024 10:56:34 +0200 Subject: [PATCH 1/2] 1176 remove `Show Warnings` from modules (#264) Part of https://github.com/insightsengineering/teal/issues/1176 --------- Signed-off-by: kartikeya kirar Signed-off-by: Marcin <133694481+m7pr@users.noreply.github.com> Co-authored-by: unknown Co-authored-by: 27856297+dependabot-preview[bot]@users.noreply.github.com <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- NEWS.md | 2 ++ R/tm_g_ae_oview.R | 8 -------- R/tm_g_ae_sub.R | 8 -------- R/tm_g_butterfly.R | 8 -------- R/tm_g_events_term_id.R | 8 -------- R/tm_g_heat_bygrade.R | 8 -------- R/tm_g_patient_profile.R | 8 -------- R/tm_g_spiderplot.R | 8 -------- R/tm_g_swimlane.R | 8 -------- R/tm_g_waterfall.R | 8 -------- 10 files changed, 2 insertions(+), 72 deletions(-) diff --git a/NEWS.md b/NEWS.md index 9fe8fa93..d2500120 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,7 @@ # teal.osprey 0.1.16.9017 +* Removed `Show Warnings` modals from modules. + ### Breaking Changes * Adapted all modules to use `teal_data` objects. diff --git a/R/tm_g_ae_oview.R b/R/tm_g_ae_oview.R index 13f5858e..ba5b690d 100644 --- a/R/tm_g_ae_oview.R +++ b/R/tm_g_ae_oview.R @@ -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") ) ) @@ -333,13 +332,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())), diff --git a/R/tm_g_ae_sub.R b/R/tm_g_ae_sub.R index bed0eda4..2f556da6 100644 --- a/R/tm_g_ae_sub.R +++ b/R/tm_g_ae_sub.R @@ -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") ) ) @@ -374,13 +373,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())), diff --git a/R/tm_g_butterfly.R b/R/tm_g_butterfly.R index 6f0dd025..64562d95 100644 --- a/R/tm_g_butterfly.R +++ b/R/tm_g_butterfly.R @@ -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, @@ -504,13 +503,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), diff --git a/R/tm_g_events_term_id.R b/R/tm_g_events_term_id.R index 2539762b..e4c6cd93 100644 --- a/R/tm_g_events_term_id.R +++ b/R/tm_g_events_term_id.R @@ -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") ) ) @@ -364,13 +363,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), diff --git a/R/tm_g_heat_bygrade.R b/R/tm_g_heat_bygrade.R index 904ae79c..a7e40ce8 100644 --- a/R/tm_g_heat_bygrade.R +++ b/R/tm_g_heat_bygrade.R @@ -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") ) ) @@ -457,13 +456,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), diff --git a/R/tm_g_patient_profile.R b/R/tm_g_patient_profile.R index dd3ba667..82af536c 100644 --- a/R/tm_g_patient_profile.R +++ b/R/tm_g_patient_profile.R @@ -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, @@ -897,13 +896,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), diff --git a/R/tm_g_spiderplot.R b/R/tm_g_spiderplot.R index 6f917fea..5945e25b 100644 --- a/R/tm_g_spiderplot.R +++ b/R/tm_g_spiderplot.R @@ -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, @@ -420,13 +419,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), diff --git a/R/tm_g_swimlane.R b/R/tm_g_swimlane.R index 90a2871a..3fa0484b 100644 --- a/R/tm_g_swimlane.R +++ b/R/tm_g_swimlane.R @@ -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, @@ -517,13 +516,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), diff --git a/R/tm_g_waterfall.R b/R/tm_g_waterfall.R index 1ab5d15d..7250139b 100644 --- a/R/tm_g_waterfall.R +++ b/R/tm_g_waterfall.R @@ -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, @@ -541,13 +540,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", From a6c567b175eafd3a806f5087b0631f26c0e443f6 Mon Sep 17 00:00:00 2001 From: m7pr Date: Fri, 10 May 2024 08:57:38 +0000 Subject: [PATCH 2/2] [skip actions] Bump version to 0.1.16.9018 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index fb0cdc82..9e976ea2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -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", , "qit3@gene.com", role = c("aut", "cre")), person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index d2500120..ff735fd4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.osprey 0.1.16.9017 +# teal.osprey 0.1.16.9018 * Removed `Show Warnings` modals from modules.