Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add inherits to list of used configs #834

Merged
merged 3 commits into from
Jan 23, 2025
Merged

Add inherits to list of used configs #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f077ca8
Add `inherits` to used configs
jthompson-arcus Jan 23, 2025
cabb83a
Update version and NEWS
jthompson-arcus Jan 23, 2025
581b9b3
Re-build manifest file
actions-user Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
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.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"),
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion R/utils_startup.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) %>%
Expand Down
38 changes: 19 additions & 19 deletions manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@
"Maintainer": "Gábor Csárdi <csardi.gabor@gmail.com>",
"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 <sebastien@thinkr.fr>",
"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 <myrmecocystus@gmail.com>",
"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 <thomas.pedersen@posit.co>",
"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 <thomas.pedersen@posit.co>",
"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 <hadley@rstudio.com>",
"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 <kevin@rstudio.com>",
"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": {
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 <csardi.gabor@gmail.com>",
"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 <csardi.gabor@gmail.com>",
"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,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 <eli.miller@atorusresearch.com>",
"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",
Expand Down Expand Up @@ -5038,7 +5038,7 @@
"Maintainer": "Victor Perrier <victor.perrier@dreamrs.fr>",
"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 <hadley@posit.co>",
"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 <csardi.gabor@gmail.com>",
"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": "d269be66d51c38bd3cf8d01381f75bdb"
},
"inst/app/www/css/community_metrics.css": {
"checksum": "f08eb25c2ee48ac22ed63b0d18994a04"
Expand Down Expand Up @@ -6470,7 +6470,7 @@
"checksum": "97d1232340e04c53088bc8f814133dcd"
},
"NEWS.md": {
"checksum": "9c3198ce32b76cd0d81f9dae86c9a092"
"checksum": "3f750ced5e226047c9f6fb60fd4f40b7"
},
"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 Down