From decf2797fecf984642a6478c9544e07ccdcccd55 Mon Sep 17 00:00:00 2001
From: James Bisese <james.bisese@tetratech.com>
Date: Wed, 4 Dec 2024 13:19:03 -0500
Subject: [PATCH 1/2] Disable Load button until option selected

Prevent fatal error by disabling Load button on Load tab until the user has selected an Example dataset.
---
 R/mod_query_data.R | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/R/mod_query_data.R b/R/mod_query_data.R
index f5b716bb..e5867ad9 100644
--- a/R/mod_query_data.R
+++ b/R/mod_query_data.R
@@ -58,6 +58,7 @@ mod_query_data_ui <- function(id) {
         ns("example_data_go"),
         "Load",
         shiny::icon("truck-ramp-box"),
+        disabled = TRUE,
         style = "color: #fff; background-color: #337ab7; border-color: #2e6da4"
       )
     )),
@@ -256,6 +257,13 @@ mod_query_data_server <- function(id, tadat) {
   shiny::moduleServer(id, function(input, output, session) {
     ns <- session$ns
 
+    # https://stackoverflow.com/questions/24175997/force-no-default-selection-in-selectinput
+    shiny::observeEvent(input$example_data, {
+      if (!is.na(input$example_data) && nchar(input$example_data) > 1) {
+          shinyjs::enable("example_data_go")
+      } 
+    })
+    
     # read in the excel spreadsheet dataset if this input reactive object is populated via fileInput and define as tadat$raw
     shiny::observeEvent(input$file, {
       # a modal that pops up showing it's working on querying the portal

From 4cd24e4ae8507a64821988253e163d3807a0133d Mon Sep 17 00:00:00 2001
From: James Bisese <james.bisese@tetratech.com>
Date: Wed, 4 Dec 2024 16:56:06 -0500
Subject: [PATCH 2/2] Disable Apply Methods to Dataset button

Added logic to disable Apply Methods to Dataset button when the inputs are not complete or the button is not useful.
---
 R/mod_censored_data.R | 42 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/R/mod_censored_data.R b/R/mod_censored_data.R
index effba121..68edec35 100644
--- a/R/mod_censored_data.R
+++ b/R/mod_censored_data.R
@@ -64,7 +64,11 @@ mod_censored_data_ui <- function(id) {
     shiny::fluidRow(
       column(
         3,
-        shiny::actionButton(ns("apply_methods"), "Apply Methods to Dataset", style = "color: #fff; background-color: #337ab7; border-color: #2e6da4")
+        shiny::actionButton(
+          ns("apply_methods"), 
+          "Apply Methods to Dataset", 
+          disabled = TRUE,
+          style = "color: #fff; background-color: #337ab7; border-color: #2e6da4")
       ),
       column(3, shiny::uiOutput(ns("undo_methods")))
     ),
@@ -99,7 +103,7 @@ mod_censored_data_ui <- function(id) {
 mod_censored_data_server <- function(id, tadat) {
   shiny::moduleServer(id, function(input, output, session) {
     ns <- session$ns
-
+    
     # initialize dropdown values
 
     # reactive values specific to this module
@@ -162,9 +166,9 @@ mod_censored_data_server <- function(id, tadat) {
       if (is.null(init_val)) {
         init_val <- 0.5
       }
-      if (input$nd_method == nd_method_options[1]) {
+      if (input$nd_method == "Multiply detection limit by x") {
         shiny::numericInput(ns("nd_mult"),
-          "Multiplier (x)",
+          "Non-Detect Multiplier (x)",
           value = init_val,
           min = 0
         )
@@ -177,9 +181,9 @@ mod_censored_data_server <- function(id, tadat) {
       if (is.null(init_val)) {
         init_val <- 0.5
       }
-      if (input$od_method == od_method_options[1]) {
+      if (input$od_method == "Multiply detection limit by x") {
         shiny::numericInput(ns("od_mult"),
-          "Multiplier (x)",
+          "Over-Detect Multiplier (x)",
           value = init_val,
           min = 0
         )
@@ -211,18 +215,44 @@ mod_censored_data_server <- function(id, tadat) {
     # Make this part more concise?
     shiny::observeEvent(input$nd_method, {
       tadat$nd_method <- input$nd_method
+
+      if ((input$nd_method == "Multiply detection limit by x" && !is.numeric(input$nd_mult))
+          || (input$nd_method == "No change" && input$od_method == "No change" )){ 
+        shinyjs::disable("apply_methods")
+      } else {
+        shinyjs::enable("apply_methods")
+      }
     })
 
     shiny::observeEvent(input$nd_mult, {
       tadat$nd_mult <- input$nd_mult
+      
+      if (input$nd_method == "Multiply detection limit by x" && !is.numeric(input$nd_mult)) { 
+        shinyjs::disable("apply_methods")
+      } else {
+        shinyjs::enable("apply_methods")
+      }      
     })
 
     shiny::observeEvent(input$od_method, {
       tadat$od_method <- input$od_method
+
+      if ((input$od_method == "Multiply detection limit by x" && !is.numeric(input$od_mult))
+          || (input$nd_method == "No change" && input$od_method == "No change" )){ 
+        shinyjs::disable("apply_methods")
+      } else {
+        shinyjs::enable("apply_methods")
+      }
     })
 
     shiny::observeEvent(input$od_mult, {
       tadat$od_mult <- input$od_mult
+      
+      if (input$od_method == "Multiply detection limit by x" && !is.numeric(input$od_mult)) { 
+        shinyjs::disable("apply_methods")
+      } else {
+        shinyjs::enable("apply_methods")
+      }
     })