chore: merge upstream changes (#522)

Author: ramonrodgal

e2e/cypress/e2e/runner/RepeatingSectionSummaryPageController.feature

@@ -56,6 +56,7 @@ export class SummaryViewModel {
   _webhookData: WebhookData | undefined;
   callback?: InitialiseSessionOptions;
   showPaymentSkippedWarningPage: boolean = false;
+  returnUrl: string;
   constructor(
     pageTitle: string,
     model: FormModel,
@@ -130,6 +131,7 @@ export class SummaryViewModel {
     const { feeOptions } = model;
     this.showPaymentSkippedWarningPage =
       feeOptions.showPaymentSkippedWarningPage ?? false;
+    this.returnUrl = `/${model.basePath}/summary`;
   }
 
   private processErrors(result, details) {

runner/src/server/plugins/engine/models/SummaryViewModel.ts

@@ -66,6 +66,7 @@ export class PageControllerBase {
   backLinkFallback?: string;
   details?: any;
   disableBackLink?: boolean;
+  returnUrl?: string;
 
   // TODO: pageDef type
   constructor(model: FormModel, pageDef: { [prop: string]: any } = {}) {
@@ -154,6 +155,7 @@ export class PageControllerBase {
     backLink?: string;
     phaseTag?: string | undefined;
     details?: any;
+    returnUrl?: string | undefined;
   } {
     let showTitle = true;
     let pageTitle = this.title;
@@ -205,6 +207,7 @@ export class PageControllerBase {
       errors,
       isStartPage: false,
       details: this.details || undefined,
+      returnUrl: this.returnUrl || undefined,
     };
   }
 

runner/src/server/plugins/engine/pageControllers/PageControllerBase.ts

@@ -8,7 +8,7 @@ import { PageController } from "./PageController";
 export class RepeatingSectionSummaryPageController extends PageController {
   makeGetRouteHandler() {
     return async (request: HapiRequest, h: HapiResponseToolkit) => {
-      const { remove } = request.query;
+      const { remove, returnUrl } = request.query;
       const { cacheService } = request.services([]);
       const state = await cacheService.getState(request);
       const noInt = (str: string) => str.replace(/\d+/g, "");
@@ -34,22 +34,27 @@ export class RepeatingSectionSummaryPageController extends PageController {
           }
         });
         await cacheService.mergeState(request, newState);
+        let param = "";
+        if (returnUrl) param = `?returnUrl=${encodeURIComponent(returnUrl)}`;
 
         if (int(this.path) === summaryFiltered.length) {
+          const newPath = noInt(this.path) + (int(this.path) - 1);
           return h.redirect(
-            `/${this.model.basePath}${noInt(this.path)}${int(this.path) - 1}`
+            `/${this.model.basePath}${newPath}${param}`
           );
         }
-        return h.redirect(`/${this.model.basePath}${this.path}`);
+        return h.redirect(`/${this.model.basePath}${this.path}${param}`);
       }
 
       this.details = summaryFiltered.map((detail) => {
+        if (returnUrl) return detail;
         const currentPath = this.path.replace("/", "");
         return {
           ...detail,
           card: detail.items[0].url.replace("summary", currentPath),
         };
       });
+      this.returnUrl = returnUrl;
       return super.makeGetRouteHandler()(request, h);
     };
   }

runner/src/server/plugins/engine/pageControllers/RepeatingSectionSummaryPageController.ts

@@ -1,4 +1,4 @@
-{% from "./summary-row.html" import summaryRow %} {% macro summaryCard(data, hideRemove)
+{% from "./summary-row.html" import summaryRow %} {% macro summaryCard(data, hideRemove, returnUrl)
 %} {% set isRepeatableSection = (data.items[0] | isArray) %}
 
 <div class="govuk-summary-card">
@@ -8,7 +8,7 @@ <h2 class="govuk-summary-card__title" name="{{data.title}}" id="{{data.title}}">
       <ul class="govuk-summary-card__actions">
         {% if not hideRemove %}
           <li class="govuk-summary-card__action">
-            <a class="govuk-link" href="?remove={{ data.name }}">
+            <a class="govuk-link" href="?remove={{ data.name }}{{ "&returnUrl=" + returnUrl if returnUrl }}">
               Delete<span class="govuk-visually-hidden"> {{data.title}}</span>
             </a>
           </li>

runner/src/server/views/partials/summary-card.html

@@ -23,7 +23,7 @@ <h1 class="govuk-heading-l">
         {% if details.length === 1 %}
           {{ summaryCard(detail, true) }}
         {% else %}
-          {{ summaryCard(detail) }}
+          {{ summaryCard(detail, false, returnUrl) }}
         {% endif %}
       {% endfor %}
 

runner/src/server/views/repeating-section-summary.html

@@ -31,8 +31,10 @@ <h1 class="govuk-heading-l">
             {% if not details[loop.index].card %}
               {% set splitDash = detail.items[0].pageId.split("-") %}
               {% set lastEntry = splitDash.slice(-1)[0] %}
+              {% set formAction = splitDash.slice(0, -1).concat(["added", lastEntry]).join("-") %}
 
-              <form action="{{ splitDash.slice(0, -1).concat(["added", lastEntry]).join("-") }}" method="get">
+              <form action="{{ formAction }}" method="get">
+                <input type="hidden" name="returnUrl" value="{{ returnUrl }}" />
                 <button class="govuk-button govuk-button--secondary">
                   Add {% if lastEntry !== "1" %} or delete {% endif %}
                   {{ detail.title.split(" ").slice(0, -1).join(" ") | lower }}

runner/src/server/views/summary.html

@@ -70,7 +70,7 @@ suite("uploads", () => {
 
     stub(UploadService.prototype, "uploadDocuments").callsFake(async () => {
       return {
-        error: "The selected files contained a virus",
+        error: 'The selected files contain a virus',
       };
     });
 
@@ -87,7 +87,7 @@ suite("uploads", () => {
 
     const $ = cheerio.load(response.payload);
     expect($("[href='#file1']").text().trim()).to.equal(
-      "The selected files contained a virus"
+      'The selected files contain a virus'
     );
   });