Merge remote-tracking branch 'origin/main' into MAN-225-merge

.circleci/config.yml

@@ -31,12 +31,12 @@ jobs:
           name: Update npm
           command: 'sudo npm install -g npm@10'
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-v2-{{ checksum "package-lock.json" }}
       - run:
           name: Install Dependencies
           command: npm ci --no-audit
       - save_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-v2-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
             - ~/.cache
@@ -61,7 +61,7 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-v2-{{ checksum "package-lock.json" }}
       - run:
           name: unit tests
           command: npm run test:ci
@@ -82,7 +82,7 @@ jobs:
           name: Install missing OS dependency
           command: sudo apt-get install libxss1
       - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
+          key: dependency-cache-v2-{{ checksum "package-lock.json" }}
       - run:
           name: Run the node app.
           command: npm run start-feature
@@ -125,7 +125,7 @@ workflows:
                 - main
       - hmpps/deploy_env:
           name: deploy_dev
-          env: "dev"
+          env: 'dev'
           jira_update: true
           pipeline_id: <<pipeline.id>>
           pipeline_number: <<pipeline.number>>
@@ -142,7 +142,7 @@ workflows:
           helm_timeout: 5m
       - hmpps/deploy_env:
           name: deploy_preprod
-          env: "preprod"
+          env: 'preprod'
           jira_update: true
           jira_env_type: staging
           pipeline_id: <<pipeline.id>>
@@ -160,30 +160,30 @@ workflows:
             - integration_test
             - build_docker
           helm_timeout: 5m
-#      - request-prod-approval:
-#          type: approval
-#          requires:
-#            - deploy_preprod
-#      - hmpps/deploy_env:
-#          name: deploy_prod
-#          env: "prod"
-#          jira_update: true
-#          jira_env_type: production
-#          pipeline_id: <<pipeline.id>>
-#          pipeline_number: <<pipeline.number>>
-#          slack_notification: true
-#          slack_channel_name: << pipeline.parameters.releases-slack-channel >>
-#          context:
-#            - hmpps-common-vars
-#            - hmpps-manage-a-supervision-ui-prod
-#          requires:
-#            - request-prod-approval
-#          helm_timeout: 5m
+  #      - request-prod-approval:
+  #          type: approval
+  #          requires:
+  #            - deploy_preprod
+  #      - hmpps/deploy_env:
+  #          name: deploy_prod
+  #          env: "prod"
+  #          jira_update: true
+  #          jira_env_type: production
+  #          pipeline_id: <<pipeline.id>>
+  #          pipeline_number: <<pipeline.number>>
+  #          slack_notification: true
+  #          slack_channel_name: << pipeline.parameters.releases-slack-channel >>
+  #          context:
+  #            - hmpps-common-vars
+  #            - hmpps-manage-a-supervision-ui-prod
+  #          requires:
+  #            - request-prod-approval
+  #          helm_timeout: 5m
 
   security:
     triggers:
       - schedule:
-          cron: "5 9 * * 1-5"
+          cron: '5 9 * * 1-5'
           filters:
             branches:
               only:
@@ -202,7 +202,7 @@ workflows:
   security-weekly:
     triggers:
       - schedule:
-          cron: "11 9 * * 1"
+          cron: '11 9 * * 1'
           filters:
             branches:
               only:

.eslintrc.json

@@ -34,15 +34,11 @@
       ],
       "rules": {
         "@typescript-eslint/no-use-before-define": 0,
+        "@typescript-eslint/no-unused-vars": 0,
         "class-methods-use-this": 0,
         "no-useless-constructor": 0,
-        "@typescript-eslint/no-unused-vars": [
-          1,
-          {
-            "argsIgnorePattern": "res|next|^err|_",
-            "ignoreRestSiblings": true
-          }
-        ],
+        "import/prefer-default-export": 0,
+        "@typescript-eslint/no-explicit-any": 0,
         "@typescript-eslint/semi": 0,
         "import/no-unresolved": "error",
         "prettier/prettier": [
@@ -85,7 +81,16 @@
     "comma-dangle": ["error", "always-multiline"],
     "import/no-extraneous-dependencies": [
       "error",
-      { "devDependencies": ["**/*.test.js", "**/*.test.ts", "**/testutils/**", "cypress.config.ts", "e2e_tests/**", "playwright.config.ts"] }
+      {
+        "devDependencies": [
+          "**/*.test.js",
+          "**/*.test.ts",
+          "**/testutils/**",
+          "cypress.config.ts",
+          "e2e_tests/**",
+          "playwright.config.ts"
+        ]
+      }
     ],
     "no-only-tests/no-only-tests": "error",
     "prettier/prettier": [

.github/workflows/security.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   trivy:
-    uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_trivy.yml@86eaa5068ee47ca59d2ac6e6351ecd5dcbd2d28a # v1
+    uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_trivy.yml@8cb19358c0575f37e48937fb8ff462beca6c4f6a # v1
     with:
       channel_id: probation-integration-notifications
     secrets:

.gitignore

@@ -133,3 +133,4 @@ integration_tests/screenshots/
 /playwright-report/
 /blob-report/
 /playwright/.cache/
+.DS_Store

.zap/traverse.js

@@ -1,5 +1,5 @@
 function listChildren(node, level) {
-  var j
+  let j
   for (j = 0; j < node.getChildCount(); j++) {
     print(Array(level + 1).join('    ') + node.getChildAt(j).getNodeName())
     listChildren(node.getChildAt(j), level + 1)

assets/js/application.js

@@ -0,0 +1,52 @@
+/* eslint-disable no-restricted-globals */
+const lastAppointment = () => {
+  const repeatingFrequency = document.querySelector('div[data-repeating-frequency]')
+  if (repeatingFrequency) {
+    const repeatingFrequencyRadios = repeatingFrequency.querySelectorAll('input[type="radio"]')
+    const repeatingCount = document.querySelector('div[data-repeating-count] input')
+    const lastAppointmentElm = document.querySelector('div[data-last-appointment')
+    const lastAppointmentHandler = async () => {
+      const repeatingFrequencyRadioSelected = repeatingFrequency.querySelector('input:checked')
+      if (parseInt(repeatingCount.value, 10) > 0 && repeatingFrequencyRadioSelected) {
+        const divider = location.href.includes('?') ? '&' : '?'
+        const url = `${location.href}${divider}repeating-frequency=${encodeURI(repeatingFrequencyRadioSelected.value)}&repeating-count=${repeatingCount.value}`
+        const headers = {
+          Accept: '*/*',
+          'Content-Type': 'application/x-www-form-urlencoded',
+        }
+        const response = await fetch(url, {
+          method: 'GET',
+          cache: 'no-cache',
+          credentials: 'same-origin',
+          headers,
+        })
+        const html = await response.text()
+        const parser = new DOMParser()
+        const doc = parser.parseFromString(html, 'text/html')
+        const element = doc.querySelector('div[data-last-appointment]').innerHTML
+        document.querySelector('div[data-last-appointment]').innerHTML = element
+      } else {
+        lastAppointmentElm.innerHTML = ''
+      }
+    }
+    repeatingFrequencyRadios.forEach(input => input.addEventListener('click', lastAppointmentHandler))
+    repeatingCount.addEventListener('keyup', lastAppointmentHandler)
+  }
+}
+const resetConditionals = () => {
+  const handleReset = () => {
+    document.querySelectorAll('.govuk-radios__conditional input').forEach(radioBtn => {
+      // eslint-disable-next-line no-param-reassign
+      radioBtn.checked = false
+    })
+  }
+  const elm = document.querySelector('[data-reset-conditional-radios]')
+  if (elm) {
+    // eslint-disable-next-line no-shadow
+    document.querySelectorAll('[data-reset-conditional-radios]').forEach(elm => {
+      elm.addEventListener('click', handleReset)
+    })
+  }
+}
+lastAppointment()
+resetConditionals()

assets/js/backendSortableTable.js

@@ -1,3 +1,4 @@
+/* eslint-disable func-names,no-plusplus */
 MOJFrontend.BackendSortableTable = function (params) {
   this.table = $(params.table)
 
@@ -16,11 +17,11 @@ MOJFrontend.BackendSortableTable = function (params) {
 }
 
 MOJFrontend.BackendSortableTable.prototype.check = function () {
-  //Empty function
+  // Empty function
 }
 
-MOJFrontend.BackendSortableTable.prototype.setupOptions = function (params) {
-  params = params || {}
+MOJFrontend.BackendSortableTable.prototype.setupOptions = function (nullableParams) {
+  const params = nullableParams || {}
   this.statusMessage = params.statusMessage || 'Sort by %heading% (%direction%)'
   this.ascendingText = params.ascendingText || 'ascending'
   this.descendingText = params.descendingText || 'descending'
@@ -30,7 +31,7 @@ MOJFrontend.BackendSortableTable.prototype.createHeadingButtons = function () {
   const headings = this.table.find('thead th')
   let heading
   let i = 0
-  for (let head of headings) {
+  for (const head of headings) {
     heading = $(head)
     if (heading.attr('aria-sort')) {
       this.createHeadingButton(heading, i)
@@ -44,19 +45,21 @@ MOJFrontend.BackendSortableTable.prototype.setNaturalOrder = function () {
   let heading
   this.naturalSortColumn = 0
   this.naturalSortDirection = 'ascending'
-  for (let head of headings) {
+  let i = 0
+  for (const head of headings) {
     heading = $(head)
     if (heading.attr('aria-sort-natural')) {
       this.naturalSortColumn = i
       this.naturalSortDirection = heading.attr('aria-sort-natural')
       break
     }
+    i++
   }
 }
 
 MOJFrontend.BackendSortableTable.prototype.createHeadingButton = function (heading, i) {
   const text = heading.text()
-  const button = $('<button type="button" data-index="' + i + '">' + text + '</button>')
+  const button = $(`<button type="button" data-index="${i}">${text}</button>`)
   heading.text('')
   heading.append(button)
 }
@@ -77,7 +80,7 @@ MOJFrontend.BackendSortableTable.prototype.onSortButtonClick = function (e) {
   }
 
   const columnName = $(e.currentTarget).parent().attr('col-name')
-  const sortBy = columnName + '.' + backendSortDirection
+  const sortBy = `${columnName}.${backendSortDirection}`
 
   window.location = `/${action}?sortBy=${sortBy}`
 }
@@ -97,15 +100,14 @@ MOJFrontend.BackendSortableTable.prototype.sort = function (rows, columnNumber,
           return 1
         }
         return this.sortNatural(rowA, rowB)
-      } else {
-        if (valueB < valueA) {
-          return -1
-        }
-        if (valueB > valueA) {
-          return 1
-        }
-        return this.sortNatural(rowA, rowB)
       }
+      if (valueB < valueA) {
+        return -1
+      }
+      if (valueB > valueA) {
+        return 1
+      }
+      return this.sortNatural(rowA, rowB)
     }, this),
   )
 }
@@ -123,15 +125,14 @@ MOJFrontend.BackendSortableTable.prototype.sortNatural = function (rowA, rowB) {
       return 1
     }
     return 0
-  } else {
-    if (valueB < valueA) {
-      return -1
-    }
-    if (valueB > valueA) {
-      return 1
-    }
-    return 0
   }
+  if (valueB < valueA) {
+    return -1
+  }
+  if (valueB > valueA) {
+    return 1
+  }
+  return 0
 }
 
 MOJFrontend.BackendSortableTable.prototype.getCellValue = function (cell) {

assets/js/govukFrontendInit.js

@@ -1,3 +1,4 @@
-import { initAll } from '/assets/govuk/govuk-frontend.min.js'
+// eslint-disable-next-line import/no-unresolved,import/extensions
+import { initAll } from './govuk/govuk-frontend.min.js'
 
 initAll()

assets/js/mojFrontendInit.js

@@ -1,6 +1,6 @@
 window.MOJFrontend.initAll()
 const $backendSortableTables = document.querySelectorAll('[data-module="moj-backend-sortable-table"]')
-MOJFrontend.nodeListForEach($backendSortableTables, function ($table) {
+MOJFrontend.nodeListForEach($backendSortableTables, function f($table) {
   const best = new MOJFrontend.BackendSortableTable({
     table: $table,
   })