Skip to content

Commit 3a1b5d6

Browse files
committed
Merge branch 'main' into test@bslib@main
# Conflicts: # R/module_teal.R
2 parents 486b565 + c75f39e commit 3a1b5d6

File tree

101 files changed

+3389
-1934
lines changed

Some content is hidden

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

101 files changed

+3389
-1934
lines changed

.github/workflows/check.yaml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@ jobs:
4343
unit-test-report-brand: >-
4444
https://raw.githubusercontent.com/insightsengineering/hex-stickers/main/thumbs/teal.png
4545
deps-installation-method: setup-r-dependencies
46-
lookup-refs: |
47-
insightsengineering/teal.data
48-
insightsengineering/teal.slice
49-
insightsengineering/teal.code
50-
insightsengineering/teal.logger
51-
insightsengineering/teal.reporter
52-
insightsengineering/teal.widgets
53-
insightsengineering/rtables
54-
insightsengineering/formatters
55-
insightsengineering/rtables.officer
5646

5747
r-cmd-non-cran:
5848
name: R CMD Check (non-CRAN) 🧬
@@ -76,16 +66,6 @@ jobs:
7666
checking for unstated dependencies in vignettes .* NOTE
7767
checking top-level files .* NOTE
7868
deps-installation-method: setup-r-dependencies
79-
lookup-refs: |
80-
insightsengineering/teal.data
81-
insightsengineering/teal.slice
82-
insightsengineering/teal.code
83-
insightsengineering/teal.logger
84-
insightsengineering/teal.reporter
85-
insightsengineering/teal.widgets
86-
insightsengineering/rtables
87-
insightsengineering/rtables.officer
88-
insightsengineering/formatters
8969

9070
coverage:
9171
name: Coverage 📔
@@ -96,16 +76,6 @@ jobs:
9676
additional-env-vars: |
9777
NOT_CRAN=true
9878
deps-installation-method: setup-r-dependencies
99-
lookup-refs: |
100-
insightsengineering/teal.data
101-
insightsengineering/teal.slice
102-
insightsengineering/teal.code
103-
insightsengineering/teal.logger
104-
insightsengineering/teal.reporter
105-
insightsengineering/teal.widgets
106-
insightsengineering/rtables
107-
insightsengineering/rtables.officer
108-
insightsengineering/formatters
10979
linter:
11080
if: github.event_name != 'push'
11181
name: SuperLinter 🦸‍♀️
@@ -118,16 +88,6 @@ jobs:
11888
with:
11989
auto-update: true
12090
deps-installation-method: setup-r-dependencies
121-
lookup-refs: |
122-
insightsengineering/teal.data
123-
insightsengineering/teal.slice
124-
insightsengineering/teal.code
125-
insightsengineering/teal.logger
126-
insightsengineering/teal.reporter
127-
insightsengineering/teal.widgets
128-
insightsengineering/rtables
129-
insightsengineering/rtables.officer
130-
insightsengineering/formatters
13191
gitleaks:
13292
name: gitleaks 💧
13393
uses: insightsengineering/r.pkg.template/.github/workflows/gitleaks.yaml@main

.github/workflows/docs.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,3 @@ jobs:
4343
default-landing-page: latest-tag
4444
additional-unit-test-report-directories: unit-test-report-non-cran
4545
deps-installation-method: setup-r-dependencies
46-
lookup-refs: |
47-
insightsengineering/teal.data
48-
insightsengineering/teal.slice
49-
insightsengineering/teal.code
50-
insightsengineering/teal.logger
51-
insightsengineering/teal.reporter
52-
insightsengineering/teal.widgets
53-
insightsengineering/rtables
54-
insightsengineering/rtables.officer
55-
insightsengineering/formatters

.github/workflows/release.yaml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@ jobs:
1717
with:
1818
default-landing-page: latest-tag
1919
deps-installation-method: setup-r-dependencies
20-
lookup-refs: |
21-
insightsengineering/teal.data
22-
insightsengineering/teal.slice
23-
insightsengineering/teal.code
24-
insightsengineering/teal.logger
25-
insightsengineering/teal.reporter
26-
insightsengineering/teal.widgets
27-
insightsengineering/rtables
28-
insightsengineering/rtables.officer
29-
insightsengineering/formatters
3020
validation:
3121
name: R Package Validation report 📃
3222
needs: release
@@ -35,16 +25,6 @@ jobs:
3525
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
3626
with:
3727
deps-installation-method: setup-r-dependencies
38-
lookup-refs: |
39-
insightsengineering/teal.data
40-
insightsengineering/teal.slice
41-
insightsengineering/teal.code
42-
insightsengineering/teal.logger
43-
insightsengineering/teal.reporter
44-
insightsengineering/teal.widgets
45-
insightsengineering/rtables
46-
insightsengineering/rtables.officer
47-
insightsengineering/formatters
4828
release:
4929
name: Create release 🎉
5030
uses: insightsengineering/r.pkg.template/.github/workflows/release.yaml@main
@@ -70,16 +50,6 @@ jobs:
7050
unit-test-report-brand: >-
7151
https://raw.githubusercontent.com/insightsengineering/hex-stickers/main/thumbs/teal.png
7252
deps-installation-method: setup-r-dependencies
73-
lookup-refs: |
74-
insightsengineering/teal.data
75-
insightsengineering/teal.slice
76-
insightsengineering/teal.code
77-
insightsengineering/teal.logger
78-
insightsengineering/teal.reporter
79-
insightsengineering/teal.widgets
80-
insightsengineering/rtables
81-
insightsengineering/rtables.officer
82-
insightsengineering/formatters
8353
coverage:
8454
name: Coverage 📔
8555
needs: [release, docs]
@@ -90,16 +60,6 @@ jobs:
9060
additional-env-vars: |
9161
NOT_CRAN=true
9262
deps-installation-method: setup-r-dependencies
93-
lookup-refs: |
94-
insightsengineering/teal.data
95-
insightsengineering/teal.slice
96-
insightsengineering/teal.code
97-
insightsengineering/teal.logger
98-
insightsengineering/teal.reporter
99-
insightsengineering/teal.widgets
100-
insightsengineering/rtables
101-
insightsengineering/rtables.officer
102-
insightsengineering/formatters
10363
wasm:
10464
name: Build WASM packages 🧑‍🏭
10565
needs: release

.github/workflows/scheduled.yaml

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ jobs:
3838
strategy: ${{ matrix.test-strategy }}
3939
additional-env-vars: |
4040
PKG_SYSREQS_DRY_RUN=true
41+
extra-deps: |
42+
matrixStats (>= 1.5.0)
4143
branch-cleanup:
4244
if: >
4345
github.event_name == 'schedule' || (
@@ -56,17 +58,7 @@ jobs:
5658
)
5759
name: revdepcheck ↩️
5860
uses: insightsengineering/r.pkg.template/.github/workflows/revdepcheck.yaml@main
59-
with:
60-
lookup-refs: |
61-
insightsengineering/teal.data
62-
insightsengineering/teal.slice
63-
insightsengineering/teal.code
64-
insightsengineering/teal.logger
65-
insightsengineering/teal.reporter
66-
insightsengineering/teal.widgets
67-
insightsengineering/rtables
68-
insightsengineering/rtables.officer
69-
insightsengineering/formatters
61+
7062
rhub:
7163
if: >
7264
github.event_name == 'schedule' || (
@@ -75,14 +67,4 @@ jobs:
7567
)
7668
name: R-hub 🌐
7769
uses: insightsengineering/r.pkg.template/.github/workflows/rhub.yaml@main
78-
with:
79-
lookup-refs: |
80-
insightsengineering/teal.data
81-
insightsengineering/teal.slice
82-
insightsengineering/teal.code
83-
insightsengineering/teal.logger
84-
insightsengineering/teal.reporter
85-
insightsengineering/teal.widgets
86-
insightsengineering/rtables
87-
insightsengineering/rtables.officer
88-
insightsengineering/formatters
70+

.pre-commit-config.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ repos:
1919
- davidgohel/gdtools # for flextable
2020
- mirai
2121
- checkmate
22-
- crayon
22+
- cli
23+
- htmltools
2324
- jsonlite
2425
- lifecycle
2526
- logger
@@ -30,6 +31,7 @@ repos:
3031
- shiny
3132
- shinyjs
3233
- stats
34+
- insightsengineering/roxy.shinylive
3335
- insightsengineering/teal.code
3436
- insightsengineering/teal.data
3537
- insightsengineering/teal.logger

DESCRIPTION

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Type: Package
22
Package: teal
33
Title: Exploratory Web Apps for Analyzing Clinical Trials Data
4-
Version: 0.15.2.9091
5-
Date: 2024-11-29
4+
Version: 0.15.2.9131
5+
Date: 2025-02-12
66
Authors@R: c(
77
person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre"),
88
comment = c(ORCID = "0000-0001-9533-457X")),
@@ -35,25 +35,26 @@ URL: https://insightsengineering.github.io/teal/,
3535
https://github.com/insightsengineering/teal/
3636
BugReports: https://github.com/insightsengineering/teal/issues
3737
Depends:
38-
R (>= 4.0),
38+
R (>= 4.1),
3939
shiny (>= 1.8.1),
40-
teal.data (>= 0.6.0.9017),
41-
teal.slice (>= 0.5.1.9015)
40+
teal.data (>= 0.7.0),
41+
teal.slice (>= 0.6.0)
4242
Imports:
4343
bslib (>= 0.8.0),
4444
checkmate (>= 2.1.0),
45-
crayon,
45+
cli,
46+
htmltools,
4647
jsonlite,
4748
lifecycle (>= 0.2.0),
4849
logger (>= 0.2.0),
4950
methods,
5051
rlang (>= 1.0.0),
5152
shinyjs,
5253
stats,
53-
teal.code (>= 0.5.0.9015),
54-
teal.logger (>= 0.2.0),
55-
teal.reporter (>= 0.3.1.9004),
56-
teal.widgets (>= 0.4.0),
54+
teal.code (>= 0.6.0),
55+
teal.logger (>= 0.3.1),
56+
teal.reporter (>= 0.4.0),
57+
teal.widgets (>= 0.4.3),
5758
tools,
5859
utils
5960
Suggests:
@@ -64,6 +65,7 @@ Suggests:
6465
R6,
6566
renv (>= 1.0.11),
6667
rmarkdown (>= 2.23),
68+
roxy.shinylive,
6769
rvest (>= 1.0.0),
6870
shinytest2,
6971
shinyvalidate,
@@ -77,25 +79,25 @@ RdMacros:
7779
lifecycle
7880
Config/Needs/verdepcheck: rstudio/shiny, insightsengineering/teal.data,
7981
insightsengineering/teal.slice, mllg/checkmate, jeroen/jsonlite,
80-
r-lib/lifecycle, daroczig/logger, shikokuchuo/mirai, r-lib/crayon,
82+
r-lib/lifecycle, daroczig/logger, shikokuchuo/mirai, r-lib/cli,
8183
shikokuchuo/nanonext, rstudio/renv, r-lib/rlang, daattali/shinyjs,
8284
insightsengineering/teal.code, insightsengineering/teal.logger,
8385
insightsengineering/teal.reporter, insightsengineering/teal.widgets,
8486
rstudio/bslib, yihui/knitr, bioc::MultiAssayExperiment, r-lib/R6,
8587
rstudio/rmarkdown, tidyverse/rvest, rstudio/shinytest2,
8688
rstudio/shinyvalidate, r-lib/testthat, r-lib/withr,
87-
yaml=vubiostat/r-yaml
89+
yaml=vubiostat/r-yaml, rstudio/htmltools, bioc::matrixStats,
90+
insightsengineering/roxy.shinylive
8891
Config/Needs/website: insightsengineering/nesttemplate
8992
Encoding: UTF-8
9093
Language: en-US
9194
LazyData: true
92-
Roxygen: list(markdown = TRUE)
95+
Roxygen: list(markdown = TRUE, packages = c("roxy.shinylive"))
9396
RoxygenNote: 7.3.2
9497
Collate:
9598
'TealAppDriver.R'
9699
'checkmate.R'
97100
'dummy_functions.R'
98-
'get_rcode_utils.R'
99101
'include_css_js.R'
100102
'modules.R'
101103
'init.R'
@@ -106,6 +108,7 @@ Collate:
106108
'module_filter_manager.R'
107109
'module_init_data.R'
108110
'module_nested_tabs.R'
111+
'module_session_info.R'
109112
'module_snapshot_manager.R'
110113
'module_teal.R'
111114
'module_teal_data.R'
@@ -120,6 +123,7 @@ Collate:
120123
'teal_data_module-eval_code.R'
121124
'teal_data_module-within.R'
122125
'teal_data_utils.R'
126+
'teal_modifiers.R'
123127
'teal_reporter.R'
124128
'teal_slices-store.R'
125129
'teal_slices.R'

NAMESPACE

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ S3method(ui_teal_module,teal_module)
1414
S3method(ui_teal_module,teal_modules)
1515
S3method(within,teal_data_module)
1616
export(TealReportCard)
17+
export(add_landing_modal)
1718
export(as.teal_slices)
1819
export(as_tdata)
1920
export(build_app_title)
@@ -23,20 +24,24 @@ export(get_metadata)
2324
export(init)
2425
export(landing_popup_module)
2526
export(make_teal_transform_server)
27+
export(modify_footer)
28+
export(modify_header)
29+
export(modify_title)
2630
export(module)
2731
export(modules)
2832
export(new_tdata)
2933
export(report_card_template)
3034
export(reporter_previewer_module)
31-
export(set_datanames)
3235
export(show_rcode_modal)
36+
export(srv_session_info)
3337
export(srv_teal)
3438
export(srv_teal_with_splash)
3539
export(srv_transform_teal_data)
3640
export(tdata2env)
3741
export(teal_data_module)
3842
export(teal_slices)
3943
export(teal_transform_module)
44+
export(ui_session_info)
4045
export(ui_teal)
4146
export(ui_teal_with_splash)
4247
export(ui_transform_teal_data)

NEWS.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
# teal 0.15.2.9091
1+
# teal 0.15.2.9131
22

33
### New features
44

55
* Possible to call `ui_teal` and `srv_teal` directly in any application by delivering `data` argument as a `reactive` returning `teal_data` object. #669
6+
* Since introduction of `ui_teal` and `srv_teal` functions `id` argument in `init` is being deprecated. #1438
7+
* Introduce `ui_session_info` and `srv_session_info` shiny module to create the user session info and teal app lockfile download button.
68
* Introduced `teal_transform_module` to provide a way to interactively modify data delivered to `teal_module`'s `server` and to decorate module outputs. #1228 #1384
79
* Introduced a new argument `once = FALSE` in `teal_data_module` to possibly reload data during a run time.
810
* Possibility to download lockfile to restore app session for reproducibility. #479
9-
* Introduced a function `set_datanames()` to change a `datanames` of the `teal_module`.
1011
* Datasets which name starts with `.` are ignored when `module`'s `datanames` is set as `"all"`.
1112
* Added warning when reserved `datanames`, such as `all` and `.raw_data` are being used.
13+
* Added `add_custom_server()` to allow adding custom server logic to the main shiny server function of a teal app.
1214

1315
### Breaking changes
1416

1517
* Setting `datanames()` on `data` passed to teal application no longer has effect. In order to change `teal_module`'s
1618
`datanames` one should modify `module$datanames`.
17-
* The `landing_popup_module()` needs to be passed as the `landing_popup` argument of `init` instead of being passed as a module of the `modules` argument of `init`.
19+
* `landing_popup_module()` is deprecated. Please use `add_landing_modal()` function to add a landing popup for your teal application.
1820
* `teal` no longer re-export `%>%`. Please load `library(magrittr)` instead or use `|>` from `base`.
21+
* `build_app_title` will be removed in the future release. Please use the `modify_title()` function to change the title for your teal application.
22+
* The `title`, `header`, and `footer` arguments of the `init()` function are deprecated. Please use the `modify_title`, `modify_header`, and `modify_footer` respectively.
1923

2024
### Enhancement
2125

0 commit comments

Comments
 (0)