Merge branch '21-fix-if-empty-response-in-get_phenotypes_matrix' into…

… 'master' Resolve "fix if empty response in get_phenotypes_matrix" Closes #21 See merge request wuxi-nextcode/wxnc-plat/gorr!46
wuxi-nextcode · Sep 10, 2021 · b5d33cd · b5d33cd
2 parents ae94269 + 8e8674e
commit b5d33cd
Show file tree

Hide file tree

Showing 77 changed files with 220 additions and 213 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: gorr
 Title: GOR Direct Query API for R
-Version: 1.4.3
+Version: 1.4.4
 Authors@R: c(
     person("Genuity", "Science", role = c("aut", "cre","cph"), email = "[email protected]"),
     person("Edvald", "Gislason", role = "aut", email = ""),

diff --git a/R/phenotype_services.R b/R/phenotype_services.R
@@ -130,7 +130,7 @@ query__phenotypes <- function(conn, all_tags, any_tags, pn_count, categories, li
 #' api_key <- Sys.getenv("GOR_API_KEY")
 #' project <- Sys.getenv("GOR_PROJECT")
 #' conn <- platform_connect(api_key, project)
-#' phenotypes <- get_phenotypes(conn)
+#' phenotypes <- get_phenotypes(conn, limit=5)
 #' }
 get_phenotypes <- function(conn,
                            tags = list(),
@@ -218,7 +218,7 @@ print.phenotype_list <- function(x, ...) {
 #' api_key <- Sys.getenv("GOR_API_KEY")
 #' project <- Sys.getenv("GOR_PROJECT")
 #' conn <- platform_connect(api_key, project)
-#' phenotypes <- get_phenotypes(conn)
+#' phenotypes <- get_phenotypes_dataframe(conn, limit=5)
 #' }
 get_phenotypes_dataframe <- function(conn = conn,
                                      pheno_names=list(),
@@ -262,6 +262,10 @@ get_phenotypes_dataframe <- function(conn = conn,
         do.call(rbind, .)  %>%
         as.data.frame()
 
+    if (nrow(phenotypes_dataframe) == 0) {
+        return(phenotypes_dataframe)
+    }
+
     if (filtered) {
         cols <- c("name", "description", "result_type", "tag_list", "pn_count")
         phenotypes_dataframe <- phenotypes_dataframe %>% dplyr::select(tidyselect::all_of(cols))

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/articles/basic-query.html b/docs/articles/basic-query.html
diff --git a/docs/articles/covariate-services.html b/docs/articles/covariate-services.html
diff --git a/docs/articles/gor-create.html b/docs/articles/gor-create.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/persistance-of-results.html b/docs/articles/persistance-of-results.html
diff --git a/docs/articles/phenotype-categories.html b/docs/articles/phenotype-categories.html