Skip to content

Commit

Permalink
CRAN 1.6.6
Browse files Browse the repository at this point in the history
  • Loading branch information
vnijs committed May 15, 2024
1 parent 0c84c6d commit c5c8d5d
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 22 deletions.
6 changes: 3 additions & 3 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Version: 1.6.2
Date: 2023-10-16 05:23:20 UTC
SHA: 8796b6e08e1d0c9c194965c0bc5c30b6992449d3
Version: 1.6.6
Date: 2024-05-14 23:05:49 UTC
SHA: 0c84c6defccc2050cfe133e40538b6b8cc1d2520
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: radiant.data
Title: Data Menu for Radiant: Business Analytics using R and Shiny
Version: 1.6.3
Date: 2023-12-16
Version: 1.6.6
Date: 2024-5-14
Authors@R: c(
person("Vincent", "Nijs", email = "[email protected]", role = c("aut", "cre")),
person("Niklas", "von Hertzen", email = "[email protected]", role = c("aut"), comment = "html2canvas library")
Expand All @@ -11,7 +11,7 @@ Description: The Radiant Data menu includes interfaces for loading, saving,
contains functionality to generate reproducible reports of the analyses
conducted in the application.
Depends:
R (>= 4.0.0),
R (>= 4.3.0),
magrittr (>= 1.5),
ggplot2 (>= 3.4.2),
lubridate (>= 1.7.4),
Expand All @@ -26,7 +26,7 @@ Imports:
knitr (>= 1.20),
markdown (>= 1.7),
rmarkdown(>= 2.22),
shiny (>= 1.8.0),
shiny (>= 1.8.1),
jsonlite (>= 1.0),
shinyAce (>= 0.4.1),
psych (>= 1.8.4),
Expand Down Expand Up @@ -65,4 +65,4 @@ License: AGPL-3 | file LICENSE
LazyData: true
Encoding: UTF-8
Language: en-US
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# radiant.data 1.6.6

* Require Shiny 1.8.1. Adjustments related to icon-buttons were made to address a breaking change in Shiny 1.8.1
* Reverting changes that removed `req(input$dataset)` in different places

# radiant.data 1.6.3

* Require shiny 1.8.0. This fixes a bug in the shiny 1.7 versions that caused issues with all radiant packages.
Expand Down
1 change: 0 additions & 1 deletion R/deprecated.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#' @rdname radiant.data-deprecated
#' @name radiant.data-deprecated
#' @param ... Parameters to be passed to the updated functions
#' @docType package
#' @export mean_rm median_rm min_rm max_rm sd_rm var_rm sum_rm getdata filterdata combinedata viewdata toFct fixMS getsummary Search formatnr formatdf rounddf getclass is_numeric
#' @aliases mean_rm median_rm min_rm max_rm sd_rm var_rm sum_rm getdata filterdata combinedata viewdata toFct fixMS getsummary Search formatnr formatdf rounddf getclass is_numeric
#' @section Details:
Expand Down
17 changes: 16 additions & 1 deletion cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
## Resubmission

This is a resubmission. In this version I require shiny version 1.8.0 which fixed a bug that caused issues in the radiant apps. See NEWS.md for details.
This is a resubmission. In this version I require shiny version 1.8.1 or newer and have addressed a breaking change introduced in that version of shiny. See NEWS.md for details.

## Test environments

* macOS, R 4.4.0
* macOS, R 4.3.2
* win-builder (devel)

Expand All @@ -13,6 +14,20 @@ There were no ERRORs or WARNINGs. There was one NOTE related to the number of no

# Previous cran-comments

## Resubmission

This is a resubmission. In this version I require shiny version 1.8.0 which fixed a bug that caused issues in the radiant apps. See NEWS.md for details.

## Test environments

* macOS, R 4.3.2
* win-builder (devel)

## R CMD check results

There were no ERRORs or WARNINGs. There was one NOTE related to the number of non-standard dependencies. However, this note is not easily addressed without substantially inconveniencing users that rely on the web (shiny) interface available for radiant.data.


## Resubmission

This is a resubmission. In this version I have fixed a bug that caused problems for users on Windows with a space in their username. See NEWS.md for details.
Expand Down
5 changes: 2 additions & 3 deletions inst/app/init.R
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ observeEvent(input$nav_radiant, {
## Jump to the page you were on
## only goes two layers deep at this point
if (!is.null(r_state$nav_radiant)) {

## don't return-to-the-spot if that was quit or stop
if (r_state$nav_radiant %in% c("Refresh", "Stop")) {
return()
Expand Down Expand Up @@ -345,7 +344,7 @@ isolate({
if (getOption("radiant.from.package", default = TRUE)) {
## launch using installed radiant.data package
# radiant.data::copy_all("radiant.data")
# cat("\nGetting radiant.data from package ...\n")
cat("\nGetting radiant.data from package ...\n")
} else {
## for shiny-server and development
for (file in list.files("../../R", pattern = "\\.(r|R)$", full.names = TRUE)) {
Expand All @@ -362,4 +361,4 @@ observeEvent(input$get_screen_width, {
})


radiant.data::copy_from(radiant.data, register, deregister)
radiant.data::copy_from(radiant.data, register, deregister)
4 changes: 2 additions & 2 deletions inst/app/radiant.R
Original file line number Diff line number Diff line change
Expand Up @@ -662,8 +662,8 @@ help_and_report <- function(modal_title, fun_name, help_file,
</div>
</div>
<i title='Help' class='fa fa-question alignleft' data-toggle='modal' data-target='#%s_help'></i>
<i title='Report results & Screenshot' class='fa fa-camera action-button shiny-bound-input aligncenter' href='#%s_screenshot' id='%s_screenshot' onclick='generate_screenshot();'></i>
<i title='Report results' class='fa fa-edit action-button shiny-bound-input alignright' href='#%s_report' id='%s_report'></i>
<i title='Report results & Screenshot' class='fa fa-camera action-button aligncenter' href='#%s_screenshot' id='%s_screenshot' onclick='generate_screenshot();'></i>
<i title='Report results' class='fa fa-edit action-button alignright' href='#%s_report' id='%s_report'></i>
<div style='clear: both;'></div>",
fun_name, fun_name, fun_name, modal_title, help_file, author, year, lic, lic, fun_name, fun_name, fun_name, fun_name, fun_name
) %>%
Expand Down
2 changes: 1 addition & 1 deletion inst/app/tools/data/combine_ui.R
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ combine_report <- function() {
}

output$cmb_data1 <- renderText({
# req(input$dataset)
req(input$dataset)
filt <- if (input$show_filter) input$data_filter else ""
arr <- if (input$show_filter) input$data_arrange else ""
rows <- if (input$show_filter) input$data_rows else ""
Expand Down
1 change: 0 additions & 1 deletion inst/app/tools/data/view_ui.R
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ observeEvent(input$view_clear, {

output$dataviewer <- DT::renderDataTable(
{
## next line causes strange bootstrap issue https://github.com/ramnathv/htmlwidgets/issues/281
input$view_clear
req(available(input$view_vars))
dat <- select_at(.get_data(), .vars = input$view_vars)
Expand Down
8 changes: 4 additions & 4 deletions inst/app/www/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,9 @@ body {
margin-bottom: 10px;
}

.dropdown-menu{
max-height:90vh;
overflow-y:auto;
.dropdown-menu {
max-height: 90vh;
overflow-y: auto;
}

@media (max-width: 1000px) {
Expand Down Expand Up @@ -254,4 +254,4 @@ body {
.ace_replacebtn,
.ace_searchbtn {
color: black;
}
}
1 change: 0 additions & 1 deletion man/radiant.data-deprecated.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c5c8d5d

Please sign in to comment.