Merge branch 'main' into add-inequalities-module

Author: StatsRhian

.Rbuildignore

@@ -1,28 +1,32 @@
 ^CODEOWNERS$
-^remove_files_from_manifest.js$
-^update_manifest.js$
+^remove_files_from_manifest\.js$
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^data-raw$
-dev_history.R
+^dev_history\.R$
 ^dev$
 $run_dev.*
 ^LICENSE\.md$
 ^README\.Rmd$
 ^app\.R$
 ^rsconnect$
 
-.lintr
-.github
-.vscode
+^\.lintr$
+^\.github$
+^\.vscode$
 
 ^_targets$
 ^targets$
-^_targets.R$
+^_targets\.R$
 ^\.github$
 
-^params/$
-^update_manifest.js$
-^manifest.json$
+^\.cache/
+^params/
+^update_manifest\.js$
+^manifest\.json$
+
+^inputs_selection_app/
+
+^\.Renviron\.example$
+^\.git-blame-ignore-revs$
 
-^inputs_selection_app/

.gitignore

@@ -1,17 +1,20 @@
-.Rproj.user
-.Rhistory
-.Rdata
-.httr-oauth
-.DS_Store
-
-_targets/
-_targets.yaml
-
-.Renviron
-
-rsconnect/
-
-params/
-
-# worktrees
-inputs_selection_app/
+.Rproj.user
+.Rhistory
+.Rdata
+.httr-oauth
+.DS_Store
+
+_targets/
+_targets.yaml
+
+.Renviron
+
+rsconnect/
+
+params/
+
+# worktrees
+inputs_selection_app/
+
+.cache/
+tmp/

DESCRIPTION

@@ -34,7 +34,6 @@ Imports:
     gt,
     htmltools,
     httr2,
-    janitor,
     jsonlite,
     jsonvalidate,
     leaflet,

R/fct_azure_storage.R

@@ -1,49 +1,33 @@
-#' azure_storage
-#'
-#' @description A fct function
+#' Get Provider Data
 #'
-#' @return The return value, if any, from executing the function.
+#' Read the parquet file containing a selected type of provider data.
 #'
-#' @noRd
-load_rds_from_adls <- function(
+#' @param file The name of the file to read.
+#' @param inputs_data_version The version of the inputs data to use.
+#' @return A tibble.
+load_provider_data <- function(
   file,
   inputs_data_version = Sys.getenv("NHP_INPUTS_DATA_VERSION", "dev")
 ) {
-  fs <- get_adls_fs()
-  AzureStor::storage_load_rds(fs, glue::glue("{inputs_data_version}/{file}"))
-}
-
-#' Get inequalities data
-#'
-#' Read the parquet file for inequalities
-#' @return A tibble.
-load_inequalities_data <- function() {
-
   fs <- get_adls_fs()
   fs |>
     AzureStor::download_adls_file(
-      glue::glue("dev/inequalities.parquet"),
+      glue::glue("{inputs_data_version}/{file}.parquet"),
       dest = NULL
     ) |>
     arrow::read_parquet() |>
     tibble::as_tibble()
 }
 
-#' Get Provider Data
-#'
-#' Read the parquet file containing a selected type of provider data.
+#' Get inequalities data
 #'
-#' @param file The name of the file to read.
-#' @param inputs_data_version The version of the inputs data to use.
+#' Read the parquet file for inequalities
 #' @return A tibble.
-load_provider_data <- function(
-  file,
-  inputs_data_version = Sys.getenv("NHP_INPUTS_DATA_VERSION", "dev")
-) {
+load_inequalities_data <- function() {
   fs <- get_adls_fs()
   fs |>
     AzureStor::download_adls_file(
-      glue::glue("{inputs_data_version}/{file}.parquet"),
+      glue::glue("dev/inequalities.parquet"),
       dest = NULL
     ) |>
     arrow::read_parquet() |>

R/mod_mitigators_server.R

@@ -567,6 +567,14 @@ mod_mitigators_server <- function(
           readr::read_csv(col_types = "cddd") |>
           dplyr::filter(.data[["param_name"]] == input$strategy)
 
+        shiny::validate(
+          shiny::need(
+            nrow(nee_params) > 0,
+            "This TPMA was not part of the National Elicitation Exercise,
+                      so a nationally-determined estimate is not available."
+          )
+        )
+
         nee_params |>
           ggplot2::ggplot() +
           ggplot2::geom_segment(