From 4aee528146d1e3580f50bea952d661ea1e34e070 Mon Sep 17 00:00:00 2001
From: "Sam A. Welch (NIVA)" <saw@niva.no>
Date: Tue, 31 Mar 2026 12:44:08 +0200
Subject: [PATCH] Finally renamed mod_data to mod_measurements, a slightly less
 confusing option.

---
 R/app_server.R |  6 +++---
 R/app_ui.R     |  4 ++--
 R/mod_data.R   | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/R/app_server.R b/R/app_server.R
index 3b7fdd3..9c32332 100644
--- a/R/app_server.R
+++ b/R/app_server.R
@@ -133,8 +133,8 @@ app_server <- function(input, output, session) {
   moduleMethods <- mod_methods_server("methods")
   moduleSamples <- mod_samples_server("samples")
   moduleBiota <- mod_biota_server("biota")
-  moduleData <- mod_data_server(
-    "data",
+  moduleMeasurements <- mod_measurements_server(
+    "measurements",
     parent_session = session
   )
   moduleReview <- mod_review_server(
@@ -160,7 +160,7 @@ app_server <- function(input, output, session) {
     "06-methods",
     "07-samples",
     "08-biota",
-    "09-data",
+    "09-measurements",
     "10-review",
     "12-CREED",
     "13-Zenodo",
diff --git a/R/app_ui.R b/R/app_ui.R
index d6ec1a5..a2b2f5a 100644
--- a/R/app_ui.R
+++ b/R/app_ui.R
@@ -156,8 +156,8 @@ app_ui <- function(request) {
           "9. Data",
           "Enter measured values, units, and uncertainty."
         ),
-        value = "09-data",
-        mod_data_ui("data"),
+        value = "09-measurements",
+        mod_measurements_ui("measurements"),
         icon = bs_icon("app")
       ),
       nav_panel(
diff --git a/R/mod_data.R b/R/mod_data.R
index f6ced4d..c342a88 100644
--- a/R/mod_data.R
+++ b/R/mod_data.R
@@ -10,7 +10,7 @@
 #' @importFrom rhandsontable rHandsontableOutput
 #' @importFrom shinyjs useShinyjs show hide hidden
 #' @import eDataDRF
-mod_data_ui <- function(id) {
+mod_measurements_ui <- function(id) {
   ns <- NS(id)
 
   tagList(
@@ -116,7 +116,7 @@ mod_data_ui <- function(id) {
 #' @importFrom utils capture.output head
 #' @importFrom purrr is_empty map_lgl
 #' @import eDataDRF
-mod_data_server <- function(id, parent_session) {
+mod_measurements_server <- function(id, parent_session) {
   moduleServer(id, function(input, output, session) {
     ns <- session$ns
 
@@ -542,7 +542,7 @@ mod_data_server <- function(id, parent_session) {
 
           session$userData$reactiveValues$measurementsData <- new_combinations
           print_dev(glue(
-            "mod_data: All modules validated, created {nrow(session$userData$reactiveValues$measurementsData)} measurement combinations"
+            "mod_measurements: All modules validated, created {nrow(session$userData$reactiveValues$measurementsData)} measurement combinations"
           ))
         }
       } else if (
@@ -550,7 +550,7 @@ mod_data_server <- function(id, parent_session) {
       ) {
         moduleState$data_entry_ready <- FALSE
         session$userData$reactiveValues$measurementsData <- initialise_measurements_tibble()
-        print_dev("mod_data: Some modules pending, data entry disabled")
+        print_dev("mod_measurements: Some modules pending, data entry disabled")
       }
       # We shouldn't need an explicit case for when all modules validate and a save extraction was successful, because
       # that should be covered by the existing code in fct_import.R. hopefully...
@@ -1001,7 +1001,7 @@ mod_data_server <- function(id, parent_session) {
 }
 
 ## To be copied in the UI ----
-# mod_data_ui("data_1")
+# mod_measurements_ui("data_1")
 
 ## To be copied in the server ----
-# mod_data_server("data_1")
+# mod_measurements_server("data_1")