Skip to content

Commit 6fa6b31

Browse files
averissimoaverissimo
committed
chore: convert all datanames() instances to ls() or remove assignment
1 parent 0ea551b commit 6fa6b31

Some content is hidden

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

49 files changed

+113
-208
lines changed

‎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[ls(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[ls(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[ls(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(ls(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[ls(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 <- ls(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[ls(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[ls(data)]
121119
#'
122120
#' app <- init(
123121
#' data = data,

‎R/tm_g_distribution.R‎

Lines changed: 1 addition & 3 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[ls(data)]
7371
#'
7472
#' vars1 <- choices_selected(
7573
#' variable_choices(data[["ADSL"]], c("ARM", "COUNTRY", "SEX")),

‎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[ls(data)]
103101
#'
104102
#' app <- init(
105103
#' data = data,

‎R/tm_g_scatterplot.R‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
#' require(nestcolor)
4444
#' CO2 <- CO2
4545
#' })
46-
#' datanames(data) <- "CO2"
4746
#'
4847
#' app <- init(
4948
#' data = data,
@@ -133,8 +132,7 @@
133132
#' require(nestcolor)
134133
#' ADSL <- rADSL
135134
#' })
136-
#' datanames(data) <- c("ADSL")
137-
#' join_keys(data) <- default_cdisc_join_keys[datanames(data)]
135+
#' join_keys(data) <- default_cdisc_join_keys[ls(data)]
138136
#'
139137
#' app <- init(
140138
#' data = data,

0 commit comments

Comments
 (0)