diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index ac91f0e80..8fb971c31 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -130,7 +130,7 @@ The package maintainer also reserves the right to adjust the criteria to recogni If you have further questions regarding the contribution guidelines, please contact the package/repository maintainer. -[docs]: https://insightsengineering.github.io/teal.slice/latest-tag/index.html -[articles]: https://insightsengineering.github.io/teal.slice/latest-tag/articles/index.html -[license]: https://insightsengineering.github.io/teal.slice/latest-tag/LICENSE-text.html -[insights]: https://github.com/insightsengineering/teal.slice/pulse +[docs]: https://pharmaverse.github.io/teal.slice/latest-tag/index.html +[articles]: https://pharmaverse.github.io/teal.slice/latest-tag/articles/index.html +[license]: https://pharmaverse.github.io/teal.slice/latest-tag/LICENSE-text.html +[insights]: https://github.com/pharmaverse/teal.slice/pulse diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 040a1c931..c5de7e658 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -33,7 +33,7 @@ body: id: code-of-conduct attributes: label: Code of Conduct - description: By submitting this issue, you agree to follow our [Code of Conduct.](https://insightsengineering.github.io/teal.slice/latest-tag/CODE_OF_CONDUCT.html) + description: By submitting this issue, you agree to follow our [Code of Conduct.](https://pharmaverse.github.io/teal.slice/latest-tag/CODE_OF_CONDUCT.html) options: - label: I agree to follow this project's Code of Conduct. required: true @@ -41,7 +41,7 @@ body: id: contributor-guidelines attributes: label: Contribution Guidelines - description: By submitting this issue, you agree to follow our [Contribution Guidelines.](https://insightsengineering.github.io/teal.slice/latest-tag/CONTRIBUTING.html) + description: By submitting this issue, you agree to follow our [Contribution Guidelines.](https://pharmaverse.github.io/teal.slice/latest-tag/CONTRIBUTING.html) options: - label: I agree to follow this project's Contribution Guidelines. required: true @@ -49,7 +49,7 @@ body: id: security-policy attributes: label: Security Policy - description: By submitting this issue, you agree to follow our [Security Policy.](https://github.com/insightsengineering/teal.slice/security/policy) + description: By submitting this issue, you agree to follow our [Security Policy.](https://github.com/pharmaverse/teal.slice/security/policy) options: - label: I agree to follow this project's Security Policy. required: true diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml index 87a57ba6f..3f4daa6fb 100644 --- a/.github/ISSUE_TEMPLATE/feature.yml +++ b/.github/ISSUE_TEMPLATE/feature.yml @@ -13,7 +13,7 @@ body: id: code-of-conduct attributes: label: Code of Conduct - description: By submitting this issue, you agree to follow our [Code of Conduct.](https://insightsengineering.github.io/teal.slice/latest-tag/CODE_OF_CONDUCT.html) + description: By submitting this issue, you agree to follow our [Code of Conduct.](https://pharmaverse.github.io/teal.slice/latest-tag/CODE_OF_CONDUCT.html) options: - label: I agree to follow this project's Code of Conduct. required: true @@ -21,7 +21,7 @@ body: id: contributor-guidelines attributes: label: Contribution Guidelines - description: By submitting this issue, you agree to follow our [Contribution Guidelines.](https://insightsengineering.github.io/teal.slice/latest-tag/CONTRIBUTING.html) + description: By submitting this issue, you agree to follow our [Contribution Guidelines.](https://pharmaverse.github.io/teal.slice/latest-tag/CONTRIBUTING.html) options: - label: I agree to follow this project's Contribution Guidelines. required: true @@ -29,7 +29,7 @@ body: id: security-policy attributes: label: Security Policy - description: By submitting this issue, you agree to follow our [Security Policy.](https://github.com/insightsengineering/teal.slice/security/policy) + description: By submitting this issue, you agree to follow our [Security Policy.](https://github.com/pharmaverse/teal.slice/security/policy) options: - label: I agree to follow this project's Security Policy. required: true diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml index 3be20b7ae..8d59e10a6 100644 --- a/.github/ISSUE_TEMPLATE/question.yml +++ b/.github/ISSUE_TEMPLATE/question.yml @@ -13,7 +13,7 @@ body: id: code-of-conduct attributes: label: Code of Conduct - description: By submitting this issue, you agree to follow our [Code of Conduct.](https://insightsengineering.github.io/teal.slice/latest-tag/CODE_OF_CONDUCT.html) + description: By submitting this issue, you agree to follow our [Code of Conduct.](https://pharmaverse.github.io/teal.slice/latest-tag/CODE_OF_CONDUCT.html) options: - label: I agree to follow this project's Code of Conduct. required: true @@ -21,7 +21,7 @@ body: id: contributor-guidelines attributes: label: Contribution Guidelines - description: By submitting this issue, you agree to follow our [Contribution Guidelines.](https://insightsengineering.github.io/teal.slice/latest-tag/CONTRIBUTING.html) + description: By submitting this issue, you agree to follow our [Contribution Guidelines.](https://pharmaverse.github.io/teal.slice/latest-tag/CONTRIBUTING.html) options: - label: I agree to follow this project's Contribution Guidelines. required: true @@ -29,7 +29,7 @@ body: id: security-policy attributes: label: Security Policy - description: By submitting this issue, you agree to follow our [Security Policy.](https://github.com/insightsengineering/teal.slice/security/policy) + description: By submitting this issue, you agree to follow our [Security Policy.](https://github.com/pharmaverse/teal.slice/security/policy) options: - label: I agree to follow this project's Security Policy. required: true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9767c176e..8d810187d 100755 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -29,10 +29,10 @@ repos: - shinycssloaders - shinyjs - shinyWidgets - - insightsengineering/teal.code - - insightsengineering/teal.data - - insightsengineering/teal.logger - - insightsengineering/teal.widgets + - pharmaverse/teal.code + - pharmaverse/teal.data + - pharmaverse/teal.logger + - pharmaverse/teal.widgets - id: spell-check name: Check spelling with `spelling` exclude: > diff --git a/DESCRIPTION b/DESCRIPTION index 6b7a3626d..db5b5f068 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -30,9 +30,9 @@ Description: Data filtering module for 'teal' applications. Allows for 'MultiAssayExperiment' objects. Also displays filtered and unfiltered observation counts. License: Apache License 2.0 -URL: https://insightsengineering.github.io/teal.slice/, - https://github.com/insightsengineering/teal.slice/ -BugReports: https://github.com/insightsengineering/teal.slice/issues +URL: https://pharmaverse.github.io/teal.slice/, + https://github.com/pharmaverse/teal.slice/ +BugReports: https://github.com/pharmaverse/teal.slice/issues Depends: R (>= 4.0) Imports: @@ -72,13 +72,13 @@ VignetteBuilder: Config/Needs/verdepcheck: rstudio/shiny, rstudio/bslib, mllg/checkmate, tidyverse/dplyr, rstudio/htmltools, jeroen/jsonlite, daroczig/logger, plotly/plotly, r-lib/R6, daattali/shinycssloaders, daattali/shinyjs, - dreamRs/shinyWidgets, insightsengineering/teal.data, - insightsengineering/teal.logger, insightsengineering/teal.widgets, + dreamRs/shinyWidgets, pharmaverse/teal.data, + pharmaverse/teal.logger, pharmaverse/teal.widgets, rstudio/DT, yihui/knitr, bioc::MultiAssayExperiment, bioc::SummarizedExperiment, rstudio/rmarkdown, r-lib/testthat, r-lib/withr, bioc::matrixStats Config/Needs/website: insightsengineering/nesttemplate -Config/roxygen2/version: 8.0.0 +Config/roxygen2/version: 8.1.0 Encoding: UTF-8 Language: en-US LazyData: true diff --git a/R/FilterStateDate.R b/R/FilterStateDate.R index c496a66f3..90dd8e862 100644 --- a/R/FilterStateDate.R +++ b/R/FilterStateDate.R @@ -116,7 +116,6 @@ DateFilterState <- R6::R6Class( # nolint # public methods ---- public = list( - #' @description #' Initialize a `FilterState` object. #' @@ -251,7 +250,7 @@ DateFilterState <- R6::R6Class( # nolint }, remove_out_of_bounds_values = function(values) { choices <- private$get_choices() - if (values[1] < choices[1L] | values[1] > choices[2L]) { + if (values[1] < choices[1L] || values[1] > choices[2L]) { warning( sprintf( "Value: %s is outside of the possible range for column %s of dataset %s, setting minimum possible value.", @@ -261,7 +260,7 @@ DateFilterState <- R6::R6Class( # nolint values[1] <- choices[1L] } - if (values[2] > choices[2L] | values[2] < choices[1L]) { + if (values[2] > choices[2L] || values[2] < choices[1L]) { warning( sprintf( "Value: %s is outside of the possible range for column %s of dataset %s, setting maximum possible value.", diff --git a/R/FilterStateDatettime.R b/R/FilterStateDatettime.R index 9954a4824..9f503a191 100644 --- a/R/FilterStateDatettime.R +++ b/R/FilterStateDatettime.R @@ -122,7 +122,6 @@ DatetimeFilterState <- R6::R6Class( # nolint # public methods ---- public = list( - #' @description #' Initialize a `FilterState` object. This class #' has an extra field, `private$timezone`, which is set to `Sys.timezone()` by @@ -297,7 +296,7 @@ DatetimeFilterState <- R6::R6Class( # nolint values[1] <- choices[1L] } - if (values[2] > choices[2L] | values[2] < choices[1L]) { + if (values[2] > choices[2L] || values[2] < choices[1L]) { warning( sprintf( "Value: '%s' is outside of the range for the column '%s' in dataset '%s', setting maximum possible value.", diff --git a/R/FilterStateEmpty.R b/R/FilterStateEmpty.R index 841b14add..333283f5e 100644 --- a/R/FilterStateEmpty.R +++ b/R/FilterStateEmpty.R @@ -31,7 +31,6 @@ EmptyFilterState <- R6::R6Class( # nolint # public methods ---- public = list( - #' @description #' Initialize `EmptyFilterState` object. #' diff --git a/R/FilterStateLogical.R b/R/FilterStateLogical.R index 0dea7d938..2340e6d0c 100644 --- a/R/FilterStateLogical.R +++ b/R/FilterStateLogical.R @@ -101,7 +101,6 @@ LogicalFilterState <- R6::R6Class( # nolint # public methods ---- public = list( - #' @description #' Initialize a `FilterState` object. #' diff --git a/R/FilteredDatasetDataframe.R b/R/FilteredDatasetDataframe.R index ebb31d200..f2b3dd2c2 100644 --- a/R/FilteredDatasetDataframe.R +++ b/R/FilteredDatasetDataframe.R @@ -37,7 +37,6 @@ DataframeFilteredDataset <- R6::R6Class( # nolint # public fields ---- public = list( - #' @description #' Initializes this `DataframeFilteredDataset` object. #' diff --git a/R/FilteredDatasetDefault.R b/R/FilteredDatasetDefault.R index aefbb8d71..64838e899 100644 --- a/R/FilteredDatasetDefault.R +++ b/R/FilteredDatasetDefault.R @@ -24,7 +24,6 @@ DefaultFilteredDataset <- R6::R6Class( # nolint # public methods ---- public = list( - #' @description #' Initializes this `DefaultFilteredDataset` object. #' diff --git a/R/teal_slices.R b/R/teal_slices.R index f527c4a76..0323c3e73 100644 --- a/R/teal_slices.R +++ b/R/teal_slices.R @@ -19,7 +19,7 @@ #' specify which variables are allowed to be filtered; see `Details`. #' @param count_type #' _This is a new feature. Do kindly share your opinions on -#' [`teal.slice`'s GitHub repository](https://github.com/insightsengineering/teal.slice/)._ +#' [`teal.slice`'s GitHub repository](https://github.com/pharmaverse/teal.slice/)._ #' #' (`character(1)`) string specifying how observations are tallied by these filter states. #' Possible options: diff --git a/R/utils.R b/R/utils.R index ba04a84b9..ebf7b4f22 100644 --- a/R/utils.R +++ b/R/utils.R @@ -64,7 +64,6 @@ make_c_call <- function(choices) { } - #' Encodes ids to be used in JavaScript and Shiny #' #' @description diff --git a/README.md b/README.md index 20561fdd3..9de816155 100644 --- a/README.md +++ b/README.md @@ -6,22 +6,22 @@ [![Last Month Downloads](http://cranlogs.r-pkg.org/badges/last-month/teal.slice?color=green)](https://cran.r-project.org/package=teal.slice) [![Last Week Downloads](http://cranlogs.r-pkg.org/badges/last-week/teal.slice?color=green)](https://cran.r-project.org/package=teal.slice) -[![Check 🛠](https://github.com/insightsengineering/teal.slice/actions/workflows/check.yaml/badge.svg)](https://insightsengineering.github.io/teal.slice/main/unit-test-report/) -[![Docs 📚](https://github.com/insightsengineering/teal.slice/actions/workflows/docs.yaml/badge.svg)](https://insightsengineering.github.io/teal.slice/) -[![Code Coverage 📔](https://raw.githubusercontent.com/insightsengineering/teal.slice/_xml_coverage_reports/data/main/badge.svg)](https://insightsengineering.github.io/teal.slice/main/coverage-report/) - -![GitHub forks](https://img.shields.io/github/forks/insightsengineering/teal.slice?style=social) -![GitHub repo stars](https://img.shields.io/github/stars/insightsengineering/teal.slice?style=social) - -![GitHub commit activity](https://img.shields.io/github/commit-activity/m/insightsengineering/teal.slice) -![GitHub contributors](https://img.shields.io/github/contributors/insightsengineering/teal.slice) -![GitHub last commit](https://img.shields.io/github/last-commit/insightsengineering/teal.slice) -![GitHub pull requests](https://img.shields.io/github/issues-pr/insightsengineering/teal.slice) -![GitHub repo size](https://img.shields.io/github/repo-size/insightsengineering/teal.slice) -![GitHub language count](https://img.shields.io/github/languages/count/insightsengineering/teal.slice) +[![Check 🛠](https://github.com/pharmaverse/teal.slice/actions/workflows/check.yaml/badge.svg)](https://pharmaverse.github.io/teal.slice/main/unit-test-report/) +[![Docs 📚](https://github.com/pharmaverse/teal.slice/actions/workflows/docs.yaml/badge.svg)](https://pharmaverse.github.io/teal.slice/) +[![Code Coverage 📔](https://raw.githubusercontent.com/pharmaverse/teal.slice/_xml_coverage_reports/data/main/badge.svg)](https://pharmaverse.github.io/teal.slice/main/coverage-report/) + +![GitHub forks](https://img.shields.io/github/forks/pharmaverse/teal.slice?style=social) +![GitHub repo stars](https://img.shields.io/github/stars/pharmaverse/teal.slice?style=social) + +![GitHub commit activity](https://img.shields.io/github/commit-activity/m/pharmaverse/teal.slice) +![GitHub contributors](https://img.shields.io/github/contributors/pharmaverse/teal.slice) +![GitHub last commit](https://img.shields.io/github/last-commit/pharmaverse/teal.slice) +![GitHub pull requests](https://img.shields.io/github/issues-pr/pharmaverse/teal.slice) +![GitHub repo size](https://img.shields.io/github/repo-size/pharmaverse/teal.slice) +![GitHub language count](https://img.shields.io/github/languages/count/pharmaverse/teal.slice) [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) -[![Current Version](https://img.shields.io/github/r-package/v/insightsengineering/teal.slice/main?color=purple\&label=package%20version)](https://github.com/insightsengineering/teal.slice/tree/main) -[![Open Issues](https://img.shields.io/github/issues-raw/insightsengineering/teal.slice?color=red\&label=open%20issues)](https://github.com/insightsengineering/teal.slice/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) +[![Current Version](https://img.shields.io/github/r-package/v/pharmaverse/teal.slice/main?color=purple\&label=package%20version)](https://github.com/pharmaverse/teal.slice/tree/main) +[![Open Issues](https://img.shields.io/github/issues-raw/pharmaverse/teal.slice?color=red\&label=open%20issues)](https://github.com/pharmaverse/teal.slice/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) `teal.slice` is an `R` library used in the development of `teal` `shiny` modules. It provides: @@ -40,14 +40,14 @@ Alternatively, you might want to use the development version. ```r # install.packages("pak") -pak::pak("insightsengineering/teal.slice") +pak::pak("pharmaverse/teal.slice") ``` ## Usage -To understand how to use this package, please refer to the [Introduction to `teal.slice`](https://insightsengineering.github.io/teal.slice/latest-tag/articles/teal-slice.html) article, which provides multiple examples of code implementation. +To understand how to use this package, please refer to the [Introduction to `teal.slice`](https://pharmaverse.github.io/teal.slice/latest-tag/articles/teal-slice.html) article, which provides multiple examples of code implementation. -![Showcase](https://github.com/insightsengineering/teal.slice/blob/main/assets/img/showcase.gif) +![Showcase](https://github.com/pharmaverse/teal.slice/blob/main/assets/img/showcase.gif) ## Getting help diff --git a/_pkgdown.yml b/_pkgdown.yml index 60b5bef06..ee2e31460 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -1,5 +1,5 @@ --- -url: https://insightsengineering.github.io/teal.slice +url: https://pharmaverse.github.io/teal.slice template: package: nesttemplate @@ -20,7 +20,7 @@ navbar: href: unit-test-report-non-cran/ github: icon: fa-github - href: https://github.com/insightsengineering/teal.slice + href: https://github.com/pharmaverse/teal.slice reference: - title: "`teal` filter-panel API" diff --git a/man/teal.slice-package.Rd b/man/teal.slice-package.Rd index 119bc9287..d44560e9f 100644 --- a/man/teal.slice-package.Rd +++ b/man/teal.slice-package.Rd @@ -11,9 +11,9 @@ \seealso{ Useful links: \itemize{ - \item \url{https://insightsengineering.github.io/teal.slice/} - \item \url{https://github.com/insightsengineering/teal.slice/} - \item Report bugs at \url{https://github.com/insightsengineering/teal.slice/issues} + \item \url{https://pharmaverse.github.io/teal.slice/} + \item \url{https://github.com/pharmaverse/teal.slice/} + \item Report bugs at \url{https://github.com/pharmaverse/teal.slice/issues} } } diff --git a/man/teal_slices.Rd b/man/teal_slices.Rd index 4a80d320b..ec3965025 100644 --- a/man/teal_slices.Rd +++ b/man/teal_slices.Rd @@ -20,7 +20,7 @@ match names of data sets and vector elements match variable names in respective specify which variables are allowed to be filtered; see \code{Details}.} \item{count_type}{\emph{This is a new feature. Do kindly share your opinions on -\href{https://github.com/insightsengineering/teal.slice/}{\code{teal.slice}'s GitHub repository}.} +\href{https://github.com/pharmaverse/teal.slice/}{\code{teal.slice}'s GitHub repository}.} (\code{character(1)}) string specifying how observations are tallied by these filter states. Possible options: diff --git a/staged_dependencies.yaml b/staged_dependencies.yaml index 911654f95..396746e39 100644 --- a/staged_dependencies.yaml +++ b/staged_dependencies.yaml @@ -1,20 +1,20 @@ --- current_repo: - repo: insightsengineering/teal.slice + repo: pharmaverse/teal.slice host: https://github.com upstream_repos: - insightsengineering/teal.logger: - repo: insightsengineering/teal.logger + pharmaverse/teal.logger: + repo: pharmaverse/teal.logger host: https://github.com - insightsengineering/teal.widgets: - repo: insightsengineering/teal.widgets + pharmaverse/teal.widgets: + repo: pharmaverse/teal.widgets host: https://github.com - insightsengineering/teal.data: - repo: insightsengineering/teal.data + pharmaverse/teal.data: + repo: pharmaverse/teal.data host: https://github.com downstream_repos: - insightsengineering/teal: - repo: insightsengineering/teal + pharmaverse/teal: + repo: pharmaverse/teal host: https://github.com insightsengineering/teal.modules.general: repo: insightsengineering/teal.modules.general diff --git a/tests/testthat/test-filter_panel_api.R b/tests/testthat/test-filter_panel_api.R index 8cb2ccdfe..8286bbc93 100644 --- a/tests/testthat/test-filter_panel_api.R +++ b/tests/testthat/test-filter_panel_api.R @@ -119,7 +119,6 @@ testthat::test_that("FilterPanelAPI$clear_filter_states remove the filters of th }) - # WRAPPER FUNCTIONS ---- # get_filter_state ---- testthat::test_that("get_filter_state returns `teal_slices` with features identical to those in input", {