From a84a64b9c979db091387bceb05a3f58d78abc34a Mon Sep 17 00:00:00 2001 From: javier-gracia-tabuenca-tuni Date: Tue, 1 Jul 2025 13:47:29 +0300 Subject: [PATCH 1/4] Added logic to set "ADD_INFO:validationMessages" and "ADD_INFO:autoUpdatingInfo" to NA if they are empty in usagiTibble. --- R/usagiFile.R | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/R/usagiFile.R b/R/usagiFile.R index 2a2ae8e..289c44a 100644 --- a/R/usagiFile.R +++ b/R/usagiFile.R @@ -164,5 +164,12 @@ writeUsagiFile <- function(usagiTibble, pathToUsagiFile) { dplyr::any_of(c(firstColNames, midColNames, lastColNames)) ) + # force "ADD_INFO:validationMessages" and "ADD_INFO:autoUpdatingInfo" to be NA if they are empty + usagiTibble <- usagiTibble |> + dplyr::mutate( + `ADD_INFO:validationMessages` = ifelse(`ADD_INFO:validationMessages` == "", NA, `ADD_INFO:validationMessages`), + `ADD_INFO:autoUpdatingInfo` = ifelse(`ADD_INFO:autoUpdatingInfo` == "", NA, `ADD_INFO:autoUpdatingInfo`) + ) + readr::write_csv(usagiTibble, pathToUsagiFile, na = "") } From 50a52899daeb54bd808bea6327101b9c5b8e0cb5 Mon Sep 17 00:00:00 2001 From: javier-gracia-tabuenca-tuni Date: Tue, 1 Jul 2025 13:48:30 +0300 Subject: [PATCH 2/4] Fix typo in issue link description in buildStatusDashboard function --- R/buildStatusDashboard.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/buildStatusDashboard.R b/R/buildStatusDashboard.R index 99c1d8b..996d30b 100644 --- a/R/buildStatusDashboard.R +++ b/R/buildStatusDashboard.R @@ -596,7 +596,7 @@ buildStatusDashboard <- function( statusSetBy = statusSetBy, fileIssue = paste0( "File issue" ) ) |> From 4afc9c881ae862e69ea85e8538e514cc0255ff1a Mon Sep 17 00:00:00 2001 From: javier-gracia-tabuenca-tuni Date: Tue, 1 Jul 2025 14:00:26 +0300 Subject: [PATCH 3/4] Update usagiFile to conditionally set "ADD_INFO:validationMessages" and "ADD_INFO:autoUpdatingInfo" to NA if they exist and are empty. --- R/usagiFile.R | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/R/usagiFile.R b/R/usagiFile.R index 289c44a..5c2c0ff 100644 --- a/R/usagiFile.R +++ b/R/usagiFile.R @@ -164,12 +164,19 @@ writeUsagiFile <- function(usagiTibble, pathToUsagiFile) { dplyr::any_of(c(firstColNames, midColNames, lastColNames)) ) - # force "ADD_INFO:validationMessages" and "ADD_INFO:autoUpdatingInfo" to be NA if they are empty - usagiTibble <- usagiTibble |> - dplyr::mutate( - `ADD_INFO:validationMessages` = ifelse(`ADD_INFO:validationMessages` == "", NA, `ADD_INFO:validationMessages`), - `ADD_INFO:autoUpdatingInfo` = ifelse(`ADD_INFO:autoUpdatingInfo` == "", NA, `ADD_INFO:autoUpdatingInfo`) - ) + # force "ADD_INFO:validationMessages" and "ADD_INFO:autoUpdatingInfo" to be NA if they are empty, if they exist + if ("ADD_INFO:validationMessages" %in% colNames) { + usagiTibble <- usagiTibble |> + dplyr::mutate( + `ADD_INFO:validationMessages` = ifelse(`ADD_INFO:validationMessages` == "", NA, `ADD_INFO:validationMessages`) + ) + } + if ("ADD_INFO:autoUpdatingInfo" %in% colNames) { + usagiTibble <- usagiTibble |> + dplyr::mutate( + `ADD_INFO:autoUpdatingInfo` = ifelse(`ADD_INFO:autoUpdatingInfo` == "", NA, `ADD_INFO:autoUpdatingInfo`) + ) + } readr::write_csv(usagiTibble, pathToUsagiFile, na = "") } From e7b0092da4dcca8228fb9bf05416fd2e8417b006 Mon Sep 17 00:00:00 2001 From: javier-gracia-tabuenca-tuni Date: Tue, 1 Jul 2025 14:16:32 +0300 Subject: [PATCH 4/4] v2.0.3 --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 98c2f64..aa6bed1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,7 @@ # ROMOPMappingTools 2.0.3 - Added download button to vocabulary and database status tables +- Force `ADD_INFO:validationMessages` and `ADD_INFO:autoUpdatingInfo` to be NA if they are empty # ROMOPMappingTools 2.0.2