MAP-575 rename flexion techniques

.circleci/config.yml

@@ -14,13 +14,13 @@ parameters:
 
   node-version:
     type: string
-    default: 18.17.1-browsers
+    default: 21.5.0-browsers
 
 executors:
   integration-tests:
     docker:
       - image: cimg/node:<< pipeline.parameters.node-version >>
-      - image: circleci/postgres:10.13-ram
+      - image: cimg/postgres:14.7
         environment:
           POSTGRES_PASSWORD: use-of-force
           POSTGRES_USER: use-of-force
@@ -39,7 +39,7 @@ jobs:
       - checkout
       - run:
           name: Update npm
-          command: 'sudo npm install -g npm@9'
+          command: 'sudo npm install -g npm@10'
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.17.1 as builder
+FROM node:21.5.0 as builder
 
 ARG BUILD_NUMBER
 ARG GIT_REF
@@ -24,7 +24,7 @@ RUN CYPRESS_INSTALL_BINARY=0 npm ci --no-audit && \
 
 RUN npm prune --production
 
-FROM node:18.17.1-slim
+FROM node:21.5.0-slim
 LABEL maintainer="HMPPS Digital Studio <[email protected]>"
 
 # Cache breaking

integration-tests/pages/sections/reportDetails.js

@@ -65,7 +65,7 @@ module.exports = {
     cy.get('[data-qa="restraintUsed"]').contains('Yes - standing, on back (supine), on front (prone), kneeling')
     handcuffsApplied().contains('Yes')
     painInducingTechniques().contains('Yes')
-    cy.get('[data-qa="painInducingTechniques"]').contains('Yes - final lock flexion, thumb lock')
+    cy.get('[data-qa="painInducingTechniques"]').contains('Yes - wrist flexion, thumb lock')
 
     cy.get('[data-qa="prisonerRelocation"]').contains('Segregation unit')
     prisonerCompliant().contains('Yes')

package.json

@@ -29,8 +29,8 @@
     "security_audit": "npx audit-ci --config audit-ci.json"
   },
   "engines": {
-    "node": "^18",
-    "npm": "<10"
+    "node": "^21",
+    "npm": "^10"
   },
   "jest": {
     "transform": {

server/config/types.ts

@@ -28,8 +28,8 @@ export const ControlAndRestraintPosition = toEnum({
 })
 
 export const PainInducingTechniquesUsed = toEnum({
-  FINAL_LOCK_FLEXION: { value: 'FINAL_LOCK_FLEXION', label: 'Final lock flexion' },
-  FINAL_LOCK_ROTATION: { value: 'FINAL_LOCK_ROTATION', label: 'Final lock rotation' },
+  FINAL_LOCK_FLEXION: { value: 'FINAL_LOCK_FLEXION', label: 'Wrist flexion' },
+  FINAL_LOCK_ROTATION: { value: 'FINAL_LOCK_ROTATION', label: 'Wrist rotation' },
   MANDIBULAR_ANGLE_TECHNIQUE: { value: 'MANDIBULAR_ANGLE_TECHNIQUE', label: 'Mandibular angle technique' },
   SHOULDER_CONTROL: { value: 'SHOULDER_CONTROL', label: 'Shoulder control' },
   THROUGH_RIGID_BAR_CUFFS: { value: 'THROUGH_RIGID_BAR_CUFFS', label: 'Through rigid bar cuffs' },
@@ -43,6 +43,9 @@ export const RelocationLocation = toEnum({
   SEGREGATION_UNIT: { value: 'SEGREGATION_UNIT', label: 'Segregation unit' },
   SPECIAL_ACCOMMODATION: { value: 'SPECIAL_ACCOMMODATION', label: 'Special accommodation' },
   CELLULAR_VEHICLE: { value: 'CELLULAR_VEHICLE', label: 'Cellular vehicle' },
+  RECEPTION: { value: 'RECEPTION', label: 'Reception' },
+  OTHER_WING: { value: 'OTHER_WING', label: 'Other wing' },
+  FACILITATE_RELEASE: { value: 'FACILITATE_RELEASE', label: 'To facilitate release' },
 })
 
 export const ReportStatus = toEnum({

server/routes/maintainingReports/admin.test.ts

@@ -142,7 +142,7 @@ describe('/:reportId/edit-report', () => {
           expect(reportService.update).not.toHaveBeenCalled()
           expect(flash).toHaveBeenCalledWith('errors', {
             href: '#form',
-            text: 'Unexpected token h in JSON at position 1',
+            text: "Unexpected token 'h', \"this isn't json!\" is not valid JSON",
           })
         })
     })

server/services/reportSummary.test.ts

@@ -29,14 +29,14 @@ describe('reportSummary', () => {
       form.useOfForceDetails.painInducingTechniques = true
       form.useOfForceDetails.painInducingTechniquesUsed = ['FINAL_LOCK_FLEXION']
       const result = reportSummary(form, offenderDetail, prison, locationDescription, involvedStaff, incidentDate)
-      expect(result.useOfForceDetails.painInducingTechniques).toEqual('Yes - Final lock flexion')
+      expect(result.useOfForceDetails.painInducingTechniques).toEqual('Yes - Wrist flexion')
     })
 
     it('should return 2 techniques used', () => {
       form.useOfForceDetails.painInducingTechniques = true
       form.useOfForceDetails.painInducingTechniquesUsed = ['FINAL_LOCK_FLEXION', 'THUMB_LOCK']
       const result = reportSummary(form, offenderDetail, prison, locationDescription, involvedStaff, incidentDate)
-      expect(result.useOfForceDetails.painInducingTechniques).toEqual('Yes - Final lock flexion, Thumb lock')
+      expect(result.useOfForceDetails.painInducingTechniques).toEqual('Yes - Wrist flexion, Thumb lock')
     })
 
     it('should return "No"', () => {