Skip to content

Commit 942634a

Browse files
kartikeyakirarkartikeyakirar
committed
merge back
Merge branch '518_incorrect_soft_dep@main' of https://github.com/insightsengineering/teal.modules.general into 518_incorrect_soft_dep@main # Conflicts: # DESCRIPTION
2 parents a94b5fd + 594a44d commit 942634a

17 files changed

+36
-34
lines changed

‎DESCRIPTION‎

Lines changed: 19 additions & 17 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.3.0.9034
5-
Date: 2024-05-16
4+
Version: 0.3.0.9038
5+
Date: 2024-06-27
66
Authors@R: c(
77
person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
88
person("Pawel", "Rucki", , "[email protected]", role = "aut"),
@@ -51,10 +51,10 @@ Imports:
5151
stringr (>= 1.4.1),
5252
teal.code (>= 0.5.0),
5353
teal.data (>= 0.5.0),
54-
teal.logger (>= 0.1.3.9013),
54+
teal.logger (>= 0.2.0.9004),
5555
teal.reporter (>= 0.3.0),
5656
teal.widgets (>= 0.4.0),
57-
tern (>= 0.9.3),
57+
tern (>= 0.9.5),
5858
tibble (>= 2.0.0),
5959
tidyr (>= 0.8.3),
6060
tools,
@@ -66,32 +66,34 @@ Suggests:
6666
htmlwidgets,
6767
jsonlite,
6868
knitr (>= 1.42),
69+
logger (>= 0.2.0),
6970
MASS,
7071
nestcolor (>= 0.1.0),
7172
pkgload,
7273
rlang (>= 1.0.0),
73-
rtables (>= 0.6.6),
74+
rmarkdown (>= 2.23),
75+
rtables (>= 0.6.8),
7476
rvest,
7577
shinytest2,
7678
sparkline,
77-
testthat (>= 3.0.4),
79+
testthat (>= 3.1.9),
7880
withr (>= 2.0.0)
7981
VignetteBuilder:
8082
knitr
8183
Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2,
8284
rstudio/shiny, insightsengineering/teal,
8385
insightsengineering/teal.transform, mllg/checkmate, tidyverse/dplyr,
84-
rstudio/DT, tidyverse/forcats, daroczig/logger, r-lib/scales,
85-
daattali/shinyjs, shinyTree/shinyTree, rstudio/shinyvalidate,
86-
dreamRs/shinyWidgets, tidyverse/stringr,
87-
insightsengineering/teal.code, insightsengineering/teal.data,
88-
insightsengineering/teal.logger, insightsengineering/teal.reporter,
89-
insightsengineering/teal.widgets, insightsengineering/tern,
90-
tidyverse/tibble, tidyverse/tidyr, tidymodels/broom,
91-
daattali/colourpicker, daattali/ggExtra, aphalo/ggpmisc, aphalo/ggpp,
92-
slowkow/ggrepel, baddstats/goftest, gridExtra, ramnathv/htmlwidgets,
93-
jeroen/jsonlite, yihui/knitr, deepayan/lattice, MASS,
94-
insightsengineering/nestcolor, r-lib/rlang,
86+
rstudio/DT, tidyverse/forcats, r-lib/scales, daattali/shinyjs,
87+
shinyTree/shinyTree, rstudio/shinyvalidate, dreamRs/shinyWidgets,
88+
tidyverse/stringr, insightsengineering/teal.code,
89+
insightsengineering/teal.data, insightsengineering/teal.logger,
90+
insightsengineering/teal.reporter, insightsengineering/teal.widgets,
91+
insightsengineering/tern, tidyverse/tibble, tidyverse/tidyr,
92+
tidymodels/broom, daattali/colourpicker, daattali/ggExtra,
93+
aphalo/ggpmisc, aphalo/ggpp, slowkow/ggrepel, baddstats/goftest,
94+
gridExtra, ramnathv/htmlwidgets, jeroen/jsonlite, yihui/knitr,
95+
daroczig/logger, deepayan/lattice, MASS,
96+
insightsengineering/nestcolor, r-lib/rlang, rstudio/rmarkdown,
9597
insightsengineering/rtables, tidyverse/rvest, sparkline,
9698
rstudio/shinytest2, insightsengineering/teal.data, r-lib/testthat,
9799
r-lib/withr

‎NEWS.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# teal.modules.general 0.3.0.9034
1+
# teal.modules.general 0.3.0.9038
22

33
* Removed `Show Warnings` modals from modules.
44

55
### Enhancements
6-
* Added `logger` functionality for logging changes in shiny inputs in all modules. `logger` was added to Imports.
6+
* Added `teal.logger` functionality for logging changes in shiny inputs in all modules.
77

88
# teal.modules.general 0.3.0
99

‎R/tm_a_pca.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
297297
checkmate::assert_class(data, "reactive")
298298
checkmate::assert_class(isolate(data()), "teal_data")
299299
moduleServer(id, function(input, output, session) {
300-
if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
300+
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
301301

302302
response <- dat
303303

‎R/tm_a_regression.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ srv_a_regression <- function(id,
371371
checkmate::assert_class(data, "reactive")
372372
checkmate::assert_class(isolate(data()), "teal_data")
373373
moduleServer(id, function(input, output, session) {
374-
if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
374+
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
375375

376376
ns <- session$ns
377377

‎R/tm_data_table.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ srv_page_data_table <- function(id,
182182
checkmate::assert_class(data, "reactive")
183183
checkmate::assert_class(isolate(data()), "teal_data")
184184
moduleServer(id, function(input, output, session) {
185-
if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
185+
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
186186

187187
if_filtered <- reactive(as.logical(input$if_filtered))
188188
if_distinct <- reactive(as.logical(input$if_distinct))

‎R/tm_file_viewer.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ ui_viewer <- function(id, ...) {
124124
# Server function for the file viewer module
125125
srv_viewer <- function(id, input_path) {
126126
moduleServer(id, function(input, output, session) {
127-
if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
127+
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
128128

129129
temp_dir <- tempfile()
130130
if (!dir.exists(temp_dir)) {

‎R/tm_front_page.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ srv_front_page <- function(id, data, tables, show_metadata) {
137137
checkmate::assert_class(data, "reactive")
138138
checkmate::assert_class(isolate(data()), "teal_data")
139139
moduleServer(id, function(input, output, session) {
140-
if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
140+
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
141141

142142
ns <- session$ns
143143

‎R/tm_g_association.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ srv_tm_g_association <- function(id,
285285
checkmate::assert_class(isolate(data()), "teal_data")
286286

287287
moduleServer(id, function(input, output, session) {
288-
if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
288+
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
289289

290290
selector_list <- teal.transform::data_extract_multiple_srv(
291291
data_extract = list(ref = ref, vars = vars),

‎R/tm_g_bivariate.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ srv_g_bivariate <- function(id,
459459
checkmate::assert_class(data, "reactive")
460460
checkmate::assert_class(isolate(data()), "teal_data")
461461
moduleServer(id, function(input, output, session) {
462-
if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
462+
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
463463

464464
ns <- session$ns
465465

‎R/tm_g_distribution.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ srv_distribution <- function(id,
346346
checkmate::assert_class(data, "reactive")
347347
checkmate::assert_class(isolate(data()), "teal_data")
348348
moduleServer(id, function(input, output, session) {
349-
if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
349+
teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general")
350350

351351
setBookmarkExclude("params_reset")
352352

0 commit comments

Comments
 (0)