Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

443 rcycle@main #637

Merged
merged 40 commits into from
Jun 15, 2022
Merged
Changes from 4 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
3603e96
tests
Polkas May 20, 2022
d38e539
Revert "tests"
May 20, 2022
a8b62f6
callable
May 20, 2022
ff80b88
Merge branch 'main' into 443_rcycle@main
May 20, 2022
11f5979
Update module_nested_tabs.R
May 20, 2022
9641494
rm shinyUI
May 23, 2022
dd18019
old comment
Polkas May 23, 2022
4dc2c39
old comment
Polkas May 23, 2022
622298e
Merge branch 'main' into 443_rcycle@main
May 24, 2022
49172ca
pass tests
Polkas May 24, 2022
48b4705
trigger test
Polkas May 24, 2022
c10460d
roxygen2
Polkas May 24, 2022
6714ce1
Dawid reco
Polkas May 24, 2022
78253d2
Merge branch 'main' into 443_rcycle@main
May 24, 2022
e9a7256
spelling
Polkas May 24, 2022
8bd492a
Merge branch 'main' into 443_rcycle@main
May 25, 2022
a993b82
test
Polkas May 25, 2022
4e7b7a1
test
Polkas May 25, 2022
24287d2
Merge branch 'main' into 443_rcycle@main
May 25, 2022
bffed58
full scope
Polkas May 25, 2022
d2ba775
test
Polkas May 25, 2022
80a5edd
better event js
Polkas May 25, 2022
edd249b
better event js
Polkas May 25, 2022
21cdb5f
better event js
Polkas May 25, 2022
4186205
comment
Polkas May 25, 2022
9302e18
more direct selector
Polkas May 25, 2022
201fbf3
better js code
Polkas May 26, 2022
cb249d9
nested tabs
Polkas May 26, 2022
24fc94f
not export
Polkas May 26, 2022
7dd56d6
DRY
Polkas May 26, 2022
9af939c
Merge branch 'main' into 443_rcycle@main
mhallal1 May 27, 2022
0e339a5
Update R/module_teal.R
May 27, 2022
f49e165
Update R/module_nested_tabs.R
May 27, 2022
efedccd
Update R/module_nested_tabs.R
May 27, 2022
5798846
full input cycle
Polkas May 30, 2022
9fad112
Dawid reco
Polkas May 30, 2022
7a78a84
Merge branch 'main' into 443_rcycle@main
Jun 10, 2022
5588fc0
rm the note in the vignette
Jun 13, 2022
d06502e
Merge branch 'main' into 443_rcycle@main
Jun 15, 2022
da4f8ed
Update NEWS.md
Jun 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions R/module_nested_tabs.R
Original file line number Diff line number Diff line change
Expand Up @@ -177,18 +177,23 @@ srv_nested_tabs.teal_module <- function(id, datasets, modules) {
)
)

modules$server_args <- teal.transform::resolve_delayed(modules$server_args, datasets)
is_module_server <- isTRUE("id" %in% names(formals(modules$server)))
if (is_module_server) {
do.call(modules$server, c(list(id = id, datasets = datasets), modules$server_args))
} else {
do.call(
callModule,
c(
list(module = modules$server, id = id, datasets = datasets),
modules$server_args
)
)
}
reactive(modules)
module_run_callable <- function() {
modules$server_args <- teal.transform::resolve_delayed(modules$server_args, datasets)
if (isTRUE("id" %in% names(formals(modules$server)))) {
do.call(modules$server, c(list(id = id, datasets = datasets), modules$server_args))
} else {
do.call(
callModule,
c(
list(module = modules$server, id = id, datasets = datasets),
modules$server_args
)
)
}
}

reactive({
module_run_callable()
modules
})
}