Skip to content

Commit

Permalink
Merge pull request #789 from pharmaR/jt-fix_report_includes
Browse files Browse the repository at this point in the history
Repair interconnectivity of report inclusions
  • Loading branch information
aclark02-arcus authored Jun 6, 2024
2 parents a154676 + f39d48a commit 650dd61
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/write-manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ 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 required packages
run: Rscript -e 'install.packages("rsconnect")'
run: Rscript -e 'renv::install("rsconnect")'

- name: Create manifest.json
run: Rscript -e 'rsconnect::writeManifest()'
Expand Down
6 changes: 5 additions & 1 deletion R/mod_downloadHandler.R
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ mod_downloadHandler_include_server <- function(id) {
ns <- session$ns

output$mod_downloadHandler_incl_output <- renderUI({
# Freezing the input will cause it to trigger again after rendering. This
# is necessary for the shinyjs code to disable/enable "Includes Suggests"
freezeReactiveValue(input, "report_includes")
div(
strong(p("Elements to include:")),
div(align = 'left', class = 'twocol', style = 'margin-top: 0px;',
Expand All @@ -67,7 +70,8 @@ mod_downloadHandler_include_server <- function(id) {
)
)
)
})
}) %>%
bindEvent(session$userData$trigger_events$update_report_pref_inclusions) # Triggers when switching packages on other tabs

# save user selections and notify user
observeEvent(input$store_prefs, {
Expand Down
6 changes: 3 additions & 3 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4367,7 +4367,7 @@
"Maintainer": "Kevin Ushey <kevin@rstudio.com>",
"Repository": "RSPM",
"Date/Publication": "2024-02-29 01:10:07 UTC",
"Built": "R 4.3.0; ; 2024-03-01 11:32:02 UTC; unix"
"Built": "R 4.3.3; ; 2024-06-06 17:15:02 UTC; unix"
}
},
"reprex": {
Expand Down Expand Up @@ -6178,7 +6178,7 @@
"checksum": "c0baef024db9ec1299aae4098e904e9c"
},
".github/workflows/write-manifest.yaml": {
"checksum": "64262504d53caa2823ff8987bca08a66"
"checksum": "cdfc1470af653982867daed2b99d5b97"
},
".open": {
"checksum": "d41d8cd98f00b204e9800998ecf8427e"
Expand Down Expand Up @@ -6508,7 +6508,7 @@
"checksum": "e22e1f4c044bc9f11c46a5fcdba33063"
},
"R/mod_downloadHandler.R": {
"checksum": "923e810fb1c8c7afe2d111cd42703579"
"checksum": "20126728855935201f75b0e36d444175"
},
"R/mod_introJS_utils_text.R": {
"checksum": "d98620a891752cf54b0d0282ddaa4af6"
Expand Down

0 comments on commit 650dd61

Please sign in to comment.