Refactor register filter with REL tags

android/engine/build.gradle.kts

@@ -176,11 +176,7 @@ dependencies {
   api(libs.timber)
   api(libs.converter.gson)
   api(libs.json.path)
-  api(libs.commons.jexl3) { exclude(group = "commons-logging", module = "commons-logging") }
-  api(libs.easy.rules.jexl) {
-    exclude(group = "commons-logging", module = "commons-logging")
-    exclude(group = "org.apache.commons", module = "commons-jexl3")
-  }
+  api(libs.easy.rules.jexl) { exclude(group = "commons-logging", module = "commons-logging") }
   api(libs.data.capture) {
     isTransitive = true
     exclude(group = "ca.uhn.hapi.fhir")

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt

@@ -33,7 +33,6 @@ import java.io.File
 import java.io.FileNotFoundException
 import java.io.InputStreamReader
 import java.net.UnknownHostException
-import java.util.LinkedList
 import java.util.Locale
 import java.util.PropertyResourceBundle
 import java.util.ResourceBundle
@@ -61,8 +60,6 @@ import org.smartregister.fhircore.engine.configuration.app.ApplicationConfigurat
 import org.smartregister.fhircore.engine.configuration.app.ConfigService
 import org.smartregister.fhircore.engine.data.remote.fhir.resource.FhirResourceDataSource
 import org.smartregister.fhircore.engine.di.NetworkModule
-import org.smartregister.fhircore.engine.domain.model.FhirResourceConfig
-import org.smartregister.fhircore.engine.domain.model.ResourceConfig
 import org.smartregister.fhircore.engine.util.DispatcherProvider
 import org.smartregister.fhircore.engine.util.SharedPreferenceKey
 import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
@@ -376,19 +373,23 @@ constructor(
    * @return A list of strings of config files.
    */
   private fun retrieveAssetConfigs(context: Context, appId: String): MutableList<String> {
-    val filesQueue = LinkedList<String>()
+    val filesQueue = ArrayDeque<String>()
     val configFiles = mutableListOf<String>()
     context.assets.list(String.format(BASE_CONFIG_PATH, appId))?.onEach {
       if (!supportedFileExtensions.contains(it.fileExtension)) {
         filesQueue.addLast(String.format(BASE_CONFIG_PATH, appId) + "/$it")
-      } else configFiles.add(String.format(BASE_CONFIG_PATH, appId) + "/$it")
+      } else {
+        configFiles.add(String.format(BASE_CONFIG_PATH, appId) + "/$it")
+      }
     }
     while (filesQueue.isNotEmpty()) {
       val currentPath = filesQueue.removeFirst()
       context.assets.list(currentPath)?.onEach {
         if (!supportedFileExtensions.contains(it.fileExtension)) {
           filesQueue.addLast("$currentPath/$it")
-        } else configFiles.add("$currentPath/$it")
+        } else {
+          configFiles.add("$currentPath/$it")
+        }
       }
     }
     return configFiles
@@ -510,13 +511,14 @@ constructor(
     val resultBundle =
       if (isNonProxy()) {
         fhirResourceDataSourceGetBundle(resourceType, resourceIdList)
-      } else
+      } else {
         fhirResourceDataSource.post(
           requestBody =
             generateRequestBundle(resourceType, resourceIdList)
               .encodeResourceToString()
               .toRequestBody(NetworkModule.JSON_MEDIA_TYPE),
         )
+      }
 
     processResultBundleEntries(resultBundle.entry)
 
@@ -730,16 +732,6 @@ constructor(
     }
   }
 
-  private fun FhirResourceConfig.dependentResourceTypes(target: MutableList<ResourceType>) {
-    this.baseResource.dependentResourceTypes(target)
-    this.relatedResources.forEach { it.dependentResourceTypes(target) }
-  }
-
-  private fun ResourceConfig.dependentResourceTypes(target: MutableList<ResourceType>) {
-    target.add(resource)
-    relatedResources.forEach { it.dependentResourceTypes(target) }
-  }
-
   suspend fun loadResourceSearchParams():
     Pair<Map<String, Map<String, String>>, ResourceSearchParams> {
     val syncConfig = retrieveResourceConfiguration<Parameters>(ConfigType.Sync)

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/navigation/NavigationMenuConfig.kt

@@ -22,6 +22,9 @@ import kotlinx.serialization.Serializable
 import org.smartregister.fhircore.engine.domain.model.ActionConfig
 import org.smartregister.fhircore.engine.util.extension.interpolate
 
+const val ICON_TYPE_LOCAL = "local"
+const val ICON_TYPE_REMOTE = "remote"
+
 @Serializable
 @Parcelize
 data class NavigationMenuConfig(
@@ -53,9 +56,6 @@ data class ImageConfig(
   }
 }
 
-const val ICON_TYPE_LOCAL = "local"
-const val ICON_TYPE_REMOTE = "remote"
-
 enum class ImageType {
   JPEG,
   PNG,

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/register/RegisterConfiguration.kt

@@ -50,6 +50,7 @@ data class RegisterConfiguration(
   val filterDataByRelatedEntityLocation: Boolean = false,
   val topScreenSection: TopScreenSectionConfig? = null,
   val onSearchByQrSingleResultActions: List<ActionConfig>? = null,
+  val infiniteScroll: Boolean = true,
 ) : Configuration() {
   val onSearchByQrSingleResultValidActions =
     onSearchByQrSingleResultActions?.filter { it.trigger == ActionTrigger.ON_SEARCH_SINGLE_RESULT }

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/view/ButtonProperties.kt

@@ -91,7 +91,9 @@ data class ButtonProperties(
     val interpolated = this.status.interpolate(computedValuesMap)
     return if (ServiceStatus.values().map { it.name }.contains(interpolated)) {
       ServiceStatus.valueOf(interpolated)
-    } else ServiceStatus.UPCOMING
+    } else {
+      ServiceStatus.UPCOMING
+    }
   }
 }
 

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/view/ViewProperties.kt

@@ -16,7 +16,6 @@
 
 package org.smartregister.fhircore.engine.configuration.view
 
-import java.util.LinkedList
 import kotlinx.serialization.Serializable
 import org.smartregister.fhircore.engine.domain.model.ViewType
 
@@ -47,18 +46,17 @@ abstract class ViewProperties : java.io.Serializable {
  */
 fun List<ViewProperties>.retrieveListProperties(): List<ListProperties> {
   val listProperties = mutableListOf<ListProperties>()
-  val viewPropertiesLinkedList: LinkedList<ViewProperties> = LinkedList(this)
-  while (viewPropertiesLinkedList.isNotEmpty()) {
-    val properties = viewPropertiesLinkedList.removeFirst()
+  val viewPropertiesQueue: ArrayDeque<ViewProperties> = ArrayDeque(this)
+  while (viewPropertiesQueue.isNotEmpty()) {
+    val properties = viewPropertiesQueue.removeFirst()
     if (properties.viewType == ViewType.LIST) {
       listProperties.add(properties as ListProperties)
     }
     when (properties.viewType) {
-      ViewType.COLUMN -> viewPropertiesLinkedList.addAll((properties as ColumnProperties).children)
-      ViewType.ROW -> viewPropertiesLinkedList.addAll((properties as RowProperties).children)
-      ViewType.CARD -> viewPropertiesLinkedList.addAll((properties as CardViewProperties).content)
-      ViewType.LIST ->
-        viewPropertiesLinkedList.addAll((properties as ListProperties).registerCard.views)
+      ViewType.COLUMN -> viewPropertiesQueue.addAll((properties as ColumnProperties).children)
+      ViewType.ROW -> viewPropertiesQueue.addAll((properties as RowProperties).children)
+      ViewType.CARD -> viewPropertiesQueue.addAll((properties as CardViewProperties).content)
+      ViewType.LIST -> viewPropertiesQueue.addAll((properties as ListProperties).registerCard.views)
       else -> {}
     }
   }

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/view/ViewPropertiesSerializer.kt

@@ -29,12 +29,14 @@ object ViewPropertiesSerializer :
   JsonContentPolymorphicSerializer<ViewProperties>(ViewProperties::class) {
   override fun selectDeserializer(
     element: JsonElement,
-  ): DeserializationStrategy<out ViewProperties> {
+  ): DeserializationStrategy<ViewProperties> {
     val jsonObject = element.jsonObject
     val viewType = jsonObject[VIEW_TYPE]?.jsonPrimitive?.content
-    require(viewType != null && ViewType.values().contains(ViewType.valueOf(viewType))) {
+    require(
+      viewType != null && ViewType.entries.toTypedArray().contains(ViewType.valueOf(viewType)),
+    ) {
       """Ensure that supported `viewType` property is included in your register view properties configuration.
-         Supported types: ${ViewType.values()}
+         Supported types: ${ViewType.entries.toTypedArray()}
          Parsed JSON: $jsonObject
             """
         .trimMargin()