@defra/forms-engine-plugin 0.1.13 → 0.1.15

package/src/server/plugins/nunjucks/context.test.js

@@ -10,14 +10,14 @@ describe('Nunjucks context', () => {
 
   describe('Asset path', () => {
     it("should include 'assetPath' for GOV.UK Frontend icons", () => {
-      const { assetPath } = devtoolContext()
+      const { assetPath } = devtoolContext(null)
       expect(assetPath).toBe('/assets')
     })
   })
 
   describe('Asset helper', () => {
     it("should locate 'assets-manifest.json' assets", () => {
-      const { getDxtAssetPath } = devtoolContext()
+      const { getDxtAssetPath } = devtoolContext(null)
 
       expect(getDxtAssetPath('example.scss')).toBe(
         '/stylesheets/example.xxxxxxx.min.css'
@@ -39,7 +39,7 @@ describe('Nunjucks context', () => {
 
         // Update config for missing manifest
         config.set('publicDir', tmpdir())
-        const { getDxtAssetPath } = devtoolContext()
+        const { getDxtAssetPath } = devtoolContext(null)
 
         // Uses original paths when missing
         expect(getDxtAssetPath('example.scss')).toBe('/example.scss')
@@ -48,24 +48,24 @@ describe('Nunjucks context', () => {
     })
 
     it('should return path to unknown assets', () => {
-      const { getDxtAssetPath } = devtoolContext()
+      const { getDxtAssetPath } = devtoolContext(null)
 
-      expect(getDxtAssetPath()).toBe('/')
+      expect(getDxtAssetPath('')).toBe('/')
       expect(getDxtAssetPath('example.jpg')).toBe('/example.jpg')
       expect(getDxtAssetPath('example.gif')).toBe('/example.gif')
     })
   })
 
   describe('Config', () => {
-    it('should include environment, phase tag and service info', () => {
-      expect(() => context(null)).toThrow(
+    it('should include environment, phase tag and service info', async () => {
+      await expect(context(null)).rejects.toThrow(
         'context called before plugin registered'
       )
     })
   })
 
   describe('Crumb', () => {
-    it('should handle malformed requests with missing state', () => {
+    it('should handle malformed requests with missing state', async () => {
       // While state should always exist in a valid Hapi request (it holds cookies),
       // we've seen malformed requests in production where it's missing
       const malformedRequest = /** @type {FormRequest} */ (
@@ -92,14 +92,14 @@ describe('Nunjucks context', () => {
         })
       )
 
-      const { crumb } = context(malformedRequest)
+      const { crumb } = await context(malformedRequest)
       expect(crumb).toBeUndefined()
       expect(
         malformedRequest.server.plugins.crumb.generate
       ).not.toHaveBeenCalled()
     })
 
-    it('should generate crumb when state exists', () => {
+    it('should generate crumb when state exists', async () => {
       const mockCrumb = 'generated-crumb-value'
       const validRequest = /** @type {FormRequest} */ (
         /** @type {unknown} */ ({
@@ -125,7 +125,7 @@ describe('Nunjucks context', () => {
         })
       )
 
-      const { crumb } = context(validRequest)
+      const { crumb } = await context(validRequest)
       expect(crumb).toBe(mockCrumb)
       expect(validRequest.server.plugins.crumb.generate).toHaveBeenCalledWith(
         validRequest

package/src/typings/hapi/index.d.ts

@@ -5,7 +5,6 @@ import { type ServerYar, type Yar } from '@hapi/yar'
 import { type Logger } from 'pino'
 
 import { type FormModel } from '~/src/server/plugins/engine/models/index.js'
-import { type context } from '~/src/server/plugins/engine/nunjucks.js'
 import {
   type FormRequest,
   type FormRequestPayload
@@ -22,7 +21,9 @@ declare module '@hapi/hapi' {
     'forms-engine-plugin': {
       baseLayoutPath: string
       cacheService: CacheService
-      viewContext: context
+      viewContext?: (
+        request: FormRequest | FormRequestPayload | null
+      ) => Record<string, unknown> | Promise<Record<string, unknown>>
     }
   }
 

package/.server/client/stylesheets/_service-banner.scss

@@ -1,24 +0,0 @@
-@use "govuk-frontend" as *;
-
-.app-service-banner {
-  display: block;
-  background: govuk-colour("yellow");
-  color: govuk-colour("black");
-
-  @include govuk-responsive-padding(2, "top");
-  @include govuk-responsive-padding(2, "bottom");
-
-  &__content {
-    margin: 0;
-  }
-
-  .govuk-warning-text__text {
-    font-weight: $govuk-font-weight-regular;
-  }
-
-  .govuk-skip-link:active + &,
-  .govuk-skip-link:focus + & {
-    // Ofset service banner from skip link
-    margin-top: $govuk-border-width + $govuk-focus-width;
-  }
-}

package/src/client/stylesheets/_service-banner.scss

@@ -1,24 +0,0 @@
-@use "govuk-frontend" as *;
-
-.app-service-banner {
-  display: block;
-  background: govuk-colour("yellow");
-  color: govuk-colour("black");
-
-  @include govuk-responsive-padding(2, "top");
-  @include govuk-responsive-padding(2, "bottom");
-
-  &__content {
-    margin: 0;
-  }
-
-  .govuk-warning-text__text {
-    font-weight: $govuk-font-weight-regular;
-  }
-
-  .govuk-skip-link:active + &,
-  .govuk-skip-link:focus + & {
-    // Ofset service banner from skip link
-    margin-top: $govuk-border-width + $govuk-focus-width;
-  }
-}