Merge pull request #146 from surveydown-dev/cookie-revert

Cookie update

NEWS.md

@@ -2,7 +2,8 @@
 
 # surveydown 0.5.2
 
-- Cookies feature fixed.
+- Cookies feature fixed and back online.
+- Now upon window closure, the data will be immediately uploaded to db. A backup uploading will trigger upon session ends, which is usually after 5-10 secs upon closing the window.
 
 # surveydown 0.5.1
 

R/server.R

@@ -371,7 +371,7 @@ sd_server <- function(
     # Reactive value to track which fields have changed
     changed_fields <- shiny::reactiveVal(names(initial_data))
 
-    # Initial data update when session starts
+    # Update checkpoint 1 - when session starts
     shiny::isolate({
         update_data()
     })
@@ -497,7 +497,7 @@ sd_server <- function(
                         # Update tracker of which fields changed
                         changed_fields(c(changed_fields(), next_ts_id, "current_page"))
 
-                        # Update data
+                        # Update checkpoint 2 - upon going to the next page
                         update_data()
                     } else if (!is.null(next_page_id)) {
                         shinyWidgets::sendSweetAlert(
@@ -561,7 +561,7 @@ sd_server <- function(
         rating <- input$survey_rating
         all_data[['exit_survey_rating']] <- rating
         changed_fields(c(changed_fields(), 'exit_survey_rating'))
-        # Update data immediately
+        # Update checkpoint 3 - when submitting rating
         shiny::isolate({
             update_data(time_last = TRUE)
         })
@@ -576,7 +576,14 @@ sd_server <- function(
         session$sendCustomMessage("closeWindow", list())
     })
 
-    # Ensure final update on session end
+    # Update checkpoint 4 - when window is closed
+    shiny::observeEvent(input$window_closing, {
+        shiny::isolate({
+            update_data(time_last = TRUE)
+        })
+    }, ignoreInit = TRUE)
+
+    # Update checkpoint 5 - when session is ended (backup)
     shiny::onSessionEnded(function() {
         shiny::isolate({
             update_data(time_last = TRUE)

R/ui.R

@@ -91,6 +91,7 @@ sd_ui <- function() {
         "countdown.js",
         "enter_key.js",
         "keep_alive.js",
+        "window_close.js",
         "surveydown.css"
       ),
       if (any(theme == "default")) {

inst/js/window_close.js

@@ -0,0 +1,10 @@
+$(document).ready(function() {
+  window.addEventListener('beforeunload', function(e) {
+    // Send message to Shiny
+    Shiny.setInputValue('window_closing', true, {priority: 'event'});
+
+    // Small delay to allow data to save
+    var start = Date.now();
+    while(Date.now() - start < 200) {}
+  });
+});