Merge branch 'master' of https://github.com/bigomics/omicsplayground

bigomics · Mar 17, 2023 · e38a6ff · e38a6ff
2 parents 835698c + 6bde44a
commit e38a6ff
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 8 deletions.
diff --git a/components/app/R/OPTIONS b/components/app/R/OPTIONS
@@ -15,7 +15,6 @@ WATERMARK       = TRUE
 TIMEOUT         = 0
 #TIMEOUT        = 2400
 HONCHO_URL      = http://localhost:8000
-PLOTLY_EDITOR = https://shiny-plotly-editor.cpsievert.me
 
 #BOARDS_ENABLED = welcome,load,upload,view,clustersamples,clusterfeatures,wgcna,diffexpr,corr,enrich,pathway,wordcloud,drug,isect,sig,bio,cmap,comp,tcga,cell
 #BOARDS_ENABLED = load,dataview
diff --git a/components/app/R/www/editor/asset-manifest.json b/components/app/R/www/editor/asset-manifest.json
@@ -0,0 +1,6 @@
+{
+  "main.css": "static/css/main.fadcc9c8.css",
+  "main.css.map": "static/css/main.fadcc9c8.css.map",
+  "main.js": "static/js/main.c2f639fa.js",
+  "main.js.map": "static/js/main.c2f639fa.js.map"
+}
diff --git a/components/app/R/www/editor/favicon.ico b/components/app/R/www/editor/favicon.ico
diff --git a/components/app/R/www/editor/index.html b/components/app/R/www/editor/index.html
@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link href="https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700" rel="stylesheet"><link rel="shortcut icon" href="./favicon.ico"><title>Demo App</title><link href="../static/css/main.fadcc9c8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="../static/js/main.c2f639fa.js"></script></body></html>
diff --git a/components/app/R/www/editor/service-worker.js b/components/app/R/www/editor/service-worker.js
diff --git a/components/app/R/www/editor/static/css/main.fadcc9c8.css b/components/app/R/www/editor/static/css/main.fadcc9c8.css
diff --git a/components/app/R/www/editor/static/css/main.fadcc9c8.css.map b/components/app/R/www/editor/static/css/main.fadcc9c8.css.map
diff --git a/components/app/R/www/editor/static/js/main.c2f639fa.js b/components/app/R/www/editor/static/js/main.c2f639fa.js
diff --git a/components/app/R/www/editor/static/js/main.c2f639fa.js.map b/components/app/R/www/editor/static/js/main.c2f639fa.js.map
diff --git a/components/base/R/ui-PlotModule.R b/components/base/R/ui-PlotModule.R
@@ -326,7 +326,7 @@ PlotModuleServer <- function(
             cd <- session$clientData
             sprintf(
               "%s/?plotURL=%s//%s:%s%s%s",
-              PLOTLY_EDITOR,
+              "editor/index.html",
               cd$url_protocol,
               cd$url_hostname,
               cd$url_port,
@@ -344,8 +344,7 @@ PlotModuleServer <- function(
                 httpResponse(
                   status = 200,
                   content_type = 'application/json',
-                  content = data,
-                  headers = list("Access-Control-Allow-Origin" = PLOTLY_EDITOR)
+                  content = data
                 )
               }
             )
@@ -388,7 +387,7 @@ PlotModuleServer <- function(
             download.png <- shiny::downloadHandler(
               filename = "plot.png",
               content = function(file) {
-                
+
                 pdf.width  <- input$pdf_width
                 pdf.height <- input$pdf_height
                 resx <- 4  ## upresolution
@@ -439,7 +438,7 @@ PlotModuleServer <- function(
                     mtext("Error. PNG not available.",line=-8)
                     dev.off()
                   }
-                  
+
                   ## finally copy to final exported file
                   dbg("[downloadHandler.PNG] copy PNGFILE",PNGFILE,"to download file",file )
                   file.copy(PNGFILE, file, overwrite=TRUE)
@@ -511,11 +510,11 @@ PlotModuleServer <- function(
                       mtext("Error. PDF not available.",line=-8)
                       dev.off()
                     }
-                    
+
                     ## finally copy to final exported file
                     dbg("[downloadHandler.PDF] copy PDFFILE",PDFFILE,"to download file",file )
                     file.copy(PDFFILE, file, overwrite=TRUE)
-                    
+
                     ## ImageMagick or pdftk
                     if(TRUE && add.watermark) {
                       message("[plotModule] adding watermark to PDF...")
@@ -746,6 +745,8 @@ PlotModuleServer <- function(
                 # By default remove plotly logo from all plots
                 plot <- func() %>% plotly::config(displaylogo = FALSE) %>%
                   plotly::plotly_build()
+                plot <- plot %>%
+                  plotly_default1()
                 # If there is already custom buttons, append the edit one
                 # (issue #2210 plotly/plotly.R)
                 if(inherits(plot$x$config$modeBarButtons, "list")){