Simplify EEF.

Author: ml-ebs-ext

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: dv.papo
 Title: Patient Profile
-Version: 2.2.0-9001
+Version: 2.2.0-9002
 Authors@R: 
     c(person("Boehringer-Ingelheim Pharma GmbH & Co.KG", role = c("cph", "fnd")),
       person(given = "Korbinian",
@@ -35,14 +35,14 @@ Imports:
     shiny,
     shinyWidgets
 Suggests:
-    dv.manager (>= 2.1.0),
+    dv.manager (>= 3.0.0-9004),
     knitr,
     safetyData,
     shinytest2,
     testthat,
     jsonlite,
     withr,
     dplyr
-Remotes: boehringer-ingelheim/dv.manager
+Remotes: boehringer-ingelheim/dv.manager@372284-integrate_CM
 VignetteBuilder: knitr
 Config/testthat/edition: 3

NEWS.md

@@ -1,3 +1,7 @@
+# dv.papo 2.2.0-9002
+
+- [NOT USER-FACING] Move some EEF logic into dv.manager.
+
 # dv.papo 2.2.0-9001
 
 - Wrap decode column into no more than two lines (to avoid overlap).

R/check_papo_call_manual.R

@@ -3,8 +3,15 @@
 # TODO: Generate from mod_patient_profile_API
 # This function has been written manually, but mod_patient_profile_API carries
 # enough information to derive most of it automatically
-check_papo_call <- function(datasets, module_id, subject_level_dataset_name, subjid_var,
-                            sender_ids, summary, listings, plots, afmm_module_names) {
+check_papo_call <- function(datasets, module_args, afmm_module_names) {
+  module_id <- module_args[["module_id"]]
+  subject_level_dataset_name <- module_args[["subject_level_dataset_name"]]
+  subjid_var <- module_args[["subjid_var"]]
+  sender_ids <- module_args[["sender_ids"]]
+  summary <- module_args[["summary"]]
+  listings <- module_args[["listings"]]
+  plots <- module_args[["plots"]]
+  
   warn <- character(0)
   err <- character(0)
 

R/dressing_room.R

@@ -1222,40 +1222,3 @@ explorer_app <- function(datasets = NULL) {
     enableBookmarking = "url"
   )
 }
-
-app_creator_feedback_ui <- function(id) {
-  id <- paste(c(id, "validator"), collapse = "-")
-  ns <- shiny::NS(id)
-  return(shiny::uiOutput(ns("ui")))
-}
-
-app_creator_feedback_server <- function(id, warning_messages, error_messages, ui) {
-  id <- paste(c(id, "validator"), collapse = "-")
-  module <- shiny::moduleServer(
-    id,
-    function(input, output, session) {
-      output[["ui"]] <- shiny::renderUI({
-        res <- list()
-        warn <- warning_messages()
-        if (length(warn)) {
-          res[[length(res) + 1]] <- message_well("Module configuration warnings", Map(shiny::p, warn), color = "#fff7ef")
-        }
-
-        err <- error_messages()
-        if (length(err)) {
-          res[[length(res) + 1]] <- message_well("Module configuration errors", Map(shiny::p, err), color = "#f4d7d7")
-        }
-
-        if (length(error_messages()) == 0) res <- append(res, list(ui))
-        return(res)
-      })
-
-      # See: (ag4hj)
-      shiny::outputOptions(output, "ui", suspendWhenHidden = FALSE)
-    }
-  )
-
-
-
-  return(module)
-}

R/mod_patient_profile.R

@@ -402,40 +402,8 @@ mod_patient_profile <- function(module_id = "",
 
   mod <- list(
     # UI function
-    ui = function(module_id) {
-      app_creator_feedback_ui(module_id) # NOTE: original UI gated by app_creator_feedback_server
-    },
-    # Server function
+    ui = mod_patient_profile_UI,
     server = function(afmm) {
-      fb <- shiny::reactive({
-        # NOTE: We check the call here and not inside the module server function because:
-        #       - app creators interact with the davinci module and not with the ui-server combo, so
-        #         errors reported with respect to the module signature will make sense to them.
-        #         The module server function might use a different function signature.
-        #       - Here we also have access to the unfiltered dataset, which allows us to ensure call
-        #         correctness independent of filter state or operation.
-        #         Also, as long as the unfiltered dataset does not change (and to date no davinci app
-        #         changes it dynamically) this check only runs once at the beginning of the application
-        #         and has no further impact on performance.
-        #       - "catch errors early"
-
-        # Overwrite first "argument" (the function call, in fact) with the datasets provided to module manager
-        names(args)[[1]] <- "datasets"
-        args[[1]] <- afmm[["unfiltered_dataset"]]()
-        args[["afmm_module_names"]] <- afmm[["module_names"]]
-        do.call(check_papo_call, args)
-      })
-
-      fb_warn <- shiny::reactive(fb()[["warnings"]])
-      fb_err <- shiny::reactive(fb()[["errors"]])
-
-      app_creator_feedback_server(
-        id = module_id,
-        warning_messages = fb_warn,
-        error_messages = fb_err,
-        ui = dv.papo::mod_patient_profile_UI(module_id)
-      )
-
       # set palette colours for range_plots
       grading_vals <- get_grading_vals(plots[["range_plots"]], afmm[["data"]])
       plots[["palette"]] <- fill_palette(grading_vals, plots[["palette"]])
@@ -503,7 +471,15 @@ mod_patient_profile <- function(module_id = "",
           return(unique(res))
         }),
         subject_level = subject_level_dataset_name
-      )
+      ),
+      check_mod_fn = function(afmm, dataset_list) {
+        res <- check_papo_call(
+          datasets = dataset_list, 
+          module_args = args[-1], # exclude function from the result of `match.call`
+          afmm_module_names = afmm[["module_names"]]
+        )
+        return(res[["errors"]])
+      }
     )
   )
   return(mod)

tests/testthat/test-all.R

@@ -146,7 +146,7 @@ test_that(
       '"variable":"SEX","values":["M"],"include_NA":true}]}]}},',
       '"dataset_list_name":"demo"}'
     ), allow_no_input_binding_ = TRUE, priority_ = "event")
-    pat_id <- app$wait_for_value(input = sel_id)
+    app$wait_for_idle(duration = wait_for_idle_ms)
     testthat::expect_equal(app$get_value(input = sel_id), "01-701-1023")
 
     # Check if no patient is selected when filtered accordingly