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.

Sign up for GitHub

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

Prevent too early evaluation #1425

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+33 −2
Open

Prevent too early evaluation #1425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9344594
prevent early evaluation
gogonzo Dec 9, 2024
feea5c1
Merge remote-tracking branch 'origin/main' into fix_error
gogonzo Jan 9, 2025
7a421ed
add a test
gogonzo Jan 9, 2025
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
4 changes: 2 additions & 2 deletions R/module_nested_tabs.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,9 @@ srv_teal_module.teal_module <- function(id,
}

if (is_arg_used(modules$server, "id")) {
do.call(modules$server, args)
do.call(modules$server, args, quote = TRUE)
Copy link
Contributor

@averissimo averissimo Dec 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider adding a test before merging, such as:

testthat::it("srv_teal_module.teal_module accepts quoted arguments", {
  tm_query <- function(query) {
    module(
      "module_1", 
      server = function(id, data, query) {
        moduleServer(id, function(input, output, session) {
          reactive(q <- eval_code(data(), query))
        )
      },
      server_args = list(query = query)
    )
  }
  shiny::testServer(
    app = srv_teal,
    args = list(
      id = "test",
      data = teal.data::teal_data(a_dataset = iris),
      modules = modules(tm_query(quote(a_dataset <- subset(a_dataset, Species == "setosa"))))
    ),
    expr = {
      session$setInputs(`teal_modules-active_tab` = "module_1")
      session$flushReact()
      
      testthat::expect_setequal(
        "setosa",
        unique(modules_output$module_1()()[["a_dataset"]]$Species)
      )
    }
  )
})

} else {
do.call(callModule, c(args, list(module = modules$server)))
do.call(callModule, c(args, list(module = modules$server)), quote = TRUE)
}
}

Expand Down
31 changes: 31 additions & 0 deletions tests/testthat/test-module_teal.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,6 +1035,37 @@ testthat::describe("srv_teal teal_modules", {
)
})

testthat::it("srv_teal_module.teal_module passes quoted arguments to the teal_module$server call", {
tm_query <- function(query) {
module(
"module_1",
server = function(id, data, query) {
moduleServer(id, function(input, output, session) {
reactive(q <- eval_code(data(), query))
})
},
server_args = list(query = query)
)
}
shiny::testServer(
app = srv_teal,
args = list(
id = "test",
data = teal.data::teal_data(a_dataset = iris),
modules = modules(tm_query(quote(a_dataset <- subset(a_dataset, Species == "setosa"))))
),
expr = {
session$setInputs(`teal_modules-active_tab` = "module_1")
session$flushReact()

testthat::expect_setequal(
"setosa",
unique(modules_output$module_1()()[["a_dataset"]]$Species)
)
}
)
})

testthat::it("srv_teal_module.teal_module passes filter_panel_api if specified", {
shiny::testServer(
app = srv_teal,
Expand Down
Loading