From 5824d72c5bfa2a754c734e7b589730b935f748bf Mon Sep 17 00:00:00 2001
From: Adam Forys <adam.forys@roche.com>
Date: Tue, 20 Dec 2022 15:01:56 +0100
Subject: [PATCH] Using only first class from the object, discard NULL filters
 from autofilter

---
 R/source_tblist.R | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/R/source_tblist.R b/R/source_tblist.R
index 3bedfac..7268328 100644
--- a/R/source_tblist.R
+++ b/R/source_tblist.R
@@ -175,7 +175,7 @@ rule_Date <- function(column, name, dataset_name) {
 }
 
 filter_rule <- function(column, name, dataset_name) {
-  rule_method <- paste0("rule_", class(column))
+  rule_method <- paste0("rule_", class(column)[[1]])
   do.call(
     rule_method,
     list(
@@ -198,6 +198,7 @@ autofilter.tblist <- function(source, attach_as = c("step", "meta"), ...) {
   step_rule <- source$dtconn %>%
     purrr::imap(~filter_rules(.x, .y)) %>%
     unlist(recursive = FALSE) %>%
+    purrr::discard(~is.null(.x)) %>%
     purrr::map(~do.call(cohortBuilder::filter, .)) %>%
     unname()