Merge branch 'main' into 886-r-script-with-the-custom-time-duplicate-management

Author: Gero1999

NEWS.md

@@ -56,6 +56,7 @@ identify difference between missing and not requested (#934)
 * Creation of intervals reworked to prevent doses being combined if no samples are taken post dose (#963)
 * Parameter selection no longer resets after changes to NCA setup and slope selector- apart from changes to analyte and pcspec that change the study types detected (#1008)
 * Prevent a crash when selecting already defined identity variables (i.e, `DOSETRT`) for the `Additional Grouping Variables` in the `Mapping Tab` (#1060)
+* Filtering will now correctly also affect all the input widgets in NCA setup (#1092)
 
 # aNCA 0.1.0
 

inst/shiny/modules/tab_nca.R

@@ -164,11 +164,12 @@ tab_nca_server <- function(id, pknca_data, extra_group_vars, settings_override)
             remove_pp_not_requested()
         },
         warning = function(w) {
-          log_warn("Warning during NCA calculation: {conditionMessage(w)}")
-          pknca_warn_env$warnings <- append(
-            pknca_warn_env$warnings,
-            .parse_pknca_warning(w)
-          )
+          parsed <- .parse_pknca_warning(w)
+          if (!is.null(parsed)) {
+            log_warn("Warning during NCA calculation: {conditionMessage(w)}")
+            pknca_warn_env$warnings <- append(pknca_warn_env$warnings, parsed)
+          }
+          invokeRestart("muffleWarning")
         })
 
         # Display unique warnings thrown by PKNCA run.

inst/shiny/modules/tab_nca/setup/settings.R

@@ -226,11 +226,10 @@ settings_server <- function(id, data, adnca_data, settings_override) {
         # Additional settings (PCSPEC and ATPTREF handled later)
         updateSelectInput(session, inputId = "method", selected = settings$method)
 
-        if (!is.null(settings$bioavailability) &&
-              adnca_data()$dose$data$std_route %>%
-                unique() %>%
-                length() > 1) {
-          updateSelectInput(session,
+        dose_routes <- unique(adnca_data()$dose$data$std_route)
+        if (!is.null(settings$bioavailability) && length(dose_routes) > 1) {
+          updateSelectInput(
+            session,
             inputId = "bioavailability",
             selected = settings$bioavailability
           )
@@ -295,8 +294,9 @@ settings_server <- function(id, data, adnca_data, settings_override) {
     })
 
     # Update Downstream Inputs (Profile & Specimen)
-    observeEvent(input$select_analyte, {
-      req(data())
+    # React to both analyte selection and data changes
+    observeEvent(c(input$select_analyte, data()), {
+      req(data(), input$select_analyte)
 
       settings <- settings_override()