fix: [ANDROAPP-6131] refresh data on resume

Signed-off-by: Pablo <[email protected]>
dhis2 · Jun 14, 2024 · d818054 · d818054
1 parent 3508924
commit d818054
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/eventList/EventListFragment.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/eventList/EventListFragment.kt
@@ -30,6 +30,8 @@ class EventListFragment : FragmentGlobalAbstract() {
     @Inject
     lateinit var cardMapper: EventCardMapper
 
+    val eventListViewModel by viewModels<EventListViewModel> { eventListViewModelFactory }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -43,7 +45,6 @@ class EventListFragment : FragmentGlobalAbstract() {
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
             setContent {
                 val workingListViewModel by viewModels<WorkingListViewModel> { workingListViewModelFactory }
-                val eventListViewModel by viewModels<EventListViewModel> { eventListViewModelFactory }
                 val programEventsViewModel by activityViewModels<ProgramEventDetailViewModel>()
                 val cardClicked by eventListViewModel.onEventCardClick.collectAsState(null)
                 val syncClicked by eventListViewModel.onSyncClick.collectAsState(null)
@@ -65,4 +66,9 @@ class EventListFragment : FragmentGlobalAbstract() {
             }
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        eventListViewModel.refreshData()
+    }
 }
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/eventList/EventListViewModel.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/eventList/EventListViewModel.kt
@@ -11,7 +11,6 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.reactive.asFlow
 import kotlinx.coroutines.withContext
 import org.dhis2.commons.filters.FilterManager
 import org.dhis2.commons.ui.model.ListCardUiModel
@@ -82,4 +81,8 @@ class EventListViewModel(
             _onEventCardClick.emit(eventUidAndOrgUnit)
         }
     }
+
+    fun refreshData() {
+        filterManager.publishData()
+    }
 }