Merge pull request #62 from nathancday/master

Add ability to see validated cases in app

Author: lionel-

NEWS.md

@@ -1,6 +1,9 @@
 
 # vdiffr 0.3.0.9000
 
+- You can now select the validated cases in the Shiny app (#38,
+  @clauswilke).
+
 - The testthat context is now shown on the Shiny app (#14,
   @paleolimbot).
 

R/cases-ui.R

@@ -9,7 +9,7 @@
 #' @export
 manage_cases <- function(package = ".", filter = NULL, ..., options = list()) {
   cases <- collect_cases(package, filter = filter)
-  cases <- filter_cases(cases, c("new_case", "mismatch_case", "orphaned_case"))
+  cases <- filter_cases(cases, c("new_case", "mismatch_case", "orphaned_case", "success_case"))
 
   vdiffrApp <- shiny::shinyApp(
     ui = vdiffrUi(cases),
@@ -28,7 +28,7 @@ manage_cases <- function(package = ".", filter = NULL, ..., options = list()) {
 vdiffrAddin <- function() {
   pkg_path <- rstudioapi::getActiveProject() %||% "."
   cases <- collect_cases(pkg_path)
-  cases <- filter_cases(cases, c("new_case", "mismatch_case", "orphaned_case"))
+  cases <- filter_cases(cases, c("new_case", "mismatch_case", "orphaned_case", "success_case"))
 
   vdiffrApp <- shiny::shinyApp(
     ui = vdiffrUi(cases),

R/cases.R

@@ -174,6 +174,12 @@ print.cases <- function(x, ...) {
     print_cases_names(new)
   }
 
+  success <- filter_cases(x, "success_case")
+  if (length(success) > 0) {
+    cat("\nValidated:\n")
+    print_cases_names(success)
+  }
+
   orphaned <- filter_cases(x, "orphaned_case")
   if (length(orphaned) > 0) {
     figs_path <- file.path(attr(x, "pkg_path"), "tests")

R/shiny-server.R

@@ -1,6 +1,6 @@
 
 vdiffrServer <- function(cases) {
-  shiny::shinyServer(function(input, output) {
+  shiny::shinyServer(function(input, output, session) {
     cases <- shiny::reactiveValues(all = cases)
     cases$active <- shiny::reactive({
       type <- input$type %||% "new_case"
@@ -29,6 +29,8 @@ vdiffrServer <- function(cases) {
     output$status <- renderStatus(input, cases)
     output$case_context <- renderCaseContext(input, cases)
 
+    toggleValidateBtns(input, session)
+
     quitApp(input)
   })
 }
@@ -39,7 +41,8 @@ diff_text_watcher <- function(input) {
 
 prettify_types <- function(x) {
   ifelse(x == "mismatch_case", "Mismatched",
-  ifelse(x == "new_case", "New", "Orphaned"
+  ifelse(x == "new_case", "New",
+  ifelse(x == "success_case", "Validated", "Orphaned")
   ))
 }
 
@@ -51,13 +54,16 @@ renderTypeInput <- function(input, reactive_cases) {
     if (length(types) == 0) {
       return(NULL)
     }
-    types <- set_names(types, prettify_types(types))
+
+    types <- sort(set_names(types, prettify_types(types)))
+
+    selected <- input$type %||% types[[1]]
 
     shiny::selectInput(
       inputId = "type",
       label = "Type:",
       choices = types,
-      selected = types[[1]]
+      selected = selected
     )
   })
 }
@@ -152,7 +158,7 @@ validateSingleCase <- function(input, reactive_cases) {
       case <- shiny::isolate(input$case)
 
       withdraw_cases(cases[case])
-      cases <- cases[-match(case, names(cases))]
+      cases[[case]] <- success_case(cases[[case]])
 
       shiny::isolate(reactive_cases$all <- cases)
     }
@@ -169,10 +175,8 @@ validateGroupCases <- function(input, reactive_cases) {
         type <- shiny::isolate(input$type)
 
         withdraw_cases(active_cases)
-
-        case_types <- c("new_case", "mismatch_case", "orphaned_case")
-        types <- case_types[!case_types == type]
-        cases <- filter_cases(cases, types)
+        idx <- sapply(cases, inherits, type)
+        cases[idx] <- lapply(cases[idx], success_case)
 
         shiny::isolate(reactive_cases$all <- cases)
       }
@@ -218,6 +222,14 @@ renderStatus <- function(input, reactive_cases) {
   })
 }
 
+toggleValidateBtns <- function(input, session) {
+  shiny::observeEvent(input$type, {
+    req(input$type)
+    message <- input$type == "success_case"
+    session$sendCustomMessage("toggle-validate-btns-handler", message)
+  })
+}
+
 quitApp <- function(input) {
   shiny::observe({
     if (input$quit_button > 0) {

inst/www/toggle.js

@@ -7,3 +7,10 @@ document.addEventListener('toggled', function(event) {
     status.innerHTML = 'After';
   }
 });
+
+// Disable/Enable validate buttons
+Shiny.addCustomMessageHandler('toggle-validate-btns-handler', toggleBtns);
+function toggleBtns(message) {
+  document.getElementById('group_validation_button').disabled = message;
+  document.getElementById('case_validation_button').disabled = message;
+}