Cran 0.4.6 release (#12)

cb4ds · Sep 26, 2019 · a7c242f · a7c242f
1 parent 3bbf9c4
commit a7c242f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: periscope
 Type: Package
 Title: Enterprise Streamlined 'Shiny' Application Framework
-Version: 0.4.5
+Version: 0.4.6
 Authors@R: c(
     person("Constance", "Brett", email="connie@aggregate-genius.com", role = c("aut", "cre")),
     person("Isaac", "Neuhaus", role = "aut", comment = "canvasXpress JavaScript Library Maintainer"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,8 @@
 #Revisions and Change Log
 
+### v0.4.6
+* Bugfix - hide downloadable table button if there are no download functions defined
+* Updated tests to be compatable with the next release of htmltools (0.4, schloerke)
 
 ### v0.4.5
 * Bugfix - downloadable table button was not appearing when created in a reactive block

diff --git a/R/downloadableTable.R b/R/downloadableTable.R
@@ -65,6 +65,7 @@ downloadableTableUI <- function(id,
         shiny::span(
             id = ns("dtableButtonDiv"),
             class = "periscope-downloadable-table-button",
+            style = ifelse(length(downloadtypes) > 0, "", "display:none"),
             downloadFileButton(ns("dtableButtonID"),
                                downloadtypes,
                                hovertext)),
@@ -147,6 +148,10 @@ downloadableTable <- function(input, output, session, logger,
 
     shiny::callModule(downloadFile,  "dtableButtonID",
                       logger, filenameroot, downloaddatafxns)
+
+    session$sendCustomMessage("downloadbutton_toggle",
+                              message = list(btn  = session$ns("dtableButtonDiv"),
+                                             rows = -1))
 
     dtInfo <- shiny::reactiveValues(selected  = NULL,
                                     tabledata = NULL,
@@ -164,9 +169,9 @@ downloadableTable <- function(input, output, session, logger,
         dtInfo$downloaddatafxns <- lapply(downloaddatafxns, do.call, list())
 
         rowct <- lapply(dtInfo$downloaddatafxns, nrow)
-            session$sendCustomMessage("downloadbutton_toggle",
-                message = list(btn  = session$ns("dtableButtonDiv"),
-                               rows = sum(unlist(rowct))))
+        session$sendCustomMessage("downloadbutton_toggle",
+                                  message = list(btn  = session$ns("dtableButtonDiv"),
+                                                 rows = sum(unlist(rowct))))
     })
 
     output$dtableOutputID <- DT::renderDataTable({

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,6 +1,9 @@
 ## Comments from Maintainer
 
-Bugfix: downloadable table button not appearing in dynamically created UI reactives
+Bugfix: hide downloadable table button if there are no download functions defined
+
+Updated tests to be compatable with the next release of htmltools (0.4, schloerke)
+
 
 ---  
 
@@ -17,7 +20,7 @@ Travis-CI (Ubuntu 16.04.6)
 
 * R 3.5.3
 * R 3.6.1
-* R devel 2019-09-15 r77192)
+* R devel (2019-09-25 r77216)
 
 WinBuilder