@defra/forms-engine-plugin 3.0.7 → 3.0.9

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/forms/register-as-a-unicorn-breeder.yaml

@@ -1,5 +1,6 @@
 ---
 name: Register as a unicorn breeder
+declaration: "<p class=\"govuk-body\">All the answers you have provided are true to the best of your knowledge.</p>"
 pages:
   - path: '/whats-your-name'
     title: What's your name?

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/pageControllers/SummaryPageController.test.ts

@@ -0,0 +1,85 @@
+import { FormModel } from '~/src/server/plugins/engine/models/FormModel.js'
+import { SummaryPageController } from '~/src/server/plugins/engine/pageControllers/SummaryPageController.js'
+import { buildFormRequest } from '~/src/server/plugins/engine/pageControllers/__stubs__/request.js'
+import { type FormSubmissionState } from '~/src/server/plugins/engine/types.js'
+import {
+  type FormRequest,
+  type FormRequestPayload,
+  type FormResponseToolkit
+} from '~/src/server/routes/types.js'
+import { type CacheService } from '~/src/server/services/cacheService.js'
+import definition from '~/test/form/definitions/basic.js'
+
+describe('SummaryPageController', () => {
+  let model: FormModel
+  let controller: SummaryPageController
+  let requestPage: FormRequest
+
+  const response = {
+    code: jest.fn().mockImplementation(() => response)
+  }
+  const h: FormResponseToolkit = {
+    redirect: jest.fn().mockReturnValue(response),
+    view: jest.fn()
+  }
+
+  beforeEach(() => {
+    model = new FormModel(definition, {
+      basePath: 'test'
+    })
+
+    // Create a mock page for SummaryPageController
+    const mockPage = {
+      ...definition.pages[0],
+      controller: 'summary'
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    controller = new SummaryPageController(model, mockPage as any)
+
+    requestPage = buildFormRequest({
+      method: 'get',
+      url: new URL('http://example.com/test/summary'),
+      path: '/test/summary',
+      params: {
+        path: 'summary',
+        slug: 'test'
+      },
+      query: {},
+      app: { model }
+    } as FormRequest)
+  })
+
+  describe('handleSaveAndExit', () => {
+    it('should invoke saveAndExit plugin option', async () => {
+      const saveAndExitMock = jest.fn(() => ({}))
+      const state: FormSubmissionState = {
+        $$__referenceNumber: 'foobar',
+        licenceLength: 365,
+        fullName: 'John Smith'
+      }
+      const request = {
+        ...requestPage,
+        server: {
+          plugins: {
+            'forms-engine-plugin': {
+              saveAndExit: saveAndExitMock,
+              cacheService: {
+                clearState: jest.fn()
+              } as unknown as CacheService
+            }
+          }
+        },
+        method: 'post',
+        payload: { fullName: 'John Smith', action: 'save-and-exit' }
+      } as unknown as FormRequestPayload
+
+      const context = model.getFormContext(request, state)
+
+      const postHandler = controller.makePostRouteHandler()
+      await postHandler(request, context, h)
+
+      expect(saveAndExitMock).toHaveBeenCalledWith(request, h, context)
+    })
+  })
+})

package/src/server/plugins/engine/pageControllers/SummaryPageController.ts

@@ -73,6 +73,7 @@ export class SummaryPageController extends QuestionPageController {
     viewModel.phaseTag = this.phaseTag
     viewModel.components = components
     viewModel.allowSaveAndExit = this.shouldShowSaveAndExit(request.server)
+    viewModel.errors = errors
 
     return viewModel
   }
@@ -107,48 +108,56 @@ export class SummaryPageController extends QuestionPageController {
       context: FormContext,
       h: FormResponseToolkit
     ) => {
-      const { model } = this
-      const { params } = request
-
       // Check if this is a save-and-exit action
       const { action } = request.payload
       if (action === FormAction.SaveAndExit) {
         return this.handleSaveAndExit(request, context, h)
       }
 
-      const cacheService = getCacheService(request.server)
-
-      const { formsService } = this.model.services
-      const { getFormMetadata } = formsService
-
-      // Get the form metadata using the `slug` param
-      const formMetadata = await getFormMetadata(params.slug)
-      const { notificationEmail } = formMetadata
-      const { isPreview } = checkFormStatus(request.params)
-      const emailAddress = notificationEmail ?? this.model.def.outputEmail
-
-      checkEmailAddressForLiveFormSubmission(emailAddress, isPreview)
-
-      // Send submission email
-      if (emailAddress) {
-        const viewModel = this.getSummaryViewModel(request, context)
-        await submitForm(
-          context,
-          request,
-          viewModel,
-          model,
-          emailAddress,
-          formMetadata
-        )
-      }
+      return this.handleFormSubmit(request, context, h)
+    }
+  }
+
+  async handleFormSubmit(
+    request: FormRequestPayload,
+    context: FormContext,
+    h: FormResponseToolkit
+  ) {
+    const { model } = this
+    const { params } = request
+
+    const cacheService = getCacheService(request.server)
 
-      await cacheService.setConfirmationState(request, { confirmed: true })
+    const { formsService } = this.model.services
+    const { getFormMetadata } = formsService
 
-      // Clear all form data
-      await cacheService.clearState(request)
+    // Get the form metadata using the `slug` param
+    const formMetadata = await getFormMetadata(params.slug)
+    const { notificationEmail } = formMetadata
+    const { isPreview } = checkFormStatus(request.params)
+    const emailAddress = notificationEmail ?? this.model.def.outputEmail
 
-      return this.proceed(request, h, this.getStatusPath())
+    checkEmailAddressForLiveFormSubmission(emailAddress, isPreview)
+
+    // Send submission email
+    if (emailAddress) {
+      const viewModel = this.getSummaryViewModel(request, context)
+      await submitForm(
+        context,
+        request,
+        viewModel,
+        model,
+        emailAddress,
+        formMetadata
+      )
     }
+
+    await cacheService.setConfirmationState(request, { confirmed: true })
+
+    // Clear all form data
+    await cacheService.clearState(request)
+
+    return this.proceed(request, h, this.getStatusPath())
   }
 
   get postRouteOptions(): RouteOptions<FormRequestPayloadRefs> {
@@ -164,7 +173,7 @@ export class SummaryPageController extends QuestionPageController {
   }
 }
 
-async function submitForm(
+export async function submitForm(
   context: FormContext,
   request: FormRequestPayload,
   summaryViewModel: SummaryViewModel,

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,

package/src/server/plugins/engine/types/schema.test.ts

@@ -78,6 +78,29 @@ describe('Schema validation', () => {
       expect(error).toBeUndefined()
     })
 
+    it('should validate valid meta object with valid custom properties', () => {
+      const validMetaWithCustom = {
+        ...validMeta,
+        custom: {
+          property1: 'value 1',
+          property2: 'value2'
+        }
+      }
+      const { error } =
+        formAdapterSubmissionMessageMetaSchema.validate(validMetaWithCustom)
+      expect(error).toBeUndefined()
+    })
+
+    it('should validate valid meta object with empty custom properties', () => {
+      const validMetaWithCustom = {
+        ...validMeta,
+        custom: {}
+      }
+      const { error } =
+        formAdapterSubmissionMessageMetaSchema.validate(validMetaWithCustom)
+      expect(error).toBeUndefined()
+    })
+
     it('should reject invalid schema version', () => {
       const invalidMeta = { ...validMeta, schemaVersion: 'invalid' }
       const { error } =
@@ -92,6 +115,17 @@ describe('Schema validation', () => {
         formAdapterSubmissionMessageMetaSchema.validate(metaWithoutTimestamp)
       expect(error).toBeDefined()
     })
+
+    it('should reject invalid custom structure', () => {
+      const validMetaWithInvalidCustom = {
+        ...validMeta,
+        custom: 'invalid'
+      }
+      const { error } = formAdapterSubmissionMessageMetaSchema.validate(
+        validMetaWithInvalidCustom
+      )
+      expect(error).toBeDefined()
+    })
   })
 
   describe('formAdapterSubmissionMessageDataSchema', () => {

package/src/server/plugins/engine/types/schema.ts

@@ -31,7 +31,12 @@ export const formAdapterSubmissionMessageMetaSchema =
       .required(),
     isPreview: Joi.boolean().required(),
     notificationEmail: notificationEmailAddressSchema.required(),
-    versionMetadata: formVersionMetadataSchema.optional()
+    versionMetadata: formVersionMetadataSchema.optional(),
+    custom: Joi.object()
+      .pattern(/^/, Joi.any())
+      .unknown()
+      .optional()
+      .description('Custom properties for the message')
   })
 
 export const formAdapterSubmissionMessageDataSchema =

package/src/server/plugins/engine/types.ts

@@ -409,6 +409,7 @@ export interface FormAdapterSubmissionMessageMeta {
   isPreview: boolean
   notificationEmail: string
   versionMetadata?: FormVersionMetadata
+  custom?: Record<string, unknown>
 }
 
 export type FormAdapterSubmissionMessageMetaSerialised = Omit<

package/src/server/plugins/engine/views/summary.html

@@ -4,6 +4,7 @@
 {% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
 {% from "govuk/components/button/macro.njk" import govukButton %}
 {% from "partials/components.html" import componentList with context %}
+{% from "govuk/components/input/macro.njk" import govukInput %}
 
 {% block content %}
   <div class="govuk-grid-row">
@@ -12,6 +13,13 @@
         {% include "partials/preview-banner.html" %}
       {% endif %}
 
+      {% if errors %}
+        {{ govukErrorSummary({
+          titleText: "There is a problem",
+          errorList: checkErrorTemplates(errors)
+        }) }}
+      {% endif %}
+
       {% if hasMissingNotificationEmail %}
         {% include "partials/warn-missing-notification-email.html" %}
       {% endif %}
@@ -33,6 +41,10 @@
       <form method="post" novalidate>
         <input type="hidden" name="crumb" value="{{ crumb }}">
 
+        {{ componentList(components) }}
+
+        {% block customPageContent %}{% endblock %}
+
         {% if declaration %}
           <h2 class="govuk-heading-m" id="declaration">Declaration</h2>
           <div class="govuk-body">
@@ -40,8 +52,6 @@
           </div>
         {% endif %}
 
-        {{ componentList(components) }}
-
         <div class="govuk-button-group">
           {% set isDeclaration = declaration or components | length %}