Change logic for when the form Continue button is displayed for V2

DEFRA · Jan 21, 2025 · bf40f10 · bf40f10
1 parent 7f96277
commit bf40f10
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/server/plugins/engine/pageControllers/QuestionPageController.ts b/src/server/plugins/engine/pageControllers/QuestionPageController.ts
@@ -81,6 +81,14 @@ export class QuestionPageController extends PageController {
     })
   }
 
+  get allowContinue(): boolean {
+    if (this.model.engine === Engine.V2) {
+      return this.pageDef.controller !== ControllerType.Terminal
+    }
+
+    return this.next.length > 0
+  }
+
   getItemId(request?: FormContextRequest) {
     const { itemId } = this.getFormParams(request)
     return itemId ?? request?.params.itemId

diff --git a/src/server/plugins/engine/views/index.html b/src/server/plugins/engine/views/index.html
@@ -24,7 +24,7 @@
       {% include "partials/heading.html" %}
 
       {% block form %}
-        {% if page.next | length %}
+        {% if page.allowContinue %}
           {% include "partials/form.html" %}
         {% else %}
           {{ componentList(components) }}