Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: teal.modules.general
Title: General Modules for 'teal' Applications
Version: 0.4.0.9001
Date: 2025-03-11
Version: 0.4.1.9000
Date: 2025-04-01
Authors@R: c(
person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
person("Pawel", "Rucki", , "[email protected]", role = "aut"),
Expand Down
7 changes: 6 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# teal.modules.general 0.4.0.9001
# teal.modules.general 0.4.1.9000

# teal.modules.general 0.4.1

### Bug fixes
* Fixes output is not updated when filter is added for the modules: `tm_a_pca`, `tm_a_regression`, `tm_g_scatterplot`, `tm_g_association`, `tm_g_bivariate`, `tm_g_distribution`, `tm_g_response`, `tm_t_crosstable` (#870)

# teal.modules.general 0.4.0

Expand Down
6 changes: 4 additions & 2 deletions R/tm_a_pca.R
Original file line number Diff line number Diff line change
Expand Up @@ -436,10 +436,12 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
selector_list = selector_list,
datasets = data
)
qenv <- teal.code::eval_code(data(), 'library("ggplot2");library("dplyr");library("tidyr")') # nolint quotes
qenv <- reactive(
teal.code::eval_code(data(), 'library("ggplot2");library("dplyr");library("tidyr")') # nolint quotes
)
anl_merged_q <- reactive({
req(anl_merged_input())
qenv %>%
qenv() %>%
teal.code::eval_code(as.expression(anl_merged_input()$expr))
})

Expand Down
7 changes: 3 additions & 4 deletions R/tm_a_regression.R
Original file line number Diff line number Diff line change
Expand Up @@ -462,14 +462,13 @@ srv_a_regression <- function(id,
)
})

qenv <- teal.code::eval_code(
data(),
'library("ggplot2");library("dplyr")' # nolint quotes
qenv <- reactive(
teal.code::eval_code(data(), 'library("ggplot2");library("dplyr")') # nolint quotes
)

anl_merged_q <- reactive({
req(anl_merged_input())
qenv %>%
qenv() %>%
teal.code::eval_code(as.expression(anl_merged_input()$expr))
})

Expand Down
7 changes: 3 additions & 4 deletions R/tm_g_association.R
Original file line number Diff line number Diff line change
Expand Up @@ -346,13 +346,12 @@ srv_tm_g_association <- function(id,
selector_list = selector_list
)

qenv <- teal.code::eval_code(
data(),
'library("ggplot2");library("dplyr");library("tern");library("ggmosaic")' # nolint quotes
qenv <- reactive(
teal.code::eval_code(data(), 'library("ggplot2");library("dplyr");library("tern");library("ggmosaic")') # nolint quotes
)
anl_merged_q <- reactive({
req(anl_merged_input())
qenv %>% teal.code::eval_code(as.expression(anl_merged_input()$expr))
qenv() %>% teal.code::eval_code(as.expression(anl_merged_input()$expr))
})

merged <- list(
Expand Down
7 changes: 3 additions & 4 deletions R/tm_g_bivariate.R
Original file line number Diff line number Diff line change
Expand Up @@ -559,14 +559,13 @@ srv_g_bivariate <- function(id,
selector_list = selector_list,
datasets = data
)
qenv <- teal.code::eval_code(
data(),
'library("ggplot2");library("dplyr");library("teal.modules.general")' # nolint quotes
qenv <- reactive(
teal.code::eval_code(data(), 'library("ggplot2");library("dplyr");library("teal.modules.general")') # nolint quotes
)

anl_merged_q <- reactive({
req(anl_merged_input())
qenv %>%
qenv() %>%
teal.code::eval_code(as.expression(anl_merged_input()$expr))
})

Expand Down
7 changes: 3 additions & 4 deletions R/tm_g_distribution.R
Original file line number Diff line number Diff line change
Expand Up @@ -541,14 +541,13 @@ srv_distribution <- function(id,
datasets = data
)

qenv <- teal.code::eval_code(
data(),
'library("ggplot2");library("dplyr")' # nolint quotes
qenv <- reactive(
teal.code::eval_code(data(), 'library("ggplot2");library("dplyr")') # nolint quotes
)

anl_merged_q <- reactive({
req(anl_merged_input())
qenv %>%
qenv() %>%
teal.code::eval_code(as.expression(anl_merged_input()$expr))
})

Expand Down
7 changes: 3 additions & 4 deletions R/tm_g_response.R
Original file line number Diff line number Diff line change
Expand Up @@ -394,14 +394,13 @@ srv_g_response <- function(id,
datasets = data
)

qenv <- teal.code::eval_code(
data(),
'library("ggplot2");library("dplyr")' # nolint quotes
qenv <- reactive(
teal.code::eval_code(data(), 'library("ggplot2");library("dplyr")') # nolint quotes
)

anl_merged_q <- reactive({
req(anl_merged_input())
qenv %>%
qenv() %>%
teal.code::eval_code(as.expression(anl_merged_input()$expr))
})

Expand Down
6 changes: 4 additions & 2 deletions R/tm_g_scatterplot.R
Original file line number Diff line number Diff line change
Expand Up @@ -590,11 +590,13 @@ srv_g_scatterplot <- function(id,
datasets = data,
merge_function = "dplyr::inner_join"
)
qenv <- teal.code::eval_code(data(), 'library("ggplot2");library("dplyr")') # nolint quotes
qenv <- reactive(
teal.code::eval_code(data(), 'library("ggplot2");library("dplyr")') # nolint quotes
)

anl_merged_q <- reactive({
req(anl_merged_input())
qenv %>%
qenv() %>%
teal.code::eval_code(as.expression(anl_merged_input()$expr)) %>%
teal.code::eval_code(quote(ANL)) # used to display table when running show-r-code code
})
Expand Down
6 changes: 4 additions & 2 deletions R/tm_t_crosstable.R
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,12 @@ srv_t_crosstable <- function(id, data, reporter, filter_panel_api, label, x, y,
selector_list = selector_list,
merge_function = merge_function
)
qenv <- teal.code::eval_code(data(), 'library("rtables");library("tern");library("dplyr")') # nolint quotes
qenv <- reactive(
teal.code::eval_code(data(), 'library("rtables");library("tern");library("dplyr")') # nolint quotes
)
anl_merged_q <- reactive({
req(anl_merged_input())
qenv %>%
qenv() %>%
teal.code::eval_code(as.expression(anl_merged_input()$expr))
})

Expand Down