From 8d44ef550d884d8f3374d0ce4a684bc8790cec4c Mon Sep 17 00:00:00 2001 From: Nuno Agostinho Date: Wed, 26 Oct 2022 19:30:22 +0100 Subject: [PATCH 1/2] Fix bugs that prevent web app from opening --- R/app.R | 2 +- R/utils_fileBrowserDialog.R | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/R/app.R b/R/app.R index bb498c66..69db6c4e 100644 --- a/R/app.R +++ b/R/app.R @@ -233,7 +233,7 @@ modTabPanel <- function(title, ..., icon=NULL, menu=FALSE) { replaceStrInList <- function(tag, old, new) { FUN <- function(x) { res <- x - if (grepl(old, x)) res <- gsub(old, new, x, fixed=TRUE) + if (any(grepl(old, x))) res <- gsub(old, new, x, fixed=TRUE) return(res) } rapply(tag, FUN, how="replace", classes="character") diff --git a/R/utils_fileBrowserDialog.R b/R/utils_fileBrowserDialog.R index e3f2fe9a..4a67106b 100644 --- a/R/utils_fileBrowserDialog.R +++ b/R/utils_fileBrowserDialog.R @@ -252,9 +252,11 @@ fileBrowserInput <- function(id, label, value=NULL, placeholder=NULL, check <- function (x, y) { # Based on shiny:::`%AND%` - if (!is.null(x) && !is.na(x)) - if (!is.null(y) && !is.na(y)) + if (!is.null(x) && !is.na(x)) { + if (!is.null(y) && !is.na(y$children[[1]])) { return(y) + } + } return(NULL) } From 800700a74ad9727116618f2d17f0bfb0228bf430 Mon Sep 17 00:00:00 2001 From: Nuno Agostinho Date: Wed, 26 Oct 2022 19:33:24 +0100 Subject: [PATCH 2/2] Bump to 1.24.0 --- DESCRIPTION | 2 +- NEWS.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 70eba020..eb19b081 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: psichomics Title: Graphical Interface for Alternative Splicing Quantification, Analysis and Visualisation -Version: 1.22.1 +Version: 1.24.0 Encoding: UTF-8 Authors@R: c( person("Nuno", "Saraiva-Agostinho", diff --git a/NEWS.md b/NEWS.md index 42f756dc..a36e84c3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# psichomics 1.24.0 (26 Oct, 2022) + +* Bug fix: psichomics app now opens as expected instead of crashing + # psichomics 1.22.1 (14 July, 2022) * Bug fix: GTEx data v8 can now be downloaded using newer versions of R