added explicit waiter; tried as reactive with waiter <- reactive({Wai…

…ter$new}) and then waiter()$show - did not work
ICB-DCM · Oct 30, 2024 · c69a50d · c69a50d
1 parent 57001a2
commit c69a50d
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 3 deletions.
diff --git a/program/shinyApp/R/enrichment_analysis/server.R b/program/shinyApp/R/enrichment_analysis/server.R
@@ -47,6 +47,11 @@ enrichment_analysis_geneset_server <- function(
             paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")
           },
           content = function(file){
+            waiter <- Waiter$new(
+              html = LOADING_SCREEN,
+              color = "#3897F147",
+              hide_on_render = FALSE
+            )
             waiter$show()
           #  tmp <- getUserReactiveValues(input)
            # par_tmp$Enrichment[names(tmp)] <<- tmp

diff --git a/program/shinyApp/R/heatmap/server.R b/program/shinyApp/R/heatmap/server.R
@@ -284,6 +284,11 @@ heatmap_server <- function(id, data, params, updates){
             paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")
           },
           content = function(file){
+            waiter <- Waiter$new(
+              html = LOADING_SCREEN,
+              color = "#3897F147",
+              hide_on_render = FALSE
+            )
             waiter$show()
             envList <- list(
               res_tmp = res_tmp[[session$token]],

diff --git a/program/shinyApp/R/pca/server.R b/program/shinyApp/R/pca/server.R
@@ -477,6 +477,11 @@ pca_Server <- function(id, data, params, row_select){
             paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")
           },
           content = function(file){
+            waiter <- Waiter$new(
+              html = LOADING_SCREEN,
+              color = "#3897F147",
+              hide_on_render = FALSE
+            )
             waiter$show()
             envList <- list(
               res_tmp = res_tmp[[session$token]],
@@ -575,6 +580,11 @@ pca_Server <- function(id, data, params, row_select){
             paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")
           },
           content = function(file){
+            waiter <- Waiter$new(
+              html = LOADING_SCREEN,
+              color = "#3897F147",
+              hide_on_render = FALSE
+            )
             waiter$show()
 
             envList <- list(
@@ -654,6 +664,11 @@ pca_Server <- function(id, data, params, row_select){
             paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")
           },
           content = function(file){
+            waiter <- Waiter$new(
+              html = LOADING_SCREEN,
+              color = "#3897F147",
+              hide_on_render = FALSE
+            )
             waiter$show()
             envList <- list(
 
@@ -741,6 +756,11 @@ pca_Server <- function(id, data, params, row_select){
             paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")
           },
           content = function(file){
+            waiter <- Waiter$new(
+              html = LOADING_SCREEN,
+              color = "#3897F147",
+              hide_on_render = FALSE
+            )
             waiter$show()
             envList <- list(
 

diff --git a/program/shinyApp/R/sample_correlation/server.R b/program/shinyApp/R/sample_correlation/server.R
@@ -164,6 +164,11 @@ sample_correlation_server <- function(id, data, params){
       output$getR_SampleCorrelation <- downloadHandler(
         filename = function(){ paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")},
         content = function(file){
+          waiter <- Waiter$new(
+            html = LOADING_SCREEN,
+            color = "#3897F147",
+            hide_on_render = FALSE
+          )
           waiter$show()
           envList <- list(
 

diff --git a/program/shinyApp/R/significance_analysis/server.R b/program/shinyApp/R/significance_analysis/server.R
@@ -520,6 +520,11 @@ significance_analysis_server <- function(id, data, params){
           paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")
         },
         content = function(file){
+          waiter <- Waiter$new(
+            html = LOADING_SCREEN,
+            color = "#3897F147",
+            hide_on_render = FALSE
+          )
           waiter$show()
           tmp <- getUserReactiveValues(input)
           par_tmp[[session$token]]$SigAna[names(tmp)] <<- tmp

diff --git a/program/shinyApp/R/significance_analysis/util.R b/program/shinyApp/R/significance_analysis/util.R
@@ -398,6 +398,11 @@ create_new_tab_manual <- function(title, targetPanel, result, contrast, alpha, n
         paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")
       },
       content = function(file){
+        waiter <- Waiter$new(
+          html = LOADING_SCREEN,
+          color = "#3897F147",
+          hide_on_render = FALSE
+        )
         waiter$show()
         tmp <- getUserReactiveValues(input)
         par_tmp[[session$token]]$SigAna[names(tmp)] <<- tmp
@@ -453,6 +458,11 @@ create_new_tab_manual <- function(title, targetPanel, result, contrast, alpha, n
         paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")
       },
       content = function(file){
+        waiter <- Waiter$new(
+          html = LOADING_SCREEN,
+          color = "#3897F147",
+          hide_on_render = FALSE
+        )
         waiter$show()
         tmp <- getUserReactiveValues(input)
         par_tmp[[session$token]]$SigAna[names(tmp)] <<- tmp
@@ -934,6 +944,11 @@ create_new_tab_DESeq <- function(title, targetPanel, result, contrast, alpha, ns
       paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")
     },
     content = function(file){
+      waiter <- Waiter$new(
+        html = LOADING_SCREEN,
+        color = "#3897F147",
+        hide_on_render = FALSE
+      )
       waiter$show()
       tmp <- getUserReactiveValues(input)
       par_tmp[[session$token]]$SigAna[names(tmp)] <<- tmp
@@ -989,6 +1004,11 @@ create_new_tab_DESeq <- function(title, targetPanel, result, contrast, alpha, ns
       paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")
     },
     content = function(file){
+      waiter <- Waiter$new(
+        html = LOADING_SCREEN,
+        color = "#3897F147",
+        hide_on_render = FALSE
+      )
       waiter$show()
       tmp <- getUserReactiveValues(input)
       par_tmp[[session$token]]$SigAna[names(tmp)] <<- tmp

diff --git a/program/shinyApp/R/single_gene_visualisation/server.R b/program/shinyApp/R/single_gene_visualisation/server.R
@@ -265,6 +265,11 @@ single_gene_visualisation_server <- function(id, data){
             paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")
           },
           content = function(file){
+            waiter <- Waiter$new(
+              html = LOADING_SCREEN,
+              color = "#3897F147",
+              hide_on_render = FALSE
+            )
             waiter$show()
             envList <- list(
 

diff --git a/program/shinyApp/server.R b/program/shinyApp/server.R
@@ -81,6 +81,7 @@ server <- function(input,output,session){
   # create an empty list in res/par_tmp[[session$token]]
   res_tmp[[session$token]] <<- list()
   par_tmp[[session$token]] <<- list()
+
   # On session end, remove the list from res/par_tmp
   session$onSessionEnded(function() {
     res_tmp[[session$token]] <<- NULL
@@ -906,10 +907,9 @@ server <- function(input,output,session){
     # only enter this when you actually click data
     req(input$Do_preprocessing > 0)
     waiter <- Waiter$new(
-      id="data_summary",
       html = LOADING_SCREEN,
-      color="#3897F147",
-      hide_on_render=FALSE
+      color = "#3897F147",
+      hide_on_render = FALSE
     )
     waiter$show()
     print("Do Preprocessing")
@@ -1247,6 +1247,11 @@ server <- function(input,output,session){
       paste0("ShinyOmics_Rcode2Reproduce_", Sys.Date(), ".zip")
     },
     content = function(file) {
+      waiter <- Waiter$new(
+        html = LOADING_SCREEN,
+        color = "#3897F147",
+        hide_on_render = FALSE
+      )
       waiter$show()
       envList <- list(
         res_tmp = res_tmp[[session$token]],