@planning-inspectorate/dynamic-forms 2.3.0 → 3.0.0

package/src/controller.js

@@ -66,6 +66,14 @@ function buildSectionRowViewModel(key, value, action) {
 	};
 }
 
+/**
+ * @param {object} [viewData]
+ * @returns {import('express').Handler}
+ */
+export function buildList(viewData = {}) {
+	return (req, res) => list(req, res, viewData.pageCaption, viewData);
+}
+
 /**
  * @param {import('express').Request} req
  * @param {import('express').Response} res
@@ -135,22 +143,39 @@ export async function list(req, res, pageCaption, viewData) {
 }
 
 /**
+ * Render an individual question
+ *
  * @type {import('express').Handler}
  */
 export async function question(req, res) {
-	//render an individual question
-	const { section, question } = req.params;
 	const { journey } = res.locals;
 
-	const sectionObj = journey.getSection(section);
-	const questionObj = journey.getQuestionBySectionAndName(section, question);
+	const section = journey.getSection(req.params.section);
+	const question = journey.getQuestionByParams(req.params);
 
-	if (!questionObj || !sectionObj) {
+	if (!question || !section) {
 		return res.redirect(journey.taskListUrl);
 	}
 
-	const viewModel = questionObj.prepQuestionForRendering(sectionObj, journey);
-	return questionObj.renderAction(res, viewModel);
+	let manageListQuestion;
+	if (question.isInManageListSection) {
+		// find parent question for the manage list
+		manageListQuestion = journey.getQuestionByParams({ section: req.params.section, question: req.params.question });
+		if (!manageListQuestion) {
+			return res.redirect(journey.taskListUrl);
+		}
+	}
+
+	const viewModel = question.toViewModel({
+		params: req.params,
+		manageListQuestion,
+		section,
+		journey,
+		customViewData: {
+			originalUrl: req.originalUrl
+		}
+	});
+	return question.renderAction(res, viewModel);
 }
 
 /**
@@ -173,28 +198,36 @@ export async function question(req, res) {
  */
 export function buildSave(saveData, redirectToTaskListOnSuccess) {
 	return async (req, res) => {
-		const { section, question } = req.params;
 		/** @type {import('./journey/journey.js').Journey} */
 		const journey = res.locals.journey;
 		/** @type {import('./journey/journey-response.js').JourneyResponse} */
 		const journeyResponse = res.locals.journeyResponse;
 
-		const sectionObj = journey.getSection(section);
-		const questionObj = journey.getQuestionBySectionAndName(section, question);
+		const section = journey.getSection(req.params.section);
+		const question = journey.getQuestionByParams(req.params);
 
-		if (!questionObj || !sectionObj) {
+		if (!question || !section) {
 			return res.redirect(journey.taskListUrl);
 		}
 
+		let manageListQuestion;
+		if (question.isInManageListSection) {
+			// find parent question for the manage list
+			manageListQuestion = journey.getQuestionByParams({ section: req.params.section, question: req.params.question });
+			if (!manageListQuestion) {
+				return res.redirect(journey.taskListUrl);
+			}
+		}
+
 		try {
 			// check for validation errors
-			const errorViewModel = questionObj.checkForValidationErrors(req, sectionObj, journey);
+			const errorViewModel = question.checkForValidationErrors(req, section, journey, manageListQuestion);
 			if (errorViewModel) {
-				return questionObj.renderAction(res, errorViewModel);
+				return question.renderAction(res, errorViewModel);
 			}
 
 			// save
-			const data = await questionObj.getDataToSave(req, journeyResponse);
+			const data = await question.getDataToSave(req, journeyResponse);
 
 			await saveData({
 				req,
@@ -205,20 +238,27 @@ export function buildSave(saveData, redirectToTaskListOnSuccess) {
 			});
 
 			// check for saving errors
-			const saveViewModel = questionObj.checkForSavingErrors(req, sectionObj, journey);
+			const saveViewModel = question.checkForSavingErrors(req, section, journey);
 			if (saveViewModel) {
-				return questionObj.renderAction(res, saveViewModel);
+				return question.renderAction(res, saveViewModel);
 			}
 			if (redirectToTaskListOnSuccess) {
 				return res.redirect(journey.taskListUrl);
 			}
 			// move to the next question
-			return questionObj.handleNextQuestion(res, journey, sectionObj.segment, questionObj.fieldName);
+			return journey.redirectToNextQuestion(res, req.params, manageListQuestion);
 		} catch (err) {
-			const viewModel = questionObj.prepQuestionForRendering(sectionObj, journey, {
-				errorSummary: err.errorSummary ?? [{ text: err.toString(), href: '#' }]
+			const viewModel = question.toViewModel({
+				params: req.params,
+				manageListQuestion,
+				section,
+				journey,
+				customViewData: {
+					originalUrl: req.originalUrl,
+					errorSummary: err.errorSummary ?? [{ text: err.toString(), href: '#' }]
+				}
 			});
-			return questionObj.renderAction(res, viewModel);
+			return question.renderAction(res, viewModel);
 		}
 	};
 }

package/src/controller.test.js

@@ -178,10 +178,10 @@ const sampleQuestionObj = {
 	getDataToSave: mock.fn(),
 	checkForValidationErrors: mock.fn(),
 	checkForSavingErrors: mock.fn(),
+	toViewModel: mock.fn(),
 	prepQuestionForRendering: mock.fn(),
 	formatAnswerForSummary: mock.fn(() => [mockAnswer]),
-	viewFolder: 'sampleType',
-	handleNextQuestion: mock.fn()
+	viewFolder: 'sampleType'
 };
 
 const mockSection = {
@@ -301,8 +301,8 @@ describe('dynamic-form/controller', () => {
 
 	describe('question', () => {
 		it('should redirect if question is not found', async () => {
-			mockJourney.getQuestionBySectionAndName = mock.fn();
-			mockJourney.getQuestionBySectionAndName.mock.mockImplementationOnce(() => null);
+			mockJourney.getQuestionByParams = mock.fn();
+			mockJourney.getQuestionByParams.mock.mockImplementationOnce(() => null);
 
 			await question(req, res);
 
@@ -314,8 +314,8 @@ describe('dynamic-form/controller', () => {
 			mockJourney.getSection.mock.mockImplementationOnce(() => {
 				return {};
 			});
-			mockJourney.getQuestionBySectionAndName = mock.fn(() => sampleQuestionObj);
-			mockJourney.getQuestionBySectionAndName.mock.mockImplementationOnce(() => sampleQuestionObj);
+			mockJourney.getQuestionByParams = mock.fn(() => sampleQuestionObj);
+			mockJourney.getQuestionByParams.mock.mockImplementationOnce(() => sampleQuestionObj);
 			sampleQuestionObj.renderAction = mock.fn();
 
 			await question(req, res);
@@ -326,15 +326,16 @@ describe('dynamic-form/controller', () => {
 
 		it('should render the question template', async () => {
 			sampleQuestionObj.renderAction.mock.resetCalls();
+			sampleQuestionObj.toViewModel.mock.resetCalls();
 			req.params.referenceId = mockRef;
 			const mockAnswer = 'sampleAnswer';
 			const mockBackLink = 'back';
 			const mockQuestionRendering = 'test';
 
-			sampleQuestionObj.prepQuestionForRendering.mock.mockImplementationOnce(() => mockQuestionRendering);
+			sampleQuestionObj.toViewModel.mock.mockImplementationOnce(() => mockQuestionRendering);
 
-			mockJourney.getQuestionBySectionAndName = mock.fn();
-			mockJourney.getQuestionBySectionAndName.mock.mockImplementationOnce(() => sampleQuestionObj);
+			mockJourney.getQuestionByParams = mock.fn();
+			mockJourney.getQuestionByParams.mock.mockImplementationOnce(() => sampleQuestionObj);
 			mockJourney.response.answers.sampleFieldName = mockAnswer;
 			mockJourney.getNextQuestionUrl = mock.fn(() => mockBackLink);
 			mockJourney.getSection = mock.fn(() => mockSection);
@@ -343,6 +344,11 @@ describe('dynamic-form/controller', () => {
 
 			assert.strictEqual(sampleQuestionObj.renderAction.mock.callCount(), 1);
 			assert.deepStrictEqual(sampleQuestionObj.renderAction.mock.calls[0].arguments, [res, mockQuestionRendering]);
+			assert.strictEqual(sampleQuestionObj.toViewModel.mock.callCount(), 1);
+			const args = sampleQuestionObj.toViewModel.mock.calls[0].arguments[0];
+			assert.ok(args);
+			assert.ok(args?.customViewData?.originalUrl);
+			assert.strictEqual(args?.customViewData?.originalUrl, req.originalUrl);
 		});
 	});
 
@@ -367,8 +373,8 @@ describe('dynamic-form/controller', () => {
 				notSampleFieldName: 'do not send this'
 			};
 
-			mockJourney.getQuestionBySectionAndName = mock.fn();
-			mockJourney.getQuestionBySectionAndName.mock.mockImplementationOnce(() => sampleQuestionObj);
+			mockJourney.getQuestionByParams = mock.fn();
+			mockJourney.getQuestionByParams.mock.mockImplementationOnce(() => sampleQuestionObj);
 
 			const saveData = mock.fn();
 			await buildSave(saveData)(req, res, journeyId);
@@ -387,7 +393,9 @@ describe('dynamic-form/controller', () => {
 			const mocks = [sampleQuestionObj.checkForValidationErrors.mock, sampleQuestionObj.checkForSavingErrors.mock];
 			for (const mockFn of mocks) {
 				assert.strictEqual(mockFn.callCount(), 1);
-				assert.deepStrictEqual(mockFn.calls[0].arguments, [req, sections[0], mockJourney]);
+				assert.deepStrictEqual(mockFn.calls[0].arguments[0], req);
+				assert.deepStrictEqual(mockFn.calls[0].arguments[1], sections[0]);
+				assert.deepStrictEqual(mockFn.calls[0].arguments[2], mockJourney);
 			}
 		});
 
@@ -397,7 +405,7 @@ describe('dynamic-form/controller', () => {
 			const sampleQuestionObjWithActions = {
 				...sampleQuestionObj,
 				saveAction: mock.fn(),
-				prepQuestionForRendering: mock.fn(() => expectedViewModel),
+				toViewModel: mock.fn(() => expectedViewModel),
 				renderAction: mock.fn()
 			};
 
@@ -418,8 +426,8 @@ describe('dynamic-form/controller', () => {
 				notSampleFieldName: 'do not send this'
 			};
 
-			mockJourney.getQuestionBySectionAndName = mock.fn();
-			mockJourney.getQuestionBySectionAndName.mock.mockImplementationOnce(() => sampleQuestionObjWithActions);
+			mockJourney.getQuestionByParams = mock.fn();
+			mockJourney.getQuestionByParams.mock.mockImplementationOnce(() => sampleQuestionObjWithActions);
 
 			const saveData = mock.fn(() => {
 				throw new Error('Expected error message');
@@ -427,20 +435,25 @@ describe('dynamic-form/controller', () => {
 			await buildSave(saveData)(req, res, journeyId);
 
 			assert.strictEqual(saveData.mock.callCount(), 1);
-			assert.deepStrictEqual(saveData.mock.calls[0].arguments, [
-				{
-					req,
-					res,
-					journeyId: journeyParams.journeyId,
-					referenceId: journeyParams.referenceId,
-					data: undefined
-				}
-			]);
-
-			assert.deepStrictEqual(sampleQuestionObjWithActions.renderAction.mock.calls[0].arguments, [
-				res,
-				expectedViewModel
-			]);
+			assert.deepStrictEqual(
+				saveData.mock.calls[0].arguments,
+				[
+					{
+						req,
+						res,
+						journeyId: journeyParams.journeyId,
+						referenceId: journeyParams.referenceId,
+						data: undefined
+					}
+				],
+				'save data args'
+			);
+
+			assert.deepStrictEqual(
+				sampleQuestionObjWithActions.renderAction.mock.calls[0].arguments,
+				[res, expectedViewModel],
+				'render args'
+			);
 		});
 
 		it('should handle validation errors', async () => {
@@ -465,8 +478,8 @@ describe('dynamic-form/controller', () => {
 				answers: {}
 			};
 
-			mockJourney.getQuestionBySectionAndName = mock.fn();
-			mockJourney.getQuestionBySectionAndName.mock.mockImplementationOnce(() => sampleQuestionObjWithActions);
+			mockJourney.getQuestionByParams = mock.fn();
+			mockJourney.getQuestionByParams.mock.mockImplementationOnce(() => sampleQuestionObjWithActions);
 
 			const saveData = mock.fn();
 			await buildSave(saveData)(req, res, journeyId);
@@ -480,10 +493,7 @@ describe('dynamic-form/controller', () => {
 			const journeyId = 'has-questionnaire';
 			const expectedUrl = 'redirect-url';
 			const sampleQuestionObjWithActions = {
-				...sampleQuestionObj,
-				handleNextQuestion: mock.fn((res, journey) => {
-					res.redirect(journey.getNextQuestionUrl());
-				})
+				...sampleQuestionObj
 			};
 
 			req.params = {
@@ -498,8 +508,8 @@ describe('dynamic-form/controller', () => {
 			};
 
 			mockJourney.getSection = mock.fn(() => ({}));
-			mockJourney.getQuestionBySectionAndName = mock.fn();
-			mockJourney.getQuestionBySectionAndName.mock.mockImplementationOnce(() => sampleQuestionObjWithActions);
+			mockJourney.getQuestionByParams = mock.fn();
+			mockJourney.getQuestionByParams.mock.mockImplementationOnce(() => sampleQuestionObjWithActions);
 			mockJourney.getNextQuestionUrl = mock.fn(() => expectedUrl);
 
 			const saveData = mock.fn();
@@ -515,10 +525,7 @@ describe('dynamic-form/controller', () => {
 			const journeyId = 'has-questionnaire';
 			const expectedUrl = 'redirect-url';
 			const sampleQuestionObjWithActions = {
-				...sampleQuestionObj,
-				handleNextQuestion: mock.fn((res, journey) => {
-					res.redirect(journey.getNextQuestionUrl());
-				})
+				...sampleQuestionObj
 			};
 
 			req.params = {
@@ -533,8 +540,8 @@ describe('dynamic-form/controller', () => {
 			};
 
 			mockJourney.getSection = mock.fn(() => ({}));
-			mockJourney.getQuestionBySectionAndName = mock.fn();
-			mockJourney.getQuestionBySectionAndName.mock.mockImplementationOnce(() => sampleQuestionObjWithActions);
+			mockJourney.getQuestionByParams = mock.fn();
+			mockJourney.getQuestionByParams.mock.mockImplementationOnce(() => sampleQuestionObjWithActions);
 			mockJourney.getNextQuestionUrl = mock.fn(() => expectedUrl);
 
 			const saveData = mock.fn();
@@ -545,6 +552,66 @@ describe('dynamic-form/controller', () => {
 			assert.match(res.redirect.mock.calls[0].arguments[0], /\/task-list$/);
 			assert.strictEqual(mockJourney.getNextQuestionUrl.mock.callCount(), 0);
 		});
+
+		describe('manageListQuestions', () => {
+			const setupJourney = () => {
+				const q = {
+					fieldName: 'question-2',
+					get isInManageListSection() {
+						return true;
+					},
+					checkForValidationErrors: mock.fn(),
+					getDataToSave: mock.fn(),
+					checkForSavingErrors: mock.fn()
+				};
+				const manageListQ = {
+					get isManageListQuestion() {
+						return true;
+					}
+				};
+				const req = {
+					params: {
+						section: 'section-1',
+						question: 'question-1',
+						manageListAction: 'add',
+						manageListItemId: 'item-id-1',
+						manageListQuestion: 'question-6'
+					}
+				};
+				const journey = {
+					getSection: mock.fn(() => ({ segment: 'section-1' })),
+					getQuestionByParams: mock.fn(),
+					redirectToNextQuestion: mock.fn()
+				};
+				const res = {
+					locals: {
+						journey,
+						journeyResponse: { answers: {} }
+					},
+					redirect: mock.fn()
+				};
+				journey.getQuestionByParams.mock.mockImplementationOnce(() => q, 0);
+				journey.getQuestionByParams.mock.mockImplementationOnce(() => manageListQ, 1);
+				return { journey, manageListQ, req, res, q };
+			};
+			it('should find the parent manage list question', async () => {
+				const { journey, manageListQ, req, res } = setupJourney();
+				const saveData = mock.fn();
+				await buildSave(saveData)(req, res, 'journey-1');
+				assert.strictEqual(journey.getSection.mock.callCount(), 1);
+				assert.strictEqual(journey.getQuestionByParams.mock.callCount(), 2);
+				assert.strictEqual(journey.redirectToNextQuestion.mock.callCount(), 1);
+				assert.strictEqual(journey.redirectToNextQuestion.mock.calls[0].arguments[2], manageListQ);
+			});
+			it('should preserve request route params', async () => {
+				const { journey, req, res } = setupJourney();
+				const saveData = mock.fn();
+				await buildSave(saveData)(req, res, 'journey-1');
+				assert.strictEqual(journey.redirectToNextQuestion.mock.callCount(), 1);
+				const params = journey.redirectToNextQuestion.mock.calls[0].arguments[1];
+				assert.deepStrictEqual(params, req.params);
+			});
+		});
 	});
 });
 

package/src/index.js

@@ -3,7 +3,7 @@
  */
 
 /**
- * @type {Readonly<{CHECKBOX: QuestionTypes, BOOLEAN: QuestionTypes, RADIO: QuestionTypes, DATE: QuestionTypes, DATE_PERIOD: QuestionTypes, TEXT_ENTRY: QuestionTypes, TEXT_ENTRY_REDACT: QuestionTypes, SELECT: QuestionTypes, SINGLE_LINE_INPUT: QuestionTypes, MULTI_FIELD_INPUT: QuestionTypes, NUMBER: QuestionTypes, ADDRESS: QuestionTypes, UNIT_OPTION: QuestionTypes, EMAIL: QuestionTypes}>}
+ * @type {Readonly<{CHECKBOX: QuestionTypes, BOOLEAN: QuestionTypes, RADIO: QuestionTypes, DATE: QuestionTypes, DATE_PERIOD: QuestionTypes, TEXT_ENTRY: QuestionTypes, TEXT_ENTRY_REDACT: QuestionTypes, SELECT: QuestionTypes, SINGLE_LINE_INPUT: QuestionTypes, MULTI_FIELD_INPUT: QuestionTypes, NUMBER: QuestionTypes, ADDRESS: QuestionTypes, UNIT_OPTION: QuestionTypes, EMAIL: QuestionTypes, MANAGE_LIST: QuestionTypes}>}
  */
 export const COMPONENT_TYPES = Object.freeze({
 	CHECKBOX: 'checkbox',
@@ -20,5 +20,6 @@ export const COMPONENT_TYPES = Object.freeze({
 	NUMBER: 'number',
 	ADDRESS: 'site-address',
 	UNIT_OPTION: 'unit-option',
-	EMAIL: 'email'
+	EMAIL: 'email',
+	MANAGE_LIST: 'manage-list'
 });

package/src/journey/journey-types.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Express route parameters used for journey routes
+ */
+export type RouteParams = CoreRouteParams & ManageListRouteParams;
+
+export type CoreRouteParams = {
+	section: string;
+	question: string;
+	[key: string]: string;
+};
+
+export type ManageListRouteParams =
+	| {
+			manageListAction: string;
+			manageListItemId: string;
+			manageListQuestion: string;
+	  }
+	| {};

package/src/journey/journey.js

@@ -3,6 +3,7 @@
  * (e.g. questionnaire). Specific journeys should be       *
  * instances of this class                                 *
  ***********************************************************/
+import { END_OF_SECTION } from '#src/section.js';
 
 /**
  * @typedef {import('./journey-response').JourneyResponse} JourneyResponse
@@ -135,12 +136,15 @@ export class Journey {
 
 	/**
 	 * utility function to build up a url to a question
-	 * @param {string} sectionSegment url param for a section
-	 * @param {string} questionSegment url param for a question
+	 * @param {import('./journey-types.d.ts').RouteParams} params
 	 * @returns {string} url for a question
 	 */
-	#buildQuestionUrl(sectionSegment, questionSegment) {
-		return this.#prependPathToUrl(this.baseUrl, `${sectionSegment}/${questionSegment}`);
+	#buildQuestionUrl(params) {
+		const parts = [params.section, params.question];
+		if (params.manageListAction) {
+			parts.push(params.manageListAction, params.manageListItemId, params.manageListQuestion);
+		}
+		return this.#prependPathToUrl(this.baseUrl, parts.join('/'));
 	}
 
 	/**
@@ -158,39 +162,58 @@ export class Journey {
 	 * Get question within a section
 	 * @param {Section} section
 	 * @param {string} questionSegment
+	 * @param {{action: string, itemId: string, question: string}} [manageListParams]
 	 * @returns {Question | undefined} question if it belongs in the given section
 	 */
-	#getQuestion(section, questionSegment) {
-		return section?.questions.find((q) => {
-			return q.fieldName === questionSegment || q.url === questionSegment;
-		});
+	#getQuestion(section, questionSegment, manageListParams) {
+		const matchQuestion = (q, toMatch) => {
+			return q.fieldName === toMatch || q.url === toMatch;
+		};
+		const question = section?.questions.find((q) => matchQuestion(q, questionSegment));
+		if (!question) {
+			return undefined;
+		}
+		if (manageListParams && question.isManageListQuestion) {
+			return question.section.questions.find((q) => matchQuestion(q, manageListParams.question));
+		}
+		return question;
 	}
 
 	/**
 	 * gets a question from the object's sections based on a section + question names
-	 * @param {string} sectionSegment segment of the section to find the question in
-	 * @param {string} questionSegment fieldname of the question to lookup
+	 * @param {import('./journey-types.d.ts').RouteParams} params
 	 * @returns {Question | undefined} question found by lookup
 	 */
-	getQuestionBySectionAndName(sectionSegment, questionSegment) {
-		const section = this.getSection(sectionSegment);
+	getQuestionByParams(params) {
+		const section = this.getSection(params.section);
 
 		if (!section) {
 			return undefined;
 		}
-
-		return this.#getQuestion(section, questionSegment);
+		let manageListParams;
+		if (params.manageListAction && params.manageListItemId && params.manageListQuestion) {
+			manageListParams = {
+				action: params.manageListAction,
+				itemId: params.manageListItemId,
+				question: params.manageListQuestion
+			};
+		}
+		return this.#getQuestion(section, params.question, manageListParams);
 	}
 
 	/**
 	 * Get the back link for the journey - e.g. the previous question
 	 *
-	 * @param {string} sectionSegment - section segment
-	 * @param {string} questionSegment - question segment
+	 * @param {Object} options
+	 * @param {import('./journey-types.d.ts').RouteParams} options.params
+	 * @param {import('#src/components/manage-list/question.js')} [options.manageListQuestion]
 	 * @returns {string|null} url for the next question, or null if unmatched
 	 */
-	getBackLink(sectionSegment, questionSegment) {
-		const previousQuestion = this.getNextQuestionUrl(sectionSegment, questionSegment, true);
+	getBackLink({ params, manageListQuestion }) {
+		const previousQuestion = this.getNextQuestionUrl(params, {
+			manageListQuestion,
+			reverse: true
+		});
 		if (!previousQuestion) {
 			return this.initialBackLink;
 		}
@@ -198,15 +221,32 @@ export class Journey {
 	}
 
 	/**
-	 * Get url for the next question in this section
-	 * @param {string} sectionSegment - section segment
-	 * @param {string} questionSegment - question segment
-	 * @param {boolean} [reverse] - if passed in this will get the previous question
+	 * Handles redirect to the next question in the journey
+	 * Used after question post/saving
+	 *
+	 * @param {import('express').Response} res
+	 * @param {import('./journey-types.d.ts').RouteParams} params
+	 * @param {import('#src/components/manage-list/question.js')} [manageListQuestion]
+	 * @returns {void}
+	 */
+	redirectToNextQuestion(res, params, manageListQuestion) {
+		const next = this.getNextQuestionUrl(params, { manageListQuestion }) ?? this.taskListUrl;
+		return res.redirect(next);
+	}
+
+	/**
+	 * Get url for the next question in the journey
+	 *
+	 * @param {import('./journey-types.d.ts').RouteParams} params
+	 * @param {Object} options
+	 * @param {boolean} [options.reverse] - if passed in this will get the previous question
+	 * @param {import('#src/components/manage-list/question.js')} [options.manageListQuestion]
 	 * @returns {string|null} url for the next question, or null if unmatched
 	 */
-	getNextQuestionUrl(sectionSegment, questionSegment, reverse = false) {
+	getNextQuestionUrl(params, { reverse = false, manageListQuestion } = {}) {
 		const numberOfSections = this.sections.length;
 		const sectionsStart = reverse ? numberOfSections - 1 : 0;
+		const questionFieldName = manageListQuestion ? params.manageListQuestion : params.question;
 
 		let currentSectionIndex;
 		let foundSection = false;
@@ -214,9 +254,8 @@ export class Journey {
 
 		for (let i = sectionsStart; reverse ? i >= 0 : i < numberOfSections; reverse ? i-- : i++) {
 			const currentSection = this.sections[i];
-			const numberOfQuestions = currentSection.questions.length;
 
-			if (currentSection.segment === sectionSegment) {
+			if (currentSection.segment === params.section) {
 				foundSection = true;
 				currentSectionIndex = i;
 			}
@@ -225,17 +264,39 @@ export class Journey {
 				if (this.returnToListing && i !== currentSectionIndex) {
 					return null;
 				}
-
-				const questionsStart = reverse ? numberOfQuestions - 1 : 0;
-				for (let j = questionsStart; reverse ? j >= 0 : j < numberOfQuestions; reverse ? j-- : j++) {
-					const question = currentSection.questions[j];
-					if (takeNextQuestion && question.shouldDisplay(this.response)) {
-						return this.#buildQuestionUrl(currentSection.segment, question.url ? question.url : question.fieldName);
-					}
-
-					if (question.fieldName === questionSegment) {
-						takeNextQuestion = true;
+				const question = currentSection.getNextQuestion({
+					questionFieldName,
+					response: this.response,
+					manageListQuestion,
+					takeNextQuestion,
+					reverse
+				});
+				if (question === END_OF_SECTION) {
+					takeNextQuestion = true; // get the first question from the following section
+				} else if (question) {
+					/**
+					 * if this is a regular question, then only section and question params are required
+					 * don't include other params which may be set (e.g. manageList* params), as we may now be
+					 * redirecting to a non-manage list question, having previously been on a manage list question
+					 *
+					 * @type {import('./journey-types.d.ts').RouteParams}
+					 */
+					let newParams = {
+						section: currentSection.segment,
+						question: question.url || question.fieldName
+					};
+					if (question.isInManageListSection && manageListQuestion) {
+						// if this is in a manage list section, then the manage list params will be set
+						// we need to retain the manageListAction and manageListItemId params
+						newParams = {
+							...params,
+							// the question param is for the 'parent' manageListQuestion
+							question: manageListQuestion.url,
+							// the manageListQuestion param is for the next question
+							manageListQuestion: question.url || question.fieldName
+						};
 					}
+					return this.#buildQuestionUrl(newParams);
 				}
 			}
 		}
@@ -264,10 +325,10 @@ export class Journey {
 			return unmatchedUrl;
 		}
 
-		return this.#buildQuestionUrl(
-			matchingSection.segment,
-			matchingQuestion.url ? matchingQuestion.url : matchingQuestion.fieldName
-		);
+		return this.#buildQuestionUrl({
+			section: matchingSection.segment,
+			question: matchingQuestion.url || matchingQuestion.fieldName
+		});
 	};
 
 	/**
@@ -303,7 +364,10 @@ export class Journey {
 
 		const questionUrl = matchingQuestion.url ?? matchingQuestion.fieldName;
 
-		return this.#buildQuestionUrl(matchingSection.segment, questionUrl + addition);
+		return this.#buildQuestionUrl({
+			section: matchingSection.segment,
+			question: questionUrl + addition
+		});
 	};
 
 	/**