Improve update_cbs()

openpharma · Dec 6, 2024 · 70ad863 · 70ad863
1 parent 39238a3
commit 70ad863
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/R/mod_common_forms.R b/R/mod_common_forms.R
@@ -179,8 +179,8 @@ mod_common_forms_server <- function(
     observeEvent(session$userData$update_checkboxes[[form]], {
       checked <- session$userData$update_checkboxes[[form]]
 
-      update_cbs(ns("common_form_table"), checked)
-      update_cbs(ns("SAE_table"), checked)
+      update_cbs("common_form_table", checked)
+      update_cbs("SAE_table", checked)
     })
 
     observeEvent(input$SAE_table_review_selection, {

diff --git a/R/mod_study_forms.R b/R/mod_study_forms.R
@@ -223,7 +223,7 @@ mod_study_forms_server <- function(
     observeEvent(session$userData$update_checkboxes[[form]], {
       checked <- session$userData$update_checkboxes[[form]]
 
-      update_cbs(ns("table"), checked)
+      update_cbs("table", checked)
     })
 
     ############################### Outputs: ###################################

diff --git a/R/shiny.R b/R/shiny.R
@@ -38,13 +38,10 @@ checkbox_create_callback <- DT::JS(
   "}"
 )
 
-update_cbs <- function(tblId, checked) {
-  "$(':checkbox:not(.indeterminate)', $('#%s .table').DataTable().rows().nodes()).prop('checked', %s)" |> 
-    sprintf(tblId, tolower(checked)) |> 
-    shinyjs::runjs()
-  "$(':checkbox.indeterminate', $('#%s .table').DataTable().rows().nodes()).prop('checked', %s).prop('indeterminate', false).prop('readOnly', %s)" |> 
-    sprintf(tblId, tolower(checked), tolower(!checked)) |> 
-    shinyjs::runjs()
+update_cbs <- function(id, checked, session = getDefaultReactiveDomain()) {
+  tblId <- session$ns(id)
+  params <- list(id = tblId, checked = checked)
+  session$sendCustomMessage('update_checkboxes', params)
 }
 
 progress_bar <- function(outputId) {

diff --git a/inst/app/www/custom.js b/inst/app/www/custom.js
@@ -10,6 +10,17 @@ function ts(cb) {
 
 $(document).ready(function() {
 
+  Shiny.addCustomMessageHandler("update_checkboxes", function(params) {
+    var table = $('#' + params.id + " .table").DataTable()
+    table.column(0).data().each(function(data){data.updated = params.checked})
+    $(':checkbox:not(.indeterminate)', table.rows().nodes()).
+        prop('checked', params.checked);
+    $(':checkbox.indeterminate', table.rows().nodes()).
+        prop('checked', params.checked).
+        prop('indeterminate', false).
+        prop('readOnly', params.checked);
+  });
+
   /* Define custom Shiny input binding for overall review checkbox. 
   This is needed to assign an event priority to the checkbox.*/
   var customCheckbox = new Shiny.InputBinding();