feat: UT non-strategic publishing (UTCC, UTLC, UTAAC) #425

.yarnrc.yml

@@ -4,3 +4,13 @@ npmScopes:
   hmcts-cft:
     npmRegistryServer: "https://pkgs.dev.azure.com/hmcts/Artifacts/_packaging/hmcts-lib/npm/registry/"
     npmAlwaysAuth: true
+
+supportedArchitectures:
+  os:
+    - current
+    - darwin
+    - linux
+  cpu:
+    - current
+    - arm64
+    - x64

apps/postgres/prisma.config.ts

@@ -4,7 +4,7 @@ import { defineConfig, env } from "prisma/config";
 
 if (process.env.POSTGRES_HOST && process.env.POSTGRES_USER && process.env.POSTGRES_PASSWORD && process.env.POSTGRES_PORT && process.env.POSTGRES_DATABASE) {
   const { POSTGRES_HOST, POSTGRES_USER, POSTGRES_PASSWORD, POSTGRES_PORT, POSTGRES_DATABASE } = process.env;
-  process.env.DATABASE_URL = `postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DATABASE}?sslmode=require`;
+  process.env.DATABASE_URL = `postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DATABASE}?sslmode=require&connect_timeout=10`;
 }
 
 process.env.DATABASE_URL ??= "postgresql://hmcts@localhost:5433/postgres";

apps/postgres/prisma/migrations/20260707090002/migration.sql

@@ -0,0 +1,10 @@
+-- AddForeignKey
+DO $$ BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM information_schema.table_constraints
+    WHERE constraint_name = 'artefact_list_type_id_fkey'
+    AND table_name = 'artefact'
+  ) THEN
+    ALTER TABLE "artefact" ADD CONSTRAINT "artefact_list_type_id_fkey" FOREIGN KEY ("list_type_id") REFERENCES "list_types"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+  END IF;
+END $$;

apps/postgres/prisma/seed.ts

@@ -40,25 +40,26 @@ async function seedReferenceData() {
       });
     }
     console.log(`Seeded ${locationData.jurisdictions.length} jurisdictions`);
-
-    console.log("Seeding sub-jurisdictions...");
-    for (const subJurisdiction of locationData.subJurisdictions) {
-      await prisma.subJurisdiction.upsert({
-        where: { subJurisdictionId: subJurisdiction.subJurisdictionId },
-        create: {
-          subJurisdictionId: subJurisdiction.subJurisdictionId,
-          name: subJurisdiction.name,
-          welshName: subJurisdiction.welshName,
-          jurisdictionId: subJurisdiction.jurisdictionId
-        },
-        update: { name: subJurisdiction.name, welshName: subJurisdiction.welshName, jurisdictionId: subJurisdiction.jurisdictionId }
-      });
-    }
-    console.log(`Seeded ${locationData.subJurisdictions.length} sub-jurisdictions`);
   } else {
     console.log("Skipping location seed: tables already contain data");
   }
 
+  // Always upsert sub-jurisdictions to pick up new entries
+  console.log("Seeding sub-jurisdictions...");
+  for (const subJurisdiction of locationData.subJurisdictions) {
+    await prisma.subJurisdiction.upsert({
+      where: { subJurisdictionId: subJurisdiction.subJurisdictionId },
+      create: {
+        subJurisdictionId: subJurisdiction.subJurisdictionId,
+        name: subJurisdiction.name,
+        welshName: subJurisdiction.welshName,
+        jurisdictionId: subJurisdiction.jurisdictionId
+      },
+      update: { name: subJurisdiction.name, welshName: subJurisdiction.welshName, jurisdictionId: subJurisdiction.jurisdictionId }
+    });
+  }
+  console.log(`Seeded ${locationData.subJurisdictions.length} sub-jurisdictions`);
+
   // Always run list type seeding to pick up new entries
   console.log("Seeding list types...");
   const allSubJurisdictions = await prisma.subJurisdiction.findMany();
@@ -222,6 +223,7 @@ async function main() {
   console.log("Starting seed...");
   await seedReferenceData();
   await seedTestData();
+
   console.log("Seed completed successfully!");
 }
 

apps/postgres/start.sh

@@ -10,13 +10,10 @@ if [ -d "/mnt/secrets" ]; then
     if [ -d "$vault_dir" ]; then
       for secret in "$vault_dir"*; do
         name=$(basename "$secret")
-        # Skip CSI driver internal entries (start with ..)
         case "$name" in
           ..*) continue ;;
         esac
-        # Check for regular file or symlink pointing to a file
         if [ -f "$secret" ] || [ -L "$secret" ]; then
-          # Verify it's not a symlink to a directory
           if [ ! -d "$secret" ]; then
             value=$(cat "$secret")
             export "$name"="$value"
@@ -30,24 +27,22 @@ fi
 
 echo "Resolving any failed migrations..."
 printf "UPDATE _prisma_migrations SET rolled_back_at = NOW() WHERE finished_at IS NULL AND rolled_back_at IS NULL AND started_at IS NOT NULL;" | \
-  npx prisma db execute --stdin --config=./prisma.config.ts 2>/dev/null || true
+  npx --ignore-scripts prisma db execute --stdin --config=./prisma.config.ts 2>/dev/null || true
+
+echo "Clearing stale migration records for removed migrations..."
+printf "DELETE FROM _prisma_migrations WHERE migration_name IN ('20260527140208', '20260528115459_add_third_party_push_log');" | \
+  npx --ignore-scripts prisma db execute --stdin --config=./prisma.config.ts 2>/dev/null || true
 
 echo "Running database migrations..."
-npx prisma migrate deploy --config=./prisma.config.ts
-
-if [ $? -eq 0 ]; then
-  echo "Migrations completed successfully"
-  echo "Starting health proxy on port 5555..."
-  node health-server.mjs &
-  HEALTH_PID=$!
-
-  echo "Starting Prisma Studio on port 5556..."
-  npx prisma studio --config=./prisma.config.ts --port 5556 --browser none &
-  STUDIO_PID=$!
-
-  # Wait for both processes
-  wait $HEALTH_PID $STUDIO_PID
-else
-  echo "Migration failed, exiting..."
-  exit 1
-fi
+npx --ignore-scripts prisma migrate deploy --config=./prisma.config.ts
+
+echo "Migrations completed successfully"
+echo "Starting health proxy on port 5555..."
+node health-server.mjs &
+HEALTH_PID=$!
+
+echo "Starting Prisma Studio on port 5556..."
+npx --ignore-scripts prisma studio --config=./prisma.config.ts --port 5556 --browser none &
+STUDIO_PID=$!
+
+wait $HEALTH_PID $STUDIO_PID

apps/web/package.json

@@ -46,6 +46,9 @@
     "@hmcts/subscriptions": "workspace:*",
     "@hmcts/system-admin-pages": "workspace:*",
     "@hmcts/test-support": "workspace:*",
+    "@hmcts/upper-tribunal-administrative-appeals-chamber-daily-hearing-list": "workspace:*",
+    "@hmcts/upper-tribunal-lands-chamber-daily-hearing-list": "workspace:*",
+    "@hmcts/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list": "workspace:*",
     "@hmcts/web-core": "workspace:*",
     "compression": "1.8.1",
     "config": "4.4.2",

apps/web/src/app.test.ts

@@ -73,6 +73,18 @@ vi.mock("@hmcts/care-standards-tribunal-weekly-hearing-list/config", () => ({
   pageRoutes: { path: "/mock/care-standards-tribunal/pages" }
 }));
 
+vi.mock("@hmcts/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/config", () => ({
+  moduleRoot: "/mock/utcc"
+}));
+
+vi.mock("@hmcts/upper-tribunal-lands-chamber-daily-hearing-list/config", () => ({
+  moduleRoot: "/mock/utlc"
+}));
+
+vi.mock("@hmcts/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/config", () => ({
+  moduleRoot: "/mock/utaac"
+}));
+
 vi.mock("@hmcts/civil-and-family-daily-cause-list/config", () => ({
   moduleRoot: "/mock/civil-family",
   pageRoutes: { path: "/mock/civil-family/pages" }

apps/web/src/app.ts

@@ -37,6 +37,9 @@ import {
   moduleRoot as systemAdminModuleRoot,
   pages as systemAdminPages
 } from "@hmcts/system-admin-pages/config";
+import { moduleRoot as utaacModuleRoot } from "@hmcts/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/config";
+import { moduleRoot as utlcModuleRoot } from "@hmcts/upper-tribunal-lands-chamber-daily-hearing-list/config";
+import { moduleRoot as utccModuleRoot } from "@hmcts/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/config";
 import { moduleRoot as utiacJrModuleRoot } from "@hmcts/utiac-jr-daily-hearing-list/config";
 import { moduleRoot as utiacStatutoryAppealModuleRoot } from "@hmcts/utiac-statutory-appeal-daily-hearing-list/config";
 import {
@@ -115,6 +118,9 @@ export async function createApp(): Promise<Express> {
     fttTaxChamberModuleRoot,
     fttLrtModuleRoot,
     fttRptModuleRoot,
+    utccModuleRoot,
+    utlcModuleRoot,
+    utaacModuleRoot,
     civilFamilyCauseListModuleRoot,
     civilDailyCauseListModuleRoot,
     familyDailyCauseListModuleRoot,

apps/web/src/pages/(admin)/non-strategic-upload-summary/cy.ts

@@ -1,14 +1,14 @@
 export const cy = {
-  pageTitle: "[Welsh] Non-strategic upload - File upload summary - Court and tribunal hearings - GOV.UK",
-  heading: "[Welsh] File upload summary",
-  subHeading: "[Welsh] Check upload details",
-  courtName: "[Welsh] Court name",
-  file: "[Welsh] File",
-  listType: "[Welsh] List type",
-  hearingStartDate: "[Welsh] Hearing start date",
-  sensitivity: "[Welsh] Sensitivity",
-  language: "[Welsh] Language",
-  displayFileDates: "[Welsh] Display file dates",
-  change: "[Welsh] Change",
-  confirmButton: "[Welsh] Confirm"
+  pageTitle: "Llwytho i fyny â llaw - Crynodeb lanlwytho ffeil - Gwrandawiadau llys a thribiwnlys - GOV.UK",
+  heading: "Crynodeb lanlwytho ffeil",
+  subHeading: "Gwirio manylion lanlwytho",
+  courtName: "Enw'r llys",
+  file: "Ffeil",
+  listType: "Math o restr",
+  hearingStartDate: "Dyddiad cychwyn y gwrandawiad",
+  sensitivity: "Sensitifrwydd",
+  language: "Iaith",
+  displayFileDates: "Dangos dyddiadau ffeil",
+  change: "Newid",
+  confirmButton: "Cadarnhau"
 };

apps/web/src/pages/(admin)/non-strategic-upload/cy.ts

@@ -1,60 +1,60 @@
 export const cy = {
-  title: "[Welsh] Upload Excel file",
-  pageTitle: "[Welsh] Upload - Upload Excel file",
-  warningTitle: "[Welsh] Warning",
-  warningMessage:
-    "[Welsh] Prior to upload you must ensure the file is suitable for publication e.g. redaction of personal data has been done during the production of this file.",
-  fileUploadLabel: "[Welsh] Manually upload an Excel file (.xlsx), max size 2MB",
-  courtLabel: "[Welsh] Court name or Tribunal name",
-  listTypeLabel: "[Welsh] List type",
-  listTypePlaceholder: "[Welsh] Please choose a list type",
-  hearingStartDateLabel: "[Welsh] Hearing start date",
-  hearingStartDateHint: "[Welsh] For example, 16 01 2022",
-  sensitivityLabel: "[Welsh] Sensitivity",
-  languageLabel: "[Welsh] Language",
-  displayFromLabel: "[Welsh] Display file from",
-  displayFromHint: "[Welsh] For example, 27 01 2022",
-  displayToLabel: "[Welsh] Display file to",
-  displayToHint: "[Welsh] For example, 18 02 2022",
-  continueButton: "[Welsh] Continue",
-  errorSummaryTitle: "[Welsh] There is a problem",
-  pageHelpTitle: "[Welsh] Page help",
-  pageHelpLists: "[Welsh] Lists",
+  title: "Llwytho â llaw",
+  pageTitle: "Llwytho - Llwytho â llaw",
+  warningTitle: "Rhybudd",
+  warningMessage: "Cyn llwytho rhaid i chi sicrhau bod y ffeil yn addas i'w chyhoeddi e.e. bod data personol wedi'i olygu yn ystod cynhyrchu'r ffeil hon.",
+  fileUploadLabel: "Llwytho ffeil Excel (.xlsx) â llaw, uchafswm maint 2MB",
+  courtLabel: "Enw'r llys neu enw'r tribiwnlys",
+  listTypeLabel: "Math o restr",
+  listTypePlaceholder: "Dewiswch fath o restr",
+  hearingStartDateLabel: "Dyddiad dechrau'r gwrandawiad",
+  hearingStartDateHint: "Er enghraifft, 16 01 2022",
+  sensitivityLabel: "Sensitifrwydd",
+  languageLabel: "Iaith",
+  displayFromLabel: "Dangos y ffeil o",
+  displayFromHint: "Er enghraifft, 27 01 2022",
+  displayToLabel: "Dangos y ffeil tan",
+  displayToHint: "Er enghraifft, 18 02 2022",
+  continueButton: "Parhau",
+  errorSummaryTitle: "Mae yna broblem",
+  pageHelpTitle: "Cymorth tudalen",
+  pageHelpLists: "Rhestrau",
   pageHelpListsText:
-    "[Welsh] You must ensure that you only upload one file that contains all hearings for the Court or Tribunal name and List type. This should include all judges and court rooms in one document.",
-  pageHelpSensitivity: "[Welsh] Sensitivity",
-  pageHelpSensitivityText: "[Welsh] You need to indicate which user group your document should be available to:",
-  pageHelpSensitivityPublic: "[Welsh] Public",
-  pageHelpSensitivityPublicText: "[Welsh] Publication available to all users.",
-  pageHelpSensitivityPrivate: "[Welsh] Private",
-  pageHelpSensitivityPrivateText: "[Welsh] Publication available to all verified users e.g. Legal professionals and media.",
-  pageHelpSensitivityClassified: "[Welsh] Classified",
+    "Rhaid i chi sicrhau eich bod chi ond yn llwytho un ffeil sy'n cynnwys yr holl wrandawiadau ar gyfer enw'r Llys neu'r Tribiwnlys a'r math o restr. Dylai hyn gynnwys pob barnwr ac ystafell lys mewn un ddogfen.",
+  pageHelpSensitivity: "Sensitifrwydd",
+  pageHelpSensitivityText: "Mae angen i chi nodi pa grŵp defnyddwyr y dylai eich dogfen fod ar gael iddynt:",
+  pageHelpSensitivityPublic: "Cyhoeddus",
+  pageHelpSensitivityPublicText: "Cyhoeddiad ar gael i bob defnyddiwr.",
+  pageHelpSensitivityPrivate: "Preifat",
+  pageHelpSensitivityPrivateText: "Cyhoeddiad ar gael i bob defnyddiwr wedi'u dilysu e.e. Gweithwyr proffesiynol cyfreithiol a'r cyfryngau.",
+  pageHelpSensitivityClassified: "Dosbarthedig",
   pageHelpSensitivityClassifiedText:
-    "[Welsh] Publication only available to verified users who are in a group eligible to view that list e.g. SJP press list available to Media.",
-  pageHelpDisplayFrom: "[Welsh] Display from",
-  pageHelpDisplayFromText: "[Welsh] This will be the date the publication is available from … displayed immediately if today's date is used.",
-  pageHelpDisplayTo: "[Welsh] Display to",
-  pageHelpDisplayToText: "[Welsh] This will be the last date the publication is available. It will be displayed until 23:59 of that date.",
-  dayLabel: "[Welsh] Day",
-  monthLabel: "[Welsh] Month",
-  yearLabel: "[Welsh] Year",
-  backToTop: "[Welsh] Back to top",
+    "Cyhoeddiad ar gael i ddefnyddwyr wedi'u dilysu sydd mewn grŵp sy'n gymwys i weld y rhestr honno e.e. Rhestr y wasg SJP ar gael i'r Cyfryngau",
+  pageHelpDisplayFrom: "Dangos o",
+  pageHelpDisplayFromText:
+    "Hwn fydd y dyddiad y bydd y cyhoeddiad ar gael ohono, os defnyddir dyddiad heddiw bydd yn cael ei ddangos ar unwaith. Os defnyddir dyddiad yn y dyfodol, bydd yn cael ei ddangos o 00:01 ar y dyddiad hwnnw.",
+  pageHelpDisplayTo: "Dangos tan",
+  pageHelpDisplayToText: "Hwn fydd y dyddiad olaf y bydd y cyhoeddiad ar gael. Bydd yn cael ei ddangos tan 23:59 ar y dyddiad hwnnw.",
+  dayLabel: "Diwrnod",
+  monthLabel: "Mis",
+  yearLabel: "Blwyddyn",
+  backToTop: "Nôl i'r brig",
 
   errorMessages: {
-    fileRequired: "[Welsh] Please provide a file",
-    fileType: "[Welsh] The selected file type is not supported",
-    fileSize: "[Welsh] The selected file must be smaller than 2MB",
-    courtRequired: "[Welsh] Please enter and select a valid court",
-    courtTooShort: "[Welsh] Court name must be three characters or more",
-    listTypeRequired: "[Welsh] Please select a list type",
-    hearingStartDateRequired: "[Welsh] Please enter a valid hearing start date",
-    hearingStartDateInvalid: "[Welsh] Please enter a valid hearing start date",
-    sensitivityRequired: "[Welsh] Please select a sensitivity",
-    languageRequired: "[Welsh] Select a language option",
-    displayFromRequired: "[Welsh] Please enter a valid display file from date",
-    displayFromInvalid: "[Welsh] Please enter a valid display file from date",
-    displayToRequired: "[Welsh] Please enter a valid display file to date",
-    displayToInvalid: "[Welsh] Please enter a valid display file to date",
-    displayToBeforeFrom: "[Welsh] 'Display to' date must be the same as or later than 'Display from' date"
+    fileRequired: "Darparwch ffeil",
+    fileType: "Llwythwch fformat ffeil dilys",
+    fileSize: "Ffeil yn rhy fawr, llwythwch ffeil yn llai na 2MB",
+    courtRequired: "Rhowch a dewiswch lys dilys",
+    courtTooShort: "Rhaid i enw'r llys fod yn dri chymeriad neu fwy",
+    listTypeRequired: "Dewiswch fath o restr",
+    hearingStartDateRequired: "Rhowch ddyddiad dechrau gwrandawiad dilys",
+    hearingStartDateInvalid: "Rhowch ddyddiad dechrau gwrandawiad dilys",
+    sensitivityRequired: "Dewiswch lefel sensitifrwydd",
+    languageRequired: "Dewiswch iaith",
+    displayFromRequired: "Rhowch ddyddiad dangos y ffeil o dilys",
+    displayFromInvalid: "Rhowch ddyddiad dangos y ffeil o dilys",
+    displayToRequired: "Rhowch ddyddiad dangos y ffeil tan dilys",
+    displayToInvalid: "Rhowch ddyddiad dangos y ffeil tan dilys",
+    displayToBeforeFrom: "Rhaid i'r dyddiad dangos tan fod ar ôl y dyddiad dangos o"
   }
 };

apps/web/src/pages/(admin)/non-strategic-upload/index.njk

@@ -43,7 +43,7 @@
 
     <h1 class="govuk-heading-xl">{{ title }}</h1>
 
-    <form method="post" enctype="multipart/form-data" novalidate>
+    <form method="post" enctype="multipart/form-data" novalidate data-list-type-sensitivity="{{ listTypeSensitivityMap }}">
 
       {% set fileErrorText = getError(errors, "#file") %}
       <div class="govuk-inset-text">