fix: [ANDROAPP-6062] clear search fields when required attributes to …

…search
dhis2 · Apr 18, 2024 · bc31137 · bc31137
1 parent 7b09f1b
commit bc31137
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModel.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEIViewModel.kt
@@ -275,7 +275,11 @@ class SearchTEIViewModel(
         val updatedItems = uiState.items.map {
             (it as FieldUiModelImpl).copy(value = null, displayName = null)
         }
-        uiState = uiState.copy(items = updatedItems)
+        uiState = uiState.copy(
+            items = updatedItems,
+            searchedItems = mapOf(),
+        )
+        searching = false
     }
 
     private fun updateSearch() {
@@ -461,6 +465,8 @@ class SearchTEIViewModel(
                 )
                 uiState = uiState.copy(minAttributesMessage = message)
                 uiState.updateMinAttributeWarning(true)
+                setSearchScreen()
+                _refreshData.postValue(Unit)
             }
         }
     }

diff --git a/...ain/java/org/dhis2/usescases/searchTrackEntity/searchparameters/SearchParametersScreen.kt b/...ain/java/org/dhis2/usescases/searchTrackEntity/searchparameters/SearchParametersScreen.kt
@@ -144,6 +144,7 @@ fun SearchParametersScreen(
                         message = message,
                         duration = SnackbarDuration.Short,
                     )
+                    uiState.updateMinAttributeWarning(false)
                 }
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -144,6 +144,7 @@ fun SearchParametersScreen( @@
                             message = message,
                             duration = SnackbarDuration.Short,
                         )
+                        uiState.updateMinAttributeWarning(false)
                     }
                 }
             }
@@ Expand Down @@