Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

624 PACKAGE LEVEL pre-release activities #639

Merged
merged 70 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
0072964
initial DESCRIPTION curation
m7pr Feb 19, 2024
e5813a9
change DESCRIPTION's Title and Description fields
m7pr Feb 19, 2024
72164f7
revisit README file
m7pr Feb 19, 2024
549b0fa
change Teal to `teal`
m7pr Feb 19, 2024
b3845f0
check /main/ to /latest-tag/ in workflows files
m7pr Feb 19, 2024
7537fcc
add latest-tag/ to urls
m7pr Feb 19, 2024
7d0ff63
Remove exception in .lintr: indentation_linter = NULL
m7pr Feb 19, 2024
6767f42
add LICENSE to .Rbuildignore
m7pr Feb 19, 2024
4d1d249
Merge branch 'main' into pre-release@main
m7pr Feb 19, 2024
ac43d53
extend WORDLIST
m7pr Feb 20, 2024
ee2d08b
Update vignettes/using-association-plot.Rmd
m7pr Feb 20, 2024
f8d3583
revert template changes
m7pr Feb 20, 2024
3bd9b71
Merge branch 'pre-release@main' of https://github.com/insightsenginee…
m7pr Feb 20, 2024
c57bc17
642 unused functions (#659)
chlebowa Feb 21, 2024
400d8cd
Adds common `@return` for modules and corrects linting (#670)
averissimo Feb 22, 2024
ec85748
Merge branch 'main' into pre-release@main
m7pr Feb 22, 2024
b67b957
pre-release: Typo with missing a full stop (#671)
averissimo Feb 22, 2024
57a1122
643 potential removal of dependencies (#663)
chlebowa Feb 22, 2024
2d89cfb
missed commit in #663 (#672)
chlebowa Feb 22, 2024
2ac9a4d
658 remove var labels@pre release@main (#673)
chlebowa Feb 23, 2024
3118bcb
docs: update the vignette author to "NEST CoreDev" (#679)
vedhav Feb 26, 2024
109065e
pre-release `tm_variable_browser` document update (#652)
kartikeyakirar Feb 26, 2024
b6f0d28
pre-release `tm_g_bivariate` document update (#660)
kartikeyakirar Feb 26, 2024
cb07cce
pre-release `tm_g_response` document update (#666)
averissimo Feb 26, 2024
51ef394
pre-release `tm_file_viewer` document update (#665)
averissimo Feb 26, 2024
0cb0b56
pre-release `tm_t_crosstable` document update (#664)
averissimo Feb 26, 2024
91d9e02
pre-release `tm_a_pca` document update (#646)
kartikeyakirar Feb 26, 2024
2e77e2a
pre-release `tm_outliers` document update (#653)
kartikeyakirar Feb 26, 2024
d5fbe8c
pre-release `tm_front_page` document update (#654)
kartikeyakirar Feb 26, 2024
33714ae
pre-release `tm_g_scatterplot` document update (#657)
kartikeyakirar Feb 26, 2024
2d70eab
pre-release ` tm_data_table` document update (#667)
kartikeyakirar Feb 26, 2024
b382d4c
pre-release other utils functions document update (#676)
kartikeyakirar Feb 26, 2024
4a34ee8
pre-release `tm_missing_data` document update (#668)
kartikeyakirar Feb 26, 2024
39ede58
pre-release `tm_g_scatterplotmatrix` document update (#661)
kartikeyakirar Feb 26, 2024
da6ab63
backticks for ggplot2
m7pr Feb 26, 2024
658743c
WORDLIST fixes
m7pr Feb 26, 2024
8d02d0c
pre-release: Update verdpecheck and pre-commit (#683)
averissimo Feb 26, 2024
7c6cde0
superlint fix
m7pr Feb 26, 2024
672b217
Merge branch 'pre-release@main' of https://github.com/insightsenginee…
m7pr Feb 26, 2024
b3ed9fa
pre-release `tm_g_association` document update (#656)
kartikeyakirar Feb 27, 2024
446ce56
pre-release `tm_g_distribution` document update (#669)
kartikeyakirar Feb 27, 2024
f097677
pre-release `tm_a_regression` document update (#655)
kartikeyakirar Feb 27, 2024
882a8d0
lintr issues
m7pr Feb 27, 2024
5fe302b
Standardise function titles similar to what we have in tmc (#691)
vedhav Feb 27, 2024
0cafa8f
Merge branch 'main' into pre-release@main
gogonzo Feb 27, 2024
3917094
[skip roxygen] [skip vbump] Roxygen Man Pages Auto Update
dependabot-preview[bot] Feb 27, 2024
804d79a
pre-release vignettes review (#681)
kartikeyakirar Feb 28, 2024
ee8cd14
641 non exported functions (#680)
chlebowa Feb 28, 2024
fcd025a
missing comma
Feb 28, 2024
87f6eee
removed @noRd tags and added return from shared_params
kartikeyakirar Feb 28, 2024
bddee61
Update to roxygen2 `@template` for `ggplot2_args` arguments (#694)
averissimo Feb 28, 2024
7da5cae
Update R/tm_file_viewer.R
m7pr Feb 28, 2024
c47b104
Merge branch 'main' into pre-release@main
vedhav Feb 28, 2024
bc56c51
[skip roxygen] [skip vbump] Roxygen Man Pages Auto Update
dependabot-preview[bot] Feb 28, 2024
65b1c06
Merge branch 'main' into pre-release@main
m7pr Feb 29, 2024
e5fc4c9
standardize the notation for optional parameters (#698)
kartikeyakirar Feb 29, 2024
bf9ef13
adding package check arg
kartikeyakirar Feb 29, 2024
962e059
removing non standard dir to Rbuildignore
kartikeyakirar Feb 29, 2024
3929aad
701 fixing the validation issue for x/y variable selection in `tm_g_b…
kartikeyakirar Mar 1, 2024
6aa97c0
removing tdata instance
kartikeyakirar Mar 1, 2024
cbae779
adding backtick on shiny keyword
kartikeyakirar Mar 1, 2024
8151b06
Adds missing assertions and reorganizes them (#696)
averissimo Mar 1, 2024
e209bf3
remove `latest-tag` from REPO url. this should onl stay in WEBSITE url
m7pr Mar 1, 2024
3f9889f
Merge branch 'pre-release@main' of https://github.com/insightsenginee…
m7pr Mar 1, 2024
92a25a5
Update .pre-commit-config.yaml
m7pr Mar 1, 2024
2aa7e85
Update .github/workflows/check.yaml
m7pr Mar 1, 2024
8f95a49
Update .github/workflows/release.yaml
m7pr Mar 1, 2024
f398140
Update DESCRIPTION
m7pr Mar 1, 2024
4dea7f3
Update vignettes/teal-modules-general.Rmd
m7pr Mar 1, 2024
92bdf31
Removes unnecessary `# nolint ` after `object_name_linter` was change…
averissimo Mar 1, 2024
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
61 changes: 45 additions & 16 deletions R/tm_g_bivariate.R
Original file line number Diff line number Diff line change
Expand Up @@ -954,38 +954,67 @@ coloring_ggplot_call <- function(colour,
fill,
size,
is_point = FALSE) {
if (!identical(colour, character(0)) && !identical(fill, character(0)) &&
is_point && !identical(size, character(0))) {
if (
!identical(colour, character(0)) &&
!identical(fill, character(0)) &&
is_point &&
!identical(size, character(0))
) {
substitute(
expr = aes(colour = colour_name, fill = fill_name, size = size_name),
env = list(colour_name = as.name(colour), fill_name = as.name(fill), size_name = as.name(size))
)
} else if (identical(colour, character(0)) && !identical(fill, character(0)) &&
is_point && identical(size, character(0))) {
} else if (
identical(colour, character(0)) &&
!identical(fill, character(0)) &&
is_point &&
identical(size, character(0))
) {
substitute(expr = aes(fill = fill_name), env = list(fill_name = as.name(fill)))
} else if (!identical(colour, character(0)) && !identical(fill, character(0)) &&
(!is_point || identical(size, character(0)))) {
} else if (
!identical(colour, character(0)) &&
!identical(fill, character(0)) &&
(!is_point || identical(size, character(0)))
) {
substitute(
expr = aes(colour = colour_name, fill = fill_name),
env = list(colour_name = as.name(colour), fill_name = as.name(fill))
)
} else if (!identical(colour, character(0)) && identical(fill, character(0)) &&
(!is_point || identical(size, character(0)))) {
} else if (
!identical(colour, character(0)) &&
identical(fill, character(0)) &&
(!is_point || identical(size, character(0)))
) {
substitute(expr = aes(colour = colour_name), env = list(colour_name = as.name(colour)))
} else if (identical(colour, character(0)) && !identical(fill, character(0)) &&
(!is_point || identical(size, character(0)))) {
} else if (
identical(colour, character(0)) &&
!identical(fill, character(0)) &&
(!is_point || identical(size, character(0)))
) {
substitute(expr = aes(fill = fill_name), env = list(fill_name = as.name(fill)))
} else if (identical(colour, character(0)) && identical(fill, character(0)) &&
is_point && !identical(size, character(0))) {
} else if (
identical(colour, character(0)) &&
identical(fill, character(0)) &&
is_point &&
!identical(size, character(0))
) {
substitute(expr = aes(size = size_name), env = list(size_name = as.name(size)))
} else if (!identical(colour, character(0)) && identical(fill, character(0)) &&
is_point && !identical(size, character(0))) {
} else if (
!identical(colour, character(0)) &&
identical(fill, character(0)) &&
is_point &&
!identical(size, character(0))
) {
substitute(
expr = aes(colour = colour_name, size = size_name),
env = list(colour_name = as.name(colour), size_name = as.name(size))
)
} else if (identical(colour, character(0)) && !identical(fill, character(0)) &&
is_point && !identical(size, character(0))) {
} else if (
identical(colour, character(0)) &&
!identical(fill, character(0)) &&
is_point &&
!identical(size, character(0))
) {
substitute(
expr = aes(colour = colour_name, fill = fill_name, size = size_name),
env = list(colour_name = as.name(fill), fill_name = as.name(fill), size_name = as.name(size))
Expand Down
9 changes: 7 additions & 2 deletions R/tm_g_distribution.R
Original file line number Diff line number Diff line change
Expand Up @@ -802,8 +802,13 @@ srv_distribution <- function(id,
)
}

if (length(s_var) == 0 && length(g_var) == 0 && main_type_var == "Density" &&
length(t_dist) != 0 && main_type_var == "Density") {
if (
length(s_var) == 0 &&
length(g_var) == 0 &&
main_type_var == "Density" &&
length(t_dist) != 0 &&
main_type_var == "Density"
) {
map_dist <- stats::setNames(
c("dnorm", "dlnorm", "dgamma", "dunif"),
c("normal", "lognormal", "gamma", "unif")
Expand Down
5 changes: 2 additions & 3 deletions R/tm_g_response.R
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,8 @@ srv_g_response <- function(id,
# nolint end

plot_call <- substitute(
expr =
ggplot(ANL2, aes(x = x_cl, y = ns)) +
geom_bar(aes(fill = resp_cl), stat = "identity", position = arg_position),
expr = ggplot(ANL2, aes(x = x_cl, y = ns)) +
geom_bar(aes(fill = resp_cl), stat = "identity", position = arg_position),
env = list(
x_cl = x_cl,
resp_cl = resp_cl,
Expand Down
24 changes: 16 additions & 8 deletions R/tm_g_scatterplot.R
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,13 @@ srv_g_scatterplot <- function(id,
teal.transform::compose_and_enable_validators(iv, selector_list)
})
iv_facet <- shinyvalidate::InputValidator$new()
iv_facet$add_rule("add_density", ~ if (isTRUE(.) &&
(length(selector_list()$row_facet()$select) > 0L ||
length(selector_list()$col_facet()$select) > 0L)) {
iv_facet$add_rule("add_density", ~ if (
isTRUE(.) &&
(
length(selector_list()$row_facet()$select) > 0L ||
length(selector_list()$col_facet()$select) > 0L
)
) {
"Cannot add marginal density when Row or Column facetting has been selected"
})
iv_facet$enable()
Expand Down Expand Up @@ -524,8 +528,10 @@ srv_g_scatterplot <- function(id,
observeEvent(
eventExpr = merged$anl_input_r()$columns_source[c("col_facet", "row_facet")],
handlerExpr = {
if (length(merged$anl_input_r()$columns_source$col_facet) == 0 &&
length(merged$anl_input_r()$columns_source$row_facet) == 0) {
if (
length(merged$anl_input_r()$columns_source$col_facet) == 0 &&
length(merged$anl_input_r()$columns_source$row_facet) == 0
) {
shinyjs::hide("free_scales")
} else {
shinyjs::show("free_scales")
Expand Down Expand Up @@ -582,9 +588,11 @@ srv_g_scatterplot <- function(id,
\n Uncheck the 'Add marginal density' checkbox to display the plot."
))
validate(need(
!(inherits(ANL[[color_by_var]], "Date") ||
inherits(ANL[[color_by_var]], "POSIXct") ||
inherits(ANL[[color_by_var]], "POSIXlt")),
!(
inherits(ANL[[color_by_var]], "Date") ||
inherits(ANL[[color_by_var]], "POSIXct") ||
inherits(ANL[[color_by_var]], "POSIXlt")
),
"Marginal plots cannot be produced when the points are colored by Date or POSIX variables.
\n Uncheck the 'Add marginal density' checkbox to display the plot."
))
Expand Down
8 changes: 5 additions & 3 deletions R/tm_missing_data.R
Original file line number Diff line number Diff line change
Expand Up @@ -554,9 +554,11 @@ srv_missing_data <- function(id, data, reporter, filter_panel_api, dataname, par
# display those previously selected values that are still available
selected <- if (!is.null(prev_choices) && any(prev_choices %in% choices)) {
prev_choices[match(choices[choices %in% prev_choices], prev_choices)]
} else if (!is.null(prev_choices) &&
!any(prev_choices %in% choices) &&
isolate(prev_group_by_var()) == input$group_by_var) {
} else if (
!is.null(prev_choices) &&
!any(prev_choices %in% choices) &&
isolate(prev_group_by_var()) == input$group_by_var
) {
# if not any previously selected value is available and the grouping variable is the same,
# then display NULL
NULL
Expand Down
6 changes: 4 additions & 2 deletions R/tm_outliers.R
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,10 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
expr = dplyr::mutate(is_outlier_selected = {
q1_q3 <- stats::quantile(outlier_var_name, probs = c(0.25, 0.75))
iqr <- q1_q3[2] - q1_q3[1]
!(outlier_var_name >= q1_q3[1] - outlier_definition_param * iqr &
outlier_var_name <= q1_q3[2] + outlier_definition_param * iqr)
!(
outlier_var_name >= q1_q3[1] - outlier_definition_param * iqr &
outlier_var_name <= q1_q3[2] + outlier_definition_param * iqr
)
}),
env = list(
outlier_var_name = as.name(outlier_var),
Expand Down
2 changes: 1 addition & 1 deletion R/tm_t_crosstable.R
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ srv_t_crosstable <- function(id, data, reporter, filter_panel_api, label, x, y,
substitute(
expr = {
lyt <- basic_tables %>%
split_call %>% # styler: off
split_call %>% # styler: off
averissimo marked this conversation as resolved.
Show resolved Hide resolved
rtables::add_colcounts() %>%
tern::analyze_vars(
vars = x_name,
Expand Down
2 changes: 2 additions & 0 deletions R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#' @param post_output (`shiny.tag`, optional) with text placed after the output to put the output
#' into context. For example the [shiny::helpText()] elements are useful.
#'
#' @return Object of class `teal_module` to be used in `teal` applications
#'
#' @name shared_params
#' @keywords internal
NULL
Expand Down
3 changes: 3 additions & 0 deletions man/shared_params.Rd

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

Loading