Create ListItemQueryset for appending associated ListItemValues

arches_controlled_lists/models.py

@@ -15,6 +15,7 @@
 from arches.app.utils.i18n import rank_label
 from arches_controlled_lists.querysets import (
     ListQuerySet,
+    ListItemQuerySet,
     ListItemImageManager,
     ListItemValueQuerySet,
     NodeQuerySet,
@@ -139,6 +140,8 @@ class ListItem(models.Model):
     )
     guide = models.BooleanField(default=False)
 
+    objects = ListItemQuerySet.as_manager()
+
     class Meta:
         constraints = [
             # Sort order concerns the list as a whole, not subsets
@@ -222,7 +225,7 @@ def build_tile_value(self):
         return tile_value
 
     def build_select_option(self):
-        labels = self.list_item_values.labels()
+        labels = getattr(self, "list_item_labels", self.list_item_values.labels())
         ranked_labels = sorted(
             labels,
             key=lambda label: rank_label(

arches_controlled_lists/querysets.py

@@ -30,6 +30,19 @@ def annotate_node_fields(self, **kwargs):
         return qs
 
 
+class ListItemQuerySet(models.QuerySet):
+    def with_list_item_labels(self):
+        from arches_controlled_lists.models import ListItemValue
+
+        return self.prefetch_related(
+            models.Prefetch(
+                "list_item_values",
+                ListItemValue.objects.labels(),
+                to_attr="list_item_labels",
+            )
+        )
+
+
 class ListItemValueQuerySet(models.QuerySet):
     def values_without_images(self):
         return self.exclude(valuetype="image")

arches_controlled_lists/views.py

@@ -381,7 +381,9 @@ def get(self, request):
             .values("controlled_list_id")[:1]
         )
 
-        list_items = ListItem.objects.filter(list_id=controlled_list_id)
+        list_items = ListItem.objects.filter(
+            list_id=controlled_list_id
+        ).with_list_item_labels()
         serialized = [
             item.build_select_option() for item in list_items if item.parent_id is None
         ]