Skip to content

Commit fe758fc

Browse files
committed
Merged origin/main into 1452_datanames@main
2 parents 96ee564 + 77b1813 commit fe758fc

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

.github/workflows/scheduled.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
additional-env-vars: |
4040
PKG_SYSREQS_DRY_RUN=true
4141
extra-deps: |
42-
MultiAssayExperiment (>= 1.32.0);SummarizedExperiment (>= 1.36.0);teal.slice (>= 0.5.1.9021)
42+
matrixStats (>= 1.5.0)
4343
branch-cleanup:
4444
if: >
4545
github.event_name == 'schedule' || (

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Type: Package
22
Package: teal.modules.general
33
Title: General Modules for 'teal' Applications
4-
Version: 0.3.0.9067
5-
Date: 2025-01-20
4+
Version: 0.3.0.9070
5+
Date: 2025-01-23
66
Authors@R: c(
77
person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
88
person("Pawel", "Rucki", , "[email protected]", role = "aut"),
@@ -60,7 +60,7 @@ Imports:
6060
stringr (>= 1.4.1),
6161
teal.code (>= 0.5.0.9012),
6262
teal.data (>= 0.6.0.9015),
63-
teal.logger (>= 0.3.0.9003),
63+
teal.logger (>= 0.3.1),
6464
teal.reporter (>= 0.3.1.9023),
6565
teal.widgets (>= 0.4.0),
6666
tern (>= 0.9.5),

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# teal.modules.general 0.3.0.9067
1+
# teal.modules.general 0.3.0.9070
22

33
* Removed `Show Warnings` modals from modules.
44
* Soft deprecated `datasets_selected` argument of modules in favor of `datanames`.

R/utils.R

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,14 @@ check_decorators <- function(x, names = NULL) { # nolint: object_name.
350350
check_message <- if (isTRUE(check_message)) {
351351
out_message <- checkmate::check_names(names(x), subset.of = c("default", names))
352352
# see https://github.com/insightsengineering/teal.logger/issues/101
353+
if (length(names(x)) != length(unique(names(x)))) {
354+
unique_message <- "Non-unique names in decorators"
355+
if (isTRUE(out_message)) {
356+
out_message <- unique_message
357+
} else {
358+
out_message <- paste0(out_message, ". Also, ", tolower(unique_message))
359+
}
360+
}
353361
if (isTRUE(out_message)) {
354362
out_message
355363
} else {

0 commit comments

Comments
 (0)