Skip to content

Commit c162d7b

Browse files
gogonzogogonzo
committed
revert unnecessary
1 parent cfcca0c commit c162d7b

File tree

9 files changed

+64
-235
lines changed

9 files changed

+64
-235
lines changed

‎DESCRIPTION‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,8 @@ Collate:
124124
'module_transform_data.R'
125125
'reporter_previewer_module.R'
126126
'show_rcode_modal.R'
127-
'standard_layout.R'
128127
'tdata.R'
129128
'teal.R'
130-
'teal.transform_wrappers.R'
131129
'teal_data_module.R'
132130
'teal_data_module-eval_code.R'
133131
'teal_data_module-within.R'

‎NAMESPACE‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,9 @@ export(srv_session_info)
4343
export(srv_teal)
4444
export(srv_teal_with_splash)
4545
export(srv_transform_teal_data)
46-
export(standard_layout2)
4746
export(tdata2env)
4847
export(teal_data_module)
49-
export(teal_nav_item)
5048
export(teal_slices)
51-
export(teal_transform_filter)
5249
export(teal_transform_module)
5350
export(ui_session_info)
5451
export(ui_teal)

‎R/after.R‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -121,41 +121,3 @@ after_srv <- function(old, new, additional_args) {
121121
formals(new_srv) <- formals(old)
122122
new_srv
123123
}
124-
125-
.before_server <- function(x, y, additional_args) {
126-
# add `_`-prefix to make sure objects are not masked in the wrapper functions
127-
`_x` <- x # nolint: object_name.
128-
`_y` <- y # nolint: object_name.
129-
new_x <- function(id, ...) {
130-
original_args <- as.list(environment())
131-
original_args$id <- "wrapped"
132-
if ("..." %in% names(formals(`_x`))) {
133-
original_args <- c(original_args, list(...))
134-
}
135-
moduleServer(id, function(input, output, session) {
136-
original_out <- if (all(c("input", "output", "session") %in% names(formals(`_x`)))) {
137-
original_args$module <- `_x`
138-
do.call(shiny::callModule, args = original_args)
139-
} else {
140-
do.call(`_x`, original_args)
141-
}
142-
original_out_r <- reactive(
143-
if (is.reactive(original_out)) {
144-
original_out()
145-
} else {
146-
original_out
147-
}
148-
)
149-
wrapper_args <- utils::modifyList(
150-
additional_args,
151-
list(id = "wrapper", input = input, output = output, session = session)
152-
)
153-
reactive({
154-
wrapper_args$data <- req(original_out_r())
155-
do.call(`_y`, wrapper_args[names(formals(`_y`))], quote = TRUE)
156-
})
157-
})
158-
}
159-
formals(new_x) <- formals(x)
160-
new_x
161-
}

‎R/module_nested_tabs.R‎

Lines changed: 42 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -188,58 +188,7 @@ srv_teal_module <- function(id,
188188
.ui_teal_module.teal_module <- function(id, modules, active_module_id) {
189189
ns <- NS(id)
190190
args <- c(list(id = ns("module")), modules$ui_args)
191-
192-
module_ui <- do.call(what = modules$ui, args = args, quote = TRUE)
193-
is_transform_relocated <- !identical(getOption("teal.transform.location"), ".teal-sidebar") &&
194-
length(htmltools::tagQuery(module_ui)$find(getOption("teal.transform.location"))$selectedTags())
195-
196-
container_id <- ns("wrapper")
197-
module_id <- modules$path
198-
199-
data_summary_ui <- tags$div(
200-
class = "teal-active-data-summary-panel",
201-
bslib::accordion(
202-
id = ns("data_summary_accordion"),
203-
bslib::accordion_panel(
204-
"Active Data Summary",
205-
tags$div(
206-
class = "teal-active-data-summary",
207-
ui_data_summary(ns("data_summary"))
208-
)
209-
)
210-
)
211-
)
212-
213-
transformators_ui <- if (length(modules$transformators) > 0 && !isTRUE(attr(modules$transformators, "custom_ui"))) {
214-
ui_transform_teal_data(
215-
ns("data_transform"),
216-
transformators = modules$transformators,
217-
container = if (is_transform_relocated) "div" else "accordion"
218-
)
219-
}
220-
221-
if (is_transform_relocated) {
222-
module_ui <- htmltools::tagInsertChildren(
223-
tag = module_ui,
224-
transformators_ui,
225-
.cssSelector = getOption("teal.transform.location"),
226-
after = 0
227-
)
228-
transformators_wrapper_ui <- NULL
229-
} else {
230-
transformators_wrapper_ui <- tags$div(
231-
tags$br(),
232-
tags$div(
233-
class = "teal-transform-panel",
234-
bslib::accordion(
235-
id = ns("data_transform_accordion"),
236-
bslib::accordion_panel("Transform Data", transformators_ui)
237-
)
238-
)
239-
)
240-
}
241-
242-
module_wrapper_ui <- tags$div(
191+
ui_teal <- tags$div(
243192
shinyjs::hidden(
244193
tags$div(
245194
id = ns("transform_failure_info"),
@@ -256,9 +205,11 @@ srv_teal_module <- function(id,
256205
class = "teal_validated",
257206
ui_check_module_datanames(ns("validate_datanames"))
258207
),
259-
module_ui
208+
do.call(what = modules$ui, args = args, quote = TRUE)
260209
)
261210
)
211+
container_id <- ns("wrapper")
212+
module_id <- modules$path
262213

263214
link <- tags$li(
264215
tags$a(
@@ -294,13 +245,45 @@ srv_teal_module <- function(id,
294245
position = getOption("teal.sidebar.position", "left"),
295246
width = getOption("teal.sidebar.width", 250),
296247
tags$div(
297-
data_summary_ui,
248+
tags$div(
249+
class = "teal-active-data-summary-panel",
250+
bslib::accordion(
251+
id = ns("data_summary_accordion"),
252+
bslib::accordion_panel(
253+
"Active Data Summary",
254+
tags$div(
255+
class = "teal-active-data-summary",
256+
ui_data_summary(ns("data_summary"))
257+
)
258+
)
259+
)
260+
),
298261
tags$br(),
299-
tags$div(class = "teal-filter-panel", ui_filter_data(ns("filter_panel"))),
300-
transformators_wrapper_ui
262+
tags$div(
263+
class = "teal-filter-panel",
264+
ui_filter_data(ns("filter_panel"))
265+
),
266+
if (length(modules$transformators) > 0 && !isTRUE(attr(modules$transformators, "custom_ui"))) {
267+
tags$div(
268+
tags$br(),
269+
tags$div(
270+
class = "teal-transform-panel",
271+
bslib::accordion(
272+
id = ns("data_transform_accordion"),
273+
bslib::accordion_panel(
274+
"Transform Data",
275+
ui_transform_teal_data(
276+
ns("data_transform"),
277+
transformators = modules$transformators
278+
)
279+
)
280+
)
281+
)
282+
)
283+
}
301284
)
302285
),
303-
module_wrapper_ui
286+
ui_teal
304287
),
305288
div(
306289
id = ns("sidebar_toggle_buttons"),
@@ -315,7 +298,7 @@ srv_teal_module <- function(id,
315298
ns("data_filters_toggle"),
316299
icon("fas fa-filter")
317300
),
318-
if (!is_transform_relocated && length(modules$transformators) > 0) {
301+
if (length(modules$transformators) > 0) {
319302
actionButton(
320303
class = "data-transforms-toggle btn-outline-primary",
321304
ns("data_transforms_toggle"),
@@ -338,7 +321,7 @@ srv_teal_module <- function(id,
338321
)
339322
)
340323
} else {
341-
module_ui
324+
ui_teal
342325
}
343326
)
344327
)

‎R/module_transform_data.R‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ NULL
1414

1515
#' @export
1616
#' @rdname module_transform_data
17-
ui_transform_teal_data <- function(id, transformators, container = c("accordion", "div")) {
17+
ui_transform_teal_data <- function(id, transformators, class = "well") {
1818
checkmate::assert_string(id)
19-
container <- match.arg(container)
2019
if (length(transformators) == 0L) {
2120
return(NULL)
2221
}
@@ -34,32 +33,29 @@ ui_transform_teal_data <- function(id, transformators, container = c("accordion"
3433
data_mod <- transformators[[name]]
3534
transform_wrapper_id <- ns(sprintf("wrapper_%s", name))
3635

37-
transformator_ui <- tags$div(
38-
id = transform_wrapper_id,
39-
if (is.null(data_mod$ui)) {
40-
return(NULL)
41-
} else {
42-
data_mod$ui(id = ns("transform"))
43-
},
44-
div(
45-
id = ns("validate_messages"),
46-
class = "teal_validated",
47-
uiOutput(ns("error_wrapper"))
48-
)
49-
)
36+
display_fun <- if (is.null(data_mod$ui)) shinyjs::hidden else function(x) x
5037

51-
transformator_wrapper <- if (container == "accordion") {
38+
display_fun(
5239
bslib::accordion(
5340
bslib::accordion_panel(
54-
title = attr(data_mod, "label"),
41+
attr(data_mod, "label"),
5542
icon = bsicons::bs_icon("palette-fill"),
56-
transformator_ui
43+
tags$div(
44+
id = transform_wrapper_id,
45+
if (is.null(data_mod$ui)) {
46+
return(NULL)
47+
} else {
48+
data_mod$ui(id = ns("transform"))
49+
},
50+
div(
51+
id = ns("validate_messages"),
52+
class = "teal_validated",
53+
uiOutput(ns("error_wrapper"))
54+
)
55+
)
5756
)
5857
)
59-
} else {
60-
teal::teal_nav_item(transformator_ui, label = tags$strong(attr(data_mod, "label")))
61-
}
62-
if (is.null(data_mod$ui)) shinyjs::hidden(transformator_wrapper) else transformator_wrapper
58+
)
6359
}
6460
)
6561
}
@@ -87,7 +83,7 @@ srv_transform_teal_data <- function(id, data, transformators, modules = NULL, is
8783

8884
data_out <- reactiveVal()
8985
.call_once_when(inherits(data_previous(), "teal_data"), {
90-
logger::log_debug("srv_transform_teal_data@2 triggering a transform module call for { name }.")
86+
logger::log_debug("srv_teal_transform_teal_data@2 triggering a transform module call for { name }.")
9187
data_unhandled <- transformators[[name]]$server("transform", data = data_previous)
9288
data_handled <- reactive(tryCatch(data_unhandled(), error = function(e) e))
9389

‎R/standard_layout.R‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎R/teal.transform_wrappers.R‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎R/zzz.R‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
teal.lockfile.mode = "auto",
77
shiny.sanitize.errors = FALSE,
88
teal.sidebar.position = "left",
9-
teal.transform.location = ".teal-sidebar", # alternatively .standard-layout.encoding-panel
109
teal.sidebar.width = 250,
1110
teal.reporter.nav_buttons = c("preview", "download", "load", "reset"),
1211
teal.show_src = TRUE

0 commit comments

Comments
 (0)