Merge pull request #6527 from grzesiek2010/COLLECT-6518

Do not create entities with blank labels
getodk · Nov 22, 2024 · 26f6a5b · 26f6a5b
2 parents 9bcfd13 + 7d09fb7
commit 26f6a5b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/entities/src/main/java/org/odk/collect/entities/LocalEntityUseCases.kt b/entities/src/main/java/org/odk/collect/entities/LocalEntityUseCases.kt
@@ -24,7 +24,7 @@ object LocalEntityUseCases {
             if (id != null) {
                 when (formEntity.action) {
                     EntityAction.CREATE -> {
-                        if (!label.isNullOrEmpty()) {
+                        if (!label.isNullOrBlank()) {
                             val entity = Entity.New(
                                 id,
                                 label,

diff --git a/entities/src/test/java/org/odk/collect/entities/LocalEntityUseCasesTest.kt b/entities/src/test/java/org/odk/collect/entities/LocalEntityUseCasesTest.kt
@@ -108,7 +108,7 @@ class LocalEntityUseCasesTest {
     }
 
     @Test
-    fun `updateLocalEntitiesFromForm updates properties and does not change label on update if label is empty`() {
+    fun `updateLocalEntitiesFromForm updates properties and does not change label on update if label is blank`() {
         entitiesRepository.save(
             "things",
             Entity.New(
@@ -120,7 +120,7 @@ class LocalEntityUseCasesTest {
         )
 
         val formEntity =
-            FormEntity(EntityAction.UPDATE, "things", "id", "", listOf("prop" to "value 2"))
+            FormEntity(EntityAction.UPDATE, "things", "id", " ", listOf("prop" to "value 2"))
         val formEntities = EntitiesExtra(listOf(formEntity))
 
         LocalEntityUseCases.updateLocalEntitiesFromForm(formEntities, entitiesRepository)
@@ -189,9 +189,9 @@ class LocalEntityUseCasesTest {
     }
 
     @Test
-    fun `updateLocalEntitiesFromForm does not create entity that has an empty label`() {
+    fun `updateLocalEntitiesFromForm does not create entity that has a blank label`() {
         val formEntity =
-            FormEntity(EntityAction.CREATE, "things", "1", "", emptyList())
+            FormEntity(EntityAction.CREATE, "things", "1", " ", emptyList())
         val formEntities = EntitiesExtra(listOf(formEntity))
         entitiesRepository.addList("things")