From f077ca84c1fc94447d795ded55806bba9e501d32 Mon Sep 17 00:00:00 2001 From: Jeff Thompson <160783290+jthompson-arcus@users.noreply.github.com> Date: Thu, 23 Jan 2025 09:50:34 -0500 Subject: [PATCH 1/3] Add `inherits` to used configs --- R/utils_startup.R | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/R/utils_startup.R b/R/utils_startup.R index 6ecaf4c3..28292aef 100644 --- a/R/utils_startup.R +++ b/R/utils_startup.R @@ -188,7 +188,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) %>% From cabb83af5878809c10feb27aa00d32b9e2055ede Mon Sep 17 00:00:00 2001 From: Jeff Thompson <160783290+jthompson-arcus@users.noreply.github.com> Date: Thu, 23 Jan 2025 09:51:23 -0500 Subject: [PATCH 2/3] Update version and NEWS --- DESCRIPTION | 2 +- NEWS.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 06b89d60..78178def 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -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.9003 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"), diff --git a/NEWS.md b/NEWS.md index e0cf1a55..1755f211 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,7 @@ * 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 # riskassessment 3.1.1 From 581b9b37b395bd9cb230707ae036782c94e23a20 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 23 Jan 2025 15:55:18 +0000 Subject: [PATCH 3/3] Re-build manifest file --- manifest.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/manifest.json b/manifest.json index 520b8d87..101ec9c6 100644 --- a/manifest.json +++ b/manifest.json @@ -771,7 +771,7 @@ "Maintainer": "Gábor Csárdi ", "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": { @@ -947,7 +947,7 @@ "RoxygenNote": "7.3.0", "Author": "Sebastien Rochette [aut, cre] (),\n Vincent Guyader [aut] (),\n Arthur Bréant [aut] (),\n Murielle Delmotte [aut] (),\n ThinkR [cph]", "Maintainer": "Sebastien Rochette ", - "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", @@ -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", @@ -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": { @@ -1482,7 +1482,7 @@ "Maintainer": "Scott Chamberlain ", "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": { @@ -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": { @@ -2330,7 +2330,7 @@ "Maintainer": "Thomas Lin Pedersen ", "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": { @@ -2593,7 +2593,7 @@ "Maintainer": "Thomas Lin Pedersen ", "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": { @@ -3790,7 +3790,7 @@ "Maintainer": "Hadley Wickham ", "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": { @@ -4374,7 +4374,7 @@ "Maintainer": "Kevin Ushey ", "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 15:54:36 UTC; unix" } }, "reprex": { @@ -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 ", - "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", @@ -4498,7 +4498,7 @@ "Maintainer": "Gábor Csárdi ", "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": { @@ -4550,7 +4550,7 @@ "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 ", - "Built": "R 4.3.3; ; 2025-01-16 14:34:28 UTC; unix", + "Built": "R 4.3.3; ; 2025-01-16 19:56:36 UTC; unix", "RemoteType": "github", "RemoteUsername": "pharmaR", "RemoteRepo": "riskmetric", @@ -5038,7 +5038,7 @@ "Maintainer": "Victor Perrier ", "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": { @@ -5379,7 +5379,7 @@ "Maintainer": "Hadley Wickham ", "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": { @@ -6088,7 +6088,7 @@ "Maintainer": "Gábor Csárdi ", "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": { @@ -6227,7 +6227,7 @@ "checksum": "99c5575cb81828e20a7fe1d205551316" }, "DESCRIPTION": { - "checksum": "af40bab3e40cbc539ff9bce986ca58f3" + "checksum": "d269be66d51c38bd3cf8d01381f75bdb" }, "inst/app/www/css/community_metrics.css": { "checksum": "f08eb25c2ee48ac22ed63b0d18994a04" @@ -6470,7 +6470,7 @@ "checksum": "97d1232340e04c53088bc8f814133dcd" }, "NEWS.md": { - "checksum": "9c3198ce32b76cd0d81f9dae86c9a092" + "checksum": "3f750ced5e226047c9f6fb60fd4f40b7" }, "R/app_config.R": { "checksum": "c2b61f270b86b6833f0ee39c44a1a440" @@ -6584,7 +6584,7 @@ "checksum": "ddb81d628ed7a465d2d050ad67983dd7" }, "R/utils_startup.R": { - "checksum": "027b633f3e6ace9fcfac994fb62e86c9" + "checksum": "b2c70ece9d63cfb6efe5dcac7517242f" }, "R/utils.R": { "checksum": "995d947896038bdcec381ff4b4e94fd0"