Skip to content

Commit 43c914a

Browse files
gogonzogogonzo
committed
Merge branch 'main' into redesign_extraction@main
2 parents a71bb7f + 3ca0aca commit 43c914a

30 files changed

+693
-746
lines changed

‎DESCRIPTION‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Type: Package
22
Package: teal.modules.general
33
Title: General Modules for 'teal' Applications
4-
Version: 0.5.0.9005
5-
Date: 2025-10-07
4+
Version: 0.5.0.9009
5+
Date: 2025-10-17
66
Authors@R: c(
77
person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
88
person("Pawel", "Rucki", , "[email protected]", role = "aut"),

‎NEWS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# teal.modules.general 0.5.0.9005
1+
# teal.modules.general 0.5.0.9009
22

33
### Enhancements
44

‎R/tm_a_pca.R‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -443,9 +443,8 @@ srv_a_pca.default <- function(id, data, dat, plot_height, plot_width, ggplot2_ar
443443
obj <- data()
444444
teal.reporter::teal_card(obj) <-
445445
c(
446-
teal.reporter::teal_card("# Principal Component Analysis"),
447446
teal.reporter::teal_card(obj),
448-
teal.reporter::teal_card("## Module's code")
447+
teal.reporter::teal_card("## Module's output(s)")
449448
)
450449
teal.code::eval_code(obj, 'library("ggplot2");library("dplyr");library("tidyr")') # nolint: quotes
451450
})
@@ -524,7 +523,7 @@ srv_a_pca.default <- function(id, data, dat, plot_height, plot_width, ggplot2_ar
524523
)
525524
)
526525

527-
teal.reporter::teal_card(qenv) <- c(teal.reporter::teal_card(qenv), "## Principal Components Table")
526+
teal.reporter::teal_card(qenv) <- c(teal.reporter::teal_card(qenv), "### Principal Components Table")
528527

529528
qenv <- teal.code::eval_code(
530529
qenv,
@@ -534,7 +533,7 @@ srv_a_pca.default <- function(id, data, dat, plot_height, plot_width, ggplot2_ar
534533
})
535534
)
536535

537-
teal.reporter::teal_card(qenv) <- c(teal.reporter::teal_card(qenv), "## Eigenvectors Table")
536+
teal.reporter::teal_card(qenv) <- c(teal.reporter::teal_card(qenv), "### Eigenvectors Table")
538537

539538
teal.code::eval_code(
540539
qenv,
@@ -616,7 +615,7 @@ srv_a_pca.default <- function(id, data, dat, plot_height, plot_width, ggplot2_ar
616615
),
617616
ggtheme = ggtheme
618617
)
619-
teal.reporter::teal_card(base_q) <- c(teal.reporter::teal_card(base_q), "## Elbow plot")
618+
teal.reporter::teal_card(base_q) <- c(teal.reporter::teal_card(base_q), "### Elbow plot")
620619
teal.code::eval_code(
621620
base_q,
622621
substitute(
@@ -693,7 +692,7 @@ srv_a_pca.default <- function(id, data, dat, plot_height, plot_width, ggplot2_ar
693692
ggtheme = ggtheme
694693
)
695694

696-
teal.reporter::teal_card(base_q) <- c(teal.reporter::teal_card(base_q), "## Circle plot")
695+
teal.reporter::teal_card(base_q) <- c(teal.reporter::teal_card(base_q), "### Circle plot")
697696
teal.code::eval_code(
698697
base_q,
699698
substitute(
@@ -752,7 +751,7 @@ srv_a_pca.default <- function(id, data, dat, plot_height, plot_width, ggplot2_ar
752751
size <- input$size
753752
font_size <- input$font_size
754753

755-
teal.reporter::teal_card(base_q) <- c(teal.reporter::teal_card(base_q), "## Biplot")
754+
teal.reporter::teal_card(base_q) <- c(teal.reporter::teal_card(base_q), "### Biplot")
756755
qenv <- teal.code::eval_code(
757756
qenv,
758757
substitute(
@@ -1013,7 +1012,7 @@ srv_a_pca.default <- function(id, data, dat, plot_height, plot_width, ggplot2_ar
10131012
parsed_ggplot2_args$theme
10141013
)
10151014

1016-
teal.reporter::teal_card(base_q) <- c(teal.reporter::teal_card(base_q), "## Eigenvector plot")
1015+
teal.reporter::teal_card(base_q) <- c(teal.reporter::teal_card(base_q), "### Eigenvector plot")
10171016
teal.code::eval_code(
10181017
base_q,
10191018
substitute(

‎R/tm_a_regression.R‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,8 @@ srv_a_regression.default <- function(id,
458458
obj <- data()
459459
teal.reporter::teal_card(obj) <-
460460
c(
461-
teal.reporter::teal_card("# Linear Regression Plot"),
462461
teal.reporter::teal_card(obj),
463-
teal.reporter::teal_card("## Module's code")
462+
teal.reporter::teal_card("## Module's output(s)")
464463
)
465464
teal.code::eval_code(obj, 'library("ggplot2");library("dplyr")') # nolint: quotes
466465
})
@@ -539,7 +538,7 @@ srv_a_regression.default <- function(id,
539538
fit_summary <- summary(fit)
540539
fit_summary
541540
}))
542-
teal.reporter::teal_card(anl_fit) <- c(teal.reporter::teal_card(anl_fit), "## Plot")
541+
teal.reporter::teal_card(anl_fit) <- c(teal.reporter::teal_card(anl_fit), "### Plot")
543542
anl_fit
544543
})
545544

‎R/tm_g_association.R‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,8 @@ srv_tm_g_association.default <- function(id,
360360
obj <- data()
361361
teal.reporter::teal_card(obj) <-
362362
c(
363-
teal.reporter::teal_card("# Association Plot"),
364363
teal.reporter::teal_card(obj),
365-
teal.reporter::teal_card("## Module's code")
364+
teal.reporter::teal_card("## Module's output(s)")
366365
)
367366
teal.code::eval_code(obj, 'library("ggplot2");library("dplyr");library("ggmosaic")') # nolint: quotes
368367
})
@@ -513,7 +512,7 @@ srv_tm_g_association.default <- function(id,
513512
)
514513
}
515514
obj <- merged$anl_q_r()
516-
teal.reporter::teal_card(obj) <- c(teal.reporter::teal_card(obj), "## Plot")
515+
teal.reporter::teal_card(obj) <- c(teal.reporter::teal_card(obj), "### Plot")
517516
teal.code::eval_code(
518517
obj,
519518
substitute(

‎R/tm_g_bivariate.R‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -553,17 +553,12 @@ srv_g_bivariate.default <- function(id,
553553
obj <- data()
554554
teal.reporter::teal_card(obj) <-
555555
c(
556-
teal.reporter::teal_card("# Bivariate Plot"),
557556
teal.reporter::teal_card(obj),
558-
teal.reporter::teal_card("## Module's code")
557+
teal.reporter::teal_card("## Module's output(s)")
559558
)
560559
obj %>%
561-
teal.code::eval_code(
562-
c(
563-
'library("ggplot2");library("dplyr")', # nolint: quotes
564-
as.expression(anl_merged_input()$expr)
565-
)
566-
)
560+
teal.code::eval_code('library("ggplot2");library("dplyr")') %>%
561+
teal.code::eval_code(as.expression(anl_merged_input()$expr)) # don't mix char with expr in single eval_code
567562
})
568563

569564
merged <- list(
@@ -690,7 +685,7 @@ srv_g_bivariate.default <- function(id,
690685
}
691686

692687
obj <- merged$anl_q_r()
693-
teal.reporter::teal_card(obj) <- c(teal.reporter::teal_card(obj), "## Plot")
688+
teal.reporter::teal_card(obj) <- c(teal.reporter::teal_card(obj), "### Plot")
694689
teal.code::eval_code(obj, substitute(expr = plot <- cl, env = list(cl = cl)))
695690
})
696691

‎R/tm_g_distribution.R‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -637,9 +637,8 @@ srv_g_distribution.default <- function(id,
637637
obj <- merged$anl_q_r()
638638
teal.reporter::teal_card(obj) <-
639639
c(
640-
teal.reporter::teal_card("# Distribution Plot"),
641640
teal.reporter::teal_card(obj),
642-
teal.reporter::teal_card("## Module's code")
641+
teal.reporter::teal_card("## Module's output(s)")
643642
)
644643

645644
ANL <- obj[["ANL"]]
@@ -956,7 +955,7 @@ srv_g_distribution.default <- function(id,
956955
ggtheme = ggtheme
957956
)
958957

959-
teal.reporter::teal_card(qenv) <- c(teal.reporter::teal_card(qenv), "## Histogram Plot")
958+
teal.reporter::teal_card(qenv) <- c(teal.reporter::teal_card(qenv), "### Histogram Plot")
960959
teal.code::eval_code(
961960
qenv,
962961
substitute(
@@ -1087,7 +1086,7 @@ srv_g_distribution.default <- function(id,
10871086
ggtheme = ggtheme
10881087
)
10891088

1090-
teal.reporter::teal_card(qenv) <- c(teal.reporter::teal_card(qenv), "## QQ Plot")
1089+
teal.reporter::teal_card(qenv) <- c(teal.reporter::teal_card(qenv), "### QQ Plot")
10911090
teal.code::eval_code(
10921091
qenv,
10931092
substitute(
@@ -1278,7 +1277,7 @@ srv_g_distribution.default <- function(id,
12781277
q_common <- common_q()
12791278
teal.reporter::teal_card(q_common) <- c(
12801279
teal.reporter::teal_card(q_common),
1281-
"## Statistics table"
1280+
"### Statistics table"
12821281
)
12831282
if (iv_r()$is_valid()) {
12841283
within(q_common, {
@@ -1298,7 +1297,7 @@ srv_g_distribution.default <- function(id,
12981297
q_common <- common_q()
12991298
teal.reporter::teal_card(q_common) <- c(
13001299
teal.reporter::teal_card(q_common),
1301-
"## Distribution Tests table"
1300+
"### Distribution Tests table"
13021301
)
13031302
if (inherits(test_q_out, c("try-error", "error"))) {
13041303
within(

‎R/tm_g_response.R‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,9 +431,8 @@ srv_g_response.default <- function(id,
431431
qenv <- merged$anl_q_r()
432432
teal.reporter::teal_card(qenv) <-
433433
c(
434-
teal.reporter::teal_card("# Response Plot"),
435434
teal.reporter::teal_card(qenv),
436-
teal.reporter::teal_card("## Module's code")
435+
teal.reporter::teal_card("## Module's output(s)")
437436
)
438437
ANL <- qenv[["ANL"]]
439438
resp_var <- as.vector(merged$anl_input_r()$columns_source$response)
@@ -594,7 +593,7 @@ srv_g_response.default <- function(id,
594593
ggthemes = parsed_ggplot2_args$ggtheme
595594
))
596595

597-
teal.reporter::teal_card(qenv) <- c(teal.reporter::teal_card(qenv), "## Plot")
596+
teal.reporter::teal_card(qenv) <- c(teal.reporter::teal_card(qenv), "### Plot")
598597
teal.code::eval_code(qenv, plot_call)
599598
})
600599

‎R/tm_g_scatterplot.R‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,9 +555,8 @@ srv_g_scatterplot.default <- function(id,
555555
qenv <- reactive({
556556
obj <- data()
557557
teal.reporter::teal_card(obj) <- c(
558-
teal.reporter::teal_card("# Scatter Plot"),
559558
teal.reporter::teal_card(obj),
560-
teal.reporter::teal_card("## Module's code")
559+
teal.reporter::teal_card("## Module's output(s)")
561560
)
562561
teal.code::eval_code(data(), 'library("ggplot2");library("dplyr")') # nolint quotes
563562
})
@@ -983,7 +982,7 @@ srv_g_scatterplot.default <- function(id,
983982

984983
plot_call <- substitute(expr = plot <- plot_call, env = list(plot_call = plot_call))
985984

986-
teal.reporter::teal_card(plot_q) <- c(teal.reporter::teal_card(plot_q), "## Plot")
985+
teal.reporter::teal_card(plot_q) <- c(teal.reporter::teal_card(plot_q), "### Plot")
987986
teal.code::eval_code(plot_q, plot_call)
988987
})
989988

‎R/tm_g_scatterplotmatrix.R‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,8 @@ srv_g_scatterplotmatrix.default <- function(id,
333333
req(anl_merged_input())
334334
obj <- data()
335335
teal.reporter::teal_card(obj) <- c(
336-
teal.reporter::teal_card("# Scatter Plot Matrix"),
337336
teal.reporter::teal_card(obj),
338-
teal.reporter::teal_card("## Module's code")
337+
teal.reporter::teal_card("## Module's output(s)")
339338
)
340339
qenv <- teal.code::eval_code(obj, 'library("dplyr");library("lattice")') # nolint quotes
341340
teal.code::eval_code(qenv, as.expression(anl_merged_input()$expr))
@@ -397,7 +396,7 @@ srv_g_scatterplotmatrix.default <- function(id,
397396

398397

399398
# create plot
400-
teal.reporter::teal_card(qenv) <- c(teal.reporter::teal_card(qenv), "## Plot")
399+
teal.reporter::teal_card(qenv) <- c(teal.reporter::teal_card(qenv), "### Plot")
401400

402401
if (add_cor) {
403402
shinyjs::show("cor_method")

0 commit comments

Comments
 (0)