Skip to content

Commit 943c260

Browse files
averissimoaverissimo
committed
fix: use plot/table with only 1 output, instead of only relying on default
1 parent bb52cf6 commit 943c260

File tree

8 files changed

+26
-26
lines changed

8 files changed

+26
-26
lines changed

‎R/tm_a_pca.R‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ tm_a_pca <- function(label = "Principal Component Analysis",
165165
checkmate::assert_multi_class(pre_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
166166
checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
167167

168-
decorators <- normalize_decorators(decorators)
169-
assert_decorators(decorators, null.ok = TRUE)
168+
decorators <- normalize_decorators(decorators, "plot")
169+
assert_decorators(decorators, null.ok = TRUE, "plot")
170170
# End of assertions
171171

172172
# Make UI args
@@ -241,7 +241,7 @@ ui_a_pca <- function(id, ...) {
241241
choices = args$plot_choices,
242242
selected = args$plot_choices[1]
243243
),
244-
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("default", args$decorators))
244+
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("plot", args$decorators))
245245
),
246246
teal.widgets::panel_item(
247247
title = "Pre-processing",
@@ -979,7 +979,7 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
979979
decorated_output_q <- srv_decorate_teal_data(
980980
id = "decorator",
981981
data = output_q,
982-
decorators = subset_decorators("default", decorators),
982+
decorators = subset_decorators("plot", decorators),
983983
expr = print(plot)
984984
)
985985

‎R/tm_data_table.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ tm_data_table <- function(label = "Data Table",
131131
checkmate::assert_multi_class(pre_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
132132
checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
133133

134-
decorators <- normalize_decorators(decorators)
135-
assert_decorators(decorators, null.ok = TRUE)
134+
decorators <- normalize_decorators(decorators, "table")
135+
assert_decorators(decorators, null.ok = TRUE, "table")
136136
# End of assertions
137137

138138
ans <- module(
@@ -297,7 +297,7 @@ ui_data_table <- function(id,
297297
tagList(
298298
teal.widgets::get_dt_rows(ns("data_table"), ns("dt_rows")),
299299
fluidRow(
300-
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("default", decorators)),
300+
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("table", decorators)),
301301
teal.widgets::optionalSelectInput(
302302
ns("variables"),
303303
"Select variables:",

‎R/tm_g_association.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ tm_g_association <- function(label = "Association",
176176
checkmate::assert_list(ggplot2_args, types = "ggplot2_args")
177177
checkmate::assert_subset(names(ggplot2_args), c("default", plot_choices))
178178

179-
decorators <- normalize_decorators(decorators)
180-
assert_decorators(decorators, null.ok = TRUE)
179+
decorators <- normalize_decorators(decorators, "plot")
180+
assert_decorators(decorators, null.ok = TRUE, "plot")
181181

182182
# End of assertions
183183

@@ -249,7 +249,7 @@ ui_tm_g_association <- function(id, ...) {
249249
"Log transformed",
250250
value = FALSE
251251
),
252-
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("default", args$decorators)),
252+
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("plot", args$decorators)),
253253
teal.widgets::panel_group(
254254
teal.widgets::panel_item(
255255
title = "Plot settings",

‎R/tm_g_bivariate.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ tm_g_bivariate <- function(label = "Bivariate Plots",
276276
checkmate::assert_multi_class(pre_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
277277
checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
278278

279-
decorators <- normalize_decorators(decorators)
280-
assert_decorators(decorators, null.ok = TRUE)
279+
decorators <- normalize_decorators(decorators, "plot")
280+
assert_decorators(decorators, null.ok = TRUE, "plot")
281281
# End of assertions
282282

283283
# Make UI args
@@ -351,7 +351,7 @@ ui_g_bivariate <- function(id, ...) {
351351
justified = TRUE
352352
)
353353
),
354-
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("default", args$decorators)),
354+
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("plot", args$decorators)),
355355
if (!is.null(args$row_facet) || !is.null(args$col_facet)) {
356356
tags$div(
357357
class = "data-extract-box",

‎R/tm_g_response.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ tm_g_response <- function(label = "Response Plot",
201201
checkmate::assert_multi_class(pre_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
202202
checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
203203

204-
decorators <- normalize_decorators(decorators)
205-
assert_decorators(decorators, null.ok = TRUE)
204+
decorators <- normalize_decorators(decorators, "plot")
205+
assert_decorators(decorators, null.ok = TRUE, "plot")
206206
# End of assertions
207207

208208
# Make UI args
@@ -286,7 +286,7 @@ ui_g_response <- function(id, ...) {
286286
selected = ifelse(args$freq, "frequency", "density"),
287287
justified = TRUE
288288
),
289-
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("default", args$decorators)),
289+
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("plot", args$decorators)),
290290
teal.widgets::panel_group(
291291
teal.widgets::panel_item(
292292
title = "Plot settings",

‎R/tm_g_scatterplot.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@ tm_g_scatterplot <- function(label = "Scatterplot",
308308
checkmate::assert_scalar(table_dec)
309309
checkmate::assert_class(ggplot2_args, "ggplot2_args")
310310

311-
decorators <- normalize_decorators(decorators)
312-
assert_decorators(decorators, null.ok = TRUE)
311+
decorators <- normalize_decorators(decorators, "plot")
312+
assert_decorators(decorators, null.ok = TRUE, "plot")
313313

314314
# End of assertions
315315

@@ -433,7 +433,7 @@ ui_g_scatterplot <- function(id, ...) {
433433
is_single_dataset = is_single_dataset_value
434434
)
435435
},
436-
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("default", args$decorators)),
436+
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("plot", args$decorators)),
437437
teal.widgets::panel_group(
438438
teal.widgets::panel_item(
439439
title = "Plot settings",

‎R/tm_g_scatterplotmatrix.R‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ tm_g_scatterplotmatrix <- function(label = "Scatterplot Matrix",
203203
checkmate::assert_multi_class(pre_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
204204
checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
205205

206-
decorators <- normalize_decorators(decorators)
207-
assert_decorators(decorators, null.ok = TRUE)
206+
decorators <- normalize_decorators(decorators, "plot")
207+
assert_decorators(decorators, null.ok = TRUE, "plot")
208208
# End of assertions
209209

210210
# Make UI args
@@ -251,7 +251,7 @@ ui_g_scatterplotmatrix <- function(id, ...) {
251251
is_single_dataset = is_single_dataset_value
252252
),
253253
tags$hr(),
254-
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("default", args$decorators)),
254+
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("plot", args$decorators)),
255255
teal.widgets::panel_group(
256256
teal.widgets::panel_item(
257257
title = "Plot settings",

‎R/tm_t_crosstable.R‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ tm_t_crosstable <- function(label = "Cross Table",
168168
checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
169169
checkmate::assert_class(basic_table_args, classes = "basic_table_args")
170170

171-
decorators <- normalize_decorators(decorators)
172-
assert_decorators(decorators, null.ok = TRUE)
171+
decorators <- normalize_decorators(decorators, "plot")
172+
assert_decorators(decorators, null.ok = TRUE, "plot")
173173
# End of assertions
174174

175175
# Make UI args
@@ -236,7 +236,7 @@ ui_t_crosstable <- function(id, x, y, show_percentage, show_total, pre_output, p
236236
checkboxInput(ns("show_total"), "Show total column", value = show_total)
237237
)
238238
),
239-
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("default", args$decorators))
239+
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("plot", args$decorators))
240240
),
241241
forms = tagList(
242242
teal.widgets::verbatim_popup_ui(ns("rcode"), "Show R code")
@@ -412,7 +412,7 @@ srv_t_crosstable <- function(id, data, reporter, filter_panel_api, label, x, y,
412412
decorated_output_q <- srv_decorate_teal_data(
413413
id = "decorator",
414414
data = output_q,
415-
decorators = subset_decorators("default", decorators),
415+
decorators = subset_decorators("plot", decorators),
416416
expr = table
417417
)
418418

0 commit comments

Comments
 (0)