diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index 78659a1d..30a2891a 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -56,7 +56,7 @@ jobs: target-folder: zap-report - name: Add HTML report URL to the job summary - run: echo '[🛡️ OWASP ZAP Report](https://ministryofjustice.github.io/hmpps-manage-a-supervision-ui/zap-report)' | tee -a "$GITHUB_STEP_SUMMARY" + run: echo '[🛡️ OWASP ZAP Report](https://ministryofjustice.github.io/hmpps-manage-people-on-probation-ui/zap-report)' | tee -a "$GITHUB_STEP_SUMMARY" - name: Parse JSON report id: json diff --git a/README.md b/README.md index a53dd3ba..c786fe0c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ User interface for the Manage a Supervision service. -Try it out in the dev environment: https://manage-a-supervision-dev.hmpps.service.justice.gov.uk +Try it out in the dev environment: https://manage-people-on-probation-dev.hmpps.service.justice.gov.uk/ ## Get started @@ -62,7 +62,7 @@ INTERVENTIONS_LINK=https://hmpps-interventions-ui-dev.apps.live-1.cloud-platform Run the following to grab client credentials from the dev namespace: ```shell -kubectl -n hmpps-manage-a-supervision-dev get secret hmpps-manage-a-supervision-ui -o json \ +kubectl -n hmpps-manage-a-supervision-dev get secret hmpps-manage-people-on-probation-ui -o json \ | jq -r '.data | map_values(@base64d) | to_entries[] | "\(.key)=\(.value)"' \ | grep CLIENT >> .env ``` diff --git a/helm_deploy/hmpps-manage-a-supervision-ui/.helmignore b/helm_deploy/hmpps-manage-people-on-probation-ui/.helmignore similarity index 100% rename from helm_deploy/hmpps-manage-a-supervision-ui/.helmignore rename to helm_deploy/hmpps-manage-people-on-probation-ui/.helmignore diff --git a/helm_deploy/hmpps-manage-a-supervision-ui/Chart.yaml b/helm_deploy/hmpps-manage-people-on-probation-ui/Chart.yaml similarity index 100% rename from helm_deploy/hmpps-manage-a-supervision-ui/Chart.yaml rename to helm_deploy/hmpps-manage-people-on-probation-ui/Chart.yaml diff --git a/helm_deploy/hmpps-manage-a-supervision-ui/values.yaml b/helm_deploy/hmpps-manage-people-on-probation-ui/values.yaml similarity index 96% rename from helm_deploy/hmpps-manage-a-supervision-ui/values.yaml rename to helm_deploy/hmpps-manage-people-on-probation-ui/values.yaml index 33129476..7f865bff 100644 --- a/helm_deploy/hmpps-manage-a-supervision-ui/values.yaml +++ b/helm_deploy/hmpps-manage-people-on-probation-ui/values.yaml @@ -4,7 +4,7 @@ generic-service: replicaCount: 4 image: - repository: ghcr.io/ministryofjustice/hmpps-manage-a-supervision-ui + repository: ghcr.io/ministryofjustice/hmpps-manage-people-on-probation-ui tag: app_version # override at deployment time port: 3000 diff --git a/helm_deploy/values-dev.yaml b/helm_deploy/values-dev.yaml index b41ccdd1..cbe55faf 100644 --- a/helm_deploy/values-dev.yaml +++ b/helm_deploy/values-dev.yaml @@ -1,5 +1,5 @@ --- -# Per environment values which override defaults in hmpps-manage-a-supervision-ui/values.yaml +# Per environment values which override defaults in hmpps-manage-people-on-probation-ui/values.yaml generic-service: replicaCount: 2 diff --git a/helm_deploy/values-preprod.yaml b/helm_deploy/values-preprod.yaml index f63cab63..a95d5169 100644 --- a/helm_deploy/values-preprod.yaml +++ b/helm_deploy/values-preprod.yaml @@ -1,5 +1,5 @@ --- -# Per environment values which override defaults in hmpps-manage-a-supervision-ui/values.yaml +# Per environment values which override defaults in hmpps-manage-people-on-probation-ui/values.yaml generic-service: replicaCount: 2 diff --git a/helm_deploy/values-prod.yaml b/helm_deploy/values-prod.yaml index 39dc62f7..dbaf4e80 100644 --- a/helm_deploy/values-prod.yaml +++ b/helm_deploy/values-prod.yaml @@ -1,5 +1,5 @@ --- -# Per environment values which override defaults in hmpps-manage-a-supervision-ui/values.yaml +# Per environment values which override defaults in hmpps-manage-people-on-probation-ui/values.yaml generic-service: ingress: diff --git a/package-lock.json b/package-lock.json index 61d27255..4e396338 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "hmpps-manage-a-supervision-ui", + "name": "hmpps-manage-people-on-probation-ui", "version": "0.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "hmpps-manage-a-supervision-ui", + "name": "hmpps-manage-people-on-probation-ui", "version": "0.0.1", "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 2e942ae0..a70456eb 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "hmpps-manage-a-supervision-ui", + "name": "hmpps-manage-people-on-probation-ui", "version": "0.0.1", "description": "Hmpps Manage A Supervision Ui", - "repository": "git@github.com:ministryofjustice/hmpps-manage-a-supervision-ui.git", + "repository": "git@github.com:ministryofjustice/hmpps-manage-people-on-probation-ui.git", "license": "MIT", "scripts": { "prepare": "husky", @@ -29,7 +29,7 @@ "int-test": "cypress run --config video=false", "int-test-ui": "cypress open --e2e --browser chrome", "clean": "rm -rf dist build node_modules stylesheets", - "sentry:sourcemaps": "sentry-cli sourcemaps inject --org ministryofjustice --project hmpps-manage-a-supervision-ui ./dist && sentry-cli sourcemaps upload --org ministryofjustice --project hmpps-manage-a-supervision-ui ./dist", + "sentry:sourcemaps": "sentry-cli sourcemaps inject --org ministryofjustice --project hmpps-manage-people-on-probation-ui ./dist && sentry-cli sourcemaps upload --org ministryofjustice --project hmpps-manage-people-on-probation-ui ./dist", "e2e-test": "NODE_OPTIONS='--import tsx' npx playwright test", "e2e-test:headed": "NODE_OPTIONS='--import tsx' npx playwright test --headed", "e2e-test:debug": "NODE_OPTIONS='--import tsx' npx playwright test --debug" diff --git a/server/middleware/setUpWebSession.ts b/server/middleware/setUpWebSession.ts index 4033a5d9..acec868b 100644 --- a/server/middleware/setUpWebSession.ts +++ b/server/middleware/setUpWebSession.ts @@ -20,7 +20,7 @@ export default function setUpWebSession(): Router { router.use( session({ store, - name: 'hmpps-manage-a-supervision-ui.session', + name: 'hmpps-manage-people-on-probation-ui.session', cookie: { secure: config.https, sameSite: 'lax', maxAge: config.session.expiryMinutes * 60 * 1000 }, secret: config.session.secret, resave: false, // redis implements touch so shouldn't need this diff --git a/server/routes/activityLog.ts b/server/routes/activityLog.ts index e60c8362..f1def428 100644 --- a/server/routes/activityLog.ts +++ b/server/routes/activityLog.ts @@ -40,7 +40,7 @@ export default function activityLogRoutes(router: Router, { hmppsAuthClient }: S subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) res.render('pages/activity-log', { personActivity, @@ -60,7 +60,7 @@ export default function activityLogRoutes(router: Router, { hmppsAuthClient }: S subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const masClient = new MasApiClient(token) @@ -113,7 +113,7 @@ export default function activityLogRoutes(router: Router, { hmppsAuthClient }: S subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) res.render('pages/appointments/appointment', { diff --git a/server/routes/appointments.ts b/server/routes/appointments.ts index d5f85107..7c669a7f 100644 --- a/server/routes/appointments.ts +++ b/server/routes/appointments.ts @@ -24,7 +24,7 @@ export default function scheduleRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const [upcomingAppointments, pastAppointments, tierCalculation] = await Promise.all([ @@ -57,7 +57,7 @@ export default function scheduleRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const personAppointment = await masClient.getPersonAppointment(crn, contactId) @@ -78,7 +78,7 @@ export default function scheduleRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const schedule = await masClient.getPersonSchedule(crn, 'previous') diff --git a/server/routes/case.ts b/server/routes/case.ts index c78c6216..125eb48c 100644 --- a/server/routes/case.ts +++ b/server/routes/case.ts @@ -23,7 +23,7 @@ export default function caseRoutes(router: Router, { hmppsAuthClient }: Services subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const [overview, risks, tierCalculation] = await Promise.all([ diff --git a/server/routes/caseload.ts b/server/routes/caseload.ts index 62d6b0db..0dcdaef2 100644 --- a/server/routes/caseload.ts +++ b/server/routes/caseload.ts @@ -105,7 +105,7 @@ export default function caseloadRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: res.locals.user.username, subjectType: 'USER', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const pagination: Pagination = getPaginationLinks( req.session.page ? Number.parseInt(req.session.page as string, config.apis.masApi.pageSize) : 1, @@ -148,7 +148,7 @@ export default function caseloadRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: res.locals.user.username, subjectType: 'USER', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) res.render('pages/caseload/select-team', { userTeams, @@ -171,7 +171,7 @@ export default function caseloadRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: res.locals.user.username, subjectType: 'USER', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const userTeams = await masClient.getUserTeams(res.locals.user.username) res.render('pages/caseload/select-team', { @@ -194,7 +194,7 @@ export default function caseloadRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: teamCode, subjectType: 'TEAM', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const pageNum: number = req.query.page ? Number.parseInt(req.query.page as string, config.apis.masApi.pageSize) @@ -249,7 +249,7 @@ export default function caseloadRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: res.locals.user.username, subjectType: 'USER', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) res.render('pages/caseload/recent-cases', { diff --git a/server/routes/compliance.ts b/server/routes/compliance.ts index 0e823559..82181afa 100644 --- a/server/routes/compliance.ts +++ b/server/routes/compliance.ts @@ -19,7 +19,7 @@ export default function complianceRoutes(router: Router, { hmppsAuthClient }: Se subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const masClient = new MasApiClient(token) diff --git a/server/routes/interventions.ts b/server/routes/interventions.ts index 07abf3b0..05db9165 100644 --- a/server/routes/interventions.ts +++ b/server/routes/interventions.ts @@ -23,7 +23,7 @@ export default function interventionsRoutes(router: Router, { hmppsAuthClient }: subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const [personSummary, interventions, tierCalculation] = await Promise.all([ diff --git a/server/routes/personalDetails.ts b/server/routes/personalDetails.ts index 7c6d4b23..66d82f84 100644 --- a/server/routes/personalDetails.ts +++ b/server/routes/personalDetails.ts @@ -23,7 +23,7 @@ export default function personalDetailRoutes(router: Router, { hmppsAuthClient } subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const [personalDetails, needs, tierCalculation] = await Promise.all([ masClient.getPersonalDetails(crn), @@ -51,7 +51,7 @@ export default function personalDetailRoutes(router: Router, { hmppsAuthClient } subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const [personalContact, tierCalculation] = await Promise.all([ @@ -77,7 +77,7 @@ export default function personalDetailRoutes(router: Router, { hmppsAuthClient } subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const addressOverview = await masClient.getPersonalAddresses(crn) @@ -99,7 +99,7 @@ export default function personalDetailRoutes(router: Router, { hmppsAuthClient } subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const response = await masClient.downloadDocument(crn, documentId) @@ -119,7 +119,7 @@ export default function personalDetailRoutes(router: Router, { hmppsAuthClient } subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const personSummary = await masClient.getPersonSummary(crn) @@ -140,7 +140,7 @@ export default function personalDetailRoutes(router: Router, { hmppsAuthClient } subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const disabilities = await masClient.getPersonDisabilities(crn) @@ -161,7 +161,7 @@ export default function personalDetailRoutes(router: Router, { hmppsAuthClient } subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const adjustments = await masClient.getPersonAdjustments(crn) @@ -182,7 +182,7 @@ export default function personalDetailRoutes(router: Router, { hmppsAuthClient } subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const circumstances = await masClient.getPersonCircumstances(crn) diff --git a/server/routes/risks.ts b/server/routes/risks.ts index a5ba976b..6f50ffb4 100644 --- a/server/routes/risks.ts +++ b/server/routes/risks.ts @@ -22,7 +22,7 @@ export default function risksRoutes(router: Router, { hmppsAuthClient }: Service subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const arnsClient = new ArnsApiClient(token) @@ -71,7 +71,7 @@ export default function risksRoutes(router: Router, { hmppsAuthClient }: Service subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const personRiskFlag = await masClient.getPersonRiskFlag(crn, id) @@ -93,7 +93,7 @@ export default function risksRoutes(router: Router, { hmppsAuthClient }: Service subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const personRisk = await masClient.getPersonRiskFlags(crn) diff --git a/server/routes/sentence.ts b/server/routes/sentence.ts index 553d1065..f279cdda 100644 --- a/server/routes/sentence.ts +++ b/server/routes/sentence.ts @@ -32,7 +32,7 @@ export default function sentenceRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const masClient = new MasApiClient(token) @@ -60,7 +60,7 @@ export default function sentenceRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const masClient = new MasApiClient(token) @@ -88,7 +88,7 @@ export default function sentenceRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const masClient = new MasApiClient(token) @@ -111,7 +111,7 @@ export default function sentenceRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const masClient = new MasApiClient(token) @@ -134,7 +134,7 @@ export default function sentenceRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const masClient = new MasApiClient(token) @@ -157,7 +157,7 @@ export default function sentenceRoutes(router: Router, { hmppsAuthClient }: Serv subjectId: crn, subjectType: 'CRN', correlationId: v4(), - service: 'hmpps-manage-a-supervision-ui', + service: 'hmpps-manage-people-on-probation-ui', }) const masClient = new MasApiClient(token) diff --git a/server/views/partials/layout.njk b/server/views/partials/layout.njk index 791999d5..2fadeb3d 100644 --- a/server/views/partials/layout.njk +++ b/server/views/partials/layout.njk @@ -49,7 +49,7 @@