Accept functions

NEWS.md

@@ -8,6 +8,10 @@
 
 * Fix error while creating the filter choices when the data has a factor with a level containing an empty string ("").
 
+### Miscellaneous
+
+* `DefaultFilteredDataset` has been removed and filter panel no longer displays entries for non-filterable datasets. 
+
 ### Breaking changes
 
 * `ui_add` and `srv_add` no longer exist as adding new filters is a part of `ui_active` and `srv_active`.

R/FilteredData-utils.R

@@ -29,7 +29,10 @@ init_filtered_data <- function(x, join_keys = teal.data::join_keys(), code, chec
       "init_filtered_data(check = 'No longer supported')"
     )
   }
-  FilteredData$new(x, join_keys = join_keys)
+  FilteredData$new(
+    Filter(function(obj) inherits(obj, c("data.frame", "MultiAssayExperiment")), x),
+    join_keys = join_keys
+  )
 }
 
 #' Evaluate expression with meaningful message

R/FilteredData.R

@@ -377,15 +377,13 @@ FilteredData <- R6::R6Class( # nolint
     #'
     format = function(show_all = FALSE, trim_lines = TRUE) {
       datasets <- lapply(self$datanames(), private$get_filtered_dataset)
-      ind <- vapply(datasets, inherits, logical(1L), what = "DefaultFilteredDataset")
-      states <- do.call(c, lapply(datasets[!ind], function(ds) ds$get_filter_state()))
+      states <- do.call(c, lapply(datasets, function(ds) ds$get_filter_state()))
       states_fmt <- format(states, show_all = show_all, trim_lines = trim_lines)
-      holders_fmt <- vapply(datasets[ind], format, character(1L), show_all = show_all, trim_lines = trim_lines)
 
       sprintf(
         "%s:\n%s",
         class(self)[1],
-        paste(c(states_fmt, holders_fmt), collapse = "\n")
+        paste(states_fmt, collapse = "\n")
       )
     },
 

R/FilteredDataset-utils.R

@@ -141,9 +141,5 @@ init_filtered_dataset.default <- function(dataset,
                                           parent, # ignored
                                           join_keys, # ignored
                                           label = attr(dataset, "label", exact = TRUE)) {
-  DefaultFilteredDataset$new(
-    dataset = dataset,
-    dataname = dataname,
-    label = label
-  )
+  NULL
 }