Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ repos:
additional_dependencies:
- checkmate
- dplyr
- lifecycle
- logger
- methods
- rlang
Expand Down
5 changes: 1 addition & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Imports:
checkmate (>= 2.1.0),
dplyr (>= 1.1.0),
htmltools,
lifecycle (>= 0.2.0),
logger (>= 0.2.0),
methods,
rlang (>= 1.0.0),
Expand All @@ -48,12 +47,10 @@ Suggests:
VignetteBuilder:
knitr,
rmarkdown
RdMacros:
lifecycle
Remotes:
insightsengineering/teal.widgets
Config/Needs/verdepcheck: mllg/checkmate, tidyverse/dplyr,
r-lib/lifecycle, daroczig/logger, r-lib/rlang, rstudio/shiny,
daroczig/logger, r-lib/rlang, rstudio/shiny,
daattali/shinyjs, rstudio/shinyvalidate,
insightsengineering/teal.data, insightsengineering/teal.logger,
insightsengineering/teal.widgets, tidyverse/tidyr, r-lib/tidyselect,
Expand Down
1 change: 0 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ export(value_choices)
export(variable_choices)
import(shiny)
importFrom(dplyr,"%>%")
importFrom(lifecycle,badge)
1 change: 0 additions & 1 deletion R/Queue.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#' @docType class
#'
#' @description
#' `r lifecycle::badge("experimental")`
#'
#' Abstract data type that stores and returns any number of elements.
#'
Expand Down
3 changes: 0 additions & 3 deletions R/choices_labeled.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#' Set "`<choice>:<label>`" type of names
#'
#' @description
#' `r lifecycle::badge("stable")`
#'
#' This is often useful for [choices_selected()] as it marks up the drop-down boxes
#' for [shiny::selectInput()].
Expand Down Expand Up @@ -123,7 +122,6 @@ choices_labeled <- function(choices, labels, subset = NULL, types = NULL) {
#' Variable label extraction and custom selection from data
#'
#' @description
#' `r lifecycle::badge("stable")`
#'
#' Wrapper on [choices_labeled] to label variables basing on existing labels in data.
#'
Expand Down Expand Up @@ -244,7 +242,6 @@ variable_choices.data.frame <- function(data, subset = NULL, fill = TRUE, key =
#' Value labeling and filtering based on variable relationship
#'
#' @description
#' `r lifecycle::badge("stable")`
#'
#' Wrapper on [choices_labeled] to label variable values basing on other variable values.
#'
Expand Down
5 changes: 0 additions & 5 deletions R/choices_selected.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ no_select_keyword <- "-- no selection --"
#' Choices selected
#'
#' @description
#' `r lifecycle::badge("stable")`
#'
#' Construct a single list containing available choices, the default selected value, and
#' additional settings such as to order the choices with the selected elements appearing first
Expand Down Expand Up @@ -201,8 +200,6 @@ is.choices_selected <- function(x) { # nolint: object_name_linter.

#' Add empty choice to choices selected
#'
#' `r lifecycle::badge("stable")`
#'
#' @param x (`choices_selected`) object.
#' @param multiple (`logical(1)`) whether multiple selections are allowed or not.
#'
Expand All @@ -227,8 +224,6 @@ add_no_selected_choices <- function(x, multiple = FALSE) {

#' Check select choices for no choice made
#'
#' `r lifecycle::badge("stable")`
#'
#' @param x (`character`) Word that shall be checked for `NULL`, empty, "--no-selection".
#'
#' @return The word or `NULL`.
Expand Down
2 changes: 1 addition & 1 deletion R/column_functions.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#' Returns non-key column names from data
#'
#' @description `r lifecycle::badge("stable")`
#' @description Returns non-key column names from data.
#'
#' @param data (`data.frame`) Data with attribute `filter_and_columns`. This can only be
#' created by [data_extract_srv()], which returns a shiny [shiny::reactive()].
Expand Down
3 changes: 0 additions & 3 deletions R/data_extract_datanames.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#' Help text with available datasets input
#'
#' @description
#' `r lifecycle::badge("stable")`
#'
#' Creates [shiny::helpText()] with the names of available datasets for the
#' current module.
Expand All @@ -23,7 +22,6 @@ datanames_input <- function(data_extracts) {
#' Gets names of the datasets from a list of `data_extract_spec` objects
#'
#' @description
#' `r lifecycle::badge("stable")`
#'
#' Fetches `dataname` slot per `data_extract_spec` from a list of
#' `data_extract_spec`.
Expand Down Expand Up @@ -67,7 +65,6 @@ get_extract_datanames <- function(data_extracts) {
#' Verify uniform dataset source across data extract specification
#'
#' @description
#' `r lifecycle::badge("stable")`
#'
#' Checks if the input `data_extract_spec` objects all come from the same dataset.
#'
Expand Down
5 changes: 1 addition & 4 deletions R/data_extract_module.R
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ data_extract_deps <- function() {

#' `teal` data extraction module user-interface
#'
#' @description
#' `r lifecycle::badge("experimental")`
#' @description Data extraction module.
#'
#' @details
#' There are three inputs that will be rendered
Expand Down Expand Up @@ -273,7 +272,6 @@ check_data_extract_spec_react <- function(datasets, data_extract) {
#' Extraction of the selector(s) details
#'
#' @description
#' `r lifecycle::badge("stable")`
#'
#' Extracting details of the selection(s) in [data_extract_ui] elements.
#'
Expand Down Expand Up @@ -582,7 +580,6 @@ data_extract_srv.list <- function(id,
#' Creates a named list of `data_extract_srv` output
#'
#' @description
#' `r lifecycle::badge("experimental")`
#'
#' `data_extract_multiple_srv` loops over the list of `data_extract` given and
#' runs `data_extract_srv` for each one returning a list of reactive objects.
Expand Down
1 change: 0 additions & 1 deletion R/data_extract_spec.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#' Data extract input for `teal` modules
#'
#' @description
#' `r lifecycle::badge("stable")`
#'
#' The Data extract input can be used to filter and select columns from a data set.
#' This function enables such an input in `teal`.
Expand Down
1 change: 0 additions & 1 deletion R/delayed_choices.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#' Bare constructor for `delayed_choices` object
#'
#' @description
#' `r lifecycle::badge("experimental")`
#'
#' Special S3 structures that delay selection of possible choices in a
#' `filter_spec`, `select_spec` or `choices_selected` object.
Expand Down
1 change: 0 additions & 1 deletion R/filter_spec.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#' Data extract filter specification
#'
#' @description
#' `r lifecycle::badge("stable")`
#'
#' It consists in choices and additionally the variable names for the choices.
#'
Expand Down
5 changes: 0 additions & 5 deletions R/get_merge_call.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#' Get merge call from a list of selectors
#'
#' @description
#' `r lifecycle::badge("stable")`
#'
#' Creates list of calls depending on selector(s) and type of the merge.
#' The merge order is the same as in selectors passed to the function.
Expand Down Expand Up @@ -352,8 +351,6 @@

#' Gets the relabel call
#'
#' `r lifecycle::badge("stable")`
#'
#' @inheritParams merge_datasets
#' @param columns_source (named `list`)
#' where names are column names, values are labels + additional attribute `dataname`
Expand Down Expand Up @@ -386,7 +383,7 @@
column_labels <- labels[intersect(colnames(data_used()), column_names)]

# NULL for no labels at all, character(0) for no labels for a given columns
return(

Check warning on line 386 in R/get_merge_call.R

View workflow job for this annotation

GitHub Actions / SuperLinter 🦸‍♀️ / Lint R code 🧶

file=R/get_merge_call.R,line=386,col=9,[return_linter] Use implicit return behavior; explicit return() is not needed.
if (rlang::is_empty(column_labels)) {
column_labels
} else {
Expand Down Expand Up @@ -422,8 +419,6 @@
#' Create relabel call from named character
#'
#' @description
#' `r lifecycle::badge("stable")`
#'
#' Function creates relabel call from named character.
#'
#' @param labels (named `character`)
Expand Down
4 changes: 0 additions & 4 deletions R/input_checks.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

#' Make sure that the extract specification is in list format
#'
#' `r lifecycle::badge("stable")`
#'
#' @param x (`data_extract_spec` or `list`) of `data_extract_spec` elements.
#' @param allow_null (`logical`) whether x can be `NULL`.
#'
Expand All @@ -27,8 +25,6 @@ list_extract_spec <- function(x, allow_null = FALSE) {
#' Checks that the `extract_input` specification does not allow multiple
#' selection
#'
#' `r lifecycle::badge("stable")`
#'
#' Stops if condition not met.
#'
#' @param extract_input (`list` or `NULL`) a list of `data_extract_spec`
Expand Down
1 change: 0 additions & 1 deletion R/merge_datasets.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#' Merge the datasets on the keys
#'
#' @description
#' `r lifecycle::badge("experimental")`
#'
#' Combines/merges multiple datasets with specified keys attribute.
#'
Expand Down
3 changes: 0 additions & 3 deletions R/merge_expression_module.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#' Merge expression module
#'
#' @description
#' `r lifecycle::badge("experimental")`
#'
#' Convenient wrapper to combine `data_extract_multiple_srv()` and
#' `merge_expression_srv()` when no additional processing is required.
Expand Down Expand Up @@ -199,8 +198,6 @@ merge_expression_module.list <- function(datasets,

#' Data merge module server
#'
#' `r lifecycle::badge("experimental")`
#'
#' When additional processing of the `data_extract` list input is required,
#' `merge_expression_srv()` can be combined with `data_extract_multiple_srv()`
#' or `data_extract_srv()` to influence the `selector_list` input.
Expand Down
2 changes: 0 additions & 2 deletions R/resolve.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#' Resolve delayed inputs by evaluating the code within the provided datasets
#'
#' `r lifecycle::badge("stable")`
#'
#' @note This is an internal function that is used by [resolve_delayed()].
#' All the methods are used internally only.
#'
Expand Down
2 changes: 0 additions & 2 deletions R/resolve_delayed.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#' Resolve delayed inputs by evaluating the code within the provided datasets
#'
#' `r lifecycle::badge("stable")`
#'
#' @param x (`delayed_data`, `list`) to resolve.
#' @param datasets (`FilteredData` or named `list`) to use as a reference to resolve `x`.
#' @param keys (named `list`) with primary keys for each dataset from `datasets`. `names(keys)`
Expand Down
1 change: 0 additions & 1 deletion R/select_spec.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#' Column selection input specification
#'
#' @description
#' `r lifecycle::badge("stable")`
#'
#' `select_spec` is used inside `teal` to create a [shiny::selectInput()]
#' that will select columns from a dataset.
Expand Down
1 change: 0 additions & 1 deletion R/teal.transform-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#' @import shiny
#' @importFrom dplyr %>%
#' @importFrom lifecycle badge
NULL

#' @export
Expand Down
2 changes: 0 additions & 2 deletions R/utils.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#' Split by separator (matched exactly)
#'
#' `r lifecycle::badge("stable")`
#'
#' @param x (`character`) Character vector, each element of which is to be split.
#' Other inputs, including a factor return themselves.
#' @param sep (`character`) separator to use for splitting.
Expand Down
2 changes: 0 additions & 2 deletions man/Queue.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/add_no_selected_choices.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions man/check_no_multiple_selection.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions man/choices_labeled.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions man/choices_selected.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions man/data_extract_multiple_srv.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions man/data_extract_spec.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions man/data_extract_srv.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/data_extract_ui.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions man/datanames_input.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions man/delayed_choices.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions man/filter_spec.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/get_anl_relabel_call.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading