allow evaluate null

BristolMyersSquibb · Oct 23, 2024 · 400f640 · 400f640
1 parent d55b882
commit 400f640
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/R/block-core.R b/R/block-core.R
@@ -220,13 +220,18 @@ generate_code.call <- function(x) {
 #' @inherit new_block
 #' @param ... For generic consistency.
 #' @export
-evaluate_block <- function(x, ...) {
+evaluate_block <- function(x, data, ...) {
+
+  if (!missing(data) && is.null(data)) {
+    return(NULL)
+  }
+
   UseMethod("evaluate_block")
 }
 
 #' @rdname evaluate_block
 #' @export
-evaluate_block.data_block <- function(x, ...) {
+evaluate_block.data_block <- function(x, data, ...) {
 
   stopifnot(...length() == 0L)
 

diff --git a/R/server.R b/R/server.R
@@ -212,7 +212,7 @@ generate_server_block <- function(
           {
             if (!is_valid$block) {
               NULL
-            } else if (is.null(in_dat()) && !inherits(x, "transform_block")) {
+            } else if (inherits(x, "dataset_block")) {
               evaluate_block(blk())
             } else {
               evaluate_block(blk(), data = in_dat())
@@ -226,7 +226,7 @@ generate_server_block <- function(
         reactive({
           if (!is_valid$block) {
             NULL
-          } else if (is.null(in_dat()) && !inherits(x, "transform_block")) {
+          } else if (inherits(x, "dataset_block")) {
             evaluate_block(blk())
           } else {
             evaluate_block(blk(), data = in_dat())