Skip to content

Commit 3d94b0b

Browse files
committed
add libraries code and the code to create objects
1 parent 11804a2 commit 3d94b0b

File tree

2 files changed

+45
-14
lines changed

2 files changed

+45
-14
lines changed

R/tm_a_pca.R

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,11 +1126,19 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
11261126
subset_code <- function(code, data) {
11271127
gsub(code, "", teal.data::get_code(data), fixed = TRUE)
11281128
}
1129-
setup_code_r <- reactive(teal.data::get_code(qenv))
1130-
data_prep_code_r <-
1129+
setup_code_r <- reactive(teal.data::get_code(req(data())))
1130+
libraries_code_r <-
11311131
reactive(
11321132
subset_code(
11331133
setup_code_r(),
1134+
qenv
1135+
)
1136+
)
1137+
1138+
data_prep_code_r <-
1139+
reactive(
1140+
subset_code(
1141+
paste0(setup_code_r(), libraries_code_r()),
11341142
req(anl_merged_q())
11351143
)
11361144
)
@@ -1184,25 +1192,28 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
11841192
"## Setup",
11851193
teal.reporter::code_chunk(setup_code_r()),
11861194

1195+
"## Libraries",
1196+
teal.reporter::code_chunk(libraries_code_r(), eval = TRUE),
1197+
11871198
"## Data Preparations",
11881199
teal.reporter::code_chunk(data_prep_code_r()),
11891200

11901201
"## PCA Model",
11911202
teal.reporter::code_chunk(computation_model_code_r()),
11921203

11931204
"### Principal Components Table",
1194-
teal.reporter::code_chunk(computation_tbl_imp_code_r()) |>
1195-
teal.reporter::link_output(computation()[["tbl_importance"]]),
1205+
teal.reporter::code_chunk(computation_tbl_imp_code_r()),
1206+
computation()[["tbl_importance"]],
11961207

11971208
"### Eigenvectors Table",
1198-
teal.reporter::code_chunk(computation_tbl_eig_code_r()) |>
1199-
teal.reporter::link_output(computation()[["tbl_eigenvector"]]),
1209+
teal.reporter::code_chunk(computation_tbl_eig_code_r()),
1210+
computation()[["tbl_eigenvector"]],
12001211

12011212
"### Plot",
12021213
teal.reporter::code_chunk(
12031214
plot_code_r() |> styler::style_text() |> paste(collapse = "\n")
1204-
) |>
1205-
teal.reporter::link_output(plot_r())
1215+
),
1216+
plot_r()
12061217
)
12071218
})
12081219

R/tm_a_regression.R

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,25 +1027,32 @@ srv_a_regression <- function(id,
10271027
subset_code <- function(code, data) {
10281028
gsub(code, "", teal.data::get_code(data), fixed = TRUE)
10291029
}
1030-
setup_code_r <- reactive(teal.data::get_code(qenv))
1031-
data_prep_code_r <-
1030+
setup_code_r <- reactive(teal.data::get_code(req(data())))
1031+
libraries_code_r <-
10321032
reactive(
10331033
subset_code(
10341034
setup_code_r(),
1035+
qenv
1036+
)
1037+
)
1038+
data_prep_code_r <-
1039+
reactive(
1040+
subset_code(
1041+
paste0(setup_code_r(), libraries_code_r()),
10351042
req(anl_merged_q())
10361043
)
10371044
)
10381045
fit_code_r <-
10391046
reactive(
10401047
subset_code(
1041-
paste0(setup_code_r(), data_prep_code_r()),
1048+
paste0(setup_code_r(), libraries_code_r(), data_prep_code_r()),
10421049
req(fit_r())
10431050
)
10441051
)
10451052
plot_code_r <-
10461053
reactive(
10471054
subset_code(
1048-
paste0(setup_code_r(), data_prep_code_r(), fit_code_r()),
1055+
paste0(setup_code_r(), libraries_code_r(), data_prep_code_r(), fit_code_r()),
10491056
req(decorated_output_q())
10501057
)
10511058
)
@@ -1066,6 +1073,9 @@ srv_a_regression <- function(id,
10661073
"## Setup",
10671074
teal.reporter::code_chunk(setup_code_r()),
10681075

1076+
"## Libraries",
1077+
teal.reporter::code_chunk(libraries_code_r(), eval = TRUE),
1078+
10691079
"## Data Preparations",
10701080
teal.reporter::code_chunk(data_prep_code_r()),
10711081

@@ -1080,17 +1090,27 @@ srv_a_regression <- function(id,
10801090
"## Plot",
10811091
teal.reporter::code_chunk(
10821092
plot_code_r() |> styler::style_text() |> paste(collapse = "\n")
1083-
) |>
1084-
teal.reporter::link_output(plot_r()),
1093+
),
1094+
plot_r(),
10851095

10861096
"## rtables for testing",
1097+
teal.reporter::code_chunk(
1098+
"rtables::rtable(
1099+
header = LETTERS[1:3],
1100+
rtables::rrow('one to three', 1, 2, 3),
1101+
rtables::rrow('more stuff', rtables::rcell(pi, format = 'xx.xx'), 'test', 'and more')
1102+
)"
1103+
),
10871104
rtables::rtable(
10881105
header = LETTERS[1:3],
10891106
rtables::rrow("one to three", 1, 2, 3),
10901107
rtables::rrow("more stuff", rtables::rcell(pi, format = "xx.xx"), "test", "and more")
10911108
),
10921109

10931110
"## Table for testing",
1111+
teal.reporter::code_chunk(
1112+
"head(iris)"
1113+
),
10941114
head(iris)
10951115
)
10961116
})

0 commit comments

Comments
 (0)