Fix style

Author: lionel-

R/shiny-server.R

@@ -50,9 +50,8 @@ prettify_types <- function(x) {
 renderTypeInput <- function(input, reactive_cases) {
   shiny::renderUI({
     cases <- reactive_cases$all
-    
+
     types <- unique(map_chr(cases, function(case) class(case)[[1]]))
-    
     if (length(types) == 0) {
       return(NULL)
     }
@@ -155,7 +154,7 @@ withdraw_cases <- function(cases) {
 
 validateSingleCase <- function(input, reactive_cases) {
   shiny::observeEvent(c(input$case_validation_button, input[["validateCase"]]), {
-    
+
     cases <- shiny::isolate(reactive_cases$all)
     case <- shiny::isolate(input$case)
     shiny::req(input$case)
@@ -164,21 +163,21 @@ validateSingleCase <- function(input, reactive_cases) {
     cases[[case]] <- success_case(cases[[case]])
 
     shiny::isolate(reactive_cases$all <- cases)
-    })
+  })
 }
 
 validateGroupCases <- function(input, reactive_cases, session) {
   shiny::observeEvent(c(input$group_validation_button, input[["validateGroup"]]), {
     active_cases <- shiny::isolate(reactive_cases$active())
     cases <- shiny::isolate(reactive_cases$all)
-    
+
     if (length(cases) > 0) {
       shiny::req(input$type)
       type <- shiny::isolate(input$type)
 
       withdraw_cases(active_cases)
-      idx <- sapply(cases, inherits, type)
-      cases[idx] <- lapply(cases[idx], success_case)
+      idx <- map_lgl(cases, inherits, type)
+      cases <- map_if(cases, idx, success_case)
 
       shiny::isolate(reactive_cases$all <- cases)
     }
@@ -235,22 +234,26 @@ listenToKeys <- function(input, session, reactive_cases) {
   shiny::observeEvent(input[["nextCase"]], {
     names <- unique(names(reactive_cases$active()))
     shiny::updateSelectInput(session, "case",
-                      selected = next_element(input$case, names))
+      selected = next_element(input$case, names)
+    )
   })
   shiny::observeEvent(input[["prevCase"]], {
     names <- unique(names(reactive_cases$active()))
     shiny::updateSelectInput(session, "case",
-                      selected = next_element(input$case, names, direction = -1))
+      selected = next_element(input$case, names, direction = -1)
+    )
   })
   shiny::observeEvent(input[["nextType"]], {
     types <- unique(map_chr(reactive_cases$all, function(case) class(case)[[1]]))
     shiny::updateSelectInput(session, "type",
-                      selected = next_element(input$type, types))
+      selected = next_element(input$type, types)
+    )
   })
   shiny::observeEvent(input[["prevType"]], {
     types <- unique(map_chr(reactive_cases$all, function(case) class(case)[[1]]))
     shiny::updateSelectInput(session, "type",
-                      selected = next_element(input$type, types, direction = -1))
+      selected = next_element(input$type, types, direction = -1)
+    )
   })
 }
 

R/utils.R

@@ -191,13 +191,15 @@ is_bool <- function(x) {
 next_element <- function(element, group, direction = 1) {
   if (element == "") {
     return(NULL) # if a type is empty
-  } else {
-    next_position <- match(element, group) + direction
-    if (next_position > length(group)) {
-      next_position <- next_position - length(group)
-    } else if (next_position < 1) {
-      next_position <- length(group)
-    }
-    return(group[next_position])
   }
+
+  next_position <- match(element, group) + direction
+
+  if (next_position > length(group)) {
+    next_position <- next_position - length(group)
+  } else if (next_position < 1) {
+    next_position <- length(group)
+  }
+
+  group[next_position]
 }