Merge branch 'main' into DTOSS-11864-snagging-updates

Author: cameronhargreaves1-nhs

.github/dependabot.yaml

@@ -49,7 +49,8 @@ updates:
           - 'eslint'
           - 'eslint-*'
           - 'prettier'
-          - 'typescript'
+          - 'typescript*'
+          - '@types/*'
 
       test:
         patterns:

.gitleaksignore

@@ -23,3 +23,5 @@ infrastructure/terraform/resource_group_init/storage.bicep:generic-api-key:59
 infrastructure/terraform/resource_group_init/keyVault.bicep:generic-api-key:10
 manage_breast_screening/config/settings_test.py:private-key:34
 manage_breast_screening/config/settings_test.py:public-key:61
+manage_breast_screening/config/.env.tpl:generic-api-key:36
+manage_breast_screening/config/.env.tpl:generic-api-key:42

.tool-versions

@@ -1,10 +1,8 @@
+nodejs 24.11.0
 pre-commit 3.6.0
 python 3.14.0
-nodejs 24.11.0
-uv 0.9.7
-# TODO: can we switch all these docker scripts to github actions instead? Or at least something that
-# will be maintained by Dependabot?
-# docker/ghcr.io/gitleaks/gitleaks v8.18.0@sha256:fd2b5cab12b563d2cc538b14631764a1c25577780e3b7dba71657d58da45d9d9 # SEE: https://github.com/gitleaks/gitleaks/pkgs/container/gitleaks
-# docker/ghcr.io/anchore/grype v0.87.0@sha256:7638bec6a2a2b570588bb96e5e9632ef37f5556e92d126eb1a9542a76f71471c # SEE: https://github.com/anchore/grype/pkgs/container/grype
-# docker/ghcr.io/anchore/syft v0.92.0@sha256:63c60f0a21efb13e80aa1359ab243e49213b6cc2d7e0f8179da38e6913b997e0 # SEE: https://github.com/anchore/syft/pkgs/container/syft
 terraform 1.7.0
+uv 0.9.7
+# docker/ghcr.io/gitleaks/gitleaks v8.30.0@sha256:691af3c7c5a48b16f187ce3446d5f194838f91238f27270ed36eef6359a574d9 # SEE: https://github.com/gitleaks/gitleaks/pkgs/container/gitleaks
+# docker/ghcr.io/anchore/grype v0.104.2@sha256:7416f2fada8bd8f99095d955a6fed700b714b51ceb8150f838920932954b04aa # SEE: https://github.com/anchore/grype/pkgs/container/grype
+# docker/ghcr.io/anchore/syft v1.38.2@sha256:63a159108794114992136692c92155c7694f259aca814a92c187a4e025754b00 # SEE: https://github.com/anchore/syft/pkgs/container/syft

infrastructure/environments/review/variables.tfvars

@@ -9,4 +9,3 @@ protect_keyvault                      = false
 vnet_address_space                    = "10.142.0.0/16"
 deploy_database_as_container          = true
 seed_demo_data                        = true
-nhs_notify_api_message_batch_url      = "https://int.api.service.nhs.uk/comms/v1/message-batches"

infrastructure/modules/container-apps/variables.tf

@@ -94,12 +94,6 @@ variable "deploy_database_as_container" {
   type        = bool
 }
 
-variable "nhs_notify_api_message_batch_url" {
-  description = "The API endpoint URL used to send message batches to NHS Notify"
-  type        = string
-  default     = null
-}
-
 variable "postgres_backup_retention_days" {
   description = "The number of days to retain backups for the PostgreSQL Flexible Server."
   type        = number

infrastructure/terraform/main.tf

@@ -76,7 +76,6 @@ module "container-apps" {
   infra_key_vault_name                  = local.infra_key_vault_name
   infra_key_vault_rg                    = local.infra_key_vault_rg
   api_oauth_token_url                   = var.api_oauth_token_url
-  nhs_notify_api_message_batch_url      = var.nhs_notify_api_message_batch_url
   target_url                            = var.deploy_container_apps ? "${module.container-apps[0].external_url}healthcheck" : null
   resource_group_name_infra             = local.resource_group_name
   enable_notifications_jobs_schedule    = var.enable_notifications_jobs_schedule

infrastructure/terraform/variables.tf

@@ -173,11 +173,6 @@ variable "api_oauth_token_url" {
   type        = string
 }
 
-variable "nhs_notify_api_message_batch_url" {
-  description = "NHS Notify API endpoint URL for making message batch requests"
-  type        = string
-}
-
 variable "enable_notifications_jobs_schedule" {
   description = "Whether we apply the cron schedules for the notifications container app jobs"
   type        = bool

manage_breast_screening/assets/sass/components/_nested-info.scss

@@ -0,0 +1,125 @@
+/**
+This component renders a block of complex information using headings and subheadings.
+It looks the same as the summaryList component in the design system, but doesn't use a dl.
+
+Use it to display data that:
+
+- is differently shaped depending on the key
+- has up to 2 dimensions
+
+Example with a 2 column grid:
+
+*Key*     *Subkey 1*  *Subkey 2*
+          Data item   Data item
+
+          *Subkey 3*
+          Data item
+---------------------------------
+
+On a narrow screen / high zoom, this collapses to a vertical layout just like
+the summaryList component does.
+**/
+
+@use "../vendor/nhsuk-frontend/base" as *;
+
+.app-nested-info {
+  margin: 0; // Reset default user agent styles
+
+  @include nhsuk-font($size: 19);
+  @include nhsuk-responsive-margin(6, "bottom");
+
+  @include nhsuk-media-query($from: tablet) {
+    display: table;
+    width: 100%;
+    table-layout: fixed; // Required to allow us to wrap words that overflow.
+    border-collapse: collapse;
+  }
+}
+
+.app-nested-info__row {
+  border-bottom: 1px solid $nhsuk-border-colour;
+
+  @include nhsuk-media-query($until: tablet) {
+    margin-bottom: nhsuk-spacing(3);
+  }
+  @include nhsuk-media-query($from: tablet) {
+    display: table-row;
+  }
+}
+
+.app-nested-info__key,
+.app-nested-info__value {
+  box-sizing: border-box;
+  margin: 0; // Reset default user agent styles
+  vertical-align: top;
+
+  @include nhsuk-media-query($from: tablet) {
+    display: table-cell;
+    padding-top: nhsuk-spacing(2);
+    padding-right: nhsuk-spacing(4);
+    padding-bottom: nhsuk-spacing(2);
+  }
+}
+
+.app-nested-info__key,
+.app-nested-info__value {
+  // Automatic wrapping for unbreakable text (e.g. URLs)
+  @include nhsuk-text-break-word;
+}
+
+.app-nested-info__key {
+  margin-bottom: nhsuk-spacing(1);
+
+  @include nhsuk-typography-weight-bold;
+
+  @include nhsuk-media-query($from: tablet) {
+    width: 30%;
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    margin-bottom: 0;
+  }
+}
+
+.app-nested-info__value {
+  @include nhsuk-media-query($until: tablet) {
+    margin-bottom: nhsuk-spacing(3);
+  }
+}
+
+.app-nested-info__value > :last-child {
+  margin-bottom: 0;
+}
+
+// Remove the usual margin from paragraphs and lists, where it touches the border of the grid
+// leaving only the spacing from the .app-nested-info__value
+.app-nested-info__subvalue_row:last-child > .app-nested-info__subvalue > ul:last-child,
+.app-nested-info__subvalue_row:last-child > .app-nested-info__subvalue > p:last-child {
+  @include nhsuk-media-query($from: tablet) {
+    margin-bottom: 0;
+  }
+}
+
+// No border on specific rows
+.app-nested-info__row--no-border {
+  border: 0;
+
+  // Increase padding by 1px to compensate for 'missing' border
+  @include nhsuk-media-query($from: tablet) {
+    .app-nested-info__key,
+    .app-nested-info__value {
+      padding-bottom: nhsuk-spacing(2) + 1px;
+    }
+  }
+}
+
+.nhsuk-card__content {
+  .app-nested-info:last-child .app-nested-info__row:last-of-type {
+    margin-bottom: 0;
+  }
+}

manage_breast_screening/assets/sass/main.scss

@@ -8,6 +8,7 @@
 @forward "components/appointment-status";
 @forward "components/secondary-navigation";
 @forward "components/special-appointment-banner";
+@forward "components/nested-info";
 
 $color_app-dark-blue: #00386e;
 

manage_breast_screening/clinics/models.py

@@ -4,6 +4,7 @@
 
 from django.conf import settings
 from django.contrib.postgres.fields import ArrayField
+from django.core.exceptions import ValidationError
 from django.core.validators import MinLengthValidator
 from django.db import models
 from django.db.models import OuterRef, Subquery
@@ -193,6 +194,12 @@ def __str__(self):
             self.clinic.setting.name + " " + self.starts_at.strftime("%Y-%m-%d %H:%M")
         )
 
+    def clean(self):
+        if self.starts_at.date() != self.clinic.starts_at.date():
+            raise ValidationError(
+                "Clinic slot must start on the same date as the clinic"
+            )
+
 
 class ClinicStatus(models.Model):
     SCHEDULED = "SCHEDULED"