Merge branch 'main' into task/CDD-2983-reject-validation-with-missing-is-public-with-override-option

Author: kathryn-dale

.pre-commit-config.yaml

@@ -0,0 +1,5 @@
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.18.1
+    hooks:
+      - id: gitleaks

README.md

@@ -244,9 +244,49 @@ You can check for known vulnerabilities in the codebase with the following comma
 ```bash
 uhd security vulnerabilities
 ```
+---
+
+---
+
+### Pre-commit Hooks
+
+This repository uses **pre-commit** to automatically scan for hardcoded secrets before allowing commits.
+
+We recommend using **prek**, a faster drop-in replacement for pre-commit. It works with the existing configuration and requires no changes to the config files.
 
 ---
 
+#### Setup (one-time)
+
+1. Install `uv` (if not already installed)
+
+On macOS:
+
+```bash
+brew install uv
+```
+
+2. Install `prek` globally:
+
+```bash
+uv tool install prek
+```
+
+3. Install Git Hooks(required)
+
+Run this once per repository
+```bash
+prek install
+```
+This install the git hooks so secret scanning runs automatically before every commit
+
+4. Run Manually(Optional)
+
+To scan all files manually
+```bash
+prek run --all-files
+```
+
 ### Architectural constraints check
 
 We use the `import-linter` package to enforce architectural constraints across the codebase.

cms/dashboard/templates/cms_starting_pages/health_topics_page.json

@@ -0,0 +1,31 @@
+{
+  "id": 83,
+  "meta": {
+    "seo_title": "Health topics",
+    "search_description": "",
+    "type": "topics_list.TopicsListPage",
+    "detail_url": "https://http:/api/pages/83/",
+    "html_url": "https://http://localhost:3000/health-topics/",
+    "slug": "health-topics",
+    "show_in_menus": false,
+    "first_published_at": "2026-02-16T16:00:23.483810Z",
+    "alias_of": null,
+    "parent": {
+      "id": 3,
+      "meta": {
+        "type": "home.UKHSARootPage",
+        "detail_url": "https://http:/api/pages/3/",
+        "html_url": null
+      },
+      "title": "UKHSA Dashboard Root"
+    }
+  },
+  "title": "health topics",
+  "body": "",
+  "seo_change_frequency": 5,
+  "seo_priority": "0.5",
+  "last_updated_at": "2026-02-16T16:00:23.483810Z",
+  "last_published_at": "2026-02-16T16:00:23.483810Z",
+  "active_announcements": [],
+  "page_description": "<p data-block-key=\"onu6j\">The UKHSA data dashboard shares public health data in a simple, inclusive and accessible way.</p>"
+}

cms/metrics_documentation/migrations/0013_alter_metricsdocumentationchildentry_is_public.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.11 on 2026-02-23 12:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metrics_documentation", "0012_metricsdocumentationchildentry_is_public"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="metricsdocumentationchildentry",
+            name="is_public",
+            field=models.BooleanField(default=False, verbose_name="enable public page"),
+        ),
+    ]

cms/topic/migrations/0026_alter_topicpage_is_public.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.11 on 2026-02-23 12:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("topic", "0025_topicpage_is_public"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="topicpage",
+            name="is_public",
+            field=models.BooleanField(default=False, verbose_name="enable public page"),
+        ),
+    ]

cms/topics_list/__init__.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class TopicsListConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "cms.topics_list"

cms/topics_list/apps.py

@@ -0,0 +1,42 @@
+"""
+This file contains the custom QuerySet and Manager classes associated with the `TopicsList` model.
+
+Note that the application layer should only call into the `Manager` class.
+The application should not interact directly with the `QuerySet` class.
+"""
+
+from django.db import models
+from wagtail.models import PageManager
+from wagtail.query import PageQuerySet
+
+EXPECTED_TOPICS_LIST_PAGE_SLUG = "health-topics"
+
+
+class TopicsListPageQuerySet(PageQuerySet):
+    """Custom queryset for which can be used by the `TopicsListPageManager`."""
+
+    def get_topics_list_page(self) -> models.QuerySet:
+        """Gets the designated health-topics page.
+
+        Returns:
+            QuerySet: A queryset of the individual topics_list page.
+                Examples:
+                    `<TopicsListPageQuerySet [<TopicsListPage: Health Topics>, ... ]`
+        """
+        return self.filter(slug=EXPECTED_TOPICS_LIST_PAGE_SLUG)
+
+
+class TopicsListPageManager(PageManager):
+    """Custom model manager class for the `TopicsListPageManager`."""
+
+    def get_queryset(self) -> TopicsListPageQuerySet:
+        return TopicsListPageQuerySet(self.model, using=self._db)
+
+    def get_topics_list_page(self):
+        """Gets the designated health topics page.
+
+        Returns:
+            The designated topics list page object
+            which has the slug of `health-topics`
+        """
+        return self.get_queryset().get_topics_list_page().last()