feat(DF-789): render unavailable view when form is offline (#398)

* feat(DF-789): render unavailable view when form is offline

* chore: update @defra/forms-model dependency to version 3.0.663 in package.json and package-lock.json

* chore: fix CI check failures (formatting, linting, and typing)

* test: increase coverage for form offline feature

* chore: add full stop to unavailable message and reiterate registration order comment

Author: mokhld

package-lock.json

@@ -87,7 +87,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "dependencies": {
-    "@defra/forms-model": "^3.0.655",
+    "@defra/forms-model": "^3.0.663",
     "@defra/hapi-tracing": "^1.29.0",
     "@defra/interactive-map": "^0.0.22-alpha",
     "@elastic/ecs-pino-format": "^1.5.0",

package.json

@@ -27,11 +27,11 @@ describe('Model cache', () => {
   let server: Server
 
   const getCacheSize = () => {
-    return server.app.models.size
+    return server.app.models?.size ?? 0
   }
 
   const getCacheItem = (key: string) => {
-    return server.app.models.get(key)
+    return server.app.models?.get(key)
   }
 
   beforeAll(async () => {
@@ -43,7 +43,7 @@ describe('Model cache', () => {
 
   beforeEach(() => {
     jest.mocked(getFormMetadata).mockResolvedValue(fixtures.form.metadata)
-    server.app.models.clear()
+    server.app.models?.clear()
   })
 
   afterAll(async () => {

src/server/index.test.ts

@@ -3,6 +3,7 @@ import { type Request, type Server } from '@hapi/hapi'
 import { isEqual } from 'date-fns'
 
 import { PREVIEW_PATH_PREFIX } from '~/src/server/constants.js'
+import { assertFormAvailable } from '~/src/server/plugins/engine/form-availability.js'
 import {
   checkEmailAddressForLiveFormSubmission,
   getCacheService
@@ -52,6 +53,7 @@ export async function getFormModel(
   const formState = resolveState(state)
 
   const metadata = await formsService.getFormMetadata(slug)
+  assertFormAvailable(metadata)
 
   const definition = await formsService.getFormDefinition(
     metadata.id,
@@ -134,6 +136,7 @@ export async function resolveFormModel(
   const { formsService } = services
 
   const metadata = await formsService.getFormMetadata(slug)
+  assertFormAvailable(metadata)
   const formState = resolveState(state)
   const isPreview = options.isPreview ?? isPreviewState(state, options)
   const stateMetadata = metadata[formState]
@@ -145,15 +148,10 @@ export async function resolveFormModel(
   }
 
   // The models cache is created lazily per server instance
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-  if (!server.app.models) {
-    server.app.models = new Map<string, { model: FormModel; updatedAt: Date }>()
-  }
 
-  const cache = server.app.models as Map<
-    string,
-    { model: FormModel; updatedAt: Date }
-  >
+  server.app.models ??= new Map<string, { model: FormModel; updatedAt: Date }>()
+
+  const cache = server.app.models
 
   const cacheKey = `${metadata.id}_${formState}_${isPreview}`
   let entry = cache.get(cacheKey)

src/server/plugins/engine/beta/form-context.ts

@@ -116,7 +116,7 @@ export function getGeospatialSchema(country?: GeospatialFieldOptionsCountry) {
       return value
     }
 
-    const result = booleanWithin(value, countryFeature)
+    const result = booleanWithin(value as Geometry | Feature, countryFeature)
 
     if (!result) {
       return helpers.error('any.custom', {