Merge pull request #6107 from grzesiek2010/COLLECT-6017

Fixed displaying saved forms to delete
getodk · Apr 29, 2024 · b3cd4a0 · b3cd4a0
2 parents 3d2ca0b + 2d30b34
commit b3cd4a0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/...p/src/main/java/org/odk/collect/android/formlists/savedformlist/SavedFormListViewModel.kt b/...p/src/main/java/org/odk/collect/android/formlists/savedformlist/SavedFormListViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
 import org.odk.collect.android.instancemanagement.InstancesDataService
 import org.odk.collect.androidshared.async.TrackableWorker
 import org.odk.collect.androidshared.data.Consumable
@@ -39,6 +40,7 @@ class SavedFormListViewModel(
         }
 
     val formsToDisplay: LiveData<List<Instance>> = instancesDataService.instances
+        .map { instances -> instances.filter { instance -> instance.deletedDate == null } }
         .combine(_sortOrder) { instances, order ->
             when (order) {
                 SortOrder.NAME_DESC -> {

diff --git a/...c/test/java/org/odk/collect/android/formlists/savedformlist/SavedFormListViewModelTest.kt b/...c/test/java/org/odk/collect/android/formlists/savedformlist/SavedFormListViewModelTest.kt
@@ -34,6 +34,20 @@ class SavedFormListViewModelTest {
         on { instances } doReturn MutableStateFlow(emptyList())
     }
 
+    @Test
+    fun `formsToDisplay should not include deleted forms`() {
+        val myForm = InstanceFixtures.instance(displayName = "My form", deletedDate = 1)
+        val yourForm = InstanceFixtures.instance(displayName = "Your form")
+        saveForms(listOf(myForm, yourForm))
+
+        val viewModel = SavedFormListViewModel(scheduler, settings, instancesDataService, "projectId")
+
+        assertThat(
+            viewModel.formsToDisplay.getOrAwaitValue(scheduler),
+            contains(yourForm)
+        )
+    }
+
     @Test
     fun `setting filterText filters forms on display name`() {
         val myForm = InstanceFixtures.instance(displayName = "My form")

diff --git a/forms-test/src/main/java/org/odk/collect/formstest/InstanceFixtures.kt b/forms-test/src/main/java/org/odk/collect/formstest/InstanceFixtures.kt
@@ -11,7 +11,8 @@ object InstanceFixtures {
         lastStatusChangeDate: Long = 0,
         displayName: String? = null,
         dbId: Long? = null,
-        form: Form? = null
+        form: Form? = null,
+        deletedDate: Long? = null
     ): Instance {
         val instancesDir = TempFiles.createTempDir()
         return InstanceUtils.buildInstance("formId", "version", instancesDir.absolutePath)
@@ -24,6 +25,7 @@ object InstanceFixtures {
                     it.formVersion(form.version)
                 }
             }
+            .deletedDate(deletedDate)
             .build()
     }
 }