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

Update docs to use the new teal_data instead of TealData #597

Merged
merged 14 commits into from
Nov 20, 2023
Merged
Prev Previous commit
Next Next commit
fix: address the cran NOTEs
vedhav committed Nov 9, 2023
commit a61bdf5d7d67bdcba82e139e7124d46c90e5364e
4 changes: 2 additions & 2 deletions R/tm_a_pca.R
Original file line number Diff line number Diff line change
@@ -257,7 +257,7 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
response[[i]]$select$choices <- var_labels(data[[response[[i]]$dataname]]())
response[[i]]$select$choices <- setdiff(
response[[i]]$select$choices,
unlist(join_keys(data)[[response[[i]]$dataname]])
unlist(teal.data::join_keys(data)[[response[[i]]$dataname]])
)
}

@@ -323,7 +323,7 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
anl_merged_input <- teal.transform::merge_expression_srv(
selector_list = selector_list,
datasets = data,
join_keys = join_keys(data)
join_keys = teal.data::join_keys(data)
)

anl_merged_q <- reactive({
2 changes: 1 addition & 1 deletion R/tm_a_regression.R
Original file line number Diff line number Diff line change
@@ -295,7 +295,7 @@ srv_a_regression <- function(id,
anl_merged_input <- teal.transform::merge_expression_srv(
selector_list = selector_list,
datasets = data,
join_keys = join_keys(data)
join_keys = teal.data::join_keys(data)
)

regression_var <- reactive({
2 changes: 1 addition & 1 deletion R/tm_g_association.R
Original file line number Diff line number Diff line change
@@ -251,7 +251,7 @@ srv_tm_g_association <- function(id,
anl_merged_input <- teal.transform::merge_expression_srv(
datasets = data,
selector_list = selector_list,
join_keys = join_keys(data)
join_keys = teal.data::join_keys(data)
)

anl_merged_q <- reactive({
2 changes: 1 addition & 1 deletion R/tm_g_bivariate.R
Original file line number Diff line number Diff line change
@@ -441,7 +441,7 @@ srv_g_bivariate <- function(id,
anl_merged_input <- teal.transform::merge_expression_srv(
selector_list = selector_list,
datasets = data,
join_keys = join_keys(data)
join_keys = teal.data::join_keys(data)
)

anl_merged_q <- reactive({
2 changes: 1 addition & 1 deletion R/tm_g_distribution.R
Original file line number Diff line number Diff line change
@@ -447,7 +447,7 @@ srv_distribution <- function(id,
anl_merged_input <- teal.transform::merge_expression_srv(
selector_list = selector_list,
datasets = data,
join_keys = join_keys(data)
join_keys = teal.data::join_keys(data)
)

anl_merged_q <- reactive({
2 changes: 1 addition & 1 deletion R/tm_g_response.R
Original file line number Diff line number Diff line change
@@ -275,7 +275,7 @@ srv_g_response <- function(id,
anl_merged_input <- teal.transform::merge_expression_srv(
selector_list = selector_list,
datasets = data,
join_keys = join_keys(data)
join_keys = teal.data::join_keys(data)
)

anl_merged_q <- reactive({
2 changes: 1 addition & 1 deletion R/tm_g_scatterplot.R
Original file line number Diff line number Diff line change
@@ -471,7 +471,7 @@ srv_g_scatterplot <- function(id,
anl_merged_input <- teal.transform::merge_expression_srv(
selector_list = selector_list,
datasets = data,
join_keys = join_keys(data),
join_keys = teal.data::join_keys(data),
merge_function = "dplyr::inner_join"
)

2 changes: 1 addition & 1 deletion R/tm_g_scatterplotmatrix.R
Original file line number Diff line number Diff line change
@@ -180,7 +180,7 @@ srv_g_scatterplotmatrix <- function(id, data, reporter, filter_panel_api, variab

anl_merged_input <- teal.transform::merge_expression_srv(
datasets = data,
join_keys = join_keys(data),
join_keys = teal.data::join_keys(data),
selector_list = selector_list
)

2 changes: 1 addition & 1 deletion R/tm_missing_data.R
Original file line number Diff line number Diff line change
@@ -356,7 +356,7 @@ srv_missing_data <- function(id, data, reporter, filter_panel_api, dataname, par
moduleServer(id, function(input, output, session) {
prev_group_by_var <- reactiveVal("")
data_r <- data[[dataname]]
data_keys <- reactive(unlist(join_keys(data)[[dataname]]))
data_keys <- reactive(unlist(teal.data::join_keys(data)[[dataname]]))

iv_r <- reactive({
iv <- shinyvalidate::InputValidator$new()
4 changes: 2 additions & 2 deletions R/tm_outliers.R
Original file line number Diff line number Diff line change
@@ -293,7 +293,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
anl_merged_input <- teal.transform::merge_expression_srv(
selector_list = reactive_select_input,
datasets = data,
join_keys = join_keys(data),
join_keys = teal.data::join_keys(data),
merge_function = "dplyr::inner_join"
)

@@ -476,7 +476,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
},
env = list(
dataname = as.name(dataname_first),
join_keys = as.character(join_keys(data)[[dataname_first]][[dataname_first]])
join_keys = as.character(teal.data::join_keys(data)[[dataname_first]][[dataname_first]])
)
)
)
2 changes: 1 addition & 1 deletion R/tm_t_crosstable.R
Original file line number Diff line number Diff line change
@@ -215,7 +215,7 @@ srv_t_crosstable <- function(id, data, reporter, filter_panel_api, label, x, y,

anl_merged_input <- teal.transform::merge_expression_srv(
datasets = data,
join_keys = join_keys(data),
join_keys = teal.data::join_keys(data),
selector_list = selector_list,
merge_function = merge_function
)