@dwp/govuk-casa 9.5.3 → 9.6.0
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/dist/casa.d.ts +12 -1
- package/dist/casa.js +7 -1
- package/dist/casa.js.map +1 -1
- package/dist/lib/configuration-ingestor.d.ts +20 -0
- package/dist/lib/configuration-ingestor.js +43 -0
- package/dist/lib/configuration-ingestor.js.map +1 -1
- package/dist/lib/configure.js +5 -1
- package/dist/lib/configure.js.map +1 -1
- package/dist/lib/nunjucks.d.ts +2 -1
- package/dist/lib/nunjucks.js +3 -1
- package/dist/lib/nunjucks.js.map +1 -1
- package/dist/middleware/data.d.ts +3 -1
- package/dist/middleware/data.js +5 -2
- package/dist/middleware/data.js.map +1 -1
- package/dist/mjs/esm-wrapper.js +1 -0
- package/dist/routes/journey.d.ts +12 -0
- package/dist/routes/journey.js +15 -6
- package/dist/routes/journey.js.map +1 -1
- package/package.json +2 -2
- package/src/casa.js +6 -0
- package/src/lib/configuration-ingestor.js +49 -0
- package/src/lib/configure.js +5 -0
- package/src/lib/nunjucks.js +3 -1
- package/src/middleware/data.js +10 -2
- package/src/routes/journey.js +14 -5
- package/views/casa/layouts/main.njk +21 -8
package/dist/casa.d.ts
CHANGED
|
@@ -68,6 +68,11 @@ export type I18nOptions = {
|
|
|
68
68
|
* Directories to search for locale dictionaries
|
|
69
69
|
*/
|
|
70
70
|
dirs: string[];
|
|
71
|
+
/**
|
|
72
|
+
* Fallback language to use if
|
|
73
|
+
* translations aren't available for a given key. Default is `false`
|
|
74
|
+
*/
|
|
75
|
+
fallbackLng?: string | false | undefined;
|
|
71
76
|
/**
|
|
72
77
|
* Supported locales. Default is
|
|
73
78
|
* `['en', 'cy']`
|
|
@@ -235,6 +240,11 @@ export type ConfigurationOptions = {
|
|
|
235
240
|
* active on GET request
|
|
236
241
|
*/
|
|
237
242
|
errorVisibility?: symbol | Function | undefined;
|
|
243
|
+
/**
|
|
244
|
+
* Sets whether you wish to use the
|
|
245
|
+
* govuk rebrand. Default is `false`
|
|
246
|
+
*/
|
|
247
|
+
govukRebrand?: boolean | undefined;
|
|
238
248
|
};
|
|
239
249
|
/**
|
|
240
250
|
* Result of a call to configure() function
|
|
@@ -547,8 +557,9 @@ import ValidationError from "./lib/ValidationError.js";
|
|
|
547
557
|
import MutableRouter from "./lib/MutableRouter.js";
|
|
548
558
|
import waypointUrl from "./lib/waypoint-url.js";
|
|
549
559
|
import endSession from "./lib/end-session.js";
|
|
560
|
+
import { generateGovukErrors } from "./routes/journey.js";
|
|
550
561
|
import * as nunjucksFilters from "./lib/nunjucks-filters.js";
|
|
551
562
|
import * as constants from "./lib/constants.js";
|
|
552
563
|
import * as contextIdGenerators from "./lib/context-id-generators.js";
|
|
553
564
|
import * as corePlugins from "./core-plugins/index.js";
|
|
554
|
-
export { configure, validators, field, Plan, JourneyContext, ValidatorFactory, ValidationError, MutableRouter, waypointUrl, endSession, nunjucksFilters, constants, contextIdGenerators, corePlugins };
|
|
565
|
+
export { configure, validators, field, Plan, JourneyContext, ValidatorFactory, ValidationError, MutableRouter, waypointUrl, endSession, generateGovukErrors, nunjucksFilters, constants, contextIdGenerators, corePlugins };
|
package/dist/casa.js
CHANGED
|
@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.corePlugins = exports.contextIdGenerators = exports.constants = exports.nunjucksFilters = exports.endSession = exports.waypointUrl = exports.MutableRouter = exports.ValidationError = exports.ValidatorFactory = exports.JourneyContext = exports.Plan = exports.field = exports.validators = exports.configure = void 0;
|
|
39
|
+
exports.corePlugins = exports.contextIdGenerators = exports.constants = exports.nunjucksFilters = exports.generateGovukErrors = exports.endSession = exports.waypointUrl = exports.MutableRouter = exports.ValidationError = exports.ValidatorFactory = exports.JourneyContext = exports.Plan = exports.field = exports.validators = exports.configure = void 0;
|
|
40
40
|
// NOTE: Any changes made here must be reflected in `scripts/esm-wrapper.js`
|
|
41
41
|
const configure_js_1 = __importDefault(require("./lib/configure.js"));
|
|
42
42
|
exports.configure = configure_js_1.default;
|
|
@@ -58,6 +58,8 @@ const waypoint_url_js_1 = __importDefault(require("./lib/waypoint-url.js"));
|
|
|
58
58
|
exports.waypointUrl = waypoint_url_js_1.default;
|
|
59
59
|
const end_session_js_1 = __importDefault(require("./lib/end-session.js"));
|
|
60
60
|
exports.endSession = end_session_js_1.default;
|
|
61
|
+
const journey_js_1 = require("./routes/journey.js");
|
|
62
|
+
Object.defineProperty(exports, "generateGovukErrors", { enumerable: true, get: function () { return journey_js_1.generateGovukErrors; } });
|
|
61
63
|
const nunjucksFilters = __importStar(require("./lib/nunjucks-filters.js"));
|
|
62
64
|
exports.nunjucksFilters = nunjucksFilters;
|
|
63
65
|
const constants = __importStar(require("./lib/constants.js"));
|
|
@@ -105,6 +107,8 @@ exports.corePlugins = corePlugins;
|
|
|
105
107
|
/**
|
|
106
108
|
* @typedef {object} I18nOptions
|
|
107
109
|
* @property {string[]} dirs Directories to search for locale dictionaries
|
|
110
|
+
* @property {string | false} [fallbackLng=false] Fallback language to use if
|
|
111
|
+
* translations aren't available for a given key. Default is `false`
|
|
108
112
|
* @property {string[]} [locales=['en', 'cy']] Supported locales. Default is
|
|
109
113
|
* `['en', 'cy']`
|
|
110
114
|
*/
|
|
@@ -194,6 +198,8 @@ exports.corePlugins = corePlugins;
|
|
|
194
198
|
* generator
|
|
195
199
|
* @property {symbol | Function} [errorVisibility] Option to keep page errors
|
|
196
200
|
* active on GET request
|
|
201
|
+
* @property {boolean} [govukRebrand=false] Sets whether you wish to use the
|
|
202
|
+
* govuk rebrand. Default is `false`
|
|
197
203
|
*/
|
|
198
204
|
/**
|
|
199
205
|
* @typedef {object} ConfigureResult Result of a call to configure() function
|
package/dist/casa.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"casa.js","sourceRoot":"","sources":["../src/casa.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAA4E;AAC5E,sEAA2C;
|
|
1
|
+
{"version":3,"file":"casa.js","sourceRoot":"","sources":["../src/casa.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4EAA4E;AAC5E,sEAA2C;AAkBzC,oBAlBK,sBAAS,CAkBL;AAjBX,yEAAmD;AAkBjD,qBAlBK,kBAAU,CAkBL;AAjBZ,8DAAmC;AAkBjC,gBAlBK,kBAAK,CAkBL;AAjBP,4DAAiC;AAkB/B,eAlBK,iBAAI,CAkBL;AAjBN,gFAAqD;AAkBnD,yBAlBK,2BAAc,CAkBL;AAjBhB,oFAAyD;AAkBvD,2BAlBK,6BAAgB,CAkBL;AAjBlB,kFAAuD;AAkBrD,0BAlBK,4BAAe,CAkBL;AAjBjB,8EAAmD;AAkBjD,wBAlBK,0BAAa,CAkBL;AAjBf,4EAAgD;AAoB9C,sBApBK,yBAAW,CAoBL;AAnBb,0EAA8C;AAoB5C,qBApBK,wBAAU,CAoBL;AAnBZ,oDAA0D;AAoBxD,oGApBO,gCAAmB,OAoBP;AAnBrB,2EAA6D;AAsB3D,0CAAe;AArBjB,8DAAgD;AAwB9C,8BAAS;AAvBX,oFAAsE;AA0BpE,kDAAmB;AAzBrB,qEAAuD;AA4BrD,kCAAW;AAGb,gFAAgF;AAChF,qEAAqE;AAErE,2DAA2D;AAE3D;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;;;;;;GASG;AAEH;;;;;;;GAOG;AAEH;;;;;;;GAOG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;;;GAYG;AAEH;;;;;GAKG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;;GAIG;AAEH;;;;;;;;;;;;;;;GAeG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH;;;;;;;GAOG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;;;;GAOG;AAEH;;;;;GAKG;AAEH;;;;GAIG;AAEH;;;;;;;GAOG;AAEH;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;GAaG"}
|
|
@@ -28,6 +28,17 @@ export function validateI18nDirs(dirs?: any[]): any[];
|
|
|
28
28
|
* @access private
|
|
29
29
|
*/
|
|
30
30
|
export function validateI18nLocales(locales?: any[]): any[];
|
|
31
|
+
/**
|
|
32
|
+
* Validates the i18n fallback language.
|
|
33
|
+
*
|
|
34
|
+
* @param {string} [fallback] Locale
|
|
35
|
+
* @param {Array} locales Array of valid locales.
|
|
36
|
+
* @returns {string} Fallback locale
|
|
37
|
+
* @throws {SyntaxError} For invalid locales.
|
|
38
|
+
* @throws {TypeError} For invalid type.
|
|
39
|
+
* @access private
|
|
40
|
+
*/
|
|
41
|
+
export function validateI18nFallbackLng(fallback?: string, locales?: any[]): string;
|
|
31
42
|
/**
|
|
32
43
|
* Validates and sanitises mount url.
|
|
33
44
|
*
|
|
@@ -206,6 +217,15 @@ export function validateFormMaxBytes(value: number, defaultValue?: number): numb
|
|
|
206
217
|
* @throws {TypeError} If not a function
|
|
207
218
|
*/
|
|
208
219
|
export function validateContextIdGenerator(generator: ContextIdGenerator): ContextIdGenerator;
|
|
220
|
+
/**
|
|
221
|
+
* Validates the govuk rebrand feature flag.
|
|
222
|
+
*
|
|
223
|
+
* @param {boolean} [govukRebrand] Govuk rebrand feature flag
|
|
224
|
+
* @returns {boolean | true} Boolean.
|
|
225
|
+
* @throws {TypeError} For invalid feagure flag is set.
|
|
226
|
+
* @access private
|
|
227
|
+
*/
|
|
228
|
+
export function validateGovukRebrand(govukRebrand?: boolean): boolean | true;
|
|
209
229
|
/**
|
|
210
230
|
* Ingest, validate, sanitise and manipulate configuration parameters.
|
|
211
231
|
*
|
|
@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
39
39
|
exports.validateI18nObject = validateI18nObject;
|
|
40
40
|
exports.validateI18nDirs = validateI18nDirs;
|
|
41
41
|
exports.validateI18nLocales = validateI18nLocales;
|
|
42
|
+
exports.validateI18nFallbackLng = validateI18nFallbackLng;
|
|
42
43
|
exports.validateMountUrl = validateMountUrl;
|
|
43
44
|
exports.validateSessionObject = validateSessionObject;
|
|
44
45
|
exports.validateViews = validateViews;
|
|
@@ -61,6 +62,7 @@ exports.validateHelmetConfigurator = validateHelmetConfigurator;
|
|
|
61
62
|
exports.validateFormMaxParams = validateFormMaxParams;
|
|
62
63
|
exports.validateFormMaxBytes = validateFormMaxBytes;
|
|
63
64
|
exports.validateContextIdGenerator = validateContextIdGenerator;
|
|
65
|
+
exports.validateGovukRebrand = validateGovukRebrand;
|
|
64
66
|
exports.default = ingest;
|
|
65
67
|
const bytes_1 = __importDefault(require("bytes"));
|
|
66
68
|
const field_js_1 = require("./field.js");
|
|
@@ -160,6 +162,28 @@ function validateI18nLocales(locales = ["en", "cy"]) {
|
|
|
160
162
|
}
|
|
161
163
|
return locales;
|
|
162
164
|
}
|
|
165
|
+
/**
|
|
166
|
+
* Validates the i18n fallback language.
|
|
167
|
+
*
|
|
168
|
+
* @param {string} [fallback] Locale
|
|
169
|
+
* @param {Array} locales Array of valid locales.
|
|
170
|
+
* @returns {string} Fallback locale
|
|
171
|
+
* @throws {SyntaxError} For invalid locales.
|
|
172
|
+
* @throws {TypeError} For invalid type.
|
|
173
|
+
* @access private
|
|
174
|
+
*/
|
|
175
|
+
function validateI18nFallbackLng(fallback, locales = ["en", "cy"]) {
|
|
176
|
+
if (fallback === undefined) {
|
|
177
|
+
return false;
|
|
178
|
+
}
|
|
179
|
+
if (typeof fallback !== "string") {
|
|
180
|
+
throw new TypeError("I18n fallback language must be a string (i18n.fallbackLng)");
|
|
181
|
+
}
|
|
182
|
+
if (!locales.includes(fallback)) {
|
|
183
|
+
throw new SyntaxError("I18n fallback language must be included in the locales array (i18n.fallbackLng)");
|
|
184
|
+
}
|
|
185
|
+
return fallback;
|
|
186
|
+
}
|
|
163
187
|
/**
|
|
164
188
|
* Validates and sanitises mount url.
|
|
165
189
|
*
|
|
@@ -574,6 +598,23 @@ function validateContextIdGenerator(generator) {
|
|
|
574
598
|
}
|
|
575
599
|
return generator;
|
|
576
600
|
}
|
|
601
|
+
/**
|
|
602
|
+
* Validates the govuk rebrand feature flag.
|
|
603
|
+
*
|
|
604
|
+
* @param {boolean} [govukRebrand] Govuk rebrand feature flag
|
|
605
|
+
* @returns {boolean | true} Boolean.
|
|
606
|
+
* @throws {TypeError} For invalid feagure flag is set.
|
|
607
|
+
* @access private
|
|
608
|
+
*/
|
|
609
|
+
function validateGovukRebrand(govukRebrand) {
|
|
610
|
+
if (govukRebrand === undefined) {
|
|
611
|
+
return false;
|
|
612
|
+
}
|
|
613
|
+
if (typeof govukRebrand !== "boolean") {
|
|
614
|
+
throw new TypeError("govukRebrand must be a boolean");
|
|
615
|
+
}
|
|
616
|
+
return govukRebrand;
|
|
617
|
+
}
|
|
577
618
|
/**
|
|
578
619
|
* Ingest, validate, sanitise and manipulate configuration parameters.
|
|
579
620
|
*
|
|
@@ -588,6 +629,7 @@ function ingest(config = {}) {
|
|
|
588
629
|
i18n: validateI18nObject(config.i18n, (i18n) => ({
|
|
589
630
|
dirs: validateI18nDirs(i18n.dirs),
|
|
590
631
|
locales: validateI18nLocales(i18n.locales),
|
|
632
|
+
fallbackLng: validateI18nFallbackLng(i18n.fallbackLng, i18n.locales),
|
|
591
633
|
})),
|
|
592
634
|
// URL that will prefix all URLs in the browser address bar
|
|
593
635
|
mountUrl: validateMountUrl(config.mountUrl),
|
|
@@ -622,6 +664,7 @@ function ingest(config = {}) {
|
|
|
622
664
|
formMaxBytes: validateFormMaxBytes(config.formMaxBytes, 1024 * 50),
|
|
623
665
|
// Context ID generator
|
|
624
666
|
contextIdGenerator: validateContextIdGenerator(config.contextIdGenerator),
|
|
667
|
+
govukRebrand: validateGovukRebrand(config.govukRebrand),
|
|
625
668
|
};
|
|
626
669
|
// Freeze to modifications
|
|
627
670
|
Object.freeze(parsed);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration-ingestor.js","sourceRoot":"","sources":["../../src/lib/configuration-ingestor.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"configuration-ingestor.js","sourceRoot":"","sources":["../../src/lib/configuration-ingestor.js"],"names":[],"mappings":"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"}
|
package/dist/lib/configure.js
CHANGED
|
@@ -61,7 +61,7 @@ function configure(config = {}) {
|
|
|
61
61
|
}, pages = [], plan = null, hooks = [], plugins = [], events = [], i18n = {
|
|
62
62
|
dirs: [],
|
|
63
63
|
locales: ["en", "cy"],
|
|
64
|
-
}, helmetConfigurator = undefined, formMaxParams, formMaxBytes, contextIdGenerator, } = ingestedConfig;
|
|
64
|
+
}, helmetConfigurator = undefined, formMaxParams, formMaxBytes, contextIdGenerator, govukRebrand = false, } = ingestedConfig;
|
|
65
65
|
// Prepare all page hooks so they are prefixed with the `journey.` scope.
|
|
66
66
|
for (const page of pages) {
|
|
67
67
|
if (page?.hooks) {
|
|
@@ -78,6 +78,7 @@ function configure(config = {}) {
|
|
|
78
78
|
(0, node_path_1.resolve)(dirname_cjs_1.default, "../../views"),
|
|
79
79
|
(0, node_path_1.resolve)((0, node_module_1.createRequire)(dirname_cjs_1.default).resolve("govuk-frontend"), "../../"),
|
|
80
80
|
],
|
|
81
|
+
govukRebrand,
|
|
81
82
|
});
|
|
82
83
|
// Prepare mandatory middleware
|
|
83
84
|
// These _must_ be added to the ExpressJS application at the start and end
|
|
@@ -109,6 +110,7 @@ function configure(config = {}) {
|
|
|
109
110
|
plan,
|
|
110
111
|
events,
|
|
111
112
|
contextIdGenerator,
|
|
113
|
+
govukRebrand,
|
|
112
114
|
});
|
|
113
115
|
// Prepare form middleware and its constituent parts
|
|
114
116
|
// These are used for any forms, including waypoint page forms.
|
|
@@ -152,6 +154,8 @@ function configure(config = {}) {
|
|
|
152
154
|
// Nunjucks environment, so it can be attached to other ExpressJS instances
|
|
153
155
|
// using `nunjucksEnv.express(myApp); myApp.set('view engine', 'njk');`.
|
|
154
156
|
nunjucksEnv,
|
|
157
|
+
// govuk rebrand flag
|
|
158
|
+
govukRebrand,
|
|
155
159
|
// Mandatory middleware. User must add these to their ExpressJS app.
|
|
156
160
|
preMiddleware,
|
|
157
161
|
postMiddleware,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../src/lib/configure.js"],"names":[],"mappings":";;;;;AAgDA,
|
|
1
|
+
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../src/lib/configure.js"],"names":[],"mappings":"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"}
|
package/dist/lib/nunjucks.d.ts
CHANGED
|
@@ -7,10 +7,11 @@
|
|
|
7
7
|
* Create a Nunjucks environment.
|
|
8
8
|
*
|
|
9
9
|
* @param {NunjucksOptions} options Nunjucks options
|
|
10
|
+
* @param {boolean} govukRebrand GovukRebrand flag
|
|
10
11
|
* @returns {Environment} Nunjucks Environment instance
|
|
11
12
|
* @access private
|
|
12
13
|
*/
|
|
13
|
-
export default function nunjucksConfig({ views }: NunjucksOptions): Environment;
|
|
14
|
+
export default function nunjucksConfig({ views, govukRebrand }: NunjucksOptions): Environment;
|
|
14
15
|
export type NunjucksOptions = {
|
|
15
16
|
/**
|
|
16
17
|
* Template file directories (optional, default
|
package/dist/lib/nunjucks.js
CHANGED
|
@@ -19,10 +19,11 @@ const nunjucks_filters_js_1 = require("./nunjucks-filters.js");
|
|
|
19
19
|
* Create a Nunjucks environment.
|
|
20
20
|
*
|
|
21
21
|
* @param {NunjucksOptions} options Nunjucks options
|
|
22
|
+
* @param {boolean} govukRebrand GovukRebrand flag
|
|
22
23
|
* @returns {Environment} Nunjucks Environment instance
|
|
23
24
|
* @access private
|
|
24
25
|
*/
|
|
25
|
-
function nunjucksConfig({ views = [] }) {
|
|
26
|
+
function nunjucksConfig({ views = [], govukRebrand }) {
|
|
26
27
|
// Prepare a single Nunjucks environment for all responses to use. Note that
|
|
27
28
|
// we cannot prepare response-specific global functions/filters if we use a
|
|
28
29
|
// single environment, but the performance gains of doing so are significant.
|
|
@@ -43,6 +44,7 @@ function nunjucksConfig({ views = [] }) {
|
|
|
43
44
|
env.addGlobal("casaVersion",
|
|
44
45
|
/* eslint-disable-next-line security/detect-non-literal-fs-filename */
|
|
45
46
|
JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(dirname_cjs_1.default, "../../package.json"))).version);
|
|
47
|
+
env.addGlobal("govukRebrand", govukRebrand);
|
|
46
48
|
env.addGlobal("mergeObjects", nunjucks_filters_js_1.mergeObjects);
|
|
47
49
|
env.addGlobal("includes", nunjucks_filters_js_1.includes);
|
|
48
50
|
env.addGlobal("formatDateObject", nunjucks_filters_js_1.formatDateObject);
|
package/dist/lib/nunjucks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nunjucks.js","sourceRoot":"","sources":["../../src/lib/nunjucks.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"nunjucks.js","sourceRoot":"","sources":["../../src/lib/nunjucks.js"],"names":[],"mappings":";;;;;AA0BA,iCAkCC;AA5DD,qCAAuC;AACvC,yCAAoC;AACpC,uCAAuC;AACvC,gEAAoC;AACpC,oFAAyD;AACzD,+DAK+B;AAE/B;;;;GAIG;AAEH;;;;;;;GAOG;AACH,SAAwB,cAAc,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,YAAY,EAAE;IACjE,4EAA4E;IAC5E,2EAA2E;IAC3E,6EAA6E;IAC7E,MAAM,MAAM,GAAG,IAAI,+BAAkB,CAAC,KAAK,EAAE;QAC3C,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE,KAAK;KACf,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAI,sBAAW,CAAC,MAAM,EAAE;QAClC,UAAU,EAAE,IAAI;QAChB,gBAAgB,EAAE,KAAK;QACvB,UAAU,EAAE,KAAK;QACjB,YAAY,EAAE,KAAK;KACpB,CAAC,CAAC;IAEH,yCAAyC;IACzC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAElD,UAAU;IACV,8EAA8E;IAC9E,GAAG,CAAC,SAAS,CACX,aAAa;IACb,sEAAsE;IACtE,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAA,mBAAO,EAAC,qBAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,OAAO,CACzE,CAAC;IAEF,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IAC5C,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,kCAAY,CAAC,CAAC;IAC5C,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,8BAAQ,CAAC,CAAC;IACpC,GAAG,CAAC,SAAS,CAAC,kBAAkB,EAAE,sCAAgB,CAAC,CAAC;IACpD,GAAG,CAAC,SAAS,CAAC,oBAAoB,EAAE,wCAAkB,CAAC,CAAC;IAExD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -9,9 +9,11 @@
|
|
|
9
9
|
* @param {Plan} opts.plan CASA Plan
|
|
10
10
|
* @param {ContextEventHandler[]} opts.events Event handlers
|
|
11
11
|
* @param {ContextIdGenerator} opts.contextIdGenerator Content ID generator
|
|
12
|
+
* @param {boolean} ops.govukRebrand Govuk rebrand feature flag
|
|
13
|
+
* @param opts.govukRebrand
|
|
12
14
|
* @returns {RequestHandler[]} Middleware functions
|
|
13
15
|
*/
|
|
14
|
-
export default function dataMiddleware({ plan, events, contextIdGenerator }: {
|
|
16
|
+
export default function dataMiddleware({ plan, events, contextIdGenerator, govukRebrand, }: {
|
|
15
17
|
plan: Plan;
|
|
16
18
|
events: ContextEventHandler[];
|
|
17
19
|
contextIdGenerator: ContextIdGenerator;
|
package/dist/middleware/data.js
CHANGED
|
@@ -43,9 +43,11 @@ const editOrigin = (req) => {
|
|
|
43
43
|
* @param {Plan} opts.plan CASA Plan
|
|
44
44
|
* @param {ContextEventHandler[]} opts.events Event handlers
|
|
45
45
|
* @param {ContextIdGenerator} opts.contextIdGenerator Content ID generator
|
|
46
|
+
* @param {boolean} ops.govukRebrand Govuk rebrand feature flag
|
|
47
|
+
* @param opts.govukRebrand
|
|
46
48
|
* @returns {RequestHandler[]} Middleware functions
|
|
47
49
|
*/
|
|
48
|
-
function dataMiddleware({ plan, events, contextIdGenerator }) {
|
|
50
|
+
function dataMiddleware({ plan, events, contextIdGenerator, govukRebrand, }) {
|
|
49
51
|
return [
|
|
50
52
|
(req, res, next) => {
|
|
51
53
|
/* ------------------------------------------------ Request decorations */
|
|
@@ -107,7 +109,8 @@ function dataMiddleware({ plan, events, contextIdGenerator }) {
|
|
|
107
109
|
// htmlLang = req.language is provided by i18n-http-middleware
|
|
108
110
|
// assetPath = used for linking to static assets in the govuk-frontend module
|
|
109
111
|
res.locals.htmlLang = req.language;
|
|
110
|
-
|
|
112
|
+
const rebrandAssetPath = govukRebrand ? "/rebrand" : "";
|
|
113
|
+
res.locals.assetPath = `${staticMountUrl}govuk/assets${rebrandAssetPath}`;
|
|
111
114
|
// Function for building URLs. This will be curried with the `mountUrl`,
|
|
112
115
|
// `journeyContext`, `edit` and `editOrigin` for convenience. This means
|
|
113
116
|
// the template author does not have to be concerned about the current
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/middleware/data.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/middleware/data.js"],"names":[],"mappings":"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"}
|
package/dist/mjs/esm-wrapper.js
CHANGED
|
@@ -14,6 +14,7 @@ export const { contextIdGenerators } = casa;
|
|
|
14
14
|
export const { corePlugins } = casa;
|
|
15
15
|
export const { endSession } = casa;
|
|
16
16
|
export const { field } = casa;
|
|
17
|
+
export const { generateGovukErrors } = casa;
|
|
17
18
|
export const { nunjucksFilters } = casa;
|
|
18
19
|
export const { validators } = casa;
|
|
19
20
|
export const { waypointUrl } = casa;
|
package/dist/routes/journey.d.ts
CHANGED
|
@@ -7,6 +7,18 @@
|
|
|
7
7
|
* @access private
|
|
8
8
|
*/
|
|
9
9
|
export default function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, globalErrorVisibility, }: JourneyRouterOptions): MutableRouter;
|
|
10
|
+
export function generateGovukErrors(errors: Record<string, ValidationError>, req: import("express").Request): GovUkErrorObject[];
|
|
11
|
+
export type ValidationError = import("../casa.js").ValidationError;
|
|
12
|
+
export type GovUkErrorObject = {
|
|
13
|
+
/**
|
|
14
|
+
* Error message text
|
|
15
|
+
*/
|
|
16
|
+
text: string;
|
|
17
|
+
/**
|
|
18
|
+
* Error message anchor href
|
|
19
|
+
*/
|
|
20
|
+
href: string;
|
|
21
|
+
};
|
|
10
22
|
/**
|
|
11
23
|
* Options to configure static router
|
|
12
24
|
*/
|
package/dist/routes/journey.js
CHANGED
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.generateGovukErrors = void 0;
|
|
6
7
|
exports.default = journeyRouter;
|
|
7
8
|
const MutableRouter_js_1 = __importDefault(require("../lib/MutableRouter.js"));
|
|
8
9
|
const skip_waypoint_js_1 = __importDefault(require("../middleware/skip-waypoint.js"));
|
|
@@ -28,6 +29,12 @@ const log = (0, logger_js_1.default)("routes:journey");
|
|
|
28
29
|
* @param {import("../casa.js").Plan} Plan
|
|
29
30
|
* @access private
|
|
30
31
|
*/
|
|
32
|
+
/** @typedef {import("../casa.js").ValidationError} ValidationError */
|
|
33
|
+
/**
|
|
34
|
+
* @typedef {object} GovUkErrorObject
|
|
35
|
+
* @property {string} text Error message text
|
|
36
|
+
* @property {string} href Error message anchor href
|
|
37
|
+
*/
|
|
31
38
|
/**
|
|
32
39
|
* @typedef {object} JourneyRouterOptions Options to configure static router
|
|
33
40
|
* @property {GlobalHook[]} globalHooks Global hooks
|
|
@@ -55,16 +62,18 @@ const renderMiddlewareFactory = (view, contextFactory) => [
|
|
|
55
62
|
},
|
|
56
63
|
];
|
|
57
64
|
/**
|
|
58
|
-
* Generate page validation
|
|
65
|
+
* Generate page validation errors
|
|
59
66
|
*
|
|
60
|
-
* @param {
|
|
61
|
-
*
|
|
62
|
-
* @
|
|
67
|
+
* @param {Record<string, ValidationError>} errors Object of page validation
|
|
68
|
+
* errors
|
|
69
|
+
* @param {import("express").Request} req Casa request object
|
|
70
|
+
* @returns {GovUkErrorObject[]} Array of error objects
|
|
63
71
|
*/
|
|
64
72
|
const generateGovukErrors = (errors, req) => Object.values(errors || {}).map(([error]) => ({
|
|
65
73
|
text: req.t(error.summary, error.variables),
|
|
66
74
|
href: error.fieldHref,
|
|
67
75
|
}));
|
|
76
|
+
exports.generateGovukErrors = generateGovukErrors;
|
|
68
77
|
const generateEditCancelUrl = (editOrigin, waypoint) => {
|
|
69
78
|
const url = new URL(editOrigin, "https://placeholder.test/");
|
|
70
79
|
url.searchParams.set("editcancel", waypoint);
|
|
@@ -187,7 +196,7 @@ function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, globalErrorVi
|
|
|
187
196
|
const errors = displayErrors &&
|
|
188
197
|
(req.casa.journeyContext.getValidationErrorsForPageByField(waypoint) ??
|
|
189
198
|
Object.create(null));
|
|
190
|
-
const govukErrors = displayErrors && generateGovukErrors(errors, req);
|
|
199
|
+
const govukErrors = displayErrors && (0, exports.generateGovukErrors)(errors, req);
|
|
191
200
|
return {
|
|
192
201
|
formUrl: (0, waypoint_url_js_1.default)({
|
|
193
202
|
mountUrl: `${req.baseUrl}/`,
|
|
@@ -245,7 +254,7 @@ function journeyRouter({ globalHooks, pages, plan, csrfMiddleware, globalErrorVi
|
|
|
245
254
|
// first one is shown.
|
|
246
255
|
// Disabling security/detect-object-injection rule because both `errors`
|
|
247
256
|
// and the `k` property are known entities
|
|
248
|
-
const govukErrors = generateGovukErrors(errors, req);
|
|
257
|
+
const govukErrors = (0, exports.generateGovukErrors)(errors, req);
|
|
249
258
|
return {
|
|
250
259
|
formUrl: (0, waypoint_url_js_1.default)({
|
|
251
260
|
mountUrl: `${req.baseUrl}/`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journey.js","sourceRoot":"","sources":["../../src/routes/journey.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"journey.js","sourceRoot":"","sources":["../../src/routes/journey.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dwp/govuk-casa",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.6.0",
|
|
4
4
|
"description": "A framework for building GOVUK Collect-And-Submit-Applications",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -9,10 +9,10 @@
|
|
|
9
9
|
"main": "dist/casa.js",
|
|
10
10
|
"module": "dist/mjs/casa.js",
|
|
11
11
|
"exports": {
|
|
12
|
+
"types": "./dist/casa.d.ts",
|
|
12
13
|
"import": "./dist/mjs/esm-wrapper.js",
|
|
13
14
|
"require": "./dist/casa.js"
|
|
14
15
|
},
|
|
15
|
-
"typings": "dist/casa.d.ts",
|
|
16
16
|
"files": [
|
|
17
17
|
"dist/**/*",
|
|
18
18
|
"locales/**/*",
|
package/src/casa.js
CHANGED
|
@@ -9,6 +9,7 @@ import ValidationError from "./lib/ValidationError.js";
|
|
|
9
9
|
import MutableRouter from "./lib/MutableRouter.js";
|
|
10
10
|
import waypointUrl from "./lib/waypoint-url.js";
|
|
11
11
|
import endSession from "./lib/end-session.js";
|
|
12
|
+
import { generateGovukErrors } from "./routes/journey.js";
|
|
12
13
|
import * as nunjucksFilters from "./lib/nunjucks-filters.js";
|
|
13
14
|
import * as constants from "./lib/constants.js";
|
|
14
15
|
import * as contextIdGenerators from "./lib/context-id-generators.js";
|
|
@@ -28,6 +29,7 @@ export {
|
|
|
28
29
|
// Utilities
|
|
29
30
|
waypointUrl,
|
|
30
31
|
endSession,
|
|
32
|
+
generateGovukErrors,
|
|
31
33
|
|
|
32
34
|
// Nunjucks filters
|
|
33
35
|
nunjucksFilters,
|
|
@@ -88,6 +90,8 @@ export {
|
|
|
88
90
|
/**
|
|
89
91
|
* @typedef {object} I18nOptions
|
|
90
92
|
* @property {string[]} dirs Directories to search for locale dictionaries
|
|
93
|
+
* @property {string | false} [fallbackLng=false] Fallback language to use if
|
|
94
|
+
* translations aren't available for a given key. Default is `false`
|
|
91
95
|
* @property {string[]} [locales=['en', 'cy']] Supported locales. Default is
|
|
92
96
|
* `['en', 'cy']`
|
|
93
97
|
*/
|
|
@@ -186,6 +190,8 @@ export {
|
|
|
186
190
|
* generator
|
|
187
191
|
* @property {symbol | Function} [errorVisibility] Option to keep page errors
|
|
188
192
|
* active on GET request
|
|
193
|
+
* @property {boolean} [govukRebrand=false] Sets whether you wish to use the
|
|
194
|
+
* govuk rebrand. Default is `false`
|
|
189
195
|
*/
|
|
190
196
|
|
|
191
197
|
/**
|
|
@@ -124,6 +124,34 @@ export function validateI18nLocales(locales = ["en", "cy"]) {
|
|
|
124
124
|
return locales;
|
|
125
125
|
}
|
|
126
126
|
|
|
127
|
+
/**
|
|
128
|
+
* Validates the i18n fallback language.
|
|
129
|
+
*
|
|
130
|
+
* @param {string} [fallback] Locale
|
|
131
|
+
* @param {Array} locales Array of valid locales.
|
|
132
|
+
* @returns {string} Fallback locale
|
|
133
|
+
* @throws {SyntaxError} For invalid locales.
|
|
134
|
+
* @throws {TypeError} For invalid type.
|
|
135
|
+
* @access private
|
|
136
|
+
*/
|
|
137
|
+
export function validateI18nFallbackLng(fallback, locales = ["en", "cy"]) {
|
|
138
|
+
if (fallback === undefined) {
|
|
139
|
+
return false;
|
|
140
|
+
}
|
|
141
|
+
if (typeof fallback !== "string") {
|
|
142
|
+
throw new TypeError(
|
|
143
|
+
"I18n fallback language must be a string (i18n.fallbackLng)",
|
|
144
|
+
);
|
|
145
|
+
}
|
|
146
|
+
if (!locales.includes(fallback)) {
|
|
147
|
+
throw new SyntaxError(
|
|
148
|
+
"I18n fallback language must be included in the locales array (i18n.fallbackLng)",
|
|
149
|
+
);
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
return fallback;
|
|
153
|
+
}
|
|
154
|
+
|
|
127
155
|
/**
|
|
128
156
|
* Validates and sanitises mount url.
|
|
129
157
|
*
|
|
@@ -606,6 +634,24 @@ export function validateContextIdGenerator(generator) {
|
|
|
606
634
|
return generator;
|
|
607
635
|
}
|
|
608
636
|
|
|
637
|
+
/**
|
|
638
|
+
* Validates the govuk rebrand feature flag.
|
|
639
|
+
*
|
|
640
|
+
* @param {boolean} [govukRebrand] Govuk rebrand feature flag
|
|
641
|
+
* @returns {boolean | true} Boolean.
|
|
642
|
+
* @throws {TypeError} For invalid feagure flag is set.
|
|
643
|
+
* @access private
|
|
644
|
+
*/
|
|
645
|
+
export function validateGovukRebrand(govukRebrand) {
|
|
646
|
+
if (govukRebrand === undefined) {
|
|
647
|
+
return false;
|
|
648
|
+
}
|
|
649
|
+
if (typeof govukRebrand !== "boolean") {
|
|
650
|
+
throw new TypeError("govukRebrand must be a boolean");
|
|
651
|
+
}
|
|
652
|
+
return govukRebrand;
|
|
653
|
+
}
|
|
654
|
+
|
|
609
655
|
/**
|
|
610
656
|
* Ingest, validate, sanitise and manipulate configuration parameters.
|
|
611
657
|
*
|
|
@@ -620,6 +666,7 @@ export default function ingest(config = {}) {
|
|
|
620
666
|
i18n: validateI18nObject(config.i18n, (i18n) => ({
|
|
621
667
|
dirs: validateI18nDirs(i18n.dirs),
|
|
622
668
|
locales: validateI18nLocales(i18n.locales),
|
|
669
|
+
fallbackLng: validateI18nFallbackLng(i18n.fallbackLng, i18n.locales),
|
|
623
670
|
})),
|
|
624
671
|
|
|
625
672
|
// URL that will prefix all URLs in the browser address bar
|
|
@@ -669,6 +716,8 @@ export default function ingest(config = {}) {
|
|
|
669
716
|
|
|
670
717
|
// Context ID generator
|
|
671
718
|
contextIdGenerator: validateContextIdGenerator(config.contextIdGenerator),
|
|
719
|
+
|
|
720
|
+
govukRebrand: validateGovukRebrand(config.govukRebrand),
|
|
672
721
|
};
|
|
673
722
|
|
|
674
723
|
// Freeze to modifications
|
package/src/lib/configure.js
CHANGED
|
@@ -81,6 +81,7 @@ export default function configure(config = {}) {
|
|
|
81
81
|
formMaxParams,
|
|
82
82
|
formMaxBytes,
|
|
83
83
|
contextIdGenerator,
|
|
84
|
+
govukRebrand = false,
|
|
84
85
|
} = ingestedConfig;
|
|
85
86
|
|
|
86
87
|
// Prepare all page hooks so they are prefixed with the `journey.` scope.
|
|
@@ -100,6 +101,7 @@ export default function configure(config = {}) {
|
|
|
100
101
|
resolve(dirname, "../../views"),
|
|
101
102
|
resolve(createRequire(dirname).resolve("govuk-frontend"), "../../"),
|
|
102
103
|
],
|
|
104
|
+
govukRebrand,
|
|
103
105
|
});
|
|
104
106
|
|
|
105
107
|
// Prepare mandatory middleware
|
|
@@ -133,6 +135,7 @@ export default function configure(config = {}) {
|
|
|
133
135
|
plan,
|
|
134
136
|
events,
|
|
135
137
|
contextIdGenerator,
|
|
138
|
+
govukRebrand,
|
|
136
139
|
});
|
|
137
140
|
|
|
138
141
|
// Prepare form middleware and its constituent parts
|
|
@@ -182,6 +185,8 @@ export default function configure(config = {}) {
|
|
|
182
185
|
// Nunjucks environment, so it can be attached to other ExpressJS instances
|
|
183
186
|
// using `nunjucksEnv.express(myApp); myApp.set('view engine', 'njk');`.
|
|
184
187
|
nunjucksEnv,
|
|
188
|
+
// govuk rebrand flag
|
|
189
|
+
govukRebrand,
|
|
185
190
|
|
|
186
191
|
// Mandatory middleware. User must add these to their ExpressJS app.
|
|
187
192
|
preMiddleware,
|
package/src/lib/nunjucks.js
CHANGED
|
@@ -20,10 +20,11 @@ import {
|
|
|
20
20
|
* Create a Nunjucks environment.
|
|
21
21
|
*
|
|
22
22
|
* @param {NunjucksOptions} options Nunjucks options
|
|
23
|
+
* @param {boolean} govukRebrand GovukRebrand flag
|
|
23
24
|
* @returns {Environment} Nunjucks Environment instance
|
|
24
25
|
* @access private
|
|
25
26
|
*/
|
|
26
|
-
export default function nunjucksConfig({ views = [] }) {
|
|
27
|
+
export default function nunjucksConfig({ views = [], govukRebrand }) {
|
|
27
28
|
// Prepare a single Nunjucks environment for all responses to use. Note that
|
|
28
29
|
// we cannot prepare response-specific global functions/filters if we use a
|
|
29
30
|
// single environment, but the performance gains of doing so are significant.
|
|
@@ -50,6 +51,7 @@ export default function nunjucksConfig({ views = [] }) {
|
|
|
50
51
|
JSON.parse(readFileSync(resolve(dirname, "../../package.json"))).version,
|
|
51
52
|
);
|
|
52
53
|
|
|
54
|
+
env.addGlobal("govukRebrand", govukRebrand);
|
|
53
55
|
env.addGlobal("mergeObjects", mergeObjects);
|
|
54
56
|
env.addGlobal("includes", includes);
|
|
55
57
|
env.addGlobal("formatDateObject", formatDateObject);
|
package/src/middleware/data.js
CHANGED
|
@@ -43,9 +43,16 @@ const editOrigin = (req) => {
|
|
|
43
43
|
* @param {Plan} opts.plan CASA Plan
|
|
44
44
|
* @param {ContextEventHandler[]} opts.events Event handlers
|
|
45
45
|
* @param {ContextIdGenerator} opts.contextIdGenerator Content ID generator
|
|
46
|
+
* @param {boolean} ops.govukRebrand Govuk rebrand feature flag
|
|
47
|
+
* @param opts.govukRebrand
|
|
46
48
|
* @returns {RequestHandler[]} Middleware functions
|
|
47
49
|
*/
|
|
48
|
-
export default function dataMiddleware({
|
|
50
|
+
export default function dataMiddleware({
|
|
51
|
+
plan,
|
|
52
|
+
events,
|
|
53
|
+
contextIdGenerator,
|
|
54
|
+
govukRebrand,
|
|
55
|
+
}) {
|
|
49
56
|
return [
|
|
50
57
|
(req, res, next) => {
|
|
51
58
|
/* ------------------------------------------------ Request decorations */
|
|
@@ -124,7 +131,8 @@ export default function dataMiddleware({ plan, events, contextIdGenerator }) {
|
|
|
124
131
|
// htmlLang = req.language is provided by i18n-http-middleware
|
|
125
132
|
// assetPath = used for linking to static assets in the govuk-frontend module
|
|
126
133
|
res.locals.htmlLang = req.language;
|
|
127
|
-
|
|
134
|
+
const rebrandAssetPath = govukRebrand ? "/rebrand" : "";
|
|
135
|
+
res.locals.assetPath = `${staticMountUrl}govuk/assets${rebrandAssetPath}`;
|
|
128
136
|
|
|
129
137
|
// Function for building URLs. This will be curried with the `mountUrl`,
|
|
130
138
|
// `journeyContext`, `edit` and `editOrigin` for convenience. This means
|
package/src/routes/journey.js
CHANGED
|
@@ -27,6 +27,14 @@ const log = logger("routes:journey");
|
|
|
27
27
|
* @access private
|
|
28
28
|
*/
|
|
29
29
|
|
|
30
|
+
/** @typedef {import("../casa.js").ValidationError} ValidationError */
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* @typedef {object} GovUkErrorObject
|
|
34
|
+
* @property {string} text Error message text
|
|
35
|
+
* @property {string} href Error message anchor href
|
|
36
|
+
*/
|
|
37
|
+
|
|
30
38
|
/**
|
|
31
39
|
* @typedef {object} JourneyRouterOptions Options to configure static router
|
|
32
40
|
* @property {GlobalHook[]} globalHooks Global hooks
|
|
@@ -62,13 +70,14 @@ const renderMiddlewareFactory = (view, contextFactory) => [
|
|
|
62
70
|
];
|
|
63
71
|
|
|
64
72
|
/**
|
|
65
|
-
* Generate page validation
|
|
73
|
+
* Generate page validation errors
|
|
66
74
|
*
|
|
67
|
-
* @param {
|
|
68
|
-
*
|
|
69
|
-
* @
|
|
75
|
+
* @param {Record<string, ValidationError>} errors Object of page validation
|
|
76
|
+
* errors
|
|
77
|
+
* @param {import("express").Request} req Casa request object
|
|
78
|
+
* @returns {GovUkErrorObject[]} Array of error objects
|
|
70
79
|
*/
|
|
71
|
-
const generateGovukErrors = (errors, req) =>
|
|
80
|
+
export const generateGovukErrors = (errors, req) =>
|
|
72
81
|
Object.values(errors || {}).map(([error]) => ({
|
|
73
82
|
text: req.t(error.summary, error.variables),
|
|
74
83
|
href: error.fieldHref,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{% extends "govuk/template.njk" %}
|
|
2
|
-
|
|
2
|
+
{% from "govuk/components/service-navigation/macro.njk" import govukServiceNavigation %}
|
|
3
3
|
|
|
4
4
|
{% block head %}
|
|
5
5
|
{% include "casa/partials/styles.njk" %}
|
|
@@ -16,13 +16,26 @@
|
|
|
16
16
|
|
|
17
17
|
|
|
18
18
|
{% block header %}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
19
|
+
|
|
20
|
+
{% if govukRebrand %}
|
|
21
|
+
{{ govukHeader({
|
|
22
|
+
homepageUrl: "https://www.gov.uk/"
|
|
23
|
+
}) }}
|
|
24
|
+
{% block serviceNavigation %}
|
|
25
|
+
{{ govukServiceNavigation({
|
|
26
|
+
serviceName: t('common:serviceName') if t else '',
|
|
27
|
+
serviceUrl: casa.mountUrl
|
|
28
|
+
}) }}
|
|
29
|
+
{% endblock %}
|
|
30
|
+
{% else %}
|
|
31
|
+
{{ govukHeader({
|
|
32
|
+
assetsPath: assetPath + "/images",
|
|
33
|
+
serviceName: t('common:serviceName') if t else '',
|
|
34
|
+
serviceUrl: casa.mountUrl,
|
|
35
|
+
homepageUrl: "https://www.gov.uk/",
|
|
36
|
+
useTudorCrown: true
|
|
37
|
+
}) }}
|
|
38
|
+
{% endif %}
|
|
26
39
|
{% endblock %}
|
|
27
40
|
|
|
28
41
|
|