ministryofjustice · brightonsbox · Oct 18, 2023 · Nov 12, 2020 · Nov 19, 2020 · Nov 19, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 
 orbs:
   hmpps: ministryofjustice/hmpps@7
-  slack: circleci/[email protected].1
+  slack: circleci/[email protected].5
 
 parameters:
   alerts-slack-channel:
@@ -15,7 +15,7 @@ parameters:
 
   node-version:
     type: string
-    default: 18.12-browsers
+    default: 18.18-browsers
 
 jobs:
   build:
@@ -40,18 +40,13 @@ jobs:
       - run:
           command: |
             npm run build
-            DATE=$(date '+%Y-%m-%d')
-            export BUILD_NUMBER=${DATE}.${CIRCLE_BUILD_NUM}
-            export GIT_REF="$CIRCLE_SHA1"
-            npm run record-build-info
       - run: # Run linter after build because the integration test code depend on compiled typescript...
           name: Linter check
           command: npm run lint
       - persist_to_workspace:
           root: .
           paths:
             - node_modules
-            - build-info.json
             - build
             - dist
             - .cache/Cypress
@@ -76,14 +71,16 @@ jobs:
     executor:
       name: hmpps/node_redis
       node_tag: << pipeline.parameters.node-version >>
-      redis_tag: '6.2'
+      redis_tag: "7.0"
     steps:
       - checkout
       - attach_workspace:
           at: ~/app
       - run:
           name: Install missing OS dependency
           command: sudo apt-get install libxss1
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: Get wiremock
           command: curl -o wiremock.jar https://repo1.maven.org/maven2/com/github/tomakehurst/wiremock-standalone/2.27.1/wiremock-standalone-2.27.1.jar
@@ -98,8 +95,6 @@ jobs:
       - run:
           name: Wait for node app to start
           command: sleep 5
-      - restore_cache:
-          key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:
           name: integration tests
           command: npm run int-test
@@ -146,6 +141,7 @@ workflows:
             - unit_test
             - integration_test
             - build_docker
+          helm_timeout: 5m
       - request-preprod-approval:
           type: approval
           requires:
@@ -160,6 +156,7 @@ workflows:
             - hmpps-audit-poc-ui-preprod
           requires:
             - request-preprod-approval
+          helm_timeout: 5m
       - request-prod-approval:
           type: approval
           requires:
@@ -170,12 +167,13 @@ workflows:
           jira_update: true
           jira_env_type: production
           slack_notification: true
+          slack_channel_name: << pipeline.parameters.releases-slack-channel >>
           context:
             - hmpps-common-vars
             - hmpps-audit-poc-ui-prod
           requires:
             - request-prod-approval
-
+          helm_timeout: 5m
   security:
     triggers:
       - schedule:

diff --git a/.dockerignore b/.dockerignore
@@ -4,10 +4,9 @@ helm_deploy*
 README.md
 node_modules
 npm-debug.log
-README.md
 .*
 **/*.test.js
 scss-report.txt
 eslint-report.html
 test-report.html
-docker-compose.yml
+docker-compose*
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -5,7 +5,7 @@
     "jest": true
   },
 
-  "plugins": ["import"],
+  "plugins": ["import", "no-only-tests"],
 
   "settings": {
     "import/parsers": {
@@ -36,7 +36,6 @@
         "@typescript-eslint/no-use-before-define": 0,
         "class-methods-use-this": 0,
         "no-useless-constructor": 0,
-        "no-promise-executor-return": 0,
         "@typescript-eslint/no-unused-vars": [
           1,
           {
@@ -49,7 +48,7 @@
         "prettier/prettier": [
           "error",
           {
-            "trailingComma": "es5",
+            "trailingComma": "all",
             "singleQuote": true,
             "printWidth": 120,
             "semi": false
@@ -88,14 +87,16 @@
       "error",
       { "devDependencies": ["**/*.test.js", "**/*.test.ts", "**/testutils/**", "cypress.config.ts"] }
     ],
+    "no-only-tests/no-only-tests": "error",
     "prettier/prettier": [
       "error",
       {
-        "trailingComma": "es5",
+        "trailingComma": "all",
         "singleQuote": true,
         "printWidth": 120,
         "semi": false
       }
-    ]
+    ],
+    "no-empty-function": ["error", { "allow": ["constructors", "arrowFunctions"] }]
   }
 }
diff --git a/.gitignore b/.gitignore
@@ -120,11 +120,9 @@ dist
 assets/stylesheets/*.css
 .idea
 .vscode
-build-info.json
 dist/
 test_results/
 integration_tests/videos/
 integration_tests/screenshots/
 */*.iml
-helm_deploy/*/Chart.lock
-helm_deploy/*/charts/
+**/Chart.lock
diff --git a/Dockerfile b/Dockerfile
@@ -1,47 +1,52 @@
 # Stage: base image
-FROM node:18.12-bullseye-slim as base
+FROM node:18.18-bullseye-slim as base
 
-ARG BUILD_NUMBER=1_0_0
-ARG GIT_REF=not-available
+ARG BUILD_NUMBER
+ARG GIT_REF
+ARG GIT_BRANCH
 
 LABEL maintainer="HMPPS Digital Studio <[email protected]>"
 
 ENV TZ=Europe/London
 RUN ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime && echo "$TZ" > /etc/timezone
 
 RUN addgroup --gid 2000 --system appgroup && \
-    adduser --uid 2000 --system appuser --gid 2000
+        adduser --uid 2000 --system appuser --gid 2000
 
 WORKDIR /app
 
-# Cache breaking
-ENV BUILD_NUMBER ${BUILD_NUMBER:-1_0_0}
+# Cache breaking and ensure required build / git args defined
+RUN test -n "$BUILD_NUMBER" || (echo "BUILD_NUMBER not set" && false)
+RUN test -n "$GIT_REF" || (echo "GIT_REF not set" && false)
+RUN test -n "$GIT_BRANCH" || (echo "GIT_BRANCH not set" && false)
+
+# Define env variables for runtime health / info
+ENV BUILD_NUMBER=${BUILD_NUMBER}
+ENV GIT_REF=${GIT_REF}
+ENV GIT_BRANCH=${GIT_BRANCH}
 
 RUN apt-get update && \
-    apt-get upgrade -y && \
-    apt-get autoremove -y && \
-    rm -rf /var/lib/apt/lists/*
+        apt-get upgrade -y && \
+        apt-get autoremove -y && \
+        rm -rf /var/lib/apt/lists/*
 
 # Stage: build assets
 FROM base as build
 
-ARG BUILD_NUMBER=1_0_0
-ARG GIT_REF=not-available
+ARG BUILD_NUMBER
+ARG GIT_REF
+ARG GIT_BRANCH
 
 RUN apt-get update && \
-    apt-get install -y make python g++
+        apt-get install -y make python g++
 
 COPY package*.json ./
 RUN CYPRESS_INSTALL_BINARY=0 npm ci --no-audit
 
 COPY . .
 RUN npm run build
 
-RUN export BUILD_NUMBER=${BUILD_NUMBER} && \
-    export GIT_REF=${GIT_REF} && \
-    npm run record-build-info
-
-RUN npm prune --no-audit --production
+RUN npm prune --no-audit --omit=dev
 
 # Stage: copy production assets and dependencies
 FROM base
@@ -51,9 +56,6 @@ COPY --from=build --chown=appuser:appgroup \
         /app/package-lock.json \
         ./
 
-COPY --from=build --chown=appuser:appgroup \
-        /app/build-info.json ./dist/build-info.json
-
 COPY --from=build --chown=appuser:appgroup \
         /app/assets ./assets
 
@@ -63,7 +65,7 @@ COPY --from=build --chown=appuser:appgroup \
 COPY --from=build --chown=appuser:appgroup \
         /app/node_modules ./node_modules
 
-EXPOSE 3000
+EXPOSE 3000 3001
 ENV NODE_ENV='production'
 USER 2000
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 Crown Copyright (Ministry of Justice)
+Copyright (c) 2020-2023 Crown Copyright (Ministry of Justice)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,30 +1,57 @@
+[![repo standards badge](https://img.shields.io/badge/dynamic/json?color=blue&style=flat&logo=github&label=MoJ%20Compliant&query=%24.result&url=https%3A%2F%2Foperations-engineering-reports.cloud-platform.service.justice.gov.uk%2Fapi%2Fv1%2Fcompliant_public_repositories%2Fhmpps-audit-poc-ui)](https://operations-engineering-reports.cloud-platform.service.justice.gov.uk/public-github-repositories.html#hmpps-audit-poc-ui "Link to report")
 [![CircleCI](https://circleci.com/gh/ministryofjustice/hmpps-audit-poc-ui/tree/main.svg?style=svg)](https://circleci.com/gh/ministryofjustice/hmpps-audit-poc-ui)
-[![Known Vulnerabilities](https://snyk.io/test/github/ministryofjustice/hmpps-audit-poc-ui/badge.svg)](https://snyk.io/test/github/ministryofjustice/hmpps-audit-poc-ui)
 
 # hmpps-audit-poc-ui
 A POC to investigate how to capture audit information for frontend applications.
 
-## Latest
-This is currently a skeleton Typescript UI project and no extra functionality has been added.
-
-### Running the Cypress tests
-You need to fire up the wiremock server first:
-```
-docker-compose -f docker-compose-test.yml up
-```
-
-### Starting feature tests node instance
-A separate node instance needs to be started for the feature tests. This will run on port 3008 and won't conflict
-with any of the api services.
-```
-npm run start-feature:dev
-```
-
-### Running the tests
-With the UI:
-```
-npm run int-test-ui
-```
+## Running the app
+The easiest way to run the app is to use docker compose to create the service and all dependencies.
+
+`docker compose pull`
+
+`docker compose up`
+
+### Dependencies
+The app requires:
+* hmpps-auth - for authentication
+* redis - session store and token caching
+
+### Running the app for development
+
+
+Install dependencies using `npm install`, ensuring you are using `node v18.x` and `npm v9.x`
+
+Note: Using `nvm` (or [fnm](https://github.com/Schniz/fnm)), run `nvm install --latest-npm` within the repository folder to use the correct version of node, and the latest version of npm. This matches the `engines` config in `package.json` and the CircleCI build config.
+
+And then, to build the assets and start the app with nodemon:
+
+`npm run start:dev`
+
+### Run linter
+
+`npm run lint`
+
+### Run tests
+
+`npm run test`
+
+### Running integration tests
+
+For local running, start a test db, redis, and wiremock instance by:
+
+`docker compose -f docker-compose-test.yml up`
+
+Then run the server in test mode by:
+
+`npm run start-feature` (or `npm run start-feature:dev` to run with nodemon)
+
+And then either, run tests in headless mode with:
+
+`npm run int-test`
+
+Or run tests with the cypress UI:
+
+`npm run int-test-ui`
 
 
 

diff --git a/assets/scss/components/_header-bar.scss b/assets/scss/components/_header-bar.scss
@@ -139,3 +139,8 @@
     display: none;
   }
 }
+
+.govuk-phase-banner {
+  @include govuk-width-container;
+  border: none;
+}
diff --git a/audit-ci.json b/audit-ci.json
@@ -1,5 +1,6 @@
 {
   "low": true,
   "package-manager": "auto",
-  "registry": "https://registry.npmjs.org"
+  "registry": "https://registry.npmjs.org",
+  "allowlist": []
 }
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -12,7 +12,6 @@ export default defineConfig({
   reporterOptions: {
     configFile: 'reporter-config.json',
   },
-  videoUploadOnPasses: false,
   taskTimeout: 60000,
   e2e: {
     // We've imported your old cypress plugins here.

diff --git a/docker-compose-test.yml b/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: '3.1'
 services:
 
   redis:
-    image: 'redis:6.2'
+    image: 'redis:7.2'
     networks:
       - hmpps_int
     ports:
@@ -11,7 +11,7 @@ services:
   wiremock:
     image: wiremock/wiremock
     networks:
-      - hmpps_int
+    - hmpps_int
     container_name: wiremock
     restart: always
     ports: