Skip to content

Commit

Permalink
Merge branch 'dev' into demo-shinyapps.io-v311
Browse files Browse the repository at this point in the history
  • Loading branch information
@aclark02-arcus
aclark02-arcus committed Jan 23, 2025
2 parents d6e44a8 + 0662c30 commit a2c2831
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 30 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: riskassessment
Title: A web app designed to interface with the `riskmetric` package
Version: 3.1.1.9002
Version: 3.1.1.9004
Authors@R: c(
person("Aaron", "Clark", role = c("aut", "cre"), email = "[email protected]"),
person("Jeff", "Thompson", role = c("aut"), email = "[email protected]", comment = "Co-Lead"),
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

* Open hyperlinks in a new tab from cards.
* Fix bug causing app to crash with ELSE condition in rules
* Add `inherits` to list of used configs
* Incorporate bug fix for dependency assessment from `riskmetric`

# riskassessment 3.1.1

Expand Down
4 changes: 3 additions & 1 deletion R/utils_startup.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,9 @@ initialize_raa <- function(assess_db, cred_db, configuration) {
if (isTRUE(getOption("shiny.testmode"))) return(NULL)

db_config <- if(missing(configuration)) get_db_config(NULL) else configuration
used_configs <- c("assessment_db", "credential_db", "decisions", "credentials", "loggit_json", "metric_weights", "report_prefs", "package_repo", "use_shinymanager")
used_configs <- c("assessment_db", "credential_db", "decisions", "credentials",
"loggit_json", "metric_weights", "report_prefs",
"package_repo", "use_shinymanager", "inherits")
if (any(!names(db_config) %in% used_configs)) {
names(db_config) %>%
`[`(!. %in% used_configs) %>%
Expand Down
48 changes: 24 additions & 24 deletions manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@
"Maintainer": "Gábor Csárdi <[email protected]>",
"Repository": "RSPM",
"Date/Publication": "2023-12-10 10:50:07 UTC",
"Built": "R 4.3.3; x86_64-pc-linux-gnu; 2025-01-16 14:32:39 UTC; unix"
"Built": "R 4.3.3; x86_64-pc-linux-gnu; 2025-01-16 19:54:53 UTC; unix"
}
},
"broom": {
Expand Down Expand Up @@ -947,7 +947,7 @@
"RoxygenNote": "7.3.0",
"Author": "Sebastien Rochette [aut, cre] (<https://orcid.org/0000-0002-1565-9313>),\n Vincent Guyader [aut] (<https://orcid.org/0000-0003-0671-9270>),\n Arthur Bréant [aut] (<https://orcid.org/0000-0003-1668-0963>),\n Murielle Delmotte [aut] (<https://orcid.org/0000-0002-1339-2424>),\n ThinkR [cph]",
"Maintainer": "Sebastien Rochette <[email protected]>",
"Built": "R 4.3.3; ; 2025-01-16 14:33:31 UTC; unix",
"Built": "R 4.3.3; ; 2025-01-16 19:55:43 UTC; unix",
"RemoteType": "github",
"RemoteUsername": "thinkr-open",
"RemoteRepo": "checkhelper",
Expand Down Expand Up @@ -1310,7 +1310,7 @@
"Imports": "callr,\ncranlike (>= 1.0.2),\ncurl,\ndesc (>= 1.1.0),\ndigest,\nparsedate,\nrappdirs,\nrematch2,\ntools,\nutils,\nwithr",
"Suggests": "covr,\npingr,\ntestthat,\nzip",
"Encoding": "UTF-8",
"Built": "R 4.3.3; ; 2025-01-16 14:33:43 UTC; unix",
"Built": "R 4.3.3; ; 2025-01-16 19:55:53 UTC; unix",
"RemoteType": "github",
"RemoteHost": "api.github.com",
"RemoteUsername": "r-lib",
Expand Down Expand Up @@ -1346,7 +1346,7 @@
"Packaged": "2018-11-26 09:54:46 UTC; gaborcsardi",
"Repository": "RSPM",
"Date/Publication": "2018-11-26 10:10:03 UTC",
"Built": "R 4.3.3; ; 2025-01-16 14:33:40 UTC; unix"
"Built": "R 4.3.3; ; 2025-01-16 19:55:50 UTC; unix"
}
},
"cranlogs": {
Expand Down Expand Up @@ -1482,7 +1482,7 @@
"Maintainer": "Scott Chamberlain <[email protected]>",
"Repository": "RSPM",
"Date/Publication": "2023-05-17 07:30:02 UTC",
"Built": "R 4.3.3; ; 2025-01-16 14:33:48 UTC; unix"
"Built": "R 4.3.3; ; 2025-01-16 19:55:58 UTC; unix"
}
},
"curl": {
Expand Down Expand Up @@ -1596,7 +1596,7 @@
"Packaged": "2017-10-22 09:14:23 UTC; gaborcsardi",
"Repository": "RSPM",
"Date/Publication": "2017-10-22 14:18:09 UTC",
"Built": "R 4.3.3; ; 2025-01-16 14:33:38 UTC; unix"
"Built": "R 4.3.3; ; 2025-01-16 19:55:49 UTC; unix"
}
},
"desc": {
Expand Down Expand Up @@ -2330,7 +2330,7 @@
"Maintainer": "Thomas Lin Pedersen <[email protected]>",
"Repository": "RSPM",
"Date/Publication": "2024-02-23 09:30:02 UTC",
"Built": "R 4.3.3; ; 2025-01-16 14:32:21 UTC; unix"
"Built": "R 4.3.3; ; 2025-01-16 19:54:36 UTC; unix"
}
},
"gh": {
Expand Down Expand Up @@ -2593,7 +2593,7 @@
"Maintainer": "Thomas Lin Pedersen <[email protected]>",
"Repository": "RSPM",
"Date/Publication": "2023-08-21 11:20:02 UTC",
"Built": "R 4.3.3; ; 2025-01-16 14:32:15 UTC; unix"
"Built": "R 4.3.3; ; 2025-01-16 19:54:30 UTC; unix"
}
},
"haven": {
Expand Down Expand Up @@ -3790,7 +3790,7 @@
"Maintainer": "Hadley Wickham <[email protected]>",
"Repository": "RSPM",
"Date/Publication": "2022-12-14 11:40:06 UTC",
"Built": "R 4.3.3; ; 2025-01-16 14:32:51 UTC; unix"
"Built": "R 4.3.3; ; 2025-01-16 19:55:04 UTC; unix"
}
},
"pkgload": {
Expand Down Expand Up @@ -4374,7 +4374,7 @@
"Maintainer": "Kevin Ushey <[email protected]>",
"Repository": "RSPM",
"Date/Publication": "2024-02-29 01:10:07 UTC",
"Built": "R 4.3.3; ; 2025-01-16 15:02:57 UTC; unix"
"Built": "R 4.3.3; ; 2025-01-23 16:15:10 UTC; unix"
}
},
"reprex": {
Expand Down Expand Up @@ -4432,7 +4432,7 @@
"RoxygenNote": "7.2.3",
"Author": "Gábor Csárdi [cre, aut, cph],\n Hadley Wickham [aut],\n RConsortium [cph],\n RStudio [cph, fnd]",
"Maintainer": "Gábor Csárdi <[email protected]>",
"Built": "R 4.3.3; ; 2025-01-16 14:34:20 UTC; unix",
"Built": "R 4.3.3; ; 2025-01-16 19:56:28 UTC; unix",
"RemoteType": "github",
"RemoteUsername": "r-lib",
"RemoteRepo": "revdepcheck",
Expand Down Expand Up @@ -4498,7 +4498,7 @@
"Maintainer": "Gábor Csárdi <[email protected]>",
"Repository": "RSPM",
"Date/Publication": "2022-08-31 13:00:11 UTC",
"Built": "R 4.3.3; ; 2025-01-16 14:34:24 UTC; unix"
"Built": "R 4.3.3; ; 2025-01-16 19:56:33 UTC; unix"
}
},
"rintrojs": {
Expand Down Expand Up @@ -4550,18 +4550,18 @@
"Config/testthat/edition": "3",
"Author": "R Validation Hub [aut],\n Doug Kelkhoff [aut],\n Marly Gotti [aut],\n Eli Miller [cre, aut],\n Kevin K [aut],\n Yilong Zhang [aut],\n Eric Milliman [aut],\n Juliane Manitz [aut],\n Mark Padgham [ctb],\n PSI special interest group Application and Implementation of\n Methodologies in Statistics [cph]",
"Maintainer": "Eli Miller <[email protected]>",
"Built": "R 4.3.3; ; 2025-01-16 14:34:28 UTC; unix",
"Built": "R 4.3.3; ; 2025-01-23 15:41:39 UTC; unix",
"RemoteType": "github",
"RemoteUsername": "pharmaR",
"RemoteHost": "api.github.com",
"RemoteRepo": "riskmetric",
"RemoteUsername": "pharmaR",
"RemoteRef": "HEAD",
"RemoteSha": "7c7bf3c15c02c33bc788e1070f25302b203d6d9e",
"RemoteHost": "api.github.com",
"RemoteSha": "39489b26dbb3b7e5731bbcf55d975755fbb841e4",
"GithubHost": "api.github.com",
"GithubRepo": "riskmetric",
"GithubUsername": "pharmaR",
"GithubRef": "HEAD",
"GithubSHA1": "7c7bf3c15c02c33bc788e1070f25302b203d6d9e"
"GithubSHA1": "39489b26dbb3b7e5731bbcf55d975755fbb841e4"
}
},
"rjson": {
Expand Down Expand Up @@ -5038,7 +5038,7 @@
"Maintainer": "Victor Perrier <[email protected]>",
"Repository": "RSPM",
"Date/Publication": "2024-04-04 17:40:02 UTC",
"Built": "R 4.3.3; ; 2025-01-16 14:34:59 UTC; unix"
"Built": "R 4.3.3; ; 2025-01-16 19:57:06 UTC; unix"
}
},
"shinyjs": {
Expand Down Expand Up @@ -5379,7 +5379,7 @@
"Maintainer": "Hadley Wickham <[email protected]>",
"Repository": "RSPM",
"Date/Publication": "2023-12-02 11:50:05 UTC",
"Built": "R 4.3.3; x86_64-pc-linux-gnu; 2025-01-16 14:33:01 UTC; unix"
"Built": "R 4.3.3; x86_64-pc-linux-gnu; 2025-01-16 19:55:14 UTC; unix"
}
},
"textshaping": {
Expand Down Expand Up @@ -6088,7 +6088,7 @@
"Maintainer": "Gábor Csárdi <[email protected]>",
"Repository": "RSPM",
"Date/Publication": "2018-09-17 13:10:03 UTC",
"Built": "R 4.3.3; ; 2025-01-16 14:32:56 UTC; unix"
"Built": "R 4.3.3; ; 2025-01-16 19:55:09 UTC; unix"
}
},
"xtable": {
Expand Down Expand Up @@ -6227,7 +6227,7 @@
"checksum": "99c5575cb81828e20a7fe1d205551316"
},
"DESCRIPTION": {
"checksum": "af40bab3e40cbc539ff9bce986ca58f3"
"checksum": "12e481058ce37c76bd7036879d7dee13"
},
"inst/app/www/css/community_metrics.css": {
"checksum": "f08eb25c2ee48ac22ed63b0d18994a04"
Expand Down Expand Up @@ -6470,7 +6470,7 @@
"checksum": "97d1232340e04c53088bc8f814133dcd"
},
"NEWS.md": {
"checksum": "9c3198ce32b76cd0d81f9dae86c9a092"
"checksum": "4bfd8192cb4473f04cc2185e48c79e1b"
},
"R/app_config.R": {
"checksum": "c2b61f270b86b6833f0ee39c44a1a440"
Expand Down Expand Up @@ -6584,7 +6584,7 @@
"checksum": "ddb81d628ed7a465d2d050ad67983dd7"
},
"R/utils_startup.R": {
"checksum": "027b633f3e6ace9fcfac994fb62e86c9"
"checksum": "b2c70ece9d63cfb6efe5dcac7517242f"
},
"R/utils.R": {
"checksum": "995d947896038bdcec381ff4b4e94fd0"
Expand All @@ -6596,7 +6596,7 @@
"checksum": "a2eefba927d32d8c78d4e385178a93b7"
},
"renv.lock": {
"checksum": "d7b9816932ef58733e25081235f6fc78"
"checksum": "f880b5ebba3ea209ea914031dfefb052"
}
},
"users": null
Expand Down
8 changes: 4 additions & 4 deletions renv.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2366,11 +2366,11 @@
"Version": "0.2.4.9000",
"Source": "GitHub",
"RemoteType": "github",
"RemoteUsername": "pharmaR",
"RemoteHost": "api.github.com",
"RemoteRepo": "riskmetric",
"RemoteUsername": "pharmaR",
"RemoteRef": "HEAD",
"RemoteSha": "7c7bf3c15c02c33bc788e1070f25302b203d6d9e",
"RemoteHost": "api.github.com",
"RemoteSha": "39489b26dbb3b7e5731bbcf55d975755fbb841e4",
"Requirements": [
"BiocManager",
"backports",
Expand All @@ -2389,7 +2389,7 @@
"vctrs",
"xml2"
],
"Hash": "74a42c9c6546b6b67b247f91007369f9"
"Hash": "0760a20553721c30ee74c7c62b1b052e"
},
"rjson": {
"Package": "rjson",
Expand Down

0 comments on commit a2c2831

Please sign in to comment.