@defra/forms-engine-plugin 1.0.1 → 1.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.server/server/plugins/engine/configureEnginePlugin.d.ts +2 -1
- package/.server/server/plugins/engine/configureEnginePlugin.js +1 -1
- package/.server/server/plugins/engine/configureEnginePlugin.js.map +1 -1
- package/.server/server/plugins/engine/options.d.ts +7 -0
- package/.server/server/plugins/engine/options.js +36 -0
- package/.server/server/plugins/engine/options.js.map +1 -0
- package/.server/server/plugins/engine/options.test.js +33 -0
- package/.server/server/plugins/engine/options.test.js.map +1 -0
- package/.server/server/plugins/engine/plugin.d.ts +2 -30
- package/.server/server/plugins/engine/plugin.js +12 -596
- package/.server/server/plugins/engine/plugin.js.map +1 -1
- package/.server/server/plugins/engine/registrationOptions.d.ts +1 -0
- package/.server/server/plugins/engine/registrationOptions.js +2 -0
- package/.server/server/plugins/engine/registrationOptions.js.map +1 -0
- package/.server/server/plugins/engine/routes/file-upload.d.ts +4 -0
- package/.server/server/plugins/engine/routes/file-upload.js +41 -0
- package/.server/server/plugins/engine/routes/file-upload.js.map +1 -0
- package/.server/server/plugins/engine/routes/index.d.ts +7 -0
- package/.server/server/plugins/engine/routes/index.js +141 -0
- package/.server/server/plugins/engine/routes/index.js.map +1 -0
- package/.server/server/plugins/engine/routes/questions.d.ts +3 -0
- package/.server/server/plugins/engine/routes/questions.js +168 -0
- package/.server/server/plugins/engine/routes/questions.js.map +1 -0
- package/.server/server/plugins/engine/routes/repeaters/item-delete.d.ts +3 -0
- package/.server/server/plugins/engine/routes/repeaters/item-delete.js +106 -0
- package/.server/server/plugins/engine/routes/repeaters/item-delete.js.map +1 -0
- package/.server/server/plugins/engine/routes/repeaters/summary.d.ts +3 -0
- package/.server/server/plugins/engine/routes/repeaters/summary.js +98 -0
- package/.server/server/plugins/engine/routes/repeaters/summary.js.map +1 -0
- package/.server/server/plugins/engine/types.d.ts +19 -1
- package/.server/server/plugins/engine/types.js.map +1 -1
- package/.server/server/plugins/engine/vision.d.ts +12 -0
- package/.server/server/plugins/engine/vision.js +55 -0
- package/.server/server/plugins/engine/vision.js.map +1 -0
- package/package.json +1 -1
- package/src/server/plugins/engine/configureEnginePlugin.ts +3 -5
- package/src/server/plugins/engine/options.js +37 -0
- package/src/server/plugins/engine/options.test.js +34 -0
- package/src/server/plugins/engine/plugin.ts +30 -772
- package/src/server/plugins/engine/registrationOptions.ts +0 -0
- package/src/server/plugins/engine/routes/file-upload.ts +54 -0
- package/src/server/plugins/engine/routes/index.ts +187 -0
- package/src/server/plugins/engine/routes/questions.ts +208 -0
- package/src/server/plugins/engine/routes/repeaters/item-delete.ts +157 -0
- package/src/server/plugins/engine/routes/repeaters/summary.ts +137 -0
- package/src/server/plugins/engine/types.ts +26 -1
- package/src/server/plugins/engine/vision.ts +95 -0
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
// List summary GET route
|
|
2
|
+
import { slugSchema } from '@defra/forms-model'
|
|
3
|
+
import Boom from '@hapi/boom'
|
|
4
|
+
import {
|
|
5
|
+
type ResponseToolkit,
|
|
6
|
+
type RouteOptions,
|
|
7
|
+
type ServerRoute
|
|
8
|
+
} from '@hapi/hapi'
|
|
9
|
+
import Joi from 'joi'
|
|
10
|
+
|
|
11
|
+
import { RepeatPageController } from '~/src/server/plugins/engine/pageControllers/RepeatPageController.js'
|
|
12
|
+
import { redirectOrMakeHandler } from '~/src/server/plugins/engine/routes/index.js'
|
|
13
|
+
import {
|
|
14
|
+
type FormRequest,
|
|
15
|
+
type FormRequestPayload,
|
|
16
|
+
type FormRequestPayloadRefs,
|
|
17
|
+
type FormRequestRefs
|
|
18
|
+
} from '~/src/server/routes/types.js'
|
|
19
|
+
import {
|
|
20
|
+
actionSchema,
|
|
21
|
+
crumbSchema,
|
|
22
|
+
pathSchema,
|
|
23
|
+
stateSchema
|
|
24
|
+
} from '~/src/server/schemas/index.js'
|
|
25
|
+
|
|
26
|
+
function getHandler(
|
|
27
|
+
request: FormRequest,
|
|
28
|
+
h: Pick<ResponseToolkit, 'redirect' | 'view'>
|
|
29
|
+
) {
|
|
30
|
+
const { params } = request
|
|
31
|
+
|
|
32
|
+
return redirectOrMakeHandler(request, h, (page, context) => {
|
|
33
|
+
if (!(page instanceof RepeatPageController)) {
|
|
34
|
+
throw Boom.notFound(`No repeater page found for /${params.path}`)
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
return page.makeGetListSummaryRouteHandler()(request, context, h)
|
|
38
|
+
})
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
function postHandler(
|
|
42
|
+
request: FormRequestPayload,
|
|
43
|
+
h: Pick<ResponseToolkit, 'redirect' | 'view'>
|
|
44
|
+
) {
|
|
45
|
+
const { params } = request
|
|
46
|
+
|
|
47
|
+
return redirectOrMakeHandler(request, h, (page, context) => {
|
|
48
|
+
const { isForceAccess } = context
|
|
49
|
+
|
|
50
|
+
if (isForceAccess || !(page instanceof RepeatPageController)) {
|
|
51
|
+
throw Boom.notFound(`No repeater page found for /${params.path}`)
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
return page.makePostListSummaryRouteHandler()(request, context, h)
|
|
55
|
+
})
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
export function getRoutes(
|
|
59
|
+
getRouteOptions: RouteOptions<FormRequestRefs>,
|
|
60
|
+
postRouteOptions: RouteOptions<FormRequestPayloadRefs>
|
|
61
|
+
): (ServerRoute<FormRequestRefs> | ServerRoute<FormRequestPayloadRefs>)[] {
|
|
62
|
+
return [
|
|
63
|
+
{
|
|
64
|
+
method: 'get',
|
|
65
|
+
path: '/{slug}/{path}/summary',
|
|
66
|
+
handler: getHandler,
|
|
67
|
+
options: {
|
|
68
|
+
...getRouteOptions,
|
|
69
|
+
validate: {
|
|
70
|
+
params: Joi.object().keys({
|
|
71
|
+
slug: slugSchema,
|
|
72
|
+
path: pathSchema
|
|
73
|
+
})
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
},
|
|
77
|
+
|
|
78
|
+
{
|
|
79
|
+
method: 'get',
|
|
80
|
+
path: '/preview/{state}/{slug}/{path}/summary',
|
|
81
|
+
handler: getHandler,
|
|
82
|
+
options: {
|
|
83
|
+
...getRouteOptions,
|
|
84
|
+
validate: {
|
|
85
|
+
params: Joi.object().keys({
|
|
86
|
+
state: stateSchema,
|
|
87
|
+
slug: slugSchema,
|
|
88
|
+
path: pathSchema
|
|
89
|
+
})
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
},
|
|
93
|
+
|
|
94
|
+
{
|
|
95
|
+
method: 'post',
|
|
96
|
+
path: '/{slug}/{path}/summary',
|
|
97
|
+
handler: postHandler,
|
|
98
|
+
options: {
|
|
99
|
+
...postRouteOptions,
|
|
100
|
+
validate: {
|
|
101
|
+
params: Joi.object().keys({
|
|
102
|
+
slug: slugSchema,
|
|
103
|
+
path: pathSchema
|
|
104
|
+
}),
|
|
105
|
+
payload: Joi.object()
|
|
106
|
+
.keys({
|
|
107
|
+
crumb: crumbSchema,
|
|
108
|
+
action: actionSchema
|
|
109
|
+
})
|
|
110
|
+
.required()
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
},
|
|
114
|
+
|
|
115
|
+
{
|
|
116
|
+
method: 'post',
|
|
117
|
+
path: '/preview/{state}/{slug}/{path}/summary',
|
|
118
|
+
handler: postHandler,
|
|
119
|
+
options: {
|
|
120
|
+
...postRouteOptions,
|
|
121
|
+
validate: {
|
|
122
|
+
params: Joi.object().keys({
|
|
123
|
+
state: stateSchema,
|
|
124
|
+
slug: slugSchema,
|
|
125
|
+
path: pathSchema
|
|
126
|
+
}),
|
|
127
|
+
payload: Joi.object()
|
|
128
|
+
.keys({
|
|
129
|
+
crumb: crumbSchema,
|
|
130
|
+
action: actionSchema
|
|
131
|
+
})
|
|
132
|
+
.required()
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
]
|
|
137
|
+
}
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
type List,
|
|
5
5
|
type Page
|
|
6
6
|
} from '@defra/forms-model'
|
|
7
|
+
import { type PluginProperties, type Request } from '@hapi/hapi'
|
|
7
8
|
import { type JoiExpression, type ValidationErrorItem } from 'joi'
|
|
8
9
|
|
|
9
10
|
import { FormComponent } from '~/src/server/plugins/engine/components/FormComponent.js'
|
|
@@ -13,10 +14,16 @@ import {
|
|
|
13
14
|
type ComponentText,
|
|
14
15
|
type ComponentViewModel
|
|
15
16
|
} from '~/src/server/plugins/engine/components/types.js'
|
|
17
|
+
import { type FormModel } from '~/src/server/plugins/engine/models/index.js'
|
|
16
18
|
import { type PageController } from '~/src/server/plugins/engine/pageControllers/PageController.js'
|
|
17
19
|
import { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers.js'
|
|
18
20
|
import { type ViewContext } from '~/src/server/plugins/nunjucks/types.js'
|
|
19
|
-
import {
|
|
21
|
+
import {
|
|
22
|
+
type FormAction,
|
|
23
|
+
type FormRequest,
|
|
24
|
+
type FormRequestPayload
|
|
25
|
+
} from '~/src/server/routes/types.js'
|
|
26
|
+
import { type Services } from '~/src/server/types.js'
|
|
20
27
|
|
|
21
28
|
/**
|
|
22
29
|
* Form submission state stores the following in Redis:
|
|
@@ -325,3 +332,21 @@ export interface ErrorMessageTemplateList {
|
|
|
325
332
|
baseErrors: ErrorMessageTemplate[]
|
|
326
333
|
advancedSettingsErrors: ErrorMessageTemplate[]
|
|
327
334
|
}
|
|
335
|
+
|
|
336
|
+
export interface PluginOptions {
|
|
337
|
+
model?: FormModel
|
|
338
|
+
services?: Services
|
|
339
|
+
controllers?: Record<string, typeof PageController>
|
|
340
|
+
cacheName?: string
|
|
341
|
+
filters?: Record<string, FilterFunction>
|
|
342
|
+
keyGenerator?: (request: Request | FormRequest | FormRequestPayload) => string
|
|
343
|
+
sessionHydrator?: (
|
|
344
|
+
request: Request | FormRequest | FormRequestPayload
|
|
345
|
+
) => Promise<FormSubmissionState>
|
|
346
|
+
pluginPath?: string
|
|
347
|
+
nunjucks: {
|
|
348
|
+
baseLayoutPath: string
|
|
349
|
+
paths: string[]
|
|
350
|
+
}
|
|
351
|
+
viewContext: PluginProperties['forms-engine-plugin']['viewContext']
|
|
352
|
+
}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import { existsSync } from 'fs'
|
|
2
|
+
import { dirname, join } from 'path'
|
|
3
|
+
import { fileURLToPath } from 'url'
|
|
4
|
+
|
|
5
|
+
import { type Server } from '@hapi/hapi'
|
|
6
|
+
import vision from '@hapi/vision'
|
|
7
|
+
import nunjucks, { type Environment } from 'nunjucks'
|
|
8
|
+
import resolvePkg from 'resolve'
|
|
9
|
+
|
|
10
|
+
import {
|
|
11
|
+
VIEW_PATH,
|
|
12
|
+
context,
|
|
13
|
+
prepareNunjucksEnvironment
|
|
14
|
+
} from '~/src/server/plugins/engine/index.js'
|
|
15
|
+
import { type PluginOptions } from '~/src/server/plugins/engine/types.js'
|
|
16
|
+
|
|
17
|
+
export async function registerVision(
|
|
18
|
+
server: Server,
|
|
19
|
+
pluginOptions: PluginOptions
|
|
20
|
+
) {
|
|
21
|
+
const packageRoot = findPackageRoot()
|
|
22
|
+
const govukFrontendPath = dirname(
|
|
23
|
+
resolvePkg.sync('govuk-frontend/package.json')
|
|
24
|
+
)
|
|
25
|
+
|
|
26
|
+
const viewPathResolved = join(packageRoot, VIEW_PATH)
|
|
27
|
+
|
|
28
|
+
const paths = [
|
|
29
|
+
...pluginOptions.nunjucks.paths,
|
|
30
|
+
viewPathResolved,
|
|
31
|
+
join(govukFrontendPath, 'dist')
|
|
32
|
+
]
|
|
33
|
+
|
|
34
|
+
await server.register({
|
|
35
|
+
plugin: vision,
|
|
36
|
+
options: {
|
|
37
|
+
engines: {
|
|
38
|
+
html: {
|
|
39
|
+
compile: (
|
|
40
|
+
path: string,
|
|
41
|
+
compileOptions: { environment: Environment }
|
|
42
|
+
) => {
|
|
43
|
+
const template = nunjucks.compile(path, compileOptions.environment)
|
|
44
|
+
|
|
45
|
+
return (context: object | undefined) => {
|
|
46
|
+
return template.render(context)
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
prepare: (
|
|
50
|
+
options: EngineConfigurationObject,
|
|
51
|
+
next: (err?: Error) => void
|
|
52
|
+
) => {
|
|
53
|
+
// Nunjucks also needs an additional path configuration
|
|
54
|
+
// to use the templates and macros from `govuk-frontend`
|
|
55
|
+
const environment = nunjucks.configure(paths)
|
|
56
|
+
|
|
57
|
+
// Applies custom filters and globals for nunjucks
|
|
58
|
+
// that are required by the `forms-engine-plugin`
|
|
59
|
+
prepareNunjucksEnvironment(environment, pluginOptions.filters)
|
|
60
|
+
|
|
61
|
+
options.compileOptions.environment = environment
|
|
62
|
+
|
|
63
|
+
next()
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
},
|
|
67
|
+
path: paths,
|
|
68
|
+
// Provides global context used with all templates
|
|
69
|
+
context
|
|
70
|
+
}
|
|
71
|
+
})
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
interface CompileOptions {
|
|
75
|
+
environment: Environment
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
export interface EngineConfigurationObject {
|
|
79
|
+
compileOptions: CompileOptions
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
export function findPackageRoot() {
|
|
83
|
+
const currentFileName = fileURLToPath(import.meta.url)
|
|
84
|
+
const currentDirectoryName = dirname(currentFileName)
|
|
85
|
+
|
|
86
|
+
let dir = currentDirectoryName
|
|
87
|
+
while (dir !== '/') {
|
|
88
|
+
if (existsSync(join(dir, 'package.json'))) {
|
|
89
|
+
return dir
|
|
90
|
+
}
|
|
91
|
+
dir = dirname(dir)
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
throw new Error('package.json not found in parent directories')
|
|
95
|
+
}
|