fix issue with plot blocks, bump version + fix tests

BristolMyersSquibb · Oct 14, 2024 · 8260e59 · 8260e59
1 parent b4d605a
commit 8260e59
Show file tree

Hide file tree

Showing 38 changed files with 16 additions and 15 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: blockr
 Title: A block-based framework for data manipulation and visualization
-Version: 0.0.2.9031
+Version: 0.0.2.9035
 Authors@R: 
     c(person(given = "Nicolas",
              family = "Bennett",

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# blockr 0.0.2.9031
+# blockr 0.0.2.9035
 
 ## Feature
 - Improved `submit` feature for blocks. Now submit isn't added as a class but as a special block attribute. When you design a block, you can pass the `submit` parameter like so:

diff --git a/R/server.R b/R/server.R
@@ -236,7 +236,9 @@ generate_server_block <- function(
           if (is.null(in_dat()) && !inherits(x, "transform_block")) {
             evaluate_block(blk())
           } else {
-            if (nrow(in_dat()) == 0 && !inherits(x, "parser_block")) return(data.frame())
+            if (inherits(in_dat(), "data.frame") && nrow(in_dat()) == 0) {
+              return(data.frame())
+            }
             evaluate_block(blk(), data = in_dat())
           }
         })

diff --git a/_pkgdown.yml b/_pkgdown.yml
@@ -206,6 +206,6 @@ reference:
 
 news:
  releases:
- - text: "blockr 0.0.2.9031"
+ - text: "blockr 0.0.2.9035"
  - text: "blockr 0.0.2"
  - text: "blockr 0.0.1.9000"
diff --git a/tests/testthat/_snaps/block/block-app-001_.new.png b/tests/testthat/_snaps/block/block-app-001_.new.png
diff --git a/tests/testthat/_snaps/block/block-app-001_.png b/tests/testthat/_snaps/block/block-app-001_.png
diff --git a/tests/testthat/_snaps/block/block-app-002_.new.png b/tests/testthat/_snaps/block/block-app-002_.new.png
diff --git a/tests/testthat/_snaps/block/block-app-002_.png b/tests/testthat/_snaps/block/block-app-002_.png
diff --git a/tests/testthat/_snaps/block/block-app-003_.new.png b/tests/testthat/_snaps/block/block-app-003_.new.png
diff --git a/tests/testthat/_snaps/block/block-app-003_.png b/tests/testthat/_snaps/block/block-app-003_.png
diff --git a/tests/testthat/_snaps/block/block-app-004_.new.png b/tests/testthat/_snaps/block/block-app-004_.new.png
diff --git a/tests/testthat/_snaps/block/block-app-004_.png b/tests/testthat/_snaps/block/block-app-004_.png
diff --git a/tests/testthat/_snaps/block/block-app-005_.new.png b/tests/testthat/_snaps/block/block-app-005_.new.png
diff --git a/tests/testthat/_snaps/block/block-app-005_.png b/tests/testthat/_snaps/block/block-app-005_.png
diff --git a/tests/testthat/_snaps/result/result-app-001_.new.png b/tests/testthat/_snaps/result/result-app-001_.new.png
diff --git a/tests/testthat/_snaps/stack/stack-app-001_.png b/tests/testthat/_snaps/stack/stack-app-001_.png
diff --git a/tests/testthat/_snaps/stack/stack-app-002_.new.png b/tests/testthat/_snaps/stack/stack-app-002_.new.png
diff --git a/tests/testthat/_snaps/stack/stack-app-002_.png b/tests/testthat/_snaps/stack/stack-app-002_.png
diff --git a/tests/testthat/_snaps/stack/stack-app-003.json b/tests/testthat/_snaps/stack/stack-app-003.json
@@ -39,8 +39,8 @@
 
           ],
           "choices": [
-            "function (data) ",
-            "colnames(data)"
+            "structure(function (data) ",
+            "colnames(data), result = c(\"Time\", \"demand\"))"
           ],
           "multiple": true
         }

diff --git a/tests/testthat/_snaps/stack/stack-app-003_.new.png b/tests/testthat/_snaps/stack/stack-app-003_.new.png
diff --git a/tests/testthat/_snaps/stack/stack-app-003_.png b/tests/testthat/_snaps/stack/stack-app-003_.png
diff --git a/tests/testthat/_snaps/stack/stack-app-004.json b/tests/testthat/_snaps/stack/stack-app-004.json
@@ -39,8 +39,8 @@
 
           ],
           "choices": [
-            "function (data) ",
-            "colnames(data)"
+            "structure(function (data) ",
+            "colnames(data), result = c(\"Time\", \"demand\"))"
           ],
           "multiple": true
         }

diff --git a/tests/testthat/_snaps/stack/stack-app-004_.new.png b/tests/testthat/_snaps/stack/stack-app-004_.new.png
diff --git a/tests/testthat/_snaps/stack/stack-app-004_.png b/tests/testthat/_snaps/stack/stack-app-004_.png
diff --git a/tests/testthat/_snaps/stack/stack-app-005.json b/tests/testthat/_snaps/stack/stack-app-005.json
@@ -39,8 +39,8 @@
 
           ],
           "choices": [
-            "function (data) ",
-            "colnames(data)"
+            "structure(function (data) ",
+            "colnames(data), result = c(\"Time\", \"demand\"))"
           ],
           "multiple": true
         }

diff --git a/tests/testthat/_snaps/stack/stack-app-005_.new.png b/tests/testthat/_snaps/stack/stack-app-005_.new.png
diff --git a/tests/testthat/_snaps/stack/stack-app-005_.png b/tests/testthat/_snaps/stack/stack-app-005_.png
diff --git a/tests/testthat/_snaps/stack/stack-app-006.json b/tests/testthat/_snaps/stack/stack-app-006.json
@@ -39,8 +39,8 @@
 
           ],
           "choices": [
-            "function (data) ",
-            "colnames(data)"
+            "structure(function (data) ",
+            "colnames(data), result = c(\"Time\", \"demand\"))"
           ],
           "multiple": true
         }

diff --git a/tests/testthat/_snaps/stack/stack-app-006_.new.png b/tests/testthat/_snaps/stack/stack-app-006_.new.png
diff --git a/tests/testthat/_snaps/stack/stack-app-006_.png b/tests/testthat/_snaps/stack/stack-app-006_.png
diff --git a/tests/testthat/_snaps/stack/stack-app-007.json b/tests/testthat/_snaps/stack/stack-app-007.json
@@ -39,8 +39,8 @@
 
           ],
           "choices": [
-            "function (data) ",
-            "colnames(data)"
+            "structure(function (data) ",
+            "colnames(data), result = c(\"Time\", \"demand\"))"
           ],
           "multiple": true
         }

diff --git a/tests/testthat/_snaps/stack/stack-app-007_.png b/tests/testthat/_snaps/stack/stack-app-007_.png
diff --git a/tests/testthat/_snaps/workspace/restore-workspace-app-001_.new.png b/tests/testthat/_snaps/workspace/restore-workspace-app-001_.new.png
diff --git a/tests/testthat/_snaps/workspace/workspace-app-001_.new.png b/tests/testthat/_snaps/workspace/workspace-app-001_.new.png
diff --git a/tests/testthat/_snaps/workspace/workspace-app-002_.new.png b/tests/testthat/_snaps/workspace/workspace-app-002_.new.png
diff --git a/tests/testthat/_snaps/workspace/workspace-app-003_.new.png b/tests/testthat/_snaps/workspace/workspace-app-003_.new.png
diff --git a/tests/testthat/_snaps/workspace/workspace-app-004_.new.png b/tests/testthat/_snaps/workspace/workspace-app-004_.new.png
diff --git a/tests/testthat/test-validate-block.R b/tests/testthat/test-validate-block.R
@@ -14,7 +14,6 @@ testServer(module_server_test, {
   # Invalidate
   session$setInputs("columns" = "")
   session$flushReact()
-  expect_error(out_dat())
   expect_false(is_valid$block)
   expect_identical(is_valid$message, "selected value(s) not among provided choices")
   expect_identical(is_valid$fields, "columns")