remove datsets check as we do not render per dataset anymore (#441)

insightsengineering · Apr 10, 2020 · 0f11daa · 0f11daa
1 parent 771075e
commit 0f11daa
Showing 1 changed file with 25 additions and 39 deletions.
diff --git a/R/module_filter_info.R b/R/module_filter_info.R
@@ -14,46 +14,32 @@ srv_filter_info <- function(input, output, session, datasets) {
   output$table <- renderTable({
     .log("update uifiltersinfo")
 
-    on_filters <- vapply(
-      datasets$datanames(),
-      function(dataname) {
-        length(names(datasets$get_filter_state(dataname, reactive = TRUE))) >= 1
+    observations <- vapply(
+      X = datasets$datanames(),
+      FUN = function(dataname, datasets) {
+        paste0(
+          datasets$get_data_info(dataname, filtered = TRUE, reactive = TRUE)$dim[1], "/",
+          datasets$get_data_info(dataname = dataname, filtered = FALSE, reactive = TRUE)$dim[1]
+        )
       },
-      logical(1)
+      FUN.VALUE = character(1),
+      dataset = datasets
+    )
+    subjects <- vapply(
+      X = datasets$datanames(),
+      FUN = function(dataname, datasets) {
+        paste0(
+          datasets$get_data_info(dataname, filtered = TRUE, reactive = TRUE)$patients, "/",
+          datasets$get_data_info(dataname = dataname, filtered = FALSE, reactive = TRUE)$patients
+        )
+      },
+      FUN.VALUE = character(1),
+      dataset = datasets
+    )
+    data.frame(
+      Dataset = datasets$datanames(),
+      Obs = observations,
+      Subjects = subjects
     )
-
-    already_rendered <- length(which(on_filters)) > 1
-
-    if (already_rendered) {
-      NULL
-    } else {
-      observations <- vapply(
-        X = datasets$datanames(),
-        FUN = function(dataname, datasets) {
-          paste0(
-            datasets$get_data_info(dataname, filtered = TRUE, reactive = TRUE)$dim[1], "/",
-            datasets$get_data_info(dataname = dataname, filtered = FALSE, reactive = TRUE)$dim[1]
-          )
-        },
-        FUN.VALUE = character(1),
-        dataset = datasets
-      )
-      subjects <- vapply(
-        X = datasets$datanames(),
-        FUN = function(dataname, datasets) {
-          paste0(
-            datasets$get_data_info(dataname, filtered = TRUE, reactive = TRUE)$patients, "/",
-            datasets$get_data_info(dataname = dataname, filtered = FALSE, reactive = TRUE)$patients
-          )
-        },
-        FUN.VALUE = character(1),
-        dataset = datasets
-      )
-      data.frame(
-        Dataset = datasets$datanames(),
-        Obs = observations,
-        Subjects = subjects
-      )
-    }
   }, width = "100%")
 }