Merge pull request #220 from pharmaverse/dev

Closes #218 modified row merge (#219)
pharmaverse · Apr 12, 2024 · f6c24f8 · f6c24f8
2 parents 4e07873 + acfc8ad
commit f6c24f8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/check-standard.yaml b/.github/workflows/check-standard.yaml
@@ -35,13 +35,13 @@ jobs:
  GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
 
- - uses: r-lib/actions/setup-r@v1
+ - uses: r-lib/actions/setup-r@v2
  with:
  r-version: ${{ matrix.config.r }}
 
- - uses: r-lib/actions/setup-pandoc@v1
+ - uses: r-lib/actions/setup-pandoc@v2
 
  - name: Query dependencies
  run: |

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: logrx
 Title: A Logging Utility Focus on Clinical Trial Programming Workflows
-Version: 0.3.0
+Version: 0.3.1
 Authors@R: 
  c(
  person(given = "Nathan",

diff --git a/NAMESPACE b/NAMESPACE
@@ -18,6 +18,7 @@ importFrom(dplyr,group_by)
 importFrom(dplyr,mutate)
 importFrom(dplyr,rename_with)
 importFrom(dplyr,select)
+importFrom(dplyr,summarize)
 importFrom(dplyr,ungroup)
 importFrom(magrittr,"%>%")
 importFrom(miniUI,gadgetTitleBar)

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,8 @@
 
+# logrx 0.3.1
+
+ - Hotfix to update used and unapproved packages and functions writing (#218)
+
 # logrx 0.3.0
 
 - Moved website theme to bootstrap 5, enabled search (#179)

diff --git a/R/writer.R b/R/writer.R
@@ -142,6 +142,7 @@ write_masked_functions <- function(){
 #' @return Formatted vector of used package functions
 #' @export
 #'
+#' @importFrom dplyr summarize
 #' @importFrom purrr map2
 #' @importFrom stats aggregate
 #'
@@ -153,7 +154,9 @@ write_masked_functions <- function(){
 write_used_functions <- function(){
  used_functions_list <- get_log_element("used_packages_functions")
 
- combined <- aggregate(function_name~library, used_functions_list, paste)
+ combined <- used_functions_list %>%
+ group_by(library) %>%
+ summarize(function_name = paste0(.data[["function_name"]], collapse = ", "))
 
  map2(combined$library, combined$function_name, ~paste(paste0("{", .x, "}"), paste0(.y, collapse = ", "))) %>%
  unname() %>%
@@ -183,7 +186,9 @@ write_unapproved_functions <- function(){
  return("No unapproved packages or functions used")
  }
 
- combined <- aggregate(function_name~library, unapproved_functions_list, paste)
+ combined <- unapproved_functions_list %>%
+ group_by(library) %>%
+ summarize(function_name = paste0(.data[["function_name"]], collapse = ", "))
 
  map2(combined$library, combined$function_name, ~paste(paste0("{", .x, "}"), paste0(.y, collapse = ", "))) %>%
  unname() %>%