0.4.0

.Rbuildignore

@@ -1,3 +1,5 @@
+^renv$
+^renv\.lock$
 ^\.github$
 ^.*\.Rproj$
 ^\.Rproj\.user$

.circleci/config.yml

@@ -9,14 +9,14 @@ workflows:
   version: 2
   Prepare-All-R-Editions:
     jobs:
-      - Build-for-r4_0_5
+      - Build-for-r4_2_0
       - Build-for-rLATEST
 
 jobs:
 
-  Build-for-r4_0_5:
+  Build-for-r4_2_0:
     docker:
-      - image: rocker/verse:4.0.5
+      - image: rocker/verse:4.2
 
     steps:
       - checkout
@@ -34,12 +34,11 @@ jobs:
       - run:
           name: Install R dependencies
           command: |
-            R -e 'install.packages("shiny", repos = "https://cran.rstudio.com/")'
-            R -e 'install.packages("bs4Dash", repos = "https://cran.rstudio.com/")'
             R -e 'install.packages(c("shinyWidgets", "yaml", "DT", "writexl", "fresh", "miniUI", "shinyFeedback"))'
-            R -e 'install.packages(c("canvasXpress", "waiter", "shinyjs", "openxlsx", "spelling", "colourpicker", "lifecycle"))'
+            R -e 'install.packages(c("canvasXpress", "waiter", "shinyjs", "openxlsx",  "openxlsx2", "spelling", "colourpicker", "lifecycle"))'
+            R -e 'install.packages("covr")'
             R -e 'install.packages("reactable")'
-            R -e 'install.packages("openxlsx2", repos = "https://cloud.r-project.org")'
+            R -e 'install.packages("bs4Dash", repos = "https://cran.rstudio.com/")'
 
       - run:
           name: Session information and installed package versions
@@ -61,6 +60,7 @@ jobs:
             R CMD check *tar.gz
 
 
+
   Build-for-rLATEST:
     docker:
       - image: rocker/verse:latest

.gitignore

@@ -41,3 +41,5 @@ vignettes/*.pdf
 /Meta/
 inst/doc
 tests/testthat/*/log/
+
+.Rprofile

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: periscope2
 Type: Package
 Title: Enterprise Streamlined 'shiny' Application Framework Using 'bs4Dash'
-Version: 0.3.0
+Version: 0.4.0.9001
 Authors@R: c(
     person("Mohammed", "Ali",      role = c("aut", "cre"), email   = "mohammed@aggregate-genius.com"),
     person("Constance", "Brett",   role = c("ctb")),
@@ -18,7 +18,7 @@ License: GPL-3
 Encoding: UTF-8
 Language: en-US
 Depends:
-    R (>= 4.0)
+    R (>= 4.2)
 Imports:
     shiny (>= 1.7),
     bs4Dash (>= 2.3),
@@ -34,7 +34,6 @@ Imports:
     writexl,
     yaml,
     lifecycle
-RoxygenNote: 7.3.2
 Suggests:
     assertthat,
     canvasXpress,
@@ -52,3 +51,5 @@ Suggests:
     waiter
 VignetteBuilder: knitr
 Roxygen: list(markdown = TRUE)
+Config/roxygen2/version: 8.0.0
+RoxygenNote: 7.3.3

NEWS.md

@@ -1,3 +1,14 @@
+# periscope2 0.4.0
+
+## New Features
+- Bumped minimum R version to 4.2 to keep up with modern shiny/promises/httr2/testthat.
+
+## Bug Fixes
+- Fixed renv installation error 
+- Fixed *?downloadableReactTable* module return value reactivity issue
+
+-----
+
 # periscope2 0.3.0
 
 ## New Features

R/downloadableReactTable.R

@@ -217,12 +217,16 @@ downloadableReactTable <- function(id,
                                    logger             = NULL) {
         shiny::moduleServer(id,
              function(input, output, session) {
+                 downloadable_module_state <- shiny::reactiveVal(list(selected_rows = NULL, table_state = NULL))
+                 is_stale                  <- shiny::reactiveVal(FALSE)
+
                  if (is.null(table_data) || !is.function(table_data)) {
                      logerror("'table_data' parameter must be a function or reactive expression.", logger = logger)
                      output$reactTableOutputID <- reactable::renderReactable({ NULL })
                  } else {
                      table_react_params <- shiny::reactiveValues(table_data        = NULL,
                                                                  pre_selected_rows = NULL)
+
                      if (is.null(file_name_root)) {
                          logwarn("'file_name_root' parameter should not be NULL. Setting default value 'data_file'.", logger = logger)
                          file_name_root <- "data_file"
@@ -243,7 +247,9 @@ downloadableReactTable <- function(id,
                          pre_selected_rows <- NULL
                      }
 
-                     shiny::observe({
+                     shiny::observeEvent(table_data(), {
+                         is_stale(TRUE)
+
                          if (!is.data.frame(table_data())) {
                              table_data <- shiny::reactiveVal(data.frame(table_data()))
                          }
@@ -256,7 +262,7 @@ downloadableReactTable <- function(id,
 
                          }
                          shiny::outputOptions(output, "displayButton", suspendWhenHidden = FALSE)
-                     })
+                     }, priority = 10)
 
                      shiny::observe({
                          table_react_params$pre_selected_rows <- NULL
@@ -351,14 +357,35 @@ downloadableReactTable <- function(id,
                          table_output
                     })
                  }
-                 shiny::reactive({
+                 shiny::observe({
+
                      table_state   <- reactable::getReactableState("reactTableOutputID")
                      selected_rows <- NULL
-                     if (!is.null(table_state) && !is.null(table_state$selected) && is.data.frame(table_data())) {
-                         selected_rows <- table_data()[table_state$selected, ]
+
+                     # data is just re/set and new react state is not ready yet
+                     if (is_stale()) {
+                         # If the state is NULL or empty, it means the browser just finished resetting.
+                         # We can turn off the stale flag.
+                         if (is.null(table_state) || is.null(table_state$selected)) {
+                             is_stale(FALSE)
+                            if (!is.null(table_react_params) && !is.null(table_react_params$pre_selected_rows) && is.data.frame(table_data())) {
+                                selected_rows <- table_data()[table_react_params$pre_selected_rows, ]
+                            }
+                         }
+
+                         downloadable_module_state(list(selected_rows = selected_rows, table_state = NULL))
+
+                     } else { # the table is rendered, get the state directly from react table
+                         if (!is.null(table_state)) {
+                             if (!is.null(table_state$selected) && is.data.frame(table_data())) {
+                                 selected_rows <- table_data()[table_state$selected, ]
+                             }
+                             downloadable_module_state(list(selected_rows = selected_rows, table_state = table_state))
+                         }
                      }
-                     list(selected_rows = selected_rows, table_state = table_state)
                  })
+
+                 downloadable_module_state
             }
         )
 }