cleanup autosave

R/functionsServer.R

@@ -7,18 +7,18 @@ getGroupTable <- function(parTable) {
 
 importModel <- function(session, full, importedModel) {
   imported <- FALSE
-  if (Sys.getenv('SHINY_PORT') == "") {
-    server <- FALSE
+  if (Sys.getenv("SHINY_PORT") == "") {
+    shinyapps <- FALSE
   } else {
-    server <- TRUE
+    shinyapps <- TRUE
   }
-  session$sendCustomMessage("fullServer", message = list(full=full,server=server))
+  session$sendCustomMessage("fullServer", message = list(full = full, shinyapps = shinyapps))
 
   makeNewVars <- function(vars, groups) {
     allCombs <- expand.grid(vars, groups)
     paste0(allCombs$Var1, ".", allCombs$Var2)
   }
-  
+
   # import model if present
   if ((!imported) && !(is.null(importedModel))) {
     parTable <- importedModel$parTable
@@ -63,8 +63,8 @@ modifyResTable <- function(ests) {
   names(ests)[names(ests) == "lhs"] <- "source"
   names(ests)[names(ests) == "op"] <- "arrow"
   names(ests)[names(ests) == "rhs"] <- "target"
-  ests$arrow[ests$arrow == "~"] <- "\u2192" #→
-  ests$arrow[ests$arrow == "=~"] <- "\u2192" #→
-  ests$arrow[ests$arrow == "~~"] <- "\u2194" #↔
+  ests$arrow[ests$arrow == "~"] <- "\u2192" # →
+  ests$arrow[ests$arrow == "=~"] <- "\u2192" # →
+  ests$arrow[ests$arrow == "~~"] <- "\u2194" # ↔
   return(ests)
 }

dev/compile_restart_dev.R

@@ -1,5 +1,5 @@
 recompile_front <- T # nolint
-release <- F
+release <- T
 
 if (recompile_front) {
   # Compile Svelte front end

frontend/src/App.svelte

@@ -76,7 +76,7 @@
   <Debug />
   <FromR />
   <DuckTapeFixes />
-  {#if $appState.server}
+  {#if $appState.shinyapps}
     <AutoSave />
   {/if}
 {/if}

frontend/src/AutoSave.svelte

@@ -5,7 +5,8 @@
     import { onMount } from "svelte";
     import { parseModel } from "./MenuTop/IO";
 
-    const timeoutSeconds = 5;
+    const timeoutSeconds = 840;
+
     function idleTimer() {
         var t = setTimeout(logout, timeoutSeconds * 1000);
 
@@ -39,17 +40,20 @@
             model = jsonModel();
         }
         if (model != null || data != null) {
+            bootbox.alert(
+                "Due to inactivity, you will be disconnected from the server shortly. Your work was saved for you. In case you have already been disconnected now, you can continue where you left off by refreshing the page.",
+            );
             let sessionId = sessionStorage.getItem("sessionId");
             if (!sessionId) {
-                sessionId = Date.now().toString(); // Generate a unique session ID
+                sessionId = Date.now().toString();
                 sessionStorage.setItem("sessionId", sessionId);
                 console.log("Session ID save: ", sessionId);
             }
             var db = new Dexie("ModelDatabase");
             db.version(1).stores({
                 cache: "sessionId, model, data",
             });
-            await db.cache.clear(); // Corrected from delete() to clear()
+            await db.cache.clear();
             await db.cache.put({
                 sessionId: sessionId,
                 model: model,

frontend/src/MenuTop/IO.js

@@ -5,9 +5,6 @@ import { resetCounters } from "../Graph/graphmanipulation.js";
 import { applyLinkedClass } from "../Shiny/applyLinkedClass.js";
 import { checkNodeLoop } from "../Graph/checkNodeLoop.js";
 
-
-
-
 export async function requestData(goal) {
     // @ts-expect-error
     Shiny.setInputValue("down-requestData", { goal: goal, random: Math.random() });

frontend/src/Shiny/AppReady.svelte

@@ -1,18 +1,9 @@
 <script>
   import { appState } from "../stores";
-
-  function serverAvail() {
-    return typeof Shiny === "object" && Shiny !== null;
-  }
-  if (serverAvail()) {
-    Shiny.addCustomMessageHandler("fullServer", function (fullServer) {
-      $appState.full = fullServer.full;
-      $appState.ready = true;
-      $appState.server = true; //fullServer.server;
-      console.log("fullServer", fullServer.server);
-    });
-  } else {
-    $appState.full = true;
+  // @ts-ignore
+  Shiny.addCustomMessageHandler("fullServer", function (fullServer) {
+    $appState.full = fullServer.full;
     $appState.ready = true;
-  }
+    $appState.shinyapps = fullServer.shinyapps; //fullServer.server;
+  });
 </script>

frontend/src/stores.js

@@ -66,7 +66,8 @@ export let appState = writable({
   drawing: "none",
   undoEmpty: true,
   redoEmpty: true,
-  server: false
+  server: false,
+  shinyapps: false
 });
 
 export let dataInfo = writable(0);