Merge pull request #71 from dfe-analytical-services/tidy-commit-hook

Updating workflow naming and commit hooks

.github/workflows/shiny-tests.yaml

@@ -10,7 +10,7 @@ jobs:
   automatedTests:
     runs-on: ${{ matrix.config.os }}
 
-    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+    name: shiny-tests
 
     strategy:
       fail-fast: false

.github/workflows/tidyCode.yaml

@@ -10,7 +10,7 @@ jobs:
   tidyCode:
     runs-on: ${{ matrix.config.os }}
 
-    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+    name: tidyCode
 
     strategy:
       fail-fast: false

.hooks/pre-commit.R

@@ -3,7 +3,7 @@ cat("Running commit hooks...",fill=TRUE)
 shhh <- suppressPackageStartupMessages # It's a library, so shhh!
 shhh(library(dplyr))
 shhh(library(xfun))
-
+shhh(library(dfeshiny))
 
 error_flag <- FALSE
 
@@ -28,8 +28,6 @@ if(ncol(ign_files)>1){
   }
 }
 
-
-
 suffixes <- "xlsx$|dat$|csv$|tex$|pdf$"
 
 current_files <- data.frame(files = list.files("./", recursive = TRUE)) %>%
@@ -69,4 +67,16 @@ if (error_flag) {
   quit(save = "no", status = 1, runLast = FALSE)
 }
 
+tidy_output <- tidy_code()
+if(any(tidy_output)){
+  error_flag <- TRUE
+}
+
+if (error_flag) {
+  cat("Warning: Code did not appear to have been tidied.\nI've run tidy code for you,
+      please check your files and the dashboard still works and then re-stage and try committing again.")
+  quit(save = "no", status = 1, runLast = FALSE)
+}
+
+
 # End of hooks

global.R

@@ -112,8 +112,11 @@ choicesLAs <- dfAreas %>%
 choicesAreas <- dfAreas %>%
   filter(geographic_level == "National") %>%
   select(geographic_level, area_name = country_name) %>%
-  rbind(dfAreas %>% filter(geographic_level == "Regional") %>%
-    select(geographic_level, area_name = region_name)) %>%
+  rbind(
+    dfAreas %>%
+      filter(geographic_level == "Regional") %>%
+      select(geographic_level, area_name = region_name)
+  ) %>%
   rbind(choicesLAs)
 
 choicesYears <- unique(dfRevBal$time_period)