update shinyapps.io demo with a few more features (v3.1.1.9002)

.github/workflows/R-CMD-check.yaml

@@ -43,7 +43,7 @@ jobs:
       - uses: r-lib/actions/setup-r@v2
         with:
           r-version: 'renv'
-          use-public-rspm: true
+          use-public-rspm: false
       - uses: r-lib/actions/setup-renv@v2
 
       - name: Install riskassessment

.github/workflows/pkgdown.yaml

@@ -26,7 +26,7 @@ jobs:
 
       - uses: r-lib/actions/setup-r@v2
         with:
-          use-public-rspm: true
+          use-public-rspm: false
           r-version: 'renv'
 
       - uses: r-lib/actions/setup-renv@v2

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: riskassessment
 Title: A web app designed to interface with the `riskmetric` package
-Version: 3.1.1
+Version: 3.1.1.9002
 Authors@R: c( 
     person("Aaron", "Clark", role = c("aut", "cre"), email = "clark.aaronchris@gmail.com"),
     person("Jeff", "Thompson", role = c("aut"),  email = "jeff.thompson51317@gmail.com", comment = "Co-Lead"),

NEWS.md

@@ -1,9 +1,16 @@
+# riskassessment (development version)
+
+* Open hyperlinks in a new tab from cards.
+* Fix bug causing app to crash with ELSE condition in rules
+
 # riskassessment 3.1.1
 
 * Added navigation controls in Function Explorer tab (#644)
 * Fixed bug that crashed the Package Dependencies page for pkgs without any dependency info available (#802)
 * Fixed bug that incorrectly displayed 0 dependencies as 1 (#805)
 * Fixed bug that kept full list of available packages from populating (#776)
+* Removed `.recording` attribute from `riskmetric` assessments for storage purposes
+* Ensured `tarballs` directory existed before returning from `initialize_raa()`
 
 # riskassessment 3.1.0
 

R/mod_decision_automation_utils.R

@@ -24,7 +24,8 @@ assign_decisions <- function(rule_list, package, db_name = golem::get_golem_opti
     if (!is.na(decision)) break
     rule <- rule_list[[i]]
 
-    fn <- purrr::possibly(rule$mapper, otherwise = FALSE)
+    if (rlang::is_function(rule$mapper) || rlang::is_formula(rule$mapper))
+      fn <- purrr::possibly(rule$mapper, otherwise = FALSE)
     if (rule$type == "overall_score") {
       decision <- if (fn(get_pkg_info(package)$score)) rule$decision else NA_character_
       log_message <- glue::glue("Decision for the package {package} was assigned {decision} because the risk score returned TRUE for `{rule$condition}`")

R/mod_metricBox.R

@@ -54,7 +54,7 @@ metricBoxServer <- function(id, title, desc, value, score = "NULL",
       } else if (is_url) {
         value <- a(ifelse(nchar(value) <= val_max_nchar, value,
           glue::glue("{stringr::str_sub(value, 1, (val_max_nchar - 3))}...")
-        ), href = value)
+        ), target = "_blank", href = value)
       } # unfortunately, adding the href can sometimes force the footer to fall
       # outside the card when val_max_nchar is too large.
       else if (value %in% c("TRUE", "FALSE")) {

R/utils_insert_db.R

@@ -183,7 +183,20 @@ insert_riskmetric_to_db <- function(pkg_name, pkg_version = "",
     loggit::loggit("WARN", paste("Package", pkg_name, "not found."))
     return()
   }
-
+
+  riskmetric_assess <-
+    lapply(riskmetric_assess[-(1:3)], \(x) {
+      out <-
+        list(
+          structure(
+            x[[1]],
+            .recording = NULL,
+            class = setdiff(class(x[[1]]), "with_eval_recording")
+          )
+        )
+      attributes(out) <- attributes(x)
+      out
+    })
   assessment_serialized <- data.frame(pkg_assess = I(lapply(riskmetric_assess, serialize, connection = NULL)))
 
   # Insert all the metrics (columns of class "pkg_score") into the db.

R/utils_startup.R

@@ -217,8 +217,10 @@ initialize_raa <- function(assess_db, cred_db, configuration) {
 
   check_repos(db_config[["package_repo"]])
 
-  if (file.exists(assessment_db) && (isTRUE(getOption("shiny.testmode")) || use_shinymanager && file.exists(credentials_db)))
-    return(invisible(c(assessment_db, if (!isTRUE(getOption("shiny.testmode")) & use_shinymanager) credentials_db)))
+  if (!dir.exists("tarballs")) dir.create("tarballs")
+
+  if (file.exists(assessment_db) && (use_shinymanager && file.exists(credentials_db)))
+    return(invisible(c(assessment_db, if (use_shinymanager) credentials_db)))
 
   check_credentials(db_config[["credentials"]])
 
@@ -242,8 +244,6 @@ initialize_raa <- function(assess_db, cred_db, configuration) {
   } else if (!identical(decisions$decision, decision_categories)) {
     stop("The decision categories in the configuration file do not match those in the assessment database.")
   }
-
-  if (!dir.exists("tarballs")) dir.create("tarballs")
 
   invisible(c(assessment_db, if (use_shinymanager) credentials_db))
 }

inst/report_downloads/reportHtml.Rmd

@@ -76,7 +76,7 @@ createCard <- function(title, desc, value, score = "NULL",
   else if(is_url)
     value <- a(ifelse(nchar(value) <= val_max_nchar, value,
                     glue::glue('{stringr::str_sub(value, 1, (val_max_nchar - 3))}...')
-                 ), href = value)
+                 ), target = "_blank", href = value)
         # unfortunately, adding the href can sometimes force the footer to fall
         # outside the card when val_max_nchar is too large.
   else if(value %in% c('TRUE', 'FALSE'))