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 7145e25 + f3b0187 commit b6f3db9
Show file tree
Hide file tree
Showing 13 changed files with 5 additions and 91 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: teal.modules.general
Title: General Modules for 'teal' Applications
Version: 0.3.0.9029
Date: 2024-04-29
Version: 0.3.0.9030
Date: 2024-05-10
Authors@R: c(
person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")),
person("Pawel", "Rucki", , "pawel.rucki@roche.com", 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.modules.general 0.3.0.9029
# teal.modules.general 0.3.0.9030

* Removed `Show Warnings` modals from modules.

# teal.modules.general 0.3.0

Expand Down
8 changes: 0 additions & 8 deletions R/tm_a_pca.R
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ ui_a_pca <- 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 = args$pre_output,
Expand Down Expand Up @@ -1035,13 +1034,6 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
)
})

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_a_regression.R
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,6 @@ ui_a_regression <- 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 = args$pre_output,
Expand Down Expand Up @@ -1002,13 +1001,6 @@ srv_a_regression <- function(id,
)
})

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_association.R
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@ ui_tm_g_association <- 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 = args$pre_output,
Expand Down Expand Up @@ -508,13 +507,6 @@ srv_tm_g_association <- function(id,
teal.code::dev_suppress(output_q()[["title"]])
})

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_bivariate.R
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,6 @@ ui_g_bivariate <- function(id, ...) {
)
),
forms = tagList(
teal.widgets::verbatim_popup_ui(ns("warning"), button_label = "Show Warnings"),
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
),
pre_output = args$pre_output,
Expand Down Expand Up @@ -691,13 +690,6 @@ srv_g_bivariate <- 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",
verbatim_content = reactive(teal.code::get_code(output_q())),
Expand Down
8 changes: 0 additions & 8 deletions R/tm_g_distribution.R
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@ ui_distribution <- 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 = args$pre_output,
Expand Down Expand Up @@ -1269,13 +1268,6 @@ srv_distribution <- function(id,
rownames = FALSE
)

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_response.R
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ ui_g_response <- function(id, ...) {
)
),
forms = tagList(
teal.widgets::verbatim_popup_ui(ns("warning"), button_label = "Show Warnings"),
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
),
pre_output = args$pre_output,
Expand Down Expand Up @@ -549,13 +548,6 @@ srv_g_response <- 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",
verbatim_content = reactive(teal.code::get_code(output_q())),
Expand Down
8 changes: 0 additions & 8 deletions R/tm_g_scatterplot.R
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,6 @@ ui_g_scatterplot <- function(id, ...) {
)
),
forms = tagList(
teal.widgets::verbatim_popup_ui(ns("warning"), button_label = "Show Warnings"),
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
),
pre_output = args$pre_output,
Expand Down Expand Up @@ -1024,13 +1023,6 @@ srv_g_scatterplot <- function(id,
}
})

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_scatterplotmatrix.R
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ ui_g_scatterplotmatrix <- 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 = args$pre_output,
Expand Down Expand Up @@ -443,13 +442,6 @@ srv_g_scatterplotmatrix <- function(id, data, reporter, filter_panel_api, variab
}
})

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_missing_data.R
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ srv_page_missing_data <- function(id, data, reporter, filter_panel_api, parent_d
conditionalPanel(
is_tab_active_js(ns("dataname_tab"), x),
tagList(
teal.widgets::verbatim_popup_ui(dataname_ns("warning"), "Show Warnings"),
teal.widgets::verbatim_popup_ui(dataname_ns("rcode"), "Show R code")
)
)
Expand Down Expand Up @@ -1271,13 +1270,6 @@ srv_missing_data <- function(id, data, reporter, filter_panel_api, dataname, par
}
})

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

teal.widgets::verbatim_popup_srv(
id = "rcode",
verbatim_content = reactive(teal.code::get_code(final_q())),
Expand Down
8 changes: 0 additions & 8 deletions R/tm_outliers.R
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ ui_outliers <- 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 = args$pre_output,
Expand Down Expand Up @@ -1221,13 +1220,6 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
)
})

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

teal.widgets::verbatim_popup_srv(
id = "rcode",
verbatim_content = reactive(teal.code::get_code(final_q())),
Expand Down
8 changes: 0 additions & 8 deletions R/tm_t_crosstable.R
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ ui_t_crosstable <- function(id, x, y, show_percentage, show_total, pre_output, p
)
),
forms = tagList(
teal.widgets::verbatim_popup_ui(ns("warning"), "Show Warnings"),
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
),
pre_output = pre_output,
Expand Down Expand Up @@ -411,13 +410,6 @@ srv_t_crosstable <- function(id, data, reporter, filter_panel_api, label, x, y,
table_r = table_r
)

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

0 comments on commit b6f3db9

Please sign in to comment.