Skip to content

Commit 64ccbce

Browse files
averissimoaverissimo
committed
chore: reorder parameters and rename function to be more R-like
suggestion by @m7pr
1 parent 64b61cf commit 64ccbce

15 files changed

+55
-57
lines changed

‎R/tm_a_pca.R‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,28 +266,28 @@ ui_a_pca <- function(id, ...) {
266266
condition = sprintf("input['%s'] == 'Elbow plot'", ns("plot_type")),
267267
ui_decorate_teal_data(
268268
ns("d_elbow_plot"),
269-
decorators = subset_decorators("elbow_plot", args$decorators)
269+
decorators = select_decorators(args$decorators, "elbow_plot")
270270
)
271271
),
272272
conditionalPanel(
273273
condition = sprintf("input['%s'] == 'Circle plot'", ns("plot_type")),
274274
ui_decorate_teal_data(
275275
ns("d_circle_plot"),
276-
decorators = subset_decorators("circle_plot", args$decorators)
276+
decorators = select_decorators(args$decorators, "circle_plot")
277277
)
278278
),
279279
conditionalPanel(
280280
condition = sprintf("input['%s'] == 'Biplot'", ns("plot_type")),
281281
ui_decorate_teal_data(
282282
ns("d_biplot"),
283-
decorators = subset_decorators("biplot", args$decorators)
283+
decorators = select_decorators(args$decorators, "biplot")
284284
)
285285
),
286286
conditionalPanel(
287287
condition = sprintf("input['%s'] == 'Eigenvector plot'", ns("plot_type")),
288288
ui_decorate_teal_data(
289289
ns("d_eigenvector_plot"),
290-
decorators = subset_decorators("eigenvector_plot", args$decorators)
290+
decorators = select_decorators(args$decorators, "eigenvector_plot")
291291
)
292292
)
293293
),
@@ -1032,7 +1032,7 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
10321032
srv_decorate_teal_data(
10331033
id = sprintf("d_%s", obj_name),
10341034
data = q,
1035-
decorators = subset_decorators(obj_name, decorators),
1035+
decorators = select_decorators(decorators, obj_name),
10361036
expr = reactive({
10371037
substitute(print(.plot), env = list(.plot = as.name(obj_name)))
10381038
}),

‎R/tm_data_table.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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("table", decorators)),
300+
ui_decorate_teal_data(ns("decorator"), decorators = select_decorators(decorators, "table")),
301301
teal.widgets::optionalSelectInput(
302302
ns("variables"),
303303
"Select variables:",
@@ -369,7 +369,7 @@ srv_data_table <- function(id,
369369
decorated_data_table_data <- srv_decorate_teal_data(
370370
id = "decorator",
371371
data = data_table_data,
372-
decorators = subset_decorators("table", decorators)
372+
decorators = select_decorators(decorators, "table")
373373
)
374374

375375
output$data_table <- DT::renderDataTable(server = server_rendering, {

‎R/tm_g_association.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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("plot", args$decorators)),
252+
ui_decorate_teal_data(ns("decorator"), decorators = select_decorators(args$decorators, "plot")),
253253
teal.widgets::panel_group(
254254
teal.widgets::panel_item(
255255
title = "Plot settings",
@@ -504,7 +504,7 @@ srv_tm_g_association <- function(id,
504504
decorated_output_grob_q <- srv_decorate_teal_data(
505505
id = "decorator",
506506
data = output_q,
507-
decorators = subset_decorators("plot", decorators),
507+
decorators = select_decorators(decorators, "plot"),
508508
expr = {
509509
grid::grid.newpage()
510510
grid::grid.draw(plot)

‎R/tm_g_bivariate.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ ui_g_bivariate <- function(id, ...) {
351351
justified = TRUE
352352
)
353353
),
354-
ui_decorate_teal_data(ns("decorator"), decorators = subset_decorators("plot", args$decorators)),
354+
ui_decorate_teal_data(ns("decorator"), decorators = select_decorators(args$decorators, "plot")),
355355
if (!is.null(args$row_facet) || !is.null(args$col_facet)) {
356356
tags$div(
357357
class = "data-extract-box",
@@ -669,7 +669,7 @@ srv_g_bivariate <- function(id,
669669
decorated_output_q_facets <- srv_decorate_teal_data(
670670
"decorator",
671671
data = output_q,
672-
decorators = subset_decorators("plot", decorators),
672+
decorators = select_decorators(decorators, "plot"),
673673
expr = reactive({
674674
ANL <- merged$anl_q_r()[["ANL"]]
675675
row_facet_name <- as.vector(merged$anl_input_r()$columns_source$row_facet)

‎R/tm_g_distribution.R‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ ui_distribution <- function(id, ...) {
304304
checkboxInput(ns("add_dens"), label = "Overlay Density", value = TRUE),
305305
ui_decorate_teal_data(
306306
ns("d_density"),
307-
decorators = subset_decorators("histogram_plot", args$decorators)
307+
decorators = select_decorators(args$decorators, "histogram_plot")
308308
),
309309
collapsed = FALSE
310310
)
@@ -316,18 +316,18 @@ ui_distribution <- function(id, ...) {
316316
checkboxInput(ns("qq_line"), label = "Add diagonal line(s)", TRUE),
317317
ui_decorate_teal_data(
318318
ns("d_qq"),
319-
decorators = subset_decorators("qq_plot", args$decorators)
319+
decorators = select_decorators(args$decorators, "qq_plot")
320320
),
321321
collapsed = FALSE
322322
)
323323
),
324324
ui_decorate_teal_data(
325325
ns("d_summary"),
326-
decorators = subset_decorators("summary_table", args$decorators)
326+
decorators = select_decorators(args$decorators, "summary_table")
327327
),
328328
ui_decorate_teal_data(
329329
ns("d_test"),
330-
decorators = subset_decorators("test_table", args$decorators)
330+
decorators = select_decorators(args$decorators, "test_table")
331331
),
332332
conditionalPanel(
333333
condition = paste0("input['", ns("main_type"), "'] == 'Density'"),
@@ -1294,14 +1294,14 @@ srv_distribution <- function(id,
12941294
decorated_output_dist_q <- srv_decorate_teal_data(
12951295
"d_density",
12961296
data = output_dist_q,
1297-
decorators = subset_decorators("histogram_plot", decorators),
1297+
decorators = select_decorators(decorators, "histogram_plot"),
12981298
expr = print(histogram_plot)
12991299
)
13001300

13011301
decorated_output_qq_q <- srv_decorate_teal_data(
13021302
"d_qq",
13031303
data = output_qq_q,
1304-
decorators = subset_decorators("qq_plot", decorators),
1304+
decorators = select_decorators(decorators, "qq_plot"),
13051305
expr = print(qq_plot)
13061306
)
13071307

@@ -1317,14 +1317,14 @@ srv_distribution <- function(id,
13171317
decorated_output_q_summary <- srv_decorate_teal_data(
13181318
"d_summary",
13191319
data = decorated_output_q_base,
1320-
decorators = subset_decorators("summary_table", decorators),
1320+
decorators = select_decorators(decorators, "summary_table"),
13211321
expr = summary_table
13221322
)
13231323

13241324
decorated_output_q <- srv_decorate_teal_data(
13251325
"d_test",
13261326
data = decorated_output_q_summary,
1327-
decorators = subset_decorators("test_table", decorators),
1327+
decorators = select_decorators(decorators, "test_table"),
13281328
expr = test_table
13291329
)
13301330

‎R/tm_g_response.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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("plot", args$decorators)),
289+
ui_decorate_teal_data(ns("decorator"), decorators = select_decorators(args$decorators, "plot")),
290290
teal.widgets::panel_group(
291291
teal.widgets::panel_item(
292292
title = "Plot settings",
@@ -556,7 +556,7 @@ srv_g_response <- function(id,
556556
decorated_output_plot_q <- srv_decorate_teal_data(
557557
id = "decorator",
558558
data = output_q,
559-
decorators = subset_decorators("plot", decorators),
559+
decorators = select_decorators(decorators, "plot"),
560560
expr = print(plot)
561561
)
562562

‎R/tm_g_scatterplot.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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("plot", args$decorators)),
436+
ui_decorate_teal_data(ns("decorator"), decorators = select_decorators(args$decorators, "plot")),
437437
teal.widgets::panel_group(
438438
teal.widgets::panel_item(
439439
title = "Plot settings",
@@ -1011,7 +1011,7 @@ srv_g_scatterplot <- function(id,
10111011
decorated_output_plot_q <- srv_decorate_teal_data(
10121012
id = "decorator",
10131013
data = output_q,
1014-
decorators = subset_decorators("plot", decorators),
1014+
decorators = select_decorators(decorators, "plot"),
10151015
expr = print(plot)
10161016
)
10171017

‎R/tm_g_scatterplotmatrix.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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("plot", args$decorators)),
254+
ui_decorate_teal_data(ns("decorator"), decorators = select_decorators(args$decorators, "plot")),
255255
teal.widgets::panel_group(
256256
teal.widgets::panel_item(
257257
title = "Plot settings",
@@ -449,7 +449,7 @@ srv_g_scatterplotmatrix <- function(id,
449449
decorated_output_q <- srv_decorate_teal_data(
450450
id = "decorator",
451451
data = output_q,
452-
decorators = subset_decorators("plot", decorators),
452+
decorators = select_decorators(decorators, "plot"),
453453
expr = print(plot)
454454
)
455455

‎R/tm_missing_data.R‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -422,16 +422,16 @@ encoding_missing_data <- function(id, summary_per_patient = FALSE, ggtheme, data
422422
value = FALSE
423423
)
424424
},
425-
ui_decorate_teal_data(ns("dec_summary_plot"), decorators = subset_decorators("summary_plot", decorators))
425+
ui_decorate_teal_data(ns("dec_summary_plot"), decorators = select_decorators(decorators, "summary_plot"))
426426
),
427427
conditionalPanel(
428428
is_tab_active_js(ns("summary_type"), "Combinations"),
429429
uiOutput(ns("cutoff")),
430-
ui_decorate_teal_data(ns("dec_combination_plot"), decorators = subset_decorators("combination_plot", decorators))
430+
ui_decorate_teal_data(ns("dec_combination_plot"), decorators = select_decorators(decorators, "combination_plot"))
431431
),
432432
conditionalPanel(
433433
is_tab_active_js(ns("summary_type"), "Grouped by Subject"),
434-
ui_decorate_teal_data(ns("dec_by_subject_plot"), decorators = subset_decorators("by_subject_plot", decorators))
434+
ui_decorate_teal_data(ns("dec_by_subject_plot"), decorators = select_decorators(decorators, "by_subject_plot"))
435435
),
436436
conditionalPanel(
437437
is_tab_active_js(ns("summary_type"), "By Variable Levels"),
@@ -444,7 +444,7 @@ encoding_missing_data <- function(id, summary_per_patient = FALSE, ggtheme, data
444444
selected = "counts",
445445
inline = TRUE
446446
),
447-
ui_decorate_teal_data(ns("dec_summary_table"), decorators = subset_decorators("summary_table", decorators))
447+
ui_decorate_teal_data(ns("dec_summary_table"), decorators = select_decorators(decorators, "summary_table"))
448448
),
449449
teal.widgets::panel_item(
450450
title = "Plot settings",
@@ -1262,7 +1262,7 @@ srv_missing_data <- function(id,
12621262
decorated_summary_plot_q <- srv_decorate_teal_data(
12631263
id = "dec_summary_plot",
12641264
data = summary_plot_q,
1265-
decorators = subset_decorators("summary_plot", decorators),
1265+
decorators = select_decorators(decorators, "summary_plot"),
12661266
expr = {
12671267
grid::grid.newpage()
12681268
grid::grid.draw(summary_plot)
@@ -1272,7 +1272,7 @@ srv_missing_data <- function(id,
12721272
decorated_combination_plot_q <- srv_decorate_teal_data(
12731273
id = "dec_combination_plot",
12741274
data = combination_plot_q,
1275-
decorators = subset_decorators("combination_plot", decorators),
1275+
decorators = select_decorators(decorators, "combination_plot"),
12761276
expr = {
12771277
grid::grid.newpage()
12781278
grid::grid.draw(combination_plot)
@@ -1282,14 +1282,14 @@ srv_missing_data <- function(id,
12821282
decorated_summary_table_q <- srv_decorate_teal_data(
12831283
id = "dec_summary_table",
12841284
data = summary_table_q,
1285-
decorators = subset_decorators("summary_table", decorators),
1285+
decorators = select_decorators(decorators, "summary_table"),
12861286
expr = table
12871287
)
12881288

12891289
decorated_by_subject_plot_q <- srv_decorate_teal_data(
12901290
id = "dec_by_subject_plot",
12911291
data = by_subject_plot_q,
1292-
decorators = subset_decorators("by_subject_plot", decorators),
1292+
decorators = select_decorators(decorators, "by_subject_plot"),
12931293
expr = print(by_subject_plot)
12941294
)
12951295

‎R/tm_outliers.R‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -345,24 +345,24 @@ ui_outliers <- function(id, ...) {
345345
condition = paste0("input['", ns("tabs"), "'] == 'Boxplot'"),
346346
ui_decorate_teal_data(
347347
ns("d_box_plot"),
348-
decorators = subset_decorators("box_plot", args$decorators)
348+
decorators = select_decorators(args$decorators, "box_plot")
349349
)
350350
),
351351
conditionalPanel(
352352
condition = paste0("input['", ns("tabs"), "'] == 'Density Plot'"),
353353
ui_decorate_teal_data(
354354
ns("d_density_plot"),
355-
decorators = subset_decorators("density_plot", args$decorators)
355+
decorators = select_decorators(args$decorators, "density_plot")
356356
)
357357
),
358358
conditionalPanel(
359359
condition = paste0("input['", ns("tabs"), "'] == 'Cumulative Distribution Plot'"),
360360
ui_decorate_teal_data(
361361
ns("d_cumulative_plot"),
362-
decorators = subset_decorators("cumulative_plot", args$decorators)
362+
decorators = select_decorators(args$decorators, "cumulative_plot")
363363
)
364364
),
365-
ui_decorate_teal_data(ns("d_table"), decorators = subset_decorators("table", args$decorators)),
365+
ui_decorate_teal_data(ns("d_table"), decorators = select_decorators(args$decorators, "table")),
366366
teal.widgets::panel_item(
367367
title = "Plot settings",
368368
selectInput(
@@ -1010,7 +1010,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
10101010
srv_decorate_teal_data(
10111011
id = sprintf("d_%s", obj_name),
10121012
data = q,
1013-
decorators = subset_decorators(obj_name, decorators),
1013+
decorators = select_decorators(decorators, obj_name),
10141014
expr = reactive({
10151015
substitute(
10161016
expr = {
@@ -1036,7 +1036,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
10361036
decorated_final_q <- srv_decorate_teal_data(
10371037
"d_table",
10381038
data = decorated_final_q_no_table,
1039-
decorators = subset_decorators("table", decorators),
1039+
decorators = select_decorators(decorators, "table"),
10401040
expr = table
10411041
)
10421042

0 commit comments

Comments
 (0)