Add list collector content pages

app/forms/questionnaire_form.py

@@ -545,7 +545,7 @@ def _get_value_source_resolver(list_item: str | None = None) -> ValueSourceResol
     question_title = question.get("title")
 
     value_source_resolved_for_location = _get_value_source_resolver(list_item_id)
-    for answer in question["answers"]:
+    for answer in question.get("answers", []):
         if "list_item_id" in answer:
             value_source_resolver = _get_value_source_resolver(answer["list_item_id"])
         else:

app/jinja_filters.py

@@ -628,6 +628,7 @@ def map_summary_item_config(
         else:
             list_collector_rows = map_list_collector_config(
                 list_items=block["list"]["list_items"],
+                editable=block["list"]["editable"],
                 edit_link_text=edit_link_text,
                 edit_link_aria_label=edit_link_aria_label,
                 remove_link_text=remove_link_text,
@@ -654,6 +655,7 @@ def map_summary_item_config_processor() -> dict[str, Callable]:
 @blueprint.app_template_filter()  # type: ignore
 def map_list_collector_config(
     list_items: list[dict[str, str | int]],
+    editable: bool = True,
     render_icon: bool = False,
     edit_link_text: str = "",
     edit_link_aria_label: str = "",
@@ -672,7 +674,7 @@ def map_list_collector_config(
         edit_link_aria_label_text = None
         remove_link_aria_label_text = None
 
-        if edit_link_text:
+        if edit_link_text and editable:
             url = (
                 f'{list_item.get("edit_link")}{item_anchor}'
                 if item_anchor
@@ -694,7 +696,7 @@ def map_list_collector_config(
 
             actions.append(edit_link)
 
-        if not list_item.get("primary_person") and remove_link_text:
+        if not list_item.get("primary_person") and remove_link_text and editable:
             if remove_link_aria_label:
                 remove_link_aria_label_text = remove_link_aria_label.format(
                     item_name=item_name

app/questionnaire/questionnaire_schema.py

@@ -19,6 +19,8 @@
 
 DEFAULT_LANGUAGE_CODE = "en"
 
+LIST_COLLECTORS_WITH_REPEATING_BLOCKS = {"ListCollector", "ListCollectorContent"}
+
 LIST_COLLECTOR_CHILDREN = [
     "ListAddQuestion",
     "ListEditQuestion",
@@ -354,11 +356,12 @@ def _get_blocks_by_id(self) -> dict[str, ImmutableDict]:
                 self._parent_id_map[block_id] = group["id"]
 
                 blocks[block_id] = block
-                if block["type"] in (
+                if block["type"] in {
                     "ListCollector",
+                    "ListCollectorContent",
                     "PrimaryPersonListCollector",
                     "RelationshipCollector",
-                ):
+                }:
                     self._list_collector_section_ids_by_list_name[
                         block["for_list"]
                     ].append(self._parent_id_map[group["id"]])
@@ -619,25 +622,26 @@ def _update_answer_dependencies_for_list_source(
         )
 
         for list_collector in list_collectors:
-            add_block_question = self.get_add_block_for_list_collector(
-                list_collector["id"]  # type: ignore
-            )["question"]
-            answer_ids_for_block = list(
-                self.get_answers_for_question_by_id(add_block_question)
-            )
-            for block_answer_id in answer_ids_for_block:
-                self._answer_dependencies_map[block_answer_id] |= {
-                    self._get_answer_dependent_for_block_id(
-                        block_id=block_id, for_list=list_name
-                    )
-                    if self.is_block_in_repeating_section(block_id)
-                    # non-repeating blocks such as dynamic-answers could depend on the list
-                    else self._get_answer_dependent_for_block_id(block_id=block_id)
-                }
-            self._list_dependent_block_additional_dependencies[block_id] = set(
-                answer_ids_for_block
-            )
-            # removing an item from a list will require any dependent calculated summaries to be re-confirmed, so cache dependencies
+            if add_block := self.get_add_block_for_list_collector(  # type: ignore
+                list_collector["id"]
+            ):
+                add_block_question = add_block["question"]
+                answer_ids_for_block = list(
+                    self.get_answers_for_question_by_id(add_block_question)
+                )
+                for block_answer_id in answer_ids_for_block:
+                    self._answer_dependencies_map[block_answer_id] |= {
+                        self._get_answer_dependent_for_block_id(
+                            block_id=block_id, for_list=list_name
+                        )
+                        if self.is_block_in_repeating_section(block_id)
+                        # non-repeating blocks such as dynamic-answers could depend on the list
+                        else self._get_answer_dependent_for_block_id(block_id=block_id)
+                    }
+                self._list_dependent_block_additional_dependencies[block_id] = set(
+                    answer_ids_for_block
+                )
+                # removing an item from a list will require any dependent calculated summaries to be re-confirmed, so cache dependencies
             if remove_block_id := self.get_remove_block_id_for_list(list_name):
                 self._list_dependent_block_additional_dependencies[block_id].update(
                     self.get_answer_ids_for_block(remove_block_id)
@@ -759,7 +763,10 @@ def get_driving_question_for_list(
 
     def get_remove_block_id_for_list(self, list_name: str) -> str | None:
         for block in self.get_blocks():
-            if block["type"] == "ListCollector" and block["for_list"] == list_name:
+            if (
+                is_list_collector_block_editable(block)
+                and block["for_list"] == list_name
+            ):
                 remove_block_id: str = block["remove_block"]["id"]
                 return remove_block_id
 
@@ -970,13 +977,15 @@ def get_list_collectors_for_list_for_sections(
         for section_id in sections:
             if section := self.get_section(section_id):
                 collector_type = (
-                    "PrimaryPersonListCollector" if primary else "ListCollector"
+                    {"PrimaryPersonListCollector"}
+                    if primary
+                    else LIST_COLLECTORS_WITH_REPEATING_BLOCKS
                 )
 
                 blocks.extend(
                     block
                     for block in self.get_blocks_for_section(section)
-                    if block["type"] == collector_type and block["for_list"] == for_list
+                    if block["type"] in collector_type and block["for_list"] == for_list
                 )
 
         return blocks
@@ -1171,7 +1180,7 @@ def _block_for_answer(self, answer_id: str) -> ImmutableDict | None:
 
         if (
             parent_block
-            and parent_block["type"] == "ListCollector"
+            and parent_block["type"] in LIST_COLLECTORS_WITH_REPEATING_BLOCKS
             and block_id not in self.list_collector_repeating_block_ids
         ):
             return parent_block
@@ -1530,3 +1539,7 @@ def get_calculation_block_ids_for_grand_calculated_summary(
         calculation_block=grand_calculated_summary_block,
         source_type="calculated_summary",
     )
+
+
+def is_list_collector_block_editable(block: Mapping) -> bool:
+    return bool(block["type"] == "ListCollector")

app/questionnaire/router.py

@@ -532,9 +532,9 @@ def _get_enabled_section_keys(
         self,
     ) -> Generator[SectionKey, None, None]:
         for section_id in self.enabled_section_ids:
-            repeating_list = self._schema.get_repeating_list_for_section(section_id)
-
-            if repeating_list:
+            if repeating_list := self._schema.get_repeating_list_for_section(
+                section_id
+            ):
                 for list_item_id in self._list_store[repeating_list]:
                     section_key = SectionKey(section_id, list_item_id)
                     yield section_key

app/views/contexts/list_context.py

@@ -42,7 +42,7 @@ def __call__(
             "list": {
                 "list_items": list_items,
                 "editable": any([edit_block_id, remove_block_id]),
-            }
+            },
         }
 
     # pylint: disable=too-many-locals

app/views/contexts/section_summary_context.py

@@ -9,12 +9,12 @@
     ProgressStore,
     SupplementaryDataStore,
 )
-from app.questionnaire import QuestionnaireSchema
+from app.questionnaire import Location, QuestionnaireSchema
+from app.questionnaire.questionnaire_schema import LIST_COLLECTORS_WITH_REPEATING_BLOCKS
 from app.questionnaire.routing_path import RoutingPath
 from app.utilities import safe_content
 
 from ...data_models.metadata_proxy import MetadataProxy
-from ...utilities.types import LocationType
 from .context import Context
 from .summary import Group
 from .summary.list_collector_block import ListCollectorBlock
@@ -31,7 +31,7 @@ def __init__(
         metadata: Optional[MetadataProxy],
         response_metadata: MutableMapping,
         routing_path: RoutingPath,
-        current_location: LocationType,
+        current_location: Location,
         supplementary_data_store: SupplementaryDataStore,
     ) -> None:
         super().__init__(
@@ -212,7 +212,7 @@ def _get_refactored_groups(original_groups: dict) -> list[dict[str, Any]]:
             non_list_collector_blocks: list[dict[str, str]] = []
             list_collector_blocks: list[dict[str, str]] = []
             for block in group["blocks"]:
-                if block["type"] == "ListCollector":
+                if block["type"] in LIST_COLLECTORS_WITH_REPEATING_BLOCKS:
                     # if list collector block encountered, close the previously started non list collector blocks list if exists
                     if non_list_collector_blocks:
                         previously_started_group = {

app/views/contexts/summary/group.py

@@ -1,4 +1,4 @@
-from typing import Iterable, Mapping, MutableMapping
+from typing import Iterable, Mapping, MutableMapping, Type
 
 from werkzeug.datastructures import ImmutableDict
 
@@ -11,11 +11,18 @@
 from app.data_models.metadata_proxy import MetadataProxy
 from app.questionnaire import QuestionnaireSchema
 from app.questionnaire.placeholder_renderer import PlaceholderRenderer
+from app.questionnaire.questionnaire_schema import (
+    LIST_COLLECTORS_WITH_REPEATING_BLOCKS,
+    is_list_collector_block_editable,
+)
 from app.survey_config.link import Link
 from app.utilities.types import LocationType
 from app.views.contexts.summary.block import Block
 from app.views.contexts.summary.calculated_summary_block import CalculatedSummaryBlock
 from app.views.contexts.summary.list_collector_block import ListCollectorBlock
+from app.views.contexts.summary.list_collector_content_block import (
+    ListCollectorContentBlock,
+)
 
 
 class Group:
@@ -107,7 +114,18 @@ def _build_blocks_and_links(
                 if parent_list_collector_block_id not in routing_path_block_ids:
                     continue
 
-                list_collector_block = ListCollectorBlock(
+                list_collector_block_class: Type[
+                    ListCollectorBlock | ListCollectorContentBlock
+                ] = (
+                    ListCollectorBlock
+                    if is_list_collector_block_editable(
+                        # Type ignore: return types differ
+                        schema.get_block(parent_list_collector_block_id)  # type: ignore
+                    )
+                    else ListCollectorContentBlock
+                )
+
+                list_collector_block = list_collector_block_class(
                     routing_path_block_ids=routing_path_block_ids,
                     answer_store=answer_store,
                     list_store=list_store,
@@ -174,7 +192,7 @@ def _build_blocks_and_links(
                     ]
                 )
 
-            elif block["type"] == "ListCollector":
+            elif block["type"] in LIST_COLLECTORS_WITH_REPEATING_BLOCKS:
                 section: ImmutableDict | None = schema.get_section(location.section_id)
 
                 summary_item: ImmutableDict | None
@@ -183,7 +201,12 @@ def _build_blocks_and_links(
                     section_id=section["id"],  # type: ignore
                     list_name=block["for_list"],
                 ):
-                    list_collector_block = ListCollectorBlock(
+                    list_collector_block_class = (
+                        ListCollectorBlock
+                        if is_list_collector_block_editable(block)
+                        else ListCollectorContentBlock
+                    )
+                    list_collector_block = list_collector_block_class(
                         routing_path_block_ids=routing_path_block_ids,
                         answer_store=answer_store,
                         list_store=list_store,
@@ -195,14 +218,17 @@ def _build_blocks_and_links(
                         language=language,
                         return_to=return_to,
                         supplementary_data_store=supplementary_data_store,
+                        return_to_block_id=return_to_block_id,
                     )
-
                     list_summary_element = list_collector_block.list_summary_element(
                         summary_item
                     )
                     blocks.extend([list_summary_element])
 
-                    if not view_submitted_response:
+                    if (
+                        not view_submitted_response
+                        and is_list_collector_block_editable(block)
+                    ):
                         self.links["add_link"] = Link(
                             target="_self",
                             text=list_summary_element["add_link_text"],