From 31acb4e0e61f42a6c8f551512626c8913bf40637 Mon Sep 17 00:00:00 2001 From: Jeff Thompson <160783290+jthompson-arcus@users.noreply.github.com> Date: Thu, 6 Jun 2024 10:33:42 -0400 Subject: [PATCH 1/4] Repair interconnectivity of report inclusions --- R/mod_downloadHandler.R | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/R/mod_downloadHandler.R b/R/mod_downloadHandler.R index faf37931..e0d54ceb 100644 --- a/R/mod_downloadHandler.R +++ b/R/mod_downloadHandler.R @@ -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;', @@ -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, { From d4570a19c0bf8cab3601c0e85c65758925a1372f Mon Sep 17 00:00:00 2001 From: Jeff Thompson <160783290+jthompson-arcus@users.noreply.github.com> Date: Thu, 6 Jun 2024 12:59:20 -0400 Subject: [PATCH 2/4] Update write-manifest.yaml --- .github/workflows/write-manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/write-manifest.yaml b/.github/workflows/write-manifest.yaml index dd903ab4..39b8113a 100644 --- a/.github/workflows/write-manifest.yaml +++ b/.github/workflows/write-manifest.yaml @@ -28,7 +28,7 @@ jobs: - 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()' From d5744355f0d15fa8d897a0cc0bd10acf83c72c58 Mon Sep 17 00:00:00 2001 From: Jeff Thompson <160783290+jthompson-arcus@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:12:17 -0400 Subject: [PATCH 3/4] Don't use public rspm --- .github/workflows/write-manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/write-manifest.yaml b/.github/workflows/write-manifest.yaml index 39b8113a..39d5b58b 100644 --- a/.github/workflows/write-manifest.yaml +++ b/.github/workflows/write-manifest.yaml @@ -24,7 +24,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 required packages From f39d48abb6064471b4adf90b2bff0978a6502358 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 6 Jun 2024 17:15:49 +0000 Subject: [PATCH 4/4] Re-build manifest file --- manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 095bae70..83cfda63 100644 --- a/manifest.json +++ b/manifest.json @@ -4367,7 +4367,7 @@ "Maintainer": "Kevin Ushey ", "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": { @@ -6178,7 +6178,7 @@ "checksum": "c0baef024db9ec1299aae4098e904e9c" }, ".github/workflows/write-manifest.yaml": { - "checksum": "64262504d53caa2823ff8987bca08a66" + "checksum": "cdfc1470af653982867daed2b99d5b97" }, ".open": { "checksum": "d41d8cd98f00b204e9800998ecf8427e" @@ -6508,7 +6508,7 @@ "checksum": "e22e1f4c044bc9f11c46a5fcdba33063" }, "R/mod_downloadHandler.R": { - "checksum": "923e810fb1c8c7afe2d111cd42703579" + "checksum": "20126728855935201f75b0e36d444175" }, "R/mod_introJS_utils_text.R": { "checksum": "d98620a891752cf54b0d0282ddaa4af6"