Skip to content

Commit b77b052

Browse files
authored
Merge branch 'main' into 518_incorrect_soft_dep@main
2 parents 942634a + cd8ac9d commit b77b052

File tree

69 files changed

+856
-521
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+856
-521
lines changed

.github/workflows/check.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,10 @@ jobs:
5151
additional-env-vars: |
5252
_R_CHECK_EXAMPLE_TIMING_THRESHOLD_=11
5353
TESTING_DEPTH=5
54+
NOT_CRAN=true
5455
enforce-note-blocklist: true
55-
publish-unit-test-report-gh-pages: false
56-
junit-xml-comparison: false
5756
concurrency-group: non-cran
58-
disable-unit-test-reports: true
59-
skip-r-cmd-install: true
57+
unit-test-report-directory: unit-test-report-non-cran
6058
note-blocklist: |
6159
checking dependencies in R code .* NOTE
6260
checking R code for possible problems .* NOTE
@@ -71,6 +69,9 @@ jobs:
7169
uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main
7270
secrets:
7371
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
72+
with:
73+
additional-env-vars: |
74+
NOT_CRAN=true
7475
linter:
7576
if: github.event_name != 'push'
7677
name: SuperLinter 🦸‍♀️

.github/workflows/docs.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,4 @@ jobs:
4141
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
4242
with:
4343
default-landing-page: latest-tag
44+
additional-unit-test-report-directories: unit-test-report-non-cran

.github/workflows/on-demand.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.github/workflows/release.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,10 @@ jobs:
5252
uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main
5353
secrets:
5454
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
55+
with:
56+
additional-env-vars: |
57+
NOT_CRAN=true
58+
wasm:
59+
name: Build WASM packages 🧑‍🏭
60+
needs: release
61+
uses: insightsengineering/r.pkg.template/.github/workflows/wasm.yaml@main

.github/workflows/scheduled.yaml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,26 @@ on:
55
schedule:
66
- cron: '45 3 * * 0'
77
workflow_dispatch:
8+
inputs:
9+
chosen-workflow:
10+
description: |
11+
Select which workflow you'd like to run
12+
required: true
13+
type: choice
14+
default: rhub
15+
options:
16+
- rhub
17+
- dependency-test
18+
- branch-cleanup
19+
- revdepcheck
820

921
jobs:
1022
dependency-test:
23+
if: >
24+
github.event_name == 'schedule' || (
25+
github.event_name == 'workflow_dispatch' &&
26+
inputs.chosen-workflow == 'dependency-test'
27+
)
1128
strategy:
1229
fail-fast: false
1330
matrix:
@@ -22,7 +39,54 @@ jobs:
2239
additional-env-vars: |
2340
PKG_SYSREQS_DRY_RUN=true
2441
branch-cleanup:
42+
if: >
43+
github.event_name == 'schedule' || (
44+
github.event_name == 'workflow_dispatch' &&
45+
inputs.chosen-workflow == 'branch-cleanup'
46+
)
2547
name: Branch Cleanup 🧹
2648
uses: insightsengineering/r.pkg.template/.github/workflows/branch-cleanup.yaml@main
2749
secrets:
2850
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
51+
revdepcheck:
52+
if: >
53+
github.event_name == 'schedule' || (
54+
github.event_name == 'workflow_dispatch' &&
55+
inputs.chosen-workflow == 'revdepcheck'
56+
)
57+
name: revdepcheck ↩️
58+
uses: insightsengineering/r.pkg.template/.github/workflows/revdepcheck.yaml@main
59+
with:
60+
lookup-refs: |
61+
insightsengineering/roxy.shinylive
62+
insightsengineering/teal
63+
insightsengineering/teal.transform
64+
insightsengineering/teal.code
65+
insightsengineering/teal.data
66+
insightsengineering/teal.slice
67+
insightsengineering/teal.logger
68+
insightsengineering/teal.reporter
69+
insightsengineering/teal.widgets
70+
insightsengineering/tern
71+
insightsengineering/rtables
72+
rhub:
73+
if: >
74+
github.event_name == 'schedule' || (
75+
github.event_name == 'workflow_dispatch' &&
76+
inputs.chosen-workflow == 'rhub'
77+
)
78+
name: R-hub 🌐
79+
uses: insightsengineering/r.pkg.template/.github/workflows/rhub.yaml@main
80+
with:
81+
lookup-refs: |
82+
insightsengineering/roxy.shinylive
83+
insightsengineering/teal
84+
insightsengineering/teal.transform
85+
insightsengineering/teal.code
86+
insightsengineering/teal.data
87+
insightsengineering/teal.slice
88+
insightsengineering/teal.logger
89+
insightsengineering/teal.reporter
90+
insightsengineering/teal.widgets
91+
insightsengineering/tern
92+
insightsengineering/rtables

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ vignettes/*.R
2929
coverage.*
3030
tests/testthat/_snaps/**/*.new.md
3131
tests/testthat/_snaps/**/*.new.svg
32+
/doc/
33+
/Meta/

.pre-commit-config.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
# All available hooks: https://pre-commit.com/hooks.html
33
# R specific hooks: https://github.com/lorenzwalthert/precommit
4-
default_stages: [commit]
4+
default_stages: [pre-commit]
55
default_language_version:
66
python: python3
77
repos:
88
- repo: https://github.com/lorenzwalthert/precommit
9-
rev: v0.4.2
9+
rev: v0.4.3.9003
1010
hooks:
1111
- id: style-files
1212
name: Style code with `styler`
@@ -18,8 +18,6 @@ repos:
1818
- ggmosaic
1919
- ggplot2
2020
- shiny
21-
- teal
22-
- teal.transform
2321
- checkmate
2422
- dplyr
2523
- DT
@@ -33,6 +31,9 @@ repos:
3331
- shinyWidgets
3432
- stats
3533
- stringr
34+
- insightsengineering/roxy.shinylive
35+
- insightsengineering/teal
36+
- insightsengineering/teal.transform
3637
- insightsengineering/teal.code
3738
- insightsengineering/teal.data
3839
- insightsengineering/teal.logger

DESCRIPTION

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Type: Package
22
Package: teal.modules.general
33
Title: General Modules for 'teal' Applications
4-
Version: 0.3.0.9038
5-
Date: 2024-06-27
4+
Version: 0.3.0.9054
5+
Date: 2024-11-08
66
Authors@R: c(
77
person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
88
person("Pawel", "Rucki", , "[email protected]", role = "aut"),
@@ -27,8 +27,8 @@ Depends:
2727
ggplot2 (>= 3.4.0),
2828
R (>= 3.6),
2929
shiny (>= 1.6.0),
30-
teal (>= 0.15.1),
31-
teal.transform (>= 0.5.0)
30+
teal (>= 0.15.2.9079),
31+
teal.transform (>= 0.5.0.9015)
3232
Imports:
3333
broom (>= 0.7.10),
3434
checkmate (>= 2.1.0),
@@ -49,8 +49,8 @@ Imports:
4949
shinyWidgets (>= 0.5.1),
5050
stats,
5151
stringr (>= 1.4.1),
52-
teal.code (>= 0.5.0),
53-
teal.data (>= 0.5.0),
52+
teal.code (>= 0.5.0.9012),
53+
teal.data (>= 0.6.0.9015),
5454
teal.logger (>= 0.2.0.9004),
5555
teal.reporter (>= 0.3.0),
5656
teal.widgets (>= 0.4.0),
@@ -72,14 +72,16 @@ Suggests:
7272
pkgload,
7373
rlang (>= 1.0.0),
7474
rmarkdown (>= 2.23),
75+
roxy.shinylive,
7576
rtables (>= 0.6.8),
7677
rvest,
7778
shinytest2,
7879
sparkline,
7980
testthat (>= 3.1.9),
8081
withr (>= 2.0.0)
8182
VignetteBuilder:
82-
knitr
83+
knitr,
84+
rmarkdown
8385
Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2,
8486
rstudio/shiny, insightsengineering/teal,
8587
insightsengineering/teal.transform, mllg/checkmate, tidyverse/dplyr,
@@ -91,15 +93,14 @@ Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2,
9193
insightsengineering/tern, tidyverse/tibble, tidyverse/tidyr,
9294
tidymodels/broom, daattali/colourpicker, daattali/ggExtra,
9395
aphalo/ggpmisc, aphalo/ggpp, slowkow/ggrepel, baddstats/goftest,
94-
gridExtra, ramnathv/htmlwidgets, jeroen/jsonlite, yihui/knitr,
95-
daroczig/logger, deepayan/lattice, MASS,
96-
insightsengineering/nestcolor, r-lib/rlang, rstudio/rmarkdown,
97-
insightsengineering/rtables, tidyverse/rvest, sparkline,
98-
rstudio/shinytest2, insightsengineering/teal.data, r-lib/testthat,
99-
r-lib/withr
96+
ramnathv/htmlwidgets, jeroen/jsonlite, yihui/knitr, daroczig/logger,
97+
deepayan/lattice, insightsengineering/nestcolor, r-lib/pkgload,
98+
r-lib/rlang, rstudio/rmarkdown, insightsengineering/roxy.shinylive,
99+
insightsengineering/rtables, tidyverse/rvest, htmlwidgets/sparkline,
100+
rstudio/shinytest2, r-lib/testthat, r-lib/withr
100101
Config/Needs/website: insightsengineering/nesttemplate
101102
Encoding: UTF-8
102103
Language: en-US
103104
LazyData: true
104-
Roxygen: list(markdown = TRUE)
105-
RoxygenNote: 7.3.1
105+
Roxygen: list(markdown = TRUE, packages = c("roxy.shinylive"))
106+
RoxygenNote: 7.3.2

NEWS.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
# teal.modules.general 0.3.0.9038
1+
# teal.modules.general 0.3.0.9054
22

33
* Removed `Show Warnings` modals from modules.
44

55
### Enhancements
66
* Added `teal.logger` functionality for logging changes in shiny inputs in all modules.
77

8+
### Bug fixes
9+
* Fixed a bug in `tm_missing_data` in "Group by Subject" that was not using reactive data call.
10+
811
# teal.modules.general 0.3.0
912

1013
### Enhancements
11-
* Updated the package docs and vignettes with the new way of specifying data for `teal::init()`. The `data` argument will accept a `teal_data` object
14+
* Updated the package docs and vignettes with the new way of specifying data for `teal::init()`. The `data` argument will accept a `teal_data` object.
1215

1316
### Bug fixes
1417
* Outlier labels no longer appear out of bounds in `tm_a_regression`.

R/tm_a_pca.R

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818
#'
1919
#' @inherit shared_params return
2020
#'
21+
#' @examplesShinylive
22+
#' library(teal.modules.general)
23+
#' interactive <- function() TRUE
24+
#' {{ next_example }}
2125
#' @examples
22-
#' library(teal.widgets)
23-
#'
2426
#' # general data example
2527
#' data <- teal_data()
2628
#' data <- within(data, {
2729
#' require(nestcolor)
2830
#' USArrests <- USArrests
2931
#' })
3032
#'
31-
#' datanames(data) <- "USArrests"
32-
#'
3333
#' app <- init(
3434
#' data = data,
3535
#' modules = modules(
@@ -45,9 +45,6 @@
4545
#' multiple = TRUE
4646
#' ),
4747
#' filter = NULL
48-
#' ),
49-
#' ggplot2_args = ggplot2_args(
50-
#' labs = list(subtitle = "Plot generated by PCA Module")
5148
#' )
5249
#' )
5350
#' )
@@ -56,14 +53,18 @@
5653
#' shinyApp(app$ui, app$server)
5754
#' }
5855
#'
56+
#' @examplesShinylive
57+
#' library(teal.modules.general)
58+
#' interactive <- function() TRUE
59+
#' {{ next_example }}
60+
#' @examples
5961
#' # CDISC data example
6062
#' data <- teal_data()
6163
#' data <- within(data, {
6264
#' require(nestcolor)
6365
#' ADSL <- rADSL
6466
#' })
65-
#' datanames(data) <- "ADSL"
66-
#' join_keys(data) <- default_cdisc_join_keys[datanames(data)]
67+
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
6768
#'
6869
#' app <- init(
6970
#' data = data,
@@ -80,9 +81,6 @@
8081
#' multiple = TRUE
8182
#' ),
8283
#' filter = NULL
83-
#' ),
84-
#' ggplot2_args = ggplot2_args(
85-
#' labs = list(subtitle = "Plot generated by PCA Module")
8684
#' )
8785
#' )
8886
#' )

0 commit comments

Comments
 (0)