Skip to content

Commit 3c9bcb4

Browse files
authored
teal.data::datanames() is deprecated in favor of dot-prefix and names() (#794)
# Pull Request Part of insightsengineering/teal.data#333 Blocked by: - insightsengineering/teal.code#218 - insightsengineering/teal.data#347 - insightsengineering/teal#1402
1 parent e67d7f2 commit 3c9bcb4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+124
-218
lines changed

DESCRIPTION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ Depends:
2727
ggplot2 (>= 3.4.0),
2828
R (>= 3.6),
2929
shiny (>= 1.6.0),
30-
teal (>= 0.15.2.9052),
31-
teal.transform (>= 0.5.0)
30+
teal (>= 0.15.2.9079),
31+
teal.transform (>= 0.5.0.9015)
3232
Imports:
3333
checkmate (>= 2.1.0),
3434
dplyr (>= 1.0.5),
@@ -42,8 +42,8 @@ Imports:
4242
shinyWidgets (>= 0.5.1),
4343
stats,
4444
stringr (>= 1.4.1),
45-
teal.code (>= 0.5.0),
46-
teal.data (>= 0.5.0),
45+
teal.code (>= 0.5.0.9012),
46+
teal.data (>= 0.6.0.9015),
4747
teal.logger (>= 0.2.0.9004),
4848
teal.reporter (>= 0.3.0),
4949
teal.widgets (>= 0.4.0),

R/tm_a_pca.R

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
#' USArrests <- USArrests
3131
#' })
3232
#'
33-
#' datanames(data) <- "USArrests"
34-
#'
3533
#' app <- init(
3634
#' data = data,
3735
#' modules = modules(
@@ -66,8 +64,7 @@
6664
#' require(nestcolor)
6765
#' ADSL <- rADSL
6866
#' })
69-
#' datanames(data) <- "ADSL"
70-
#' join_keys(data) <- default_cdisc_join_keys[datanames(data)]
67+
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
7168
#'
7269
#' app <- init(
7370
#' data = data,

R/tm_a_regression.R

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
#' require(nestcolor)
5454
#' CO2 <- CO2
5555
#' })
56-
#' datanames(data) <- c("CO2")
5756
#'
5857
#' app <- init(
5958
#' data = data,
@@ -98,8 +97,7 @@
9897
#' require(nestcolor)
9998
#' ADSL <- rADSL
10099
#' })
101-
#' datanames(data) <- "ADSL"
102-
#' join_keys(data) <- default_cdisc_join_keys[datanames(data)]
100+
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
103101
#'
104102
#' app <- init(
105103
#' data = data,

R/tm_data_table.R

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#' require(nestcolor)
4141
#' iris <- iris
4242
#' })
43-
#' datanames(data) <- c("iris")
4443
#'
4544
#' app <- init(
4645
#' data = data,
@@ -68,8 +67,7 @@
6867
#' require(nestcolor)
6968
#' ADSL <- rADSL
7069
#' })
71-
#' datanames(data) <- "ADSL"
72-
#' join_keys(data) <- default_cdisc_join_keys[datanames(data)]
70+
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
7371
#'
7472
#' app <- init(
7573
#' data = data,
@@ -196,7 +194,7 @@ srv_page_data_table <- function(id,
196194
if_filtered <- reactive(as.logical(input$if_filtered))
197195
if_distinct <- reactive(as.logical(input$if_distinct))
198196

199-
datanames <- isolate(teal.data::datanames(data()))
197+
datanames <- isolate(names(data()))
200198
datanames <- Filter(function(name) {
201199
is.data.frame(isolate(data())[[name]])
202200
}, datanames)

R/tm_file_viewer.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#' data <- within(data, {
2323
#' data <- data.frame(1)
2424
#' })
25-
#' datanames(data) <- c("data")
2625
#'
2726
#' app <- init(
2827
#' data = data,

R/tm_front_page.R

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
#' ADSL <- rADSL
2929
#' attr(ADSL, "metadata") <- list("Author" = "NEST team", "data_source" = "synthetic data")
3030
#' })
31-
#' datanames(data) <- "ADSL"
32-
#' join_keys(data) <- default_cdisc_join_keys[datanames(data)]
31+
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
3332
#'
3433
#' table_1 <- data.frame(Info = c("A", "B"), Text = c("A", "B"))
3534
#' table_2 <- data.frame(`Column 1` = c("C", "D"), `Column 2` = c(5.5, 6.6), `Column 3` = c("A", "B"))
@@ -169,7 +168,7 @@ srv_front_page <- function(id, data, tables, show_metadata) {
169168
)
170169

171170
metadata_data_frame <- reactive({
172-
datanames <- teal.data::datanames(data())
171+
datanames <- names(data())
173172
convert_metadata_to_dataframe(
174173
lapply(datanames, function(dataname) attr(data()[[dataname]], "metadata")),
175174
datanames

R/tm_g_association.R

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#' factors <- names(Filter(isTRUE, vapply(CO2, is.factor, logical(1L))))
3939
#' CO2[factors] <- lapply(CO2[factors], as.character)
4040
#' })
41-
#' datanames(data) <- c("CO2")
4241
#'
4342
#' app <- init(
4443
#' data = data,
@@ -81,8 +80,7 @@
8180
#' require(nestcolor)
8281
#' ADSL <- rADSL
8382
#' })
84-
#' datanames(data) <- "ADSL"
85-
#' join_keys(data) <- default_cdisc_join_keys[datanames(data)]
83+
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
8684
#'
8785
#' app <- init(
8886
#' data = data,

R/tm_g_bivariate.R

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
#' require(nestcolor)
5858
#' CO2 <- data.frame(CO2)
5959
#' })
60-
#' datanames(data) <- c("CO2")
6160
#'
6261
#' app <- init(
6362
#' data = data,
@@ -116,8 +115,7 @@
116115
#' require(nestcolor)
117116
#' ADSL <- rADSL
118117
#' })
119-
#' datanames(data) <- c("ADSL")
120-
#' join_keys(data) <- default_cdisc_join_keys[datanames(data)]
118+
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
121119
#'
122120
#' app <- init(
123121
#' data = data,

R/tm_g_distribution.R

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#' data <- within(data, {
4040
#' iris <- iris
4141
#' })
42-
#' datanames(data) <- "iris"
4342
#'
4443
#' app <- init(
4544
#' data = data,
@@ -68,8 +67,7 @@
6867
#' data <- within(data, {
6968
#' ADSL <- rADSL
7069
#' })
71-
#' datanames(data) <- c("ADSL")
72-
#' join_keys(data) <- default_cdisc_join_keys[datanames(data)]
70+
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
7371
#'
7472
#' vars1 <- choices_selected(
7573
#' variable_choices(data[["ADSL"]], c("ARM", "COUNTRY", "SEX")),
@@ -1216,15 +1214,15 @@ srv_distribution <- function(id,
12161214
# wrapped in if since could lead into validate error - we do want to continue
12171215
test_r_qenv_out <- try(test_q(), silent = TRUE)
12181216
if (!inherits(test_r_qenv_out, c("try-error", "error"))) {
1219-
qenv_final <- teal.code::join(qenv_final, test_q())
1217+
qenv_final <- c(qenv_final, test_q())
12201218
}
12211219

12221220
qenv_final <- if (tab == "Histogram") {
12231221
req(dist_q())
1224-
teal.code::join(qenv_final, dist_q())
1222+
c(qenv_final, dist_q())
12251223
} else if (tab == "QQplot") {
12261224
req(qq_q())
1227-
teal.code::join(qenv_final, qq_q())
1225+
c(qenv_final, qq_q())
12281226
}
12291227
qenv_final
12301228
})

R/tm_g_response.R

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
#' mtcars[[v]] <- as.factor(mtcars[[v]])
5454
#' }
5555
#' })
56-
#' datanames(data) <- "mtcars"
5756
#'
5857
#' app <- init(
5958
#' data = data,
@@ -98,8 +97,7 @@
9897
#' require(nestcolor)
9998
#' ADSL <- rADSL
10099
#' })
101-
#' datanames(data) <- c("ADSL")
102-
#' join_keys(data) <- default_cdisc_join_keys[datanames(data)]
100+
#' join_keys(data) <- default_cdisc_join_keys[names(data)]
103101
#'
104102
#' app <- init(
105103
#' data = data,

0 commit comments

Comments
 (0)