updated the download part of the serverless app

ComPlat · Oct 17, 2024 · 5bb897e · 5bb897e
1 parent 80a99a3
commit 5bb897e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/bs/R/DoseResponse.R b/bs/R/DoseResponse.R
@@ -127,7 +127,10 @@ DoseResponseServer <- function(id, data, listResults) {
       })
       req(length(indices) >= 1)
       l <- listResults$all_data[indices]
-      if (Sys.getenv("RUN_MODE") == "BROWSER") {
+      if (Sys.getenv("RUN_MODE") == "SERVER") {
+        excelFile <- createExcelFile(l)
+        upload(session, excelFile, new_name = "Results.xlsx") # TODO: add possibility for desired file name
+      } else {
         jsString <- createJSString(l)
         session$sendCustomMessage(
           type = "downloadZip",
@@ -136,9 +139,6 @@ DoseResponseServer <- function(id, data, listResults) {
             FileContent = jsString
           )
         )
-      } else if (Sys.getenv("RUN_MODE") == "SERVER") {
-        excelFile <- createExcelFile(l)
-        upload(session, excelFile, new_name = "Results.xlsx") # TODO: add possibility for desired file name
       }
     })
   })

diff --git a/bs/R/assumption.R b/bs/R/assumption.R
@@ -234,7 +234,10 @@ assServer <- function(id, data, listResults) {
       req(length(indices) >= 1)
       l <- listResults$all_data[indices]
 
-      if (Sys.getenv("RUN_MODE") == "BROWSER") {
+      if (Sys.getenv("RUN_MODE") == "SERVER") {
+        excelFile <- createExcelFile(l)
+        upload(session, excelFile, new_name = "Results.xlsx") # TODO: add possibility for desired file name
+      } else {
         jsString <- createJSString(l)
         session$sendCustomMessage(
           type = "downloadZip",
@@ -243,9 +246,6 @@ assServer <- function(id, data, listResults) {
             FileContent = jsString
           )
         )
-      } else if (Sys.getenv("RUN_MODE") == "SERVER") {
-        excelFile <- createExcelFile(l)
-        upload(session, excelFile, new_name = "Results.xlsx") # TODO: add possibility for desired file name
       }
     })
   })

diff --git a/bs/R/correlation.R b/bs/R/correlation.R
@@ -121,7 +121,10 @@ corrServer <- function(id, data, listResults) {
       })
       req(length(indices) >= 1)
       l <- listResults$all_data[indices]
-      if (Sys.getenv("RUN_MODE") == "BROWSER") {
+      if (Sys.getenv("RUN_MODE") == "SERVER") {
+        excelFile <- createExcelFile(l)
+        upload(session, excelFile, new_name = "Results.xlsx") # TODO: add possibility for desired file name
+      } else {
         jsString <- createJSString(l)
         session$sendCustomMessage(
           type = "downloadZip",
@@ -130,9 +133,6 @@ corrServer <- function(id, data, listResults) {
             FileContent = jsString
           )
         )
-      } else if (Sys.getenv("RUN_MODE") == "SERVER") {
-        excelFile <- createExcelFile(l)
-        upload(session, excelFile, new_name = "Results.xlsx") # TODO: add possibility for desired file name
       }
     })
   })

diff --git a/bs/R/statisticalTests.R b/bs/R/statisticalTests.R
@@ -266,7 +266,10 @@ testsServer <- function(id, data, listResults) {
       })
       req(length(indices) >= 1)
       l <- listResults$all_data[indices]
-      if (Sys.getenv("RUN_MODE") == "BROWSER") {
+      if (Sys.getenv("RUN_MODE") == "SERVER") {
+        excelFile <- createExcelFile(l)
+        upload(session, excelFile, new_name = "Results.xlsx") # TODO: add possibility for desired file name
+      } else {
         jsString <- createJSString(l)
         session$sendCustomMessage(
           type = "downloadZip",
@@ -275,9 +278,6 @@ testsServer <- function(id, data, listResults) {
             FileContent = jsString
           )
         )
-      } else if (Sys.getenv("RUN_MODE") == "SERVER") {
-        excelFile <- createExcelFile(l)
-        upload(session, excelFile, new_name = "Results.xlsx") # TODO: add possibility for desired file name
       }
     })
   })

diff --git a/bs/R/visualisation.R b/bs/R/visualisation.R
@@ -276,7 +276,10 @@ visServer <- function(id, data, listResults) {
       })
       req(length(indices) >= 1)
       l <- listResults$all_data[indices]
-      if (Sys.getenv("RUN_MODE") == "BROWSER") {
+      if (Sys.getenv("RUN_MODE") == "SERVER") {
+        excelFile <- createExcelFile(l)
+        upload(session, excelFile, new_name = "Results.xlsx") # TODO: add possibility for desired file name
+      } else {
         jsString <- createJSString(l)
         session$sendCustomMessage(
           type = "downloadZip",
@@ -285,9 +288,6 @@ visServer <- function(id, data, listResults) {
             FileContent = jsString
           )
         )
-      } else if (Sys.getenv("RUN_MODE") == "SERVER") {
-        excelFile <- createExcelFile(l)
-        upload(session, excelFile, new_name = "Results.xlsx") # TODO: add possibility for desired file name
       }
     })
   })

diff --git a/docs/app.json b/docs/app.json