From 28735c89aa4eebaf3b4d38f2e40847ea3b2edb1c Mon Sep 17 00:00:00 2001 From: Marcin <133694481+m7pr@users.noreply.github.com> Date: Wed, 19 Jun 2024 12:23:36 +0200 Subject: [PATCH] 553 change level in `log_shiny_input_changes` and exclude plot sizes in logging (#281) Part of https://github.com/insightsengineering/coredev-tasks/issues/553 and https://github.com/insightsengineering/coredev-tasks/issues/568 --- .pre-commit-config.yaml | 1 - DESCRIPTION | 5 ++--- NEWS.md | 2 +- R/tm_g_gh_boxplot.R | 2 +- R/tm_g_gh_correlationplot.R | 2 +- R/tm_g_gh_density_distribution_plot.R | 2 +- R/tm_g_gh_lineplot.R | 2 +- R/tm_g_gh_scatterplot.R | 2 +- R/tm_g_gh_spaghettiplot.R | 2 +- R/toggleable_slider.R | 2 +- R/utils-arbitrary_lines.r | 2 +- 11 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1d079690..5b29560b 100755 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -28,7 +28,6 @@ repos: - ggplot2 - grDevices - lifecycle - - logger - methods - rlang - shinyjs diff --git a/DESCRIPTION b/DESCRIPTION index 5c211cb1..8d1323fb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -42,14 +42,13 @@ Imports: ggplot2 (>= 3.4.0), grDevices, lifecycle (>= 0.2.0), - logger (>= 0.3.0), methods, rlang (>= 1.0.0), shinyjs, shinyvalidate, stats, teal.code (>= 0.4.1.9009), - teal.logger (>= 0.1.3.9013), + teal.logger (>= 0.2.0.9004), teal.reporter (>= 0.2.0), teal.widgets (>= 0.4.0), tidyr (>= 0.8.3) @@ -67,7 +66,7 @@ VignetteBuilder: Config/Needs/verdepcheck: insightsengineering/goshawk, rstudio/shiny, insightsengineering/teal, insightsengineering/teal.transform, mllg/checkmate, daattali/colourpicker, tidyverse/dplyr, rstudio/DT, - tidyverse/ggplot2, r-lib/lifecycle, daroczig/logger, r-lib/rlang, + tidyverse/ggplot2, r-lib/lifecycle, r-lib/rlang, daattali/shinyjs, rstudio/shinyvalidate, insightsengineering/teal.code, insightsengineering/teal.logger, insightsengineering/teal.reporter, insightsengineering/teal.widgets, diff --git a/NEWS.md b/NEWS.md index 81d1dd53..3e6113b5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,7 +6,7 @@ * Adapted all modules to use `teal_data` objects. ### Enhancements -* Added `logger` functionality for logging changes in shiny inputs in all modules. `logger` was added to Imports. +* Added `teal.logger` functionality for logging changes in shiny inputs in all modules. * Updated the documentation and vignettes to demonstrate method to pass `teal_data` object to `teal::init()`. ### Miscellaneous diff --git a/R/tm_g_gh_boxplot.R b/R/tm_g_gh_boxplot.R index 77b764aa..0b3d9334 100644 --- a/R/tm_g_gh_boxplot.R +++ b/R/tm_g_gh_boxplot.R @@ -326,7 +326,7 @@ srv_g_boxplot <- function(id, checkmate::assert_class(shiny::isolate(data()), "teal_data") moduleServer(id, function(input, output, session) { - if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.goshawk") + teal.logger::log_shiny_input_changes(input, namespace = "teal.goshawk") output$axis_selections <- renderUI({ env <- shiny::isolate(as.list(data()@env)) resolved_x <- teal.transform::resolve_delayed(module_args$xaxis_var, env) diff --git a/R/tm_g_gh_correlationplot.R b/R/tm_g_gh_correlationplot.R index 09999d63..a3033663 100644 --- a/R/tm_g_gh_correlationplot.R +++ b/R/tm_g_gh_correlationplot.R @@ -382,7 +382,7 @@ srv_g_correlationplot <- function(id, checkmate::assert_class(shiny::isolate(data()), "teal_data") moduleServer(id, function(input, output, session) { - if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.goshawk") + teal.logger::log_shiny_input_changes(input, namespace = "teal.goshawk") output$axis_selections <- renderUI({ env <- shiny::isolate(as.list(data()@env)) resolved_x_param <- teal.transform::resolve_delayed(module_args$xaxis_param, env) diff --git a/R/tm_g_gh_density_distribution_plot.R b/R/tm_g_gh_density_distribution_plot.R index c190371b..ee994209 100644 --- a/R/tm_g_gh_density_distribution_plot.R +++ b/R/tm_g_gh_density_distribution_plot.R @@ -268,7 +268,7 @@ srv_g_density_distribution_plot <- function(id, # nolint checkmate::assert_class(shiny::isolate(data()), "teal_data") moduleServer(id, function(input, output, session) { - if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.goshawk") + teal.logger::log_shiny_input_changes(input, namespace = "teal.goshawk") output$axis_selections <- renderUI({ env <- shiny::isolate(as.list(data()@env)) resolved_x <- teal.transform::resolve_delayed(module_args$xaxis_var, env) diff --git a/R/tm_g_gh_lineplot.R b/R/tm_g_gh_lineplot.R index 63e2b3cb..863d0b9c 100644 --- a/R/tm_g_gh_lineplot.R +++ b/R/tm_g_gh_lineplot.R @@ -356,7 +356,7 @@ srv_lineplot <- function(id, checkmate::assert_class(shiny::isolate(data()), "teal_data") moduleServer(id, function(input, output, session) { - if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.goshawk") + teal.logger::log_shiny_input_changes(input, namespace = "teal.goshawk") ns <- session$ns output$axis_selections <- renderUI({ diff --git a/R/tm_g_gh_scatterplot.R b/R/tm_g_gh_scatterplot.R index 3d5009a2..c66059b1 100644 --- a/R/tm_g_gh_scatterplot.R +++ b/R/tm_g_gh_scatterplot.R @@ -267,7 +267,7 @@ srv_g_scatterplot <- function(id, checkmate::assert_class(shiny::isolate(data()), "teal_data") moduleServer(id, function(input, output, session) { - if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.goshawk") + teal.logger::log_shiny_input_changes(input, namespace = "teal.goshawk") output$axis_selections <- renderUI({ env <- shiny::isolate(as.list(data()@env)) resolved_x <- teal.transform::resolve_delayed(module_args$xaxis_var, env) diff --git a/R/tm_g_gh_spaghettiplot.R b/R/tm_g_gh_spaghettiplot.R index e124bad4..2c2f2ff8 100644 --- a/R/tm_g_gh_spaghettiplot.R +++ b/R/tm_g_gh_spaghettiplot.R @@ -376,7 +376,7 @@ srv_g_spaghettiplot <- function(id, checkmate::assert_class(shiny::isolate(data()), "teal_data") moduleServer(id, function(input, output, session) { - if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.goshawk") + teal.logger::log_shiny_input_changes(input, namespace = "teal.goshawk") output$axis_selections <- renderUI({ env <- shiny::isolate(as.list(data()@env)) resolved_x <- teal.transform::resolve_delayed(module_args$xaxis_var, env) diff --git a/R/toggleable_slider.R b/R/toggleable_slider.R index 28863748..f3fa54da 100644 --- a/R/toggleable_slider.R +++ b/R/toggleable_slider.R @@ -142,7 +142,7 @@ toggle_slider_ui <- function(id, # is_dichotomous_slider `logical` whether it is a dichotomous slider or normal slider toggle_slider_server <- function(id, is_dichotomous_slider = TRUE) { moduleServer(id, function(input, output, session) { - if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.goshawk") + teal.logger::log_shiny_input_changes(input, namespace = "teal.goshawk") checkmate::assert_flag(is_dichotomous_slider) # model view controller: cur_state is the model, the sliderInput and numericInputs are two views/controllers # additionally, the module returns the cur_state, so it can be controlled from that end as well diff --git a/R/utils-arbitrary_lines.r b/R/utils-arbitrary_lines.r index eb9fa806..8a5d3ccd 100644 --- a/R/utils-arbitrary_lines.r +++ b/R/utils-arbitrary_lines.r @@ -48,7 +48,7 @@ ui_arbitrary_lines <- function(id, line_arb, line_arb_label, line_arb_color, tit #' @keywords internal srv_arbitrary_lines <- function(id) { moduleServer(id, function(input, output, session) { - if (shiny::isRunning()) logger::log_shiny_input_changes(input, namespace = "teal.goshawk") + teal.logger::log_shiny_input_changes(input, namespace = "teal.goshawk") comma_sep_to_values <- function(values, wrapper_fun = trimws) { vals <- strsplit(values, "\\s{0,},\\s{0,}")[[1]] suppressWarnings(wrapper_fun(vals))