@planning-inspectorate/dynamic-forms 3.21.0 → 3.22.0

package/src/dynamic-section.test.js

@@ -0,0 +1,113 @@
+import { describe, it, mock } from 'node:test';
+import assert from 'node:assert';
+import { DynamicSection } from '#src/dynamic-section.js';
+import { SECTION_STATUS } from '#section';
+import { Question } from '#question';
+
+// use a real question to avoid mocking lots of logic
+const mockQuestion = (fieldName = 'fieldName', required = true) =>
+	new Question({
+		fieldName: fieldName,
+		title: 'question',
+		question: 'question',
+		viewFolder: 'folder',
+		validators: [
+			{
+				isRequired() {
+					return required;
+				}
+			}
+		]
+	});
+
+describe('dynamic-section', () => {
+	describe('responseForSection', () => {
+		it('should return inner object for dynamic section', () => {
+			const section = new DynamicSection('s1', 'id-1', 'myList');
+			const answers = { id: 'id-1', myField: 'answer' };
+			const res = {
+				answers: {
+					myList: [{ id: 'id-2' }, { id: 'id-3' }, answers]
+				}
+			};
+			const got = section.getResponse(res);
+			assert.strictEqual(got?.answers, answers);
+		});
+	});
+
+	describe('getStatus', () => {
+		it('should use section answers for status', () => {
+			const s1Answers = { id: 'S', fieldOne: 'answer' };
+			const mockJourneyResponse = {
+				answers: {
+					visitFrequently: 'Answer 1',
+					anotherFieldName: 'Answer 2',
+					myList: [s1Answers]
+				}
+			};
+
+			const requiredQuestion = mockQuestion('visitFrequently');
+
+			const section = new DynamicSection('s1', 'S', 'myList');
+			section.addQuestion(requiredQuestion);
+
+			mock.method(requiredQuestion, 'shouldDisplay');
+			mock.method(requiredQuestion, 'isAnswered');
+
+			section.getStatus(mockJourneyResponse);
+
+			assert.strictEqual(requiredQuestion.shouldDisplay.mock.callCount(), 1);
+			assert.strictEqual(requiredQuestion.isAnswered.mock.callCount(), 2);
+			assert.strictEqual(requiredQuestion.shouldDisplay.mock.calls[0].arguments[0].answers, s1Answers);
+			assert.strictEqual(requiredQuestion.isAnswered.mock.calls[0].arguments[0].answers, s1Answers);
+		});
+
+		it('should return NOT_STARTED when no answers are given', () => {
+			const mockJourneyResponse = {
+				answers: {}
+			};
+			const section = new DynamicSection('s1', 'S', 'myList');
+			section.addQuestion(mockQuestion());
+			const result = section.getStatus(mockJourneyResponse);
+			assert.strictEqual(result, SECTION_STATUS.NOT_STARTED);
+			const isComplete = section.isComplete(mockJourneyResponse);
+			assert.strictEqual(isComplete, false);
+		});
+
+		it('should return IN_PROGRESS when at least one answer is given', () => {
+			const mockJourneyResponse = {
+				answers: {
+					myList: [{ id: 'S', visitFrequently: 'Answer 1' }]
+				}
+			};
+
+			const section = new DynamicSection('s1', 'S', 'myList');
+			section.addQuestion(mockQuestion());
+			section.addQuestion(mockQuestion('visitFrequently'));
+			const result = section.getStatus(mockJourneyResponse);
+			assert.strictEqual(result, SECTION_STATUS.IN_PROGRESS);
+			const isComplete = section.isComplete(mockJourneyResponse);
+			assert.strictEqual(isComplete, false);
+		});
+
+		it('should return COMPLETE when all required answers are given', () => {
+			const s1Answers = { id: 'S', visitFrequently: 'answer', anotherFieldName: true };
+			const mockJourneyResponse = {
+				answers: {
+					myList: [s1Answers]
+				}
+			};
+
+			const section = new DynamicSection('s1', 'S', 'myList');
+			section.addQuestion(mockQuestion('visitFrequently'));
+			section.addQuestion(mockQuestion('anotherFieldName'));
+			section.addQuestion(mockQuestion('someQuestion', false));
+
+			const result = section.getStatus(mockJourneyResponse);
+			assert.strictEqual(result, SECTION_STATUS.COMPLETE);
+
+			const isComplete = section.isComplete(mockJourneyResponse);
+			assert.strictEqual(isComplete, true);
+		});
+	});
+});

package/src/index.d.ts

@@ -32,6 +32,8 @@ export * from "./lib/utils.js";
 export * from "./middleware/build-get-journey.js";
 export * from "./middleware/redirect-to-unanswered-question.js";
 export * from "./questions/options-question.js";
+export * from "./dynamic-section.js";
+export * from "./section.js";
 export * from "./validator/address-validator.js";
 export * from "./validator/base-validator.js";
 export * from "./validator/conditional-required-validator.js";
@@ -58,6 +60,5 @@ export { JourneyResponse } from "./journey/journey-response.js";
 export { Question } from "./questions/question.js";
 export { createQuestions } from "./questions/create-questions.js";
 export { questionClasses } from "./questions/questions.js";
-export { Section } from "./section.js";
 export { default as validate } from "./validator/validator.js";
 //# sourceMappingURL=index.d.ts.map

package/src/index.js

@@ -55,7 +55,8 @@ export * from './questions/options-question.js';
 export { questionClasses } from './questions/questions.js';
 
 // Section
-export { Section } from './section.js';
+export * from './dynamic-section.js';
+export * from './section.js';
 
 // Validators
 export * from './validator/address-validator.js';

package/src/index.test.js

@@ -52,6 +52,7 @@ describe('public API', () => {
 		assert.equal(typeof api.Question, 'function');
 		assert.equal(typeof api.createQuestions, 'function');
 		assert.equal(typeof api.questionClasses, 'object');
+		assert.equal(typeof api.DynamicSection, 'function');
 		assert.equal(typeof api.Section, 'function');
 		assert.equal(typeof api.Journey, 'function');
 		assert.equal(typeof api.JourneyResponse, 'function');
@@ -84,5 +85,7 @@ describe('public API', () => {
 		assert.equal(typeof api.booleanToYesNoOrNull, 'function');
 		assert.equal(typeof api.REDACT_CHARACTER, 'string');
 		assert.equal(typeof api.TRUNCATED_MAX_LENGTH, 'number');
+		assert.equal(typeof api.END_OF_SECTION, 'symbol');
+		assert.equal(typeof api.SECTION_STATUS, 'object');
 	});
 });

package/src/journey/journey.d.ts

@@ -60,6 +60,16 @@ export class Journey {
      * @returns {import('../section.js').Section | undefined}
      */
     getSection(sectionSegment: string): import("../section.js").Section | undefined;
+    /**
+     * Get the response for the given section, required to support dynamic sections
+     *
+     * Often used in formatAnswerForSummary to get other answer fields.
+     *
+     * @param {string} sectionSegment
+     */
+    responseForSection(sectionSegment: string): import("./journey-response.js").JourneyResponse<import("#typedefs/journey-types.d.ts").JourneyAnswers> | {
+        answers: Record<string, unknown>;
+    };
     /**
      * gets a question from the object's sections based on a section + question names
      * @param {import('#typedefs/journey-types.d.ts').RouteParams} params

package/src/journey/journey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"journey.d.ts","sourceRoot":"","sources":["journey.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH;IAwBC;;;;;;;;;;;;;;OAcG;IACH,qLAZG;QAAwB,SAAS,EAAzB,MAAM;QACyE,WAAW,EAA1F,CAAC,QAAQ,EAAE,OAAO,uBAAuB,EAAE,eAAe,KAAK,MAAM;QACpD,WAAW;QAC6B,QAAQ,EAAjE,OAAO,uBAAuB,EAAE,eAAe;QAC/B,eAAe,EAA/B,MAAM;QACU,gBAAgB,EAAhC,MAAM;QACW,uBAAuB;QACxB,YAAY,EAA5B,MAAM;QACY,eAAe;QACU,QAAQ,EAAnD,OAAO,eAAe,EAAE,OAAO,EAAE;QAChB,eAAe;KAC1C,EAoDA;IAzFD,8EAA8E;IAC9E,WADW,MAAM,CACP;IACV,6FAA6F;IAC7F,UADW,KAAK,CAAE,OAAO,eAAe,EAAE,OAAO,CAAC,CACpC;IACd,mHAAmH;IACnH,UADW,OAAO,uBAAuB,EAAE,eAAe,CACjD;IACT,wFAAwF;IACxF,SADW,MAAM,CACJ;IACb,sJAAsJ;IACtJ,aADW,CAAC,eAAe,EAAE,OAAO,uBAAuB,EAAE,eAAe,KAAK,MAAM,CAChE;IACvB,kEAAkE;IAClE,aADW,MAAM,CACA;IACjB,uEAAuE;IACvE,iBADW,MAAM,CACI;IACrB,qFAAqF;IACrF,kBADW,MAAM,CACK;IACtB,4GAA4G;IAC5G,yBADW,MAAM,CACY;IAC7B,qFAAqF;IACrF,iBADW,OAAO,CACM;IACxB,2DAA2D;IAC3D,cADU,MAAM,CACH;IAmEZ,+BAA8C;IA2C/C;;;;OAIG;IACH,2BAHW,MAAM,GACJ,OAAO,eAAe,EAAE,OAAO,GAAG,SAAS,CAMvD;IA8BD;;;;OAIG;IACH,4BAHW,OAAO,8BAA8B,EAAE,WAAW,GAChD,OAAO,0BAA0B,EAAE,QAAQ,GAAG,SAAS,CAiBnE;IAED;;;;;;;OAOG;IACH,4CAJG;QAAoE,MAAM,EAAlE,OAAO,8BAA8B,EAAE,WAAW;QACU,kBAAkB;KACtF,GAAU,MAAM,GAAC,IAAI,CAWvB;IAED;;;;;;;;OAQG;IACH,4BALW,OAAO,SAAS,EAAE,QAAQ,UAC1B,OAAO,8BAA8B,EAAE,WAAW,kFAEhD,IAAI,CAKhB;IAED;;;;;;;;OAQG;IACH,2BANW,OAAO,8BAA8B,EAAE,WAAW,oCAE1D;QAA0B,OAAO;QACmC,kBAAkB;KACtF,GAAU,MAAM,GAAC,IAAI,CAyEvB;IAED;;;;;OAKG;IACH,wBAAyB,gBAJd,MAI4B,EAAE,iBAH9B,MAG6C,KAF3C,MAAM,CAqBjB;IAEF;;;;OAIG;IACH,sCAAuC,iBAH5B,MAG2C,KAFzC,MAAM,CAIjB;IAEF;;;;;;OAMG;IACH,0BAA2B,gBALhB,MAK8B,EAAE,iBAJhC,MAI+C,EAAE,UAHjD,MAGyD,KAFvD,MAAM,CAuBjB;IAEF;;;OAGG;IACH,cAFa,OAAO,CAInB;IAED;;OAEG;IACH,6BAFW,OAAO,uBAAuB,EAAE,eAAe,QAKzD;;CACD"}
+{"version":3,"file":"journey.d.ts","sourceRoot":"","sources":["journey.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH;IAwBC;;;;;;;;;;;;;;OAcG;IACH,qLAZG;QAAwB,SAAS,EAAzB,MAAM;QACyE,WAAW,EAA1F,CAAC,QAAQ,EAAE,OAAO,uBAAuB,EAAE,eAAe,KAAK,MAAM;QACpD,WAAW;QAC6B,QAAQ,EAAjE,OAAO,uBAAuB,EAAE,eAAe;QAC/B,eAAe,EAA/B,MAAM;QACU,gBAAgB,EAAhC,MAAM;QACW,uBAAuB;QACxB,YAAY,EAA5B,MAAM;QACY,eAAe;QACU,QAAQ,EAAnD,OAAO,eAAe,EAAE,OAAO,EAAE;QAChB,eAAe;KAC1C,EAoDA;IAzFD,8EAA8E;IAC9E,WADW,MAAM,CACP;IACV,6FAA6F;IAC7F,UADW,KAAK,CAAE,OAAO,eAAe,EAAE,OAAO,CAAC,CACpC;IACd,mHAAmH;IACnH,UADW,OAAO,uBAAuB,EAAE,eAAe,CACjD;IACT,wFAAwF;IACxF,SADW,MAAM,CACJ;IACb,sJAAsJ;IACtJ,aADW,CAAC,eAAe,EAAE,OAAO,uBAAuB,EAAE,eAAe,KAAK,MAAM,CAChE;IACvB,kEAAkE;IAClE,aADW,MAAM,CACA;IACjB,uEAAuE;IACvE,iBADW,MAAM,CACI;IACrB,qFAAqF;IACrF,kBADW,MAAM,CACK;IACtB,4GAA4G;IAC5G,yBADW,MAAM,CACY;IAC7B,qFAAqF;IACrF,iBADW,OAAO,CACM;IACxB,2DAA2D;IAC3D,cADU,MAAM,CACH;IAmEZ,+BAA8C;IA2C/C;;;;OAIG;IACH,2BAHW,MAAM,GACJ,OAAO,eAAe,EAAE,OAAO,GAAG,SAAS,CAMvD;IAED;;;;;;OAMG;IACH,mCAFW,MAAM;;MAQhB;IA8BD;;;;OAIG;IACH,4BAHW,OAAO,8BAA8B,EAAE,WAAW,GAChD,OAAO,0BAA0B,EAAE,QAAQ,GAAG,SAAS,CAiBnE;IAED;;;;;;;OAOG;IACH,4CAJG;QAAoE,MAAM,EAAlE,OAAO,8BAA8B,EAAE,WAAW;QACU,kBAAkB;KACtF,GAAU,MAAM,GAAC,IAAI,CAWvB;IAED;;;;;;;;OAQG;IACH,4BALW,OAAO,SAAS,EAAE,QAAQ,UAC1B,OAAO,8BAA8B,EAAE,WAAW,kFAEhD,IAAI,CAKhB;IAED;;;;;;;;OAQG;IACH,2BANW,OAAO,8BAA8B,EAAE,WAAW,oCAE1D;QAA0B,OAAO;QACmC,kBAAkB;KACtF,GAAU,MAAM,GAAC,IAAI,CAyEvB;IAED;;;;;OAKG;IACH,wBAAyB,gBAJd,MAI4B,EAAE,iBAH9B,MAG6C,KAF3C,MAAM,CAqBjB;IAEF;;;;OAIG;IACH,sCAAuC,iBAH5B,MAG2C,KAFzC,MAAM,CAIjB;IAEF;;;;;;OAMG;IACH,0BAA2B,gBALhB,MAK8B,EAAE,iBAJhC,MAI+C,EAAE,UAHjD,MAGyD,KAFvD,MAAM,CAuBjB;IAEF;;;OAGG;IACH,cAFa,OAAO,CAInB;IAED;;OAEG;IACH,6BAFW,OAAO,uBAAuB,EAAE,eAAe,QAKzD;;CACD"}

package/src/journey/journey.js

@@ -153,6 +153,21 @@ export class Journey {
 		});
 	}
 
+	/**
+	 * Get the response for the given section, required to support dynamic sections
+	 *
+	 * Often used in formatAnswerForSummary to get other answer fields.
+	 *
+	 * @param {string} sectionSegment
+	 */
+	responseForSection(sectionSegment) {
+		const section = this.getSection(sectionSegment);
+		if (!section) {
+			throw new Error(`No section found for section segment: '${sectionSegment}'`);
+		}
+		return section.getResponse(this.response);
+	}
+
 	/**
 	 * Get question within a section
 	 * @param {import('../section.js').Section} section

package/src/lib/answer-utils.d.ts

@@ -0,0 +1,22 @@
+/**
+ *
+ * @param {import('#journey-response').JourneyResponse} response
+ * @param {{fieldName: string}} withFieldName
+ * @param {string} itemId
+ * @returns {Record<string, unknown>}
+ */
+export function answerObjectForListItem(response: import("#journey-response").JourneyResponse, withFieldName: {
+    fieldName: string;
+}, itemId: string): Record<string, unknown>;
+/**
+ * Similar to answerObjectForListItem but will edit response and add a new array entry if not found
+ *
+ * @param {import('#journey-response').JourneyResponse} response
+ * @param {{fieldName: string}} withFieldName
+ * @param {string} itemId
+ * @returns {import('#typedefs/journey-types.d.ts').ManageListAnswers}
+ */
+export function answerObjectForListItemSaving(response: import("#journey-response").JourneyResponse, withFieldName: {
+    fieldName: string;
+}, itemId: string): import("#typedefs/journey-types.d.ts").ManageListAnswers;
+//# sourceMappingURL=answer-utils.d.ts.map

package/src/lib/answer-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"answer-utils.d.ts","sourceRoot":"","sources":["answer-utils.js"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,kDALW,OAAO,mBAAmB,EAAE,eAAe,iBAC3C;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,UACnB,MAAM,GACJ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAQnC;AAED;;;;;;;GAOG;AACH,wDALW,OAAO,mBAAmB,EAAE,eAAe,iBAC3C;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,UACnB,MAAM,GACJ,OAAO,8BAA8B,EAAE,iBAAiB,CAYpE"}

package/src/lib/answer-utils.js

@@ -0,0 +1,34 @@
+/**
+ *
+ * @param {import('#journey-response').JourneyResponse} response
+ * @param {{fieldName: string}} withFieldName
+ * @param {string} itemId
+ * @returns {Record<string, unknown>}
+ */
+export function answerObjectForListItem(response, withFieldName, itemId) {
+	const answers = response.answers[withFieldName.fieldName];
+	if (!Array.isArray(answers)) {
+		return {};
+	}
+	return answers.find((a) => a.id === itemId) || {};
+}
+
+/**
+ * Similar to answerObjectForListItem but will edit response and add a new array entry if not found
+ *
+ * @param {import('#journey-response').JourneyResponse} response
+ * @param {{fieldName: string}} withFieldName
+ * @param {string} itemId
+ * @returns {import('#typedefs/journey-types.d.ts').ManageListAnswers}
+ */
+export function answerObjectForListItemSaving(response, withFieldName, itemId) {
+	const answersList = response.answers[withFieldName?.fieldName] || (response.answers[withFieldName?.fieldName] = []);
+	let answers = answersList.find((item) => item.id === itemId);
+	if (!answers) {
+		answers = {
+			id: itemId
+		};
+		answersList.push(answers);
+	}
+	return answers;
+}

package/src/{components/manage-list/utils.test.js → lib/answer-utils.test.js}

@@ -1,9 +1,9 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert';
-import { answerObjectForManageList, answerObjectForManageListSaving } from '#src/components/manage-list/utils.js';
+import { answerObjectForListItem, answerObjectForListItemSaving } from '#src/lib/answer-utils.js';
 
-describe('manage-list-utils', () => {
-	describe('answerObjectForManageList', () => {
+describe('answer-utils', () => {
+	describe('answerObjectForListItem', () => {
 		it('should return the manage list item object for manage list questions', () => {
 			const manageListQuestion = {
 				fieldName: 'manageListQuestion'
@@ -18,7 +18,7 @@ describe('manage-list-utils', () => {
 				}
 			};
 			const manageListItemId = '1';
-			const got = answerObjectForManageList(journeyResponse, manageListQuestion, manageListItemId);
+			const got = answerObjectForListItem(journeyResponse, manageListQuestion, manageListItemId);
 			assert.strictEqual(got, answers);
 		});
 
@@ -36,16 +36,16 @@ describe('manage-list-utils', () => {
 				}
 			};
 			const manageListItemId = '1';
-			let got = answerObjectForManageList(journeyResponse, manageListQuestion, manageListItemId);
+			let got = answerObjectForListItem(journeyResponse, manageListQuestion, manageListItemId);
 			assert.deepStrictEqual(got, {});
 			// also fallback to {} if there is no manageListQuestion answer
 			delete journeyResponse.answers.manageListQuestion;
-			got = answerObjectForManageList(journeyResponse, manageListQuestion, manageListItemId);
+			got = answerObjectForListItem(journeyResponse, manageListQuestion, manageListItemId);
 			assert.deepStrictEqual(got, {});
 		});
 	});
 
-	describe('answerObjectForManageListSaving', () => {
+	describe('answerObjectForListItemSaving', () => {
 		it('should add an array with a new object if not found', () => {
 			const manageListQuestion = {
 				fieldName: 'manageListQuestion'
@@ -53,8 +53,7 @@ describe('manage-list-utils', () => {
 			const journeyResponse = {
 				answers: {}
 			};
-			const params = { manageListItemId: '1' };
-			const got = answerObjectForManageListSaving(journeyResponse, manageListQuestion, params);
+			const got = answerObjectForListItemSaving(journeyResponse, manageListQuestion, '1');
 			assert.deepStrictEqual(got, { id: '1' });
 			assert.ok(Array.isArray(journeyResponse.answers.manageListQuestion));
 			assert.ok(journeyResponse.answers.manageListQuestion[0]?.id, '1');
@@ -72,8 +71,7 @@ describe('manage-list-utils', () => {
 					manageListQuestion: [answers]
 				}
 			};
-			const params = { manageListItemId: '1' };
-			const got = answerObjectForManageListSaving(journeyResponse, manageListQuestion, params);
+			const got = answerObjectForListItemSaving(journeyResponse, manageListQuestion, '1');
 			assert.strictEqual(got, answers);
 		});
 	});

package/src/lib/session-answer-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-answer-store.d.ts","sourceRoot":"","sources":["session-answer-store.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,sDAJG;IAAsB,QAAQ;CAE9B,GAAU,OAAO,kBAAkB,EAAE,UAAU,CA8CjD;AASD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,gFANG;IAA0C,GAAG,EAArC,OAAO,SAAS,EAAE,OAAO;IACV,SAAS,EAAxB,MAAM;IACuB,WAAW;;;IACxB,QAAQ;CAChC,GAAU,IAAI,CAkBhB;AAED;;;;;;GAMG;AACH,8DAJW,MAAM,aACN,MAAM,GACJ,OAAO,SAAS,EAAE,OAAO,CA2BrC;AA/ED;;;;GAIG;AACH,gCAFU,OAAO,kBAAkB,EAAE,UAAU,CAEW"}
+{"version":3,"file":"session-answer-store.d.ts","sourceRoot":"","sources":["session-answer-store.js"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,sDAJG;IAAsB,QAAQ;CAE9B,GAAU,OAAO,kBAAkB,EAAE,UAAU,CAsDjD;AASD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,gFANG;IAA0C,GAAG,EAArC,OAAO,SAAS,EAAE,OAAO;IACV,SAAS,EAAxB,MAAM;IACuB,WAAW;;;IACxB,QAAQ;CAChC,GAAU,IAAI,CAkBhB;AAED;;;;;;GAMG;AACH,8DAJW,MAAM,aACN,MAAM,GACJ,OAAO,SAAS,EAAE,OAAO,CA2BrC;AA/ED;;;;GAIG;AACH,gCAFU,OAAO,kBAAkB,EAAE,UAAU,CAEW"}

package/src/lib/session-answer-store.js

@@ -50,7 +50,10 @@ export function buildSaveDataToSession({ reqParam } = {}) {
 		data,
 		isManageListItem,
 		manageListQuestionFieldName,
-		manageListItemRemove = false
+		manageListItemRemove = false,
+		isDynamicSection,
+		dynamicSectionFieldName,
+		dynamicSectionId
 	}) => {
 		if (!req.session) {
 			throw new Error('request session required');
@@ -64,12 +67,17 @@ export function buildSaveDataToSession({ reqParam } = {}) {
 		}
 		let answers = forms[journeyId] || (forms[journeyId] = {});
 
-		if (isManageListItem) {
-			const answersList = answers[manageListQuestionFieldName] || (answers[manageListQuestionFieldName] = []);
-			answers = answersList.find((item) => item.id === req.params.manageListItemId);
+		if (isManageListItem || isDynamicSection) {
+			// manage list and dynamic sections can be handled the same, just with different properties
+			// for the fieldName and item id
+			const fieldName = isManageListItem ? manageListQuestionFieldName : dynamicSectionFieldName;
+			const itemId = isManageListItem ? req.params.manageListItemId : dynamicSectionId;
+
+			const answersList = answers[fieldName] || (answers[fieldName] = []);
+			answers = answersList.find((item) => item.id === itemId);
 			if (!answers) {
-				answers = { id: req.params.manageListItemId };
-				answersList.push(answers);
+				answers = { id: itemId }; // answers object to manipulate and add other answers to
+				answersList.push(answers); // add the answers object to the array
 			}
 		} else if (manageListItemRemove && manageListQuestionFieldName && req.params.manageListItemId) {
 			const answersList = answers[manageListQuestionFieldName];

package/src/lib/session-answer-store.test.js

@@ -123,6 +123,49 @@ describe('session-answer-store', () => {
 			});
 		});
 
+		it('should add a new dynamic section when not present in the session', async () => {
+			const req = mockReq();
+			req.session = {};
+			const journeyId = 'j-1';
+			const data = { answers: { q1: 'a1' } };
+			const isDynamicSection = true;
+			const dynamicSectionFieldName = 'myList';
+			const dynamicSectionId = 'section-1';
+			const saveDataToSession = buildSaveDataToSession();
+			await saveDataToSession({ req, journeyId, data, isDynamicSection, dynamicSectionFieldName, dynamicSectionId });
+			assert.deepStrictEqual(req.session, {
+				forms: {
+					'j-1': {
+						myList: [{ id: 'section-1', q1: 'a1' }]
+					}
+				}
+			});
+		});
+		it('should add to an existing dynamic section using the id when present in the session', async () => {
+			const req = mockReq();
+			req.session = {
+				forms: {
+					'j-1': {
+						myList: [{ id: 'section-1', q1: 'old value' }]
+					}
+				}
+			};
+			const journeyId = 'j-1';
+			const data = { answers: { q2: 'a1' } };
+			const isDynamicSection = true;
+			const dynamicSectionFieldName = 'myList';
+			const dynamicSectionId = 'section-1';
+			const saveDataToSession = buildSaveDataToSession();
+			await saveDataToSession({ req, journeyId, data, isDynamicSection, dynamicSectionFieldName, dynamicSectionId });
+			assert.deepStrictEqual(req.session, {
+				forms: {
+					'j-1': {
+						myList: [{ id: 'section-1', q1: 'old value', q2: 'a1' }]
+					}
+				}
+			});
+		});
+
 		it('should remove a managed list item using the id when present in the session', async () => {
 			const req = mockReq();
 			req.params = { manageListItemId: '56789' };

package/src/middleware/redirect-to-unanswered-question.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redirect-to-unanswered-question.d.ts","sourceRoot":"","sources":["redirect-to-unanswered-question.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;;GAKG;AACH,0DAHW,sBAAsB,EAAE,GACtB,OAAO,SAAS,EAAE,OAAO,CA8BrC;qCArCY,CAAS,IAA2C,EAA3C,OAAO,0BAA0B,EAAE,QAAQ,EAAE,IAA2C,EAA3C,OAAO,mBAAmB,EAAE,eAAe,KAAG,OAAO"}
+{"version":3,"file":"redirect-to-unanswered-question.d.ts","sourceRoot":"","sources":["redirect-to-unanswered-question.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;;GAKG;AACH,0DAHW,sBAAsB,EAAE,GACtB,OAAO,SAAS,EAAE,OAAO,CA+BrC;qCAtCY,CAAS,IAA2C,EAA3C,OAAO,0BAA0B,EAAE,QAAQ,EAAE,IAA2C,EAA3C,OAAO,mBAAmB,EAAE,eAAe,KAAG,OAAO"}

package/src/middleware/redirect-to-unanswered-question.js

@@ -13,11 +13,12 @@ export function redirectToUnansweredQuestion(conditions = []) {
 		const { journeyResponse, journey } = res.locals;
 
 		for (const section of journey.sections) {
+			const response = section.getResponse(journeyResponse);
 			for (const question of section.questions) {
-				const answer = journey.response?.answers[question.fieldName];
+				const answer = response?.answers[question.fieldName];
 
-				const shouldSkip = conditions.some((condition) => condition(question, journeyResponse));
-				const shouldDisplay = !question.shouldDisplay || question.shouldDisplay(journeyResponse);
+				const shouldSkip = conditions.some((condition) => condition(question, response));
+				const shouldDisplay = !question.shouldDisplay || question.shouldDisplay(response);
 
 				if (shouldSkip || !shouldDisplay) {
 					continue;

package/src/middleware/redirect-to-unanswered-question.test.js

@@ -7,6 +7,7 @@ import { Journey } from '../journey/journey.js';
 import { Section } from '../section.js';
 import { COMPONENT_TYPES } from '../components/utils/component-types.js';
 import { questionHasAnswer } from '../components/utils/question-has-answer.js';
+import { DynamicSection } from '#src/dynamic-section.js';
 
 describe('redirectToUnansweredQuestion Middleware', () => {
 	const questions = {
@@ -145,4 +146,35 @@ describe('redirectToUnansweredQuestion Middleware', () => {
 		assert.deepStrictEqual(res.redirect.mock.calls[0].arguments, ['base/url/task-list/page']);
 		assert.strictEqual(next.mock.callCount(), 0);
 	});
+
+	it('should support dynamic sections', () => {
+		const journeyResponse = new JourneyResponse(
+			'id-1',
+			'0000003',
+			{
+				questionOne: true,
+				questionTwo: false,
+				items: [
+					{ id: 'item-1', questionThree: true, questionFour: true },
+					{ id: 'item-2', questionThree: true }
+				]
+			},
+			'Q9999'
+		);
+		res.locals.journeyResponse = journeyResponse;
+		const sections = [
+			new Section('S1', 's1').addQuestion(questions.q1).addQuestion(questions.q2),
+			new DynamicSection('S2', 'item-1', 'items').addQuestion(questions.q3).addQuestion(questions.q4),
+			new DynamicSection('S3', 'item-2', 'items').addQuestion(questions.q3).addQuestion(questions.q4)
+		];
+		const journey = new Journey({ response: journeyResponse, ...params, sections });
+		res.locals.journey = journey;
+
+		redirectToUnansweredQuestion([])(req, res, next);
+
+		assert.strictEqual(res.redirect.mock.callCount(), 1);
+		// all questions answered apart from the last dynamic section question
+		assert.deepStrictEqual(res.redirect.mock.calls[0].arguments, ['base/url/item-2/question-4']);
+		assert.strictEqual(next.mock.callCount(), 0);
+	});
 });

package/src/questions/question.d.ts

@@ -127,7 +127,7 @@ export class Question {
      * @param {import('../journey/journey.js').Journey} journey - the journey we are in
      * @param {Record<string, unknown>} [customViewData] additional data to send to view
      * @param {unknown} [payload]
-     * @param {import('#typedefs/question-types.d.ts').PrepQuestionForRenderingOptions} [options] - required to support manage list question
+     * @param {import('#typedefs/question-types.d.ts').PrepQuestionForRenderingOptions} [options] - required to support manage list question and dynamic sections
      * @returns {import('#typedefs/question-types.d.ts').QuestionViewModel}
      */
     prepQuestionForRendering(section: import("../section.js").Section, journey: import("../journey/journey.js").Journey, customViewData?: Record<string, unknown>, payload?: unknown, options?: import("#typedefs/question-types.d.ts").PrepQuestionForRenderingOptions): import("#typedefs/question-types.d.ts").QuestionViewModel;
@@ -148,13 +148,13 @@ export class Question {
      * @param {import('#typedefs/question-types.d.ts').QuestionViewModel} viewModel
      */ addCustomDataToViewModel(viewModel: import("#typedefs/question-types.d.ts").QuestionViewModel): void;
     /**
-     * Get the answers object from the journey response, which may be nested in an array for manage list questions
+     * Get the answers object from the journey response, which may be nested in an array for manage list questions or dynamic sections
      *
      * @param {import('../journey/journey-response.js').JourneyResponse} response
      * @param {import('#typedefs/question-types.d.ts').PrepQuestionForRenderingOptions} [options]
      * @returns {Record<string, any>}
      */
-    answerObjectFromJourneyResponse(response: import("../journey/journey-response.js").JourneyResponse, { params, manageListQuestion }?: import("#typedefs/question-types.d.ts").PrepQuestionForRenderingOptions): Record<string, any>;
+    answerObjectFromJourneyResponse(response: import("../journey/journey-response.js").JourneyResponse, { params, manageListQuestion, dynamicSection }?: import("#typedefs/question-types.d.ts").PrepQuestionForRenderingOptions): Record<string, any>;
     /**
      * renders the question
      * @param {import('express').Response} res - the express response
@@ -200,6 +200,11 @@ export class Question {
     handleNextQuestion(res: import("express").Response, journey: import("../journey/journey.js").Journey, sectionSegment: string, questionSegment: string): void;
     /**
      * returns the formatted answers values to be used to build task list elements
+     *
+     * If overriding this method and access answers on the journey, use journey.responseForSection
+     * to get the answers, instead of `journey.response` directly. This is to support DynamicSections
+     * where answers are in an array. See `MultiFieldInputQuestion` for an example.
+     *
      * @param {string} sectionSegment
      * @param {import('../journey/journey.js').Journey} journey
      * @param {unknown} answer

package/src/questions/question.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["question.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["question.js"],"names":[],"mappings":"AAKA;;;GAGG;AACH;IAiEC;;;OAGG;IACH,+NAHW,OAAO,+BAA+B,EAAE,kBAAkB,oBAC1D,MAAM,CAAC,MAAM,WAAW,EA0DlC;IA5HD,6EAA6E;IAC7E,WADW,MAAM,CACP;IACV,sDAAsD;IACtD,OADW,MAAM,CACX;IACN,+DAA+D;IAC/D,UADW,MAAM,CACR;IACT,mFAAmF;IACnF,aADW,MAAM,GAAC,SAAS,CACf;IACZ,iDAAiD;IACjD,YADW,MAAM,CACN;IACX,qHAAqH;IACrH,WADW,MAAM,CACP;IACV,6FAA6F;IAC7F,UADW,OAAO,CACF;IAChB,0IAA0I;IAC1I,YADW,KAAK,CAAE,OAAO,gCAAgC,EAAE,aAAa,CAAC,CACzD;IAChB,2DAA2D;IAC3D,MADW,MAAM,GAAC,SAAS,CACtB;IACL,sEAAsE;IACtE,oBADW,OAAO,CACQ;IAC1B,oDAAoD;IACpD,KADW,MAAM,GAAC,SAAS,CACvB;IACJ,qDAAqD;IACrD,MADW,MAAM,GAAC,SAAS,CACtB;IACL,sDAAsD;IACtD,eADW,MAAM,GAAC,SAAS,CACb;IACd,gGAAgG;IAChG,YADW,OAAO,+BAA+B,EAAE,UAAU,GAAC,SAAS,CAC5D;IAEX,iFAAiF;IACjF,gBADW,MAAM,CACc;IAC/B,sFAAsF;IACtF,kBADW,OAAO,CACM;IACxB,4CAA4C;IAC5C,oBADW,MAAM,CACe;IAChC,uDAAuD;IACvD,kBADW,MAAM,CACW;IAC5B,uDAAuD;IACvD,kBADW,MAAM,CACW;IAC5B,oDAAoD;IACpD,eADW,MAAM,CACK;IACtB,0IAA0I;IAC1I,oBADW,OAAO,+BAA+B,EAAE,qBAAqB,GAAC,SAAS,CAC/D;IAEnB;;;OAGG;IAEH,gBAAiB,WAJN,OAAO,gCAAgC,EAAE,eAI3B,KAHZ,OAAO,CAGe;IAEnC;;;MAGE;IACF;;;;;;OAMG;IACH,wBAFU,OAAO,CAEc;IA2C9B,iCAAgC;IAChC,kBAAwB;IAExB;;;;MAAwB;IAkBzB;;;;;;OAMG;IACH,4BAFa,OAAO,CAInB;IAWD,iCANa,OAAO,EAWnB;IAdD;;;;OAIG;IACH,6BAFa,OAAO,CAInB;IAqBD;;;;;;OAMG;IACH,sBAFa,MAAM,EAAE,CAIpB;IAED;;;;;;;;;;;;;;OAcG;IACH,uFARG;QAAoE,MAAM,EAAlE,OAAO,8BAA8B,EAAE,WAAW;QAC2B,kBAAkB;QACtD,OAAO,EAAhD,OAAO,eAAe,EAAE,OAAO;QACkB,OAAO,EAAxD,OAAO,uBAAuB,EAAE,OAAO;QACL,cAAc;QAC9B,OAAO,GAAzB,OAAO;KACf,GAAU,OAAO,+BAA+B,EAAE,iBAAiB,CAUrE;IAED;;;;;;;;;OASG;IACH,kCAPW,OAAO,eAAe,EAAE,OAAO,WAC/B,OAAO,uBAAuB,EAAE,OAAO,mBACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,YACvB,OAAO,YACP,OAAO,+BAA+B,EAAE,+BAA+B,GACrE,OAAO,+BAA+B,EAAE,iBAAiB,CAuCrE;IAED;;;;;;;;OAQG,CACH,4BAJW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,uBAEjB,GAAC,GAAC,MAAM,CAIpB;IAED;;;;;;OAMG,CACH,oCAFW,OAAO,+BAA+B,EAAE,iBAAiB,QAE9B;IAEtC;;;;;;OAMG;IACH,0CAJW,OAAO,gCAAgC,EAAE,eAAe,mDACxD,OAAO,+BAA+B,EAAE,+BAA+B,GACrE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAkB/B;IAED;;;;;OAKG;IACH,kBAJW,OAAO,SAAS,EAAE,QAAQ,aAC1B,OAAO,+BAA+B,EAAE,iBAAiB,GACvD,IAAI,CAShB;IAED;;;;;;;OAOG;IACH,8BANW,OAAO,SAAS,EAAE,OAAO,WAEzB,OAAO,eAAe,EAAE,OAAO,WAD/B,OAAO,uBAAuB,EAAE,OAAO,uBAEvC,OAAO,uCAAuC,EAAE,kBAAkB,GAChE,OAAO,+BAA+B,EAAE,iBAAiB,GAAC,SAAS,CAmB/E;IAED;;;;;;OAMG,CACH,mBAJW,OAAO,SAAS,EAAE,OAAO,mBACzB,OAAO,gCAAgC,EAAE,eAAe,GACtD,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC,CAczD;IAED;;;;;;OAMG,CACH,0BALW,OAAO,SAAS,EAAE,OAAO,cAEzB,OAAO,eAAe,EAAE,OAAO,WAD/B,OAAO,uBAAuB,EAAE,OAAO,GAErC,OAAO,+BAA+B,EAAE,iBAAiB,GAAG,SAAS,CAIjF;IAED;;;;;;;;;OASG;IACH,wBAPW,OAAO,SAAS,EAAE,QAAQ,WAC1B,OAAO,uBAAuB,EAAE,OAAO,kBACvC,MAAM,mBACN,MAAM,GACJ,IAAI,CAQhB;IAED;;;;;;;;;;;;OAYG;IACH,uCANW,MAAM,WACN,OAAO,uBAAuB,EAAE,OAAO,UACvC,OAAO,aACP,OAAO,GACL,OAAO,+BAA+B,EAAE,UAAU,EAAE,CA+BhE;IAED;;;;;;OAMG;IACH,0BALW,MAAM,WACN,OAAO,uBAAuB,EAAE,OAAO,UACvC,OAAO,GACL,OAAO,+BAA+B,EAAE,UAAU,GAAG,OAAO,+BAA+B,EAAE,UAAU,EAAE,GAAG,SAAS,CAqBjI;IAED;;;OAGG;IACH,eAHW,OAAO,GACL,OAAO,CAInB;IAED;;;;;;;OAOG;IACH,qBAHW,OAAO,GACL,MAAM,CAQlB;IAED;;OAEG;IACH,cAFa,OAAO,CAInB;IACD;;;OAGG;IACH,4BAHW,MAAM,GACJ,OAAO,CAMnB;IAED;;;;OAIG;IACH,4BAJW,OAAO,gCAAgC,EAAE,eAAe,cACxD,MAAM,GACJ,OAAO,CAInB;;CACD"}

package/src/questions/question.js

@@ -1,7 +1,7 @@
 import escape from 'escape-html';
 import { capitalize, nl2br, trimTrailingSlash } from '../lib/utils.js';
 import MultiFieldInputValidator from '../validator/multi-field-input-validator.js';
-import { answerObjectForManageList } from '#src/components/manage-list/utils.js';
+import { answerObjectForListItem } from '#src/lib/answer-utils.js';
 
 /**
  * A specific question within a journey which is made up of one (usually) or many (sometimes) components and their required content.
@@ -202,7 +202,8 @@ export class Question {
 	toViewModel({ params, manageListQuestion, section, journey, customViewData, payload }) {
 		const viewModel = this.prepQuestionForRendering(section, journey, customViewData, payload, {
 			params,
-			manageListQuestion
+			manageListQuestion,
+			dynamicSection: section.isDynamicSection ? section : undefined
 		});
 		viewModel.backLink = journey.getBackLink({ params, manageListQuestion });
 		return viewModel;
@@ -215,7 +216,7 @@ export class Question {
 	 * @param {import('../journey/journey.js').Journey} journey - the journey we are in
 	 * @param {Record<string, unknown>} [customViewData] additional data to send to view
 	 * @param {unknown} [payload]
-	 * @param {import('#typedefs/question-types.d.ts').PrepQuestionForRenderingOptions} [options] - required to support manage list question
+	 * @param {import('#typedefs/question-types.d.ts').PrepQuestionForRenderingOptions} [options] - required to support manage list question and dynamic sections
 	 * @returns {import('#typedefs/question-types.d.ts').QuestionViewModel}
 	 */
 	prepQuestionForRendering(section, journey, customViewData, payload, options) {
@@ -280,13 +281,13 @@ export class Question {
 	addCustomDataToViewModel(viewModel) {}
 
 	/**
-	 * Get the answers object from the journey response, which may be nested in an array for manage list questions
+	 * Get the answers object from the journey response, which may be nested in an array for manage list questions or dynamic sections
 	 *
 	 * @param {import('../journey/journey-response.js').JourneyResponse} response
 	 * @param {import('#typedefs/question-types.d.ts').PrepQuestionForRenderingOptions} [options]
 	 * @returns {Record<string, any>}
 	 */
-	answerObjectFromJourneyResponse(response, { params, manageListQuestion } = {}) {
+	answerObjectFromJourneyResponse(response, { params, manageListQuestion, dynamicSection } = {}) {
 		if (this.isInManageListSection) {
 			if (!params?.manageListItemId) {
 				throw new Error('no list item id for manage list question');
@@ -295,7 +296,11 @@ export class Question {
 				throw new Error('no manageListQuestion for manage list question');
 			}
 			// if this is a manage list question, the response is within the 'parent' manage list answers array
-			return answerObjectForManageList(response, manageListQuestion, params.manageListItemId);
+			return answerObjectForListItem(response, manageListQuestion, params.manageListItemId);
+		}
+		if (dynamicSection) {
+			// if this is a question in a dynamic section, the response is within an answers array, key by section
+			return answerObjectForListItem(response, dynamicSection, params.section);
 		}
 		return response.answers;
 	}
@@ -393,6 +398,11 @@ export class Question {
 
 	/**
 	 * returns the formatted answers values to be used to build task list elements
+	 *
+	 * If overriding this method and access answers on the journey, use journey.responseForSection
+	 * to get the answers, instead of `journey.response` directly. This is to support DynamicSections
+	 * where answers are in an array. See `MultiFieldInputQuestion` for an example.
+	 *
 	 * @param {string} sectionSegment
 	 * @param {import('../journey/journey.js').Journey} journey
 	 * @param {unknown} answer

package/src/questions/question.test.js

@@ -285,6 +285,25 @@ describe('./src/dynamic-forms/question.js', () => {
 				/no manageListQuestion for manage list question/
 			);
 		});
+
+		it('should return dynamic section object', () => {
+			const question = getTestQuestion();
+			const answers = {
+				id: 'section-1',
+				myField: 'my-value'
+			};
+			const journeyResponse = {
+				answers: {
+					myList: [answers]
+				}
+			};
+			const params = { section: 'section-1' };
+			const got = question.answerObjectFromJourneyResponse(journeyResponse, {
+				params,
+				dynamicSection: { fieldName: 'myList' }
+			});
+			assert.strictEqual(got, answers);
+		});
 	});
 
 	describe('renderAction', () => {