Start app faster (#196)

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: qmongr
 Title: Lightweight Quality Assessment of Norwegian Hospitals 
-Version: 0.18.3
+Version: 0.18.4
 Authors@R: c(
     person(given = "Yohannes",
            family = "Tesfay",

NEWS.md

@@ -1,3 +1,7 @@
+# qmongr 0.18.4
+
+Show stuff from app faster, before data is loaded.
+
 # qmongr 0.18.3
 
 Favicon

R/app_ui.R

@@ -39,7 +39,7 @@ add_external_resources <- function() {
       rel = "stylesheet", type = "text/css", href = "www/fontawesome/css/v4-shims.min.css"
     ),
     shiny::tags$link(
-      rel = "stylesheet", type = "text/css", href = "www/static/css/main.e193dd5b.chunk.css"
+      rel = "stylesheet", type = "text/css", href = "www/static/css/main.6aa8215a.chunk.css"
     ),
     shiny::tags$script(src = "www/iframeResizer.contentWindow.min.js")
   )

R/quality_overview.R

@@ -16,10 +16,11 @@ NULL
 #' @export
 #' @importFrom shiny NS tagList
 quality_overview_ui <- function(id) {
-  ns <- shiny::NS(id)
   tagList(
     shiny::tags$div(id = "root"),
-    shiny::htmlOutput(ns("json"))
+    shiny::tags$script(src = "www/static/js/2.295d41d0.chunk.js"),
+    shiny::tags$script(src = "www/static/js/main.9db8647e.chunk.js"),
+    shiny::tags$script(src = "www/static/js/runtime-main.7678d803.js")
   )
 }
 
@@ -32,28 +33,49 @@ quality_overview_ui <- function(id) {
 
 quality_overview_server <- function(id) {
   shiny::moduleServer(id, function(input, output, session) {
-  #All the processed data
-  app_data <- qmongr::get_data()
-  register_data <- app_data[["register_data"]]
-  grouped_by_hf <- app_data[["grouped_by_hf"]]
-  grouped_by_rhf <- app_data[["grouped_by_rhf"]]
-  grouped_by_hospital <- app_data[["grouped_by_hospital"]]
-  national_data <- app_data[["national_data"]]
-  tu_names <- app_data[["tu_names"]]
-  #data passed to js
-  output$json <- shiny::reactive({
-      paste(
-        "<script> var  description = ",
-          jsonlite::toJSON(register_data$description, na = "null"), ";",
-          "var indicator_hosp =", jsonlite::toJSON(grouped_by_hospital), ";",
-          "var indicator_hf =", jsonlite::toJSON(grouped_by_hf), ";",
-          "var indicator_rhf =", jsonlite::toJSON(grouped_by_rhf), ";",
-          "var indicator_nat =", jsonlite::toJSON(national_data), ";",
-          "var tu_names =", jsonlite::toJSON(tu_names), ";",
-        "</script>",
-        shiny::tags$script(src = "www/static/js/2.e726af5f.chunk.js"),
-        shiny::tags$script(src = "www/static/js/main.8260245e.chunk.js"),
-        shiny::tags$script(src = "www/static/js/runtime-main.7678d803.js")
+    #All the processed data
+    app_data <- qmongr::get_data()
+    register_data <- app_data[["register_data"]]
+    grouped_by_hf <- app_data[["grouped_by_hf"]]
+    grouped_by_rhf <- app_data[["grouped_by_rhf"]]
+    grouped_by_hospital <- app_data[["grouped_by_hospital"]]
+    national_data <- app_data[["national_data"]]
+    tu_names <- app_data[["tu_names"]]
+
+    shiny::observe({
+      session$sendCustomMessage(
+        type = "tu_names",
+        message =  jsonlite::toJSON(tu_names)
+      )
+    })
+    shiny::observe({
+      session$sendCustomMessage(
+        type = "description",
+        message =  jsonlite::toJSON(register_data$description, na = "null")
+      )
+    })
+    shiny::observe({
+      session$sendCustomMessage(
+        type = "nation",
+        message =  jsonlite::toJSON(national_data)
+      )
+    })
+    shiny::observe({
+      session$sendCustomMessage(
+        type = "hospital",
+        message =  jsonlite::toJSON(grouped_by_hospital)
+      )
+    })
+    shiny::observe({
+      session$sendCustomMessage(
+        type = "hf",
+        message =  jsonlite::toJSON(grouped_by_hf)
+      )
+    })
+    shiny::observe({
+      session$sendCustomMessage(
+        type = "rhf",
+        message =  jsonlite::toJSON(grouped_by_rhf)
       )
     })
   })

tests/testthat/test-app_ui.R

@@ -1,6 +1,6 @@
 test_that("app_ui", {
   config <- get_config()
-  ref_chr <- as.character(purrr::flatten(app_ui()))[4]
+  ref_chr <- as.character(purrr::flatten(app_ui()))[1]
 
-  expect_true(grepl("shiny-html-output", ref_chr, fixed = TRUE))
+  expect_true(grepl("head", ref_chr, fixed = TRUE))
 })