From a61bdf5d7d67bdcba82e139e7124d46c90e5364e Mon Sep 17 00:00:00 2001 From: vedhav Date: Thu, 9 Nov 2023 17:02:29 +0530 Subject: [PATCH] fix: address the cran NOTEs --- R/tm_a_pca.R | 4 ++-- R/tm_a_regression.R | 2 +- R/tm_g_association.R | 2 +- R/tm_g_bivariate.R | 2 +- R/tm_g_distribution.R | 2 +- R/tm_g_response.R | 2 +- R/tm_g_scatterplot.R | 2 +- R/tm_g_scatterplotmatrix.R | 2 +- R/tm_missing_data.R | 2 +- R/tm_outliers.R | 4 ++-- R/tm_t_crosstable.R | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/R/tm_a_pca.R b/R/tm_a_pca.R index 3795d74d9..6966c4f2d 100644 --- a/R/tm_a_pca.R +++ b/R/tm_a_pca.R @@ -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({ diff --git a/R/tm_a_regression.R b/R/tm_a_regression.R index 3351de116..aafb365d6 100644 --- a/R/tm_a_regression.R +++ b/R/tm_a_regression.R @@ -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({ diff --git a/R/tm_g_association.R b/R/tm_g_association.R index 6c4a29351..0289754ce 100644 --- a/R/tm_g_association.R +++ b/R/tm_g_association.R @@ -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({ diff --git a/R/tm_g_bivariate.R b/R/tm_g_bivariate.R index da3ca2dda..7b0df12ba 100644 --- a/R/tm_g_bivariate.R +++ b/R/tm_g_bivariate.R @@ -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({ diff --git a/R/tm_g_distribution.R b/R/tm_g_distribution.R index 4190aeff5..8ceeb5591 100644 --- a/R/tm_g_distribution.R +++ b/R/tm_g_distribution.R @@ -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({ diff --git a/R/tm_g_response.R b/R/tm_g_response.R index 7b3468ba7..e8d87b72a 100644 --- a/R/tm_g_response.R +++ b/R/tm_g_response.R @@ -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({ diff --git a/R/tm_g_scatterplot.R b/R/tm_g_scatterplot.R index f962fc4d0..3ce500d50 100644 --- a/R/tm_g_scatterplot.R +++ b/R/tm_g_scatterplot.R @@ -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" ) diff --git a/R/tm_g_scatterplotmatrix.R b/R/tm_g_scatterplotmatrix.R index f9c93f0da..2365ecf49 100644 --- a/R/tm_g_scatterplotmatrix.R +++ b/R/tm_g_scatterplotmatrix.R @@ -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 ) diff --git a/R/tm_missing_data.R b/R/tm_missing_data.R index 1edce3cca..abf8a8ea6 100644 --- a/R/tm_missing_data.R +++ b/R/tm_missing_data.R @@ -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() diff --git a/R/tm_outliers.R b/R/tm_outliers.R index 7ca78aa53..16c07bbe0 100644 --- a/R/tm_outliers.R +++ b/R/tm_outliers.R @@ -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]]) ) ) ) diff --git a/R/tm_t_crosstable.R b/R/tm_t_crosstable.R index aad9250e5..a66591bdc 100644 --- a/R/tm_t_crosstable.R +++ b/R/tm_t_crosstable.R @@ -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 )