@defra/forms-engine-plugin 0.1.10 → 0.1.12

package/src/server/plugins/engine/outputFormatters/human/v1.ts

@@ -42,7 +42,7 @@ export function format(
     lines.push(`This is a test of the ${formName} ${formStatus.state} form.\n`)
   }
 
-  lines.push(`Form submitted at ${escapeMarkdown(formattedNow)}.\n`)
+  lines.push(`${formName} form received at ${escapeMarkdown(formattedNow)}.\n`)
   lines.push('---\n')
 
   items.forEach((item) => {

package/src/server/plugins/engine/pageControllers/FileUploadPageController.test.ts

@@ -210,6 +210,7 @@ describe('FileUploadPageController', () => {
         expect(getUploadStatusSpy).toHaveBeenCalledTimes(2)
         expect(request.logger.info).toHaveBeenCalled()
 
+        /* eslint-disable-next-line @typescript-eslint/no-unsafe-member-access */
         const logMsg = (request.logger.info as jest.Mock).mock.calls[0][0]
         expect(logMsg).toEqual(expect.stringContaining('Waiting'))
         expect(logMsg).toEqual(expect.stringContaining('some-id'))

package/src/server/plugins/engine/pageControllers/PageController.test.ts

@@ -1,5 +1,6 @@
 import { type ResponseToolkit } from '@hapi/hapi'
 
+import { FORM_PREFIX } from '~/src/server/constants.js'
 import { FormModel } from '~/src/server/plugins/engine/models/FormModel.js'
 import { PageController } from '~/src/server/plugins/engine/pageControllers/PageController.js'
 import { type FormRequest } from '~/src/server/routes/types.js'
@@ -10,6 +11,8 @@ describe('PageController', () => {
   let controller1: PageController
   let controller2: PageController
 
+  const testBasePath = `${FORM_PREFIX}/test`
+
   beforeEach(() => {
     const { pages } = definition
 
@@ -17,7 +20,7 @@ describe('PageController', () => {
     const page2 = pages[1]
 
     model = new FormModel(definition, {
-      basePath: 'test'
+      basePath: testBasePath
     })
 
     controller1 = new PageController(model, page1)
@@ -31,8 +34,8 @@ describe('PageController', () => {
     })
 
     it('returns href', () => {
-      expect(controller1).toHaveProperty('href', '/test/licence')
-      expect(controller2).toHaveProperty('href', '/test/full-name')
+      expect(controller1).toHaveProperty('href', `${testBasePath}/licence`)
+      expect(controller2).toHaveProperty('href', `${testBasePath}/full-name`)
     })
 
     it('returns keys (empty)', () => {
@@ -99,11 +102,11 @@ describe('PageController', () => {
   describe('Path methods', () => {
     describe('Link href', () => {
       it('prefixes paths into link hrefs', () => {
-        const href1 = controller1.getHref('/')
+        const href1 = controller1.getHref('')
         const href2 = controller1.getHref('/page-one')
 
-        expect(href1).toBe('/test')
-        expect(href2).toBe('/test/page-one')
+        expect(href1).toBe(testBasePath)
+        expect(href2).toBe(`${testBasePath}/page-one`)
       })
     })
 

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

@@ -135,12 +135,22 @@ export class PageController {
     return def.phaseBanner?.phase
   }
 
-  getHref(path: string) {
-    const { model } = this
+  getHref(path: string): string {
+    const basePath = this.model.basePath
 
-    return path === '/'
-      ? `/${model.basePath}` // Strip trailing slash
-      : `/${model.basePath}${path}`
+    if (path === '/') {
+      return `/${basePath}`
+    }
+
+    // if ever the path is not prefixed with a slash, add it
+    const relativeTargetPath = path.startsWith('/') ? path.substring(1) : path
+    let finalPath = `/${basePath}`
+    if (relativeTargetPath) {
+      finalPath += `/${relativeTargetPath}`
+    }
+    finalPath = finalPath.replace(/\/{2,}/g, '/')
+
+    return finalPath
   }
 
   getStartPath() {

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

@@ -398,7 +398,7 @@ export class QuestionPageController extends PageController {
       const { evaluationState } = context
 
       const viewModel = this.getViewModel(request, context)
-      viewModel.errors = collection.getErrors(viewModel.errors)
+      viewModel.errors = collection.getViewErrors(viewModel.errors)
 
       /**
        * Content components can be hidden based on a condition. If the condition evaluates to true, it is safe to be kept, otherwise discard it
@@ -498,7 +498,7 @@ export class QuestionPageController extends PageController {
        */
       if (context.errors || isForceAccess) {
         const viewModel = this.getViewModel(request, context)
-        viewModel.errors = collection.getErrors(viewModel.errors)
+        viewModel.errors = collection.getViewErrors(viewModel.errors)
 
         // Filter our components based on their conditions using our evaluated state
         viewModel.components = this.filterConditionalComponents(

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

@@ -1,7 +1,12 @@
-import { type PageSummary, type SubmitPayload } from '@defra/forms-model'
+import {
+  hasComponentsEvenIfNoNext,
+  type Page,
+  type SubmitPayload
+} from '@defra/forms-model'
 import Boom from '@hapi/boom'
 import { type ResponseToolkit, type RouteOptions } from '@hapi/hapi'
 
+import { ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js'
 import { FileUploadField } from '~/src/server/plugins/engine/components/FileUploadField.js'
 import { getAnswer } from '~/src/server/plugins/engine/components/helpers.js'
 import {
@@ -30,15 +35,21 @@ import {
 } from '~/src/server/routes/types.js'
 
 export class SummaryPageController extends QuestionPageController {
-  declare pageDef: PageSummary
+  declare pageDef: Page
 
   /**
    * The controller which is used when Page["controller"] is defined as "./pages/summary.js"
    */
 
-  constructor(model: FormModel, pageDef: PageSummary) {
+  constructor(model: FormModel, pageDef: Page) {
     super(model, pageDef)
     this.viewName = 'summary'
+
+    // Components collection
+    this.collection = new ComponentCollection(
+      hasComponentsEvenIfNoNext(pageDef) ? pageDef.components : [],
+      { model, page: this }
+    )
   }
 
   getSummaryViewModel(
@@ -47,11 +58,16 @@ export class SummaryPageController extends QuestionPageController {
   ): SummaryViewModel {
     const viewModel = new SummaryViewModel(request, this, context)
 
+    const { query } = request
+    const { payload, errors } = context
+    const components = this.collection.getViewModel(payload, errors, query)
+
     // We already figure these out in the base page controller. Take them and apply them to our page-specific model.
     // This is a stop-gap until we can add proper inheritance in place.
     viewModel.backLink = this.getBackLink(request, context)
     viewModel.feedbackLink = this.feedbackLink
     viewModel.phaseTag = this.phaseTag
+    viewModel.components = components
 
     return viewModel
   }
@@ -96,7 +112,7 @@ export class SummaryPageController extends QuestionPageController {
 
       // Get the form metadata using the `slug` param
       const { notificationEmail } = await getFormMetadata(params.slug)
-      const { isPreview } = checkFormStatus(request.path)
+      const { isPreview } = checkFormStatus(request.params)
       const emailAddress = notificationEmail ?? this.model.def.outputEmail
 
       checkEmailAddressForLiveFormSubmission(emailAddress, isPreview)
@@ -138,8 +154,7 @@ async function submitForm(
 ) {
   await extendFileRetention(model, state, emailAddress)
 
-  const { path } = request
-  const formStatus = checkFormStatus(path)
+  const formStatus = checkFormStatus(request.params)
   const logTags = ['submit', 'submissionApi']
 
   request.logger.info(logTags, 'Preparing email', formStatus)

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

@@ -1,32 +1,45 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 // Declaration above is needed for: https://github.com/hapijs/joi/issues/3064
 
-import joi, { type LanguageMessages, type ValidationOptions } from 'joi'
+import joi, {
+  type JoiExpression,
+  type LanguageMessages,
+  type LanguageMessagesExt,
+  type ReferenceOptions,
+  type ValidationOptions
+} from 'joi'
 import lowerFirst from 'lodash/lowerFirst.js'
 
 const opts = {
   functions: {
     lowerFirst
   }
-}
+} as ReferenceOptions
 
 /**
  * see @link https://joi.dev/api/?v=17.4.2#template-syntax for template syntax
  */
-export const messageTemplate = {
-  // @ts-expect-error - joi.expression options type issue
-  required: joi.expression('Enter {{lowerFirst(#label)}}', opts),
-  // @ts-expect-error - joi.expression options type issue
-  selectRequired: joi.expression('Select {{lowerFirst(#label)}}', opts),
+export const messageTemplate: Record<string, JoiExpression> = {
+  required: joi.expression(
+    'Enter {{lowerFirst(#label)}}',
+    opts
+  ) as JoiExpression,
+  selectRequired: joi.expression(
+    'Select {{lowerFirst(#label)}}',
+    opts
+  ) as JoiExpression,
+  selectYesNoRequired: '{{#label}} - select yes or no',
   max: '{{#label}} must be {{#limit}} characters or less',
   min: '{{#label}} must be {{#limit}} characters or more',
-  // @ts-expect-error - joi.expression options type issue
-  pattern: joi.expression('Enter a valid {{lowerFirst(#label)}}', opts),
+  minMax: '{{#label}} must be between {{#min}} and {{#max}} characters',
+  pattern: joi.expression(
+    'Enter a valid {{lowerFirst(#label)}}',
+    opts
+  ) as JoiExpression,
   format: joi.expression(
     'Enter {{lowerFirst(#label)}} in the correct format',
-    // @ts-expect-error - joi.expression options type issue
     opts
-  ),
+  ) as JoiExpression,
   number: '{{#label}} must be a number',
   numberPrecision: '{{#label}} must have {{#limit}} or fewer decimal places',
   numberInteger: '{{#label}} must be a whole number',
@@ -36,19 +49,17 @@ export const messageTemplate = {
 
   // Nested fields use component title
 
-  // @ts-expect-error - joi.expression options type issue
-  objectRequired: joi.expression('Enter {{#label}}', opts),
+  objectRequired: joi.expression('Enter {{#label}}', opts) as JoiExpression,
   objectMissing: joi.expression(
     '{{#title}} must include a {{lowerFirst(#label)}}',
-    // @ts-expect-error - joi.expression options type issue
     opts
-  ),
+  ) as JoiExpression,
   dateFormat: '{{#title}} must be a real date',
   dateMin: '{{#title}} must be the same as or after {{#limit}}',
   dateMax: '{{#title}} must be the same as or before {{#limit}}'
 }
 
-export const messages: LanguageMessages = {
+export const messages: LanguageMessagesExt = {
   'string.base': messageTemplate.required,
   'string.min': messageTemplate.min,
   'string.empty': messageTemplate.required,
@@ -77,9 +88,12 @@ export const messages: LanguageMessages = {
   'date.max': messageTemplate.dateMax
 }
 
+export const messagesPre: LanguageMessages =
+  messages as unknown as LanguageMessages
+
 export const validationOptions: ValidationOptions = {
   abortEarly: false,
-  messages,
+  messages: messagesPre,
   errors: {
     wrap: {
       array: false,

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

@@ -1,3 +1,7 @@
+import { existsSync } from 'fs'
+import { dirname, join } from 'path'
+import { fileURLToPath } from 'url'
+
 import { hasFormComponents, slugSchema } from '@defra/forms-model'
 import Boom from '@hapi/boom'
 import {
@@ -11,6 +15,7 @@ import vision from '@hapi/vision'
 import { isEqual } from 'date-fns'
 import Joi from 'joi'
 import nunjucks, { type Environment } from 'nunjucks'
+import resolvePkg from 'resolve'
 
 import { PREVIEW_PATH_PREFIX } from '~/src/server/constants.js'
 import {
@@ -25,7 +30,6 @@ import {
   redirectPath
 } from '~/src/server/plugins/engine/helpers.js'
 import {
-  PLUGIN_PATH,
   VIEW_PATH,
   context,
   prepareNunjucksEnvironment
@@ -65,6 +69,20 @@ import * as httpService from '~/src/server/services/httpService.js'
 import { CacheService } from '~/src/server/services/index.js'
 import { type Services } from '~/src/server/types.js'
 
+export function findPackageRoot() {
+  const currentFileName = fileURLToPath(import.meta.url)
+  const currentDirectoryName = dirname(currentFileName)
+
+  let dir = currentDirectoryName
+  while (dir !== '/') {
+    if (existsSync(join(dir, 'package.json'))) {
+      return dir
+    }
+    dir = dirname(dir)
+  }
+
+  throw new Error('package.json not found in parent directories')
+}
 export interface PluginOptions {
   model?: FormModel
   services?: Services
@@ -73,6 +91,13 @@ export interface PluginOptions {
   viewPaths?: string[]
   filters?: Record<string, FilterFunction>
   pluginPath?: string
+  nunjucks: {
+    baseLayoutPath: string
+    paths: string[]
+  }
+  viewContext: (
+    request: FormRequest | FormRequestPayload | null
+  ) => Record<string, unknown>
 }
 
 export const plugin = {
@@ -80,28 +105,32 @@ export const plugin = {
   dependencies: ['@hapi/crumb', '@hapi/yar', 'hapi-pino'],
   multiple: true,
   async register(server: Server, options: PluginOptions) {
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- hapi types are wrong
+    const prefix = server.realm.modifiers.route.prefix ?? ''
     const {
       model,
       services = defaultServices,
       controllers,
       cacheName,
-      viewPaths,
       filters,
-      pluginPath = PLUGIN_PATH
+      nunjucks: nunjucksOptions,
+      viewContext
     } = options
     const { formsService } = services
     const cacheService = new CacheService(server, cacheName)
 
-    // Paths array to tell `vision` and `nunjucks` where template files are stored.
-    // We need to include `VIEW_PATH` in addition the runtime path (node_modules)
-    // to keep the local tests working
-    const path = [`${pluginPath}/${VIEW_PATH}`, VIEW_PATH]
+    const packageRoot = findPackageRoot()
+    const govukFrontendPath = dirname(
+      resolvePkg.sync('govuk-frontend/package.json')
+    )
 
-    // Include any additional user provided view paths so our internal views engine
-    // can find any files they provide from the consumer side if using custom `page.view`s
-    if (Array.isArray(viewPaths) && viewPaths.length) {
-      path.push(...viewPaths)
-    }
+    const viewPathResolved = join(packageRoot, VIEW_PATH)
+
+    const paths = [
+      ...nunjucksOptions.paths,
+      viewPathResolved,
+      join(govukFrontendPath, 'dist')
+    ]
 
     await server.register({
       plugin: vision,
@@ -127,10 +156,7 @@ export const plugin = {
             ) => {
               // Nunjucks also needs an additional path configuration
               // to use the templates and macros from `govuk-frontend`
-              const environment = nunjucks.configure([
-                ...path,
-                'node_modules/govuk-frontend/dist'
-              ])
+              const environment = nunjucks.configure(paths)
 
               // Applies custom filters and globals for nunjucks
               // that are required by the `forms-engine-plugin`
@@ -142,12 +168,14 @@ export const plugin = {
             }
           }
         },
-        path,
+        path: paths,
         // Provides global context used with all templates
         context
       }
     })
 
+    server.expose('baseLayoutPath', nunjucksOptions.baseLayoutPath)
+    server.expose('viewContext', viewContext)
     server.expose('cacheService', cacheService)
 
     server.app.model = model
@@ -167,9 +195,9 @@ export const plugin = {
         return h.continue
       }
 
-      const { params, path } = request
+      const { params } = request
       const { slug } = params
-      const { isPreview, state: formState } = checkFormStatus(path)
+      const { isPreview, state: formState } = checkFormStatus(params)
 
       // Get the form metadata using the `slug` param
       const metadata = await formsService.getFormMetadata(slug)
@@ -215,9 +243,11 @@ export const plugin = {
         )
 
         // Set up the basePath for the model
-        const basePath = isPreview
-          ? `${PREVIEW_PATH_PREFIX.substring(1)}/${formState}/${slug}`
-          : slug
+        const basePath = (
+          isPreview
+            ? `${prefix}${PREVIEW_PATH_PREFIX}/${formState}/${slug}`
+            : `${prefix}/${slug}`
+        ).substring(1)
 
         // Construct the form model
         const model = new FormModel(

package/src/server/plugins/engine/services/formsService.js

@@ -1,46 +1,28 @@
-import { formMetadataSchema } from '@defra/forms-model'
-
-import { config } from '~/src/config/index.js'
-import { FormStatus } from '~/src/server/routes/types.js'
-import { getJson } from '~/src/server/services/httpService.js'
+const error = Error(
+  'Not implemented. Consider setting up a form loader or providing a service implementation.'
+)
 
+// eslint-disable-next-line jsdoc/require-returns-check
 /**
- * Retrieves a form definition from the form manager for a given slug
- * @param {string} slug - the slug of the form
+ * Dummy function to get form metadata.
+ * @param {string} _slug - the slug of the form
+ * @returns {Promise<FormMetadata>}
  */
-export async function getFormMetadata(slug) {
-  const getJsonByType = /** @type {typeof getJson<FormMetadata>} */ (getJson)
-
-  const { payload: metadata } = await getJsonByType(
-    `${config.get('managerUrl')}/forms/slug/${slug}`
-  )
-
-  // Run it through the schema to coerce dates
-  const result = formMetadataSchema.validate(metadata)
-
-  if (result.error) {
-    throw result.error
-  }
-
-  return result.value
+export function getFormMetadata(_slug) {
+  throw error
 }
 
+// eslint-disable-next-line jsdoc/require-returns-check
 /**
- * Retrieves a form definition from the form manager for a given id
- * @param {string} id - the id of the form
- * @param {FormStatus} state - the state of the form
+ * Dummy function to get form metadata.
+ * @param {string} _id - the id of the form
+ * @param {FormStatus} _state - the state of the form
+ * @returns {Promise<FormDefinition | undefined>}
  */
-export async function getFormDefinition(id, state) {
-  const getJsonByType = /** @type {typeof getJson<FormDefinition>} */ (getJson)
-
-  const suffix = state === FormStatus.Draft ? `/${state}` : ''
-  const { payload: definition } = await getJsonByType(
-    `${config.get('managerUrl')}/forms/${id}/definition${suffix}`
-  )
-
-  return definition
+export function getFormDefinition(_id, _state) {
+  throw error
 }
 
 /**
- * @import { FormDefinition, FormMetadata } from '@defra/forms-model'
+ * @import { FormStatus, FormDefinition, FormMetadata } from '@defra/forms-model'
  */

package/src/server/plugins/engine/services/localFormsService.js

@@ -0,0 +1,49 @@
+import { config } from '~/src/config/index.js'
+import { FileFormService } from '~/src/server/utils/file-form-service.js'
+
+// Create shared form metadata
+const now = new Date()
+const user = { id: 'user', displayName: 'Username' }
+const author = {
+  createdAt: now,
+  createdBy: user,
+  updatedAt: now,
+  updatedBy: user
+}
+const metadata = {
+  organisation: 'Defra',
+  teamName: 'Team name',
+  teamEmail: 'team@defra.gov.uk',
+  submissionGuidance: "Thanks for your submission, we'll be in touch",
+  notificationEmail: config.get('submissionEmailAddress'),
+  ...author,
+  live: author
+}
+
+/**
+ * Return an function rather than the service directly. This is to prevent consumer applications
+ * blowing up as they won't have these files on disk. We can defer the execution until when it's
+ * needed, i.e. the createServer function of the devtool.
+ */
+export const formsService = async () => {
+  // Instantiate the file loader form service
+  const loader = new FileFormService()
+
+  // Add a Json form
+  await loader.addForm('src/server/forms/register-as-a-unicorn-breeder.json', {
+    ...metadata,
+    id: '95e92559-968d-44ae-8666-2b1ad3dffd31',
+    title: 'Register as a unicorn breeder',
+    slug: 'register-as-a-unicorn-breeder'
+  })
+
+  // Add a Yaml form
+  await loader.addForm('src/server/forms/register-as-a-unicorn-breeder.yaml', {
+    ...metadata,
+    id: '641aeafd-13dd-40fa-9186-001703800efb',
+    title: 'Register as a unicorn breeder (yaml)',
+    slug: 'register-as-a-unicorn-breeder-yaml' // if we needed to validate any JSON logic, make it available for convenience
+  })
+
+  return loader.toFormsService()
+}

package/src/server/plugins/engine/services/notifyService.ts

@@ -19,8 +19,7 @@ export async function submit(
   submitResponse: SubmitResponsePayload
 ) {
   const logTags = ['submit', 'email']
-  const { path } = request
-  const formStatus = checkFormStatus(path)
+  const formStatus = checkFormStatus(request.params)
 
   // Get submission email personalisation
   request.logger.info(logTags, 'Getting personalisation data')

package/src/server/plugins/engine/services/uploadService.js

@@ -10,12 +10,19 @@ const stagingPrefix = config.get('stagingPrefix')
  * Initiates a CDP file upload
  * @param {string} path - the path of the page in the form
  * @param {string} retrievalKey - the retrieval key for the files
- * @param {string} [mimeTypes] - the csv string of accepted mimeTypes
+ * @param {string} [mimeTypesCsv] - the csv string of accepted mimeTypes
  */
-export async function initiateUpload(path, retrievalKey, mimeTypes) {
+export async function initiateUpload(path, retrievalKey, mimeTypesCsv) {
   const postJsonByType =
     /** @type {typeof postJson<UploadInitiateResponse>} */ (postJson)
 
+  const mimeTypesList = mimeTypesCsv
+    ?.split(',')
+    .map((type) => type.trim())
+    .filter((type) => type !== '')
+
+  const mimeTypes = mimeTypesList?.length ? mimeTypesList : undefined
+
   const payload = {
     redirect: path,
     callback: `${submissionUrl}/file`,
@@ -24,10 +31,7 @@ export async function initiateUpload(path, retrievalKey, mimeTypes) {
     metadata: {
       retrievalKey
     },
-    mimeTypes: mimeTypes
-      ?.split(',')
-      .map((type) => type.trim())
-      .filter((type) => type !== '')
+    mimeTypes
     // maxFileSize: 25 * 1000 * 1000
   }
 

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

@@ -4,7 +4,7 @@ import {
   type List,
   type Page
 } from '@defra/forms-model'
-import { type ValidationErrorItem } from 'joi'
+import { type JoiExpression, type ValidationErrorItem } from 'joi'
 
 import { FormComponent } from '~/src/server/plugins/engine/components/FormComponent.js'
 import { type Component } from '~/src/server/plugins/engine/components/helpers.js'
@@ -316,3 +316,12 @@ export type PageViewModel =
   | FeaturedFormPageViewModel
 
 export type FilterFunction = (value: unknown) => unknown
+export interface ErrorMessageTemplate {
+  type: string
+  template: JoiExpression
+}
+
+export interface ErrorMessageTemplateList {
+  baseErrors: ErrorMessageTemplate[]
+  advancedSettingsErrors: ErrorMessageTemplate[]
+}

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

@@ -1,3 +1,3 @@
 {% macro Html(component) %}
-    {{ component.model.content | safe }}
+  {{ component.model.content | safe }}
 {% endmacro %}

package/src/server/plugins/engine/views/components/markdown.html

@@ -0,0 +1,5 @@
+{% macro Markdown(component) %}
+  <div class="app-prose-scope">
+    {{ component.model.content | markdown | safe }}
+  </div>
+{% endmacro %}

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

@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends baseLayoutPath %}
 
 {% from "govuk/components/panel/macro.njk" import govukPanel %}
 

package/src/server/plugins/engine/views/file-upload.html

@@ -35,7 +35,7 @@
 {% block bodyEnd %}
   {{ super() }}
   <script type="module" nonce="{{ cspNonce }}">
-    import { initFileUpload } from '{{ getAssetPath("file-upload.js") }}';
+    import { initFileUpload } from '{{ getDxtAssetPath("file-upload.js") }}';
     if (document.readyState === 'loading') {
       document.addEventListener('DOMContentLoaded', initFileUpload);
     } else {

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

@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends baseLayoutPath %}
 
 {% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
 {% from "partials/components.html" import componentList with context %}

package/src/server/plugins/engine/views/item-delete.html

@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends baseLayoutPath %}
 
 {% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
 {% from "govuk/components/button/macro.njk" import govukButton %}