Display return versions in view licence setup tab

app/presenters/licences/set-up.presenter.js

@@ -28,29 +28,38 @@ const agreementDescriptions = {
  *
  * @param {module:ChargeVersionModel[]} chargeVersions - All charge versions records for the licence
  * @param {module:WorkflowModel[]} workflows - All in-progress workflow records for the licence
- * @param {module:LicenceAgreements[]} agreements - All agreements records for the licence
+ * @param {module:LicenceAgreementModel[]} agreements - All agreements records for the licence
  * @param {module:ReturnVersionModel[]} returnVersions - All returns version records for the licence
  * @param {Object} auth - The auth object taken from `request.auth` containing user details
  * @param {Object} commonData - Licence data already formatted for the view's shared elements
+ * @param {boolean} enableRequirementsForReturns - feature toggle for the return versions links
  *
  * @returns {Object} The data formatted for the view template
  */
-function go (chargeVersions, workflows, agreements, returnVersions, auth, commonData) {
+function go (chargeVersions, workflows, agreements, returnVersions, auth, commonData, enableRequirementsForReturns) {
   return {
     links: {
       chargeInformation: _chargeInformationLinks(auth, commonData),
       agreements: _agreementLinks(auth, commonData),
-      returnVersions: {
-        returnsRequired: `/system/licences/${commonData.licenceId}/returns-required`,
-        noReturnsRequired: `/system/licences/${commonData.licenceId}/no-returns-required`
-      }
+      returnVersions: _returnVersionsLinks(commonData, enableRequirementsForReturns)
     },
     agreements: _agreements(commonData, agreements, auth),
     chargeInformation: _chargeInformation(chargeVersions, workflows, auth),
-    returnVersions: _returnsVersions(returnVersions)
+    returnVersions: _returnVersions(returnVersions)
   }
 }
 
+function _returnVersionsLinks (commonData, enableRequirementsForReturns) {
+  if (enableRequirementsForReturns) {
+    return {
+      returnsRequired: `/system/licences/${commonData.licenceId}/returns-required`,
+      noReturnsRequired: `/system/licences/${commonData.licenceId}/no-returns-required`
+    }
+  }
+
+  return {}
+}
+
 function _agreements (commonData, agreements, auth) {
   return agreements.map((agreement) => {
     return {
@@ -170,7 +179,7 @@ function _financialAgreementCode (agreement) {
   return agreement.financialAgreements[0].financialAgreementCode
 }
 
-function _returnsVersions (returnVersions = [{}]) {
+function _returnVersions (returnVersions = [{}]) {
   return returnVersions.map((returnVersion) => {
     return {
       action: [{

app/services/licences/view-licence-set-up.service.js

@@ -30,13 +30,12 @@ async function go (licenceId, auth) {
   const returnVersions = await FetchReturnVersionsService.go(licenceId)
 
   const licenceSetUpData = SetUpPresenter
-    .go(chargeVersions, workflows, agreements, returnVersions, auth, commonData)
+    .go(chargeVersions, workflows, agreements, returnVersions, auth, commonData, FeatureFlagsConfig.enableRequirementsForReturns)
 
   return {
     activeTab: 'set-up',
     ...commonData,
-    ...licenceSetUpData,
-    enableRequirementsForReturns: FeatureFlagsConfig.enableRequirementsForReturns
+    ...licenceSetUpData
   }
 }
 

app/views/licences/tabs/set-up.njk

@@ -62,7 +62,7 @@
         rows: returnVersionsTableRows
       }) }}
   {% endif %}
-{% if enableRequirementsForReturns %}
+
   {% if links.returnVersions.returnsRequired %}
     <p>
       {{ govukButton({
@@ -82,7 +82,6 @@
       }) }}
     </p>
   {% endif %}
-{% endif %}
 
 <h3 class="govuk-heading-m"> Charge information </h3>
 

test/controllers/licences.controller.test.js

@@ -353,7 +353,6 @@ describe('Licences controller', () => {
           activeTab: 'set-up',
           agreements: [],
           chargeInformation: [],
-          enableRequirementsForReturns: true,
           returnVersions: []
         })
       })
@@ -378,7 +377,6 @@ describe('Licences controller', () => {
           activeTab: 'set-up',
           agreements: [],
           chargeInformation: [],
-          enableRequirementsForReturns: false,
           returnVersions: []
         })
       })