fix: [ANDROAPP-6398] Tei dashbard takes too long to load if option se…

…t is too big Signed-off-by: Pablo <[email protected]>
dhis2 · Nov 13, 2024 · a49d92c · a49d92c
1 parent 0dfdaee
commit a49d92c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/.../main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt b/.../main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt
@@ -139,7 +139,7 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
         return FragmentTeiDataBinding.inflate(inflater, container, false).also { binding ->
             this.binding = binding
             dashboardViewModel.groupByStage.observe(viewLifecycleOwner) { group ->
-                showLoadingProgress(false)
+                showLoadingProgress(true)
                 presenter.onGroupingChanged(group)
             }
 

diff --git a/...java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepositoryImpl.kt b/...java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TeiDataRepositoryImpl.kt
@@ -441,7 +441,7 @@ class TeiDataRepositoryImpl(
     override fun displayOrganisationUnit(programUid: String): Boolean {
         return d2.organisationUnitModule().organisationUnits()
             .byProgramUids(listOf(programUid))
-            .blockingGet().size > 1
+            .blockingCount() > 1
     }
 
     override fun enrollmentOrgUnitInCaptureScope(enrollmentOrgUnit: String): Boolean {

diff --git a/...2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RuleEngineExtensions.kt b/...2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RuleEngineExtensions.kt
@@ -63,8 +63,8 @@ fun List<ProgramRuleVariable>.toRuleVariableList(
     dataElementRepository: DataElementCollectionRepository,
     optionRepository: OptionCollectionRepository,
 ): List<RuleVariable> {
-    return filter {
-        when {
+    return mapNotNull {
+        val allowVariable = when {
             it.dataElement() != null -> {
                 dataElementRepository.uid(it.dataElement()?.uid()).blockingExists()
             }
@@ -75,8 +75,11 @@ fun List<ProgramRuleVariable>.toRuleVariableList(
 
             else -> isCalculatedValue(it)
         }
-    }.map {
-        it.toRuleVariable(attributeRepository, dataElementRepository, optionRepository)
+        if (allowVariable) {
+            it.toRuleVariable(attributeRepository, dataElementRepository, optionRepository)
+        } else {
+            null
+        }
     }
 }
 
@@ -348,14 +351,7 @@ fun ProgramRuleVariable.toRuleVariable(
     }
 
     val useCodeForOptionSet = useCodeForOptionSet() ?: false
-    val options = getOptions(
-        useCodeForOptionSet,
-        dataElement()?.uid(),
-        trackedEntityAttribute()?.uid(),
-        attributeRepository,
-        dataElementRepository,
-        optionRepository,
-    )
+    val options = emptyList<Option>()
 
     return when (programRuleVariableSourceType()) {
         ProgramRuleVariableSourceType.CALCULATED_VALUE ->