fix(app): refocus branch to no-returns-required

DEFRA · Apr 5, 2024 · ca46203 · ca46203
1 parent b688cbd
commit ca46203
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 43 deletions.
diff --git a/app/controllers/return-requirements.controller.js b/app/controllers/return-requirements.controller.js
@@ -259,10 +259,6 @@ async function submitPoints (request, h) {
     return h.view('return-requirements/points.njk', pageData)
   }
 
-  if (pageData.checkYourAnswersVisited) {
-    return h.redirect(`/system/return-requirements/${sessionId}/check-your-answers`)
-  }
-
   return h.redirect(`/system/return-requirements/${sessionId}/abstraction-period`)
 }
 
@@ -275,10 +271,6 @@ async function submitPurpose (request, h) {
     return h.view('return-requirements/purpose.njk', pageData)
   }
 
-  if (pageData.checkYourAnswersVisited) {
-    return h.redirect(`/system/return-requirements/${sessionId}/check-your-answers`)
-  }
-
   return h.redirect(`/system/return-requirements/${sessionId}/points`)
 }
 
@@ -291,10 +283,6 @@ async function submitReason (request, h) {
     return h.view('return-requirements/reason.njk', pageData)
   }
 
-  if (pageData.checkYourAnswersVisited) {
-    return h.redirect(`/system/return-requirements/${sessionId}/check-your-answers`)
-  }
-
   return h.redirect(`/system/return-requirements/${sessionId}/setup`)
 }
 
@@ -325,10 +313,6 @@ async function submitSiteDescription (request, h) {
     return h.view('return-requirements/site-description.njk', pageData)
   }
 
-  if (pageData.checkYourAnswersVisited) {
-    return h.redirect(`/system/return-requirements/${sessionId}/check-your-answers`)
-  }
-
   return h.redirect(`/system/return-requirements/${sessionId}/frequency-collected`)
 }
 

diff --git a/app/services/return-requirements/purpose.service.js b/app/services/return-requirements/purpose.service.js
@@ -27,7 +27,6 @@ async function go (sessionId) {
 
   return {
     activeNavBar: 'search',
-    checkYourAnswersVisited: session.data.checkYourAnswersVisited,
     pageTitle: 'Select the purpose for the requirements for returns',
     ...formattedData
   }

diff --git a/app/services/return-requirements/reason.service.js b/app/services/return-requirements/reason.service.js
@@ -23,7 +23,6 @@ async function go (sessionId) {
 
   return {
     activeNavBar: 'search',
-    checkYourAnswersVisited: session.data.checkYourAnswersVisited,
     pageTitle: 'Select the reason for the return requirement',
     ...formattedData
   }

diff --git a/app/services/return-requirements/setup.service.js b/app/services/return-requirements/setup.service.js
@@ -23,7 +23,6 @@ async function go (sessionId) {
 
   return {
     activeNavBar: 'search',
-    checkYourAnswersVisited: session.data.checkYourAnswersVisited,
     pageTitle: 'How do you want to set up the return requirement?',
     ...formattedData
   }

diff --git a/app/services/return-requirements/submit-purpose.service.js b/app/services/return-requirements/submit-purpose.service.js
@@ -33,9 +33,7 @@ async function go (sessionId, payload) {
   if (!validationResult) {
     await _save(session, payload)
 
-    return {
-      checkYourAnswersVisited: session.data.checkYourAnswersVisited
-    }
+    return {}
   }
 
   const formattedData = SelectPurposePresenter.go(session, purposesData, payload)

diff --git a/app/services/return-requirements/submit-reason.service.js b/app/services/return-requirements/submit-reason.service.js
@@ -31,16 +31,13 @@ async function go (sessionId, payload) {
   if (!validationResult) {
     await _save(session, payload)
 
-    return {
-      checkYourAnswersVisited: session.data.checkYourAnswersVisited
-    }
+    return {}
   }
 
   const formattedData = ReasonPresenter.go(session, payload)
 
   return {
     activeNavBar: 'search',
-    checkYourAnswersVisited: session.data.checkYourAnswersVisited,
     error: validationResult,
     pageTitle: 'Select the reason for the return requirement',
     ...formattedData

diff --git a/app/services/return-requirements/submit-setup.service.js b/app/services/return-requirements/submit-setup.service.js
@@ -32,7 +32,6 @@ async function go (sessionId, payload) {
     await _save(session, payload)
 
     return {
-      checkYourAnswersVisited: session.data.checkYourAnswersVisited,
       redirect: _redirect(payload.setup)
     }
   }
@@ -41,7 +40,6 @@ async function go (sessionId, payload) {
 
   return {
     activeNavBar: 'search',
-    checkYourAnswersVisited: session.data.checkYourAnswersVisited,
     error: validationResult,
     pageTitle: 'How do you want to set up the return requirement?',
     ...formattedData

diff --git a/app/views/return-requirements/purpose.njk b/app/views/return-requirements/purpose.njk
@@ -9,14 +9,10 @@
 
 {% block breadcrumbs %}
   {# Back link #}
-  {% set backLink %}
-    /system/return-requirements/{{ id }}/{{ 'check-your-answers' if checkYourAnswersVisited else 'setup' }}
-  {% endset %}
-
   {{
     govukBackLink({
       text: 'Back',
-      href: backLink
+      href: rootLink + "/setup"
     })
   }}
 {% endblock %}

diff --git a/app/views/return-requirements/reason.njk b/app/views/return-requirements/reason.njk
@@ -6,14 +6,10 @@
 
 {% block breadcrumbs %}
   {# Back link #}
-  {% set backLink %}
-    /system/return-requirements/{{ id }}/{{ 'check-your-answers' if checkYourAnswersVisited else 'start-date' }}
-  {% endset %}
-
   {{
     govukBackLink({
       text: 'Back',
-      href: backLink
+      href: '/system/return-requirements/' + id + '/start-date'
     })
   }}
 {% endblock %}

diff --git a/app/views/return-requirements/setup.njk b/app/views/return-requirements/setup.njk
@@ -8,14 +8,10 @@
 
 {% block breadcrumbs %}
   {# Back link #}
-  {% set backLink %}
-    /system/return-requirements/{{ id }}/{{ 'check-your-answers' if checkYourAnswersVisited else 'reason' }}
-  {% endset %}
-
   {{
     govukBackLink({
       text: 'Back',
-      href: backLink
+      href: rootLink + '/reason'
     })
   }}
 {% endblock %}