Next Release

.github/workflows/R-CMD-check-devel.yaml

@@ -18,11 +18,9 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest,   r: 'release'}
-          - {os: windows-latest, r: 'release'}
-          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-latest,   r: 'release'}
-          - {os: ubuntu-latest,   r: 'oldrel-1'}
+          - {os: macOS-latest,   r: 'renv'}
+          - {os: windows-latest, r: 'renv'}
+          - {os: ubuntu-latest,   r: 'renv'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -43,16 +41,11 @@ jobs:
       - uses: r-lib/actions/setup-pandoc@v2
 
       - uses: r-lib/actions/setup-r@v2
-      - uses: r-lib/actions/setup-renv@v2
         with:
           r-version: ${{ matrix.config.r }}
-          http-user-agent: ${{ matrix.config.http-user-agent }}
           use-public-rspm: true
-          extra-packages: rcmdcheck
 
-      - uses: r-lib/actions/setup-r-dependencies@v2
-        with:
-          extra-packages: rcmdcheck
+      - uses: r-lib/actions/setup-renv@v2
 
       # likely not needed since 'r-lib/actions/check-r-package@v2' will build
       # the pkg, but including it for consistency with other workflows

.github/workflows/pkgdown.yaml

@@ -27,14 +27,12 @@ jobs:
       - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
+          r-version: 'renv'
 
       - uses: r-lib/actions/setup-renv@v2
-        with:
-          extra-packages: any::pkgdown, local::.
-          needs: website
 
       - name: Install specific pkgdown version
-        run: install.packages("remotes") ; remotes::install_version("pkgdown", version = "2.0.3", repos = "cran.rstudio.com", dependencies = FALSE)
+        run: remotes::install_version("pkgdown", version = "2.0.3", repos = "cran.rstudio.com", dependencies = FALSE)
         shell: Rscript {0}
 
       - name: Install tidyCDISC

.github/workflows/test-coverage.yaml

@@ -22,10 +22,9 @@ jobs:
       - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
+          r-version: 'renv'
 
       - uses: r-lib/actions/setup-renv@v2
-        with:
-          extra-packages: covr
 
       - name: Install tidyCDISC
         shell: bash

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: tidyCDISC
 Title: Quick Table Generation & Exploratory Analyses on ADaM-Ish Datasets
-Version: 0.2.1
+Version: 0.2.1.9003
 Authors@R: c(
     person("Aaron", "Clark", , "clark.aaronchris@gmail.com", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-0123-0970")),
@@ -50,8 +50,10 @@ Imports:
     gt,
     haven,
     IDEAFilter,
+    jsonlite,
     plotly,
     purrr,
+    R6,
     rlang,
     rmarkdown,
     shiny,

NAMESPACE

@@ -1,19 +1,26 @@
 # Generated by roxygen2: do not edit by hand
 
+export(addBlock)
 export(app_methods)
 export(col_for_list_expr)
 export(common_rownames)
+export(createBlockdata)
 export(data_to_filter)
 export(data_to_use_str)
 export(get_levels)
 export(prep_adae)
 export(prep_adsl)
 export(prep_bds)
 export(pretty_IDs)
+export(removeBlock)
 export(run_app)
+export(setGroup)
+export(setTitle)
 export(std_footnote)
 export(tg_gt)
 export(varN_fctr_reorder)
+export(writeJSON)
+import(R6)
 import(dplyr)
 import(shiny)
 importFrom(GGally,ggsurv)
@@ -65,6 +72,9 @@ importFrom(gt,text_transform)
 importFrom(haven,read_sas)
 importFrom(haven,zap_formats)
 importFrom(haven,zap_label)
+importFrom(jsonlite,read_json)
+importFrom(jsonlite,toJSON)
+importFrom(jsonlite,write_json)
 importFrom(plotly,add_annotations)
 importFrom(plotly,config)
 importFrom(plotly,ggplotly)

NEWS.md

@@ -1,3 +1,9 @@
+# tidyCDISC (development version)
+* Moved "recipe" for standard table creation from JavaScript to JSON file (#167)
+* Improved code determining which standard tables to provide as options based on data uploaded (#167)
+* Fixed bug causing standard tables to run twice when grouping selected (#167)
+* Added var option functionality to "recipe" creation
+* Added a new R6 class to create blockData (#126)
 
 # tidyCDISC 0.2.1 (CRAN Release)
 
@@ -17,7 +23,7 @@
 * Fixed bug where selected filters were not being applied when 'Apply Filters' was toggled on (#175)
 * Fixed bug where plots' visual appeal was destroyed when faceting variable labels were too long (#200)
 * Fixed bug where scatter plot wouldn't display by categorical variable with `NA` values (#192)
-- Allowed for one-element lists in heatmap axis dropdowns (#214)
+* Allowed for one-element lists in heatmap axis dropdowns (#214).
 
 ### Individual Explorer
 * Updated the look of the time visualization (#194)