Merge branch 'main' into 999_default_dataname@main

insightsengineering · Dec 12, 2023 · 28afe0b · 28afe0b
2 parents 5167ee3 + 0f0cf06
commit 28afe0b
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 13 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: teal
 Title: Exploratory Web Apps for Analyzing Clinical Trials Data
-Version: 0.14.0.9027
-Date: 2023-12-08
+Version: 0.14.0.9028
+Date: 2023-12-12
 Authors@R: c(
     person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
     person("Pawel", "Rucki", , "[email protected]", role = "aut"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# teal 0.14.0.9027
+# teal 0.14.0.9028
 
 ### New features
 

diff --git a/R/teal_slices-store.R b/R/teal_slices-store.R
@@ -64,17 +64,21 @@ slices_restore <- function(file) {
     lapply(tss_json$slices, function(slice) {
       for (field in c("selected", "choices")) {
         if (!is.null(slice[[field]])) {
-          date_partial_regex <- "^[0-9]{4}-[0-9]{2}-[0-9]{2}"
-          time_stamp_regex <- paste0(date_partial_regex, "\\s[0-9]{2}:[0-9]{2}:[0-9]{2}\\sUTC$")
+          if (length(slice[[field]]) > 0) {
+            date_partial_regex <- "^[0-9]{4}-[0-9]{2}-[0-9]{2}"
+            time_stamp_regex <- paste0(date_partial_regex, "\\s[0-9]{2}:[0-9]{2}:[0-9]{2}\\sUTC$")
 
-          slice[[field]] <-
-            if (all(grepl(paste0(date_partial_regex, "$"), slice[[field]]))) {
-              as.Date(slice[[field]])
-            } else if (all(grepl(time_stamp_regex, slice[[field]]))) {
-              as.POSIXct(slice[[field]], tz = "UTC")
-            } else {
-              slice[[field]]
-            }
+            slice[[field]] <-
+              if (all(grepl(paste0(date_partial_regex, "$"), slice[[field]]))) {
+                as.Date(slice[[field]])
+              } else if (all(grepl(time_stamp_regex, slice[[field]]))) {
+                as.POSIXct(slice[[field]], tz = "UTC")
+              } else {
+                slice[[field]]
+              }
+          } else {
+            slice[[field]] <- character(0)
+          }
         }
       }
       slice

diff --git a/tests/testthat/test-teal_slices-store.R b/tests/testthat/test-teal_slices-store.R
@@ -1,3 +1,45 @@
+testthat::test_that("teal_slice store/restore supports NULL and character(0) for choices and selected", {
+  slices_path <- withr::local_file("slices.json")
+  tss <- teal_slices(
+    teal_slice(
+      dataname = "data",
+      varname = "var",
+      choices = character(0),
+      selected = NULL
+    )
+  )
+  slices_store(tss, slices_path)
+  tss_restored <- teal:::slices_restore(slices_path)
+
+  slices2_path <- withr::local_file("slices2.json")
+  tss2 <- teal_slices(
+    teal_slice(
+      dataname = "data",
+      varname = "var",
+      choices = NULL,
+      selected = NULL
+    )
+  )
+  slices_store(tss2, slices2_path)
+  tss2_restored <- slices_restore(slices2_path)
+
+  slices3_path <- withr::local_file("slices3.json")
+  tss3 <- teal_slices(
+    teal_slice(
+      dataname = "data",
+      varname = "var",
+      choices = character(0),
+      selected = character(0)
+    )
+  )
+  slices_store(tss3, slices3_path)
+  tss3_restored <- slices_restore(slices3_path)
+
+  teal.slice:::expect_identical_slice(tss[[1]], tss_restored[[1]])
+  teal.slice:::expect_identical_slice(tss2[[1]], tss2_restored[[1]])
+  teal.slice:::expect_identical_slice(tss3[[1]], tss3_restored[[1]])
+})
+
 testthat::test_that("teal_slice store/restore supports saving `POSIXct` timestamps in selected", {
   slices_path <- withr::local_file("slices.json")