From 1dfb0945a56348a9e17e46262823ef0dd3f28d98 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Tue, 6 Aug 2024 17:54:51 +0200 Subject: [PATCH 01/32] Update DESCRIPTION (#770) remove duplicated entry from config/needs/verdepcheck Signed-off-by: Pawel Rucki <12943682+pawelru@users.noreply.github.com> --- DESCRIPTION | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 5c72cdb23..bdd6f8f6a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -94,11 +94,10 @@ Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2, daroczig/logger, deepayan/lattice, MASS, insightsengineering/nestcolor, r-lib/rlang, rstudio/rmarkdown, insightsengineering/rtables, tidyverse/rvest, sparkline, - rstudio/shinytest2, insightsengineering/teal.data, r-lib/testthat, - r-lib/withr + rstudio/shinytest2, r-lib/testthat, r-lib/withr Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 Language: en-US LazyData: true Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2 From 74b71af578cd72e3716caa21e780ac2ea5cfad77 Mon Sep 17 00:00:00 2001 From: pawelru Date: Tue, 6 Aug 2024 15:55:49 +0000 Subject: [PATCH 02/32] [skip actions] Bump version to 0.3.0.9039 --- .pre-commit-config.yaml | 2 +- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6684c09a0..347dffa0a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ default_language_version: python: python3 repos: - repo: https://github.com/lorenzwalthert/precommit - rev: v0.4.2 + rev: v0.4.3 hooks: - id: style-files name: Style code with `styler` diff --git a/DESCRIPTION b/DESCRIPTION index bdd6f8f6a..d7aef173f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9038 -Date: 2024-06-27 +Version: 0.3.0.9039 +Date: 2024-08-06 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 029e1412b..28177aa9a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9038 +# teal.modules.general 0.3.0.9039 * Removed `Show Warnings` modals from modules. From a503250fdb623b91f08f2cd5920d56e7078d8cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Wed, 14 Aug 2024 15:31:59 +0100 Subject: [PATCH 03/32] Fixes data reactivity in `tm_missing_data` (#773) # Pull Request Fixes #772 #### Changes description - Convert `data` -> `data()` - Use `datanames()` instead of `names()` --------- Co-authored-by: vedhav --- DESCRIPTION | 2 +- NEWS.md | 5 ++++- R/tm_missing_data.R | 4 ++-- tests/testthat/test-shinytest2-tm_a_regression.R | 4 ++-- tests/testthat/test-shinytest2-tm_data_table.R | 2 +- tests/testthat/test-shinytest2-tm_file_viewer.R | 2 +- tests/testthat/test-shinytest2-tm_front_page.R | 2 +- tests/testthat/test-shinytest2-tm_g_association.R | 4 ++-- tests/testthat/test-shinytest2-tm_g_scatterplotmatrix.R | 4 ++-- tests/testthat/test-shinytest2-tm_misssing_data.R | 2 +- tests/testthat/test-shinytest2-tm_outliers.R | 4 ++-- tests/testthat/test-shinytest2-tm_t_crosstable.R | 4 ++-- tests/testthat/test-shinytest2-tm_variable_browser.R | 2 +- 13 files changed, 22 insertions(+), 19 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d7aef173f..2b0ce79d8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -27,7 +27,7 @@ Depends: ggplot2 (>= 3.4.0), R (>= 3.6), shiny (>= 1.6.0), - teal (>= 0.15.1), + teal (>= 0.15.2.9052), teal.transform (>= 0.5.0) Imports: checkmate (>= 2.1.0), diff --git a/NEWS.md b/NEWS.md index 28177aa9a..4d52780ad 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,10 +5,13 @@ ### Enhancements * Added `teal.logger` functionality for logging changes in shiny inputs in all modules. +### Bug fixes +* Fixed a bug in `tm_missing_data` in "Group by Subject" that was not using reactive data call. + # teal.modules.general 0.3.0 ### Enhancements -* 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 +* 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. ### Bug fixes * Outlier labels no longer appear out of bounds in `tm_a_regression`. diff --git a/R/tm_missing_data.R b/R/tm_missing_data.R index de72ee834..7af029e74 100644 --- a/R/tm_missing_data.R +++ b/R/tm_missing_data.R @@ -464,8 +464,8 @@ srv_missing_data <- function(id, data, reporter, filter_panel_api, dataname, par data_parent_keys <- reactive({ - if (length(parent_dataname) > 0 && parent_dataname %in% names(data)) { - keys <- teal.data::join_keys(data)[[dataname]] + if (length(parent_dataname) > 0 && parent_dataname %in% teal.data::datanames(data())) { + keys <- teal.data::join_keys(data())[[dataname]] if (parent_dataname %in% names(keys)) { keys[[parent_dataname]] } else { diff --git a/tests/testthat/test-shinytest2-tm_a_regression.R b/tests/testthat/test-shinytest2-tm_a_regression.R index a8e010b32..ee09a7656 100644 --- a/tests/testthat/test-shinytest2-tm_a_regression.R +++ b/tests/testthat/test-shinytest2-tm_a_regression.R @@ -53,11 +53,11 @@ testthat::test_that("e2e - tm_a_regression: Data parameter and module label is p app_driver$expect_no_shiny_error() testthat::expect_equal( - app_driver$get_text("#teal-main_ui-root-active_tab > li.active > a"), + app_driver$get_text("#teal-teal_modules-active_tab > li.active > a"), "Regression" ) - encoding_dataset <- app_driver$get_text("#teal-main_ui-root-regression .help-block") + encoding_dataset <- app_driver$get_text("#teal-teal_modules-regression .help-block") testthat::expect_match(encoding_dataset, "Dataset:[\n ]*CO2", all = FALSE) app_driver$stop() diff --git a/tests/testthat/test-shinytest2-tm_data_table.R b/tests/testthat/test-shinytest2-tm_data_table.R index 91a5b4cc2..c6330d43d 100644 --- a/tests/testthat/test-shinytest2-tm_data_table.R +++ b/tests/testthat/test-shinytest2-tm_data_table.R @@ -27,7 +27,7 @@ test_that("e2e - tm_data_table: Initializes without errors", { app_driver$expect_no_shiny_error() testthat::expect_equal( - app_driver$get_text("#teal-main_ui-root-active_tab > li.active > a"), + app_driver$get_text("#teal-teal_modules-active_tab > li.active > a"), "Data Table" ) diff --git a/tests/testthat/test-shinytest2-tm_file_viewer.R b/tests/testthat/test-shinytest2-tm_file_viewer.R index 1b47cbd00..7a6eb12c6 100644 --- a/tests/testthat/test-shinytest2-tm_file_viewer.R +++ b/tests/testthat/test-shinytest2-tm_file_viewer.R @@ -34,7 +34,7 @@ test_that("e2e - tm_file_viewer: Initializes without errors and shows files tree ) testthat::expect_equal( - app_driver$get_text("#teal-main_ui-root-active_tab > li.active > a"), + app_driver$get_text("#teal-teal_modules-active_tab > li.active > a"), "File Viewer Module" ) diff --git a/tests/testthat/test-shinytest2-tm_front_page.R b/tests/testthat/test-shinytest2-tm_front_page.R index 573de7288..c329db949 100644 --- a/tests/testthat/test-shinytest2-tm_front_page.R +++ b/tests/testthat/test-shinytest2-tm_front_page.R @@ -28,7 +28,7 @@ test_that("e2e - tm_front_page: Initializes without errors and check html elemen app_driver$expect_no_shiny_error() testthat::expect_equal( - app_driver$get_text("#teal-main_ui-root-active_tab > li.active > a"), + app_driver$get_text("#teal-teal_modules-active_tab > li.active > a"), "Front page" ) diff --git a/tests/testthat/test-shinytest2-tm_g_association.R b/tests/testthat/test-shinytest2-tm_g_association.R index ac3c73401..a5219639e 100644 --- a/tests/testthat/test-shinytest2-tm_g_association.R +++ b/tests/testthat/test-shinytest2-tm_g_association.R @@ -52,11 +52,11 @@ testthat::test_that("e2e - tm_g_association: Data parameter and module label is app_driver$expect_no_shiny_error() testthat::expect_equal( - app_driver$get_text("#teal-main_ui-root-active_tab > li.active > a"), + app_driver$get_text("#teal-teal_modules-active_tab > li.active > a"), "Association" ) - encoding_dataset <- app_driver$get_text("#teal-main_ui-root-association .help-block") + encoding_dataset <- app_driver$get_text("#teal-teal_modules-association .help-block") testthat::expect_match(encoding_dataset, "Dataset:[\n ]*CO2", all = FALSE) app_driver$stop() diff --git a/tests/testthat/test-shinytest2-tm_g_scatterplotmatrix.R b/tests/testthat/test-shinytest2-tm_g_scatterplotmatrix.R index 1f1b6e7e9..429e67b41 100644 --- a/tests/testthat/test-shinytest2-tm_g_scatterplotmatrix.R +++ b/tests/testthat/test-shinytest2-tm_g_scatterplotmatrix.R @@ -51,11 +51,11 @@ test_that("e2e - tm_g_scatterplotmatrix: Initializes without errors", { app_driver$expect_no_shiny_error() testthat::expect_equal( - app_driver$get_text("#teal-main_ui-root-active_tab > li.active > a"), + app_driver$get_text("#teal-teal_modules-active_tab > li.active > a"), "Scatterplot matrix" ) - encoding_dataset <- app_driver$get_text("#teal-main_ui-root-scatterplot_matrix .help-block") + encoding_dataset <- app_driver$get_text("#teal-teal_modules-scatterplot_matrix .help-block") testthat::expect_match(encoding_dataset, "Datasets.*ADSL.*ADRS", all = FALSE) app_driver$stop() diff --git a/tests/testthat/test-shinytest2-tm_misssing_data.R b/tests/testthat/test-shinytest2-tm_misssing_data.R index b0ac9a212..af35629ab 100644 --- a/tests/testthat/test-shinytest2-tm_misssing_data.R +++ b/tests/testthat/test-shinytest2-tm_misssing_data.R @@ -42,7 +42,7 @@ test_that("e2e - tm_missing_data: Initializes without errors", { app_driver$expect_no_shiny_error() testthat::expect_equal( - app_driver$get_text("#teal-main_ui-root-active_tab > li.active > a"), + app_driver$get_text("#teal-teal_modules-active_tab > li.active > a"), "Missing data" ) diff --git a/tests/testthat/test-shinytest2-tm_outliers.R b/tests/testthat/test-shinytest2-tm_outliers.R index a846c2a8b..33141e7ad 100644 --- a/tests/testthat/test-shinytest2-tm_outliers.R +++ b/tests/testthat/test-shinytest2-tm_outliers.R @@ -56,11 +56,11 @@ testthat::test_that("e2e - tm_outliers: Data parameter and module label is passe app_driver$expect_no_shiny_error() testthat::expect_equal( - app_driver$get_text("#teal-main_ui-root-active_tab > li.active > a"), + app_driver$get_text("#teal-teal_modules-active_tab > li.active > a"), "Outliers Module" ) - encoding_dataset <- app_driver$get_text("#teal-main_ui-root-outliers_module .help-block") + encoding_dataset <- app_driver$get_text("#teal-teal_modules-outliers_module .help-block") testthat::expect_match(encoding_dataset, "Dataset:[\n ]*CO2", all = FALSE) testthat::expect_match(encoding_dataset, "Outlier data points", all = FALSE) diff --git a/tests/testthat/test-shinytest2-tm_t_crosstable.R b/tests/testthat/test-shinytest2-tm_t_crosstable.R index ff47b2ed7..8c55b365d 100644 --- a/tests/testthat/test-shinytest2-tm_t_crosstable.R +++ b/tests/testthat/test-shinytest2-tm_t_crosstable.R @@ -50,11 +50,11 @@ test_that("e2e - tm_t_crosstable: Initializes without errors", { app_driver$expect_no_shiny_error() testthat::expect_equal( - app_driver$get_text("#teal-main_ui-root-active_tab > li.active > a"), + app_driver$get_text("#teal-teal_modules-active_tab > li.active > a"), "Cross Table" ) - encoding_dataset <- app_driver$get_text("#teal-main_ui-root-cross_table .help-block") + encoding_dataset <- app_driver$get_text("#teal-teal_modules-cross_table .help-block") testthat::expect_match(encoding_dataset, "Dataset:\\n *ADSL\\n", all = FALSE) app_driver$stop() diff --git a/tests/testthat/test-shinytest2-tm_variable_browser.R b/tests/testthat/test-shinytest2-tm_variable_browser.R index a81aa2acb..854f1352d 100644 --- a/tests/testthat/test-shinytest2-tm_variable_browser.R +++ b/tests/testthat/test-shinytest2-tm_variable_browser.R @@ -35,7 +35,7 @@ testthat::test_that("e2e - tm_variable_browser: content is displayed correctly." # Test tab name testthat::expect_equal( - trimws(app_driver$get_text("#teal-main_ui-root-active_tab > li.active")), + trimws(app_driver$get_text("#teal-teal_modules-active_tab > li.active")), "Variable browser (e2e)" ) From 5ac52a5575b236a4c0e8bd7200fadcdbb1fd7d0c Mon Sep 17 00:00:00 2001 From: averissimo Date: Wed, 14 Aug 2024 14:32:55 +0000 Subject: [PATCH 04/32] [skip actions] Bump version to 0.3.0.9040 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2b0ce79d8..241ddf308 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9039 -Date: 2024-08-06 +Version: 0.3.0.9040 +Date: 2024-08-14 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 4d52780ad..d5620160f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9039 +# teal.modules.general 0.3.0.9040 * Removed `Show Warnings` modals from modules. From 509705809831014cbdca68f4548b50da6039d27c Mon Sep 17 00:00:00 2001 From: walkowif <59475134+walkowif@users.noreply.github.com> Date: Mon, 19 Aug 2024 09:06:39 +0200 Subject: [PATCH 05/32] Workflow propagations (#767) Signed-off-by: walkowif <59475134+walkowif@users.noreply.github.com> Co-authored-by: 27856297+dependabot-preview[bot]@users.noreply.github.com <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Pawel Rucki <12943682+pawelru@users.noreply.github.com> --- .github/workflows/check.yaml | 6 ++---- .github/workflows/docs.yaml | 1 + .github/workflows/on-demand.yaml | 12 ------------ .github/workflows/release.yaml | 4 ++++ .github/workflows/scheduled.yaml | 16 ++++++++++++++++ _pkgdown.yml | 2 ++ 6 files changed, 25 insertions(+), 16 deletions(-) delete mode 100644 .github/workflows/on-demand.yaml diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 4bce0c86d..a3dc3dfed 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -51,12 +51,10 @@ jobs: additional-env-vars: | _R_CHECK_EXAMPLE_TIMING_THRESHOLD_=11 TESTING_DEPTH=5 + NOT_CRAN=true enforce-note-blocklist: true - publish-unit-test-report-gh-pages: false - junit-xml-comparison: false concurrency-group: non-cran - disable-unit-test-reports: true - skip-r-cmd-install: true + unit-test-report-directory: unit-test-report-non-cran note-blocklist: | checking dependencies in R code .* NOTE checking R code for possible problems .* NOTE diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 9b7a7e54e..57ae80042 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -41,3 +41,4 @@ jobs: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} with: default-landing-page: latest-tag + additional-unit-test-report-directories: unit-test-report-non-cran diff --git a/.github/workflows/on-demand.yaml b/.github/workflows/on-demand.yaml deleted file mode 100644 index 02843bb32..000000000 --- a/.github/workflows/on-demand.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -name: On-demand 🧑‍🔬 - -on: - schedule: - - cron: '45 3 * * 0' - workflow_dispatch: - -jobs: - revdepcheck: - name: revdepcheck ↩️ - uses: insightsengineering/r.pkg.template/.github/workflows/revdepcheck.yaml@main diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 226473ce9..e56418bb8 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -52,3 +52,7 @@ jobs: uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} + wasm: + name: Build WASM packages 🧑‍🏭 + needs: release + uses: insightsengineering/r.pkg.template/.github/workflows/wasm.yaml@main diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index f2ddf6862..73e3ce868 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -26,3 +26,19 @@ jobs: uses: insightsengineering/r.pkg.template/.github/workflows/branch-cleanup.yaml@main secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} + revdepcheck: + name: revdepcheck ↩️ + uses: insightsengineering/r.pkg.template/.github/workflows/revdepcheck.yaml@main + rhub: + name: R-hub 🌐 + uses: insightsengineering/r.pkg.template/.github/workflows/rhub.yaml@main + with: + lookup-refs: | + insightsengineering/teal.transform + insightsengineering/teal.code + insightsengineering/teal.data + insightsengineering/teal.logger + insightsengineering/teal.reporter + insightsengineering/teal.widgets + insightsengineering/tern + insightsengineering/rtables diff --git a/_pkgdown.yml b/_pkgdown.yml index ec36b1c74..d8d697150 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -15,6 +15,8 @@ navbar: href: coverage-report/ - text: Unit test report href: unit-test-report/ + - text: Non-CRAN unit test report + href: unit-test-report-non-cran/ github: icon: fa-github href: https://github.com/insightsengineering/teal.modules.general From 45eaf8f9cd04b1c420f08eac8789b5bd6c8d50db Mon Sep 17 00:00:00 2001 From: walkowif Date: Mon, 19 Aug 2024 07:07:34 +0000 Subject: [PATCH 06/32] [skip actions] Bump version to 0.3.0.9041 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 241ddf308..c8ee22835 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9040 -Date: 2024-08-14 +Version: 0.3.0.9041 +Date: 2024-08-19 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index d5620160f..a19867933 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9040 +# teal.modules.general 0.3.0.9041 * Removed `Show Warnings` modals from modules. From ee0c6dbfcd8af88215120a219546ebfcd00dc19c Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:54:01 +0200 Subject: [PATCH 07/32] update readme (#777) - remove r-universe from install instructions for simplicity - remove r-universe link - this fixes url-checker - add reference to the introduction article --- README.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index ef66a1ece..56a13a866 100644 --- a/README.md +++ b/README.md @@ -41,26 +41,19 @@ Please see [`teal` gallery](https://github.com/insightsengineering/teal.gallery) ## Installation ```r -# stable versions install.packages('teal.modules.general') - -# install.packages("pak") -pak::pak("insightsengineering/teal.modules.general@*release") ``` -Alternatively, you might want to use the development version available on [r-universe](https://r-universe.dev/). +Alternatively, you might want to use the development version. ```r -# beta versions -install.packages('teal.modules.general', repos = c('https://pharmaverse.r-universe.dev', getOption('repos'))) - # install.packages("pak") pak::pak("insightsengineering/teal.modules.general") ``` ## Usage -See package vignettes `browseVignettes(package = "teal.modules.general")` for usage of this package or visit [Package Website](https://insightsengineering.github.io/teal.modules.general/latest-tag/). +To understand how to use this package, please refer to the [Getting Started](https://insightsengineering.github.io/teal.modules.general/latest-tag/articles/teal-modules-general.html) article, which provides multiple examples of code implementation. ## Getting help From 7026ce272feac76ab34a752918ed356e8f73e624 Mon Sep 17 00:00:00 2001 From: pawelru Date: Wed, 28 Aug 2024 13:55:03 +0000 Subject: [PATCH 08/32] [skip actions] Bump version to 0.3.0.9042 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index c8ee22835..6eb16af8a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9041 -Date: 2024-08-19 +Version: 0.3.0.9042 +Date: 2024-08-28 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index a19867933..b8e7a20f5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9041 +# teal.modules.general 0.3.0.9042 * Removed `Show Warnings` modals from modules. From 1f93830493eb8f160c4a1b5a481bb625b1841609 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Tue, 10 Sep 2024 18:45:57 +0200 Subject: [PATCH 09/32] Update DESCRIPTION (#776) - be in line with whats in suggests - cran type of reference is redundant Signed-off-by: Pawel Rucki <12943682+pawelru@users.noreply.github.com> --- DESCRIPTION | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6eb16af8a..b7026f534 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -90,10 +90,10 @@ Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2, insightsengineering/tern, tidyverse/tibble, tidyverse/tidyr, tidymodels/broom, daattali/colourpicker, daattali/ggExtra, aphalo/ggpmisc, aphalo/ggpp, slowkow/ggrepel, baddstats/goftest, - gridExtra, ramnathv/htmlwidgets, jeroen/jsonlite, yihui/knitr, - daroczig/logger, deepayan/lattice, MASS, - insightsengineering/nestcolor, r-lib/rlang, rstudio/rmarkdown, - insightsengineering/rtables, tidyverse/rvest, sparkline, + ramnathv/htmlwidgets, jeroen/jsonlite, yihui/knitr, + daroczig/logger, deepayan/lattice, + insightsengineering/nestcolor, r-lib/pkgload, r-lib/rlang, rstudio/rmarkdown, + insightsengineering/rtables, tidyverse/rvest, htmlwidgets/sparkline, rstudio/shinytest2, r-lib/testthat, r-lib/withr Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 From c3ca9622bde42b79b025d1840f36fcf3199d4fb5 Mon Sep 17 00:00:00 2001 From: pawelru Date: Tue, 10 Sep 2024 16:46:54 +0000 Subject: [PATCH 10/32] [skip actions] Bump version to 0.3.0.9043 --- DESCRIPTION | 14 +++++++------- NEWS.md | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b7026f534..35bcb17ff 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9042 -Date: 2024-08-28 +Version: 0.3.0.9043 +Date: 2024-09-10 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), @@ -90,11 +90,11 @@ Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2, insightsengineering/tern, tidyverse/tibble, tidyverse/tidyr, tidymodels/broom, daattali/colourpicker, daattali/ggExtra, aphalo/ggpmisc, aphalo/ggpp, slowkow/ggrepel, baddstats/goftest, - ramnathv/htmlwidgets, jeroen/jsonlite, yihui/knitr, - daroczig/logger, deepayan/lattice, - insightsengineering/nestcolor, r-lib/pkgload, r-lib/rlang, rstudio/rmarkdown, - insightsengineering/rtables, tidyverse/rvest, htmlwidgets/sparkline, - rstudio/shinytest2, r-lib/testthat, r-lib/withr + ramnathv/htmlwidgets, jeroen/jsonlite, yihui/knitr, daroczig/logger, + deepayan/lattice, insightsengineering/nestcolor, r-lib/pkgload, + r-lib/rlang, rstudio/rmarkdown, insightsengineering/rtables, + tidyverse/rvest, htmlwidgets/sparkline, rstudio/shinytest2, + r-lib/testthat, r-lib/withr Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 Language: en-US diff --git a/NEWS.md b/NEWS.md index b8e7a20f5..d2edfb2f9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9042 +# teal.modules.general 0.3.0.9043 * Removed `Show Warnings` modals from modules. From 022a92ad71b5c3f2fe2f8a00936a4e6bd7d8dcf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ka=C5=82=C4=99dkowski?= <6959016+gogonzo@users.noreply.github.com> Date: Wed, 11 Sep 2024 22:58:38 +0200 Subject: [PATCH 11/32] @datanames ignored (#782) Fix after https://github.com/insightsengineering/teal/pull/1334 --- tests/testthat/test-shinytest2-tm_variable_browser.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testthat/test-shinytest2-tm_variable_browser.R b/tests/testthat/test-shinytest2-tm_variable_browser.R index 854f1352d..abf5680f8 100644 --- a/tests/testthat/test-shinytest2-tm_variable_browser.R +++ b/tests/testthat/test-shinytest2-tm_variable_browser.R @@ -10,18 +10,18 @@ app_driver_tm_variable_browser <- function() { CO2 <- CO2 # nolint: object_name. } ) - teal.data::datanames(data) <- c("iris", "mtcars", "women", "faithful", "CO2") init_teal_app_driver( data = data, modules = tm_variable_browser( label = "Variable browser (e2e)", + datasets_selected = c("iris", "mtcars", "women", "faithful", "CO2"), parent_dataname = "CO2", ggplot2_args = teal.widgets::ggplot2_args( labs = list(subtitle = "Plot generated by Variable Browser Module") ), pre_output = shiny::tags$div("A pre-output message for tm_variable_browser"), - post_output = shiny::tags$div("A post-output message for tm_variable_browser"), + post_output = shiny::tags$div("A post-output message for tm_variable_browser") ) ) } From b2336e4b54202ca85e361906551ada3e40d2f338 Mon Sep 17 00:00:00 2001 From: donyunardi Date: Wed, 11 Sep 2024 20:59:31 +0000 Subject: [PATCH 12/32] [skip actions] Bump version to 0.3.0.9044 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 35bcb17ff..d6041f6d1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9043 -Date: 2024-09-10 +Version: 0.3.0.9044 +Date: 2024-09-11 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index d2edfb2f9..5db3ac959 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9043 +# teal.modules.general 0.3.0.9044 * Removed `Show Warnings` modals from modules. From c7f8ab9855b53479f1176e5dc1105f224befd6ca Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Thu, 12 Sep 2024 01:45:28 +0200 Subject: [PATCH 13/32] Update scheduled.yaml (#781) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Part of https://github.com/insightsengineering/teal.modules.general/issues/771 https://github.com/insightsengineering/teal.modules.general/actions/runs/10650763277/job/29522527240 ``` ✖ Package teal not found in the `insightsengineering/teal.transform`, `insightsengineering/teal.code`, `insightsengineering/teal.data`, `insightsengineering/teal.logger`, `insightsengineering/teal.reporter`, `insightsengineering/teal.widgets`, `insightsengineering/tern`, and `insightsengineering/rtables` list. Exiting. ``` Signed-off-by: Pawel Rucki <12943682+pawelru@users.noreply.github.com> --- .github/workflows/scheduled.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index 73e3ce868..86b8582d9 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -34,6 +34,7 @@ jobs: uses: insightsengineering/r.pkg.template/.github/workflows/rhub.yaml@main with: lookup-refs: | + insightsengineering/teal insightsengineering/teal.transform insightsengineering/teal.code insightsengineering/teal.data From f940d8e856ecaa013a755ef6681c459241ddc483 Mon Sep 17 00:00:00 2001 From: pawelru Date: Wed, 11 Sep 2024 23:46:24 +0000 Subject: [PATCH 14/32] [skip actions] Bump version to 0.3.0.9045 --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d6041f6d1..f9a0819ae 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9044 +Version: 0.3.0.9045 Date: 2024-09-11 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), diff --git a/NEWS.md b/NEWS.md index 5db3ac959..3cf1ded85 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9044 +# teal.modules.general 0.3.0.9045 * Removed `Show Warnings` modals from modules. From de466acc0d7919cf65bf95ec14572f0fe3a6df03 Mon Sep 17 00:00:00 2001 From: saerobson <86623301+saerobson@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:11:09 +0100 Subject: [PATCH 15/32] Update tm_g_distribution.R (#766) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: saerobson <86623301+saerobson@users.noreply.github.com> Co-authored-by: Dony Unardi Co-authored-by: Dawid Kałędkowski <6959016+gogonzo@users.noreply.github.com> --- R/tm_g_distribution.R | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/R/tm_g_distribution.R b/R/tm_g_distribution.R index 390ab4c88..1361e3504 100644 --- a/R/tm_g_distribution.R +++ b/R/tm_g_distribution.R @@ -510,11 +510,8 @@ srv_distribution <- function(id, selector_list()$dist_i()$select ), handlerExpr = { - req(input$params_reset) params <- if (length(input$t_dist) != 0) { - dist_var2 <- as.vector(merged$anl_input_r()$columns_source$dist_i) - get_dist_params <- function(x, dist) { if (dist == "unif") { return(stats::setNames(range(x, na.rm = TRUE), c("min", "max"))) @@ -525,8 +522,8 @@ srv_distribution <- function(id, ) } - ANL <- merged$anl_q_r()[[as.character(dist_var[[1]]$dataname)]] - round(get_dist_params(as.numeric(stats::na.omit(ANL[[dist_var2]])), input$t_dist), 2) + ANL <- merged$anl_q_r()[["ANL"]] + round(get_dist_params(as.numeric(stats::na.omit(ANL[[merge_vars()$dist_var]])), input$t_dist), 2) } else { c("param1" = NA_real_, "param2" = NA_real_) } From 652712875109376b05dfd2709c06c3508aa675c8 Mon Sep 17 00:00:00 2001 From: gogonzo Date: Thu, 12 Sep 2024 15:12:07 +0000 Subject: [PATCH 16/32] [skip actions] Bump version to 0.3.0.9046 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index f9a0819ae..c41a9720c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9045 -Date: 2024-09-11 +Version: 0.3.0.9046 +Date: 2024-09-12 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 3cf1ded85..25855828a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9045 +# teal.modules.general 0.3.0.9046 * Removed `Show Warnings` modals from modules. From 2327679278558a2edc6525f5186e9b91978861d3 Mon Sep 17 00:00:00 2001 From: Shunya <109354956+PritDash@users.noreply.github.com> Date: Thu, 12 Sep 2024 20:28:37 -0600 Subject: [PATCH 17/32] added checks to resolve issue with the outlier function (#778) Fixes #768 --- R/tm_outliers.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/tm_outliers.R b/R/tm_outliers.R index 7f30b897a..db3ce782d 100644 --- a/R/tm_outliers.R +++ b/R/tm_outliers.R @@ -964,7 +964,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var, substitute( expr = { columns_index <- union( - setdiff(names(ANL_OUTLIER), "is_outlier_selected"), + setdiff(names(ANL_OUTLIER), c("is_outlier_selected", "order")), table_columns ) ANL_OUTLIER_EXTENDED[ANL_OUTLIER_EXTENDED$is_outlier_selected, columns_index] From 18e6655a795e9b78bdb9307c96dca33897047b66 Mon Sep 17 00:00:00 2001 From: donyunardi Date: Fri, 13 Sep 2024 02:29:30 +0000 Subject: [PATCH 18/32] [skip actions] Bump version to 0.3.0.9047 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index c41a9720c..cda7b0fc7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9046 -Date: 2024-09-12 +Version: 0.3.0.9047 +Date: 2024-09-13 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 25855828a..514310dbe 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9046 +# teal.modules.general 0.3.0.9047 * Removed `Show Warnings` modals from modules. From 020440401275ab95c9320bb3b4fcbfbe3804715c Mon Sep 17 00:00:00 2001 From: walkowif <59475134+walkowif@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:29:18 +0200 Subject: [PATCH 19/32] Workflow propagations (#780) --- .github/workflows/check.yaml | 3 +++ .github/workflows/release.yaml | 3 +++ .github/workflows/scheduled.yaml | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index a3dc3dfed..e7b7ebc6b 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -69,6 +69,9 @@ jobs: uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} + with: + additional-env-vars: | + NOT_CRAN=true linter: if: github.event_name != 'push' name: SuperLinter 🦸‍♀️ diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e56418bb8..aa3e7bb45 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -52,6 +52,9 @@ jobs: uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} + with: + additional-env-vars: | + NOT_CRAN=true wasm: name: Build WASM packages 🧑‍🏭 needs: release diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index 86b8582d9..a73b25644 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -5,9 +5,26 @@ on: schedule: - cron: '45 3 * * 0' workflow_dispatch: + inputs: + chosen-workflow: + description: | + Select which workflow you'd like to run + required: true + type: choice + default: rhub + options: + - rhub + - dependency-test + - branch-cleanup + - revdepcheck jobs: dependency-test: + if: > + github.event_name == 'schedule' || ( + github.event_name == 'workflow_dispatch' && + inputs.chosen-workflow == 'dependency-test' + ) strategy: fail-fast: false matrix: @@ -22,14 +39,29 @@ jobs: additional-env-vars: | PKG_SYSREQS_DRY_RUN=true branch-cleanup: + if: > + github.event_name == 'schedule' || ( + github.event_name == 'workflow_dispatch' && + inputs.chosen-workflow == 'branch-cleanup' + ) name: Branch Cleanup 🧹 uses: insightsengineering/r.pkg.template/.github/workflows/branch-cleanup.yaml@main secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} revdepcheck: + if: > + github.event_name == 'schedule' || ( + github.event_name == 'workflow_dispatch' && + inputs.chosen-workflow == 'revdepcheck' + ) name: revdepcheck ↩️ uses: insightsengineering/r.pkg.template/.github/workflows/revdepcheck.yaml@main rhub: + if: > + github.event_name == 'schedule' || ( + github.event_name == 'workflow_dispatch' && + inputs.chosen-workflow == 'rhub' + ) name: R-hub 🌐 uses: insightsengineering/r.pkg.template/.github/workflows/rhub.yaml@main with: From 2d73acd4e0dc7af0f5dd206970575febbf5c217e Mon Sep 17 00:00:00 2001 From: walkowif Date: Mon, 16 Sep 2024 14:30:14 +0000 Subject: [PATCH 20/32] [skip actions] Bump version to 0.3.0.9048 --- .pre-commit-config.yaml | 2 +- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 347dffa0a..7dd8e86f4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ default_language_version: python: python3 repos: - repo: https://github.com/lorenzwalthert/precommit - rev: v0.4.3 + rev: v0.4.3.9001 hooks: - id: style-files name: Style code with `styler` diff --git a/DESCRIPTION b/DESCRIPTION index cda7b0fc7..bf40fcb9f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9047 -Date: 2024-09-13 +Version: 0.3.0.9048 +Date: 2024-09-16 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 514310dbe..b424fe8b4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9047 +# teal.modules.general 0.3.0.9048 * Removed `Show Warnings` modals from modules. From b61d9442975c3d3446785c3f36ff0a8fb8b88ded Mon Sep 17 00:00:00 2001 From: Alvaro Sanchez <71273913+svalvaro@users.noreply.github.com> Date: Tue, 17 Sep 2024 13:49:37 +0200 Subject: [PATCH 21/32] Fixes missing imports (#784) # Pull Request Fixes #783 There were a few missing imports that made the package unusable if we want to load functions with `box`. --- R/tm_variable_browser.R | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/R/tm_variable_browser.R b/R/tm_variable_browser.R index 626822d3d..c4b7ae6c8 100644 --- a/R/tm_variable_browser.R +++ b/R/tm_variable_browser.R @@ -907,9 +907,9 @@ render_tab_header <- function(dataset_name, output, data) { dataset_ui_id <- paste0("dataset_summary_", dataset_name) output[[dataset_ui_id]] <- renderText({ df <- data()[[dataset_name]] - join_keys <- join_keys(data()) + join_keys <- teal.data::join_keys(data()) if (!is.null(join_keys)) { - key <- join_keys(data())[dataset_name, dataset_name] + key <- teal.data::join_keys(data())[dataset_name, dataset_name] } else { key <- NULL } @@ -979,7 +979,7 @@ render_tab_table <- function(dataset_name, parent_dataname, output, data, input, # get icons proper for the data types icons <- vapply(df, function(x) class(x)[1L], character(1L)) - join_keys <- join_keys(data()) + join_keys <- teal.data::join_keys(data()) if (!is.null(join_keys)) { icons[intersect(join_keys[dataset_name, dataset_name], colnames(df))] <- "primary_key" } From 56dc3d600defd86ccea456ec349d9fee0aa73693 Mon Sep 17 00:00:00 2001 From: vedhav Date: Tue, 17 Sep 2024 11:50:35 +0000 Subject: [PATCH 22/32] [skip actions] Bump version to 0.3.0.9049 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index bf40fcb9f..aff6d9374 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9048 -Date: 2024-09-16 +Version: 0.3.0.9049 +Date: 2024-09-17 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index b424fe8b4..cdefc78f4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9048 +# teal.modules.general 0.3.0.9049 * Removed `Show Warnings` modals from modules. From 05aeb65d00f86a3b78b77afab0296e50e83ae575 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Tue, 1 Oct 2024 10:31:18 +0200 Subject: [PATCH 23/32] use roxy.shinylive (#775) test with https://github.com/insightsengineering/roxy.shinylive/pull/1 Implementation of `roxy.shinylive`. Please run `pkgdown::build_site()` to see the difference. ![image](https://github.com/user-attachments/assets/96283a55-5c2a-493f-a855-5ef17425ac34) Extra: - for a few examples: remove dependency on `teal.widgets` so that the example code is simpler - for a few examples: replace `@examples` with `@examplesIf`. This is for our incorrect implementation of soft dependencies - add a new "Playground" section in the README with links to the shinylive - include shinylive iframe in the vignettes --------- Signed-off-by: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Co-authored-by: 27856297+dependabot-preview[bot]@users.noreply.github.com <27856297+dependabot-preview[bot]@users.noreply.github.com> --- .gitignore | 2 ++ DESCRIPTION | 5 +-- R/tm_a_pca.R | 17 +++++----- R/tm_a_regression.R | 19 ++++++----- R/tm_data_table.R | 9 ++++++ R/tm_file_viewer.R | 4 +++ R/tm_front_page.R | 4 +++ R/tm_g_association.R | 17 +++++----- R/tm_g_bivariate.R | 18 +++++------ R/tm_g_distribution.R | 23 ++++++++------ R/tm_g_response.R | 19 ++++++----- R/tm_g_scatterplot.R | 23 ++++++++------ R/tm_g_scatterplotmatrix.R | 11 ++++++- R/tm_missing_data.R | 31 +++++++++--------- R/tm_outliers.R | 21 ++++++------ R/tm_t_crosstable.R | 21 ++++++------ R/tm_variable_browser.R | 38 ++++++++++++++-------- README.md | 7 ++++ inst/WORDLIST | 1 + man/tm_a_pca.Rd | 23 +++++++++----- man/tm_a_regression.Rd | 25 +++++++++------ man/tm_data_table.Rd | 15 +++++++++ man/tm_file_viewer.Rd | 10 ++++++ man/tm_front_page.Rd | 10 ++++++ man/tm_g_association.Rd | 23 +++++++++----- man/tm_g_bivariate.Rd | 24 ++++++++------ man/tm_g_distribution.Rd | 29 +++++++++++------ man/tm_g_response.Rd | 25 +++++++++------ man/tm_g_scatterplot.Rd | 29 +++++++++++------ man/tm_g_scatterplotmatrix.Rd | 21 ++++++++++-- man/tm_missing_data.Rd | 41 ++++++++++++++---------- man/tm_outliers.Rd | 27 +++++++++------- man/tm_t_crosstable.Rd | 31 +++++++++++------- man/tm_variable_browser.Rd | 44 ++++++++++++++++++-------- staged_dependencies.yaml | 3 ++ vignettes/teal-modules-general.Rmd | 31 ++++++++++++++---- vignettes/using-association-plot.Rmd | 26 ++++++++++++--- vignettes/using-bivariate-plot.Rmd | 26 ++++++++++++--- vignettes/using-cross-table.Rmd | 27 +++++++++++++--- vignettes/using-data-table.Rmd | 30 ++++++++++++++---- vignettes/using-outliers-module.Rmd | 30 ++++++++++++++---- vignettes/using-regression-plots.Rmd | 26 ++++++++++++--- vignettes/using-response-plot.Rmd | 26 ++++++++++++--- vignettes/using-scatterplot-matrix.Rmd | 27 +++++++++++++--- vignettes/using-scatterplot.Rmd | 35 ++++++++++++++------ 45 files changed, 663 insertions(+), 291 deletions(-) diff --git a/.gitignore b/.gitignore index fb00dbe32..1657ceda4 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ vignettes/*.R coverage.* tests/testthat/_snaps/**/*.new.md tests/testthat/_snaps/**/*.new.svg +/doc/ +/Meta/ diff --git a/DESCRIPTION b/DESCRIPTION index aff6d9374..8b91d2565 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -71,6 +71,7 @@ Suggests: pkgload, rlang (>= 1.0.0), rmarkdown (>= 2.23), + roxy.shinylive, rtables (>= 0.6.8), rvest, shinytest2, @@ -92,12 +93,12 @@ Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2, aphalo/ggpmisc, aphalo/ggpp, slowkow/ggrepel, baddstats/goftest, ramnathv/htmlwidgets, jeroen/jsonlite, yihui/knitr, daroczig/logger, deepayan/lattice, insightsengineering/nestcolor, r-lib/pkgload, - r-lib/rlang, rstudio/rmarkdown, insightsengineering/rtables, + r-lib/rlang, rstudio/rmarkdown, insightsengineering/roxy.shinylive, insightsengineering/rtables, tidyverse/rvest, htmlwidgets/sparkline, rstudio/shinytest2, r-lib/testthat, r-lib/withr Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 Language: en-US LazyData: true -Roxygen: list(markdown = TRUE) +Roxygen: list(markdown = TRUE, packages = c("roxy.shinylive")) RoxygenNote: 7.3.2 diff --git a/R/tm_a_pca.R b/R/tm_a_pca.R index b2c0a1a2e..53996ebb7 100644 --- a/R/tm_a_pca.R +++ b/R/tm_a_pca.R @@ -18,9 +18,11 @@ #' #' @inherit shared_params return #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} #' @examples -#' library(teal.widgets) -#' #' # general data example #' data <- teal_data() #' data <- within(data, { @@ -45,9 +47,6 @@ #' multiple = TRUE #' ), #' filter = NULL -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by PCA Module") #' ) #' ) #' ) @@ -56,6 +55,11 @@ #' shinyApp(app$ui, app$server) #' } #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +#' @examples #' # CDISC data example #' data <- teal_data() #' data <- within(data, { @@ -80,9 +84,6 @@ #' multiple = TRUE #' ), #' filter = NULL -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by PCA Module") #' ) #' ) #' ) diff --git a/R/tm_a_regression.R b/R/tm_a_regression.R index a941e5e20..89406f5e5 100644 --- a/R/tm_a_regression.R +++ b/R/tm_a_regression.R @@ -42,10 +42,12 @@ #' #' @inherit shared_params return #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} #' @examples #' # general data example -#' library(teal.widgets) -#' #' data <- teal_data() #' data <- within(data, { #' require(nestcolor) @@ -77,9 +79,6 @@ #' multiple = TRUE, #' fixed = FALSE #' ) -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by Regression Module") #' ) #' ) #' ) @@ -88,9 +87,12 @@ #' shinyApp(app$ui, app$server) #' } #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +#' @examples #' # CDISC data example -#' library(teal.widgets) -#' #' data <- teal_data() #' data <- within(data, { #' require(nestcolor) @@ -123,9 +125,6 @@ #' multiple = TRUE, #' fixed = FALSE #' ) -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by Regression Module") #' ) #' ) #' ) diff --git a/R/tm_data_table.R b/R/tm_data_table.R index 2d215f8c9..4a2be49d4 100644 --- a/R/tm_data_table.R +++ b/R/tm_data_table.R @@ -29,6 +29,10 @@ #' #' @inherit shared_params return #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} #' @examples #' # general data example #' data <- teal_data() @@ -53,6 +57,11 @@ #' shinyApp(app$ui, app$server) #' } #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +#' @examples #' # CDISC data example #' data <- teal_data() #' data <- within(data, { diff --git a/R/tm_file_viewer.R b/R/tm_file_viewer.R index 3b96185bb..772dfdac3 100644 --- a/R/tm_file_viewer.R +++ b/R/tm_file_viewer.R @@ -13,6 +13,10 @@ #' #' @inherit shared_params return #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} #' @examples #' data <- teal_data() #' data <- within(data, { diff --git a/R/tm_front_page.R b/R/tm_front_page.R index fbffb8769..7304eb90c 100644 --- a/R/tm_front_page.R +++ b/R/tm_front_page.R @@ -17,6 +17,10 @@ #' #' @inherit shared_params return #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} #' @examples #' data <- teal_data() #' data <- within(data, { diff --git a/R/tm_g_association.R b/R/tm_g_association.R index b0611490c..c3698f5d8 100644 --- a/R/tm_g_association.R +++ b/R/tm_g_association.R @@ -25,9 +25,11 @@ #' #' @inherit shared_params return #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} #' @examples -#' library(teal.widgets) -#' #' # general data example #' data <- teal_data() #' data <- within(data, { @@ -60,9 +62,6 @@ #' multiple = TRUE, #' fixed = FALSE #' ) -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by Association Module") #' ) #' ) #' ) @@ -71,6 +70,11 @@ #' shinyApp(app$ui, app$server) #' } #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +#' @examples #' # CDISC data example #' data <- teal_data() #' data <- within(data, { @@ -108,9 +112,6 @@ #' multiple = TRUE, #' fixed = FALSE #' ) -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by Association Module") #' ) #' ) #' ) diff --git a/R/tm_g_bivariate.R b/R/tm_g_bivariate.R index 807b4f23b..bf9358476 100644 --- a/R/tm_g_bivariate.R +++ b/R/tm_g_bivariate.R @@ -46,9 +46,11 @@ #' #' @inherit shared_params return #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} #' @examples -#' library(teal.widgets) -#' #' # general data example #' data <- teal_data() #' data <- within(data, { @@ -96,9 +98,6 @@ #' selected = "Treatment", #' fixed = FALSE #' ) -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by Bivariate Module") #' ) #' ) #' ) @@ -106,7 +105,11 @@ #' shinyApp(app$ui, app$server) #' } #' -#' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +#' @examples #' # CDISC data example #' data <- teal_data() #' data <- within(data, { @@ -155,9 +158,6 @@ #' selected = "COUNTRY", #' fixed = FALSE #' ) -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by Bivariate Module") #' ) #' ) #' ) diff --git a/R/tm_g_distribution.R b/R/tm_g_distribution.R index 1361e3504..6b6192678 100644 --- a/R/tm_g_distribution.R +++ b/R/tm_g_distribution.R @@ -27,9 +27,13 @@ #' #' @inherit shared_params return #' -#' @examples -#' library(teal.widgets) -#' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +# nolint start: line_length_linter. +#' @examplesIf require("ggpmisc", quietly = TRUE) && require("ggpp", quietly = TRUE) && require("goftest", quietly = TRUE) && require("MASS", quietly = TRUE) && require("broom", quietly = TRUE) +# nolint end: line_length_linter. #' # general data example #' data <- teal_data() #' data <- within(data, { @@ -44,9 +48,6 @@ #' dist_var = data_extract_spec( #' dataname = "iris", #' select = select_spec(variable_choices("iris"), "Petal.Length") -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by Distribution Module") #' ) #' ) #' ) @@ -55,6 +56,13 @@ #' shinyApp(app$ui, app$server) #' } #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +# nolint start: line_length_linter. +#' @examplesIf require("ggpmisc", quietly = TRUE) && require("ggpp", quietly = TRUE) && require("goftest", quietly = TRUE) && require("MASS", quietly = TRUE) && require("broom", quietly = TRUE) +# nolint end: line_length_linter. #' # CDISC data example #' data <- teal_data() #' data <- within(data, { @@ -94,9 +102,6 @@ #' vars = vars1, #' multiple = TRUE #' ) -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by Distribution Module") #' ) #' ) #' ) diff --git a/R/tm_g_response.R b/R/tm_g_response.R index 44daa300d..35ee6d36a 100644 --- a/R/tm_g_response.R +++ b/R/tm_g_response.R @@ -39,10 +39,12 @@ #' @note For more examples, please see the vignette "Using response plot" via #' `vignette("using-response-plot", package = "teal.modules.general")`. #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} #' @examples #' # general data example -#' library(teal.widgets) -#' #' data <- teal_data() #' data <- within(data, { #' require(nestcolor) @@ -77,9 +79,6 @@ #' multiple = FALSE, #' fixed = FALSE #' ) -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by Response Module") #' ) #' ) #' ) @@ -88,9 +87,12 @@ #' shinyApp(app$ui, app$server) #' } #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +#' @examples #' # CDISC data example -#' library(teal.widgets) -#' #' data <- teal_data() #' data <- within(data, { #' require(nestcolor) @@ -123,9 +125,6 @@ #' multiple = FALSE, #' fixed = FALSE #' ) -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by Response Module") #' ) #' ) #' ) diff --git a/R/tm_g_scatterplot.R b/R/tm_g_scatterplot.R index 066ee5506..d093a4fad 100644 --- a/R/tm_g_scatterplot.R +++ b/R/tm_g_scatterplot.R @@ -30,9 +30,13 @@ #' #' @inherit shared_params return #' -#' @examples -#' library(teal.widgets) -#' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +# nolint start: line_length_linter. +#' @examplesIf require("ggpmisc", quietly = TRUE) && require("ggExtra", quietly = TRUE) && require("colourpicker", quietly = TRUE) +# nolint end: line_length_linter. #' # general data example #' data <- teal_data() #' data <- within(data, { @@ -108,9 +112,6 @@ #' multiple = FALSE, #' fixed = FALSE #' ) -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by Scatterplot Module") #' ) #' ) #' ) @@ -119,6 +120,13 @@ #' shinyApp(app$ui, app$server) #' } #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +# nolint start: line_length_linter. +#' @examplesIf require("ggpmisc", quietly = TRUE) && require("ggExtra", quietly = TRUE) && require("colourpicker", quietly = TRUE) +# nolint end: line_length_linter. #' # CDISC data example #' data <- teal_data() #' data <- within(data, { @@ -195,9 +203,6 @@ #' multiple = FALSE, #' fixed = FALSE #' ) -#' ), -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by Scatterplot Module") #' ) #' ) #' ) diff --git a/R/tm_g_scatterplotmatrix.R b/R/tm_g_scatterplotmatrix.R index e8c7ce3b9..a570bf6bb 100644 --- a/R/tm_g_scatterplotmatrix.R +++ b/R/tm_g_scatterplotmatrix.R @@ -18,7 +18,11 @@ #' #' @inherit shared_params return #' -#' @examples +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +#' @examplesIf require("lattice", quietly = TRUE) #' # general data example #' data <- teal_data() #' data <- within(data, { @@ -102,6 +106,11 @@ #' shinyApp(app$ui, app$server) #' } #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +#' @examplesIf require("lattice", quietly = TRUE) #' # CDISC data example #' data <- teal_data() #' data <- within(data, { diff --git a/R/tm_missing_data.R b/R/tm_missing_data.R index 7af029e74..7f026cb49 100644 --- a/R/tm_missing_data.R +++ b/R/tm_missing_data.R @@ -17,19 +17,11 @@ #' #' @inherit shared_params return #' -#' @examples -#' library(teal.widgets) -#' -#' # module specification used in apps below -#' tm_missing_data_module <- tm_missing_data( -#' ggplot2_args = list( -#' "Combinations Hist" = ggplot2_args( -#' labs = list(subtitle = "Plot produced by Missing Data Module", caption = NULL) -#' ), -#' "Combinations Main" = ggplot2_args(labs = list(title = NULL)) -#' ) -#' ) -#' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +#' @examplesIf require("gridExtra", quietly = TRUE) && require("rlang", quietly = TRUE) #' # general example data #' data <- teal_data() #' data <- within(data, { @@ -52,12 +44,19 @@ #' #' app <- init( #' data = data, -#' modules = modules(tm_missing_data_module) +#' modules = modules( +#' tm_missing_data() +#' ) #' ) #' if (interactive()) { #' shinyApp(app$ui, app$server) #' } #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +#' @examplesIf require("gridExtra", quietly = TRUE) && require("rlang", quietly = TRUE) #' # CDISC example data #' data <- teal_data() #' data <- within(data, { @@ -70,7 +69,9 @@ #' #' app <- init( #' data = data, -#' modules = modules(tm_missing_data_module) +#' modules = modules( +#' tm_missing_data() +#' ) #' ) #' if (interactive()) { #' shinyApp(app$ui, app$server) diff --git a/R/tm_outliers.R b/R/tm_outliers.R index db3ce782d..03a43b18e 100644 --- a/R/tm_outliers.R +++ b/R/tm_outliers.R @@ -17,9 +17,11 @@ #' #' @inherit shared_params return #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} #' @examples -#' library(teal.widgets) -#' #' # general data example #' data <- teal_data() #' data <- within(data, { @@ -57,11 +59,6 @@ #' multiple = TRUE #' ) #' ) -#' ), -#' ggplot2_args = list( -#' ggplot2_args( -#' labs = list(subtitle = "Plot generated by Outliers Module") -#' ) #' ) #' ) #' ) @@ -70,6 +67,11 @@ #' shinyApp(app$ui, app$server) #' } #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +#' @examples #' # CDISC data example #' data <- teal_data() #' data <- within(data, { @@ -107,11 +109,6 @@ #' multiple = TRUE #' ) #' ) -#' ), -#' ggplot2_args = list( -#' ggplot2_args( -#' labs = list(subtitle = "Plot generated by Outliers Module") -#' ) #' ) #' ) #' ) diff --git a/R/tm_t_crosstable.R b/R/tm_t_crosstable.R index d4e3b4700..9e4e8e62c 100644 --- a/R/tm_t_crosstable.R +++ b/R/tm_t_crosstable.R @@ -25,10 +25,12 @@ #' #' @inherit shared_params return #' -#' @examples +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +#' @examplesIf require("rtables", quietly = TRUE) #' # general data example -#' library(teal.widgets) -#' #' data <- teal_data() #' data <- within(data, { #' mtcars <- mtcars @@ -65,9 +67,6 @@ #' multiple = FALSE, #' fixed = FALSE #' ) -#' ), -#' basic_table_args = basic_table_args( -#' subtitles = "Table generated by Crosstable Module" #' ) #' ) #' ) @@ -76,9 +75,12 @@ #' shinyApp(app$ui, app$server) #' } #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +#' @examplesIf require("rtables", quietly = TRUE) #' # CDISC data example -#' library(teal.widgets) -#' #' data <- teal_data() #' data <- within(data, { #' ADSL <- rADSL @@ -117,9 +119,6 @@ #' multiple = FALSE, #' fixed = FALSE #' ) -#' ), -#' basic_table_args = basic_table_args( -#' subtitles = "Table generated by Crosstable Module" #' ) #' ) #' ) diff --git a/R/tm_variable_browser.R b/R/tm_variable_browser.R index c4b7ae6c8..28e0c11d1 100644 --- a/R/tm_variable_browser.R +++ b/R/tm_variable_browser.R @@ -21,17 +21,13 @@ #' #' @inherit shared_params return #' -#' @examples -#' library(teal.widgets) -#' -#' # Module specification used in apps below -#' tm_variable_browser_module <- tm_variable_browser( -#' label = "Variable browser", -#' ggplot2_args = ggplot2_args( -#' labs = list(subtitle = "Plot generated by Variable Browser Module") -#' ) -#' ) -#' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +# nolint start: line_length_linter. +#' @examplesIf require("sparkline", quietly = TRUE) && require("htmlwidgets", quietly = TRUE) && require("jsonlite", quietly = TRUE) +# nolint end: line_length_linter. #' # general data example #' data <- teal_data() #' data <- within(data, { @@ -45,13 +41,25 @@ #' #' app <- init( #' data = data, -#' modules = modules(tm_variable_browser_module) +#' modules = modules( +#' tm_variable_browser( +#' label = "Variable browser" +#' ) +#' ) #' ) #' if (interactive()) { #' shinyApp(app$ui, app$server) #' } #' +#' @examplesShinylive +#' library(teal.modules.general) +#' interactive <- function() TRUE +#' {{ next_example }} +# nolint start: line_length_linter. +#' @examplesIf require("sparkline", quietly = TRUE) && require("htmlwidgets", quietly = TRUE) && require("jsonlite", quietly = TRUE) +# nolint end: line_length_linter. #' # CDISC example data +#' library(sparkline) #' data <- teal_data() #' data <- within(data, { #' ADSL <- rADSL @@ -62,7 +70,11 @@ #' #' app <- init( #' data = data, -#' modules = modules(tm_variable_browser_module) +#' modules = modules( +#' tm_variable_browser( +#' label = "Variable browser" +#' ) +#' ) #' ) #' if (interactive()) { #' shinyApp(app$ui, app$server) diff --git a/README.md b/README.md index 56a13a866..b60732686 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,13 @@ pak::pak("insightsengineering/teal.modules.general") To understand how to use this package, please refer to the [Getting Started](https://insightsengineering.github.io/teal.modules.general/latest-tag/articles/teal-modules-general.html) article, which provides multiple examples of code implementation. +## Playground + +You can try out the package without installing it in the Shinylive: + +* [stable](https://shinylive.io/r/editor/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCGAC+AXSA) +* [development](https://shinylive.io/r/editor/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMI1UgSxIGcAKAdzgCMAnAfVQGsA5jy5xURRgAIAvJILMAOmC4BaAK4Q6ANzhdGcJTMlKAFqVKpGiAPTXUJqFxhQdeuBlUbtu-RgAmcFpKuJKCcKQA8rQMEIpg7Nx8QiJiEkoAlJkKEAA2dNyOAJ7M5FA5GDBEfmo5cIwYYRC6ZenZYAC+ALpAA) + ## Getting help If you encounter a bug or have a feature request, please file an issue. For questions, discussions, and staying up to date, please use the `teal` channel in the [`pharmaverse` slack workspace](https://pharmaverse.slack.com). diff --git a/inst/WORDLIST b/inst/WORDLIST index e77494d7b..d00a0162f 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -1,6 +1,7 @@ Forkers Hoffmann Prebuilt +Shinylive TLG UI customizable diff --git a/man/tm_a_pca.Rd b/man/tm_a_pca.Rd index a4fa1e679..0c3613ac4 100644 --- a/man/tm_a_pca.Rd +++ b/man/tm_a_pca.Rd @@ -83,8 +83,6 @@ Additionally, it enables dynamic customization of plot aesthetics, such as opaci font size, through UI inputs. } \examples{ -library(teal.widgets) - # general data example data <- teal_data() data <- within(data, { @@ -109,9 +107,6 @@ app <- init( multiple = TRUE ), filter = NULL - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by PCA Module") ) ) ) @@ -144,9 +139,6 @@ app <- init( multiple = TRUE ), filter = NULL - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by PCA Module") ) ) ) @@ -156,3 +148,18 @@ if (interactive()) { } } +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlY4AygCCjNUtonG6fYPDpKJKAL5d6UHQ8KLFGbZZCmATQ2LTW27Q6GMqeewV-hm6ALyXQbgXfEIio7dPwmLn3ZW6pDCJUESqAIqQuP10WwACgBhfpbB7fcExG53QFhUjMDSJUSoOAEL7gpEZZZ6W5bHZTGZ4MGE0RwEQaFF0hmkbG4-E0wm6Aj5Ii0AhiFFaFi0KD0ESJHl8gWrTlc1EolLAYDkga7EZbAC6mtKHLAAFlBIx+DJ4RCwP1RKIoMJSGbyYx6FAIJCiKh7WAsGg4FsuvKfnIEf7Ksy8eR+Ci9Ybjaa8ObLdbbb6g8GYLbaJFSfYnK5EYTA3LKiZaNRyIwUQA5RwAGWrcr9AYuXS6tBMunYKjL6k0OhstnK31EhQgrH66HYaFQABJ6qVJ1O6YwdJ05kowLNNUA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } + \item{example-2}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+zOh4UQrc23yFMCnRjaUAKyIVNIBrOFZlzLXjfjgTKGFSNIJ+WlECNP3Dk7PgBdgxFfCcgAum5oOgJipiuxaiFcroALyw8K4GF8IQiUQI3Ro4T-GF1UgwNJQNKoAhZfF1XQbAAKXkGGxRAypdUSWMyaWipGYGjSolQcAI0OZLNZuUWekRGy2jMpLNEcBEGixCqVD35guFotFBBKBwIYixWhYtCg9BEjz1tANyzl2qREURmWAwGlI22YCBQKqQo2ACEALJYADSWAAjIzqZsAOKuPBR5wAeQCPgAmht+vaqXImVm6qrBeR+FjfWBAyHw5HpbGM7m8zB7rQ4pL7E5XCLRTm7XUTLRqORGFiAHKOUbbDt1TPZmH9fq0Ey6dgqAfqTQ6Gy2GrM0RlCCsQbodhoVAAEhaVWPJ4VjB0fVmSjAMyBQA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } +} +} + diff --git a/man/tm_a_regression.Rd b/man/tm_a_regression.Rd index dc4f458f3..40a1679c0 100644 --- a/man/tm_a_regression.Rd +++ b/man/tm_a_regression.Rd @@ -112,8 +112,6 @@ For more examples, please see the vignette "Using regression plots" via } \examples{ # general data example -library(teal.widgets) - data <- teal_data() data <- within(data, { require(nestcolor) @@ -145,9 +143,6 @@ app <- init( multiple = TRUE, fixed = FALSE ) - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by Regression Module") ) ) ) @@ -157,8 +152,6 @@ if (interactive()) { } # CDISC data example -library(teal.widgets) - data <- teal_data() data <- within(data, { require(nestcolor) @@ -191,9 +184,6 @@ app <- init( multiple = TRUE, fixed = FALSE ) - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by Regression Module") ) ) ) @@ -203,3 +193,18 @@ if (interactive()) { } } +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlQDCAPIATHG6-QNKAL5dKdDwosUZtlkE7Apgo6tdSmiowyp5K93+GboAvEdBuBW6fEIioqfXAsJiB5WVpDCJUInVEtWioisEFeb0q1Cg9DgfjOqywcD+YkBJFWl0OoP+qBIoj0ZxSiTCpGYGkSolQcGWV1BlWmsBxulW6zwlKp2JEGgerPJpBJZIpaKpYIhUIeqwAylCubotCxaBCRIgUcyBQR8kRaAQxCKwIJUEEANZwRX8gWcjRwfhanX6w1M41UmDCTSROkAMQAggAZUXOVEC0EmWihc0PBwuJVvLoCuS+qm-f6iDoPPEEonc0nkkECmnwLWMmMmiXss6mtO8zN+8GQ6H0sDitmkKUyuViBW2v1vFVqjX3M7Sxiy+giRKd9UvFLAYAMwarAC6M9KFMIJAIKJrdmqgXgZA20fDoJLwZhS4sRvblQd1CdIhDTh9e7eAaDFrO7q9rjtlUjVK-n6uXS6tAmLo7AqOQqbaHANi2OUhyiIUECsG66DsNsAAk9SlGh2KMDonQTEoYDjDOQA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } + \item{example-2}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+zOh4UQrc23yFMCnRjaUAKyIVNIBrOFZlzLXjfjgTKGFSNIJ+WlECNP3Dk7PgBdgxFfCcgAum5oOgJipiuxaiFcroALyw8K4GF8IQiUQI3Ro4T-GF1UgwNJQNINCQNUSiKwQaEDOr06hQehwahYjZYODksRUkgbFF0+n1MSoEiiPSIzJpaKkZgaNKiVBwAi0wWC37wNmbEbbPD41VikQaLEGpUPBVKlWqwWM5msxEbAIs026LQsWhMkSIPl6q0EEoHAhiTUAIQAslgANJYACM3oFVt0Jo0cH4IfDUdjuvjVpg91ocXFugAYoNRgFnPyE-STLQoimsQ4XD76f0rXJK6qyRTRL0sZLpbKzYrlc26urCxstnGq0nSManXLzSPs6qbSzNY7DXPXYx3fQMV6s1W6n6A0HETu9yJHv7aIHzrlgMBJ9qNkCgVUR5sAOKuPC6B1nAADT5ACwCwQYvD-OR21HelZ3re0fz-Dsq1zahNALBsnArOC6hrOtU0REsy1cFc6lbVVKIomF+n6WgTF0dgVHIQdtDgGxbBqOlRDKCBWEGdB2DQVAABIWiqETRLFRgdD6WYlDAGYgSAA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } +} +} + diff --git a/man/tm_data_table.Rd b/man/tm_data_table.Rd index 1d24f04b1..8f0f9ff07 100644 --- a/man/tm_data_table.Rd +++ b/man/tm_data_table.Rd @@ -108,3 +108,18 @@ if (interactive()) { } } +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlQ20onG6vaJKAL5dKdDwosUZtlkE7ApgQ0tdSmioAyp5i93+GboAvPtBuBW6fEIi-ceXwmK7lZWkMMkZiUH0Io9PlVostCgXzEiVEcBEGjg-COujoLR+vx6jD6MIWSwAynBUNwMAAZCgSApLUoYrE4gDqtH4RLwuiWAAU4EEePiIIT8sS6WBGcyMJTqRzaRjUHACLQxKtzr85Gc9r9qYkWBIbrC+qR2AQ0JoSDClgBJLB69H2IEiXQAYS1Vggkrlui6lS6XVoJl07BU5GYlh0Nls5T2okKEFYAEF0OwNgASeqlKNgxg6TqjJRgEYAXSAA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } + \item{example-2}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+zOh4UQrc23yFMCnRjaUAKyIVNIBrOFZlzLXjfjgTKGFSNIJ+WlECNP3Dk7PgBdgxFfCcgAum5oOgJipiuxaiFcroALyw8K4GF8IQiUQI3Ro4T-GF1UgwDK5NLhegiaEDOrUrQsWhQcliNKiOAiDRwfhYuiiUjsLZYgjQsABOyOHwATT8Pg2VQ2jgCjgAQgApKUy3QbBUqtV4DXCvx2Zw62WbADirl1mucAA0NnI5CiqdSQg8WBJMYjubyCGhNCQsRt+XYGSJvL6rBA7fjdP06v1+rQTLp2CpyMxLDobLYalTRGUIKxBuh2GhUAASFpVUtllmMHR9WZKMAzIFAA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } +} +} + diff --git a/man/tm_file_viewer.Rd b/man/tm_file_viewer.Rd index c04f73a2e..668b3cb4c 100644 --- a/man/tm_file_viewer.Rd +++ b/man/tm_file_viewer.Rd @@ -51,3 +51,13 @@ if (interactive()) { } } +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqX8opKAeNdqAfQ8vG3dPbyNdAHdaUgALFXYgqFxdECVdXSSfTLCME2Z4dgBGRQgAX1Kk6HhRRLDbCIJ2BTAkltKlNFRslRjmiAysgF4cr1x03T4hEVFdEanhMX6MjNIYfxNaEX8tWjhImWWVjJVUQVJ-VE9Yud06UVIj44yTImp+GVvRVge4GDytnBmmBRLBUNtNjMWikrgQANZQKS3Fp+XgCRbiKQQNTUdrjAbPDKoCASL4-cj-SFAlqgmDguAbQGiAD0tPpjJEGGJEmhulhCKRIxRcG4aOmYkk0lkeImhNIAA9SGTfpTAcC2RCmaywZrOQrSLz+Yi9EKwKiFjNJdjpWA5PjCRlBIxqMiwLFSKRUKJEMzmSYPJIiFo-Vr+IxBBIWWd6PdYnB+MyAApERheGNwQwAESIBEE8DIhgAYimYJ5DABlVBwAi0TYETxWCDiVD8EwtWUrUrHLu6UqlWu6dgqcjMSw6Gy2NIE0TxCCsACC6HYXQAJIJaClV6IZDpGKUykowGUALpAA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } +} +} + diff --git a/man/tm_front_page.Rd b/man/tm_front_page.Rd index 801bbd00e..78e725ddc 100644 --- a/man/tm_front_page.Rd +++ b/man/tm_front_page.Rd @@ -82,3 +82,13 @@ if (interactive()) { } } +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqX8opKAeNdqAfQ8vG3dPbyNdAHdaUgALFXYgqFxdECVdXUY4AEdBWiz2CDFSYmoiRkUIDIBBABEAZQAZH0y6pvTdT1JGdjbGlIUweC8kwdsIulFSdkHqwTjywd0AXl1BgDlnertdLhhBgbAk-1EiQUYCOCXVwdFWMli4TQJdUbBKgF9KpOh4UUSwuNjLMGo1BkoAFZEFT+ADWcFY-ySQNecBMUGEpH8BH4tFEBH8UJh8MRwB+sDEAK8cgAum4yFB6CJ-ABGFpJDAmZjwdgASQgJiIK10BBmYGqBzWYAAQmMUnY4AAPUjC0WzSWDWXvSpeJlwfwAJnZYU53Lg7AABgBhIjUQQwKosi2qsVWjVgWpy3TW232qoG52rUUAVgwwZSADYMBG5CkfXaHboAMyBkViiV4KVauQ6xnMpPGrymil8gVCoNi1yZwYAMS9CuVLsGAHF3QAJMaVJS65kqVDzFqTaYdQZ2PN6FnXXbj1m4EdgMd63QGqc9-UGudVKWLkTJ1czpNKLvQdAtFQxGZbpLCpKbjJ8IQiUTCh-CSkdDKkGD+LkkLGoKApEvDIQN0R4oH4GR-HIRsKw-UCpV5GBUHKLwyF0FRBUYGBPCsCAp0GXkVQIKAqgkIVHiyDADng0DBgAeTiGQMLLbDcJIAiwCtUjdHIsCZDgaiwFo3RYxEtdn1WNd-D7eY7wQiDcU0EhuGgwDJN0Ns7AAWUadN+CUvDuE0nTmnKXRRHiCBWGnCRnz4yi9H0JgAD45REwUiFICAvLEJswAADU4vFdkeUx8imUwiC8nzyHdABNDDnyYiy4GICB+CimLfPcrdQMsohIn8YYILCYUHBceDKgyMSt3AyDGGFLw7IAEliFkxXqWBUF3ap0DoEjlPw955M88hGqk9SWtQdN+toQa8Ky8bcuPWgTF0dgVHG9RNB0GxbDSLdLJUVg+pmtBUBavIUgulrRBkHQKiUD4lDAD4aSAA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } +} +} + diff --git a/man/tm_g_association.Rd b/man/tm_g_association.Rd index ef47169a7..9ffd8ac9d 100644 --- a/man/tm_g_association.Rd +++ b/man/tm_g_association.Rd @@ -71,8 +71,6 @@ For more examples, please see the vignette "Using association plot" via \code{vignette("using-association-plot", package = "teal.modules.general")}. } \examples{ -library(teal.widgets) - # general data example data <- teal_data() data <- within(data, { @@ -105,9 +103,6 @@ app <- init( multiple = TRUE, fixed = FALSE ) - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by Association Module") ) ) ) @@ -153,9 +148,6 @@ app <- init( multiple = TRUE, fixed = FALSE ) - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by Association Module") ) ) ) @@ -165,3 +157,18 @@ if (interactive()) { } } +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlQDCAPIATHG6-QMVpuqkHaLD0PCi7ABitNTkjOy0og4upVpokRyjpZsYJpMdpe0StATc7ACMADJyL129g8BnGtMAusPU+2ohw+XymjFEP1KUHEBHyLEmMi6AF8uik5mJihlbFkCOwFGBRviukp9sMVHk8d1-BldABealBXDjPhCEQzeks4QY8aVUgwRISRLQ0REAi0QJWCCUyoyqpwEx0hlQRJhUjMDSJUSoOC4nmypXoxX4wl4PWy0RwEQaRUWq2kTXa3VU-UygH0S1GsAAZUtOtIuj2jHF9BEiHxTOdLt0sKINzEisDwZEiRjcYWKWAwGNg3xP0h0bxYAACgCyOHdPi7KxteXK9VAvAy2AXhGozLbX64PxPSWoE3W23TLRQl3FYsAIKPL2uSOyt76uQD2WB9lKlWhNWTB066VRtGwPT07NjU2z9u+630jsarU7s36t0eo-ei-+xNQENiMOnwfR-Kxgh43pd9PxTf800xIJM2PXN811YtS1IWswCrGs8ArFD6z5CgkObRd73NV9R2fOwsMbXClyjGBhE0SJD3sJxnEol0TGHYjdAnKcZzbec5z1ecui6WgFQ2VR1U0HQbFscoqVEQoIFYcd0HYfYABJ6ihdBVItRgdE6JQkSUMAkR+IA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } + \item{example-2}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+zOh4UQrc23yFMCnRjaUAKyIVNIBrOFZlzLXjfjgTKGFSNIJ+WlECNP3Dk7PgBdgxFfCcgAum5oOgJipiuxaiFcroALyw8K4GF8IQiUQI3Ro4T-GF1UgwNISNJQUSiIgEWhhKwQaEDOqMhomLGZNLRUjMDRpUSoOAEemMoVIqCLPSIjZbDYohnC3SiOAiDRYhVKh68-mCuWM6hQeiKrEbAKK-mkXRaFjU+giRDS-HagglA4EMRYi2MK0iR5O2gu5b27Ui4DASUjbZgIFAmWBoUCo3OAAa0t0Gywgy8rjwKbAXgA8o4AHIOACayclWAAsmWwAEHIM7IMAIzV2tphsAJmrfjsdgAYuGqhsAEIVrAAaSwnbA-Rjujk0ZjqtNcH4hrAaYzdtl2pMtCiK6xvcGowCrm3QpnwvnAfNLExiLZHK56r5cfPjN+8DXUrwN7qS+VREAJfTU-x1PUDQlGsTWVd1PTEW1f3fWMfT9N1LT1L1HWdPFkOFTJg1DaYIyjMDY2hGtE2rDdM0HHN8yLLBSyzcsqxYms6wbZt2NbetBinOjuz7AdsxHcdJw2S9A2vPD-xg8hVygsSJwEsjsXuWg4nFewnGcBdA13fdFN0I8TzPaSbykucYX6fpaBZdgVHIZ9tDgGxbBqBlRDKCBWEGdB2DQVAABIWiqILgoVRgdD6WYlDAGYgSAA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } +} +} + diff --git a/man/tm_g_bivariate.Rd b/man/tm_g_bivariate.Rd index fc0675ee3..070d9f8b1 100644 --- a/man/tm_g_bivariate.Rd +++ b/man/tm_g_bivariate.Rd @@ -116,8 +116,6 @@ For more examples, please see the vignette "Using bivariate plot" via \code{vignette("using-bivariate-plot", package = "teal.modules.general")}. } \examples{ -library(teal.widgets) - # general data example data <- teal_data() data <- within(data, { @@ -165,9 +163,6 @@ app <- init( selected = "Treatment", fixed = FALSE ) - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by Bivariate Module") ) ) ) @@ -175,7 +170,6 @@ if (interactive()) { shinyApp(app$ui, app$server) } - # CDISC data example data <- teal_data() data <- within(data, { @@ -224,9 +218,6 @@ app <- init( selected = "COUNTRY", fixed = FALSE ) - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by Bivariate Module") ) ) ) @@ -235,3 +226,18 @@ if (interactive()) { } } +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlQDCAPIATHH+GRgmzPDs-QNdAL5dKdDwosUZtlkE7Apg09tdSmiowyp5W90jsQC8F1C4Fbp8QiKiutekMIkSifTaLLSBcDOlUqoVeN0SYVIzA0iVEqDgm3uwJuSz0122uzwSOBojgIg0YNx+NIsPhiPOyMq1Cg9DxYO2AGU8QjSLotH8aSJENs7hTKQR8kRaAQxGD2Yx-vQRIkBUKRSsUsBgBjBtsALpquS8yk45kaOD8emEEgEHnY5EmWihA1ggBiAEEADIM1x8ypdZFa7GsMEpCGhKHqElwhFAymLWBo3QqgZmt26Ikswl64NksM66m0vzosBM4lsjlSuDcrHxyqy4Wi67iyXSivy1ZBJUx9Wa7U6hMpm05wSoIIAazgcY7D2EmkiUYdzuc7Z1luthuuU5d5t0HuBXr5jCI2USJnUcFZ1z9kOhqdDq4j8CNmNnuvz10TMJD5JHmbpObzSZrnOLw479ZVgWEq-jKgqVgqGTNjsqpgBqm4jk+5CLtGYB2Kw8L-nOVrdroy6ujq67unebR7geR7gqeQakhe8ZXlGLaljqSHJsSNGvh277ZqhX4Ej+RYlneyKAS81aFnW4ENoqyowbGcFtqulRIbh2x2NUgTwGQWGUvOuH4auRFrvcXRdLQJi6OwKjkGe2iAnItjlOcoiFBArD2ug7CHAAJPUpTebijA6J0SizEoYCzGqQA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } + \item{example-2}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+zOh4UQrc23yCdgUwKdGt-oArIhU0gGs4VmXMteN+OBMoYVI0gn5aUQI0w+Ozi+AF2DEK3CcgAum5oOgJipipsBiFcroALzw8K4Wq6PhCESiJG6UgwNISNL0bQsWhhOCwup1KK4zJpaKkZgaNKiVBwDbo6koqCLPTIrY7LZouHc0RwEQaXHiyVPNkcqnc6nUKD0CW4rYBCUc0i6LRk1UiRDCrlKgglI4EMS4-WMcn0ETPC20K2XXLAYCCka7MAgkFyEVK6kynVwfga7YAcVceFN3JMtCiYdxADFBqMAq5RdT+tyA6bWHTcgyokz1HL2Zzs3V-vAI0LY9XdCGpciWxWFXHlar1QKwFrZXqDQ64MbG0G6ubLdbkbb7Y6py7AZkPV7pr7-YGJ+3k33MwANE1NuowR60OL83RpjPOLdBhNJ8PI6+Zru5nN3+pEAppe5W3XIvSjLMh2VZBrWl5rj6n51O20raiy8pgROKpqtQEYDjqQ52oao5HhOuiLq6NrDguzqukCUCrts3pbH6+bHs2CHkE+uiClgACy+ETg+u5Xumr5Nu+dQMdy3S-uocAATyJZlohlaKtyEH1rR45KnBbbMayCldnUqG9mx-bMdh854WpQZETOJm4U605uuE1ENvRMHBsxfFbF4ADyjgAHIOAAmtx96JnxL5ZkGwm6O+-T9LQJi6OwKjkCB2iUnItg1HCohlBArCDOg7BoKgAAkLRVEVxXiowOh9LMShgDMIJAA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } +} +} + diff --git a/man/tm_g_distribution.Rd b/man/tm_g_distribution.Rd index 033161a0c..1b67c42c2 100644 --- a/man/tm_g_distribution.Rd +++ b/man/tm_g_distribution.Rd @@ -74,8 +74,7 @@ It offers several tools, such as histograms, Q-Q plots, and various statistical visually and statistically analyze the variable's distribution. } \examples{ -library(teal.widgets) - +\dontshow{if (require("ggpmisc", quietly = TRUE) && require("ggpp", quietly = TRUE) && require("goftest", quietly = TRUE) && require("MASS", quietly = TRUE) && require("broom", quietly = TRUE)) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # general data example data <- teal_data() data <- within(data, { @@ -90,9 +89,6 @@ app <- init( dist_var = data_extract_spec( dataname = "iris", select = select_spec(variable_choices("iris"), "Petal.Length") - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by Distribution Module") ) ) ) @@ -100,7 +96,8 @@ app <- init( if (interactive()) { shinyApp(app$ui, app$server) } - +\dontshow{\}) # examplesIf} +\dontshow{if (require("ggpmisc", quietly = TRUE) && require("ggpp", quietly = TRUE) && require("goftest", quietly = TRUE) && require("MASS", quietly = TRUE) && require("broom", quietly = TRUE)) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # CDISC data example data <- teal_data() data <- within(data, { @@ -140,9 +137,6 @@ app <- init( vars = vars1, multiple = TRUE ) - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by Distribution Module") ) ) ) @@ -150,5 +144,20 @@ app <- init( if (interactive()) { shinyApp(app$ui, app$server) } - +\dontshow{\}) # examplesIf} +} +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBISqDC0ogT+uLpetHCk1Ky6ALz2Ts62AGTpuu7Rvv6B6BFR3rHxSSkuGVk53nkBRCbkoqRF0aUJyQ6VupnZnrVwfmAAsgCCAMrjrSVxHRVpPdX9PoP+TEREMNMxs+VdaUoAxLpSEGrUuvxQpFC6cAAesKgiSlc3BsZc1AD6b1A2r2utyMugA7rRSAALFTsP6REBKXS6HyhD7IxihJQAX0UED+0HgolhQNsIP8KNE-iUSjQqDRKghfggSL+5ThiN0fCEIlE5TozSZSKRpBg3wkv1CpAx9EEmmsHKFl0l3y0LDZQO+Dyl6lI31EqDgBEFiqF+NgemS5IxlLwCpNojgIg05QdTt1+sN7FVGKg9BE3wIkKItAIYiGFP8cki-gACrFuBgADIUCRQyN2pG4xVZ3S43G0Ey6dgqcjMSw6Gy2BHM3SiaEQVijdDsWkAEm8kTbDsYOkYuKxSjAWIAukA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } + \item{example-2}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBISqDC0ogT+uLpetHCk1Ky6ALz2Ts62AGTpuu7Rvv6B6BFR3rHxSSkuGVk53nkBRCbkoqRF0aUJyQ6VupnZnrVwfmAAsgCCAMrjrSVxHRVpPdX9PoP+TEREMNMxs+VdaUoAxLoAwgAiAJLjJ7r8UKRQunAAHrCoIkp3DwbGXNQA+l8oDZPvdHkZdAB3WikAAWKnYQMiICUul0ozO4wAMj9shjsUoAL6KCBA6DwUSIsG2CEEIb4rH+EkAKyIKn+AGs4KxKUCacZ+HATFBhKR-gR+KECP9WeyuTzgGTYGIqQ85ABdJRKLQsUQARlxBFhbIIYn+ojgIg0cH4fggaJ1jFoUHoInFxtopt5YOAwH8DP86vVkTp-qwwyK-hOAHlHAA5BwATUjYHGzgAGky5LhUboLVbyPxynHHFjGRASUo0KhcSoYXa0UDykjc3whCJROU28IVbm0aQYP8JIDQqQnfRBJprH20bdR-9Hc2wf8XmP1GLRKg4KH7bO90r4OV-ZjGXgZ3v89vSOVLxpzVud3un7ojSaxOVHc7XXB3W-vQ9fWPAkwCDEN6QAcVcPBdH8AAhYYsAAaSwPUsxzXdnzRW9CyPMB4KQlCInPJ8YFFWh3j0ZIADFRixNN0Mw2cTFoZ4bXKGi6NcDCnxJZ9s2I5pmAeBcWCXYTV2YO9N23BtMIPSiYLAAMz24vdmOochGHKdTNPvGTiL3R1O2SIy9QYxjdFIjTyJEPZUgM3ReJ48y9wkRgiEEVARK05IgRXZ41ykh9ZOfeTcOUlynx0mRtNoDSZD0x8LKMj9dTMhy0SszQKLslwHKcvcCsc3MSRJWgTF0dgVE09dtEGORbBRXdRHhCBWFGdB2GrAASbxIh6i1GB0RgSUJJQwEJdUgA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } } +} + diff --git a/man/tm_g_response.Rd b/man/tm_g_response.Rd index 6e9e1e93c..0f9ae470c 100644 --- a/man/tm_g_response.Rd +++ b/man/tm_g_response.Rd @@ -98,8 +98,6 @@ For more examples, please see the vignette "Using response plot" via } \examples{ # general data example -library(teal.widgets) - data <- teal_data() data <- within(data, { require(nestcolor) @@ -134,9 +132,6 @@ app <- init( multiple = FALSE, fixed = FALSE ) - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by Response Module") ) ) ) @@ -146,8 +141,6 @@ if (interactive()) { } # CDISC data example -library(teal.widgets) - data <- teal_data() data <- within(data, { require(nestcolor) @@ -180,9 +173,6 @@ app <- init( multiple = FALSE, fixed = FALSE ) - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by Response Module") ) ) ) @@ -192,3 +182,18 @@ if (interactive()) { } } +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlTCtLKJxur0E-RWmHbrsWroqugTsCoSs1Iuli1qiq7qLsFuLUiyLcrbl3ZVDfYyiwMBaALp3g1DiJuqkHezD-Tf3d12VAF8lACuiloPBRMUMrYsosvldFm5oOhBio8gszildABefwZXBjPhCEQDXFE4RiDHnXSkGCJCSJaqiVAkURwKnU3TUKD0OB+XGLLBiFkQNm6AAK7VImzwY2pTJFYtxKUSYVIzA0iWZcHmcs5YNgegFYHhMoJZ05ujZIg0OKtfJ1pC1qB1HMtlW5vP52zAAGUHbatCxaDyRIhVnrLQR8kRaAQxHag4wQ-QRIlo7H45CUjc4ZcZQ9Srqlis8D6DowjnJze7ztbHXB+HbFgRlhGLe6YMJNJEjboAGIAQQAMr7nDXa6ZaKFG3ah6PXB3qf9OdXI7pQnaVWqNU7tbql+cDfBmyb8+3a-Xbbir3uXQfJ1yeXzT-6baRdEmU2GL5OM3GE1xL9QzgdMYwA7MMlzM8RgRMBCzmBYwA2PYUBgKsJ0vANyCbY0UNlQ9qS7agexEOcRzHTD3RMadZ1xecx3XSoV2XPUVy6LpaBMSYVHIXdtHZY4yjGURCggVhB3Qdg0FQAASepShk2S2UYHROmBJQwABO4gA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } + \item{example-2}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+zOh4UQrc23yCdgUwKdGt-oArIhU0gGs4VmXMteN+OBMoYVI0gn5aUQI0w+Ozi+AF2DEK3CcgAum5oOgJipipsBiFcroALzw8K4Wq6PhCESiJEYgTCQHouqkGBpCRpBqiVAkURwWF1Bm6ahQehwai4rZYMTUiC03QABR6pFEWzRcMZlJ5fORmTS0VIzA0aSpcA2RMZKKgiz0yK2O1F6sZtJEGlxxtVTxVavFGrqzNZ7N1YACbItui0LFoLJEiANNttBBKRwIYlxHsYXvoImeQdoIcuuWAwD1I12YBBIKqarAACEALJYADSWAATKLdFsvAB5RwAOQcAE09nIxbaja6NHB+BzcwXi2W8IaNTBHrQ4jrdAAxQajALOVttuomWhRLu46ez1z+hn9W0todRXGy+WKy2oVX0tv-eA9-WD7d1c2m5FPs8XoeM+1snsuk2kd2et6cC+vei51IGwahsi4aRtGEFxoCmRJim0zppmujZnOAAa5acoMXiuGAcj7g+DKvmuTpYPhhELouI7UJo47rjOc60W2y6rt2yIbnOH66LuGoCXUAn9P0tAmLo7AqOQp7aHSxHVOiohlBArCDOg7BoKgAAkLRVFp2m0owOh9LMShgDMIJAA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } +} +} + diff --git a/man/tm_g_scatterplot.Rd b/man/tm_g_scatterplot.Rd index 466294031..c8b39bbe1 100644 --- a/man/tm_g_scatterplot.Rd +++ b/man/tm_g_scatterplot.Rd @@ -108,8 +108,7 @@ For more examples, please see the vignette "Using scatterplot" via \code{vignette("using-scatterplot", package = "teal.modules.general")}. } \examples{ -library(teal.widgets) - +\dontshow{if (require("ggpmisc", quietly = TRUE) && require("ggExtra", quietly = TRUE) && require("colourpicker", quietly = TRUE)) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # general data example data <- teal_data() data <- within(data, { @@ -185,9 +184,6 @@ app <- init( multiple = FALSE, fixed = FALSE ) - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by Scatterplot Module") ) ) ) @@ -195,7 +191,8 @@ app <- init( if (interactive()) { shinyApp(app$ui, app$server) } - +\dontshow{\}) # examplesIf} +\dontshow{if (require("ggpmisc", quietly = TRUE) && require("ggExtra", quietly = TRUE) && require("colourpicker", quietly = TRUE)) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # CDISC data example data <- teal_data() data <- within(data, { @@ -272,9 +269,6 @@ app <- init( multiple = FALSE, fixed = FALSE ) - ), - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by Scatterplot Module") ) ) ) @@ -282,5 +276,20 @@ app <- init( if (interactive()) { shinyApp(app$ui, app$server) } - +\dontshow{\}) # examplesIf} +} +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBISqDC0ogT+uLpetHCk1Ky6ALz2Ts62AGTpuu7Rvv6BzgAepMwRUd6x8UkpLhlZOd55hETURIKMqLQEANYyZdGVCckOtUoAxLpSEGrUuvxQpFC6cIWwqCJK84sGxlzUAPpbUDabC0tGugDutKQAFirsR5EgSrrZno1w7NOipMStjEUEDeAGEAPIAJh2unBEKUAF8gUdoPBRI8zrYLv5Yf4lEo0KhoSobn5gXMztUnq9dHwhCJRNVacIxKS3m9SDB9hJ9mEFuQOq1SKy2W9qFB6HBZsl-ABlAh8mTrIikGG3IhdMQRakiwqUs77FYldSkHmoOAEYUit7I2B6aVgHF4bVW0SS80q5KukQaU3my1W0XiyXVWVujS6LQsWjikSILVkgNvAhqjUM5KRxjR+gifbJ9UEFlHYDAbGQ-wAXXLkQt-mIFjK-kEqEWvX8cjkuGdAa97rg-BDzXrToTiZgwk06ztugAYgBBAAyMucnZHAZMtEKfeqc8XrlXbKBAY7Xd0Q3JiwNxWYPtEZpr++tZxRU9LcOHid0PfDnrDJtvfpPEUxQlKVdFDb0VQzLNY3jD8kxTAs0wjKMYzgXMEMLM5i1fCsq10GtB3CPAwLAJsWzgNtjwfNkv3Ift7TIqBW3fOCx2oCcRG3BclxXODTA3Ldkh3JdAN0Q8rSogN-iIRh9noM8jkvI0bzvf0RRteAB0dXjE1o6paN9e8+OA4N7RlX9kMzVC4xYj881TaooNQ9D8xZUT1KwksHTLMBKx0viCIABTFMgGzAOxWDNMK7HcBZ4FC4jaxIIjIkbZsmIosBxI-SS4NowTdAAOUced5380dx1oScuN3cq1wE+iZ24vccpPXKRVEWgAC80PkvUL0Na8-1U0SNJfby3zqmiLJ-CDDLUq0TNA8D3Us6C4BsqaRXsxDHJQ7M0J2zDFmwibcOrPxCLCxjmPbLbpoggq0vI2DWMq6qhOa+63nXTdGuElrE2yg8psYIhLn2Ex1FifqoCUob5tGp9bS0nz7r02b3UR6jAxAgdzIgtbrNeuyMKQpyDpc1N0ROrzHT8-DLuCqAEtS8LIsytmYrgOKKFISjvs-X8CuK0rBbYjipwBwXfoKgHROBt52rZf5Iehj1zzhwbjWxj8xtRybRIxoW5v-Iy4KW-GLIpmDbMTI7yf2nMHZpqBTvpvCgpC-nEvZqLfe53mEru9yTd7RrRbK0OJaqzjPtq0PZf+5qFba51xKBIFaBMXR2BUfljW0L5210F4yVEe4IFYWd0HYAkABJvEiBvXUYHRAQRJQwHhcsgA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } + \item{example-2}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBISqDC0ogT+uLpetHCk1Ky6ALz2Ts62AGTpuu7Rvv6BzgAepMwRUd6x8UkpLhlZOd55hETURIKMqLQEANYyZdGVCckOtUoAxLoAwgAiAJIAypO6-FCkULpwhbCoIkorawbGXNQA+vtQNnur60a6AO60pAAWKuznkSBKutmejXDsEDEpGIrUYigg3wAgtN5gAZQ7ZaFwpQAX3B52g8FEb2utluBD8YCRsP84IAVkQVCdeqxsec8cZ+HATFBhKQTgR+KECCcKVSaaJgBjYGIcWs5ABdJRKNCoBEqR5+CHLa7Vd5fXR8IQiUTVLXCUUa76kGAnCQnMKrcgdVqkJXfB26ahQehwajVfzzAhWmQ7IikKZPSkEMQRI0Owpq64nTYldTs0SoOAE8OO4XwD1EmEkvCph2iN3JgPJAsiDQWpMp5WOx3O13u5KewsaXRaFi0F0iRBh6s174EINdMTVNuMDv0EQcwchunXYDAfzE-wSiWRFNEgDirjwun8ACEALJYADSWAAjGV90fTwAmUlyXB5x2lotwfiZyFbnt9x0wNm0HY9GSAAxSFYXmZxH17PsTFoQo32qUDwNcaCHXBPsHzzIYVTWGNimYctE2Te0f3TIDdyzZFc1Q74XxbEtmwTSsSJ-J0XTdTN5kY1t207OBu2o1j+2nYdklHcdJwHYNRXOedF2zZdV10ddP23SIrxPc9LzAQ9NLvMA5Ewmj80YhDGx068tMEoS-2oTRAMQsCIKgoTTDgszdCQiCn10dCayMvsQSIRgTnobDzjwuNCOYnyyI-BTrL7Oji10ZKK2InzvjrDjzK4ssA3EviBJcoSpKHXUxN4ic4CnaTsUyh1ZIXSicxXErXJUr8dw008L26iy9O0rBIUmNSKKwZwN1mAB5AA5Pq-NYgKhOSjzZscWFYXan9bPskRHOQ7aYPc98QKclClrzZbn1oAAvGqwqjXDYwIpiMuMuLzKXRKa2S6o0qIqtXOyhsKLyoseLHIrv1KkSKshiSarKmcxSgOSWsUtdCVU7TdN6+8jt+0zToonGfr7XaAP2s7Doa2D4JJryLp-Ra0MJxgiDuE4WRDFKIpe+N0qB0jrkxcj5KownaO4hj8qFlifxBzjuMK6rioa5HRIRvjavK1H0e+trlMJPGsH09SwGG0ahsmmb5oJhrVpJ9bNqlh1KYcmnnLpk6Du84zWe+a6HRBbn1FiJ6oEi175di0WRXiyWfL+2Wi1j4ysvY0Gm3y7W1Zh1jNfh1XJLh-XmsNpT11N83xpGsb-Amqa5oW4OkuJ6oXa2hqPepzzzrd756Y8pmfMD3zwz88FwVoExdHYFRrXjbR-kM3RPmVUQXggVhIXQdhZQAEm8SIj4LRgdDBVElDAFEJSAA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } } +} + diff --git a/man/tm_g_scatterplotmatrix.Rd b/man/tm_g_scatterplotmatrix.Rd index 65672cb11..294eae5ab 100644 --- a/man/tm_g_scatterplotmatrix.Rd +++ b/man/tm_g_scatterplotmatrix.Rd @@ -48,6 +48,7 @@ For more examples, please see the vignette "Using scatterplot matrix" via \code{vignette("using-scatterplot-matrix", package = "teal.modules.general")}. } \examples{ +\dontshow{if (require("lattice", quietly = TRUE)) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # general data example data <- teal_data() data <- within(data, { @@ -130,7 +131,8 @@ app <- init( if (interactive()) { shinyApp(app$ui, app$server) } - +\dontshow{\}) # examplesIf} +\dontshow{if (require("lattice", quietly = TRUE)) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # CDISC data example data <- teal_data() data <- within(data, { @@ -182,5 +184,20 @@ app <- init( if (interactive()) { shinyApp(app$ui, app$server) } - +\dontshow{\}) # examplesIf} +} +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CmlCkmgRw-ri6XrRwpNSsugC89k7OihAAxLpSEGrUuvyBULpwAB6wqCJK+aSFRrpc1AD6VVA2lQUGxgDutKQAFirszeEgSrq6xOakjFGiHXkFGCbM8H4QY2O0-AnjfmAAIq54uv4AYlhhx2AAknYX-s4AyndgAAq3R-4A4ucfYAByABlngAhQ7hfwAxzPACC7zkuFG6wkRB0jAg8DI2xM6lIREYq3W6wI7AATOEyboKQBGcm03Q0+nhBkk+GIwnUKD0ODUWaJYn+ACyJBYBF6rGeWDgqEE9DoBH8qUJrLW6w5EAkgigUga2JgtFiWJxeIJhJ2DIAzOFLbprdbqUyrUzlabdByuTztvywJ8ZDAoMp5b8ABLckQBiVEP0WUJgRXrZ3rVBEaUczQkT3sAAc1oAbAB2cI5gAM4QALAX6SX6QyqRWqQyixgc+EAJwJsYsOCFPnsc0AVgrfb7FqLDL7Rb7rep5oppZH5Kb4Wz7cy-FQGfNGFLC4rJIwNa34Ub1sbFMbFcbk90jYbW5X-Dg9FIGb3zIwdsPlMXX4-25-C7-PdfzjONRG4MQ5maRZljgE0Ni2RIqUQccERVMYJjINgGk2bYwJgcpYLZIldgOZ4zmeG5nkeZ43meb5nkBEEwUuSEYThVCXVEWgAC89ESFCiLGdxynUPikhcIiV1YLtGFwvFSHYPCCNJUci0QEkiw08IUN0YSORCbYHBcOQVx0CBBDEpSRHYL1RD9ahqGeeB+FoQQYGeDlGCkZ4SDobIFW0qs9NEwzkhXAh-RCBy4AQ3QrNg4kjOccITmhAEHhSQLwmCgzEiSlcvH9TRSDiRI0TxGB2B0qkiyrDTwqIURSF5XSIAqqqq0zOqixXVBGCIEwem2crGEqnStMrEClAAX1SZpoHgURBgKWxai9DCphmZ4wJEUQFSUAArIgVAaABrOBWCW5pVuMI6TvOy6TTuiAzou3YNumMRng+rbfk2ALEWe16OH8Havt+MG9r+-gAZVIGHveohJk+qHwTASGLi9f6wG2fwPtYbCYdjVJUiUNB11qFQehNZptiGRE+CEXbtkZ4QxDguoYAaCQGlECKghkcoiFIP1NuKDmxjdblcbAB5+fIRghefUXpmKMJBN0LQWFoTlmcSOgmol9ZmgaEophxXnUDgfk0JdeZqgWsS8aRzDfo4u2xlEblrefRIvZEDRLeto2XSl3JEn8B5vY0TXtd1sREHV22PdFY6QharXpnjhpU9odPluqYBgGd5HfoAXTLlcPf9n2YozfxOygZ4JDXZ4HyfWGPcJGBhE0AjQpcd2u90PEH3cWKkqHrvBuKOvElS9LXGT004xdKvjYKU3inNwPRCtm3h-m2AnfR8DUY1wlBuoBWsX1BWg4P4fXU5aWI9l6Pn0znXZTgRO8Av00mcWol0wgTbGU8U69DThBRIWtqAWRzlAvO7NmhF1BmffwFc0b40Jp3J+NcNBzx2P4UivxyK-Eor8aivxaK-Hor8RivxQTPFYr8WEeDh492vrQfueVkgALGOvQkBDfZxQ-g-EOpow4yyjgHT+ccf6iD-hAu2ud07bC-tnNRKCChoNPrtTBZdwhekKmQHo4pfjECaqjS4fUBo9AVEI00IiiEmM1GYkq31GrNWeHYwapAOFdy4X3EQA9koCPWKPGQRDJ4RLGDPIhC8MoRNXivDWqSpoQFSLQEwuh2AqAVjibQsETK6BGCqUQ-QICsGhOgdg5MAAk3hwiNK9owVEqRppKDANNMuQA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } + \item{example-2}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CmlCkmgRw-ri6XrRwpNSsugC89k7OihAAxLoAwgAiAJIAypm6-IFQunAAHrCoIkolpGVGulzUAPr1UDZ1pQbGAO60pAAWKuwd4SBKuroAgtn5ADK9uoxzi1Oz2Vj5y6tb+UoAvqkd0PCiY6W2TQR+YGsLYbr+c9v+qQBWRCqtANZwrAuHWuxn4cBMUGEpFaBH4tFEBFaXx+-0BwFOsDElwacgAukolGhUMsVIM-BBph0EsVSrgNnwhCJRNSGcIsRtpqQYK0JK0EYFyIwakQuYFGLQKuTptLdNQoPQ4NRqf58gQBTJhaRdDAxRKwhzpVoWLR5UzqXRRKQpTLpR1WpVSMwNHzUHBbgabTSGmc9IkXvNHngPTbRIq3VrEqGRM7RK73RTPTa5QqlX6wPkwxpdEbxaaxIh9QnE9KCENviFmYkcyb6CIYWXaBXsVBgMB-eswLjcXI6UXi7oo+G4Pxqe77gBxVx4Z5gLAzTJT8Iq5wADXevf70pgUNoNV9SRcG83uiIjDB7hHiQch+DnpMEuH1IAYjMFvlXH3Paliz3b16oPaFSOuo0Kxm61rFhi8DKvc+yFpu97UIK1KIYKLrgX+MrJoqMEZtGWoUPwqDfGQogFkGn6Jjmla6GOAAKMxzgAsjkTwvAAagUuR2OumElg2FbUka1CCHA9blliHStv6bydri4T0YxMwsdkbH3Jx+TceutF3AxzFqTMGlaWAci-pRnqDhoj5prkABy7HOHYujGM4tnZLoADyT66HZ2SOJkdi5B5tnwce25IbuIjUteH6bmZm6WRGA6ZqBcYQf22GpjOeHhtmxp5mRoWbqWEk0dWebiY2kmlNJsGyV28XHol1k6S8k4Gexr4GdkACavHmTa4WaHu0XJEem6nueLUxeN-b3hULUvm+sX9t+iZrTKG26GtqSpLQJi6OwKiCiB2hwDYtiTAmogjBArAzOg7BEgAJN44QvaGjA6IwqSHEoYCHLiQA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } } +} + diff --git a/man/tm_missing_data.Rd b/man/tm_missing_data.Rd index 878adeb14..505a3747a 100644 --- a/man/tm_missing_data.Rd +++ b/man/tm_missing_data.Rd @@ -58,18 +58,7 @@ It is useful for clinical data analysis within the context of \code{CDISC} stand adaptable for general data analysis purposes. } \examples{ -library(teal.widgets) - -# module specification used in apps below -tm_missing_data_module <- tm_missing_data( - ggplot2_args = list( - "Combinations Hist" = ggplot2_args( - labs = list(subtitle = "Plot produced by Missing Data Module", caption = NULL) - ), - "Combinations Main" = ggplot2_args(labs = list(title = NULL)) - ) -) - +\dontshow{if (require("gridExtra", quietly = TRUE) && require("rlang", quietly = TRUE)) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # general example data data <- teal_data() data <- within(data, { @@ -92,12 +81,15 @@ datanames(data) <- c("iris", "mtcars") app <- init( data = data, - modules = modules(tm_missing_data_module) + modules = modules( + tm_missing_data() + ) ) if (interactive()) { shinyApp(app$ui, app$server) } - +\dontshow{\}) # examplesIf} +\dontshow{if (require("gridExtra", quietly = TRUE) && require("rlang", quietly = TRUE)) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # CDISC example data data <- teal_data() data <- within(data, { @@ -110,10 +102,27 @@ join_keys(data) <- default_cdisc_join_keys[datanames(data)] app <- init( data = data, - modules = modules(tm_missing_data_module) + modules = modules( + tm_missing_data() + ) ) if (interactive()) { shinyApp(app$ui, app$server) } - +\dontshow{\}) # examplesIf} +} +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBKMtPzOAB6kzP64ul60cKTUrLoAvPZOzrYAZJm67rG+-ozUUBASUTHe8YkpaS6KEADEulIQatS6cKGwqCK6-FCkUEr9gwbGXNQA+iNQNsMDUGO6AO60pAAWKuwz0SBKurme3r6toqTE1ESM9fu6UPz8k9CiS2YWmtahtnsQBwehwFE3RE7FEnkm3BIEnYX2iJkuV3YIlKGxhtgAVLlzLQTOwAIzRDAABgArIS8QB2OTUgC6SwAcgBBW7-W4AXyUtx8tBeRl03NEtxg5xYvOMwoIos5v35QVEwDpfOK6ES7AF0Xuj2e9QOEtFCqWyp6HD1jFEGoeTygoh1ulN8uA-gIrGo-hpiuM1owJnUpER9uAjsILrdNNtAaDUhYoaWXp9Gn9IrNgf8UcYofqbPqM2g8FE2wWtj5BD8YAF5X89v8N2g6CWKjWfhlMxqOyFAmEYhqfCEInzLN0pBgkxgPNEKgk0wWcxl9XqON0atUzEsOhs31uok2EFYjPQ7DQqAAJN4Negj2DGDprkoORAwGyaUA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } + \item{example-2}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBKMtPzOAB6kzP64ul60cKTUrLoAvPZOzrYAZJm67rG+-ozUUBASUTHe8YkpaS6KEADEugDCACIAkgDKzbpwobCoIrr8UKRQSiNjBsZc1AD6k1A2E6NQ07oA7rSkABYq7IvRIEq6uZ7evhBipMTURIz1pwCCrZ0AMuuML+8nui9YnU+-06SgAvvVFtB4KIDqtbEZdAQ-GBvm9yv5gf56gArIgqOYAazgrBhi3hxn4cBMUGEpDmBH4tFEBDmuPxRJJwEhsDEsLGcgAukolGhUOsVNs-BBTosaodfnwhCJRDVFcJeb9TqQYHMYEzRCoJAtVstpbp6vVaCZdOwVORmJYdDZbMczaI9hBWE90OxRQASbzRf2iGQ6B5gpRgUECoA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } +} } + diff --git a/man/tm_outliers.Rd b/man/tm_outliers.Rd index 4ca23deeb..3d76bf5b7 100644 --- a/man/tm_outliers.Rd +++ b/man/tm_outliers.Rd @@ -58,8 +58,6 @@ such as IQR, Z-score, and Percentiles, and offers visualizations including box plots, density plots, and cumulative distribution plots to help interpret the outliers. } \examples{ -library(teal.widgets) - # general data example data <- teal_data() data <- within(data, { @@ -97,11 +95,6 @@ app <- init( multiple = TRUE ) ) - ), - ggplot2_args = list( - ggplot2_args( - labs = list(subtitle = "Plot generated by Outliers Module") - ) ) ) ) @@ -147,11 +140,6 @@ app <- init( multiple = TRUE ) ) - ), - ggplot2_args = list( - ggplot2_args( - labs = list(subtitle = "Plot generated by Outliers Module") - ) ) ) ) @@ -161,3 +149,18 @@ if (interactive()) { } } +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6ugDCAPIATHHV9RVNdcDACmCojLQwLKyJANZwrJ0AumONonAAjokiEOwQjETZ7LV1cooQAL7bKdDwosUZtlmdG51KAFZEKkMjxylnxrf3w6zHbxAPHBfNeF0-zqnVKnW6vX6v06WzcEC0LFEjQI+TuBDEiWmIg0cH47ARPSg9BEiRRaLEJyC7WB4zGpQI7E6AAVqFAyKCgWA7KxUHAOZ07Iw4IF4OywFttko0KhGio8oyIJUUroALz+DK4Fp8IQiJFq7XCCktSqkGCJIiCUh0GTHY2VXQWq20GSJAmq3R0USkBX233qoKJMKkZgaTG8hl2v3+tmwPRqml4SN+rFwDTulOh0Thn1Rv2s+hwPzxsAAZULqdIugJtCJIkQoKTUbJtHReqrLBrxLgpNRLYpKWpYEuYAm9MZhBIBH5YEEqCCwxhck1itzvoz5H47s6s-nfMTK9XlRgwk0kTjugAYgBBAAyJecy8P9pMtFCuPd17vrgPue2q7-fpLkmBCBHAEhED0IFJG6aqet6jbRoGoTBuopBhqmOargcsZbkOAKPoeL7UOQjDukRJHoRGP6rgSba0QRT7Nq27oItQgjdkx-YZIOw6ju2jCiAAJOuuJAdRuYiZuaqsexPbkk83EdHhIIjnS-FCZJYlPkeJ60Ge7oOC4CGVABUamfa5kAds2y0CYujsCoJGodocA2LY5QrqIhQQKwV7oOw0qCYItClIF0yMDojDbDsShgDsYxAA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } + \item{example-2}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXQBBHwCAGWTdRkaWpQBfRQhM6HhRCtzbfIUwTuaJpQArIhU0gGs4VmHMseN+OBMoYVI0gn5aUQI0+cWVteAB2DER8LkAXTcIXY00rRZRNKh+UWobUG9wAYrRqORGOwTg4XFVRGg4hxMsBgBMphMnk8qicMO9SERGHJiUovoxRG0CCUFgQxGlRHARBo4Px2GTaFB6CJDtTaLT1rlUeimtMwFiqvjPt9fv95H0lIi2ipiuxaiFcroALzq8K4NV8IQiCnag3Ce5quqkGBpIiCUh0GTDC11XS2+20GRSxha3R0USkVUQF3BnVQNLRUjMD6iVBwAiBkMh27wH3Crp4Z2JhlM0g+7Nxg4xuMJxMh6icxmpsABRkF3TszkiRATPVB0vBqk0sQ+htcuA8rsC8JCyYizHY3Tx9EAcVceF0EwAQgBZLAAaSwAEYJsTW+3g-nmfwq-VZy3M6WYPtaHE9NqQfVmgFnHv93UTLQoiyfQ+n642+2fSARecivh2YRwBIhJ8twXo+n6AYXnUmThlEkbqIWsZTgBpbJneC6jumYGlh+EIyD6pGQvSWElm+ZLGvW3zEe2nZ8t22pfNQgj9qx-IPFAI4YmKE70QAJIe5D8KBSEhhJ34cdw3EDmxQ4CWihGiuKjHkuJtZHtJOHtleEI3iIPqwv+b5AaW1nBrZujWX0fS0CYujQqoUaaDoNi2DUbaiGUECsPU6DsIiomCLQVThQyjA6ESPRKGA3RPEAA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } +} +} + diff --git a/man/tm_t_crosstable.Rd b/man/tm_t_crosstable.Rd index 54b96b06e..3cc5c5cb4 100644 --- a/man/tm_t_crosstable.Rd +++ b/man/tm_t_crosstable.Rd @@ -62,9 +62,8 @@ For more examples, please see the vignette "Using cross table" via \code{vignette("using-cross-table", package = "teal.modules.general")}. } \examples{ +\dontshow{if (require("rtables", quietly = TRUE)) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # general data example -library(teal.widgets) - data <- teal_data() data <- within(data, { mtcars <- mtcars @@ -101,9 +100,6 @@ app <- init( multiple = FALSE, fixed = FALSE ) - ), - basic_table_args = basic_table_args( - subtitles = "Table generated by Crosstable Module" ) ) ) @@ -111,10 +107,9 @@ app <- init( if (interactive()) { shinyApp(app$ui, app$server) } - +\dontshow{\}) # examplesIf} +\dontshow{if (require("rtables", quietly = TRUE)) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # CDISC data example -library(teal.widgets) - data <- teal_data() data <- within(data, { ADSL <- rADSL @@ -153,9 +148,6 @@ app <- init( multiple = FALSE, fixed = FALSE ) - ), - basic_table_args = basic_table_args( - subtitles = "Table generated by Crosstable Module" ) ) ) @@ -163,5 +155,20 @@ app <- init( if (interactive()) { shinyApp(app$ui, app$server) } - +\dontshow{\}) # examplesIf} } +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsIykUPQiov64ul60cKTUrLoAvPZOzooQAMS6UhBq1Lr8UEG6cAAesKgiSgVFRrpc1AD61VA2VYVQBsYA7rSkABYq7M0RIEq6ujCkBCyinRNTM2OmRIy67Fq6KroEfoSs1OG6-lpheEcoMIf+Uiz+crajEOPjk9OMosDAWgC633NQ4hM6lIK3Yrxmnx+3zS4wAvktwe9Pv5UIxaDAWKwGgBrOCsfy-OaiTwNEQQdgQRhELpghbve5KWFpZrQeCiIbtWy1fyI05KABWRBUOLx7OaXOMguFuNY7KlEBFHB5dNOEWVb1V51R6MxiruaSUaFQcxUvT8T3y7USlqCuARAmEYmtfCEoXNzzqMAapAaBCpolEQRCcHdHt01GCcDySX8AGF-bM7MFKnglh6Stbmg1SqRmBoGqJUHAdmmwyzYHoY2BeeFSx7iSINNaG8WfYXi6Gw88I-Qo9b-ABlKOt3RaFi0ZNwRC1i1d8YEPpCghOpJjtGT32L2jLsXtZHVlUE74REt7A5nY6a-ywK5gG6MfV22dzlsaOD8a2ngj7W-3u5PudnhgYRNAqStkhcADAN0FZ+Bkd9rQcSC6zDExaBKBCkgAMQAQQAGQHVxnw9GEwzkKCPXiJIsxzPM2yLEtiOect4H7A8NRnQDX1IZth3zdtGOg8NI2jc4h0bHi1wnYNp1TJiPQXJcV1HccN0U7cxA5IJ9xrMBfhPXZv3PNUwBOW8bwvO84FuMB7gol8+PID8qzMuShOA6hQJEa1cII5x7K7NCMOc3RfMIlDxlIkjS1ItI0loEw1hUcg6O0EN7l0R5xlEAYIFYHD0HYI0ABJvAiEriUYHRGDSeEIDAWFviAA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } + \item{example-2}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsIykUPQiov64ul60cKTUrLoAvPZOzooQAMS6AMIAIgCSAMpZuvxQQbpwAB6wqCJKpeVGulzUAPoNUDb1ZVAGxgDutKQAFirsHREgSrq6AII5BQAyfbqM80tKAL5pHdDwouM9tk3+64v+SgBWRCqtANZwrAcdx8b8cCZQwqStBPy0ogIrWutweT2Au1gYkOQTkAF0lEo0KgViohn4IDMOokSj1cNNdHwhKEcUThNCCTNSDBWj8CIwiKJREEQnAMTMObpqME4NQcf4sgymfZgnU8JSOZUcR1WlVSMwNK1RKg4AR2ZyOZD4PywGdwhLOaJearSDijSJFcrVeqNRzufReTqCsaNLotCxaKK4Ih9ZjbRyCMMbgQxDj3YxPazfkHaCHnj1gMBTgtzmA4XCIqJBPQjaakmYLJprC9dFM-f6ObR+FKmgBCd3oOIwqARFTDGRDUQRahECSx7jsACMcgiav8OTKcHCun8AAUAPIFPIADQ007ni5X1FI-jkaQrnPcpEEjAg7D20JewCrlTh+4P23x5f95pNcH4Oqy88cADkHABNX0D0Jb5aFqPQkgcFwn2AohGHedwP0glIYIPExaEqd8cQAMVmRYClcZ9OXvYjUM5eIkhlOUFR+K0xyIzUegvHU9XFBiZlfV0kk42iVXo4D7UdJJ-GdC1TXDSMRB9NjgMDYNQySCSvWjeT4yCRNkw2NMM10LMcxiHEC0sYsjlLA1-RvFYG1qDgJl0AEME+DQ4O7Xt+2oIc93M20jxPM8LzUqA5Gvas728jlH3CjiXXIJCZzAAjlyAg8YFA8CcLwgiyP9dDMLi3D8MIisSI5Er7zSNJaBMXR2BUcgaO0Nk9zMv1RFGCBWFmdB2GRAASbwIj6o1GB0Rg0k2JQwE2OEgA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } +} +} + diff --git a/man/tm_variable_browser.Rd b/man/tm_variable_browser.Rd index 00d3548b7..9c4c3f119 100644 --- a/man/tm_variable_browser.Rd +++ b/man/tm_variable_browser.Rd @@ -54,16 +54,7 @@ or continuous with a checkbox allowing users to switch how they are treated(if < then the default is discrete, otherwise it is continuous). } \examples{ -library(teal.widgets) - -# Module specification used in apps below -tm_variable_browser_module <- tm_variable_browser( - label = "Variable browser", - ggplot2_args = ggplot2_args( - labs = list(subtitle = "Plot generated by Variable Browser Module") - ) -) - +\dontshow{if (require("sparkline", quietly = TRUE) && require("htmlwidgets", quietly = TRUE) && require("jsonlite", quietly = TRUE)) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # general data example data <- teal_data() data <- within(data, { @@ -77,13 +68,19 @@ datanames(data) <- c("iris", "mtcars", "women", "faithful", "CO2") app <- init( data = data, - modules = modules(tm_variable_browser_module) + modules = modules( + tm_variable_browser( + label = "Variable browser" + ) + ) ) if (interactive()) { shinyApp(app$ui, app$server) } - +\dontshow{\}) # examplesIf} +\dontshow{if (require("sparkline", quietly = TRUE) && require("htmlwidgets", quietly = TRUE) && require("jsonlite", quietly = TRUE)) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # CDISC example data +library(sparkline) data <- teal_data() data <- within(data, { ADSL <- rADSL @@ -94,10 +91,29 @@ join_keys(data) <- default_cdisc_join_keys[datanames(data)] app <- init( data = data, - modules = modules(tm_variable_browser_module) + modules = modules( + tm_variable_browser( + label = "Variable browser" + ) + ) ) if (interactive()) { shinyApp(app$ui, app$server) } - +\dontshow{\}) # examplesIf} +} +\section{Examples in Shinylive}{ +\describe{ + \item{example-1}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsKKoLADWdBBw-ri6XrRwpNSsugC89k7OtgBkGbruMb7+ABakMNQA7rT8UqSikdHecQnJqS6Z2bne+WAAVqIkdOS1MQ2JKQ4tSgDEulLhsrr8UKRQunAAHrCoIkoLSwbGXNQA+jtQNtuLy0a65aQFKuwnUSBKuro+tKJ7b4wfL7owpAILE+VwBQMYNQgr1KRHgUKuMLhfxMUFotzM1C+KLRBQxfwAwgB5ABMXyJxKUAF9FBATtB4KIHhdbFcCH4wO8anhdP4wcDav5ERQBWBsejhCLyf4aUo0Kgvio0X4ofMLk1Hn8+EIRJ8UlrhGJla9XsVDloWLQoPQRIcmERSqIZEbja9qFa4JiUv4AGoWq0iXR2h0yfx-V408NKGm0Ey6dgqcjMSw6Gy2Z4q0R3CCsACC6HYcoAJN4okXHYwdIwaZSlGBKQBdIA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } + \item{example-2}{ + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsKKoLADWdBBw-ri6XrRwpNSsugC89k7OtgBkGbruMb7+ABakMNQA7rT8UqSikdHecQnJqS6Z2bne+WAAVqIkdOS1MQ2JKQ4tSgDEugDCACIAkgDK07pwAB6wqCK6-FCkUEp0TCwcgSFhcIoQu-sGxlzUAPo3UDZKL3e65aQFKuwvURASl0ugAgrNFgAZT6McFQ4Fg2Z2OzOGHg5GuCAAXyuL2g8FE-z2UFsRl0BD8YDhkNq-nRKP8Vy6RBUj2CcFYhJepOM-DgJigwlIjwI-FoogIj2ZrPZnOAeNgYiJ+zkAF0lEo0KhPipaKQ-BAQR8UgCEXwhCJRE1zcIlQiQcVHloWLQoPQRI8mERSqIZAaQQHdNQ3XBqE1-AA1F1u7Zen0yfz23RXEFXK60Ey6dgqcjMSw6Gy2IGG3SiX4QVig9DsLUAEm8UTrvsYOkYVyxSjAWNVQA}{Open in Shinylive} + \if{html}{\out{}} + \if{html}{\out{}} + } } +} + diff --git a/staged_dependencies.yaml b/staged_dependencies.yaml index 16fdd83d9..d484dfe68 100644 --- a/staged_dependencies.yaml +++ b/staged_dependencies.yaml @@ -5,6 +5,9 @@ upstream_repos: insightsengineering/nestcolor: repo: insightsengineering/nestcolor host: https://github.com + insightsengineering/roxy.shinylive: + repo: insightsengineering/roxy.shinylive + host: https://github.com insightsengineering/teal.logger: repo: insightsengineering/teal.logger host: https://github.com diff --git a/vignettes/teal-modules-general.Rmd b/vignettes/teal-modules-general.Rmd index 4ccb9a329..6969a0695 100644 --- a/vignettes/teal-modules-general.Rmd +++ b/vignettes/teal-modules-general.Rmd @@ -10,16 +10,16 @@ vignette: > ### Introduction -`teal` extends the `shiny` framework, enabling the creation of interactive GUI applications using the `R`. -`shiny`, and `teal`facilitate the development of extensive applications through combining small, decoupled modules. -The `teal.modules.general` package consist of collection of modules essential for developing `teal` applications. -It is "general" in the sense that the intended functions of these modules are more fundamental. This contrasts with the more specialized focus on clinical data found in the `teal.modules.clinical` package. +`teal` extends the `shiny` framework, enabling the creation of interactive GUI applications using the `R`. +`shiny`, and `teal`facilitate the development of extensive applications through combining small, decoupled modules. +The `teal.modules.general` package consist of collection of modules essential for developing `teal` applications. +It is "general" in the sense that the intended functions of these modules are more fundamental. This contrasts with the more specialized focus on clinical data found in the `teal.modules.clinical` package. The modules from `teal.modules.general` can be used in conjunction with modules from `teal.modules.clinical` and / or other `shiny` modules to build a large `teal` / `shiny` app. The concepts presented here require knowledge about the core features of `teal`, specifically on how to launch a `teal` -application and how to pass data into it. Therefore, it is highly recommended to refer to the [`README`](https://insightsengineering.github.io/teal/index.html) file and +application and how to pass data into it. Therefore, it is highly recommended to refer to the [`README`](https://insightsengineering.github.io/teal/index.html) file and the introductory [vignette](https://insightsengineering.github.io/teal/latest-tag/articles/getting-started-with-teal.html) of the `teal` package. See also `teal.modules.clinical`'s [`README`](https://insightsengineering.github.io/teal.modules.clinical/latest-tag/index.html). @@ -39,10 +39,11 @@ See [package functions / modules](https://insightsengineering.github.io/teal.mod ### Example application A simple application featuring the `tm_variable_browser()` module: -```{r, message = FALSE, results = "hide"} +```{r app, message = FALSE, results = "hide"} # load libraries library(teal.modules.general) library(teal.widgets) +library(sparkline) # teal_data object data <- teal_data() @@ -69,12 +70,28 @@ app <- init( ) ``` -```{r, eval = FALSE} +```{r shinyapp, eval = FALSE} shinyApp(app$ui, app$server) ``` +### Try it out in Shinylive + +```{r shinylive_url, echo = FALSE, results = 'asis'} +code <- paste0(c( + knitr::knit_code$get("app"), + knitr::knit_code$get("shinyapp") +), collapse = "\n") + +url <- roxy.shinylive::create_shinylive_url(code) +cat(sprintf("[Open in Shinylive](%s)\n\n", url)) +``` + +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +knitr::include_url(url, height = "800px") +``` + Let's break the above app into pieces: 1: Load the necessary libraries and data. diff --git a/vignettes/using-association-plot.Rmd b/vignettes/using-association-plot.Rmd index dc4660cb8..b303ff9b7 100644 --- a/vignettes/using-association-plot.Rmd +++ b/vignettes/using-association-plot.Rmd @@ -19,7 +19,7 @@ This vignette will guide you through the four parts to create a `teal` applicati ## 1 - Load libraries -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r library, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} library(teal.modules.general) # used to create the app library(dplyr) # used to modify data sets ``` @@ -33,7 +33,7 @@ Inside this app 4 datasets will be used 3. `ADTTE` A long data set with time to event data 4. `ADLB` A long data set with lab measurements for each subject -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r data, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} data <- teal_data() data <- within(data, { ADSL <- teal.modules.general::rADSL %>% @@ -56,7 +56,7 @@ join_keys(data) <- default_cdisc_join_keys[datanames] This is the most important section. We will use the `teal::init()` function to create an app. The data will be handed over using `teal.data::teal_data()`. The app itself will be constructed by multiple calls of `tm_g_association()` using different combinations of data sets. -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r app, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} # configuration for a single wide dataset mod1 <- tm_g_association( label = "Single wide dataset", @@ -296,8 +296,26 @@ app <- init( A simple `shiny::shinyApp()` call will let you run the app. Note that app is only displayed when running this code inside an `R` session. -```{r, echo=TRUE, results="hide", eval=base::interactive()} +```{r shinyapp, echo=TRUE, results="hide", eval=base::interactive()} shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ``` + +## 5 - Try it out in Shinylive + +```{r shinylive_url, echo = FALSE, results = 'asis'} +code <- paste0(c( + knitr::knit_code$get("library"), + knitr::knit_code$get("data"), + knitr::knit_code$get("app"), + knitr::knit_code$get("shinyapp") +), collapse = "\n") + +url <- roxy.shinylive::create_shinylive_url(code) +cat(sprintf("[Open in Shinylive](%s)\n\n", url)) +``` + +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +knitr::include_url(url, height = "800px") +``` diff --git a/vignettes/using-bivariate-plot.Rmd b/vignettes/using-bivariate-plot.Rmd index 518692b38..a13de8866 100644 --- a/vignettes/using-bivariate-plot.Rmd +++ b/vignettes/using-bivariate-plot.Rmd @@ -20,7 +20,7 @@ various types of datasets using the bivariate plot module `tm_g_bivariate()`: ## 1 - Load libraries -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r library, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} library(teal.modules.general) # used to create the app library(dplyr) # used to modify data sets ``` @@ -35,7 +35,7 @@ Inside this app 4 datasets will be used 3. `ADTTE` A long data set with time to event data 4. `ADLB` A long data set with lab measurements for each subject -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r data, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} data <- teal_data() data <- within(data, { ADSL <- teal.modules.general::rADSL %>% @@ -61,7 +61,7 @@ create an app. The data will be handed over using `teal.data::teal_data()`. The itself will be constructed by multiple calls of `tm_g_bivariate()` using different combinations of data sets. -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r app, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} # configuration for the single wide dataset mod1 <- tm_g_bivariate( label = "Single wide dataset", @@ -622,8 +622,26 @@ app <- init( A simple `shiny::shinyApp()` call will let you run the app. Note that app is only displayed when running this code inside an `R` session. -```{r, echo=TRUE, results="hide", eval=base::interactive()} +```{r shinyapp, echo=TRUE, results="hide", eval=base::interactive()} shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ``` + +## 5 - Try it out in Shinylive + +```{r shinylive_url, echo = FALSE, results = 'asis'} +code <- paste0(c( + knitr::knit_code$get("library"), + knitr::knit_code$get("data"), + knitr::knit_code$get("app"), + knitr::knit_code$get("shinyapp") +), collapse = "\n") + +url <- roxy.shinylive::create_shinylive_url(code) +cat(sprintf("[Open in Shinylive](%s)\n\n", url)) +``` + +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +knitr::include_url(url, height = "800px") +``` diff --git a/vignettes/using-cross-table.Rmd b/vignettes/using-cross-table.Rmd index fd0c98b6d..73c823003 100644 --- a/vignettes/using-cross-table.Rmd +++ b/vignettes/using-cross-table.Rmd @@ -20,9 +20,10 @@ various types of datasets using the cross table module `tm_t_crosstable()`: ## 1 - Load libraries -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r library, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} library(teal.modules.general) # used to create the app library(dplyr) # used to modify data sets +library(rtables) ``` ## 2 - Create data sets @@ -32,7 +33,7 @@ Inside this app 2 datasets will be used 1. `ADSL` A wide data set with subject data 2. `ADLB` A long data set with lab measurements for each subject -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide", echo=2:6} +```{r data, echo=TRUE, message=FALSE, warning=FALSE, results="hide", echo=2:6} data <- teal_data() data <- within(data, { ADSL <- teal.modules.general::rADSL @@ -55,7 +56,7 @@ create an app. The data will be handed over using `teal.data::teal_data()`. The itself will be constructed by multiple calls of `tm_t_crosstable()` using different combinations of data sets. -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r app, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} # configuration for the single wide dataset mod1 <- tm_t_crosstable( label = "Single wide dataset", @@ -138,8 +139,26 @@ app <- init( A simple `shiny::shinyApp()` call will let you run the app. Note that app is only displayed when running this code inside an `R` session. -```{r, echo=TRUE, results="hide", eval=base::interactive()} +```{r shinyapp, echo=TRUE, results="hide", eval=base::interactive()} shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ``` + +## 5 - Try it out in Shinylive + +```{r shinylive_url, echo = FALSE, results = 'asis'} +code <- paste0(c( + knitr::knit_code$get("library"), + knitr::knit_code$get("data"), + knitr::knit_code$get("app"), + knitr::knit_code$get("shinyapp") +), collapse = "\n") + +url <- roxy.shinylive::create_shinylive_url(code) +cat(sprintf("[Open in Shinylive](%s)\n\n", url)) +``` + +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +knitr::include_url(url, height = "800px") +``` diff --git a/vignettes/using-data-table.Rmd b/vignettes/using-data-table.Rmd index c1a34f450..686f61b14 100644 --- a/vignettes/using-data-table.Rmd +++ b/vignettes/using-data-table.Rmd @@ -20,7 +20,7 @@ various types of datasets using the data table module `tm_data_table()`: ## 1 - Load libraries -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r library, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} library(teal.modules.general) # used to create the app ``` @@ -32,7 +32,7 @@ Inside this app 3 datasets will be used 2. `ADTTE` A long data set with time to event data 3. `ADLB` A long data set with lab measurements for each subject -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r data, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} data <- teal_data() data <- within(data, { ADSL <- teal.modules.general::rADSL @@ -51,7 +51,7 @@ create an app. The data will be handed over using `teal.data::teal_data()`. The app itself will be constructed by multiple calls of `tm_data_table()` using different combinations of data sets. -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r app, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} # configuration for the two-datasets example mod1 <- tm_data_table( label = "Two datasets", @@ -106,11 +106,29 @@ app <- init( ## 4 - Run the app -A simple `shiny::shinyApp()` call will let you run the app. -Note that app is only displayed when running this code inside an `R` session. +A simple `shiny::shinyApp()` call will let you run the app. +Note that app is only displayed when running this code inside an `R` session. -```{r, echo=TRUE, results="hide", eval=base::interactive()} +```{r shinyapp, echo=TRUE, results="hide", eval=base::interactive()} shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ``` + +## 5 - Try it out in Shinylive + +```{r shinylive_url, echo = FALSE, results = 'asis'} +code <- paste0(c( + knitr::knit_code$get("library"), + knitr::knit_code$get("data"), + knitr::knit_code$get("app"), + knitr::knit_code$get("shinyapp") +), collapse = "\n") + +url <- roxy.shinylive::create_shinylive_url(code) +cat(sprintf("[Open in Shinylive](%s)\n\n", url)) +``` + +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +knitr::include_url(url, height = "800px") +``` diff --git a/vignettes/using-outliers-module.Rmd b/vignettes/using-outliers-module.Rmd index 9ed56f0ad..1d6ca8536 100644 --- a/vignettes/using-outliers-module.Rmd +++ b/vignettes/using-outliers-module.Rmd @@ -20,7 +20,7 @@ various types of datasets using the outliers module `tm_outliers()`: ## 1 - Load libraries -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r library, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} library(teal.modules.general) # used to create the app library(dplyr) # used to modify data sets ``` @@ -33,7 +33,7 @@ Inside this app 3 datasets will be used 2. `ADRS` A long data set with response data for subjects at different time points of the study 3. `ADLB` A long data set with lab measurements for each subject -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r data, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} data <- teal_data() data <- within(data, { ADSL <- teal.modules.general::rADSL @@ -52,7 +52,7 @@ create an app. The data will be handed over using `teal.data::teal_data()`. The itself will be constructed by multiple calls of `tm_outliers()` using different combinations of data sets. -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r app, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} # configuration for the single wide dataset mod1 <- tm_outliers( label = "Single wide dataset", @@ -187,11 +187,29 @@ app <- init( ``` ## 4 - Run the app -A simple `shiny::shinyApp()` call will let you run the app. -Note that app is only displayed when running this code inside an `R` session. +A simple `shiny::shinyApp()` call will let you run the app. +Note that app is only displayed when running this code inside an `R` session. -```{r, echo=TRUE, results="hide", eval=base::interactive()} +```{r shinyapp, echo=TRUE, results="hide", eval=base::interactive()} shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ``` + +## 5 - Try it out in Shinylive + +```{r shinylive_url, echo = FALSE, results = 'asis'} +code <- paste0(c( + knitr::knit_code$get("library"), + knitr::knit_code$get("data"), + knitr::knit_code$get("app"), + knitr::knit_code$get("shinyapp") +), collapse = "\n") + +url <- roxy.shinylive::create_shinylive_url(code) +cat(sprintf("[Open in Shinylive](%s)\n\n", url)) +``` + +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +knitr::include_url(url, height = "800px") +``` diff --git a/vignettes/using-regression-plots.Rmd b/vignettes/using-regression-plots.Rmd index 93d901012..94c8aac14 100644 --- a/vignettes/using-regression-plots.Rmd +++ b/vignettes/using-regression-plots.Rmd @@ -21,7 +21,7 @@ various types of datasets using the regression plot module `tm_a_regression()`: ## 1 - Load libraries -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r library, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} library(teal.modules.general) # used to create the app library(dplyr) # used to modify data sets ``` @@ -35,7 +35,7 @@ Inside this app 4 datasets will be used 3. `ADTTE` A long data set with time to event data 4. `ADLB` A long data set with lab measurements for each subject -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r data, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} data <- teal_data() data <- within(data, { ADSL <- teal.modules.general::rADSL %>% @@ -61,7 +61,7 @@ create an app. The data will be handed over using `teal.data::teal_data()`. The itself will be constructed by multiple calls of `tm_a_regression()` using different combinations of data sets. -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r app, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} # configuration for the single wide dataset mod1 <- tm_a_regression( label = "Single wide dataset", @@ -269,8 +269,26 @@ app <- init( A simple `shiny::shinyApp()` call will let you run the app. Note that app is only displayed when running this code inside an `R` session. -```{r, echo=TRUE, results="hide", eval=base::interactive()} +```{r shinyapp, echo=TRUE, results="hide", eval=base::interactive()} shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ``` + +## 5 - Try it out in Shinylive + +```{r shinylive_url, echo = FALSE, results = 'asis'} +code <- paste0(c( + knitr::knit_code$get("library"), + knitr::knit_code$get("data"), + knitr::knit_code$get("app"), + knitr::knit_code$get("shinyapp") +), collapse = "\n") + +url <- roxy.shinylive::create_shinylive_url(code) +cat(sprintf("[Open in Shinylive](%s)\n\n", url)) +``` + +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +knitr::include_url(url, height = "800px") +``` diff --git a/vignettes/using-response-plot.Rmd b/vignettes/using-response-plot.Rmd index 415f095f7..f8054e4c8 100644 --- a/vignettes/using-response-plot.Rmd +++ b/vignettes/using-response-plot.Rmd @@ -20,7 +20,7 @@ various types of datasets using the response plot module `tm_g_response()`: ## 1 - Load libraries -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r library, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} library(teal.modules.general) # used to create the app library(dplyr) # used to modify data sets ``` @@ -34,7 +34,7 @@ Inside this app 4 datasets will be used 3. `ADTTE` A long data set with time to event data 4. `ADLB` A long data set with lab measurements for each subject -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r data, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} data <- teal_data() data <- within(data, { ADSL <- teal.modules.general::rADSL %>% @@ -60,7 +60,7 @@ create an app. The data will be handed over using `teal.data::teal_data()`. The itself will be constructed by multiple calls of `tm_g_response()` using different combinations of data sets. -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r app, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} # configuration for the single wide dataset mod1 <- tm_g_response( label = "Single wide dataset", @@ -378,8 +378,26 @@ app <- init( A simple `shiny::shinyApp()` call will let you run the app. Note that app is only displayed when running this code inside an `R` session. -```{r, echo=TRUE, results="hide", eval=base::interactive()} +```{r shinyapp, echo=TRUE, results="hide", eval=base::interactive()} shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ``` + +## 5 - Try it out in Shinylive + +```{r shinylive_url, echo = FALSE, results = 'asis'} +code <- paste0(c( + knitr::knit_code$get("library"), + knitr::knit_code$get("data"), + knitr::knit_code$get("app"), + knitr::knit_code$get("shinyapp") +), collapse = "\n") + +url <- roxy.shinylive::create_shinylive_url(code) +cat(sprintf("[Open in Shinylive](%s)\n\n", url)) +``` + +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +knitr::include_url(url, height = "800px") +``` diff --git a/vignettes/using-scatterplot-matrix.Rmd b/vignettes/using-scatterplot-matrix.Rmd index befb643fb..c89490ad4 100644 --- a/vignettes/using-scatterplot-matrix.Rmd +++ b/vignettes/using-scatterplot-matrix.Rmd @@ -21,9 +21,10 @@ various types of datasets using the scatter plot matrix module `tm_g_scatterplot ## 1 - Load libraries -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r library, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} library(teal.modules.general) # used to create the app library(dplyr) # used to modify data sets +library(lattice) ``` ## 2 - Create data sets @@ -35,7 +36,7 @@ Inside this app 4 datasets will be used 3. `ADTTE` A long data set with time to event data 4. `ADLB` A long data set with lab measurements for each subject -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r data, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} data <- teal_data() data <- within(data, { ADSL <- teal.modules.general::rADSL %>% @@ -61,7 +62,7 @@ create an app. The data will be handed over using `teal.data::teal_data()`. The itself will be constructed by multiple calls of `tm_g_scatterplotmatrix()` using different combinations of data sets. -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r app, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} # configuration for the single wide dataset mod1 <- tm_g_scatterplotmatrix( label = "Single wide dataset", @@ -156,8 +157,26 @@ app <- init( A simple `shiny::shinyApp()` call will let you run the app. Note that app is only displayed when running this code inside an `R` session. -```{r, echo=TRUE, results="hide", eval=base::interactive()} +```{r shinyapp, echo=TRUE, results="hide", eval=base::interactive()} shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ``` + +## 5 - Try it out in Shinylive + +```{r shinylive_url, echo = FALSE, results = 'asis'} +code <- paste0(c( + knitr::knit_code$get("library"), + knitr::knit_code$get("data"), + knitr::knit_code$get("app"), + knitr::knit_code$get("shinyapp") +), collapse = "\n") + +url <- roxy.shinylive::create_shinylive_url(code) +cat(sprintf("[Open in Shinylive](%s)\n\n", url)) +``` + +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +knitr::include_url(url, height = "800px") +``` diff --git a/vignettes/using-scatterplot.Rmd b/vignettes/using-scatterplot.Rmd index 58e42ef92..bd28df325 100644 --- a/vignettes/using-scatterplot.Rmd +++ b/vignettes/using-scatterplot.Rmd @@ -21,9 +21,12 @@ various types of datasets using the scatter plot module `tm_g_scatterplot()`: ## 1 - Load libraries -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r library, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} library(teal.modules.general) # used to create the app library(dplyr) # used to modify data sets +library(ggpmisc) +library(ggExtra) +library(colourpicker) ``` ## 2 - Create data sets @@ -35,7 +38,7 @@ Inside this app 4 datasets will be used 3. `ADTTE` A long data set with time to event data 4. `ADLB` A long data set with lab measurements for each subject -```{r echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r data, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} data <- teal_data() data <- within(data, { ADSL <- teal.modules.general::rADSL %>% @@ -61,13 +64,7 @@ create an app. The data will be handed over using `teal.data::teal_data()`. The itself will be constructed by multiple calls of `tm_g_scatterplot()` using different combinations of data sets. -```{r ggExtra, include = FALSE} -ggextra_available <- requireNamespace("ggExtra", quietly = TRUE) -``` -```{r, include = !ggextra_available} -# NOTE: The code will not be run as package ggExtra is not installed. -``` -```{r, eval = ggextra_available, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r app, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} # configuration for the single wide datasets mod1 <- tm_g_scatterplot( label = "Single wide dataset", @@ -376,8 +373,26 @@ app <- init( A simple `shiny::shinyApp()` call will let you run the app. Note that app is only displayed when running this code inside an `R` session. -```{r, echo=TRUE, results="hide", eval=base::interactive()} +```{r shinyapp, echo=TRUE, results="hide", eval=base::interactive()} shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ``` + +## 5 - Try it out in Shinylive + +```{r shinylive_url, echo = FALSE, results = 'asis'} +code <- paste0(c( + knitr::knit_code$get("library"), + knitr::knit_code$get("data"), + knitr::knit_code$get("app"), + knitr::knit_code$get("shinyapp") +), collapse = "\n") + +url <- roxy.shinylive::create_shinylive_url(code) +cat(sprintf("[Open in Shinylive](%s)\n\n", url)) +``` + +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +knitr::include_url(url, height = "800px") +``` From ae01110ea4c35ff586ffaeebf7f9455b8a38d57c Mon Sep 17 00:00:00 2001 From: pawelru Date: Tue, 1 Oct 2024 08:32:11 +0000 Subject: [PATCH 24/32] [skip actions] Bump version to 0.3.0.9050 --- DESCRIPTION | 10 +++++----- NEWS.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8b91d2565..a19237bbc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9049 -Date: 2024-09-17 +Version: 0.3.0.9050 +Date: 2024-10-01 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), @@ -93,9 +93,9 @@ Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2, aphalo/ggpmisc, aphalo/ggpp, slowkow/ggrepel, baddstats/goftest, ramnathv/htmlwidgets, jeroen/jsonlite, yihui/knitr, daroczig/logger, deepayan/lattice, insightsengineering/nestcolor, r-lib/pkgload, - r-lib/rlang, rstudio/rmarkdown, insightsengineering/roxy.shinylive, insightsengineering/rtables, - tidyverse/rvest, htmlwidgets/sparkline, rstudio/shinytest2, - r-lib/testthat, r-lib/withr + r-lib/rlang, rstudio/rmarkdown, insightsengineering/roxy.shinylive, + insightsengineering/rtables, tidyverse/rvest, htmlwidgets/sparkline, + rstudio/shinytest2, r-lib/testthat, r-lib/withr Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 Language: en-US diff --git a/NEWS.md b/NEWS.md index cdefc78f4..8c896e68b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9049 +# teal.modules.general 0.3.0.9050 * Removed `Show Warnings` modals from modules. From d9fd08ba2e53c54c549333c65f4f63cb51fd32bb Mon Sep 17 00:00:00 2001 From: Marcin <133694481+m7pr@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:46:37 +0200 Subject: [PATCH 25/32] WIP 771 fix failed pipelines (#789) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #771 - revdepcheck 🆗 https://github.com/insightsengineering/teal.modules.general/actions/runs/11162906687 - rhub 🌮 WIP https://github.com/insightsengineering/teal.modules.general/actions/runs/11211837075/job/31161572229 This fixes R-hub and revdepcheck checks --- .github/workflows/scheduled.yaml | 15 +++++++++++++++ DESCRIPTION | 2 +- vignettes/teal-modules-general.Rmd | 8 ++++---- vignettes/using-association-plot.Rmd | 4 ++-- vignettes/using-bivariate-plot.Rmd | 4 ++-- vignettes/using-cross-table.Rmd | 4 ++-- vignettes/using-data-table.Rmd | 4 ++-- vignettes/using-outliers-module.Rmd | 4 ++-- vignettes/using-regression-plots.Rmd | 4 ++-- vignettes/using-response-plot.Rmd | 4 ++-- vignettes/using-scatterplot-matrix.Rmd | 4 ++-- vignettes/using-scatterplot.Rmd | 10 +++++----- 12 files changed, 41 insertions(+), 26 deletions(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index a73b25644..2aace5e2b 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -56,6 +56,19 @@ jobs: ) name: revdepcheck ↩️ uses: insightsengineering/r.pkg.template/.github/workflows/revdepcheck.yaml@main + with: + lookup-refs: | + insightsengineering/roxy.shinylive + insightsengineering/teal + insightsengineering/teal.transform + insightsengineering/teal.code + insightsengineering/teal.data + insightsengineering/teal.slice + insightsengineering/teal.logger + insightsengineering/teal.reporter + insightsengineering/teal.widgets + insightsengineering/tern + insightsengineering/rtables rhub: if: > github.event_name == 'schedule' || ( @@ -66,10 +79,12 @@ jobs: uses: insightsengineering/r.pkg.template/.github/workflows/rhub.yaml@main with: lookup-refs: | + insightsengineering/roxy.shinylive insightsengineering/teal insightsengineering/teal.transform insightsengineering/teal.code insightsengineering/teal.data + insightsengineering/teal.slice insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets diff --git a/DESCRIPTION b/DESCRIPTION index a19237bbc..42b807f01 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -81,7 +81,7 @@ Suggests: VignetteBuilder: knitr Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2, - rstudio/shiny, insightsengineering/teal, + rstudio/shiny, insightsengineering/teal, insightsengineering/teal.transform, mllg/checkmate, tidyverse/dplyr, rstudio/DT, tidyverse/forcats, r-lib/scales, daattali/shinyjs, shinyTree/shinyTree, rstudio/shinyvalidate, dreamRs/shinyWidgets, diff --git a/vignettes/teal-modules-general.Rmd b/vignettes/teal-modules-general.Rmd index 6969a0695..0980da151 100644 --- a/vignettes/teal-modules-general.Rmd +++ b/vignettes/teal-modules-general.Rmd @@ -39,7 +39,7 @@ See [package functions / modules](https://insightsengineering.github.io/teal.mod ### Example application A simple application featuring the `tm_variable_browser()` module: -```{r app, message = FALSE, results = "hide"} +```{r app, message = FALSE, results = "hide", eval = requireNamespace("sparkline", quietly = TRUE)} # load libraries library(teal.modules.general) library(teal.widgets) @@ -78,7 +78,7 @@ shinyApp(app$ui, app$server) ### Try it out in Shinylive -```{r shinylive_url, echo = FALSE, results = 'asis'} +```{r shinylive_url, echo = FALSE, results = 'asis', eval = requireNamespace("roxy.shinylive", quietly = TRUE)} code <- paste0(c( knitr::knit_code$get("app"), knitr::knit_code$get("shinyapp") @@ -88,7 +88,7 @@ url <- roxy.shinylive::create_shinylive_url(code) cat(sprintf("[Open in Shinylive](%s)\n\n", url)) ``` -```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = requireNamespace("roxy.shinylive", quietly = TRUE) && knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} knitr::include_url(url, height = "800px") ``` @@ -146,7 +146,7 @@ In a `teal` app, data and modules are decoupled. In the app above: - The app developer specified the module and assigned it to the `modules` argument. - The `init` function took these arguments and returned a list containing `ui` and `server` object, which can be demonstrated by running: -```{r, indent = " "} +```{r, indent = " ", eval = requireNamespace("sparkline", quietly = TRUE)} class(app) names(app) ``` diff --git a/vignettes/using-association-plot.Rmd b/vignettes/using-association-plot.Rmd index b303ff9b7..b7f8aff42 100644 --- a/vignettes/using-association-plot.Rmd +++ b/vignettes/using-association-plot.Rmd @@ -304,7 +304,7 @@ shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ## 5 - Try it out in Shinylive -```{r shinylive_url, echo = FALSE, results = 'asis'} +```{r shinylive_url, echo = FALSE, results = 'asis', eval = requireNamespace("roxy.shinylive", quietly = TRUE)} code <- paste0(c( knitr::knit_code$get("library"), knitr::knit_code$get("data"), @@ -316,6 +316,6 @@ url <- roxy.shinylive::create_shinylive_url(code) cat(sprintf("[Open in Shinylive](%s)\n\n", url)) ``` -```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = requireNamespace("roxy.shinylive", quietly = TRUE) && knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} knitr::include_url(url, height = "800px") ``` diff --git a/vignettes/using-bivariate-plot.Rmd b/vignettes/using-bivariate-plot.Rmd index a13de8866..431c87929 100644 --- a/vignettes/using-bivariate-plot.Rmd +++ b/vignettes/using-bivariate-plot.Rmd @@ -630,7 +630,7 @@ shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ## 5 - Try it out in Shinylive -```{r shinylive_url, echo = FALSE, results = 'asis'} +```{r shinylive_url, echo = FALSE, results = 'asis', eval = requireNamespace("roxy.shinylive", quietly = TRUE)} code <- paste0(c( knitr::knit_code$get("library"), knitr::knit_code$get("data"), @@ -642,6 +642,6 @@ url <- roxy.shinylive::create_shinylive_url(code) cat(sprintf("[Open in Shinylive](%s)\n\n", url)) ``` -```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = requireNamespace("roxy.shinylive", quietly = TRUE) && knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} knitr::include_url(url, height = "800px") ``` diff --git a/vignettes/using-cross-table.Rmd b/vignettes/using-cross-table.Rmd index 73c823003..0a9ad3011 100644 --- a/vignettes/using-cross-table.Rmd +++ b/vignettes/using-cross-table.Rmd @@ -147,7 +147,7 @@ shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ## 5 - Try it out in Shinylive -```{r shinylive_url, echo = FALSE, results = 'asis'} +```{r shinylive_url, echo = FALSE, results = 'asis', eval = requireNamespace("roxy.shinylive", quietly = TRUE)} code <- paste0(c( knitr::knit_code$get("library"), knitr::knit_code$get("data"), @@ -159,6 +159,6 @@ url <- roxy.shinylive::create_shinylive_url(code) cat(sprintf("[Open in Shinylive](%s)\n\n", url)) ``` -```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = requireNamespace("roxy.shinylive", quietly = TRUE) && knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} knitr::include_url(url, height = "800px") ``` diff --git a/vignettes/using-data-table.Rmd b/vignettes/using-data-table.Rmd index 686f61b14..27fd1ea3c 100644 --- a/vignettes/using-data-table.Rmd +++ b/vignettes/using-data-table.Rmd @@ -117,7 +117,7 @@ shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ## 5 - Try it out in Shinylive -```{r shinylive_url, echo = FALSE, results = 'asis'} +```{r shinylive_url, echo = FALSE, results = 'asis', eval = requireNamespace("roxy.shinylive", quietly = TRUE)} code <- paste0(c( knitr::knit_code$get("library"), knitr::knit_code$get("data"), @@ -129,6 +129,6 @@ url <- roxy.shinylive::create_shinylive_url(code) cat(sprintf("[Open in Shinylive](%s)\n\n", url)) ``` -```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = requireNamespace("roxy.shinylive", quietly = TRUE) && knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} knitr::include_url(url, height = "800px") ``` diff --git a/vignettes/using-outliers-module.Rmd b/vignettes/using-outliers-module.Rmd index 1d6ca8536..507cf4716 100644 --- a/vignettes/using-outliers-module.Rmd +++ b/vignettes/using-outliers-module.Rmd @@ -198,7 +198,7 @@ shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ## 5 - Try it out in Shinylive -```{r shinylive_url, echo = FALSE, results = 'asis'} +```{r shinylive_url, echo = FALSE, results = 'asis', eval = requireNamespace("roxy.shinylive", quietly = TRUE)} code <- paste0(c( knitr::knit_code$get("library"), knitr::knit_code$get("data"), @@ -210,6 +210,6 @@ url <- roxy.shinylive::create_shinylive_url(code) cat(sprintf("[Open in Shinylive](%s)\n\n", url)) ``` -```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = requireNamespace("roxy.shinylive", quietly = TRUE) && knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} knitr::include_url(url, height = "800px") ``` diff --git a/vignettes/using-regression-plots.Rmd b/vignettes/using-regression-plots.Rmd index 94c8aac14..fe10bce4f 100644 --- a/vignettes/using-regression-plots.Rmd +++ b/vignettes/using-regression-plots.Rmd @@ -277,7 +277,7 @@ shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ## 5 - Try it out in Shinylive -```{r shinylive_url, echo = FALSE, results = 'asis'} +```{r shinylive_url, echo = FALSE, results = 'asis', eval = requireNamespace("roxy.shinylive", quietly = TRUE)} code <- paste0(c( knitr::knit_code$get("library"), knitr::knit_code$get("data"), @@ -289,6 +289,6 @@ url <- roxy.shinylive::create_shinylive_url(code) cat(sprintf("[Open in Shinylive](%s)\n\n", url)) ``` -```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = requireNamespace("roxy.shinylive", quietly = TRUE) && knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} knitr::include_url(url, height = "800px") ``` diff --git a/vignettes/using-response-plot.Rmd b/vignettes/using-response-plot.Rmd index f8054e4c8..59dae80f3 100644 --- a/vignettes/using-response-plot.Rmd +++ b/vignettes/using-response-plot.Rmd @@ -386,7 +386,7 @@ shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ## 5 - Try it out in Shinylive -```{r shinylive_url, echo = FALSE, results = 'asis'} +```{r shinylive_url, echo = FALSE, results = 'asis', eval = requireNamespace("roxy.shinylive", quietly = TRUE)} code <- paste0(c( knitr::knit_code$get("library"), knitr::knit_code$get("data"), @@ -398,6 +398,6 @@ url <- roxy.shinylive::create_shinylive_url(code) cat(sprintf("[Open in Shinylive](%s)\n\n", url)) ``` -```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = requireNamespace("roxy.shinylive", quietly = TRUE) && knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} knitr::include_url(url, height = "800px") ``` diff --git a/vignettes/using-scatterplot-matrix.Rmd b/vignettes/using-scatterplot-matrix.Rmd index c89490ad4..28d09f70e 100644 --- a/vignettes/using-scatterplot-matrix.Rmd +++ b/vignettes/using-scatterplot-matrix.Rmd @@ -165,7 +165,7 @@ shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ## 5 - Try it out in Shinylive -```{r shinylive_url, echo = FALSE, results = 'asis'} +```{r shinylive_url, echo = FALSE, results = 'asis', eval = requireNamespace("roxy.shinylive", quietly = TRUE)} code <- paste0(c( knitr::knit_code$get("library"), knitr::knit_code$get("data"), @@ -177,6 +177,6 @@ url <- roxy.shinylive::create_shinylive_url(code) cat(sprintf("[Open in Shinylive](%s)\n\n", url)) ``` -```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = requireNamespace("roxy.shinylive", quietly = TRUE) && knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} knitr::include_url(url, height = "800px") ``` diff --git a/vignettes/using-scatterplot.Rmd b/vignettes/using-scatterplot.Rmd index bd28df325..ec40e2e8d 100644 --- a/vignettes/using-scatterplot.Rmd +++ b/vignettes/using-scatterplot.Rmd @@ -21,7 +21,7 @@ various types of datasets using the scatter plot module `tm_g_scatterplot()`: ## 1 - Load libraries -```{r library, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r library, echo=TRUE, message=FALSE, warning=FALSE, results="hide", eval = requireNamespace("ggpmics") && requireNamespace("ggExtra") && requireNamespace("colourpicker")} library(teal.modules.general) # used to create the app library(dplyr) # used to modify data sets library(ggpmisc) @@ -38,7 +38,7 @@ Inside this app 4 datasets will be used 3. `ADTTE` A long data set with time to event data 4. `ADLB` A long data set with lab measurements for each subject -```{r data, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r data, echo=TRUE, message=FALSE, warning=FALSE, results="hide", eval = requireNamespace("ggpmics") && requireNamespace("ggExtra") && requireNamespace("colourpicker")} data <- teal_data() data <- within(data, { ADSL <- teal.modules.general::rADSL %>% @@ -64,7 +64,7 @@ create an app. The data will be handed over using `teal.data::teal_data()`. The itself will be constructed by multiple calls of `tm_g_scatterplot()` using different combinations of data sets. -```{r app, echo=TRUE, message=FALSE, warning=FALSE, results="hide"} +```{r app, echo=TRUE, message=FALSE, warning=FALSE, results="hide", eval = requireNamespace("ggpmics") && requireNamespace("ggExtra") && requireNamespace("colourpicker")} # configuration for the single wide datasets mod1 <- tm_g_scatterplot( label = "Single wide dataset", @@ -381,7 +381,7 @@ shinyApp(app$ui, app$server, options = list(height = 1024, width = 1024)) ## 5 - Try it out in Shinylive -```{r shinylive_url, echo = FALSE, results = 'asis'} +```{r shinylive_url, echo = FALSE, results = 'asis', eval = requireNamespace("roxy.shinylive", quietly = TRUE)} code <- paste0(c( knitr::knit_code$get("library"), knitr::knit_code$get("data"), @@ -393,6 +393,6 @@ url <- roxy.shinylive::create_shinylive_url(code) cat(sprintf("[Open in Shinylive](%s)\n\n", url)) ``` -```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} +```{r shinylive_iframe, echo = FALSE, out.width = '150%', out.extra = 'style = "position: relative; z-index:1"', eval = requireNamespace("roxy.shinylive", quietly = TRUE) && knitr::is_html_output() && identical(Sys.getenv("IN_PKGDOWN"), "true")} knitr::include_url(url, height = "800px") ``` From 643644eb0d839c755cc796f6074b6f8c4b9b59ea Mon Sep 17 00:00:00 2001 From: donyunardi Date: Mon, 7 Oct 2024 21:47:30 +0000 Subject: [PATCH 26/32] [skip actions] Bump version to 0.3.0.9051 --- .pre-commit-config.yaml | 2 +- DESCRIPTION | 6 +++--- NEWS.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7dd8e86f4..469b6771c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ --- # All available hooks: https://pre-commit.com/hooks.html # R specific hooks: https://github.com/lorenzwalthert/precommit -default_stages: [commit] +default_stages: [pre-commit] default_language_version: python: python3 repos: diff --git a/DESCRIPTION b/DESCRIPTION index 42b807f01..fd23a917a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9050 -Date: 2024-10-01 +Version: 0.3.0.9051 +Date: 2024-10-07 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), @@ -81,7 +81,7 @@ Suggests: VignetteBuilder: knitr Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2, - rstudio/shiny, insightsengineering/teal, + rstudio/shiny, insightsengineering/teal, insightsengineering/teal.transform, mllg/checkmate, tidyverse/dplyr, rstudio/DT, tidyverse/forcats, r-lib/scales, daattali/shinyjs, shinyTree/shinyTree, rstudio/shinyvalidate, dreamRs/shinyWidgets, diff --git a/NEWS.md b/NEWS.md index 8c896e68b..62b8e77e5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9050 +# teal.modules.general 0.3.0.9051 * Removed `Show Warnings` modals from modules. From dfd33c43afb41417a6f4852304dfec31170065de Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Fri, 25 Oct 2024 12:20:30 +0200 Subject: [PATCH 27/32] add rmarkdown to VignetteBuilder (#792) fix nosuggest ci --- DESCRIPTION | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index fd23a917a..a04a431f4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -79,7 +79,8 @@ Suggests: testthat (>= 3.1.9), withr (>= 2.0.0) VignetteBuilder: - knitr + knitr, + rmarkdown Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2, rstudio/shiny, insightsengineering/teal, insightsengineering/teal.transform, mllg/checkmate, tidyverse/dplyr, From 0ea551b583ec739c7a4b01b70b7e8bce9b5133e7 Mon Sep 17 00:00:00 2001 From: pawelru Date: Fri, 25 Oct 2024 10:21:26 +0000 Subject: [PATCH 28/32] [skip actions] Bump version to 0.3.0.9052 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index a04a431f4..b371e0f7c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9051 -Date: 2024-10-07 +Version: 0.3.0.9052 +Date: 2024-10-25 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 62b8e77e5..6b98d9689 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9051 +# teal.modules.general 0.3.0.9052 * Removed `Show Warnings` modals from modules. From b0d1863735f5a29b1ac2459c1683906e52528d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Mon, 4 Nov 2024 12:53:41 +0000 Subject: [PATCH 29/32] Adds `roxy.shinylive` to pre-commit configuration (#793) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Pull Request Fixes https://github.com/insightsengineering/nestdevs-tasks/issues/85 ### Changes description - Add dependency to pre-commit configuration --------- Signed-off-by: André Veríssimo <211358+averissimo@users.noreply.github.com> --- .pre-commit-config.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 469b6771c..b154dbae6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ default_language_version: python: python3 repos: - repo: https://github.com/lorenzwalthert/precommit - rev: v0.4.3.9001 + rev: v0.4.3.9003 hooks: - id: style-files name: Style code with `styler` @@ -18,8 +18,6 @@ repos: - ggmosaic - ggplot2 - shiny - - teal - - teal.transform - checkmate - dplyr - DT @@ -33,6 +31,9 @@ repos: - shinyWidgets - stats - stringr + - insightsengineering/roxy.shinylive + - insightsengineering/teal + - insightsengineering/teal.transform - insightsengineering/teal.code - insightsengineering/teal.data - insightsengineering/teal.logger From e67d7f2b46f302ccd2ac41d942f30bf6f68609d3 Mon Sep 17 00:00:00 2001 From: averissimo Date: Mon, 4 Nov 2024 12:54:34 +0000 Subject: [PATCH 30/32] [skip actions] Bump version to 0.3.0.9053 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b371e0f7c..c91bff840 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9052 -Date: 2024-10-25 +Version: 0.3.0.9053 +Date: 2024-11-04 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 6b98d9689..b50d8ce9a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9052 +# teal.modules.general 0.3.0.9053 * Removed `Show Warnings` modals from modules. From 3c9bcb4461302e5cfdaae06ac9d7f9f6c3795781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Fri, 8 Nov 2024 14:02:16 +0000 Subject: [PATCH 31/32] `teal.data::datanames()` is deprecated in favor of dot-prefix and `names()` (#794) # Pull Request Part of https://github.com/insightsengineering/teal.data/issues/333 Blocked by: - https://github.com/insightsengineering/teal.code/pull/218 - https://github.com/insightsengineering/teal.data/pull/347 - https://github.com/insightsengineering/teal/pull/1402 --- DESCRIPTION | 8 ++++---- R/tm_a_pca.R | 5 +---- R/tm_a_regression.R | 4 +--- R/tm_data_table.R | 6 ++---- R/tm_file_viewer.R | 1 - R/tm_front_page.R | 5 ++--- R/tm_g_association.R | 4 +--- R/tm_g_bivariate.R | 4 +--- R/tm_g_distribution.R | 10 ++++------ R/tm_g_response.R | 4 +--- R/tm_g_scatterplot.R | 4 +--- R/tm_g_scatterplotmatrix.R | 4 +--- R/tm_missing_data.R | 15 +++++++-------- R/tm_outliers.R | 6 ++---- R/tm_t_crosstable.R | 4 +--- R/tm_variable_browser.R | 6 ++---- man/tm_a_pca.Rd | 13 +++++-------- man/tm_a_regression.Rd | 12 +++++------- man/tm_data_table.Rd | 12 +++++------- man/tm_file_viewer.Rd | 5 ++--- man/tm_front_page.Rd | 7 +++---- man/tm_g_association.Rd | 12 +++++------- man/tm_g_bivariate.Rd | 12 +++++------- man/tm_g_distribution.Rd | 12 +++++------- man/tm_g_response.Rd | 12 +++++------- man/tm_g_scatterplot.Rd | 12 +++++------- man/tm_g_scatterplotmatrix.Rd | 12 +++++------- man/tm_missing_data.Rd | 12 +++++------- man/tm_outliers.Rd | 12 +++++------- man/tm_t_crosstable.Rd | 12 +++++------- man/tm_variable_browser.Rd | 12 +++++------- tests/testthat/helper-TealAppDriver.R | 16 ++++++---------- tests/testthat/test-shinytest2-tm_a_pca.R | 2 -- tests/testthat/test-shinytest2-tm_a_regression.R | 1 - .../testthat/test-shinytest2-tm_g_association.R | 5 ++--- tests/testthat/test-shinytest2-tm_g_bivariate.R | 1 - .../testthat/test-shinytest2-tm_g_distribution.R | 7 ++----- tests/testthat/test-shinytest2-tm_g_response.R | 3 +-- .../testthat/test-shinytest2-tm_g_scatterplot.R | 3 +-- tests/testthat/test-shinytest2-tm_outliers.R | 1 - vignettes/teal-modules-general.Rmd | 8 ++------ vignettes/using-association-plot.Rmd | 4 +--- vignettes/using-bivariate-plot.Rmd | 4 +--- vignettes/using-cross-table.Rmd | 4 +--- vignettes/using-data-table.Rmd | 4 +--- vignettes/using-outliers-module.Rmd | 4 +--- vignettes/using-regression-plots.Rmd | 4 +--- vignettes/using-response-plot.Rmd | 4 +--- vignettes/using-scatterplot-matrix.Rmd | 4 +--- vignettes/using-scatterplot.Rmd | 4 +--- 50 files changed, 124 insertions(+), 218 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index c91bff840..580816261 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -27,8 +27,8 @@ Depends: ggplot2 (>= 3.4.0), R (>= 3.6), shiny (>= 1.6.0), - teal (>= 0.15.2.9052), - teal.transform (>= 0.5.0) + teal (>= 0.15.2.9079), + teal.transform (>= 0.5.0.9015) Imports: checkmate (>= 2.1.0), dplyr (>= 1.0.5), @@ -42,8 +42,8 @@ Imports: shinyWidgets (>= 0.5.1), stats, stringr (>= 1.4.1), - teal.code (>= 0.5.0), - teal.data (>= 0.5.0), + teal.code (>= 0.5.0.9012), + teal.data (>= 0.6.0.9015), teal.logger (>= 0.2.0.9004), teal.reporter (>= 0.3.0), teal.widgets (>= 0.4.0), diff --git a/R/tm_a_pca.R b/R/tm_a_pca.R index 53996ebb7..7753c3101 100644 --- a/R/tm_a_pca.R +++ b/R/tm_a_pca.R @@ -30,8 +30,6 @@ #' USArrests <- USArrests #' }) #' -#' datanames(data) <- "USArrests" -#' #' app <- init( #' data = data, #' modules = modules( @@ -66,8 +64,7 @@ #' require(nestcolor) #' ADSL <- rADSL #' }) -#' datanames(data) <- "ADSL" -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' app <- init( #' data = data, diff --git a/R/tm_a_regression.R b/R/tm_a_regression.R index 89406f5e5..4e28de543 100644 --- a/R/tm_a_regression.R +++ b/R/tm_a_regression.R @@ -53,7 +53,6 @@ #' require(nestcolor) #' CO2 <- CO2 #' }) -#' datanames(data) <- c("CO2") #' #' app <- init( #' data = data, @@ -98,8 +97,7 @@ #' require(nestcolor) #' ADSL <- rADSL #' }) -#' datanames(data) <- "ADSL" -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' app <- init( #' data = data, diff --git a/R/tm_data_table.R b/R/tm_data_table.R index 4a2be49d4..2a688f7d7 100644 --- a/R/tm_data_table.R +++ b/R/tm_data_table.R @@ -40,7 +40,6 @@ #' require(nestcolor) #' iris <- iris #' }) -#' datanames(data) <- c("iris") #' #' app <- init( #' data = data, @@ -68,8 +67,7 @@ #' require(nestcolor) #' ADSL <- rADSL #' }) -#' datanames(data) <- "ADSL" -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' app <- init( #' data = data, @@ -196,7 +194,7 @@ srv_page_data_table <- function(id, if_filtered <- reactive(as.logical(input$if_filtered)) if_distinct <- reactive(as.logical(input$if_distinct)) - datanames <- isolate(teal.data::datanames(data())) + datanames <- isolate(names(data())) datanames <- Filter(function(name) { is.data.frame(isolate(data())[[name]]) }, datanames) diff --git a/R/tm_file_viewer.R b/R/tm_file_viewer.R index 772dfdac3..ee2d50acb 100644 --- a/R/tm_file_viewer.R +++ b/R/tm_file_viewer.R @@ -22,7 +22,6 @@ #' data <- within(data, { #' data <- data.frame(1) #' }) -#' datanames(data) <- c("data") #' #' app <- init( #' data = data, diff --git a/R/tm_front_page.R b/R/tm_front_page.R index 7304eb90c..6cdbb0ce8 100644 --- a/R/tm_front_page.R +++ b/R/tm_front_page.R @@ -28,8 +28,7 @@ #' ADSL <- rADSL #' attr(ADSL, "metadata") <- list("Author" = "NEST team", "data_source" = "synthetic data") #' }) -#' datanames(data) <- "ADSL" -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' table_1 <- data.frame(Info = c("A", "B"), Text = c("A", "B")) #' table_2 <- data.frame(`Column 1` = c("C", "D"), `Column 2` = c(5.5, 6.6), `Column 3` = c("A", "B")) @@ -169,7 +168,7 @@ srv_front_page <- function(id, data, tables, show_metadata) { ) metadata_data_frame <- reactive({ - datanames <- teal.data::datanames(data()) + datanames <- names(data()) convert_metadata_to_dataframe( lapply(datanames, function(dataname) attr(data()[[dataname]], "metadata")), datanames diff --git a/R/tm_g_association.R b/R/tm_g_association.R index c3698f5d8..3611df804 100644 --- a/R/tm_g_association.R +++ b/R/tm_g_association.R @@ -38,7 +38,6 @@ #' factors <- names(Filter(isTRUE, vapply(CO2, is.factor, logical(1L)))) #' CO2[factors] <- lapply(CO2[factors], as.character) #' }) -#' datanames(data) <- c("CO2") #' #' app <- init( #' data = data, @@ -81,8 +80,7 @@ #' require(nestcolor) #' ADSL <- rADSL #' }) -#' datanames(data) <- "ADSL" -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' app <- init( #' data = data, diff --git a/R/tm_g_bivariate.R b/R/tm_g_bivariate.R index bf9358476..4e93151b9 100644 --- a/R/tm_g_bivariate.R +++ b/R/tm_g_bivariate.R @@ -57,7 +57,6 @@ #' require(nestcolor) #' CO2 <- data.frame(CO2) #' }) -#' datanames(data) <- c("CO2") #' #' app <- init( #' data = data, @@ -116,8 +115,7 @@ #' require(nestcolor) #' ADSL <- rADSL #' }) -#' datanames(data) <- c("ADSL") -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' app <- init( #' data = data, diff --git a/R/tm_g_distribution.R b/R/tm_g_distribution.R index 6b6192678..22d5fec89 100644 --- a/R/tm_g_distribution.R +++ b/R/tm_g_distribution.R @@ -39,7 +39,6 @@ #' data <- within(data, { #' iris <- iris #' }) -#' datanames(data) <- "iris" #' #' app <- init( #' data = data, @@ -68,8 +67,7 @@ #' data <- within(data, { #' ADSL <- rADSL #' }) -#' datanames(data) <- c("ADSL") -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' vars1 <- choices_selected( #' variable_choices(data[["ADSL"]], c("ARM", "COUNTRY", "SEX")), @@ -1216,15 +1214,15 @@ srv_distribution <- function(id, # wrapped in if since could lead into validate error - we do want to continue test_r_qenv_out <- try(test_q(), silent = TRUE) if (!inherits(test_r_qenv_out, c("try-error", "error"))) { - qenv_final <- teal.code::join(qenv_final, test_q()) + qenv_final <- c(qenv_final, test_q()) } qenv_final <- if (tab == "Histogram") { req(dist_q()) - teal.code::join(qenv_final, dist_q()) + c(qenv_final, dist_q()) } else if (tab == "QQplot") { req(qq_q()) - teal.code::join(qenv_final, qq_q()) + c(qenv_final, qq_q()) } qenv_final }) diff --git a/R/tm_g_response.R b/R/tm_g_response.R index 35ee6d36a..a593c46a4 100644 --- a/R/tm_g_response.R +++ b/R/tm_g_response.R @@ -53,7 +53,6 @@ #' mtcars[[v]] <- as.factor(mtcars[[v]]) #' } #' }) -#' datanames(data) <- "mtcars" #' #' app <- init( #' data = data, @@ -98,8 +97,7 @@ #' require(nestcolor) #' ADSL <- rADSL #' }) -#' datanames(data) <- c("ADSL") -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' app <- init( #' data = data, diff --git a/R/tm_g_scatterplot.R b/R/tm_g_scatterplot.R index d093a4fad..1f2d9d58a 100644 --- a/R/tm_g_scatterplot.R +++ b/R/tm_g_scatterplot.R @@ -43,7 +43,6 @@ #' require(nestcolor) #' CO2 <- CO2 #' }) -#' datanames(data) <- "CO2" #' #' app <- init( #' data = data, @@ -133,8 +132,7 @@ #' require(nestcolor) #' ADSL <- rADSL #' }) -#' datanames(data) <- c("ADSL") -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' app <- init( #' data = data, diff --git a/R/tm_g_scatterplotmatrix.R b/R/tm_g_scatterplotmatrix.R index a570bf6bb..70f5d4b7e 100644 --- a/R/tm_g_scatterplotmatrix.R +++ b/R/tm_g_scatterplotmatrix.R @@ -56,7 +56,6 @@ #' profit = rnorm(50, 20, 10) #' ) #' }) -#' datanames(data) <- c("countries", "sales") #' join_keys(data) <- join_keys( #' join_key("countries", "countries", "id"), #' join_key("sales", "sales", "id"), @@ -117,8 +116,7 @@ #' ADSL <- rADSL #' ADRS <- rADRS #' }) -#' datanames(data) <- c("ADSL", "ADRS") -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' app <- init( #' data = data, diff --git a/R/tm_missing_data.R b/R/tm_missing_data.R index 7f026cb49..d57c616bd 100644 --- a/R/tm_missing_data.R +++ b/R/tm_missing_data.R @@ -40,7 +40,6 @@ #' mtcars[["cyl"]] <- as.factor(mtcars[["cyl"]]) #' mtcars[["gear"]] <- as.factor(mtcars[["gear"]]) #' }) -#' datanames(data) <- c("iris", "mtcars") #' #' app <- init( #' data = data, @@ -64,8 +63,7 @@ #' ADSL <- rADSL #' ADRS <- rADRS #' }) -#' datanames(data) <- c("ADSL", "ADRS") -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' app <- init( #' data = data, @@ -173,10 +171,11 @@ srv_page_missing_data <- function(id, data, reporter, filter_panel_api, parent_d moduleServer(id, function(input, output, session) { teal.logger::log_shiny_input_changes(input, namespace = "teal.modules.general") - datanames <- isolate(teal.data::datanames(data())) - datanames <- Filter(function(name) { - is.data.frame(isolate(data())[[name]]) - }, datanames) + datanames <- isolate(names(data())) + datanames <- Filter( + function(name) is.data.frame(isolate(data())[[name]]), + datanames + ) if_subject_plot <- length(parent_dataname) > 0 && parent_dataname %in% datanames ns <- session$ns @@ -465,7 +464,7 @@ srv_missing_data <- function(id, data, reporter, filter_panel_api, dataname, par data_parent_keys <- reactive({ - if (length(parent_dataname) > 0 && parent_dataname %in% teal.data::datanames(data())) { + if (length(parent_dataname) > 0 && parent_dataname %in% names(data())) { keys <- teal.data::join_keys(data())[[dataname]] if (parent_dataname %in% names(keys)) { keys[[parent_dataname]] diff --git a/R/tm_outliers.R b/R/tm_outliers.R index 03a43b18e..dab983f2d 100644 --- a/R/tm_outliers.R +++ b/R/tm_outliers.R @@ -28,7 +28,6 @@ #' CO2 <- CO2 #' CO2[["primary_key"]] <- seq_len(nrow(CO2)) #' }) -#' datanames(data) <- "CO2" #' join_keys(data) <- join_keys(join_key("CO2", "CO2", "primary_key")) #' #' vars <- choices_selected(variable_choices(data[["CO2"]], c("Plant", "Type", "Treatment"))) @@ -77,8 +76,7 @@ #' data <- within(data, { #' ADSL <- rADSL #' }) -#' datanames(data) <- "ADSL" -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' fact_vars_adsl <- names(Filter(isTRUE, sapply(data[["ADSL"]], is.factor))) #' vars <- choices_selected(variable_choices(data[["ADSL"]], fact_vars_adsl)) @@ -396,7 +394,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var, }) # Used to create outlier table and the dropdown with additional columns - dataname_first <- isolate(teal.data::datanames(data())[[1]]) + dataname_first <- isolate(names(data())[[1]]) common_code_q <- reactive({ req(iv_r()$is_valid()) diff --git a/R/tm_t_crosstable.R b/R/tm_t_crosstable.R index 9e4e8e62c..47d84bcfd 100644 --- a/R/tm_t_crosstable.R +++ b/R/tm_t_crosstable.R @@ -39,7 +39,6 @@ #' } #' mtcars[["primary_key"]] <- seq_len(nrow(mtcars)) #' }) -#' datanames(data) <- "mtcars" #' join_keys(data) <- join_keys(join_key("mtcars", "mtcars", "primary_key")) #' #' app <- init( @@ -85,8 +84,7 @@ #' data <- within(data, { #' ADSL <- rADSL #' }) -#' datanames(data) <- "ADSL" -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' app <- init( #' data = data, diff --git a/R/tm_variable_browser.R b/R/tm_variable_browser.R index 28e0c11d1..708c835e7 100644 --- a/R/tm_variable_browser.R +++ b/R/tm_variable_browser.R @@ -37,7 +37,6 @@ #' faithful <- faithful #' CO2 <- CO2 #' }) -#' datanames(data) <- c("iris", "mtcars", "women", "faithful", "CO2") #' #' app <- init( #' data = data, @@ -65,8 +64,7 @@ #' ADSL <- rADSL #' ADTTE <- rADTTE #' }) -#' datanames(data) <- c("ADSL", "ADTTE") -#' join_keys(data) <- default_cdisc_join_keys[datanames(data)] +#' join_keys(data) <- default_cdisc_join_keys[names(data)] #' #' app <- init( #' data = data, @@ -225,7 +223,7 @@ srv_variable_browser <- function(id, varname_numeric_as_factor <- reactiveValues() - datanames <- isolate(teal.data::datanames(data())) + datanames <- isolate(names(data())) datanames <- Filter(function(name) { is.data.frame(isolate(data())[[name]]) }, datanames) diff --git a/man/tm_a_pca.Rd b/man/tm_a_pca.Rd index 0c3613ac4..ac4f506ba 100644 --- a/man/tm_a_pca.Rd +++ b/man/tm_a_pca.Rd @@ -90,8 +90,6 @@ data <- within(data, { USArrests <- USArrests }) -datanames(data) <- "USArrests" - app <- init( data = data, modules = modules( @@ -121,8 +119,7 @@ data <- within(data, { require(nestcolor) ADSL <- rADSL }) -datanames(data) <- "ADSL" -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] app <- init( data = data, @@ -151,14 +148,14 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlY4AygCCjNUtonG6fYPDpKJKAL5d6UHQ8KLFGbZZCmATQ2LTW27Q6GMqeewV-hm6ALyXQbgXfEIio7dPwmLn3ZW6pDCJUESqAIqQuP10WwACgBhfpbB7fcExG53QFhUjMDSJUSoOAEL7gpEZZZ6W5bHZTGZ4MGE0RwEQaFF0hmkbG4-E0wm6Aj5Ii0AhiFFaFi0KD0ESJHl8gWrTlc1EolLAYDkga7EZbAC6mtKHLAAFlBIx+DJ4RCwP1RKIoMJSGbyYx6FAIJCiKh7WAsGg4FsuvKfnIEf7Ksy8eR+Ci9Ybjaa8ObLdbbb6g8GYLbaJFSfYnK5EYTA3LKiZaNRyIwUQA5RwAGWrcr9AYuXS6tBMunYKjL6k0OhstnK31EhQgrH66HYaFQABJ6qVJ1O6YwdJ05kowLNNUA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlY4AygCCjNUtonG6fYPDpKJKAL5dSmioYyp57BX+GboAvJtBuBt8QiKju0fCYuvdlbqkMIlQiagEqRs3ugpgAAoAwv2fB2u7xiOz2jzCpGYGkSolQcAIV3ewIy0HgoM+EyGYmmALeSNEcBEGlBBKJpBhcIReKRugI+SItAIYlBWhYtCg9BEiTpDKZokRNKRKVBKWAwAxAyxI0+AF0ZaUqWAALKCRj8GQAj5gfqiURQYSkTUYxj0KAQL5EVBGsBYNBwT5dQU3OSAp2VUnw8j8UGKlVqjV4LU6vUGh2ut0wA20SJ6XYOFzU53hmkmWjUciMUEAOUcABlc4nHc6Nl0urQTLp2CoM+pNDobLZytdRIUIKx+uh2EsACT1Uo9gmMHSdOZKMCzGVAA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } \item{example-2}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+zOh4UQrc23yFMCnRjaUAKyIVNIBrOFZlzLXjfjgTKGFSNIJ+WlECNP3Dk7PgBdgxFfCcgAum5oOgJipiuxaiFcroALyw8K4GF8IQiUQI3Ro4T-GF1UgwNJQNKoAhZfF1XQbAAKXkGGxRAypdUSWMyaWipGYGjSolQcAI0OZLNZuUWekRGy2jMpLNEcBEGixCqVD35guFotFBBKBwIYixWhYtCg9BEjz1tANyzl2qREURmWAwGlI22YCBQKqQo2ACEALJYADSWAAjIzqZsAOKuPBR5wAeQCPgAmht+vaqXImVm6qrBeR+FjfWBAyHw5HpbGM7m8zB7rQ4pL7E5XCLRTm7XUTLRqORGFiAHKOUbbDt1TPZmH9fq0Ey6dgqAfqTQ6Gy2GrM0RlCCsQbodhoVAAEhaVWPJ4VjB0fVmSjAMyBQA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+gCsiFTSAazhWUQrc23z+OBMoYVI0gn5aUQI0xeW1jeBoeE3MuQBdN2h0CZVi9lqQ3N0AF5-uFcH8+EIRKIgboIcIxL8BnVdKQYGkoGlUAQsn9kboFGAAApeQYEsFIvGJGGZNLRUjMDRpUSoOAERF4ym5B56YEEqajMm4jmiOAiDQwkVi47M1nsjl4gglJYEMQwrQsWhQegiE5K2gqzZC+V1TLU3LAYB8kYCsAvF5VNkEgBCAFksABpLAARjJ+LAgwA4q48H7nAB5AI+ACaBP6xuRcnJ8bqktZ5H4MMdYFdHu9vr5QdjSeTMCOtDiPPsTlcFI5iaNyJMtGo5EYMIAco5RgLa3U4wm-v1+rQTLp2CpW+pNDobLYakjRGUIKxBuh2GhUAASFpVDebkWMHR9WZKMAzF5AA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_a_regression.Rd b/man/tm_a_regression.Rd index 40a1679c0..85b3c578d 100644 --- a/man/tm_a_regression.Rd +++ b/man/tm_a_regression.Rd @@ -117,7 +117,6 @@ data <- within(data, { require(nestcolor) CO2 <- CO2 }) -datanames(data) <- c("CO2") app <- init( data = data, @@ -157,8 +156,7 @@ data <- within(data, { require(nestcolor) ADSL <- rADSL }) -datanames(data) <- "ADSL" -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] app <- init( data = data, @@ -196,14 +194,14 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlQDCAPIATHG6-QNKAL5dKdDwosUZtlkE7Apgo6tdSmiowyp5K93+GboAvEdBuBW6fEIioqfXAsJiB5WVpDCJUInVEtWioisEFeb0q1Cg9DgfjOqywcD+YkBJFWl0OoP+qBIoj0ZxSiTCpGYGkSolQcGWV1BlWmsBxulW6zwlKp2JEGgerPJpBJZIpaKpYIhUIeqwAylCubotCxaBCRIgUcyBQR8kRaAQxCKwIJUEEANZwRX8gWcjRwfhanX6w1M41UmDCTSROkAMQAggAZUXOVEC0EmWihc0PBwuJVvLoCuS+qm-f6iDoPPEEonc0nkkECmnwLWMmMmiXss6mtO8zN+8GQ6H0sDitmkKUyuViBW2v1vFVqjX3M7Sxiy+giRKd9UvFLAYAMwarAC6M9KFMIJAIKJrdmqgXgZA20fDoJLwZhS4sRvblQd1CdIhDTh9e7eAaDFrO7q9rjtlUjVK-n6uXS6tAmLo7AqOQqbaHANi2OUhyiIUECsG66DsNsAAk9SlGh2KMDonQTEoYDjDOQA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlQDCAPIATHG6-QNKAL5dSmiowyp57BX+GboAvMtBuEt8QiKia7o7wmKL3ZW6pDCJUInVEtWiolYQp+fn1FD0cH7rCmBYcHuYieJD+WzObweqBIoj06xSiTCpGYGkSolQcAIrze5xS0HgBz+ozBSxxulhIg0BwpmNIaIxWNJZN0Hy+P10fwAyt9abotCxaJ8RIgSRDmQR8kRaAQxISwIJUEEANZwUXM840jRwfhyhXK1V4JlkmDCTSROG6ABiAEEADKc5zg9WVEy0ULag4OFxG85dMlyJ04u4PUQdA4IpEounozHYsl42AWomDNXMzWkak81Exxlisms75y7mUjP8xiC+h7EWGvM4iVSmX7dZlisiRL16UnFLAYDJsZgAC6A9KjMIJAIYI5YDs1UC8DIfzkAZ9b3THt+Y4sqfVJuoZpEnqcjpX51d7p16xt9tctcqfpx97vSy6XVoJl07BU5Cj2jgNls5RnKIhQQKw1roOwMwACT1KU0GwowOidBMShgOMA5AA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } \item{example-2}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+zOh4UQrc23yFMCnRjaUAKyIVNIBrOFZlzLXjfjgTKGFSNIJ+WlECNP3Dk7PgBdgxFfCcgAum5oOgJipiuxaiFcroALyw8K4GF8IQiUQI3Ro4T-GF1UgwNJQNINCQNUSiKwQaEDOr06hQehwahYjZYODksRUkgbFF0+n1MSoEiiPSIzJpaKkZgaNKiVBwAi0wWC37wNmbEbbPD41VikQaLEGpUPBVKlWqwWM5msxEbAIs026LQsWhMkSIPl6q0EEoHAhiTUAIQAslgANJYACM3oFVt0Jo0cH4IfDUdjuvjVpg91ocXFugAYoNRgFnPyE-STLQoimsQ4XD76f0rXJK6qyRTRL0sZLpbKzYrlc26urCxstnGq0nSManXLzSPs6qbSzNY7DXPXYx3fQMV6s1W6n6A0HETu9yJHv7aIHzrlgMBJ9qNkCgVUR5sAOKuPC6B1nAADT5ACwCwQYvD-OR21HelZ3re0fz-Dsq1zahNALBsnArOC6hrOtU0REsy1cFc6lbVVKIomF+n6WgTF0dgVHIQdtDgGxbBqOlRDKCBWEGdB2DQVAABIWiqETRLFRgdD6WYlDAGYgSAA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+gCsiFTSAazhWUQrc23z+OBMoYVI0gn5aUQI0xeW1jeBoeE3MuQBdN2h0CZVi9lqQ3N0AF5-uFcH8+EIRKIgboIcIxL8BnVdKQYGkoGkGhIGqJRFYIIjkcjqFB6HBqDCFGAsHBsWI8SQqWCkUScagSKI9MDMmloqRmBo0qJUHACISicjMg8uboqVNRky-hLdJyRBoYarRcdhaLxcq6iSyRTgVSAuStbotCxaKSRIhFSz9QQSksCGJKWAAEIAWSwAGksABGB365GajRwfgen3+oMh0Owo60OIygBig1GAWczITploUUjMIcLiVEv6yrkOYlWJxol6MJ5fIF2pFYtLRKlsBlcpGCrw7bD5vVwPDLd1A6JhvJHrNatIluttrE9v7juVztd7uBVsYNvoIhOLtobqeuWAwB70zALxeVTbYEGAHFXHhZWAswANJlvrCDLwvuRKwnQc50LE0H2feNQxgJMUyLJxs2AuoTHzMDdHTTNXDXZFyzLUtcP6fpaBMXR2BUchm20OAbFsGokVEMoIFYQZ0HYNBUAAEhaKp2I4zlGB0PpZiUMAZheIA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_data_table.Rd b/man/tm_data_table.Rd index 8f0f9ff07..3d105c6c0 100644 --- a/man/tm_data_table.Rd +++ b/man/tm_data_table.Rd @@ -68,7 +68,6 @@ data <- within(data, { require(nestcolor) iris <- iris }) -datanames(data) <- c("iris") app <- init( data = data, @@ -91,8 +90,7 @@ data <- within(data, { require(nestcolor) ADSL <- rADSL }) -datanames(data) <- "ADSL" -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] app <- init( data = data, @@ -111,14 +109,14 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlQ20onG6vaJKAL5dKdDwosUZtlkE7ApgQ0tdSmioAyp5i93+GboAvPtBuBW6fEIi-ceXwmK7lZWkMMkZiUH0Io9PlVostCgXzEiVEcBEGjg-COujoLR+vx6jD6MIWSwAynBUNwMAAZCgSApLUoYrE4gDqtH4RLwuiWAAU4EEePiIIT8sS6WBGcyMJTqRzaRjUHACLQxKtzr85Gc9r9qYkWBIbrC+qR2AQ0JoSDClgBJLB69H2IEiXQAYS1Vggkrlui6lS6XVoJl07BU5GYlh0Nls5T2okKEFYAEF0OwNgASeqlKNgxg6TqjJRgEYAXSAA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlQ20onG6vaJKAL5dSmioAyp57BX+GboAvAtBuPN8QiL9K5vCYnPdlbqkMMkZiUH0IofHx1ostFDXYomicCIacPzLunQttzuxyGvwIczAAGU4KhuBgADIUCQFBR4XQoqEwngAdVo-GRqJRAAU4EEeAiIEj8ijSkSSbCcXiqQTIag4ARaGIUV0gbo5Osjnc8YkWBIdn8+qR2AQ0JoSL8UQBJLAKiH2Z4iXQAYRlVggXPmlW5vKUXVoJl07BU5GYlh0Nls5SOokKEFYAEF0OxJgASeqlH3vRg6TqjJRgEYAXSAA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } \item{example-2}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+zOh4UQrc23yFMCnRjaUAKyIVNIBrOFZlzLXjfjgTKGFSNIJ+WlECNP3Dk7PgBdgxFfCcgAum5oOgJipiuxaiFcroALyw8K4GF8IQiUQI3Ro4T-GF1UgwDK5NLhegiaEDOrUrQsWhQcliNKiOAiDRwfhYuiiUjsLZYgjQsABOyOHwATT8Pg2VQ2jgCjgAQgApKUy3QbBUqtV4DXCvx2Zw62WbADirl1mucAA0NnI5CiqdSQg8WBJMYjubyCGhNCQsRt+XYGSJvL6rBA7fjdP06v1+rQTLp2CpyMxLDobLYalTRGUIKxBuh2GhUAASFpVUtllmMHR9WZKMAzIFAA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+gCsiFTSAazhWUQrc23z+OBMoYVI0gn5aUQI0xeW1jeBoeE3MuQBdN2h0CZVi9lqQ3N0AF5-uFcH8+EIRKIgboIcIxL8BnVdKQYBlcmlwvQRIjkcitCxaFBsWI0qI4CINHB+DC6KJSOwpuNgQRfmAAnZHD4AJp+HwKPC6AWOAKOABCACk+QKqgLRZLpYK5X47M5FbKwIMAOKuJXs5wADQFcjkYKReP4xxYEmhwLpDIIaE0JBhAqZ9mJIm8TqsEGNfzq-UDSn6tBMunYKnIzEsOhsthqSNEZQgrEG6HYaFQABIWlUs9nyYwdH1ZkowDMXkA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_file_viewer.Rd b/man/tm_file_viewer.Rd index 668b3cb4c..cf3b5cdd3 100644 --- a/man/tm_file_viewer.Rd +++ b/man/tm_file_viewer.Rd @@ -31,7 +31,6 @@ data <- teal_data() data <- within(data, { data <- data.frame(1) }) -datanames(data) <- c("data") app <- init( data = data, @@ -54,9 +53,9 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqX8opKAeNdqAfQ8vG3dPbyNdAHdaUgALFXYgqFxdECVdXSSfTLCME2Z4dgBGRQgAX1Kk6HhRRLDbCIJ2BTAkltKlNFRslRjmiAysgF4cr1x03T4hEVFdEanhMX6MjNIYfxNaEX8tWjhImWWVjJVUQVJ-VE9Yud06UVIj44yTImp+GVvRVge4GDytnBmmBRLBUNtNjMWikrgQANZQKS3Fp+XgCRbiKQQNTUdrjAbPDKoCASL4-cj-SFAlqgmDguAbQGiAD0tPpjJEGGJEmhulhCKRIxRcG4aOmYkk0lkeImhNIAA9SGTfpTAcC2RCmaywZrOQrSLz+Yi9EKwKiFjNJdjpWA5PjCRlBIxqMiwLFSKRUKJEMzmSYPJIiFo-Vr+IxBBIWWd6PdYnB+MyAApERheGNwQwAESIBEE8DIhgAYimYJ5DABlVBwAi0TYETxWCDiVD8EwtWUrUrHLu6UqlWu6dgqcjMSw6Gy2NIE0TxCCsACC6HYXQAJIJaClV6IZDpGKUykowGUALpAA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqX8opKAeNdqAfQ8vG3dPbyNdAHdaUgALFXYgqFxdECVdXSSfTLCME2Z4dgBGRQgAX1KlNFRslRj2dJyvXQBeJuTGviERUVbdLuExBogMjNIYfxNaEX8tWjhImWHR0ZVUQVJ-VE9YvrpRUmWV0ZMian4ZPtFWA7gYPOm4BrBRWFQZqZ6FPF1tggBrKBSPrfPy8ASDcRSCBqajfOS4RrHX4QCRXG7ke6fJ7fV4wd5wSaPUQAejxBKJIgwqFR3xSf0BwLaoLg3HB3TEkmksnhiJGyN0pAAHqR0bcsY9nuSPsSyW8ZVThaQ6b91Iy9MywGCBj0uTCeWAEUjjoJGNQQWBYqRSKhRIgSSSTB5JEQtI7ZfxGIIJKT1vR9rE4PwSQAFIiMLz+uCGAAiRAIgngZEMADFwzBPIYAMqoOAEWhTAieKwQcSofgmb7GjKlFa13SlUoF3TsFTkZiWHQ2WxpfmieIQVgAQXQ7GqABJBLQUhPRDIdIxSmUlGAygBdIA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_front_page.Rd b/man/tm_front_page.Rd index 78e725ddc..35b1c3e9d 100644 --- a/man/tm_front_page.Rd +++ b/man/tm_front_page.Rd @@ -46,8 +46,7 @@ data <- within(data, { ADSL <- rADSL attr(ADSL, "metadata") <- list("Author" = "NEST team", "data_source" = "synthetic data") }) -datanames(data) <- "ADSL" -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] table_1 <- data.frame(Info = c("A", "B"), Text = c("A", "B")) table_2 <- data.frame(`Column 1` = c("C", "D"), `Column 2` = c(5.5, 6.6), `Column 3` = c("A", "B")) @@ -85,9 +84,9 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqX8opKAeNdqAfQ8vG3dPbyNdAHdaUgALFXYgqFxdECVdXUY4AEdBWiz2CDFSYmoiRkUIDIBBABEAZQAZH0y6pvTdT1JGdjbGlIUweC8kwdsIulFSdkHqwTjywd0AXl1BgDlnertdLhhBgbAk-1EiQUYCOCXVwdFWMli4TQJdUbBKgF9KpOh4UUSwuNjLMGo1BkoAFZEFT+ADWcFY-ySQNecBMUGEpH8BH4tFEBH8UJh8MRwB+sDEAK8cgAum4yFB6CJ-ABGFpJDAmZjwdgASQgJiIK10BBmYGqBzWYAAQmMUnY4AAPUjC0WzSWDWXvSpeJlwfwAJnZYU53Lg7AABgBhIjUQQwKosi2qsVWjVgWpy3TW232qoG52rUUAVgwwZSADYMBG5CkfXaHboAMyBkViiV4KVauQ6xnMpPGrymil8gVCoNi1yZwYAMS9CuVLsGAHF3QAJMaVJS65kqVDzFqTaYdQZ2PN6FnXXbj1m4EdgMd63QGqc9-UGudVKWLkTJ1czpNKLvQdAtFQxGZbpLCpKbjJ8IQiUTCh-CSkdDKkGD+LkkLGoKApEvDIQN0R4oH4GR-HIRsKw-UCpV5GBUHKLwyF0FRBUYGBPCsCAp0GXkVQIKAqgkIVHiyDADng0DBgAeTiGQMLLbDcJIAiwCtUjdHIsCZDgaiwFo3RYxEtdn1WNd-D7eY7wQiDcU0EhuGgwDJN0Ns7AAWUadN+CUvDuE0nTmnKXRRHiCBWGnCRnz4yi9H0JgAD45REwUiFICAvLEJswAADU4vFdkeUx8imUwiC8nzyHdABNDDnyYiy4GICB+CimLfPcrdQMsohIn8YYILCYUHBceDKgyMSt3AyDGGFLw7IAEliFkxXqWBUF3ap0DoEjlPw955M88hGqk9SWtQdN+toQa8Ky8bcuPWgTF0dgVHG9RNB0GxbDSLdLJUVg+pmtBUBavIUgulrRBkHQKiUD4lDAD4aSAA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqX8opKAeNdqAfQ8vG3dPbyNdAHdaUgALFXYgqFxdECVdXUY4AEdBWiz2CDFSYmoiRkUIDIBBABEAZQAZH0y6pvTdT1JGdjbGlIUweC8kwdsIulFSdkHqwTjywd0AXl1BgDlnertdLhhBgbAk-1EiQUYCOCXVwdFWMli4TQJdUbBKgF9KgCsiFX8ANZwViiRJhcbGfhwExQYSkfwEfi0UQEfy-f5AkHAaDwUFJOQAXTcZCg9BE-gAjC0khgTMx4OwAJIQExEFa6AgzMDVA5rMAAITGKTscAAHqR2ZzZrzBoL3pUvGS4P4AEzUsK0+lwdgAAwAwkRqIIYFUKTrJVy9TKwLUhbp9YbjVUVebVpyAKwYd0pABsGB9chSDqNJt0AGZXRyuTy8Hy5XIFaTyWH1V5NbBtczWRbBq5Y4MAGJ2kXinNgADi1oAEmNKkpFeSVKh5i1JtMOoM7Em9BTrrtu5TcB2wF2lboVX2G8qVUOqnzRyJw5OB2GlHXoOgWioYjM50l2UlZxk+EIRKJ2SfhGJdxkMqQYP46SR4agoFIb7eMo8oFDGP5yKWbofp+GSDIyMCoOUXhkLoKisowMCeFYEB9mBEoEFAVQSGyjxZBgBwdCBfIAPJxDIsEsuUiGaCQqFgHqmG6Nhui4XA+FgIRt6Bpxd7dueqxTv4TbzEeIE-kiNHQAEXgSPxuhVnYACyjTRvwEnIdw8lKc05S6KI8QQKw-ayUxOEyHo+hMAAfEKPGmEQRCkBAjliGWAAadHIrsjymPkUz2Y5znkNaACasHnmRelwMQED8AFTkubZc6fvpRCRP4ww-mE7IOC4nGVBk3Fzt+v7sjJogACSxBSXL1LAqCLtU6B0BhklJRkrIuYwZVvpVqDRs1tCtch8UyEl660CYujsCo5DMJYOg2LYaRzvpKisE1-VoKgFV5Ck20VaIMg6BUSgfEoYAfASQA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_g_association.Rd b/man/tm_g_association.Rd index 9ffd8ac9d..c239f6051 100644 --- a/man/tm_g_association.Rd +++ b/man/tm_g_association.Rd @@ -79,7 +79,6 @@ data <- within(data, { factors <- names(Filter(isTRUE, vapply(CO2, is.factor, logical(1L)))) CO2[factors] <- lapply(CO2[factors], as.character) }) -datanames(data) <- c("CO2") app <- init( data = data, @@ -117,8 +116,7 @@ data <- within(data, { require(nestcolor) ADSL <- rADSL }) -datanames(data) <- "ADSL" -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] app <- init( data = data, @@ -160,14 +158,14 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlQDCAPIATHG6-QMVpuqkHaLD0PCi7ABitNTkjOy0og4upVpokRyjpZsYJpMdpe0StATc7ACMADJyL129g8BnGtMAusPU+2ohw+XymjFEP1KUHEBHyLEmMi6AF8uik5mJihlbFkCOwFGBRviukp9sMVHk8d1-BldABealBXDjPhCEQzeks4QY8aVUgwRISRLQ0REAi0QJWCCUyoyqpwEx0hlQRJhUjMDSJUSoOC4nmypXoxX4wl4PWy0RwEQaRUWq2kTXa3VU-UygH0S1GsAAZUtOtIuj2jHF9BEiHxTOdLt0sKINzEisDwZEiRjcYWKWAwGNg3xP0h0bxYAACgCyOHdPi7KxteXK9VAvAy2AXhGozLbX64PxPSWoE3W23TLRQl3FYsAIKPL2uSOyt76uQD2WB9lKlWhNWTB066VRtGwPT07NjU2z9u+630jsarU7s36t0eo-ei-+xNQENiMOnwfR-Kxgh43pd9PxTf800xIJM2PXN811YtS1IWswCrGs8ArFD6z5CgkObRd73NV9R2fOwsMbXClyjGBhE0SJD3sJxnEol0TGHYjdAnKcZzbec5z1ecui6WgFQ2VR1U0HQbFscoqVEQoIFYcd0HYfYABJ6ihdBVItRgdE6JQkSUMAkR+IA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlQDCAPIATHG6-QMVpuqkHaLD0PCi7ABitNTkjOy0og4upVpokRyjpZsYJpMdpe0StATc7ACMADJyL129g8BnGtMAusPU+2ohw+XymjFEP1KUHEBHyLEmMi6AF8ukp9sMVHl2OMUroALz+DK4cZ8IQiGYE0nCMTY7qVXSkGCJCSJaGiIgEWiBKwQWn0+nVEz4wlBRJhUjMDSJUSoOAEPn8+kpOZ6AkKMCjdXEumK3SiOAiDTC-WG0jS2Xy8a6yoA+gG4XqgDKBrlpF0e0YXPoIkQWqt1thRBuYmFHq9IkSgeDCxSwGA6s1YB+kN0lrAAAUAWQtbp1XZWLKc3nqoF4NmwC9tdb6SbXXB+A6M1nSH6ddaTLRQvXhYsAIKPR2uNv8t6KuRVxUeikiqBi0ISybmuUK3XK2Cq3Mawat6u1o0EvdmmXL-26232tVgZ2m90scNiX14U+KqMEEMEsNQb1wSP5INvmMMjjBNtyTFM00zKBy1KPMCzgIswDsEtGQoFsK3HZ9+UPbtLyQuBS1Qndq10GBhE0SIN22ZwJ2rDsuwbAk+wHIdq1HEd-VHLouloIUNlUSVNB0GxbHKOlREKCBWF7dB2H2AASeooXQOT9UYHROiUJElDAJEfiAA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } \item{example-2}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+zOh4UQrc23yFMCnRjaUAKyIVNIBrOFZlzLXjfjgTKGFSNIJ+WlECNP3Dk7PgBdgxFfCcgAum5oOgJipiuxaiFcroALyw8K4GF8IQiUQI3Ro4T-GF1UgwNISNJQUSiIgEWhhKwQaEDOqMhomLGZNLRUjMDRpUSoOAEemMoVIqCLPSIjZbDYohnC3SiOAiDRYhVKh68-mCuWM6hQeiKrEbAKK-mkXRaFjU+giRDS-HagglA4EMRYi2MK0iR5O2gu5b27Ui4DASUjbZgIFAmWBoUCo3OAAa0t0Gywgy8rjwKbAXgA8o4AHIOACayclWAAsmWwAEHIM7IMAIzV2tphsAJmrfjsdgAYuGqhsAEIVrAAaSwnbA-Rjujk0ZjqtNcH4hrAaYzdtl2pMtCiK6xvcGowCrm3QpnwvnAfNLExiLZHK56r5cfPjN+8DXUrwN7qS+VREAJfTU-x1PUDQlGsTWVd1PTEW1f3fWMfT9N1LT1L1HWdPFkOFTJg1DaYIyjMDY2hGtE2rDdM0HHN8yLLBSyzcsqxYms6wbZt2NbetBinOjuz7AdsxHcdJw2S9A2vPD-xg8hVygsSJwEsjsXuWg4nFewnGcBdA13fdFN0I8TzPaSbykucYX6fpaBZdgVHIZ9tDgGxbBqBlRDKCBWEGdB2DQVAABIWiqILgoVRgdD6WYlDAGYgSAA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+gCsiFTSAazhWUQrc23z+OBMoYVI0gn5aUQI0xeW1jeBoeE3MuQBdN2h0CZVi9lqQ3N0AF5-uFcH8+EIRKIgboIcIxL8BnVdKQYGkJGkoKJREQCLQwlYIIjkciGiYYZk0tFSMwNGlRKg4ARiSTkZkHnpgQowFNRtywUjWbpRHARBoYSKxccGUyWUK6tQoPRRTDuQFRUzSLotCx8fQRIh+X95boCCUlgQxDCdYw9SITubaJbNsaTSCoMBgNzedyXi8BW7kcy1c4ABr83TcrCDLyuPCRsBeADyjgAcg4AJoR71YACy2bAAQcgzsgwAjAWi9HSwAmAt+Ox2ABifPj3IAQrmsABpLB1sD9QNyANuyWauD8VVgaOxo2C+UmWhRCcwpuDUYBVzzkmD1nD111G3Q4GU6m06WM4Pbtm5DlTn14A-Isfi4Evi+yp8kxXK6hT9VStqupKlChqPteJJmhaVrAjadpwA60EuhBrKZJ63ojK2fojoGwaFmGBYznGVTcsmaaZgWgx5pWxalhWbaFrRgz9iRYANs2rasZ2PZ9tyu4mvuKF1O+K5cmA3G9ixX7IjARy0HEnL2E4zg4QuS6iboa4bluAlPvxui7v0-S0OS7AqOQ57aHANi2DUSKiGUECsIM6DsGgqAACQtFU7keSKjA6H0sxKGAMwvEAA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_g_bivariate.Rd b/man/tm_g_bivariate.Rd index 070d9f8b1..cce2711a0 100644 --- a/man/tm_g_bivariate.Rd +++ b/man/tm_g_bivariate.Rd @@ -122,7 +122,6 @@ data <- within(data, { require(nestcolor) CO2 <- data.frame(CO2) }) -datanames(data) <- c("CO2") app <- init( data = data, @@ -176,8 +175,7 @@ data <- within(data, { require(nestcolor) ADSL <- rADSL }) -datanames(data) <- c("ADSL") -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] app <- init( data = data, @@ -229,14 +227,14 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlQDCAPIATHH+GRgmzPDs-QNdAL5dKdDwosUZtlkE7Apg09tdSmiowyp5W90jsQC8F1C4Fbp8QiKiutekMIkSifTaLLSBcDOlUqoVeN0SYVIzA0iVEqDgm3uwJuSz0122uzwSOBojgIg0YNx+NIsPhiPOyMq1Cg9DxYO2AGU8QjSLotH8aSJENs7hTKQR8kRaAQxGD2Yx-vQRIkBUKRSsUsBgBjBtsALpquS8yk45kaOD8emEEgEHnY5EmWihA1ggBiAEEADIM1x8ypdZFa7GsMEpCGhKHqElwhFAymLWBo3QqgZmt26Ikswl64NksM66m0vzosBM4lsjlSuDcrHxyqy4Wi67iyXSivy1ZBJUx9Wa7U6hMpm05wSoIIAazgcY7D2EmkiUYdzuc7Z1luthuuU5d5t0HuBXr5jCI2USJnUcFZ1z9kOhqdDq4j8CNmNnuvz10TMJD5JHmbpObzSZrnOLw479ZVgWEq-jKgqVgqGTNjsqpgBqm4jk+5CLtGYB2Kw8L-nOVrdroy6ujq67unebR7geR7gqeQakhe8ZXlGLaljqSHJsSNGvh277ZqhX4Ej+RYlneyKAS81aFnW4ENoqyowbGcFtqulRIbh2x2NUgTwGQWGUvOuH4auRFrvcXRdLQJi6OwKjkGe2iAnItjlOcoiFBArD2ug7CHAAJPUpTebijA6J0SizEoYCzGqQA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlQDCAPIATHH+GRgmzPDs-QNdAL5dSmiowyp57BUjsQC8m1C4G3xCIqK6O6QwiRKJ9NostIFw692VuqGnu4lhpMwaiaKocAITxeLxS0Hg7wUYGmUP2zxBojgIg070RyNIfwBQI2IMq1Cg9CRkLAAGUkYDSLotHcCSJELCcbiCPkiLQCGJ3tTGPd6CJEszWezRMUMsBgFCYWAALpSuRw3EvNEUuD8YnECwM+G4ky0UIq94AMQAggAZEmuLWVLoguWM1jvFKfULfdQY-6A4G4sGwPQ7CWDTUKpUonbBt1Yz0K-GEvx+0nklFcnl0wMK3QCtkcnZJ2lwfkszPClJi-0DKEy22WxUJ8iquOCVBBADWcFTCpgwk0kV9umNZuc8rTOr1dd7pvNjKtjMrIMYRGyiRM6jglJ2jq+P3DHsnu3BPdLber6NRNcx26reIJRLjZOPOd5cHpeB3lQzQs5NIf+cFYhFQRL0IBtKsqDkGNb6nGdisACh4gsOEFjv2O7Wi8M4vG0i7LquHwbq6Z7YlW3oQnGkqgUeFInui+GRri0bXroUK3hR94ps+F7pgW77Zp+fJvr+xbioBZbAWhYHoghUJ2NUgTwGQsEvPBo59hOVYoVOzxdF0tAmLo7AqOQm7aI8ci2OUzyiIUECsEa6DsEsAAk9SlA5iKMDonRKLMShgLMUpAA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } \item{example-2}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+zOh4UQrc23yCdgUwKdGt-oArIhU0gGs4VmXMteN+OBMoYVI0gn5aUQI0w+Ozi+AF2DEK3CcgAum5oOgJipipsBiFcroALzw8K4Wq6PhCESiJG6UgwNISNL0bQsWhhOCwup1KK4zJpaKkZgaNKiVBwDbo6koqCLPTIrY7LZouHc0RwEQaXHiyVPNkcqnc6nUKD0CW4rYBCUc0i6LRk1UiRDCrlKgglI4EMS4-WMcn0ETPC20K2XXLAYCCka7MAgkFyEVK6kynVwfga7YAcVceFN3JMtCiYdxADFBqMAq5RdT+tyA6bWHTcgyokz1HL2Zzs3V-vAI0LY9XdCGpciWxWFXHlar1QKwFrZXqDQ64MbG0G6ubLdbkbb7Y6py7AZkPV7pr7-YGJ+3k33MwANE1NuowR60OL83RpjPOLdBhNJ8PI6+Zru5nN3+pEAppe5W3XIvSjLMh2VZBrWl5rj6n51O20raiy8pgROKpqtQEYDjqQ52oao5HhOuiLq6NrDguzqukCUCrts3pbH6+bHs2CHkE+uiClgACy+ETg+u5Xumr5Nu+dQMdy3S-uocAATyJZlohlaKtyEH1rR45KnBbbMayCldnUqG9mx-bMdh854WpQZETOJm4U605uuE1ENvRMHBsxfFbF4ADyjgAHIOAAmtx96JnxL5ZkGwm6O+-T9LQJi6OwKjkCB2iUnItg1HCohlBArCDOg7BoKgAAkLRVEVxXiowOh9LMShgDMIJAA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+gCsiFTSAazhWUQrc23z+OBMoYVI0gn5aUQI0xeW1jeBoeE3MuQBdN2h0CZVi9lqQ3N0AF5-uFcH8+EIRKIgbpSDA0hI0vRtCxaGE4L8BnVdFEYZk0tFSMwNGlRKg4ARMdjsZkHnpgQowFNRoywVjqaI4CINDDOdzjmSKVTqdjqFB6FyYYyAlyKaRdFpUeKRIhWX8RboCCUlgQxDDFYw0fQRCdtbRdU9csBgIzmYyXi85GyNXU+XK4PwpUyAOKuPDqkUmWhRD0wgBig1GAVc7Ox-WpToDrDxuQJUSJ6gF5MpAbqtNg9N0tpGLP9sddsp5wLdJMFOfLovFkoZYBl-IVSuNcFVZZdmrNFv1nZNWp1Yi24WtxemYAdiYbFf5oZb0YAGmqF7oYEdaHFCxGo85nS6gyHPcCD9Hc7p43Hj3VGEQCmkDrr5cD8YTiVmhdf8-AvTtXsRRrd9dFA0ls2FDUxQlagvTbOUO0NZVuw3PtR3NPVgQNI0RwHcdMinJkS3tR17xAytyHPIsmSwABZdCT2DZddEvGMNVvOp52pboX3UOAwM-dNv0g38G3-Qtp1LCjFyQ6sqLE+s+1g5taMQnlcNQntZOxTDBxw4c4FNMdLUnG0SJnOddLkjRWMZLwAHlHAAOQcABNJiNVPVj2OvLibz+fp+loExdHYFRyG-bQMTkWwaixUQyggVhBnQdg0FQAASFoqkyrLOUYHQ+lmJQwBmF4gA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_g_distribution.Rd b/man/tm_g_distribution.Rd index 1b67c42c2..0b7cae9be 100644 --- a/man/tm_g_distribution.Rd +++ b/man/tm_g_distribution.Rd @@ -80,7 +80,6 @@ data <- teal_data() data <- within(data, { iris <- iris }) -datanames(data) <- "iris" app <- init( data = data, @@ -103,8 +102,7 @@ data <- teal_data() data <- within(data, { ADSL <- rADSL }) -datanames(data) <- c("ADSL") -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] vars1 <- choices_selected( variable_choices(data[["ADSL"]], c("ARM", "COUNTRY", "SEX")), @@ -149,14 +147,14 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBISqDC0ogT+uLpetHCk1Ky6ALz2Ts62AGTpuu7Rvv6B6BFR3rHxSSkuGVk53nkBRCbkoqRF0aUJyQ6VupnZnrVwfmAAsgCCAMrjrSVxHRVpPdX9PoP+TEREMNMxs+VdaUoAxLpSEGrUuvxQpFC6cAAesKgiSlc3BsZc1AD6b1A2r2utyMugA7rRSAALFTsP6REBKXS6HyhD7IxihJQAX0UED+0HgolhQNsIP8KNE-iUSjQqDRKghfggSL+5ThiN0fCEIlE5TozSZSKRpBg3wkv1CpAx9EEmmsHKFl0l3y0LDZQO+Dyl6lI31EqDgBEFiqF+NgemS5IxlLwCpNojgIg05QdTt1+sN7FVGKg9BE3wIkKItAIYiGFP8cki-gACrFuBgADIUCRQyN2pG4xVZ3S43G0Ey6dgqcjMSw6Gy2BHM3SiaEQVijdDsWkAEm8kTbDsYOkYuKxSjAWIAukA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBISqDC0ogT+uLpetHCk1Ky6ALz2Ts62AGTpuu7Rvv6B6BFR3rHxSSkuGVk53nkBRCbkoqRF0aUJyQ6VupnZnrVwfmAAsgCCAMrjrSVxHRVpPdX9PoP+TEREMNMxs+VdaUoAxLpSEGrUuvxQpFC6cAAesKgiSlc3BsZc1AD6b1A2r2utyMugA7rRSAALFTsP6REBKXS6HyhD7IxihJQAX0UECUaFQaJUEL8ECRf3KcMRuj4QhEonKdGapKRSNIMG+El+oVIGPogk01mprMuPO+WhYlKB3wevPUpG+olQcAILJFrL+0Hg5X8KNEEWF6tEcBEGnKxtNCqVKvYEoxUHoIm+BEhRFoBDEQz1-jkkX8AAVYtwMAAZCgSKE+w1I3Ei2O6XG42gmXTsFTkZiWHQ2WwIsm6UTQiCsUbodgEgAk3kileNjB0jFxWKUYCxAF0gA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } \item{example-2}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBISqDC0ogT+uLpetHCk1Ky6ALz2Ts62AGTpuu7Rvv6B6BFR3rHxSSkuGVk53nkBRCbkoqRF0aUJyQ6VupnZnrVwfmAAsgCCAMrjrSVxHRVpPdX9PoP+TEREMNMxs+VdaUoAxLoAwgAiAJLjJ7r8UKRQunAAHrCoIkp3DwbGXNQA+l8oDZPvdHkZdAB3WikAAWKnYQMiICUul0ozO4wAMj9shjsUoAL6KCBA6DwUSIsG2CEEIb4rH+EkAKyIKn+AGs4KxKUCacZ+HATFBhKR-gR+KECP9WeyuTzgGTYGIqQ85ABdJRKLQsUQARlxBFhbIIYn+ojgIg0cH4fggaJ1jFoUHoInFxtopt5YOAwH8DP86vVkTp-qwwyK-hOAHlHAA5BwATUjYHGzgAGky5LhUboLVbyPxynHHFjGRASUo0KhcSoYXa0UDykjc3whCJROU28IVbm0aQYP8JIDQqQnfRBJprH20bdR-9Hc2wf8XmP1GLRKg4KH7bO90r4OV-ZjGXgZ3v89vSOVLxpzVud3un7ojSaxOVHc7XXB3W-vQ9fWPAkwCDEN6QAcVcPBdH8AAhYYsAAaSwPUsxzXdnzRW9CyPMB4KQlCInPJ8YFFWh3j0ZIADFRixNN0Mw2cTFoZ4bXKGi6NcDCnxJZ9s2I5pmAeBcWCXYTV2YO9N23BtMIPSiYLAAMz24vdmOochGHKdTNPvGTiL3R1O2SIy9QYxjdFIjTyJEPZUgM3ReJ48y9wkRgiEEVARK05IgRXZ41ykh9ZOfeTcOUlynx0mRtNoDSZD0x8LKMj9dTMhy0SszQKLslwHKcvcCsc3MSRJWgTF0dgVE09dtEGORbBRXdRHhCBWFGdB2GrAASbxIh6i1GB0RgSUJJQwEJdUgA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBISqDC0ogT+uLpetHCk1Ky6ALz2Ts62AGTpuu7Rvv6B6BFR3rHxSSkuGVk53nkBRCbkoqRF0aUJyQ6VupnZnrVwfmAAsgCCAMrjrSVxHRVpPdX9PoP+TEREMNMxs+VdaUoAxLoAwgAiAJLjJ7r8UKRQunAAHrCoIkp3DwbGXNQA+l8oDZPvdHkZdAB3WikAAWKnYQMiICUul0ozO4wAMj9shjsUoAL6KCAAKyIKn+AGs4KxRIiwbYIfw4CYoMJSP8CPxQgR-uTKTS6cBoPB6UC5ABdJRKLQsUQARlxBFhFIIYn+ojgIg0cH4fggaLljFoUHoIi5qto6vFYOAwH8+Kx-klksiBCGoywwyK-hOAHlHAA5BwATV9YHGzgAGv45HJcKjdFqdeR+OUg44sc6ICSlGhULiVDCDWigeUkUm+EIRKJytXhGJS2jdKQYP8JIDQqQTfRBJprEmW7du-9jRWwf8Xj31JzRKg4B6h8PbmDRXpko7Mc68MvhynF6RygeNJqF0vDSvhyq1WJysbTea4Jbb7aHvatwSwK73Z6AOKuHguj+AAQsMWAANJYAqcYJnuK4nmm5SgeBUEwbul5XmiMAcrQ7wbroABioxYlGiaYVhJi0M8erlMRpGuBRw4klecFMcmM4PGOLATlx07MKe86Ls2V5AuuyFgE6ETwWiVHUOQjDlHJClnsJMktsadbJJpCrkVhLY4fJeEiHsqTqSxK5sVeEiMEQgioNxinJECU7PDOgnniJK5ibABGfjuemUbQ8kyEpwUqUJF76Ua8r3vKunqdhuH4aZLjmfBFlohZJIkrQJi6OwKgKbO2iDPGugopeojwhArCjOg7AFgAJN4kTNVqjA6IwJKEkoYCEpKQA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_g_response.Rd b/man/tm_g_response.Rd index 0f9ae470c..4c34a0f6f 100644 --- a/man/tm_g_response.Rd +++ b/man/tm_g_response.Rd @@ -106,7 +106,6 @@ data <- within(data, { mtcars[[v]] <- as.factor(mtcars[[v]]) } }) -datanames(data) <- "mtcars" app <- init( data = data, @@ -146,8 +145,7 @@ data <- within(data, { require(nestcolor) ADSL <- rADSL }) -datanames(data) <- c("ADSL") -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] app <- init( data = data, @@ -185,14 +183,14 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlTCtLKJxur0E-RWmHbrsWroqugTsCoSs1Iuli1qiq7qLsFuLUiyLcrbl3ZVDfYyiwMBaALp3g1DiJuqkHezD-Tf3d12VAF8lACuiloPBRMUMrYsosvldFm5oOhBio8gszildABefwZXBjPhCEQDXFE4RiDHnXSkGCJCSJaqiVAkURwKnU3TUKD0OB+XGLLBiFkQNm6AAK7VImzwY2pTJFYtxKUSYVIzA0iWZcHmcs5YNgegFYHhMoJZ05ujZIg0OKtfJ1pC1qB1HMtlW5vP52zAAGUHbatCxaDyRIhVnrLQR8kRaAQxHag4wQ-QRIlo7H45CUjc4ZcZQ9Srqlis8D6DowjnJze7ztbHXB+HbFgRlhGLe6YMJNJEjboAGIAQQAMr7nDXa6ZaKFG3ah6PXB3qf9OdXI7pQnaVWqNU7tbql+cDfBmyb8+3a-Xbbir3uXQfJ1yeXzT-6baRdEmU2GL5OM3GE1xL9QzgdMYwA7MMlzM8RgRMBCzmBYwA2PYUBgKsJ0vANyCbY0UNlQ9qS7agexEOcRzHTD3RMadZ1xecx3XSoV2XPUVy6LpaBMSYVHIXdtHZY4yjGURCggVhB3Qdg0FQAASepShk2S2UYHROmBJQwABO4gA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6uoxwAI6CtNXsPqKkxNREjIoQlTCtLKJxur0E-RWmHbrsWroqugTsCoSs1Iuli1qiq7qLsFuLUiyLcrbl3ZVDfYyiwMBaALp3g1DiJuqkHezD-Tf3d12VAF8lACuko0KhBio8gszildABefwZXBjPhCEQDRFo4RiGHnXSkGCJCSJaqiVAkURwPH43TUKD0OB+RGLLBiCkQKm6AAK7VImzwY3xZI5XMRKUSYVIzA0iXJcHmQtpKWg8AR2zAXyuqyV+KpIg06v1CtIctQCpptPO9MZzI1AGUmSbdFoWLQGSJEDqzlbKgR8kRaAQxOrXYx3fQRIl-YHg6JihkbostQKHqVFUsVngNQdGEc5Cifb7jRo4Px1YsCMtvb7zjBhJpInpEQAxACCABl7c5C7XKiZaKEy+r213XEX8f9aQXdbpQuqJVKZab5YqJ+cVbBmxqUzXi07DYiSyvzWu+3SGUyK2BHQbSC63R64F7Bev8TGgyHEWGI1GP3GEyCJNNUuVM7nTBYwA2PYUBgfNez7Y9hxZKCBQQ2t62oRsRBHTtu3Q30ByHctWzw8daynSclSnLouloExJhUchl20aljjKMZREKCBWDbdB2HBAASepSiEqlGB0TpgSUMAATuIA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } \item{example-2}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+zOh4UQrc23yCdgUwKdGt-oArIhU0gGs4VmXMteN+OBMoYVI0gn5aUQI0w+Ozi+AF2DEK3CcgAum5oOgJipipsBiFcroALzw8K4Wq6PhCESiJEYgTCQHouqkGBpCRpBqiVAkURwWF1Bm6ahQehwai4rZYMTUiC03QABR6pFEWzRcMZlJ5fORmTS0VIzA0aSpcA2RMZKKgiz0yK2O1F6sZtJEGlxxtVTxVavFGrqzNZ7N1YACbItui0LFoLJEiANNttBBKRwIYlxHsYXvoImeQdoIcuuWAwD1I12YBBIKqarAACEALJYADSWAATKLdFsvAB5RwAOQcAE09nIxbaja6NHB+BzcwXi2W8IaNTBHrQ4jrdAAxQajALOVttuomWhRLu46ez1z+hn9W0todRXGy+WKy2oVX0tv-eA9-WD7d1c2m5FPs8XoeM+1snsuk2kd2et6cC+vei51IGwahsi4aRtGEFxoCmRJim0zppmujZnOAAa5acoMXiuGAcj7g+DKvmuTpYPhhELouI7UJo47rjOc60W2y6rt2yIbnOH66LuGoCXUAn9P0tAmLo7AqOQp7aHSxHVOiohlBArCDOg7BoKgAAkLRVFp2m0owOh9LMShgDMIJAA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXUY4AEdBWgb2CDFSYmoiRkUIOoBBHwCAGWT64bGlAF9+gCsiFTSAazhWUQrc23z+OBMoYVI0gn5aUQI0xeW1jeBoeE3MuQBdN2h0CZVi9lqQ3N0AF5-uFcH8+EIRKIgboIcIxL8BnVdKQYGkJGkGqJUCRRHBEcjkdQoPQ4NQYQowFgxDiIHjdAAFHqkUSUsFIwlY2n04GZNLRUjMDRpbFwAgEwnIzIPPTAylTUZsv6S3R4kQaGFqsXHUXi5Uq3TE0nkuVgAJk7W6LQsWgkkSIJUcg0EEpLAhiGHWxi2+giE6u2jup65YDAeUjRVgF4vKp6sAAIQAslgANJYABMbN0lK8AHlHAA5BwATUpcjk7INyK1Gjg-ApCeTaczeH1KpgR1ocVlugAYoNRgFnJWq6ZaFE6zD+4PXE7Cf0VRW27oojC+QKhTrUGKJSrpbAe+Hpq259WLRrgTWtzvl4SjWSG+b1aQrTa7XAHSfR7oXW6PcCvR9P1f0DBFMlDI9I2jWNfjNZwAA0s0pLBBi8VwwHLEcqyvSdTRQtDHW-DtqE0bspwHIcsINExx1wvsKNnKsF0lZi6mY-p+loExdHYFRyE3bR8XLao-lEMoIFYQZ0HYNBUAAEhaKpZLkvFGB0PpZiUMAZheIA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_g_scatterplot.Rd b/man/tm_g_scatterplot.Rd index c8b39bbe1..5c1c306f7 100644 --- a/man/tm_g_scatterplot.Rd +++ b/man/tm_g_scatterplot.Rd @@ -115,7 +115,6 @@ data <- within(data, { require(nestcolor) CO2 <- CO2 }) -datanames(data) <- "CO2" app <- init( data = data, @@ -199,8 +198,7 @@ data <- within(data, { require(nestcolor) ADSL <- rADSL }) -datanames(data) <- c("ADSL") -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] app <- init( data = data, @@ -281,14 +279,14 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBISqDC0ogT+uLpetHCk1Ky6ALz2Ts62AGTpuu7Rvv6BzgAepMwRUd6x8UkpLhlZOd55hETURIKMqLQEANYyZdGVCckOtUoAxLpSEGrUuvxQpFC6cIWwqCJK84sGxlzUAPpbUDabC0tGugDutKQAFirsR5EgSrrZno1w7NOipMStjEUEDeAGEAPIAJh2unBEKUAF8gUdoPBRI8zrYLv5Yf4lEo0KhoSobn5gXMztUnq9dHwhCJRNVacIxKS3m9SDB9hJ9mEFuQOq1SKy2W9qFB6HBZsl-ABlAh8mTrIikGG3IhdMQRakiwqUs77FYldSkHmoOAEYUit7I2B6aVgHF4bVW0SS80q5KukQaU3my1W0XiyXVWVujS6LQsWjikSILVkgNvAhqjUM5KRxjR+gifbJ9UEFlHYDAbGQ-wAXXLkQt-mIFjK-kEqEWvX8cjkuGdAa97rg-BDzXrToTiZgwk06ztugAYgBBAAyMucnZHAZMtEKfeqc8XrlXbKBAY7Xd0Q3JiwNxWYPtEZpr++tZxRU9LcOHid0PfDnrDJtvfpPEUxQlKVdFDb0VQzLNY3jD8kxTAs0wjKMYzgXMEMLM5i1fCsq10GtB3CPAwLAJsWzgNtjwfNkv3Ift7TIqBW3fOCx2oCcRG3BclxXODTA3Ldkh3JdAN0Q8rSogN-iIRh9noM8jkvI0bzvf0RRteAB0dXjE1o6paN9e8+OA4N7RlX9kMzVC4xYj881TaooNQ9D8xZUT1KwksHTLMBKx0viCIABTFMgGzAOxWDNMK7HcBZ4FC4jaxIIjIkbZsmIosBxI-SS4NowTdAAOUced5380dx1oScuN3cq1wE+iZ24vccpPXKRVEWgAC80PkvUL0Na8-1U0SNJfby3zqmiLJ-CDDLUq0TNA8D3Us6C4BsqaRXsxDHJQ7M0J2zDFmwibcOrPxCLCxjmPbLbpoggq0vI2DWMq6qhOa+63nXTdGuElrE2yg8psYIhLn2Ex1FifqoCUob5tGp9bS0nz7r02b3UR6jAxAgdzIgtbrNeuyMKQpyDpc1N0ROrzHT8-DLuCqAEtS8LIsytmYrgOKKFISjvs-X8CuK0rBbYjipwBwXfoKgHROBt52rZf5Iehj1zzhwbjWxj8xtRybRIxoW5v-Iy4KW-GLIpmDbMTI7yf2nMHZpqBTvpvCgpC-nEvZqLfe53mEru9yTd7RrRbK0OJaqzjPtq0PZf+5qFba51xKBIFaBMXR2BUfljW0L5210F4yVEe4IFYWd0HYAkABJvEiBvXUYHRAQRJQwHhcsgA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBISqDC0ogT+uLpetHCk1Ky6ALz2Ts62AGTpuu7Rvv6BzgAepMwRUd6x8UkpLhlZOd55hETURIKMqLQEANYyZdGVCckOtUoAxLpSEGrUuvxQpFC6cIWwqCJK84sGxlzUAPpbUDabC0tGugDutKQAFirsR5EgSrrZno1w7NOipMStjEUEDeAGEAPIAJh2unBEKUAF8gUo0KhoSobn5gXMztUnq9dHwhCJRNVCcIxJi3m9SDB9hJ9mEFuQOq1SJSqW9qFB6HBZsl-ABlAhMmTrIikGG3IhdMQRfEcwq4s77FYldSkBmoOAEdkct5HaDwar+WFyrF63SiXnaiXJK0iDSa7W6i26Lk8vm6QXWjS6LQsWjckSIM2uqkEKUyknJf2MQP0ET7CPSggUo7AYAmyH+AC6OciOv8xAsZX8glQi16-jkclw8td9ptcH4xuaJbw9YtMGEmnWemSADEAIIAGQFzjr5tdJlohWb1WHY9cU45QIttc7uiG2MWKuKzEdoi1hZXVINsH7XrApo7p7ejd9dp9GqPzs3HPdvNbAuffoDQbgENbzDN5kyjapY3jRMwNTURHjODMszhMA8wLPw23CPAr3LSs4GrDc7ypB9yBbfkwBwqAq2AkDu2oXsRAXUdx0nEDTFnedByY5cwzXPUCItf4iEYfZ6G3I49zVQ9jxdDlzyNMibxYhtfyfB0X2k98qU-T1vTUv84wAoClLDGCxAg-8EzgJNI1gmTXXTTNr2zFD800jlCzAAAFLkyFLMA7FYLU-LsdwFngXysKLEhMMiMsK0ovCwF4njjOUtSON0AA5RwRxHVKux7Wg+0Ypd8r1Gc51I3RF3HTTkqpfi9VEWgAC8rNEpVd1VA91LfQi5MvJDQzSm1qmIp0T1Y7Tv1-SDDOGkybLMmMLOgpa4IcoaXLQqL21i8j4qomsyo5YiMri3CFtdWj6MvGqJzctjKpK2rCPqt5Go5RgiEufYTHUWJOqgCSeomuz9TOQ1Bqc5CTstFT4bUsHHumsifz0ubLKMx7TOjfSoKs3H4MWRCYdzfNdA87yoAi-aAqCyL-NCmkKFIfC4fvZ8Muy3KOYJQris40rHoqjL7rqzdPvDFo-oB20d2B7r1WR-rIYvVtFM04ixufFWpu5L80dm1bAKugT1vMgzLOslM0wQxyb1Qyn0Op2mr3pxK6eZ8K2aSqWLTOqqebyx6bqKhiheYkX2Kq8W3sl+teKBIFaBMXR2BUZl1W0L4a10F4sVEe4IFYId0HYFEABJvEiKurUYHRAQRJQwHhHMgA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } \item{example-2}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBISqDC0ogT+uLpetHCk1Ky6ALz2Ts62AGTpuu7Rvv6BzgAepMwRUd6x8UkpLhlZOd55hETURIKMqLQEANYyZdGVCckOtUoAxLoAwgAiAJIAypO6-FCkULpwhbCoIkorawbGXNQA+vtQNnur60a6AO60pAAWKuznkSBKutmejXDsEDEpGIrUYigg3wAgtN5gAZQ7ZaFwpQAX3B52g8FEb2utluBD8YCRsP84IAVkQVCdeqxsec8cZ+HATFBhKQTgR+KECCcKVSaaJgBjYGIcWs5ABdJRKNCoBEqR5+CHLa7Vd5fXR8IQiUTVLXCUUa76kGAnCQnMKrcgdVqkJXfB26ahQehwajVfzzAhWmQ7IikKZPSkEMQRI0Owpq64nTYldTs0SoOAE8OO4XwD1EmEkvCph2iN3JgPJAsiDQWpMp5WOx3O13u5KewsaXRaFi0F0iRBh6s174EINdMTVNuMDv0EQcwchunXYDAfzE-wSiWRFNEgDirjwun8ACEALJYADSWAAjGV90fTwAmUlyXB5x2lotwfiZyFbnt9x0wNm0HY9GSAAxSFYXmZxH17PsTFoQo32qUDwNcaCHXBPsHzzIYVTWGNimYctE2Te0f3TIDdyzZFc1Q74XxbEtmwTSsSJ-J0XTdTN5kY1t207OBu2o1j+2nYdklHcdJwHYNRXOedF2zZdV10ddP23SIrxPc9LzAQ9NLvMA5Ewmj80YhDGx068tMEoS-2oTRAMQsCIKgoTTDgszdCQiCn10dCayMvsQSIRgTnobDzjwuNCOYnyyI-BTrL7Oji10ZKK2InzvjrDjzK4ssA3EviBJcoSpKHXUxN4ic4CnaTsUyh1ZIXSicxXErXJUr8dw008L26iy9O0rBIUmNSKKwZwN1mAB5AA5Pq-NYgKhOSjzZscWFYXan9bPskRHOQ7aYPc98QKclClrzZbn1oAAvGqwqjXDYwIpiMuMuLzKXRKa2S6o0qIqtXOyhsKLyoseLHIrv1KkSKshiSarKmcxSgOSWsUtdCVU7TdN6+8jt+0zToonGfr7XaAP2s7Doa2D4JJryLp-Ra0MJxgiDuE4WRDFKIpe+N0qB0jrkxcj5KownaO4hj8qFlifxBzjuMK6rioa5HRIRvjavK1H0e+trlMJPGsH09SwGG0ahsmmb5oJhrVpJ9bNqlh1KYcmnnLpk6Du84zWe+a6HRBbn1FiJ6oEi175di0WRXiyWfL+2Wi1j4ysvY0Gm3y7W1Zh1jNfh1XJLh-XmsNpT11N83xpGsb-Amqa5oW4OkuJ6oXa2hqPepzzzrd756Y8pmfMD3zwz88FwVoExdHYFRrXjbR-kM3RPmVUQXggVhIXQdhZQAEm8SIj4LRgdDBVElDAFEJSAA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBISqDC0ogT+uLpetHCk1Ky6ALz2Ts62AGTpuu7Rvv6BzgAepMwRUd6x8UkpLhlZOd55hETURIKMqLQEANYyZdGVCckOtUoAxLoAwgAiAJIAypO6-FCkULpwhbCoIkorawbGXNQA+vtQNnur60a6AO60pAAWKuznkSBKutmejXDsEDEpGIrUYigg3wAgtN5gAZQ7ZaFwpQAX3BACsiCoTr1WKI3tdbLd+HATFBhKQTgR+KECCdMdjcaJgNB4PjznIALpKJRoVAIlSPPwQ5bXarvL66PhCESiarS4RiYXfb6kGAnCQnMKrcgdVqkZUq77UKD0ODUar+eYEHUyHZEUhTJ5YghiCKSo2FcXXE6bErqSmiVBwAiGo3fc6svTJfxI2HukXh3Sic0hx3JFMiDRa4Ohj1J3Qms0WmNgeapjS6LQsWimkSIBMFlUEZ1dMTVauMWv0ERU1uu9nXYDAWMw+NgTmcyJ5sCQgDirjwun8ACEALJYADSWAAjGVVxvtwAmfxyOS4fNJzNpuD8S2zheNptSim0HbR3QAMUhsPmzgviYFiYtCFLe1Tfr+riAUa4JJuel66EMoprL6xTMNmQYhmG4aRrAH6jsieAId816VhmFaBrm2FJkW5r3uWWaOp23b1k+TYti67bJMxdZwH2nGDmsw4EeOk7Tn4D6LpEB5bru+5gOusknmAZ4Ac+yYUWBpaKdue5EdB4YwK+77gT+f5qc+wGgXeyQQX+xG6LB4bwQZIJEIwJz0Eh5yof6GFUQ5uHwPecZseGpHphpjE5lhDnGqadGlgxaZVjWvENvp6kcW2crcWlPZ8dlA7UQW5zCbOY7+GJcXNhJ85ScuCmHnJS4yce8lYJCkwNf4WDOHOswAPIAHJ6U5TYuepEVabow2OLCsIWU2RnUJoJm2WZ-41VZM12VBE0IZN4W0AAXnxXneihfroZRsUGRG1xRiFlWZQWEXVBFMV5vdKq0SWjXJZWPEFRlS0FkVXGpV2vH8TlBJCSOFWEWJugzvV8k6S1qk1dNNmNejr3LcZIimZBYNJjteN7Q540qkdRqMEQdwnGSrqRT510Bl9JUPWsT2lqFhPhRRH0UdzNV-fRIvA6xQtJhDuVQyxhX9kqZWI4LKMzpjynSWAnXdR1-VDaNp7029ml43NC3k4ZxMfntttGpTpP2T9tPfOb3wgiz6ixJdUC+Td4s-UF+FI+OTtRSl5HRZh33qZLSXS-lstR97quKzLKsCfDUDlZrU6oxJOsdV1PX68bI1jV7wuMTN1uLTVK1rSTG1k9tIG7ZtNOHfmTnguCtAmLo7AqLqAbaP8Z66J8IqiC8ECsJC6DsHyAAk3iRBvKaMDoYKokoYAopyQA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_g_scatterplotmatrix.Rd b/man/tm_g_scatterplotmatrix.Rd index 294eae5ab..ec2645a59 100644 --- a/man/tm_g_scatterplotmatrix.Rd +++ b/man/tm_g_scatterplotmatrix.Rd @@ -82,7 +82,6 @@ data <- within(data, { profit = rnorm(50, 20, 10) ) }) -datanames(data) <- c("countries", "sales") join_keys(data) <- join_keys( join_key("countries", "countries", "id"), join_key("sales", "sales", "id"), @@ -139,8 +138,7 @@ data <- within(data, { ADSL <- rADSL ADRS <- rADRS }) -datanames(data) <- c("ADSL", "ADRS") -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] app <- init( data = data, @@ -189,14 +187,14 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CmlCkmgRw-ri6XrRwpNSsugC89k7OihAAxLpSEGrUuvyBULpwAB6wqCJK+aSFRrpc1AD6VVA2lQUGxgDutKQAFirszeEgSrq6xOakjFGiHXkFGCbM8H4QY2O0-AnjfmAAIq54uv4AYlhhx2AAknYX-s4AyndgAAq3R-4A4ucfYAByABlngAhQ7hfwAxzPACC7zkuFG6wkRB0jAg8DI2xM6lIREYq3W6wI7AATOEyboKQBGcm03Q0+nhBkk+GIwnUKD0ODUWaJYn+ACyJBYBF6rGeWDgqEE9DoBH8qUJrLW6w5EAkgigUga2JgtFiWJxeIJhJ2DIAzOFLbprdbqUyrUzlabdByuTztvywJ8ZDAoMp5b8ABLckQBiVEP0WUJgRXrZ3rVBEaUczQkT3sAAc1oAbAB2cI5gAM4QALAX6SX6QyqRWqQyixgc+EAJwJsYsOCFPnsc0AVgrfb7FqLDL7Rb7rep5oppZH5Kb4Wz7cy-FQGfNGFLC4rJIwNa34Ub1sbFMbFcbk90jYbW5X-Dg9FIGb3zIwdsPlMXX4-25-C7-PdfzjONRG4MQ5maRZljgE0Ni2RIqUQccERVMYJjINgGk2bYwJgcpYLZIldgOZ4zmeG5nkeZ43meb5nkBEEwUuSEYThVCXVEWgAC89ESFCiLGdxynUPikhcIiV1YLtGFwvFSHYPCCNJUci0QEkiw08IUN0YSORCbYHBcOQVx0CBBDEpSRHYL1RD9ahqGeeB+FoQQYGeDlGCkZ4SDobIFW0qs9NEwzkhXAh-RCBy4AQ3QrNg4kjOccITmhAEHhSQLwmCgzEiSlcvH9TRSDiRI0TxGB2B0qkiyrDTwqIURSF5XSIAqqqq0zOqixXVBGCIEwem2crGEqnStMrEClAAX1SZpoHgURBgKWxai9DCphmZ4wJEUQFSUAArIgVAaABrOBWCW5pVuMI6TvOy6TTuiAzou3YNumMRng+rbfk2ALEWe16OH8Havt+MG9r+-gAZVIGHveohJk+qHwTASGLi9f6wG2fwPtYbCYdjVJUiUNB11qFQehNZptiGRE+CEXbtkZ4QxDguoYAaCQGlECKghkcoiFIP1NuKDmxjdblcbAB5+fIRghefUXpmKMJBN0LQWFoTlmcSOgmol9ZmgaEophxXnUDgfk0JdeZqgWsS8aRzDfo4u2xlEblrefRIvZEDRLeto2XSl3JEn8B5vY0TXtd1sREHV22PdFY6QharXpnjhpU9odPluqYBgGd5HfoAXTLlcPf9n2YozfxOygZ4JDXZ4HyfWGPcJGBhE0AjQpcd2u90PEH3cWKkqHrvBuKOvElS9LXGT004xdKvjYKU3inNwPRCtm3h-m2AnfR8DUY1wlBuoBWsX1BWg4P4fXU5aWI9l6Pn0znXZTgRO8Av00mcWol0wgTbGU8U69DThBRIWtqAWRzlAvO7NmhF1BmffwFc0b40Jp3J+NcNBzx2P4UivxyK-Eor8aivxaK-Hor8RivxQTPFYr8WEeDh492vrQfueVkgALGOvQkBDfZxQ-g-EOpow4yyjgHT+ccf6iD-hAu2ud07bC-tnNRKCChoNPrtTBZdwhekKmQHo4pfjECaqjS4fUBo9AVEI00IiiEmM1GYkq31GrNWeHYwapAOFdy4X3EQA9koCPWKPGQRDJ4RLGDPIhC8MoRNXivDWqSpoQFSLQEwuh2AqAVjibQsETK6BGCqUQ-QICsGhOgdg5MAAk3hwiNK9owVEqRppKDANNMuQA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CmlCkmgRw-ri6XrRwpNSsugC89k7OihAAxLpSEGrUuvyBULpwAB6wqCJK+aSFRrpc1AD6VVA2lQUGxgDutKQAFirszeEgSrq6xOakjFGiHXkFGCbM8H4QY2O0-AnjfmAAIq54uv4AYlhhx2AAknYX-s4AyndgAAq3R-4A4ucfYAByABlngAhQ7hfwAxzPACC7zkuFG6wkRB0jAg8DI2xM6lIREYq3W6wI7AATOEyboKQBGcm03Q0+nhBkk+GIwnUKD0ODUWaJYn+ACyJBYBF6rGeWDgqEE9DoBH8qUJrLW6w5EAkgigUga2JgtFiWJxeIJhJ2DIAzOFLbprdbqUyrUzlabdByuTztvywJ8ZDAoMp5b8ABLckQBiVEP0WUJgRXrZ3rVBEaUczQkT3sAAc1oAbAB2cI5gAM4QALAX6SX6QyqRWqQyixgc+EAJwJsYsOCFPnsc0AVgrfb7FqLDL7Rb7rep5oppZH5Kb4Wz7cy-FQGfNGFLC4rJIwNa34Ub1sbFMbFcbk90jYbW5X-Dg9FIGb3zIwdsPlMXX4-25-C7-PdfzjONRG4MQ5maRZljgE0Ni2RIqUQccERVMYJjINgGk2bYwJgcpYLZIldgOZ4zmeG5nkeZ43meb5nkBEEwUuSEYThVCXVEWgAC89ESFCiLGdxynUPikhcIiV1YLtGFwvFSHYPCCNJUci0QEkiw08IUN0YSORCbYHBcOQVx0CBBDEpSRHYL1RD9ahqGeeB+FoQQYGeDlGCkZ4SDobIFW0qs9NEwzkhXAh-RCBy4AQ3QrNg4kjOccITmhAEHhSQLwmCgzEiSlcvH9TRSDiRI0TxGB2B0qkiyrDTwqIURSF5XSIAqqqq0zOqixXVBGCIEwem2crGEqnStMrEClAAX1SAArIgVAaABrOBWFEQYClsWoFqW1b1pNXaIBWtbdgwqYZmec7pjEZ5NgCxEjpOjh-DAkRRGeN7bt+e7Yw43Qnv2s6iEmG6Pt+L7wfCL1fu2fxrtYbD+AVVJUiUNB11qFQehNZptiGRE+CEd7tiJ4QxDguoYAaCQGlECKghkcoiFIP0LuKSmxjdbk4bAB4GfIRhmefNnpmKMJBN0LQWFoTkScSOgms59ZmgaEophxOnUDgfk0JdeZqmgeBeeuy68ElwlRG5HXn0SK2RA0LWdeVl1udyRJ-Aea2NClmW5bERAJb1-Xxl6RaQha6Xpn9hpRXDinmmAYB4ZBzCzYAXXTlcQ-tm2YozfxOygZ4JDXZ4HyfB7g-1mBhE0AjQpcf6Q7GPEH3cWKkublvBuKfPElS9LXGrpULd0bOVYKNXig1x3RG13WW4N-1YDE17wKhsexkG6hBaxfVBadxel9dTkeY9vnvefKPZdlOBA-NkfTSjlqU9BxHfu7kO49oCPtml6gFlY5h1-gnAoSd17vX8JncEhBU5TA-sjP6W91i5w0P3HY-hSK-HIr8SivxqK-For8eivxGK-FBM8VivxYRVxProWuu9aANzyskFBE9LZX1wlfI+LtTRu15l7B218-Z31EA-L++sf5-0SDfGO0iwHVAgWASG0D07Q12IVMgPRxS-GIE1KGlw+oDR6CjSRnEr4YK9Fo4qujYH6Oas8Yxg1SB0JPow+uIhG7JRQa3Rg7cMFd18aYWgfdYqDwyuwsecZR56ymhAVItATC6HYCoQWOJtCwRMroEYKpRD9AgKwaE6B2AYwACTeHCOUq2jBUSpGmkoMA0105AA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } \item{example-2}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CmlCkmgRw-ri6XrRwpNSsugC89k7OihAAxLoAwgAiAJIAypm6-IFQunAAHrCoIkolpGVGulzUAPr1UDZ1pQbGAO60pAAWKuwd4SBKuroAgtn5ADK9uoxzi1Oz2Vj5y6tb+UoAvqkd0PCiY6W2TQR+YGsLYbr+c9v+qQBWRCqtANZwrAuHWuxn4cBMUGEpFaBH4tFEBFaXx+-0BwFOsDElwacgAukolGhUMsVIM-BBph0EsVSrgNnwhCJRNSGcIsRtpqQYK0JK0EYFyIwakQuYFGLQKuTptLdNQoPQ4NRqf58gQBTJhaRdDAxRKwhzpVoWLR5UzqXRRKQpTLpR1WpVSMwNHzUHBbgabTSGmc9IkXvNHngPTbRIq3VrEqGRM7RK73RTPTa5QqlX6wPkwxpdEbxaaxIh9QnE9KCENviFmYkcyb6CIYWXaBXsVBgMB-eswLjcXI6UXi7oo+G4Pxqe77gBxVx4Z5gLAzTJT8Iq5wADXevf70pgUNoNV9SRcG83uiIjDB7hHiQch+DnpMEuH1IAYjMFvlXH3Paliz3b16oPaFSOuo0Kxm61rFhi8DKvc+yFpu97UIK1KIYKLrgX+MrJoqMEZtGWoUPwqDfGQogFkGn6Jjmla6GOAAKMxzgAsjkTwvAAagUuR2OumElg2FbUka1CCHA9blliHStv6bydri4T0YxMwsdkbH3Jx+TceutF3AxzFqTMGlaWAci-pRnqDhoj5prkABy7HOHYujGM4tnZLoADyT66HZ2SOJkdi5B5tnwce25IbuIjUteH6bmZm6WRGA6ZqBcYQf22GpjOeHhtmxp5mRoWbqWEk0dWebiY2kmlNJsGyV28XHol1k6S8k4Gexr4GdkACavHmTa4WaHu0XJEem6nueLUxeN-b3hULUvm+sX9t+iZrTKG26GtqSpLQJi6OwKiCiB2hwDYtiTAmogjBArAzOg7BEgAJN44QvaGjA6IwqSHEoYCHLiQA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CmlCkmgRw-ri6XrRwpNSsugC89k7OihAAxLoAwgAiAJIAypm6-IFQunAAHrCoIkolpGVGulzUAPr1UDZ1pQbGAO60pAAWKuwd4SBKuroAgtn5ADK9uoxzi1Oz2Vj5y6tb+UoAvqkAVkQqrQDWcKyiY6W2TfxwJlDCpK0E-LSiBK1nF2ut2A0Hgdw6cgAukolGhUMsVIM-BBph0EsVSrgNnwhCJROiccIxMjptNSDBWhJWr9AuRGDUiOTAoxaBUSaTptQoPQ4NR0f58gRaTIGaRdDBmaywhsOVoWLRuXj0XRRKR2RzUaVWpVSMwNNTUHACOqNZqGqC9Il-GsFtKUabSaJeUaxYknSJ9aJDcaZQ7OdzefywPlnRpdHKWYqxIg7X6OQQhucQvjEhGFfQRJ9E7Rk-cGsBgNb5rawJDIXIsfa47p3S64Px0T6wDMAOKuPC6fxYGaZdvhAXOAAa-grvr9MHetBqlqSLkr1emREYz3cDcSDjnY4dJlZ9fRADEZgt8q4qw7Un7R2eOR1tRVdeoPl6jSbTR0LUG5ttY3Gd9Q6eif50gaL5bqaXI8nyVrBqGYoUPwqDnGQogxngYEahGKa6E2AAKMzdgAsjkYSds2ABqBS5HYI7zguCZJmI6JytQghwFmDHgqUBZFt+paQuEuH4TMRHZCR1oUfkVE0dhfhgHhhFieRlHUWAchXguNawXu0G5AAcmRzh2LoxjOLp2S6AA8vuuh6dkjiZHYuQWbpP7VhO-5TiI6Ibqe1bqXGtZhm6sEgT614OhBgbQSGHpimmUYoa5cb0TmjGpvKUbsalnH5oWzb7P4Zb+dWgXkGuMnWm2ikzGRR7VdkACaNHoRy7maNO3nJLR1ZLiu2mzs43W-ru5WHsevlxhe55blN0xTakqS0CYujsCodKPtocA2LYkz2qIIwQKwMzoOwcIACTeOE51OowOiMKkhxKGAhyQkAA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_missing_data.Rd b/man/tm_missing_data.Rd index 505a3747a..a758b5a85 100644 --- a/man/tm_missing_data.Rd +++ b/man/tm_missing_data.Rd @@ -77,7 +77,6 @@ data <- within(data, { mtcars[["cyl"]] <- as.factor(mtcars[["cyl"]]) mtcars[["gear"]] <- as.factor(mtcars[["gear"]]) }) -datanames(data) <- c("iris", "mtcars") app <- init( data = data, @@ -97,8 +96,7 @@ data <- within(data, { ADSL <- rADSL ADRS <- rADRS }) -datanames(data) <- c("ADSL", "ADRS") -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] app <- init( data = data, @@ -114,14 +112,14 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBKMtPzOAB6kzP64ul60cKTUrLoAvPZOzrYAZJm67rG+-ozUUBASUTHe8YkpaS6KEADEulIQatS6cKGwqCK6-FCkUEr9gwbGXNQA+iNQNsMDUGO6AO60pAAWKuwz0SBKurme3r6toqTE1ESM9fu6UPz8k9CiS2YWmtahtnsQBwehwFE3RE7FEnkm3BIEnYX2iJkuV3YIlKGxhtgAVLlzLQTOwAIzRDAABgArIS8QB2OTUgC6SwAcgBBW7-W4AXyUtx8tBeRl03NEtxg5xYvOMwoIos5v35QVEwDpfOK6ES7AF0Xuj2e9QOEtFCqWyp6HD1jFEGoeTygoh1ulN8uA-gIrGo-hpiuM1owJnUpER9uAjsILrdNNtAaDUhYoaWXp9Gn9IrNgf8UcYofqbPqM2g8FE2wWtj5BD8YAF5X89v8N2g6CWKjWfhlMxqOyFAmEYhqfCEInzLN0pBgkxgPNEKgk0wWcxl9XqON0atUzEsOhs31uok2EFYjPQ7DQqAAJN4Negj2DGDprkoORAwGyaUA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBKMtPzOAB6kzP64ul60cKTUrLoAvPZOzrYAZJm67rG+-ozUUBASUTHe8YkpaS6KEADEulIQatS6cKGwqCK6-FCkUEr9gwbGXNQA+iNQNsMDUGO6AO60pAAWKuwz0SBKurme3r6toqTE1ESM9fu6UPz8k9CiS2YWmtahtnsQBwehwFE3RE7FEnkm3BIEnYX2iJkuV3YIlKGxhtgAVLlzLQTOwAIzRDAABgArIS8QB2OTUgC6SwAcgBBW7-W4AXyUtx8tBeRl03NEtxg5xYvOMwoIos5v35QVEwDpfOK6ES7AF0Xuj2e9QOEtFCqWyp6HD1jFEGoeTygoh1ulN8uA-gIrGo-hpiuM1owJnUpER9uAjsILrdNNtAaDUhYoaWXp9Gn9IrNgf8UcYofqbJu0HQSxUaz8MpmNR2QoEwjENT4QhEokLf10pBgkxgPNEKgk0wWcxl9XqON0atUzEsOhs31uok2EFYjPQ7DQqAAJN4Negl2DGDprkoORAwGyaUA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } \item{example-2}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBKMtPzOAB6kzP64ul60cKTUrLoAvPZOzrYAZJm67rG+-ozUUBASUTHe8YkpaS6KEADEugDCACIAkgDKzbpwobCoIrr8UKRQSiNjBsZc1AD6k1A2E6NQ07oA7rSkABYq7IvRIEq6uZ7evhBipMTURIz1pwCCrZ0AMuuML+8nui9YnU+-06SgAvvVFtB4KIDqtbEZdAQ-GBvm9yv5gf56gArIgqOYAazgrBhi3hxn4cBMUGEpDmBH4tFEBDmuPxRJJwEhsDEsLGcgAukolGhUOsVNs-BBTosaodfnwhCJRDVFcJeb9TqQYHMYEzRCoJAtVstpbp6vVaCZdOwVORmJYdDZbMczaI9hBWE90OxRQASbzRf2iGQ6B5gpRgUECoA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsBKMtPzOAB6kzP64ul60cKTUrLoAvPZOzrYAZJm67rG+-ozUUBASUTHe8YkpaS6KEADEugDCACIAkgDKzbpwobCoIrr8UKRQSiNjBsZc1AD6k1A2E6NQ07oA7rSkABYq7IvRIEq6uZ7evhBipMTURIz1pwCCrZ0AMuuML+8nui9YnU+-06SgAvvUAFZEFRzADWcFYogOq1sRmGcBMUGEpDmBH4tFEBDmUJh8MRwGg8CRizkAF0lEo0Kh1iptn4IKdFjVDr8+EIRKIanzhGJ2adTqQYHMYATRCoJAtVssObp6vVaCZdOwVORmJYdDZbMcVaI9hBWE90OwmQASbzRW2iGQ6B5gpRgUG0oA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_outliers.Rd b/man/tm_outliers.Rd index 3d76bf5b7..ff738de8d 100644 --- a/man/tm_outliers.Rd +++ b/man/tm_outliers.Rd @@ -64,7 +64,6 @@ data <- within(data, { CO2 <- CO2 CO2[["primary_key"]] <- seq_len(nrow(CO2)) }) -datanames(data) <- "CO2" join_keys(data) <- join_keys(join_key("CO2", "CO2", "primary_key")) vars <- choices_selected(variable_choices(data[["CO2"]], c("Plant", "Type", "Treatment"))) @@ -108,8 +107,7 @@ data <- teal_data() data <- within(data, { ADSL <- rADSL }) -datanames(data) <- "ADSL" -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] fact_vars_adsl <- names(Filter(isTRUE, sapply(data[["ADSL"]], is.factor))) vars <- choices_selected(variable_choices(data[["ADSL"]], fact_vars_adsl)) @@ -152,14 +150,14 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6ugDCAPIATHHV9RVNdcDACmCojLQwLKyJANZwrJ0AumONonAAjokiEOwQjETZ7LV1cooQAL7bKdDwosUZtlmdG51KAFZEKkMjxylnxrf3w6zHbxAPHBfNeF0-zqnVKnW6vX6v06WzcEC0LFEjQI+TuBDEiWmIg0cH47ARPSg9BEiRRaLEJyC7WB4zGpQI7E6AAVqFAyKCgWA7KxUHAOZ07Iw4IF4OywFttko0KhGio8oyIJUUroALz+DK4Fp8IQiJFq7XCCktSqkGCJIiCUh0GTHY2VXQWq20GSJAmq3R0USkBX233qoKJMKkZgaTG8hl2v3+tmwPRqml4SN+rFwDTulOh0Thn1Rv2s+hwPzxsAAZULqdIugJtCJIkQoKTUbJtHReqrLBrxLgpNRLYpKWpYEuYAm9MZhBIBH5YEEqCCwxhck1itzvoz5H47s6s-nfMTK9XlRgwk0kTjugAYgBBAAyJecy8P9pMtFCuPd17vrgPue2q7-fpLkmBCBHAEhED0IFJG6aqet6jbRoGoTBuopBhqmOargcsZbkOAKPoeL7UOQjDukRJHoRGP6rgSba0QRT7Nq27oItQgjdkx-YZIOw6ju2jCiAAJOuuJAdRuYiZuaqsexPbkk83EdHhIIjnS-FCZJYlPkeJ60Ge7oOC4CGVABUamfa5kAds2y0CYujsCoJGodocA2LY5QrqIhQQKwV7oOw0qCYItClIF0yMDojDbDsShgDsYxAA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXVIhrqu-lCkULpwAB6wqCJKAUEGxlzUAPoxUDbRgcFGugDutKQAFirsKbi6IEq6ugDCAPIATHHV9RVNdcDACmCojLQwLKyJANZwrJ0AumONonAAjokiEOwQjETZ7LV1cooQAL7bAFZEKkMjosUZtlmHx8OsZ9cQJxydG52lL814up3dvf1PnS2bggWhYokaBHyRwIYkS0xEGjg-HYoJ6UHoIkSkOhYnOQXaHzq4zGpQI7E6AAVqFAyG9vmA7KxUHA6Z07Iw4IF4LSwFttko0KhGio8uSIJUUroALz+DK4Fp8IQicEyxXCXEtSqkGCJIiCUh0GRnTWVXR6g20GSJVHS3R0USkMWm52yoKJMKkZgaOHMskml2ummwPQywlvf0u+FwDS2qPe0S+p0Bl3U+hwPyhsAAZXT0dIulRtHRIkQ4fFyed2NoMJVBZYRYxcCxUOruJSBLArzAE1J5MIJAIrLAglQQWGgLk8vLFcqcfI-FtnRHY5ZeAjAZgwk0kRDugAYgBBAAyWecU5nppMtFCSNth5Prmnye2FZfLsnEYIgTgEiIPS-SQ2jK9qOuugbuqEnrqKQPrRkmFYpNA8CLp2nznjOV7UOQjC2ph2GwX6T4VqitYkehF5VjWtqgtQghNpRbYZB2XY9nWjCiAAJHOSIfkRybcQuMo0XRzY4mc7YdKhRLdiSbGcQJvEXpUm5YbQO62g4LhgZUb4Brppr6W+2zbLQJi6OwKjYdB2hwDYtjlOWoiFBArAHug7CChxgi0KUnnTIwOiMNsOxKGAOxjEAA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } \item{example-2}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXQBBHwCAGWTdRkaWpQBfRQhM6HhRCtzbfIUwTuaJpQArIhU0gGs4VmHMseN+OBMoYVI0gn5aUQI0+cWVteAB2DER8LkAXTcIXY00rRZRNKh+UWobUG9wAYrRqORGOwTg4XFVRGg4hxMsBgBMphMnk8qicMO9SERGHJiUovoxRG0CCUFgQxGlRHARBo4Px2GTaFB6CJDtTaLT1rlUeimtMwFiqvjPt9fv95H0lIi2ipiuxaiFcroALzq8K4NV8IQiCnag3Ce5quqkGBpIiCUh0GTDC11XS2+20GRSxha3R0USkVUQF3BnVQNLRUjMD6iVBwAiBkMh27wH3Crp4Z2JhlM0g+7Nxg4xuMJxMh6icxmpsABRkF3TszkiRATPVB0vBqk0sQ+htcuA8rsC8JCyYizHY3Tx9EAcVceF0EwAQgBZLAAaSwAEYJsTW+3g-nmfwq-VZy3M6WYPtaHE9NqQfVmgFnHv93UTLQoiyfQ+n642+2fSARecivh2YRwBIhJ8twXo+n6AYXnUmThlEkbqIWsZTgBpbJneC6jumYGlh+EIyD6pGQvSWElm+ZLGvW3zEe2nZ8t22pfNQgj9qx-IPFAI4YmKE70QAJIe5D8KBSEhhJ34cdw3EDmxQ4CWihGiuKjHkuJtZHtJOHtleEI3iIPqwv+b5AaW1nBrZujWX0fS0CYujQqoUaaDoNi2DUbaiGUECsPU6DsIiomCLQVThQyjA6ESPRKGA3RPEAA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAokqUBiXQGEAIgEkAZS9dfihSKF04AA9YVBElUPCDYy5qAH1EqBsEsIijXQB3WlIACxV2TNxdECVdXQBBHwCAGWTdRkaWpQBfRQgAKyIVNIBrOFZRCtzbfP44EyhhUjSCflpRAjTB4bGJ4Gh4Scy5AF03CAWNNK0WUTSoflFqNoOxdgAxWmpyRnZ1hxcVVEaDiHEywGACjAnWaUJOJyq6wwl1IREYcgxShujFEbQIJSGBDEaVEcBEGjg-HY2NoUHoIhWBNoRKOuQhUJhcIRpnUy2xdweT0xECUILaKmK7FqIVyugAvDLwrhpXwhCJcQrVcI3tK6qQYGkiIJSHQZJNdXVdEaTbQZNcWPLdHRRKQpRBLR7FVA0tFSMwrqJUHACG7PZ7Mq9HRymrC8Baw6TyaRHYng8tA8HQ2HPdQ6WSo2AAmS07oaXSRIgocr3dmPfjCWJHWX6XBGQ3WeF2dCY1yqiGOQBxVx4XRQgBCAFksABpLAARihGOrtY9qYp-AL9SHVfj2ZgS1ocT0Cve9WaAWcy5XdRMtCilMdp-Prhrtb6b93civdbCcAkaOZbh7UYR1nVdXc6kyH0oj9XkSSDftX2zCNYGPUduy6OMkLDW9vhkR1cJ+eDMwgz1+SbW5vxXetmUbBUbmoQRWxolkpk7SEMNjeEqn5AASNdyH4L9SNXYt1woxjmKZVjwQ4zkwG40tbn4sTBOE7C9wPI9HQBF9r3fbMDI9IzdAMvo+loExdD+VR-U0HQbFsGoa1EMoIFYep0HYEFeMEWgqh80lGB0dEeiUMBuhOIA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_t_crosstable.Rd b/man/tm_t_crosstable.Rd index 3cc5c5cb4..a9a1354cd 100644 --- a/man/tm_t_crosstable.Rd +++ b/man/tm_t_crosstable.Rd @@ -72,7 +72,6 @@ data <- within(data, { } mtcars[["primary_key"]] <- seq_len(nrow(mtcars)) }) -datanames(data) <- "mtcars" join_keys(data) <- join_keys(join_key("mtcars", "mtcars", "primary_key")) app <- init( @@ -114,8 +113,7 @@ data <- teal_data() data <- within(data, { ADSL <- rADSL }) -datanames(data) <- "ADSL" -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] app <- init( data = data, @@ -160,14 +158,14 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsIykUPQiov64ul60cKTUrLoAvPZOzooQAMS6UhBq1Lr8UEG6cAAesKgiSgVFRrpc1AD61VA2VYVQBsYA7rSkABYq7M0RIEq6ujCkBCyinRNTM2OmRIy67Fq6KroEfoSs1OG6-lpheEcoMIf+Uiz+crajEOPjk9OMosDAWgC633NQ4hM6lIK3Yrxmnx+3zS4wAvktwe9Pv5UIxaDAWKwGgBrOCsfy-OaiTwNEQQdgQRhELpghbve5KWFpZrQeCiIbtWy1fyI05KABWRBUOLx7OaXOMguFuNY7KlEBFHB5dNOEWVb1V51R6MxiruaSUaFQcxUvT8T3y7USlqCuARAmEYmtfCEoXNzzqMAapAaBCpolEQRCcHdHt01GCcDySX8AGF-bM7MFKnglh6Stbmg1SqRmBoGqJUHAdmmwyzYHoY2BeeFSx7iSINNaG8WfYXi6Gw88I-Qo9b-ABlKOt3RaFi0ZNwRC1i1d8YEPpCghOpJjtGT32L2jLsXtZHVlUE74REt7A5nY6a-ywK5gG6MfV22dzlsaOD8a2ngj7W-3u5PudnhgYRNAqStkhcADAN0FZ+Bkd9rQcSC6zDExaBKBCkgAMQAQQAGQHVxnw9GEwzkKCPXiJIsxzPM2yLEtiOect4H7A8NRnQDX1IZth3zdtGOg8NI2jc4h0bHi1wnYNp1TJiPQXJcV1HccN0U7cxA5IJ9xrMBfhPXZv3PNUwBOW8bwvO84FuMB7gol8+PID8qzMuShOA6hQJEa1cII5x7K7NCMOc3RfMIlDxlIkjS1ItI0loEw1hUcg6O0EN7l0R5xlEAYIFYHD0HYI0ABJvAiEriUYHRGDSeEIDAWFviAA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsIykUPQiov64ul60cKTUrLoAvPZOzooQAMS6UhBq1Lr8UEG6cAAesKgiSgVFRrpc1AD61VA2VYVQBsYA7rSkABYq7M0RIEq6ujCkBCyinRNTM2OmRIy67Fq6KroEfoSs1OG6-lpheEcoMIf+Uiz+crajEOPjk9OMosDAWgC633NQ4hM6lIK3Yrxmnx+3zS4wAvktwe9Pv5UIxaDAWKwGgBrOCsfy-OaiTwNEQQdgQRhELpghbve5KWFpABWRBUOLxoiG7VstVZ7NxrC5-IgHI4-kRpwiErpUvOqPRmLFdzSSjQqDmKl6fie+XaiT1QVwCIEwjEBr4QlCOuedRgDVIDQIVNEoiCITgNttumowTgeSS-gAwi7ZnZgpU8EtbSUDc0GqVSMwNA1RKg4Dto97mtB4AaZW8pVnbcSRBoDaWM460xmvd7nr76P782AAMr+qu6LQsWgRuCIcLF70EPpsgjmpLdtF9p2j2jjrnNZFgSUE74RTN7A5nY5y-ywK5gG6MFXG3X18aVjRwfgGzcEfaH493M8X54wYSaCp6JIOFyvt9dBWfgZBvA0-2cAC3xMWgSjApIADEAEEABlW1cc9vRhLCoOeeIknjRNk2rdNM0w20c1gH9zlXKNyOeK9SArDsUxrMjAJ9P0A3OdsyyYqdew9Ac6I4kcxwnLsexnMT5zEbkgmXWjfg3XYH23aUwBOQ8Dx3I84FuMB7lw+tGPg84tJEwCP2oL8RANZC0MgodbRguDb0Q1D0Oc3RsNtXyfKWNI0loEw1hUchiO0T17l0R5LwGCBWCQ9B2HVAASbwInS4lGB0Rg0nhCAwFhb4gA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } \item{example-2}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsIykUPQiov64ul60cKTUrLoAvPZOzooQAMS6AMIAIgCSAMpZuvxQQbpwAB6wqCJKpeVGulzUAPoNUDb1ZVAGxgDutKQAFirsHREgSrq6AII5BQAyfbqM80tKAL5pHdDwouM9tk3+64v+SgBWRCqtANZwrAcdx8b8cCZQwqStBPy0ogIrWutweT2Au1gYkOQTkAF0lEo0KgViohn4IDMOokSj1cNNdHwhKEcUThNCCTNSDBWj8CIwiKJREEQnAMTMObpqME4NQcf4sgymfZgnU8JSOZUcR1WlVSMwNK1RKg4AR2ZyOZD4PywGdwhLOaJearSDijSJFcrVeqNRzufReTqCsaNLotCxaKK4Ih9ZjbRyCMMbgQxDj3YxPazfkHaCHnj1gMBTgtzmA4XCIqJBPQjaakmYLJprC9dFM-f6ObR+FKmgBCd3oOIwqARFTDGRDUQRahECSx7jsACMcgiav8OTKcHCun8AAUAPIFPIADQ007ni5X1FI-jkaQrnPcpEEjAg7D20JewCrlTh+4P23x5f95pNcH4Oqy88cADkHABNX0D0Jb5aFqPQkgcFwn2AohGHedwP0glIYIPExaEqd8cQAMVmRYClcZ9OXvYjUM5eIkhlOUFR+K0xyIzUegvHU9XFBiZlfV0kk42iVXo4D7UdJJ-GdC1TXDSMRB9NjgMDYNQySCSvWjeT4yCRNkw2NMM10LMcxiHEC0sYsjlLA1-RvFYG1qDgJl0AEME+DQ4O7Xt+2oIc93M20jxPM8LzUqA5Gvas728jlH3CjiXXIJCZzAAjlyAg8YFA8CcLwgiyP9dDMLi3D8MIisSI5Er7zSNJaBMXR2BUcgaO0Nk9zMv1RFGCBWFmdB2GRAASbwIj6o1GB0Rg0k2JQwE2OEgA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsIykUPQiov64ul60cKTUrLoAvPZOzooQAMS6AMIAIgCSAMpZuvxQQbpwAB6wqCJKpeVGulzUAPoNUDb1ZVAGxgDutKQAFirsHREgSrq6AII5BQAyfbqM80tKAL5pAFZEKq0A1nCsouM9tk38cCZQwqStBPy0ogStewfHp8DQ8GcdcgAukolGhUCsVEM-BAZh1EiUerhpro+EJQvDUcIxNCZjNSDBWg8CIwiKJREEQnAcbiZtRgnBqPD-FkSWT7ME6nhkTTKvCOq0qqRmBpWqJUHACNSabCer89El-OtFuFudLRAyJaR4eqRCKxRKpdLafTGQqwAUNRpdFoWLQOXBECqYUbcQRhvsCGJ4TbGHbKY93bRPf8esBgIqFsqwIDARFRIJ6OqtUkzBZNNYAbops6XbjaPxeU0AIQ29Bxc5BCIqYYyIaiCLUIgSIPcdgARjkEUl-hyZTg4V0-gACgB5Ap5AAaGgHw7Hk+opH8cjSuZp7lIgkYEHYcpDQTkwHzlUBK9X2yROZdOs1cH4TLAWRHjgAcg4AJpO1co+60Wry5IuBeX5EIw1zuHeSQOIBqpGiYtCVLe8IAGKzIsBSuJeNKnlhQHSvEST8oKwoPPq3aYbiHRyveSqflelrJro156uKZFfnS9AMveFq6lqPp+iIjpcuRNJuh6XpJHx9oBmJe5QGGEYbNGsaMQmSbwqmlgZhcWYwS6R4rKWtQcBMugvBgtwaCBDZNi21DtsuulGuum7bruFZQAeR4no5uLnj5MxMeQEGDuazgTrRuYwD+f7Iah6G4bmcEIcFKFoRhubYbimWnmkaS0CYujsCo5DEdoVLLjpzqiKMECsLM6DsGCAAk3gRM16qMDojBpJsShgJsgJAA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/man/tm_variable_browser.Rd b/man/tm_variable_browser.Rd index 9c4c3f119..b36911ed4 100644 --- a/man/tm_variable_browser.Rd +++ b/man/tm_variable_browser.Rd @@ -64,7 +64,6 @@ data <- within(data, { faithful <- faithful CO2 <- CO2 }) -datanames(data) <- c("iris", "mtcars", "women", "faithful", "CO2") app <- init( data = data, @@ -86,8 +85,7 @@ data <- within(data, { ADSL <- rADSL ADTTE <- rADTTE }) -datanames(data) <- c("ADSL", "ADTTE") -join_keys(data) <- default_cdisc_join_keys[datanames(data)] +join_keys(data) <- default_cdisc_join_keys[names(data)] app <- init( data = data, @@ -105,14 +103,14 @@ if (interactive()) { \section{Examples in Shinylive}{ \describe{ \item{example-1}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsKKoLADWdBBw-ri6XrRwpNSsugC89k7OtgBkGbruMb7+ABakMNQA7rT8UqSikdHecQnJqS6Z2bne+WAAVqIkdOS1MQ2JKQ4tSgDEulLhsrr8UKRQunAAHrCoIkoLSwbGXNQA+jtQNtuLy0a65aQFKuwnUSBKuro+tKJ7b4wfL7owpAILE+VwBQMYNQgr1KRHgUKuMLhfxMUFotzM1C+KLRBQxfwAwgB5ABMXyJxKUAF9FBATtB4KIHhdbFcCH4wO8anhdP4wcDav5ERQBWBsejhCLyf4aUo0Kgvio0X4ofMLk1Hn8+EIRJ8UlrhGJla9XsVDloWLQoPQRIcmERSqIZEbja9qFa4JiUv4AGoWq0iXR2h0yfx-V408NKGm0Ey6dgqcjMSw6Gy2Z4q0R3CCsACC6HYcoAJN4okXHYwdIwaZSlGBKQBdIA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsKKoLADWdBBw-ri6XrRwpNSsugC89k7OtgBkGbruMb7+ABakMNQA7rT8UqSikdHecQnJqS6Z2bne+WAAVqIkdOS1MQ2JKQ4tSgDEulLhsrr8UKRQunAAHrCoIkoLSwbGXNQA+jtQNtuLy0a65aQFKuwnUSBKuro+tKJ7b4wfL7owpAILE+VwBQMYNQgr1KRHgUKuMLhfxMUFotzM1C+KLRBQxfwAwgB5ABMXyJxKUAF9FBAlGhUF8VGi-FD5hcmo8-nwhCJPilucIxCzXq9ioctCxaFB6CJDkwiKVRDJhSLXtRpXBMSl-AA1SXSkS6eWKmT+P6vGkWpQ02gmXTsFTkZiWHQ2WzPVmiO4QVgAQXQ7HpABJvFFg0rGDpGDTKUowJSALpAA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } \item{example-2}{ - \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsKKoLADWdBBw-ri6XrRwpNSsugC89k7OtgBkGbruMb7+ABakMNQA7rT8UqSikdHecQnJqS6Z2bne+WAAVqIkdOS1MQ2JKQ4tSgDEugDCACIAkgDK07pwAB6wqCK6-FCkUEp0TCwcgSFhcIoQu-sGxlzUAPo3UDZKL3e65aQFKuwvURASl0ugAgrNFgAZT6McFQ4Fg2Z2OzOGHg5GuCAAXyuL2g8FE-z2UFsRl0BD8YDhkNq-nRKP8Vy6RBUj2CcFYhJepOM-DgJigwlIjwI-FoogIj2ZrPZnOAeNgYiJ+zkAF0lEo0KhPipaKQ-BAQR8UgCEXwhCJRE1zcIlQiQcVHloWLQoPQRI8mERSqIZAaQQHdNQ3XBqE1-AA1F1u7Zen0yfz23RXEFXK60Ey6dgqcjMSw6Gy2IGG3SiX4QVig9DsLUAEm8UTrvsYOkYVyxSjAWNVQA}{Open in Shinylive} + \href{https://shinylive.io/r/app/#code=NobwRAdghgtgpmAXGKAHVA6ASmANGAYwHsIAXOMpMAGwEsAjAJykYE8AKcqajGIgEwCu1OAGcMAcwpxm1AJQAdCLTIyoBUrQBucAAQAeALS6AZoIgbaJdnN0AVLAFUAoksZwAjoNrv2CsKKoLADWdBBw-ri6XrRwpNSsugC89k7OtgBkGbruMb7+ABakMNQA7rT8UqSikdHecQnJqS6Z2bne+WAAVqIkdOS1MQ2JKQ4tSgDEugDCACIAkgDK07pwAB6wqCK6-FCkUEp0TCwcgSFhcIoQu-sGxlzUAPo3UDZKL3e65aQFKuwvURASl0ugAgrNFgAZT6McFQ4Fg2Z2OzOGHg5GuCAAXyuXSIKkewTgrFE-z2UFsRh2cBMUGEpEeBH4tFEBEeeIJRJJwGg8FJLzkAF0lEo0KhPipaKQ-BAQR8UgCEXwhCJRE1lcIxDKQSDio8tCxaFB6CJHkwiKVRDJtTqQdRjXBqE1-AA1Q3G7bmy0yfwIkFXf1KK60Ey6dgqcjMSw6Gy2IGy3SiX4QVig9DsMUAEm8USzVsYOkYVyxSjAWMFQA}{Open in Shinylive} \if{html}{\out{}} - \if{html}{\out{}} + \if{html}{\out{}} } } } diff --git a/tests/testthat/helper-TealAppDriver.R b/tests/testthat/helper-TealAppDriver.R index 3e9e7cf6b..c59d7c259 100644 --- a/tests/testthat/helper-TealAppDriver.R +++ b/tests/testthat/helper-TealAppDriver.R @@ -31,22 +31,18 @@ simple_teal_data <- function() { iris <- iris mtcars <- mtcars }) - teal.data::datanames(data) <- c("iris", "mtcars") data } simple_cdisc_data <- function(datasets = c("ADSL", "ADRS", "ADTTE")) { datasets <- match.arg(datasets, several.ok = TRUE) - data <- within( - teal.data::teal_data(), - { - require(nestcolor) - ADSL <- teal.modules.general::rADSL - ADRS <- teal.modules.general::rADRS - ADTTE <- teal.modules.general::rADTTE - } + + data <- Reduce( + x = datasets, + function(u, x) eval_code(u, sprintf("%1$s <- teal.modules.general::r%1$s", x)), + init = within(teal.data::teal_data(), require(nestcolor)) ) - teal.data::datanames(data) <- datasets + teal.data::join_keys(data) <- teal.data::default_cdisc_join_keys[datasets] data } diff --git a/tests/testthat/test-shinytest2-tm_a_pca.R b/tests/testthat/test-shinytest2-tm_a_pca.R index 9c5bd6b7a..7e3badac7 100644 --- a/tests/testthat/test-shinytest2-tm_a_pca.R +++ b/tests/testthat/test-shinytest2-tm_a_pca.R @@ -5,8 +5,6 @@ app_driver_tm_a_pca <- function() { USArrests <- USArrests # nolint: object_name. }) - teal.data::datanames(data) <- "USArrests" - init_teal_app_driver( data = data, diff --git a/tests/testthat/test-shinytest2-tm_a_regression.R b/tests/testthat/test-shinytest2-tm_a_regression.R index ee09a7656..143956043 100644 --- a/tests/testthat/test-shinytest2-tm_a_regression.R +++ b/tests/testthat/test-shinytest2-tm_a_regression.R @@ -3,7 +3,6 @@ app_driver_tm_a_regression <- function() { require(nestcolor) CO2 <- CO2 # nolint: object_name. }) - teal.data::datanames(data) <- c("CO2") init_teal_app_driver( data = data, diff --git a/tests/testthat/test-shinytest2-tm_g_association.R b/tests/testthat/test-shinytest2-tm_g_association.R index a5219639e..b1ac33d87 100644 --- a/tests/testthat/test-shinytest2-tm_g_association.R +++ b/tests/testthat/test-shinytest2-tm_g_association.R @@ -3,10 +3,9 @@ app_driver_tm_g_association <- function() { require(nestcolor) require(ggplot2) CO2 <- CO2 # nolint: object_name. - factors <- names(Filter(isTRUE, vapply(CO2, is.factor, logical(1L)))) - CO2[factors] <- lapply(CO2[factors], as.character) # nolint: object_name. + .factors <- names(Filter(isTRUE, vapply(CO2, is.factor, logical(1L)))) + CO2[.factors] <- lapply(CO2[.factors], as.character) # nolint: object_name. }) - teal.data::datanames(data) <- c("CO2") init_teal_app_driver( data = data, diff --git a/tests/testthat/test-shinytest2-tm_g_bivariate.R b/tests/testthat/test-shinytest2-tm_g_bivariate.R index 146f53a4f..9be35efe6 100644 --- a/tests/testthat/test-shinytest2-tm_g_bivariate.R +++ b/tests/testthat/test-shinytest2-tm_g_bivariate.R @@ -4,7 +4,6 @@ app_driver_tm_g_bivariate <- function() { require(nestcolor) CO2 <- data.frame(CO2) # nolint: object_name. }) - teal.data::datanames(data) <- c("CO2") init_teal_app_driver( data = data, diff --git a/tests/testthat/test-shinytest2-tm_g_distribution.R b/tests/testthat/test-shinytest2-tm_g_distribution.R index f65282719..a610aa31a 100644 --- a/tests/testthat/test-shinytest2-tm_g_distribution.R +++ b/tests/testthat/test-shinytest2-tm_g_distribution.R @@ -1,10 +1,7 @@ app_driver_tm_g_distribution <- function() { data <- teal.data::teal_data() - data <- within(data, { - ADSL <- rADSL - }) - teal.data::datanames(data) <- c("ADSL") - teal.data::join_keys(data) <- teal.data::default_cdisc_join_keys[teal.data::datanames(data)] + data <- within(data, ADSL <- rADSL) + teal.data::join_keys(data) <- teal.data::default_cdisc_join_keys[names(data)] vars1 <- teal.transform::choices_selected( teal.transform::variable_choices(data[["ADSL"]], c("ARM", "COUNTRY", "SEX")), diff --git a/tests/testthat/test-shinytest2-tm_g_response.R b/tests/testthat/test-shinytest2-tm_g_response.R index 0a8bf3f8d..4f2beb28a 100644 --- a/tests/testthat/test-shinytest2-tm_g_response.R +++ b/tests/testthat/test-shinytest2-tm_g_response.R @@ -4,8 +4,7 @@ app_driver_tm_g_response <- function() { require(nestcolor) ADSL <- rADSL }) - teal.data::datanames(data) <- c("ADSL") - teal.data::join_keys(data) <- teal.data::default_cdisc_join_keys[teal.data::datanames(data)] + teal.data::join_keys(data) <- teal.data::default_cdisc_join_keys[names(data)] init_teal_app_driver( data = data, diff --git a/tests/testthat/test-shinytest2-tm_g_scatterplot.R b/tests/testthat/test-shinytest2-tm_g_scatterplot.R index 09fd72a7b..798dc9ba0 100644 --- a/tests/testthat/test-shinytest2-tm_g_scatterplot.R +++ b/tests/testthat/test-shinytest2-tm_g_scatterplot.R @@ -4,8 +4,7 @@ app_driver_tm_g_scatterplot <- function() { require(nestcolor) ADSL <- rADSL }) - teal.data::datanames(data) <- c("ADSL") - teal.data::join_keys(data) <- teal.data::default_cdisc_join_keys[teal.data::datanames(data)] + teal.data::join_keys(data) <- teal.data::default_cdisc_join_keys[names(data)] init_teal_app_driver( data = data, diff --git a/tests/testthat/test-shinytest2-tm_outliers.R b/tests/testthat/test-shinytest2-tm_outliers.R index 33141e7ad..b2af74f0f 100644 --- a/tests/testthat/test-shinytest2-tm_outliers.R +++ b/tests/testthat/test-shinytest2-tm_outliers.R @@ -4,7 +4,6 @@ app_driver_tm_outlier <- function() { CO2 <- CO2 # nolint: object_name CO2[["primary_key"]] <- seq_len(nrow(CO2)) # nolint: object_name }) - teal.data::datanames(data) <- "CO2" teal.data::join_keys(data) <- teal.data::join_keys(join_key("CO2", "CO2", "primary_key")) vars <- teal.transform::choices_selected( diff --git a/vignettes/teal-modules-general.Rmd b/vignettes/teal-modules-general.Rmd index 0980da151..867fba79a 100644 --- a/vignettes/teal-modules-general.Rmd +++ b/vignettes/teal-modules-general.Rmd @@ -51,9 +51,7 @@ data <- within(data, { ADSL <- rADSL ADTTE <- rADTTE }) -datanames <- c("ADSL", "ADTTE") -datanames(data) <- datanames -join_keys(data) <- default_cdisc_join_keys[datanames] +join_keys(data) <- default_cdisc_join_keys[names(data)] # tm_variable_browser module tm_variable_browser_module <- tm_variable_browser( @@ -111,9 +109,7 @@ data <- within(data, { ADSL <- rADSL ADTTE <- rADTTE }) -datanames <- c("ADSL", "ADTTE") -datanames(data) <- datanames -join_keys(data) <- default_cdisc_join_keys[datanames] +join_keys(data) <- default_cdisc_join_keys[names(data)] ``` 3: Initialize a `teal` application with specified data and modules, in this case, the module: `tm_variable_browser`, datasets:`ADSL` and `ADTTE`. diff --git a/vignettes/using-association-plot.Rmd b/vignettes/using-association-plot.Rmd index b7f8aff42..9927d6689 100644 --- a/vignettes/using-association-plot.Rmd +++ b/vignettes/using-association-plot.Rmd @@ -47,9 +47,7 @@ data <- within(data, { TRUE ~ "-" ))) }) -datanames <- c("ADSL", "ADRS", "ADTTE", "ADLB") -datanames(data) <- datanames -join_keys(data) <- default_cdisc_join_keys[datanames] +join_keys(data) <- default_cdisc_join_keys[names(data)] ``` ## 3 - Create an `app` variable diff --git a/vignettes/using-bivariate-plot.Rmd b/vignettes/using-bivariate-plot.Rmd index 431c87929..7267ae1ca 100644 --- a/vignettes/using-bivariate-plot.Rmd +++ b/vignettes/using-bivariate-plot.Rmd @@ -49,9 +49,7 @@ data <- within(data, { TRUE ~ "-" ))) }) -datanames <- c("ADSL", "ADRS", "ADTTE", "ADLB") -datanames(data) <- datanames -join_keys(data) <- default_cdisc_join_keys[datanames] +join_keys(data) <- default_cdisc_join_keys[names(data)] ``` ## 3 - Create an `app` variable diff --git a/vignettes/using-cross-table.Rmd b/vignettes/using-cross-table.Rmd index 0a9ad3011..552976eeb 100644 --- a/vignettes/using-cross-table.Rmd +++ b/vignettes/using-cross-table.Rmd @@ -44,9 +44,7 @@ data <- within(data, { TRUE ~ "-" ))) }) -datanames <- c("ADSL", "ADLB") -datanames(data) <- datanames -join_keys(data) <- default_cdisc_join_keys[datanames] +join_keys(data) <- default_cdisc_join_keys[names(data)] ``` ## 3 - Create an `app` variable diff --git a/vignettes/using-data-table.Rmd b/vignettes/using-data-table.Rmd index 27fd1ea3c..d9ca029d8 100644 --- a/vignettes/using-data-table.Rmd +++ b/vignettes/using-data-table.Rmd @@ -39,9 +39,7 @@ data <- within(data, { ADTTE <- teal.modules.general::rADTTE ADLB <- teal.modules.general::rADLB }) -datanames <- c("ADSL", "ADTTE", "ADLB") -datanames(data) <- datanames -join_keys(data) <- default_cdisc_join_keys[datanames] +join_keys(data) <- default_cdisc_join_keys[names(data)] ``` ## 3 - Create an `app` variable diff --git a/vignettes/using-outliers-module.Rmd b/vignettes/using-outliers-module.Rmd index 507cf4716..5271906e5 100644 --- a/vignettes/using-outliers-module.Rmd +++ b/vignettes/using-outliers-module.Rmd @@ -40,9 +40,7 @@ data <- within(data, { ADRS <- teal.modules.general::rADRS ADLB <- teal.modules.general::rADLB }) -datanames <- c("ADSL", "ADRS", "ADLB") -datanames(data) <- datanames -join_keys(data) <- default_cdisc_join_keys[datanames] +join_keys(data) <- default_cdisc_join_keys[names(data)] ``` ## 3 - Create an `app` variable diff --git a/vignettes/using-regression-plots.Rmd b/vignettes/using-regression-plots.Rmd index fe10bce4f..02677ad6d 100644 --- a/vignettes/using-regression-plots.Rmd +++ b/vignettes/using-regression-plots.Rmd @@ -49,9 +49,7 @@ data <- within(data, { TRUE ~ "-" ))) }) -datanames <- c("ADSL", "ADRS", "ADTTE", "ADLB") -datanames(data) <- datanames -join_keys(data) <- default_cdisc_join_keys[datanames] +join_keys(data) <- default_cdisc_join_keys[names(data)] ``` ## 3 - Create an `app` variable diff --git a/vignettes/using-response-plot.Rmd b/vignettes/using-response-plot.Rmd index 59dae80f3..af452ee15 100644 --- a/vignettes/using-response-plot.Rmd +++ b/vignettes/using-response-plot.Rmd @@ -48,9 +48,7 @@ data <- within(data, { TRUE ~ "-" ))) }) -datanames <- c("ADSL", "ADRS", "ADTTE", "ADLB") -datanames(data) <- datanames -join_keys(data) <- default_cdisc_join_keys[datanames] +join_keys(data) <- default_cdisc_join_keys[names(data)] ``` ## 3 - Create an `app` variable diff --git a/vignettes/using-scatterplot-matrix.Rmd b/vignettes/using-scatterplot-matrix.Rmd index 28d09f70e..de15d7d4a 100644 --- a/vignettes/using-scatterplot-matrix.Rmd +++ b/vignettes/using-scatterplot-matrix.Rmd @@ -50,9 +50,7 @@ data <- within(data, { TRUE ~ "-" ))) }) -datanames <- c("ADSL", "ADRS", "ADTTE", "ADLB") -datanames(data) <- datanames -join_keys(data) <- default_cdisc_join_keys[datanames] +join_keys(data) <- default_cdisc_join_keys[names(data)] ``` ## 3 - Create an `app` variable diff --git a/vignettes/using-scatterplot.Rmd b/vignettes/using-scatterplot.Rmd index ec40e2e8d..f6379d976 100644 --- a/vignettes/using-scatterplot.Rmd +++ b/vignettes/using-scatterplot.Rmd @@ -52,9 +52,7 @@ data <- within(data, { TRUE ~ "-" ))) }) -datanames <- c("ADSL", "ADRS", "ADTTE", "ADLB") -datanames(data) <- datanames -join_keys(data) <- default_cdisc_join_keys[datanames] +join_keys(data) <- default_cdisc_join_keys[names(data)] ``` ## 3 - Create an `app` variable From cd8ac9d0f5d989a839ccb2091f80a41904409024 Mon Sep 17 00:00:00 2001 From: gogonzo Date: Fri, 8 Nov 2024 14:03:18 +0000 Subject: [PATCH 32/32] [skip actions] Bump version to 0.3.0.9054 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 580816261..3c0af05ee 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: teal.modules.general Title: General Modules for 'teal' Applications -Version: 0.3.0.9053 -Date: 2024-11-04 +Version: 0.3.0.9054 +Date: 2024-11-08 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index b50d8ce9a..dea3b1d7e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.modules.general 0.3.0.9053 +# teal.modules.general 0.3.0.9054 * Removed `Show Warnings` modals from modules.