Merge branch 'master' into test_16032

infrastructure/.terraform-version

@@ -1 +1 @@
-1.7.3
+1.10.5

infrastructure/_state.tf

@@ -1,22 +1,32 @@
+provider "azurerm" {
+  features {}
+}
+
+provider "azurerm" {
+  features {}
+  resource_provider_registrations = "none"
+  alias                           = "private_endpoint"
+  subscription_id                 = var.aks_subscription_id
+}
+
 terraform {
+  required_version = ">= 0.15" # Terraform client version
+
   backend "azurerm" {}
 
   required_providers {
-    azurerm = {
-      source  = "hashicorp/azurerm"
-      version = "3.112.0"
+    azuread = {
+      source  = "hashicorp/azuread"
+      version = "3.1.0"
     }
+
     random = {
-        source = "hashicorp/random"
+      source = "hashicorp/random"
     }
-    azuread = {
-      source  = "hashicorp/azuread"
-      version = "2.53.1"
+
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~> 4.16.0"
     }
   }
 }
-
-provider "azurerm" {
-  features {}
-  skip_provider_registration = "true"
-}

infrastructure/_variables.tf

@@ -58,4 +58,6 @@ variable "sku_name" {
 variable "capacity" {
   default     = "1"
   description = "The size of the Redis cache to deploy. Valid values are 1, 2, 3, 4, 5"
-}
+}
+
+variable "aks_subscription_id" {}

infrastructure/app-insights.tf

@@ -1,5 +1,5 @@
 module "application_insights" {
-  source = "[email protected]:hmcts/terraform-module-application-insights?ref=main"
+  source = "[email protected]:hmcts/terraform-module-application-insights?ref=4.x"
 
   env      = var.env
   product  = var.product

package.json

@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@hmcts/cookie-manager": "^1.0.0",
-    "@hmcts/info-provider": "^1.2.1",
+    "@hmcts/info-provider": "^1.2.2",
     "@hmcts/nodejs-healthcheck": "^1.8.0",
     "@hmcts/nodejs-logging": "^4.0.4",
     "@hmcts/properties-volume": "^0.0.14",
@@ -78,7 +78,7 @@
     "crypto-js": "^4.2.0",
     "csurf": "^1.11.0",
     "dayjs": "^1.11.7",
-    "express": "^4.19.2",
+    "express": "^4.21.2",
     "express-async-errors": "^3.1.1",
     "express-session": "^1.17.3",
     "follow-redirects": "1.15.6",
@@ -113,9 +113,9 @@
     "validator": "^13.7.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.19.6",
-    "@babel/eslint-parser": "^7.19.1",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/core": "^7.26.0",
+    "@babel/eslint-parser": "^7.26.5",
+    "@babel/preset-env": "^7.26.0",
     "@playwright/test": "^1.41.2",
     "@types/copy-webpack-plugin": "^10.1.0",
     "@types/jest": "^29.4.0",
@@ -133,7 +133,7 @@
     "eslint-plugin-codeceptjs": "^1.3.0",
     "html-webpack-plugin": "^5.5.0",
     "html_codesniffer": "^2.5.1",
-    "jest": "^29.4.1",
+    "jest": "^29.7.0",
     "jest-junit": "^15.0.0",
     "jest-launchdarkly-mock": "^2.0.3",
     "mini-css-extract-plugin": "^2.7.2",
@@ -153,7 +153,7 @@
     "supertest": "^6.3.1",
     "supertest-session": "^4.1.0",
     "totp-generator": "^0.0.14",
-    "ts-jest": "^29.0.3",
+    "ts-jest": "^29.2.5",
     "ts-loader": "^9.4.2",
     "tslint": "^6.1.3",
     "webdriverio": "^8.3.2",
@@ -178,7 +178,10 @@
     "braces": "^3.0.3",
     "ws": "^8.17.1",
     "axios": "^1.7.4",
-    "nanoid": "^3.3.8"
+    "nanoid": "^3.3.8",
+    "@babel/traverse": "^7.26.5",
+    "cross-spawn": "7.0.6",
+    "express": "4.21.2"
   },
   "packageManager": "[email protected]"
 }

src/main/modules/i18n/locales/cy.json

@@ -585,7 +585,7 @@
       "COMBO_BOX" : {
         "TITLE": "A ddaethpwyd i gytundeb rhwng y partïon sy’n ymwneud â’r hawliad ynghylch pa ddogfennau electronig fydd yn cael eu datgelu?",
         "ITEM1": {
-          "TEXT": "Ie"
+          "TEXT": "Do"
         },
         "ITEM2": {
           "TEXT": "Na, ond mae'n debygol y bydd cytundeb"
@@ -1923,7 +1923,7 @@
       "PARAGRAPH_2.2": "Er enghraifft, nid yw e-bost wedi’i argraffu yn ddogfen electronig.",
       "TITLE_3": "Rhagor o wybodaeth",
       "URL": {
-        "BEFORE": "Rhagor o wybodaeth ",
+        "BEFORE": "Rhagor o wybodaeth ar ",
         "TEXT": "Gyfarwyddyd Ymarfer 31B (yn agor mewn tab newydd)",
         "AFTER": "."
       },

src/main/views/features/directionsQuestionnaire/fixedRecoverableCosts/frc-band-agreed.njk

@@ -29,7 +29,7 @@
                         {{ createPageTitle(title,t) }}
                         {{ createDetails( whatAreFixedRecoverableCostsContent ,t) }}
                         {{ createPageTitle(buttonTitle,t,'m') }}
-                        {{ yesNoRadioButton(t, 'option', 'option', '', form, '', {yesHtml: yesHtml, yes: 'COMMON.VARIATION.YES', no: 'COMMON.VARIATION.NO', noHtml: noHtml}) }}
+                        {{ yesNoRadioButton(t, 'option', 'option', '', form, '', {yesHtml: yesHtml, yes: 'COMMON.VARIATION_4.YES', no: 'COMMON.VARIATION_4.NO', noHtml: noHtml}) }}
                         {{ addButton(t, 'SAVE_AND_CONTINUE') }}
                         {{ contactUsForHelp(t) }}
                     </form>

src/main/views/features/directionsQuestionnaire/fixedRecoverableCosts/subject-to-frc.njk

@@ -29,7 +29,7 @@
                         {{ createPageTitle(title,t) }}
                         {{ createDetails( whatAreFixedRecoverableCostsContent ,t) }}
                         {{ createPageTitle(buttonTitle,t,'m') }}
-                        {{ yesNoRadioButton(t, 'option', 'option', '', form, '', {yesHtml: yesHtml, yes: 'COMMON.VARIATION.YES', no: 'COMMON.VARIATION.NO', noHtml: noHtml}) }}
+                        {{ yesNoRadioButton(t, 'option', 'option', '', form, '', {yesHtml: yesHtml, yes: 'COMMON.VARIATION_4.YES', no: 'COMMON.VARIATION_4.NO', noHtml: noHtml}) }}
                         {{ addButton(t, 'SAVE_AND_CONTINUE') }}
                         {{ contactUsForHelp(t) }}
                     </form>

src/main/views/features/directionsQuestionnaire/mintiMultiTrack/claimant-documents-to-be-considered.njk

@@ -30,7 +30,7 @@
               {{ createPageTitle(componentText,t, 'm') }}
             <form method="post" novalidate>
               {{ csrfProtection(csrf) }}
-              {{ yesNoRadioButton(t, 'option', 'option', '', form, '', {classes: 'govuk-radios', yes: variation.yes, no: variation.no}) }}
+              {{ yesNoRadioButton(t, 'option', 'option', '', form, '', {classes: 'govuk-radios', yes: 'COMMON.VARIATION_8.YES', no: 'COMMON.VARIATION_8.NO'}) }}
 
               {{ addButton(t, 'SAVE_AND_CONTINUE') }}
               {{ contactUsForHelp(t) }}

src/test/e2eTests/response/steps/response.js

@@ -441,7 +441,7 @@ class Response {
 
   yourRepaymentPlan(isPartial){
     let futureDate = new Date();
-    futureDate.setDate(futureDate.getDate() + 1);
+    futureDate.setDate(futureDate.getDate() + 3);
 
     I.click(responseTaskListItems.YOUR_REPAYMENT_PLAN, checkTaskList(responseTaskListItems.YOUR_REPAYMENT_PLAN, taskListStatus.INCOMPLETE));
     I.seeInCurrentUrl('/payment-plan');

src/test/e2eTests/tests/response/partAdmit/partAdmit.js

@@ -3,7 +3,7 @@ const PartAdmit = require('../../../response/steps/response');
 const {paymentType} = require('../../../commons/responseVariables');
 const {yesAndNoCheckBoxOptionValue} = require('../../../commons/eligibleVariables');
 
-Feature('Response journey defendant Part Admin').tag('@e2e');
+Feature('Response journey defendant Part Admit').tag('@e2e');
 
 Scenario('already paid', () => {
   if (['preview', 'demo'].includes(config.runningEnv)) {

src/test/functionalTests/citizenFeatures/GA/pages/applyHelpFeeSelection.js

@@ -21,6 +21,14 @@ class ApplyHelpFeeSelection {
     contactUs.verifyContactUs();
   }
 
+  async verifyPageContentForAdditionalFee(){
+    this.checkPageFullyLoaded();
+    this.verifyBreadcrumbs();
+    this.verifyHeadingDetailsForAdditionalFee();
+    await this.verifyPageText();
+    contactUs.verifyContactUs();
+  }
+
   verifyBreadcrumbs() {
     I.see('Back', '//a[@class="govuk-back-link"]');
   }
@@ -30,6 +38,11 @@ class ApplyHelpFeeSelection {
     I.see('Pay application fee', 'h1');
   }
 
+  verifyHeadingDetailsForAdditionalFee() {
+    I.see('Additional application fee', 'span');
+    I.see('Pay additional application fee', 'h1');
+  }
+
   async verifyPageText() {
     I.see('If you\'re on a low income, have limited savings or are claiming benefits, you may be able to get help with fees (opens in a new tab).');
     I.see('If you meet the criteria, you may get support to pay some or all of the fee.');

src/test/functionalTests/citizenFeatures/GA/pages/paymentGAConfirmation.js

@@ -20,6 +20,13 @@ class PaymentConfirmation {
     contactUs.verifyContactUs();
   }
 
+  async verifyAdditionalPaymentPageContent(){
+    this.checkPageFullyLoaded();
+    this.verifyHeadingDetails();
+    await this.verifyPageTextForAdditionalPayment();
+    contactUs.verifyContactUs();
+  }
+
   verifyHeadingDetails() {
     I.see('Your payment was', 'h1');
     I.see('successful', 'h1');
@@ -31,6 +38,13 @@ class PaymentConfirmation {
     I.see('If you chosen to inform the other parties or agreed the application, they will have 5 working days to respond to your application. If you have a hearing in the next 10 days, your application will be treated urgently.');
     await I.seeElement('//a[@class=\'govuk-button\' and contains(text(), \'Close and return to dashboard\')]\n');
   }
+
+  async verifyPageTextForAdditionalPayment() {
+    I.see('What happens next', 'h2');
+    I.see('The other parties will have 5 working days to respond to your application. If you have a hearing in the next 10 days, your application will be treated urgently.');
+    I.see('If necessary, all documents relating to this application, including any response from the court, will be translated. You will be notified when these are available.');
+    await I.seeElement('//a[@class=\'govuk-button\' and contains(text(), \'Close and return to dashboard\')]\n');
+  }
 }
 
 module.exports = PaymentConfirmation;

src/test/functionalTests/citizenFeatures/GA/steps/createGASteps.js

@@ -237,7 +237,7 @@ class createGASteps {
 
     let feeAmount;
 
-    switch(communicationType) {
+    switch (communicationType) {
       case 'consent':
         feeAmount = '119';
         break;
@@ -352,7 +352,7 @@ class createGASteps {
     const applicationType = 'Change a hearing date';
     let feeAmount;
 
-    switch(communicationType) {
+    switch (communicationType) {
       case 'consent':
         feeAmount = '119';
         break;
@@ -466,7 +466,7 @@ class createGASteps {
     const applicationType = 'More time to do what is required by a court order';
     let feeAmount;
 
-    switch(communicationType) {
+    switch (communicationType) {
       case 'consent':
         feeAmount = '119';
         break;
@@ -581,7 +581,7 @@ class createGASteps {
     const applicationType = 'Relief from a penalty you\'ve been given by the court';
     let feeAmount;
 
-    switch(communicationType) {
+    switch (communicationType) {
       case 'consent':
         feeAmount = '119';
         break;
@@ -698,7 +698,7 @@ class createGASteps {
     const applicationType = 'Make a change to your claim or defence that you\'ve submitted';
     let feeAmount;
 
-    switch(communicationType) {
+    switch (communicationType) {
       case 'consent':
         feeAmount = '119';
         break;
@@ -814,7 +814,7 @@ class createGASteps {
     const applicationType = 'Court to make a summary judgment on a case';
     let feeAmount;
 
-    switch(communicationType) {
+    switch (communicationType) {
       case 'consent':
         feeAmount = '119';
         break;
@@ -930,7 +930,7 @@ class createGASteps {
     const applicationType = 'Court to strike out all or part of the other parties\' case without a trial';
     let feeAmount;
 
-    switch(communicationType) {
+    switch (communicationType) {
       case 'consent':
         feeAmount = '119';
         break;
@@ -1046,7 +1046,7 @@ class createGASteps {
     const applicationType = 'Court to pause a claim';
     let feeAmount;
 
-    switch(communicationType) {
+    switch (communicationType) {
       case 'consent':
         feeAmount = '119';
         break;
@@ -1162,7 +1162,7 @@ class createGASteps {
     const applicationType = 'Court to impose a sanction on the other parties unless they do a specific action';
     let feeAmount;
 
-    switch(communicationType) {
+    switch (communicationType) {
       case 'consent':
         feeAmount = '119';
         break;
@@ -1366,7 +1366,7 @@ class createGASteps {
     const applicationType = 'Court to do something that\'s not on this list';
     let feeAmount;
 
-    switch(communicationType) {
+    switch (communicationType) {
       case 'consent':
         feeAmount = '119';
         break;
@@ -1476,6 +1476,18 @@ class createGASteps {
 
     return generalApplicationID;
   }
+
+  async additionalPayment(feeAmount) {
+    await applyHelpFeeSelectionPage.verifyPageContentForAdditionalFee();
+    await applyHelpFeeSelectionPage.nextAction('No');
+    await applyHelpFeeSelectionPage.nextAction('Continue');
+
+    await govPay.addValidCardDetails(feeAmount);
+    govPay.confirmPayment();
+
+    await paymentConfirmationPage.verifyAdditionalPaymentPageContent();
+    await paymentConfirmationPage.nextAction('Close and return to dashboard');
+  }
 }
 
 module.exports = new createGASteps();

src/test/functionalTests/specClaimHelpers/api/steps.js

@@ -96,6 +96,9 @@ module.exports = {
       case 'freeFormOrder':
         payload = makeAnOrderGA.freeFormOrder(document);
         break;
+      case 'withoutNoticeToWith':
+        payload = makeAnOrderGA.withoutNoticeToWith(document);
+        break;
       default:
         payload = makeAnOrderGA.makeAnOrderGA(document);
         break;

src/test/functionalTests/specClaimHelpers/dashboardNotificationConstants.js

@@ -533,4 +533,13 @@ module.exports = {
       nextSteps: 'View the order',
     };
   },
+
+  // The other parties have requested a change
+  otherPartiesRequestedChange: () => {
+    return {
+      title: 'The other parties have requested a change to the case',
+      content: 'Review their request and respond to it by 4pm on',
+      nextSteps: 'Review and respond to the request',
+    };
+  },
 };