Skip to content

Commit

Permalink
Merge branch 'main' into init
Browse files Browse the repository at this point in the history
  • Loading branch information
pawelru committed Sep 18, 2024
2 parents fc22ffc + 56dc3d6 commit 670c341
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
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.3.0.9048
Date: 2024-09-16
Version: 0.3.0.9049
Date: 2024-09-17
Authors@R: c(
person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")),
person("Pawel", "Rucki", , "pawel.rucki@roche.com", role = "aut"),
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# teal.modules.general 0.3.0.9048
# teal.modules.general 0.3.0.9049

* Removed `Show Warnings` modals from modules.

Expand Down
6 changes: 3 additions & 3 deletions R/tm_variable_browser.R
Original file line number Diff line number Diff line change
Expand Up @@ -919,9 +919,9 @@ render_tab_header <- function(dataset_name, output, data) {
dataset_ui_id <- paste0("dataset_summary_", dataset_name)
output[[dataset_ui_id]] <- renderText({
df <- data()[[dataset_name]]
join_keys <- join_keys(data())
join_keys <- teal.data::join_keys(data())
if (!is.null(join_keys)) {
key <- join_keys(data())[dataset_name, dataset_name]
key <- teal.data::join_keys(data())[dataset_name, dataset_name]
} else {
key <- NULL
}
Expand Down Expand Up @@ -991,7 +991,7 @@ render_tab_table <- function(dataset_name, parent_dataname, output, data, input,
# get icons proper for the data types
icons <- vapply(df, function(x) class(x)[1L], character(1L))

join_keys <- join_keys(data())
join_keys <- teal.data::join_keys(data())
if (!is.null(join_keys)) {
icons[intersect(join_keys[dataset_name, dataset_name], colnames(df))] <- "primary_key"
}
Expand Down

0 comments on commit 670c341

Please sign in to comment.