From 677c781042470b2cb6159e9523e9262111ddfe4e Mon Sep 17 00:00:00 2001 From: Aleksander Chlebowski Date: Mon, 3 Feb 2025 14:42:12 +0100 Subject: [PATCH 1/4] replace validate with req in test_q --- R/tm_g_distribution.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/tm_g_distribution.R b/R/tm_g_distribution.R index d7f4eeca7..f5e3922a8 100644 --- a/R/tm_g_distribution.R +++ b/R/tm_g_distribution.R @@ -1101,7 +1101,7 @@ srv_distribution <- function(id, dist_tests <- input$dist_tests t_dist <- input$t_dist - validate(need(dist_tests, "Please select a test")) + req(dist_tests) teal::validate_inputs(iv_dist) From 9c1a73c6966db5b545df7a2e3f85707518d2cd55 Mon Sep 17 00:00:00 2001 From: Aleksander Chlebowski Date: Mon, 3 Feb 2025 14:42:46 +0100 Subject: [PATCH 2/4] add conditinalPanel calls to block test results when tests not selected --- R/tm_g_distribution.R | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/R/tm_g_distribution.R b/R/tm_g_distribution.R index f5e3922a8..988c682ef 100644 --- a/R/tm_g_distribution.R +++ b/R/tm_g_distribution.R @@ -245,7 +245,17 @@ ui_distribution <- function(id, ...) { tags$h3("Statistics Table"), DT::dataTableOutput(ns("summary_table")), tags$h3("Tests"), - DT::dataTableOutput(ns("t_stats")) + conditionalPanel( + "input['teal-teal_modules-distribution_module-module-dist_tests'].length === 0", + div( + id = ns("please_select_a_test"), + "Please select a test" + ) + ), + conditionalPanel( + "input['teal-teal_modules-distribution_module-module-dist_tests'].length > 0", + DT::dataTableOutput(ns("t_stats")) + ) ), encoding = tags$div( ### Reporter From 5c8668d343cdac77343ec3cdafd0022cad6e8495 Mon Sep 17 00:00:00 2001 From: Aleksander Chlebowski Date: Mon, 3 Feb 2025 16:31:08 +0100 Subject: [PATCH 3/4] un-hardcode input id --- R/tm_g_distribution.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/tm_g_distribution.R b/R/tm_g_distribution.R index 988c682ef..9e8319302 100644 --- a/R/tm_g_distribution.R +++ b/R/tm_g_distribution.R @@ -246,14 +246,14 @@ ui_distribution <- function(id, ...) { DT::dataTableOutput(ns("summary_table")), tags$h3("Tests"), conditionalPanel( - "input['teal-teal_modules-distribution_module-module-dist_tests'].length === 0", + sprintf("input['%s'].length === 0", ns("dist_tests")), div( id = ns("please_select_a_test"), "Please select a test" ) ), conditionalPanel( - "input['teal-teal_modules-distribution_module-module-dist_tests'].length > 0", + sprintf("input['%s'].length > 0", ns("dist_tests")), DT::dataTableOutput(ns("t_stats")) ) ), From 76e9a019caee28f53bc0234378437e90f047939e Mon Sep 17 00:00:00 2001 From: Aleksander Chlebowski Date: Mon, 3 Feb 2025 16:38:14 +0100 Subject: [PATCH 4/4] amend unit tests for tm_g_distribution --- tests/testthat/test-shinytest2-tm_g_distribution.R | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/testthat/test-shinytest2-tm_g_distribution.R b/tests/testthat/test-shinytest2-tm_g_distribution.R index df32d82c4..73d06b858 100644 --- a/tests/testthat/test-shinytest2-tm_g_distribution.R +++ b/tests/testthat/test-shinytest2-tm_g_distribution.R @@ -74,7 +74,7 @@ testthat::test_that("e2e - tm_g_distribution: Histogram encoding inputs produce app_driver <- app_driver_tm_g_distribution() app_driver$set_active_module_input("main_type", "Density") - app_driver$expect_validation_error() # test needs to be updated to remove validation error + app_driver$expect_no_validation_error() app_driver$set_active_module_input("dist_tests", "Shapiro-Wilk") # Encodings in the Histogram tab @@ -112,8 +112,6 @@ testthat::test_that("e2e - tm_g_distribution: QQ plot encoding inputs produce ou # Encodings in the QQplot tab app_driver$set_active_module_input("main_type", "Density") - app_driver$expect_validation_error() # test needs to be updated to remove validation error - app_driver$set_active_module_input("dist_tests", "Shapiro-Wilk") app_driver$expect_no_validation_error() app_driver$set_active_module_input("tabs", "QQplot")