Cran 0.6.2 Release (#48)

cb4ds · Mar 23, 2021 · 9eb5305 · 9eb5305
1 parent 294a8d9
commit 9eb5305
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: periscope
 Type: Package
 Title: Enterprise Streamlined 'Shiny' Application Framework
-Version: 0.6.1
+Version: 0.6.2
 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.6.2
+* Bugfix for the right sidebar when using shinydashboardPlus 2.0 - first tab was disappearing
+
 ### v0.6.1
 * Updated to provide handling for shinydashboardPlus old (<= 0.7.5) and new versions (2.X)
 * Removed import less-than requirement designation for shinydashboardPlus

diff --git a/R/fw_helpers_external.R b/R/fw_helpers_external.R
@@ -123,17 +123,15 @@ fw_create_right_sidebar <- function() {
 
     params <- list(shinyBS::bsAlert("sidebarRightAlert"))
     if (!is.null(side_right) && length(side_right) > 0) {
-        for (element in side_right) {
-            params <- append(params, list(element))
-        }
+        params <- c(params, side_right)
     }
 
     if (utils::packageVersion('shinydashboardPlus') < 2) {
         plus_fxn <- getExportedValue("shinydashboardPlus", "rightSidebar")
     } else {
         plus_fxn <- getExportedValue("shinydashboardPlus", "dashboardControlbar")
     }
-    
+
     return(do.call(plus_fxn, params))
 }
 

diff --git a/R/fw_helpers_internal.R b/R/fw_helpers_internal.R
@@ -60,9 +60,12 @@
 }
 
 .right_sidebar_injection <- function() {
-    shiny::tags$script(shiny::HTML("setTimeout(function() {
-                                        $('[class~=\"control-sidebar-tabs\"]').find('li:first').remove();
-                                   }, 5000);"))
+    value <- NULL
+    if (utils::packageVersion('shinydashboardPlus') < 2) {
+        shiny::tags$script(shiny::HTML("setTimeout(function() {
+                                            $('[class~=\"control-sidebar-tabs\"]').find('li:first').remove();
+                                       }, 5000);"))
+    }
 }
 
 .remove_sidebar_toggle <- function() {

diff --git a/R/generate_template.R b/R/generate_template.R
@@ -6,7 +6,7 @@
 #' framework.  The application can be created either empty (default) or with a
 #' sample/documented example application.\cr \cr A running instance of the exact 
 #' sample application that will be created is
-#' \href{http://periscopeapps.org:3838/framework_template}{hosted here} if you
+#' \href{http://periscopeapps.org:3838/periscope_template}{hosted here} if you
 #' would like to see the sample application before creating your own copy.
 #'
 #' @param name name for the new application and directory

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,9 +1,8 @@
 ## Comments from Maintainer
 
-* 0.6.1 - our host had issues and we needed a few redirect fixes.  Solved!  Apologies.
+* Right Sidebar Bug fix for ShinyDashboardPlus 2.0 compatibility
 
-* Updated the package to handle both the old and new releases of shinydashboardPlus
-* Updated tests, fixed a few minor bugs
+* There is a NOTE due to the short time between submissions, this is an important bugfix enabling right-sidebar applications to be generated for ShinyDashboardPlus 2.0 and I kindly ask for your exception to allow this release.
 
 ---  
 
@@ -19,7 +18,7 @@ Travis-CI (Ubuntu 16.04.6)
 
 * R 3.6.3
 * R 4.0.2
-* R devel (2021-03-11 r80086)
+* R devel (2021-03-17 r80092)
 
 WinBuilder
 

diff --git a/man/create_new_application.Rd b/man/create_new_application.Rd