@defra/forms-engine-plugin 3.0.7 → 3.0.8

package/.server/client/javascripts/file-upload.d.ts

@@ -1,5 +1,6 @@
 /**
  * Build the upload status URL given the current pathname and the upload ID.
+ * This only works when called on a file upload page that has a maximum depth of 1 URL segments following the slug.
  * @param {string} pathname – e.g. window.location.pathname
  * @param {string} uploadId
  * @returns {string} e.g. "/form/upload-status/abc123"

package/.server/client/javascripts/file-upload.js

@@ -190,13 +190,19 @@ function reloadPage() {
 
 /**
  * Build the upload status URL given the current pathname and the upload ID.
+ * This only works when called on a file upload page that has a maximum depth of 1 URL segments following the slug.
  * @param {string} pathname – e.g. window.location.pathname
  * @param {string} uploadId
  * @returns {string} e.g. "/form/upload-status/abc123"
  */
 export function buildUploadStatusUrl(pathname, uploadId) {
-  const pathSegments = pathname.split('/').filter(segment => segment);
-  const prefix = pathSegments.length > 0 ? `/${pathSegments[0]}` : '';
+  // Remove preview markers and duplicate slashes
+  const normalisedPath = pathname.replace(/\/preview\/(draft|live)/g, '').replace(/\/{2,}/g, '/').replace(/\/$/, '');
+  const segments = normalisedPath.split('/').filter(Boolean);
+
+  // The slug is always the second to last segment
+  // The prefix is everything before the slug
+  const prefix = segments.length > 2 ? `/${segments.slice(0, segments.length - 2).join('/')}` : '';
   return `${prefix}/upload-status/${uploadId}`;
 }
 

package/.server/client/javascripts/file-upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-upload.js","names":["MAX_POLLING_DURATION","ARIA_DESCRIBEDBY","ERROR_SUMMARY_TITLE_ID","createOrUpdateStatusAnnouncer","form","fileCountP","statusAnnouncer","querySelector","document","createElement","id","className","setAttribute","addStatusAnnouncerToDOM","asHTMLElement","appendChild","body","nextSibling","parentNode","insertBefore","parentElement","findOrCreateSummaryList","summaryList","buttonGroup","createFileRow","selectedFile","statusText","row","name","innerHTML","renderSummary","container","getElementById","uploadForm","closest","HTMLFormElement","fileInput","existingRow","remove","firstChild","textContent","showError","message","errorSummary","topErrorSummary","titleElement","removeAttribute","formGroup","classList","add","inputId","errorMessage","element","reloadPage","window","history","replaceState","location","href","pathname","buildUploadStatusUrl","uploadId","pathSegments","split","filter","segment","prefix","length","pollUploadStatus","attempts","interval","setInterval","clearInterval","uploadStatusUrl","fetch","headers","Accept","then","response","ok","Error","json","data","uploadStatus","catch","handleStandardFormSubmission","formElement","uploadButton","continueButton","focus","setTimeout","disabled","handleAjaxFormSubmission","event","action","preventDefault","formData","FormData","isLocalDev","dataset","proxyUrl","uploadUrl","fetchOptions","method","redirect","mode","initUpload","Array","from","querySelectorAll","find","button","trim","isSubmitting","addEventListener","files","initFileUpload","readyState"],"sources":["../../../src/client/javascripts/file-upload.js"],"sourcesContent":["export const MAX_POLLING_DURATION = 300 // 5 minutes\nconst ARIA_DESCRIBEDBY = 'aria-describedby'\nconst ERROR_SUMMARY_TITLE_ID = 'error-summary-title'\n\n/**\n * Creates or updates status announcer for screen readers\n * @param {HTMLElement | null} form - The form element\n * @param {HTMLElement | null} fileCountP - The file count paragraph element\n * @returns {HTMLElement} The status announcer element\n */\nfunction createOrUpdateStatusAnnouncer(form, fileCountP) {\n  let statusAnnouncer = form?.querySelector('#statusInformation')\n\n  if (!statusAnnouncer) {\n    statusAnnouncer = document.createElement('div')\n    statusAnnouncer.id = 'statusInformation'\n    statusAnnouncer.className = 'govuk-visually-hidden'\n    statusAnnouncer.setAttribute('aria-live', 'polite')\n\n    // multiple fallbacks to ensure the status announcer is always added to the DOM\n    // this helps with cross-browser compatibility and unexpected DOM structures encountered during QA\n    try {\n      addStatusAnnouncerToDOM(\n        asHTMLElement(form),\n        asHTMLElement(fileCountP),\n        asHTMLElement(statusAnnouncer)\n      )\n    } catch {\n      try {\n        form?.appendChild(statusAnnouncer)\n      } catch {\n        document.body.appendChild(statusAnnouncer)\n      }\n    }\n  }\n\n  return /** @type {HTMLElement} */ (statusAnnouncer)\n}\n\n/**\n * Helper function to add the status announcer to the DOM\n * @param {HTMLElement} form - The form element\n * @param {HTMLElement | null} fileCountP - The file count paragraph element\n * @param {HTMLElement} statusAnnouncer - The status announcer element to add\n */\nfunction addStatusAnnouncerToDOM(form, fileCountP, statusAnnouncer) {\n  if (fileCountP?.nextSibling && fileCountP.parentNode === form) {\n    form.insertBefore(statusAnnouncer, fileCountP.nextSibling)\n    return\n  }\n\n  const parentElement = fileCountP?.parentNode ?? form\n  parentElement.appendChild(statusAnnouncer)\n}\n\n/**\n * Finds an existing summary list or creates a new one\n * @param {HTMLFormElement} form - The form element\n * @param {HTMLElement} fileCountP - The file count paragraph element\n * @returns {HTMLElement} The summary list element\n */\nfunction findOrCreateSummaryList(form, fileCountP) {\n  let summaryList = form.querySelector('dl.govuk-summary-list')\n\n  if (!summaryList) {\n    summaryList = document.createElement('dl')\n    summaryList.className = 'govuk-summary-list govuk-summary-list--long-key'\n\n    const buttonGroup = form.querySelector('.govuk-button-group')\n\n    if (buttonGroup) {\n      form.insertBefore(summaryList, buttonGroup)\n    } else {\n      form.insertBefore(summaryList, fileCountP.nextSibling)\n    }\n  }\n\n  return /** @type {HTMLElement} */ (summaryList)\n}\n\n/**\n * Creates a file row element for the summary list\n * @param {File | null} selectedFile - The selected file\n * @param {string} statusText - The status to display\n * @returns {HTMLElement} The created row element\n */\nfunction createFileRow(selectedFile, statusText) {\n  const row = document.createElement('div')\n  row.className = 'govuk-summary-list__row'\n  row.setAttribute('data-filename', selectedFile?.name ?? '')\n  row.innerHTML = `\n      <dt class=\"govuk-summary-list__key\">\n        ${selectedFile?.name ?? ''}\n      </dt>\n      <dd class=\"govuk-summary-list__value\">\n        <strong class=\"govuk-tag govuk-tag--yellow\">${statusText}</strong>\n      </dd>\n      <dd class=\"govuk-summary-list__actions\">\n      </dd>\n    `\n  return row\n}\n\n/**\n * Renders or updates the file summary box for the selected file\n * @param {File | null} selectedFile - The selected file\n * @param {string} statusText - The status to display\n * @param {HTMLElement} form - The form element\n */\nfunction renderSummary(selectedFile, statusText, form) {\n  const container = document.getElementById('uploadedFilesContainer')\n  const uploadForm = container ? container.closest('form') : null\n\n  if (!uploadForm || !(uploadForm instanceof HTMLFormElement)) {\n    return\n  }\n\n  const fileCountP = uploadForm.querySelector('p.govuk-body')\n\n  if (!fileCountP) {\n    return\n  }\n\n  const statusAnnouncer = createOrUpdateStatusAnnouncer(\n    /** @type {HTMLElement} */ (uploadForm),\n    /** @type {HTMLElement | null} */ (fileCountP)\n  )\n\n  const fileInput = form.querySelector('input[type=\"file\"]')\n\n  if (fileInput) {\n    fileInput.setAttribute(ARIA_DESCRIBEDBY, 'statusInformation')\n  }\n\n  const summaryList = findOrCreateSummaryList(\n    /** @type {HTMLFormElement} */ (uploadForm),\n    /** @type {HTMLElement} */ (fileCountP)\n  )\n\n  const existingRow = document.querySelector(\n    `[data-filename=\"${selectedFile?.name}\"]`\n  )\n\n  if (existingRow) {\n    existingRow.remove()\n  }\n\n  const row = createFileRow(selectedFile, statusText)\n  summaryList.insertBefore(row, summaryList.firstChild)\n  statusAnnouncer.textContent = `${selectedFile?.name ?? ''} ${statusText}`\n}\n\n/**\n * Shows an error message using the GOV.UK error summary component\n * and adds inline error styling to the file input\n * @param {string} message - The error message to display\n * @param {HTMLElement | null} errorSummary - The error summary container\n * @param {HTMLInputElement} fileInput - The file input element\n * @returns {void}\n */\nfunction showError(message, errorSummary, fileInput) {\n  const topErrorSummary = document.querySelector('.govuk-error-summary')\n\n  if (topErrorSummary) {\n    const titleElement = document.getElementById(ERROR_SUMMARY_TITLE_ID)\n    if (titleElement) {\n      fileInput.setAttribute(ARIA_DESCRIBEDBY, ERROR_SUMMARY_TITLE_ID)\n    } else {\n      fileInput.removeAttribute(ARIA_DESCRIBEDBY)\n    }\n    return\n  }\n\n  if (errorSummary) {\n    errorSummary.innerHTML = `\n        <div class=\"govuk-error-summary\" data-module=\"govuk-error-summary\">\n          <div role=\"alert\">\n            <h2 class=\"govuk-error-summary__title\" id=\"${ERROR_SUMMARY_TITLE_ID}\">\n              There is a problem\n            </h2>\n            <div class=\"govuk-error-summary__body\">\n              <ul class=\"govuk-list govuk-error-summary__list\">\n                <li>\n                  <a href=\"#file-upload\">${message}</a>\n                </li>\n              </ul>\n            </div>\n          </div>\n        </div>\n      `\n\n    fileInput.setAttribute(ARIA_DESCRIBEDBY, ERROR_SUMMARY_TITLE_ID)\n  }\n\n  const formGroup = fileInput.closest('.govuk-form-group')\n  if (formGroup) {\n    formGroup.classList.add('govuk-form-group--error')\n    fileInput.classList.add('govuk-file-upload--error')\n\n    const inputId = fileInput.id\n    let errorMessage = document.getElementById(`${inputId}-error`)\n\n    if (!errorMessage) {\n      errorMessage = document.createElement('p')\n      errorMessage.id = `${inputId}-error`\n      errorMessage.className = 'govuk-error-message'\n      errorMessage.innerHTML = `<span class=\"govuk-visually-hidden\">Error:</span> ${message}`\n      formGroup.insertBefore(errorMessage, fileInput)\n    }\n\n    fileInput.setAttribute(\n      ARIA_DESCRIBEDBY,\n      `error-summary-title ${inputId}-error`\n    )\n  }\n}\n\n/**\n * Helper to safely convert an Element to HTMLElement\n * @param {Element | null} element - The element to convert\n */\nfunction asHTMLElement(element) {\n  return /** @type {HTMLElement} */ (element)\n}\n\nfunction reloadPage() {\n  window.history.replaceState(null, '', window.location.href)\n  window.location.href = window.location.pathname\n}\n\n/**\n * Build the upload status URL given the current pathname and the upload ID.\n * @param {string} pathname – e.g. window.location.pathname\n * @param {string} uploadId\n * @returns {string} e.g. \"/form/upload-status/abc123\"\n */\nexport function buildUploadStatusUrl(pathname, uploadId) {\n  const pathSegments = pathname.split('/').filter((segment) => segment)\n  const prefix = pathSegments.length > 0 ? `/${pathSegments[0]}` : ''\n  return `${prefix}/upload-status/${uploadId}`\n}\n\n/**\n * Polls the upload status endpoint until the file is ready or timeout occurs\n * @param {string} uploadId - The upload ID to check\n */\nfunction pollUploadStatus(uploadId) {\n  let attempts = 0\n  const interval = setInterval(() => {\n    attempts++\n\n    if (attempts >= MAX_POLLING_DURATION) {\n      clearInterval(interval)\n      reloadPage()\n      return\n    }\n\n    const uploadStatusUrl = buildUploadStatusUrl(\n      window.location.pathname,\n      uploadId\n    )\n\n    fetch(uploadStatusUrl, {\n      headers: {\n        Accept: 'application/json'\n      }\n    })\n      .then((response) => {\n        if (!response.ok) {\n          throw new Error('Network response was not ok')\n        }\n        return response.json()\n      })\n      .then((data) => {\n        if (data.uploadStatus === 'ready') {\n          clearInterval(interval)\n          reloadPage()\n        }\n      })\n      .catch(() => {\n        clearInterval(interval)\n        reloadPage()\n      })\n  }, 1000)\n}\n\n/**\n * Handle standard form submission for file upload\n * @param {HTMLFormElement} formElement - The form element\n * @param {HTMLInputElement} fileInput - The file input element\n * @param {HTMLButtonElement} uploadButton - The upload button\n * @param {HTMLButtonElement} continueButton - The continue button\n * @param {File | null} selectedFile - The selected file\n */\nfunction handleStandardFormSubmission(\n  formElement,\n  fileInput,\n  uploadButton,\n  continueButton,\n  selectedFile\n) {\n  renderSummary(selectedFile, 'Uploading…', formElement)\n\n  fileInput.focus()\n\n  setTimeout(() => {\n    fileInput.disabled = true\n    uploadButton.disabled = true\n    continueButton.disabled = true\n  }, 100)\n}\n\n/**\n * Handle AJAX form submission with upload ID\n * @param {Event} event - The click event\n * @param {HTMLFormElement} formElement - The form element\n * @param {HTMLInputElement} fileInput - The file input element\n * @param {HTMLButtonElement} uploadButton - The upload button\n * @param {HTMLElement | null} errorSummary - The error summary container\n * @param {string | undefined} uploadId - The upload ID\n * @returns {boolean} Whether the event was handled\n */\nfunction handleAjaxFormSubmission(\n  event,\n  formElement,\n  fileInput,\n  uploadButton,\n  errorSummary,\n  uploadId\n) {\n  if (!formElement.action || !uploadId) {\n    return false\n  }\n\n  event.preventDefault()\n\n  const formData = new FormData(formElement)\n  const isLocalDev = !!formElement.dataset.proxyUrl\n  const uploadUrl = formElement.dataset.proxyUrl ?? formElement.action\n\n  const fetchOptions = /** @type {RequestInit} */ ({\n    method: 'POST',\n    body: formData,\n    redirect: isLocalDev ? 'follow' : 'manual' // follow mode if local development with the proxy\n  })\n\n  // no-cors mode if needed local development with the proxy\n  if (isLocalDev) {\n    fetchOptions.mode = 'no-cors'\n  }\n\n  fetch(uploadUrl, fetchOptions)\n    .then(() => {\n      pollUploadStatus(uploadId)\n    })\n    .catch(() => {\n      fileInput.disabled = false\n      uploadButton.disabled = false\n\n      showError(\n        'There was a problem uploading the file',\n        errorSummary,\n        fileInput\n      )\n\n      return null\n    })\n\n  return true\n}\n\nfunction initUpload() {\n  const form = document.querySelector('form:has(input[type=\"file\"])')\n  /** @type {HTMLInputElement | null} */\n  const fileInput = form ? form.querySelector('input[type=\"file\"]') : null\n  /** @type {HTMLButtonElement | null} */\n  const uploadButton = form ? form.querySelector('.upload-file-button') : null\n  const continueButton =\n    /** @type {HTMLButtonElement} */ (\n      Array.from(document.querySelectorAll('button.govuk-button')).find(\n        (button) => button.textContent?.trim() === 'Continue'\n      )\n    ) ?? null\n\n  const errorSummary = document.querySelector('.govuk-error-summary-container')\n\n  if (!form || !fileInput || !uploadButton) {\n    return\n  }\n\n  const formElement = /** @type {HTMLFormElement} */ (form)\n  /** @type {File | null} */\n  let selectedFile = null\n  let isSubmitting = false\n  const uploadId = formElement.dataset.uploadId\n\n  fileInput.addEventListener('change', () => {\n    if (errorSummary) {\n      errorSummary.innerHTML = ''\n    }\n\n    if (fileInput.files && fileInput.files.length > 0) {\n      selectedFile = fileInput.files[0]\n    }\n  })\n\n  uploadButton.addEventListener('click', (event) => {\n    if (!selectedFile) {\n      event.preventDefault()\n      showError(\n        'Select a file',\n        /** @type {HTMLElement | null} */ (errorSummary),\n        fileInput\n      )\n      return\n    }\n\n    if (isSubmitting) {\n      event.preventDefault()\n      return\n    }\n\n    isSubmitting = true\n\n    handleStandardFormSubmission(\n      formElement,\n      fileInput,\n      uploadButton,\n      continueButton,\n      selectedFile\n    )\n\n    handleAjaxFormSubmission(\n      event,\n      formElement,\n      fileInput,\n      uploadButton,\n      /** @type {HTMLElement | null} */ (errorSummary),\n      uploadId\n    )\n  })\n}\n\nexport function initFileUpload() {\n  if (document.readyState === 'loading') {\n    document.addEventListener('DOMContentLoaded', initUpload)\n  } else {\n    initUpload()\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"file-upload.js","names":["MAX_POLLING_DURATION","ARIA_DESCRIBEDBY","ERROR_SUMMARY_TITLE_ID","createOrUpdateStatusAnnouncer","form","fileCountP","statusAnnouncer","querySelector","document","createElement","id","className","setAttribute","addStatusAnnouncerToDOM","asHTMLElement","appendChild","body","nextSibling","parentNode","insertBefore","parentElement","findOrCreateSummaryList","summaryList","buttonGroup","createFileRow","selectedFile","statusText","row","name","innerHTML","renderSummary","container","getElementById","uploadForm","closest","HTMLFormElement","fileInput","existingRow","remove","firstChild","textContent","showError","message","errorSummary","topErrorSummary","titleElement","removeAttribute","formGroup","classList","add","inputId","errorMessage","element","reloadPage","window","history","replaceState","location","href","pathname","buildUploadStatusUrl","uploadId","normalisedPath","replace","segments","split","filter","Boolean","prefix","length","slice","join","pollUploadStatus","attempts","interval","setInterval","clearInterval","uploadStatusUrl","fetch","headers","Accept","then","response","ok","Error","json","data","uploadStatus","catch","handleStandardFormSubmission","formElement","uploadButton","continueButton","focus","setTimeout","disabled","handleAjaxFormSubmission","event","action","preventDefault","formData","FormData","isLocalDev","dataset","proxyUrl","uploadUrl","fetchOptions","method","redirect","mode","initUpload","Array","from","querySelectorAll","find","button","trim","isSubmitting","addEventListener","files","initFileUpload","readyState"],"sources":["../../../src/client/javascripts/file-upload.js"],"sourcesContent":["export const MAX_POLLING_DURATION = 300 // 5 minutes\nconst ARIA_DESCRIBEDBY = 'aria-describedby'\nconst ERROR_SUMMARY_TITLE_ID = 'error-summary-title'\n\n/**\n * Creates or updates status announcer for screen readers\n * @param {HTMLElement | null} form - The form element\n * @param {HTMLElement | null} fileCountP - The file count paragraph element\n * @returns {HTMLElement} The status announcer element\n */\nfunction createOrUpdateStatusAnnouncer(form, fileCountP) {\n  let statusAnnouncer = form?.querySelector('#statusInformation')\n\n  if (!statusAnnouncer) {\n    statusAnnouncer = document.createElement('div')\n    statusAnnouncer.id = 'statusInformation'\n    statusAnnouncer.className = 'govuk-visually-hidden'\n    statusAnnouncer.setAttribute('aria-live', 'polite')\n\n    // multiple fallbacks to ensure the status announcer is always added to the DOM\n    // this helps with cross-browser compatibility and unexpected DOM structures encountered during QA\n    try {\n      addStatusAnnouncerToDOM(\n        asHTMLElement(form),\n        asHTMLElement(fileCountP),\n        asHTMLElement(statusAnnouncer)\n      )\n    } catch {\n      try {\n        form?.appendChild(statusAnnouncer)\n      } catch {\n        document.body.appendChild(statusAnnouncer)\n      }\n    }\n  }\n\n  return /** @type {HTMLElement} */ (statusAnnouncer)\n}\n\n/**\n * Helper function to add the status announcer to the DOM\n * @param {HTMLElement} form - The form element\n * @param {HTMLElement | null} fileCountP - The file count paragraph element\n * @param {HTMLElement} statusAnnouncer - The status announcer element to add\n */\nfunction addStatusAnnouncerToDOM(form, fileCountP, statusAnnouncer) {\n  if (fileCountP?.nextSibling && fileCountP.parentNode === form) {\n    form.insertBefore(statusAnnouncer, fileCountP.nextSibling)\n    return\n  }\n\n  const parentElement = fileCountP?.parentNode ?? form\n  parentElement.appendChild(statusAnnouncer)\n}\n\n/**\n * Finds an existing summary list or creates a new one\n * @param {HTMLFormElement} form - The form element\n * @param {HTMLElement} fileCountP - The file count paragraph element\n * @returns {HTMLElement} The summary list element\n */\nfunction findOrCreateSummaryList(form, fileCountP) {\n  let summaryList = form.querySelector('dl.govuk-summary-list')\n\n  if (!summaryList) {\n    summaryList = document.createElement('dl')\n    summaryList.className = 'govuk-summary-list govuk-summary-list--long-key'\n\n    const buttonGroup = form.querySelector('.govuk-button-group')\n\n    if (buttonGroup) {\n      form.insertBefore(summaryList, buttonGroup)\n    } else {\n      form.insertBefore(summaryList, fileCountP.nextSibling)\n    }\n  }\n\n  return /** @type {HTMLElement} */ (summaryList)\n}\n\n/**\n * Creates a file row element for the summary list\n * @param {File | null} selectedFile - The selected file\n * @param {string} statusText - The status to display\n * @returns {HTMLElement} The created row element\n */\nfunction createFileRow(selectedFile, statusText) {\n  const row = document.createElement('div')\n  row.className = 'govuk-summary-list__row'\n  row.setAttribute('data-filename', selectedFile?.name ?? '')\n  row.innerHTML = `\n      <dt class=\"govuk-summary-list__key\">\n        ${selectedFile?.name ?? ''}\n      </dt>\n      <dd class=\"govuk-summary-list__value\">\n        <strong class=\"govuk-tag govuk-tag--yellow\">${statusText}</strong>\n      </dd>\n      <dd class=\"govuk-summary-list__actions\">\n      </dd>\n    `\n  return row\n}\n\n/**\n * Renders or updates the file summary box for the selected file\n * @param {File | null} selectedFile - The selected file\n * @param {string} statusText - The status to display\n * @param {HTMLElement} form - The form element\n */\nfunction renderSummary(selectedFile, statusText, form) {\n  const container = document.getElementById('uploadedFilesContainer')\n  const uploadForm = container ? container.closest('form') : null\n\n  if (!uploadForm || !(uploadForm instanceof HTMLFormElement)) {\n    return\n  }\n\n  const fileCountP = uploadForm.querySelector('p.govuk-body')\n\n  if (!fileCountP) {\n    return\n  }\n\n  const statusAnnouncer = createOrUpdateStatusAnnouncer(\n    /** @type {HTMLElement} */ (uploadForm),\n    /** @type {HTMLElement | null} */ (fileCountP)\n  )\n\n  const fileInput = form.querySelector('input[type=\"file\"]')\n\n  if (fileInput) {\n    fileInput.setAttribute(ARIA_DESCRIBEDBY, 'statusInformation')\n  }\n\n  const summaryList = findOrCreateSummaryList(\n    /** @type {HTMLFormElement} */ (uploadForm),\n    /** @type {HTMLElement} */ (fileCountP)\n  )\n\n  const existingRow = document.querySelector(\n    `[data-filename=\"${selectedFile?.name}\"]`\n  )\n\n  if (existingRow) {\n    existingRow.remove()\n  }\n\n  const row = createFileRow(selectedFile, statusText)\n  summaryList.insertBefore(row, summaryList.firstChild)\n  statusAnnouncer.textContent = `${selectedFile?.name ?? ''} ${statusText}`\n}\n\n/**\n * Shows an error message using the GOV.UK error summary component\n * and adds inline error styling to the file input\n * @param {string} message - The error message to display\n * @param {HTMLElement | null} errorSummary - The error summary container\n * @param {HTMLInputElement} fileInput - The file input element\n * @returns {void}\n */\nfunction showError(message, errorSummary, fileInput) {\n  const topErrorSummary = document.querySelector('.govuk-error-summary')\n\n  if (topErrorSummary) {\n    const titleElement = document.getElementById(ERROR_SUMMARY_TITLE_ID)\n    if (titleElement) {\n      fileInput.setAttribute(ARIA_DESCRIBEDBY, ERROR_SUMMARY_TITLE_ID)\n    } else {\n      fileInput.removeAttribute(ARIA_DESCRIBEDBY)\n    }\n    return\n  }\n\n  if (errorSummary) {\n    errorSummary.innerHTML = `\n        <div class=\"govuk-error-summary\" data-module=\"govuk-error-summary\">\n          <div role=\"alert\">\n            <h2 class=\"govuk-error-summary__title\" id=\"${ERROR_SUMMARY_TITLE_ID}\">\n              There is a problem\n            </h2>\n            <div class=\"govuk-error-summary__body\">\n              <ul class=\"govuk-list govuk-error-summary__list\">\n                <li>\n                  <a href=\"#file-upload\">${message}</a>\n                </li>\n              </ul>\n            </div>\n          </div>\n        </div>\n      `\n\n    fileInput.setAttribute(ARIA_DESCRIBEDBY, ERROR_SUMMARY_TITLE_ID)\n  }\n\n  const formGroup = fileInput.closest('.govuk-form-group')\n  if (formGroup) {\n    formGroup.classList.add('govuk-form-group--error')\n    fileInput.classList.add('govuk-file-upload--error')\n\n    const inputId = fileInput.id\n    let errorMessage = document.getElementById(`${inputId}-error`)\n\n    if (!errorMessage) {\n      errorMessage = document.createElement('p')\n      errorMessage.id = `${inputId}-error`\n      errorMessage.className = 'govuk-error-message'\n      errorMessage.innerHTML = `<span class=\"govuk-visually-hidden\">Error:</span> ${message}`\n      formGroup.insertBefore(errorMessage, fileInput)\n    }\n\n    fileInput.setAttribute(\n      ARIA_DESCRIBEDBY,\n      `error-summary-title ${inputId}-error`\n    )\n  }\n}\n\n/**\n * Helper to safely convert an Element to HTMLElement\n * @param {Element | null} element - The element to convert\n */\nfunction asHTMLElement(element) {\n  return /** @type {HTMLElement} */ (element)\n}\n\nfunction reloadPage() {\n  window.history.replaceState(null, '', window.location.href)\n  window.location.href = window.location.pathname\n}\n\n/**\n * Build the upload status URL given the current pathname and the upload ID.\n * This only works when called on a file upload page that has a maximum depth of 1 URL segments following the slug.\n * @param {string} pathname – e.g. window.location.pathname\n * @param {string} uploadId\n * @returns {string} e.g. \"/form/upload-status/abc123\"\n */\nexport function buildUploadStatusUrl(pathname, uploadId) {\n  // Remove preview markers and duplicate slashes\n  const normalisedPath = pathname\n    .replace(/\\/preview\\/(draft|live)/g, '')\n    .replace(/\\/{2,}/g, '/')\n    .replace(/\\/$/, '')\n\n  const segments = normalisedPath.split('/').filter(Boolean)\n\n  // The slug is always the second to last segment\n  // The prefix is everything before the slug\n  const prefix =\n    segments.length > 2\n      ? `/${segments.slice(0, segments.length - 2).join('/')}`\n      : ''\n\n  return `${prefix}/upload-status/${uploadId}`\n}\n\n/**\n * Polls the upload status endpoint until the file is ready or timeout occurs\n * @param {string} uploadId - The upload ID to check\n */\nfunction pollUploadStatus(uploadId) {\n  let attempts = 0\n  const interval = setInterval(() => {\n    attempts++\n\n    if (attempts >= MAX_POLLING_DURATION) {\n      clearInterval(interval)\n      reloadPage()\n      return\n    }\n\n    const uploadStatusUrl = buildUploadStatusUrl(\n      window.location.pathname,\n      uploadId\n    )\n\n    fetch(uploadStatusUrl, {\n      headers: {\n        Accept: 'application/json'\n      }\n    })\n      .then((response) => {\n        if (!response.ok) {\n          throw new Error('Network response was not ok')\n        }\n        return response.json()\n      })\n      .then((data) => {\n        if (data.uploadStatus === 'ready') {\n          clearInterval(interval)\n          reloadPage()\n        }\n      })\n      .catch(() => {\n        clearInterval(interval)\n        reloadPage()\n      })\n  }, 1000)\n}\n\n/**\n * Handle standard form submission for file upload\n * @param {HTMLFormElement} formElement - The form element\n * @param {HTMLInputElement} fileInput - The file input element\n * @param {HTMLButtonElement} uploadButton - The upload button\n * @param {HTMLButtonElement} continueButton - The continue button\n * @param {File | null} selectedFile - The selected file\n */\nfunction handleStandardFormSubmission(\n  formElement,\n  fileInput,\n  uploadButton,\n  continueButton,\n  selectedFile\n) {\n  renderSummary(selectedFile, 'Uploading…', formElement)\n\n  fileInput.focus()\n\n  setTimeout(() => {\n    fileInput.disabled = true\n    uploadButton.disabled = true\n    continueButton.disabled = true\n  }, 100)\n}\n\n/**\n * Handle AJAX form submission with upload ID\n * @param {Event} event - The click event\n * @param {HTMLFormElement} formElement - The form element\n * @param {HTMLInputElement} fileInput - The file input element\n * @param {HTMLButtonElement} uploadButton - The upload button\n * @param {HTMLElement | null} errorSummary - The error summary container\n * @param {string | undefined} uploadId - The upload ID\n * @returns {boolean} Whether the event was handled\n */\nfunction handleAjaxFormSubmission(\n  event,\n  formElement,\n  fileInput,\n  uploadButton,\n  errorSummary,\n  uploadId\n) {\n  if (!formElement.action || !uploadId) {\n    return false\n  }\n\n  event.preventDefault()\n\n  const formData = new FormData(formElement)\n  const isLocalDev = !!formElement.dataset.proxyUrl\n  const uploadUrl = formElement.dataset.proxyUrl ?? formElement.action\n\n  const fetchOptions = /** @type {RequestInit} */ ({\n    method: 'POST',\n    body: formData,\n    redirect: isLocalDev ? 'follow' : 'manual' // follow mode if local development with the proxy\n  })\n\n  // no-cors mode if needed local development with the proxy\n  if (isLocalDev) {\n    fetchOptions.mode = 'no-cors'\n  }\n\n  fetch(uploadUrl, fetchOptions)\n    .then(() => {\n      pollUploadStatus(uploadId)\n    })\n    .catch(() => {\n      fileInput.disabled = false\n      uploadButton.disabled = false\n\n      showError(\n        'There was a problem uploading the file',\n        errorSummary,\n        fileInput\n      )\n\n      return null\n    })\n\n  return true\n}\n\nfunction initUpload() {\n  const form = document.querySelector('form:has(input[type=\"file\"])')\n  /** @type {HTMLInputElement | null} */\n  const fileInput = form ? form.querySelector('input[type=\"file\"]') : null\n  /** @type {HTMLButtonElement | null} */\n  const uploadButton = form ? form.querySelector('.upload-file-button') : null\n  const continueButton =\n    /** @type {HTMLButtonElement} */ (\n      Array.from(document.querySelectorAll('button.govuk-button')).find(\n        (button) => button.textContent?.trim() === 'Continue'\n      )\n    ) ?? null\n\n  const errorSummary = document.querySelector('.govuk-error-summary-container')\n\n  if (!form || !fileInput || !uploadButton) {\n    return\n  }\n\n  const formElement = /** @type {HTMLFormElement} */ (form)\n  /** @type {File | null} */\n  let selectedFile = null\n  let isSubmitting = false\n  const uploadId = formElement.dataset.uploadId\n\n  fileInput.addEventListener('change', () => {\n    if (errorSummary) {\n      errorSummary.innerHTML = ''\n    }\n\n    if (fileInput.files && fileInput.files.length > 0) {\n      selectedFile = fileInput.files[0]\n    }\n  })\n\n  uploadButton.addEventListener('click', (event) => {\n    if (!selectedFile) {\n      event.preventDefault()\n      showError(\n        'Select a file',\n        /** @type {HTMLElement | null} */ (errorSummary),\n        fileInput\n      )\n      return\n    }\n\n    if (isSubmitting) {\n      event.preventDefault()\n      return\n    }\n\n    isSubmitting = true\n\n    handleStandardFormSubmission(\n      formElement,\n      fileInput,\n      uploadButton,\n      continueButton,\n      selectedFile\n    )\n\n    handleAjaxFormSubmission(\n      event,\n      formElement,\n      fileInput,\n      uploadButton,\n      /** @type {HTMLElement | null} */ (errorSummary),\n      uploadId\n    )\n  })\n}\n\nexport function initFileUpload() {\n  if (document.readyState === 'loading') {\n    document.addEventListener('DOMContentLoaded', initUpload)\n  } else {\n    initUpload()\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/.server/server/plugins/engine/routes/file-upload.js

@@ -12,7 +12,9 @@ export async function getHandler(request, h) {
         error: 'Status check failed'
       }).code(400);
     }
-    return h.response(status);
+    return h.response({
+      uploadStatus: status.uploadStatus
+    });
   } catch (err) {
     request.logger.error(err, `[uploadStatusFailed] Upload status check failed for uploadId: ${uploadId} - ${getErrorMessage(err)}`);
     return h.response({

package/.server/server/plugins/engine/routes/file-upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-upload.js","names":["getErrorMessage","Joi","getUploadStatus","getHandler","request","h","uploadId","params","status","response","error","code","err","logger","getRoutes","method","path","handler","options","plugins","crumb","validate","object","keys","string","guid","required"],"sources":["../../../../../src/server/plugins/engine/routes/file-upload.ts"],"sourcesContent":["import { getErrorMessage } from '@defra/forms-model'\nimport { type ResponseToolkit, type ServerRoute } from '@hapi/hapi'\nimport Joi from 'joi'\n\nimport { getUploadStatus } from '~/src/server/plugins/engine/services/uploadService.js'\nimport {\n  type FormRequest,\n  type FormRequestRefs\n} from '~/src/server/routes/types.js'\n\nexport async function getHandler(\n  request: FormRequest,\n  h: Pick<ResponseToolkit, 'response'>\n) {\n  const { uploadId } = request.params as unknown as {\n    uploadId: string\n  }\n  try {\n    const status = await getUploadStatus(uploadId)\n\n    if (!status) {\n      return h.response({ error: 'Status check failed' }).code(400)\n    }\n\n    return h.response(status)\n  } catch (err) {\n    request.logger.error(\n      err,\n      `[uploadStatusFailed] Upload status check failed for uploadId: ${uploadId} - ${getErrorMessage(err)}`\n    )\n    return h.response({ error: 'Status check error' }).code(500)\n  }\n}\n\nexport function getRoutes(): ServerRoute<FormRequestRefs>[] {\n  return [\n    {\n      method: 'get',\n      path: '/upload-status/{uploadId}',\n      handler: getHandler,\n      options: {\n        plugins: {\n          crumb: false\n        },\n        validate: {\n          params: Joi.object().keys({\n            uploadId: Joi.string().guid().required()\n          })\n        }\n      }\n    }\n  ]\n}\n"],"mappings":"AAAA,SAASA,eAAe,QAAQ,oBAAoB;AAEpD,OAAOC,GAAG,MAAM,KAAK;AAErB,SAASC,eAAe;AAMxB,OAAO,eAAeC,UAAUA,CAC9BC,OAAoB,EACpBC,CAAoC,EACpC;EACA,MAAM;IAAEC;EAAS,CAAC,GAAGF,OAAO,CAACG,MAE5B;EACD,IAAI;IACF,MAAMC,MAAM,GAAG,MAAMN,eAAe,CAACI,QAAQ,CAAC;IAE9C,IAAI,CAACE,MAAM,EAAE;MACX,OAAOH,CAAC,CAACI,QAAQ,CAAC;QAAEC,KAAK,EAAE;MAAsB,CAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;IAC/D;IAEA,OAAON,CAAC,CAACI,QAAQ,CAACD,MAAM,CAAC;EAC3B,CAAC,CAAC,OAAOI,GAAG,EAAE;IACZR,OAAO,CAACS,MAAM,CAACH,KAAK,CAClBE,GAAG,EACH,iEAAiEN,QAAQ,MAAMN,eAAe,CAACY,GAAG,CAAC,EACrG,CAAC;IACD,OAAOP,CAAC,CAACI,QAAQ,CAAC;MAAEC,KAAK,EAAE;IAAqB,CAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;EAC9D;AACF;AAEA,OAAO,SAASG,SAASA,CAAA,EAAmC;EAC1D,OAAO,CACL;IACEC,MAAM,EAAE,KAAK;IACbC,IAAI,EAAE,2BAA2B;IACjCC,OAAO,EAAEd,UAAU;IACnBe,OAAO,EAAE;MACPC,OAAO,EAAE;QACPC,KAAK,EAAE;MACT,CAAC;MACDC,QAAQ,EAAE;QACRd,MAAM,EAAEN,GAAG,CAACqB,MAAM,CAAC,CAAC,CAACC,IAAI,CAAC;UACxBjB,QAAQ,EAAEL,GAAG,CAACuB,MAAM,CAAC,CAAC,CAACC,IAAI,CAAC,CAAC,CAACC,QAAQ,CAAC;QACzC,CAAC;MACH;IACF;EACF,CAAC,CACF;AACH","ignoreList":[]}
+{"version":3,"file":"file-upload.js","names":["getErrorMessage","Joi","getUploadStatus","getHandler","request","h","uploadId","params","status","response","error","code","uploadStatus","err","logger","getRoutes","method","path","handler","options","plugins","crumb","validate","object","keys","string","guid","required"],"sources":["../../../../../src/server/plugins/engine/routes/file-upload.ts"],"sourcesContent":["import { getErrorMessage } from '@defra/forms-model'\nimport { type ResponseToolkit, type ServerRoute } from '@hapi/hapi'\nimport Joi from 'joi'\n\nimport { getUploadStatus } from '~/src/server/plugins/engine/services/uploadService.js'\nimport {\n  type FormRequest,\n  type FormRequestRefs\n} from '~/src/server/routes/types.js'\n\nexport async function getHandler(\n  request: FormRequest,\n  h: Pick<ResponseToolkit, 'response'>\n) {\n  const { uploadId } = request.params as unknown as {\n    uploadId: string\n  }\n  try {\n    const status = await getUploadStatus(uploadId)\n\n    if (!status) {\n      return h.response({ error: 'Status check failed' }).code(400)\n    }\n\n    return h.response({\n      uploadStatus: status.uploadStatus\n    })\n  } catch (err) {\n    request.logger.error(\n      err,\n      `[uploadStatusFailed] Upload status check failed for uploadId: ${uploadId} - ${getErrorMessage(err)}`\n    )\n    return h.response({ error: 'Status check error' }).code(500)\n  }\n}\n\nexport function getRoutes(): ServerRoute<FormRequestRefs>[] {\n  return [\n    {\n      method: 'get',\n      path: '/upload-status/{uploadId}',\n      handler: getHandler,\n      options: {\n        plugins: {\n          crumb: false\n        },\n        validate: {\n          params: Joi.object().keys({\n            uploadId: Joi.string().guid().required()\n          })\n        }\n      }\n    }\n  ]\n}\n"],"mappings":"AAAA,SAASA,eAAe,QAAQ,oBAAoB;AAEpD,OAAOC,GAAG,MAAM,KAAK;AAErB,SAASC,eAAe;AAMxB,OAAO,eAAeC,UAAUA,CAC9BC,OAAoB,EACpBC,CAAoC,EACpC;EACA,MAAM;IAAEC;EAAS,CAAC,GAAGF,OAAO,CAACG,MAE5B;EACD,IAAI;IACF,MAAMC,MAAM,GAAG,MAAMN,eAAe,CAACI,QAAQ,CAAC;IAE9C,IAAI,CAACE,MAAM,EAAE;MACX,OAAOH,CAAC,CAACI,QAAQ,CAAC;QAAEC,KAAK,EAAE;MAAsB,CAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;IAC/D;IAEA,OAAON,CAAC,CAACI,QAAQ,CAAC;MAChBG,YAAY,EAAEJ,MAAM,CAACI;IACvB,CAAC,CAAC;EACJ,CAAC,CAAC,OAAOC,GAAG,EAAE;IACZT,OAAO,CAACU,MAAM,CAACJ,KAAK,CAClBG,GAAG,EACH,iEAAiEP,QAAQ,MAAMN,eAAe,CAACa,GAAG,CAAC,EACrG,CAAC;IACD,OAAOR,CAAC,CAACI,QAAQ,CAAC;MAAEC,KAAK,EAAE;IAAqB,CAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;EAC9D;AACF;AAEA,OAAO,SAASI,SAASA,CAAA,EAAmC;EAC1D,OAAO,CACL;IACEC,MAAM,EAAE,KAAK;IACbC,IAAI,EAAE,2BAA2B;IACjCC,OAAO,EAAEf,UAAU;IACnBgB,OAAO,EAAE;MACPC,OAAO,EAAE;QACPC,KAAK,EAAE;MACT,CAAC;MACDC,QAAQ,EAAE;QACRf,MAAM,EAAEN,GAAG,CAACsB,MAAM,CAAC,CAAC,CAACC,IAAI,CAAC;UACxBlB,QAAQ,EAAEL,GAAG,CAACwB,MAAM,CAAC,CAAC,CAACC,IAAI,CAAC,CAAC,CAACC,QAAQ,CAAC;QACzC,CAAC;MACH;IACF;EACF,CAAC,CACF;AACH","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-engine-plugin",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "Defra forms engine",
   "type": "module",
   "files": [

package/src/client/javascripts/file-upload.js

@@ -230,13 +230,27 @@ function reloadPage() {
 
 /**
  * Build the upload status URL given the current pathname and the upload ID.
+ * This only works when called on a file upload page that has a maximum depth of 1 URL segments following the slug.
  * @param {string} pathname – e.g. window.location.pathname
  * @param {string} uploadId
  * @returns {string} e.g. "/form/upload-status/abc123"
  */
 export function buildUploadStatusUrl(pathname, uploadId) {
-  const pathSegments = pathname.split('/').filter((segment) => segment)
-  const prefix = pathSegments.length > 0 ? `/${pathSegments[0]}` : ''
+  // Remove preview markers and duplicate slashes
+  const normalisedPath = pathname
+    .replace(/\/preview\/(draft|live)/g, '')
+    .replace(/\/{2,}/g, '/')
+    .replace(/\/$/, '')
+
+  const segments = normalisedPath.split('/').filter(Boolean)
+
+  // The slug is always the second to last segment
+  // The prefix is everything before the slug
+  const prefix =
+    segments.length > 2
+      ? `/${segments.slice(0, segments.length - 2).join('/')}`
+      : ''
+
   return `${prefix}/upload-status/${uploadId}`
 }
 

package/src/server/index.test.ts

@@ -508,7 +508,9 @@ describe('Upload status route', () => {
     const res = await server.inject(options)
 
     expect(res.statusCode).toBe(StatusCodes.OK)
-    expect(res.result).toEqual(mockStatus)
+    expect(res.result).toEqual({
+      uploadStatus: UploadStatus.ready
+    })
     expect(getUploadStatus).toHaveBeenCalledWith(
       '123e4567-e89b-12d3-a456-426614174000'
     )

package/src/server/plugins/engine/routes/file-upload.ts

@@ -22,7 +22,9 @@ export async function getHandler(
       return h.response({ error: 'Status check failed' }).code(400)
     }
 
-    return h.response(status)
+    return h.response({
+      uploadStatus: status.uploadStatus
+    })
   } catch (err) {
     request.logger.error(
       err,