Merge branch 'main' into task/CDD-3154-seed-random-data

Author: luketowell

.github/workflows/actions.yml

@@ -1,6 +1,12 @@
 name: Pipeline
 
-on: push
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - '*'
 
 env:
   APIENV: "LOCAL"
@@ -172,6 +178,23 @@ jobs:
           source uhd.sh
           uhd tests coverage
 
+  ###############################################################################
+  # Docker build check (PR validation)
+  ###############################################################################
+
+  docker-build-check:
+    name: Docker Build Check
+    needs: [build]
+    runs-on: ubuntu-22.04-arm
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build main API Docker image
+        run: docker build -t be-main-test -f Dockerfile .
+
+      - name: Build ingestion Docker image
+        run: docker build -t be-ingestion-test -f Dockerfile-ingestion .
+
   ###############################################################################
   # Build image
   ###############################################################################
@@ -187,7 +210,8 @@ jobs:
       test-coverage,
       dependency-checks,
       vulnerability-checks,
-      architecture-checks
+      architecture-checks,
+      docker-build-check
     ]
     runs-on: ubuntu-22.04-arm
     if: ${{ github.ref == 'refs/heads/main' }}
@@ -212,7 +236,8 @@ jobs:
       test-coverage,
       dependency-checks,
       vulnerability-checks,
-      architecture-checks
+      architecture-checks,
+      docker-build-check
     ]
     runs-on: ubuntu-22.04-arm
     if: ${{ github.ref == 'refs/heads/main' }}

.python-version

@@ -1 +1 @@
-3.12
+3.12.13

Dockerfile

@@ -4,7 +4,7 @@
 # Default arguments
 # This version is hardcoded but ideally it should pull from the `.python-version`
 # When bumping Python versions, we currently have to update the `.python-version` file and this `ARG`
-ARG PYTHON_VERSION=3.12.6
+ARG PYTHON_VERSION=3.12.13
 
 FROM python:${PYTHON_VERSION}-slim AS build
 
@@ -18,7 +18,7 @@ COPY requirements-prod-ingestion.txt requirements-prod-ingestion.txt
 # Main build process
 RUN apt-get update \
     # Update the database of available packages
-    && apt-get -y install libpq-dev gcc \
+    && apt-get -y install libpq-dev gcc libnss3-dev libexpat1-dev\
     # Install toolchain needed for C libraries like `psycopg2`
     && python3 -m venv /venv \
     # Create the python virtual environment
@@ -55,7 +55,7 @@ EXPOSE 8000
 # Reinstall system libraries required for PostgreSQL drivers
 RUN apt-get update \
     # Update the database of available packages
-    && apt-get -y install libpq-dev \
+    && apt-get -y install libpq-dev libnss3-dev libexpat1-dev\
     # Reinstall the C library needed for `psycopg2`
     && chmod +x entrypoint.sh
     # Add execution permission for the entrypoint shell script

cms/dynamic_content/blocks.py

@@ -1,3 +1,4 @@
+from django.core.exceptions import ValidationError
 from django.db import models
 from wagtail import blocks
 from wagtail.snippets.blocks import SnippetChooserBlock
@@ -8,6 +9,7 @@
     PercentageNumberComponent,
     TrendNumberComponent,
 )
+from validation.url import validate_https_scheme
 
 MINIMUM_ROWS_NUMBER_BLOCK_COUNT: int = 1
 MAXIMUM_ROWS_NUMBER_BLOCK_COUNT: int = 2
@@ -161,3 +163,38 @@ class RelatedLink(blocks.StructBlock):
 
 class RelatedLinkBlock(blocks.StreamBlock):
     related_link = RelatedLink()
+
+
+class SourceLinkBlock(blocks.StructBlock):
+    """Source link supporting internal (page) or external (URL) links."""
+
+    link_display_text = blocks.CharBlock(
+        required=False,
+        help_text=help_texts.SOURCE_LINK_TEXT,
+    )
+    page = PageLinkChooserBlock(
+        target_model=["topic.TopicPage"],
+        required=False,
+        help_text=help_texts.SOURCE_LINK_PAGE,
+    )
+    external_url = blocks.URLBlock(
+        required=False,
+        help_text=help_texts.SOURCE_LINK_URL,
+        validators=[validate_https_scheme],
+    )
+
+    def clean(self, value: blocks.StructValue):
+        self._validate_only_one_of_page_or_external_url(value=value)
+        return super().clean(value=value)
+
+    @classmethod
+    def _validate_only_one_of_page_or_external_url(
+        cls, *, value: blocks.StructValue
+    ) -> None:
+        """Validate that only one of the page or external_url fields is set if provided."""
+        page = value.get("page")
+        external_url = value.get("external_url")
+
+        if page and external_url:
+            error_message = "Use either page OR external_url, not both."
+            raise ValidationError(error_message)

cms/dynamic_content/cards.py

@@ -13,6 +13,7 @@
     MetricNumberBlock,
     PageLinkChooserBlock,
     RelatedLinkBlock,
+    SourceLinkBlock,
 )
 from cms.dynamic_content.components import (
     ChartComponent,
@@ -76,11 +77,19 @@ def get_alerts(cls) -> tuple[tuple[str, str]]:
 class WeatherHealthAlertsCard(blocks.StructBlock):
     title = blocks.TextBlock(required=True, help_text=help_texts.TITLE_FIELD)
     sub_title = blocks.TextBlock(required=True, help_text=help_texts.SUB_TITLE_FIELD)
+    description = blocks.TextBlock(
+        required=False,
+        help_text=help_texts.WEATHER_HEALTH_ALERT_DESCRIPTION,
+    )
     alert_type = blocks.ChoiceBlock(
         required=True,
         choices=WHAlerts.get_alerts,
         help_text=help_texts.WHA_ALERT_CHOICE,
     )
+    source = SourceLinkBlock(
+        required=False,
+        help_text=help_texts.SOURCE_LINK,
+    )
 
     class Meta:
         icon = "weather"
@@ -295,6 +304,20 @@ class Meta:
         icon = "standalone_chart"
 
 
+class ChartWithDescriptionCard(ChartCard):
+    description = blocks.TextBlock(
+        required=True,
+        help_text=help_texts.CHART_DESCRIPTION,
+    )
+    source = SourceLinkBlock(
+        required=False,
+        help_text=help_texts.SOURCE_LINK_INTERNAL_OR_EXTERNAL,
+    )
+
+    class Meta:
+        icon = "standalone_chart"
+
+
 class HeadlineChartCard(ChartCard):
     x_axis = blocks.ChoiceBlock(
         required=True,
@@ -338,6 +361,20 @@ class Meta:
         icon = "standalone_chart"
 
 
+class HeadlineChartWithDescriptionCard(HeadlineChartCard):
+    description = blocks.TextBlock(
+        required=True,
+        help_text=help_texts.HEADLINE_CHART_DESCRIPTION,
+    )
+    source = SourceLinkBlock(
+        required=False,
+        help_text=help_texts.SOURCE_LINK_INTERNAL_OR_EXTERNAL,
+    )
+
+    class Meta:
+        icon = "standalone_chart"
+
+
 class DualCategoryChartCard(blocks.StructBlock):
     title = blocks.TextBlock(required=True, help_text=help_texts.TITLE_FIELD)
     body = blocks.TextBlock(
@@ -445,7 +482,9 @@ def media(self):
 
 class ChartRowBlockTypes(blocks.StreamBlock):
     chart_card = ChartCard()
+    chart_with_description_card = ChartWithDescriptionCard()
     headline_chart_card = HeadlineChartCard()
+    headline_chart_with_description_card = HeadlineChartWithDescriptionCard()
     chart_with_headline_and_trend_card = ChartWithHeadlineAndTrendCard()
     simplified_chart_with_link = SimplifiedChartWithLink()
     dual_category_chart_card = DualCategoryChartCard()

cms/dynamic_content/help_texts.py

@@ -552,3 +552,35 @@
 An optional body of text to accompany this block.
 This text will be displayed above the metrics table if confidence intervals is enabled.
 """
+
+WEATHER_HEALTH_ALERT_DESCRIPTION: str = """
+Optional description for the weather health alerts card.
+"""
+
+SOURCE_LINK: str = """
+Optional source link.
+"""
+
+CHART_DESCRIPTION: str = """
+Required description for the chart.
+"""
+
+HEADLINE_CHART_DESCRIPTION: str = """
+Description for the headline chart.
+"""
+
+SOURCE_LINK_INTERNAL_OR_EXTERNAL: str = """
+Source link (internal or external).
+"""
+
+SOURCE_LINK_TEXT: str = """
+Display text for the link.
+"""
+
+SOURCE_LINK_PAGE: str = """
+For linking to internal pages. (If chosen, external_url must be blank).
+"""
+
+SOURCE_LINK_URL: str = """
+For linking to external url. (Only one of page or external_url must be filled not both).
+"""