fix get_filter_expr

insightsengineering · Aug 8, 2024 · 1b02437 · 1b02437
1 parent df87600
commit 1b02437
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/R/FilteredData-utils.R b/R/FilteredData-utils.R
@@ -51,7 +51,7 @@ eval_expr_with_msg <- function(expr, env) {
         error = function(e) {
           stop(
             sprintf(
-              "Call execution failed:\n - call:\n   %s\n - message:\n   %s ",
+              "Filter call execution failed:\n - call:\n   %s\n - message:\n   %s ",
               deparse1(x, collapse = "\n"), e
             )
           )

diff --git a/R/filter_panel_api.R b/R/filter_panel_api.R
@@ -167,12 +167,9 @@ clear_filter_states <- function(datasets, force = FALSE) {
 #' @export
 #'
 get_filter_expr <- function(datasets, datanames = datasets$datanames()) {
-  checkmate::assert_character(datanames, min.len = 1, any.missing = FALSE)
-  stopifnot(
-    is(datasets, "FilteredData"),
-    all(datanames %in% datasets$datanames())
-  )
-
+  checkmate::check_class(datasets, "FilteredData")
+  checkmate::assert_character(datanames, any.missing = FALSE)
+  checkmate::assert_subset(datanames, datasets$datanames())
   paste(
     unlist(lapply(
       datanames,