NHSDigital · MatthewPopat-NHS · Sep 22, 2025 · Sep 17, 2025 · Sep 17, 2025 · Sep 17, 2025
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -67,7 +67,9 @@
           "cSpell.words": ["fhir", "Formik", "pino", "serialisation"],
           "editor.defaultFormatter": "dbaeumer.vscode-eslint"
 
-        }
+        },
+        "eslint.useFlatConfig": true,
+        "eslint.format.enable": true
       }
     },
     "postCreateCommand": "rm -f ~/.docker/config.json; git config --global --add safe.directory /workspaces/eps-prescription-tracker-ui; make install; direnv allow ."

diff --git a/.github/scripts/fix_cdk_json.sh b/.github/scripts/fix_cdk_json.sh
@@ -165,7 +165,7 @@ if [ -z "${GITHUB_ACTIONS_RUNNER_IPV6}" ]; then
 fi
 
 CFN_DRIFT_DETECTION_GROUP="cpt-ui"
-if [[ "$SERVICE_NAME" =~ -pr-[0-9]+$ ]]; then
+if [[ "$IS_PULL_REQUEST" = "true" ]]; then
   CFN_DRIFT_DETECTION_GROUP="cpt-ui-pull-request"
 fi
 
@@ -176,6 +176,7 @@ fix_string_key COMMIT_ID "${COMMIT_ID}"
 fix_string_key logRetentionInDays "${LOG_RETENTION_IN_DAYS}"
 fix_string_key logLevel "${LOG_LEVEL}"
 fix_string_key cfnDriftDetectionGroup "${CFN_DRIFT_DETECTION_GROUP}"
+fix_boolean_number_key isPullRequest "${IS_PULL_REQUEST}"
 
 if [ "$CDK_APP_NAME" == "StatefulResourcesApp" ]; then
     fix_string_key primaryOidcClientId "${PRIMARY_OIDC_CLIENT_ID}"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -131,7 +131,8 @@ jobs:
       CREATE_INT_RELEASE_NOTES: true
       CREATE_PROD_RELEASE_NOTES: true
       MARK_JIRA_RELEASED: false
-      CREATE_INT_RC_RELEASE_NOTES: false   
+      CREATE_INT_RC_RELEASE_NOTES: false
+      IS_PULL_REQUEST: false
     secrets: inherit
 
   release_qa:
@@ -168,4 +169,5 @@ jobs:
       ROUTE53_EXPORT_NAME: EPS
       REACT_LOG_LEVEL: "debug"
       LOG_RETENTION_IN_DAYS: 30
+      IS_PULL_REQUEST: false
     secrets: inherit
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -182,6 +182,7 @@ jobs:
       ROUTE53_EXPORT_NAME: EPS
       REACT_LOG_LEVEL: "debug"
       LOG_RETENTION_IN_DAYS: 30
+      IS_PULL_REQUEST: true
     secrets: inherit
   report_deployed_url:
     needs: [release_code, get_issue_number]

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -150,7 +150,8 @@ jobs:
       CREATE_INT_RELEASE_NOTES: true
       CREATE_PROD_RELEASE_NOTES: true
       MARK_JIRA_RELEASED: false
-      CREATE_INT_RC_RELEASE_NOTES: false   
+      CREATE_INT_RC_RELEASE_NOTES: false
+      IS_PULL_REQUEST: false
     secrets: inherit
 
   release_ref:
@@ -187,6 +188,7 @@ jobs:
       ROUTE53_EXPORT_NAME: EPS
       REACT_LOG_LEVEL: "debug"
       LOG_RETENTION_IN_DAYS: 30
+      IS_PULL_REQUEST: false
     secrets: inherit
 
   release_qa:
@@ -223,6 +225,7 @@ jobs:
       ROUTE53_EXPORT_NAME: EPS
       REACT_LOG_LEVEL: "debug"
       LOG_RETENTION_IN_DAYS: 30
+      IS_PULL_REQUEST: false
     secrets: inherit
   release_int:
     needs: [tag_release, package_code, get_commit_id, release_qa]
@@ -257,7 +260,8 @@ jobs:
       CREATE_INT_RELEASE_NOTES: true
       CREATE_PROD_RELEASE_NOTES: true
       MARK_JIRA_RELEASED: false
-      CREATE_INT_RC_RELEASE_NOTES: true   
+      CREATE_INT_RC_RELEASE_NOTES: true
+      IS_PULL_REQUEST: false
     secrets: inherit
   release_prod:
     needs: [tag_release, package_code, get_commit_id, release_int]
@@ -292,5 +296,6 @@ jobs:
       CREATE_INT_RELEASE_NOTES: true
       CREATE_PROD_RELEASE_NOTES: true
       MARK_JIRA_RELEASED: false
-      CREATE_INT_RC_RELEASE_NOTES: false   
+      CREATE_INT_RC_RELEASE_NOTES: false
+      IS_PULL_REQUEST: false
     secrets: inherit
diff --git a/.github/workflows/release_all_stacks.yml b/.github/workflows/release_all_stacks.yml
@@ -87,6 +87,9 @@ on:
       CREATE_INT_RC_RELEASE_NOTES:
         type: boolean
         default: false
+      IS_PULL_REQUEST:
+        type: boolean
+        required: true
 jobs:
   release_all_code:
     runs-on: ubuntu-22.04
@@ -241,6 +244,7 @@ jobs:
           ROUTE53_EXPORT_NAME: ${{ inputs.ROUTE53_EXPORT_NAME }}
           WAF_ALLOW_GA_RUNNER_CONNECTIVITY: ${{ inputs.WAF_ALLOW_GA_RUNNER_CONNECTIVITY }}
           CLOUDFRONT_ORIGIN_CUSTOM_HEADER: ${{secrets.CLOUDFRONT_ORIGIN_CUSTOM_HEADER }}
+          IS_PULL_REQUEST: ${{inputs.IS_PULL_REQUEST}}
 
       - name: Show diff for stateful stack
         run: |
@@ -375,6 +379,7 @@ jobs:
           ROUTE53_EXPORT_NAME: ${{ inputs.ROUTE53_EXPORT_NAME }}
           WAF_ALLOW_GA_RUNNER_CONNECTIVITY: ${{ inputs.WAF_ALLOW_GA_RUNNER_CONNECTIVITY }}
           CLOUDFRONT_ORIGIN_CUSTOM_HEADER: ${{secrets.CLOUDFRONT_ORIGIN_CUSTOM_HEADER }}
+          IS_PULL_REQUEST: ${{inputs.IS_PULL_REQUEST}}
 
       - name: Show diff for stateless stack
         run: |
@@ -501,6 +506,7 @@ jobs:
           ROUTE53_EXPORT_NAME: ${{ inputs.ROUTE53_EXPORT_NAME }}
           WAF_ALLOW_GA_RUNNER_CONNECTIVITY: ${{ inputs.WAF_ALLOW_GA_RUNNER_CONNECTIVITY }}
           CLOUDFRONT_ORIGIN_CUSTOM_HEADER: ${{secrets.CLOUDFRONT_ORIGIN_CUSTOM_HEADER }}
+          IS_PULL_REQUEST: ${{inputs.IS_PULL_REQUEST}}
 
       - name: Show diff for stateful stack redeployment
         if: ${{ steps.check_redeploy_stateful_stack.outputs.REDEPLOY_STATEFUL_STACK == 'true' }}
@@ -573,14 +579,14 @@ jobs:
       contents: write
     steps:
       - name: Checkout gh-pages
-        if: ${{ !startsWith(inputs.SERVICE_NAME, 'cpt-ui-pr-') }}
+        if: ${{ inputs.IS_PULL_REQUEST == false }}
         uses: actions/checkout@v5
         with:
           ref: gh-pages
           path: gh-pages
 
       - name: update release tag in github pages
-        if: ${{ !startsWith(inputs.SERVICE_NAME, 'cpt-ui-pr-') }}
+        if: ${{ inputs.IS_PULL_REQUEST == false }}
         run: |
           cd gh-pages
           NOW=$(date +'%Y-%m-%dT%H:%M:%S')

diff --git a/Makefile b/Makefile
@@ -216,6 +216,7 @@ cdk-synth-stateful-resources-no-mock:
 	SPLUNK_DELIVERY_STREAM=foo \
 	SPLUNK_SUBSCRIPTION_FILTER_ROLE=foo \
 	DO_NOT_GET_AWS_EXPORT=true \
+	IS_PULL_REQUEST=false \
 	USE_ZONE_APEX=false \
 		 ./.github/scripts/fix_cdk_json.sh .local_config/stateful_app.config.json
 	CONFIG_FILE_NAME=.local_config/stateful_app.config.json npx cdk synth \
@@ -264,6 +265,7 @@ cdk-synth-stateless-resources-no-mock:
 	CLOUDFRONT_CERT_ARN=arn:aws:acm:us-east-1:444455556666:certificate/certificate_ID \
 	DO_NOT_GET_AWS_EXPORT=true \
 	CLOUDFRONT_ORIGIN_CUSTOM_HEADER=foo \
+	IS_PULL_REQUEST=false \
 	USE_ZONE_APEX=false \
 		 ./.github/scripts/fix_cdk_json.sh .local_config/stateless_app.config.json
 	CONFIG_FILE_NAME=.local_config/stateless_app.config.json npx cdk synth \
@@ -309,6 +311,7 @@ cdk-synth-stateful-resources-mock:
 	SPLUNK_DELIVERY_STREAM=foo \
 	SPLUNK_SUBSCRIPTION_FILTER_ROLE=foo \
 	DO_NOT_GET_AWS_EXPORT=true \
+	IS_PULL_REQUEST=false \
 	USE_ZONE_APEX=false \
 		 ./.github/scripts/fix_cdk_json.sh .local_config/stateful_app.config.json
 	CONFIG_FILE_NAME=.local_config/stateful_app.config.json npx cdk synth \
@@ -363,6 +366,7 @@ cdk-synth-stateless-resources-mock:
 	GITHUB_ACTIONS_RUNNER_IPV6='["::1"]' \
 	DO_NOT_GET_AWS_EXPORT=true \
 	CLOUDFRONT_ORIGIN_CUSTOM_HEADER=foo \
+	IS_PULL_REQUEST=false \
 	USE_ZONE_APEX=false \
 		 ./.github/scripts/fix_cdk_json.sh .local_config/stateless_app.config.json
 	CONFIG_FILE_NAME=.local_config/stateless_app.config.json npx cdk synth \

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -1,8 +1,8 @@
-import globals from "globals";
-import tsPlugin from "@typescript-eslint/eslint-plugin";
-import eslintJsPlugin from "@eslint/js";
-import importNewlines from "eslint-plugin-import-newlines";
-import typescriptParser from "@typescript-eslint/parser";
+import globals from "globals"
+import tsPlugin from "@typescript-eslint/eslint-plugin"
+import eslintJsPlugin from "@eslint/js"
+import importNewlines from "eslint-plugin-import-newlines"
+import typescriptParser from "@typescript-eslint/parser"
 import react from "eslint-plugin-react"
 
 const commonConfig = {
@@ -17,16 +17,16 @@ const commonConfig = {
     "@typescript-eslint/array-type": [
       "error",
       {
-        default: "generic",
-      },
+        default: "generic"
+      }
     ],
 
     "@typescript-eslint/consistent-type-assertions": [
       "error",
       {
         assertionStyle: "as",
-        objectLiteralTypeAssertions: "never",
-      },
+        objectLiteralTypeAssertions: "never"
+      }
     ],
 
     "block-spacing": "error",
@@ -37,8 +37,8 @@ const commonConfig = {
       "error",
       {
         before: false,
-        after: true,
-      },
+        after: true
+      }
     ],
 
     "dot-location": ["error", "property"],
@@ -50,37 +50,39 @@ const commonConfig = {
       "error",
       "declaration",
       {
-        allowArrowFunctions: true,
-      },
+        allowArrowFunctions: true
+      }
     ],
 
     "import-newlines/enforce": [
       "error",
       {
         items: 3,
         "max-len": 120,
-        semi: false,
-      },
+        semi: false
+      }
     ],
 
     // TEMPORARY: Disabled due to ESLint indent rule stack overflow bug with Layout.tsx
     // Issue tracked across ESLint 8.x and 9.x versions - re-enable when fixed upstream
-    // "indent": [
-    //   "error",
-    //   2,
-    //   {
-    //     SwitchCase: 1,
-    //   },
-    // ],
+    //see: https://github.com/eslint-stylistic/eslint-stylistic/issues/915
+    // Re-enabled for now, issue is still present but can be avoided by using explicit react <Fragment> elements
+    "indent": [
+      "error",
+      2,
+      {
+        SwitchCase: 1
+      }
+    ],
 
     "max-len": ["error", 120],
     "no-multi-spaces": "error",
 
     "no-multiple-empty-lines": [
       "error",
       {
-        max: 1,
-      },
+        max: 1
+      }
     ],
 
     "no-trailing-spaces": "error",
@@ -91,13 +93,13 @@ const commonConfig = {
       "double",
       {
         allowTemplateLiterals: true,
-        avoidEscape: true,
-      },
+        avoidEscape: true
+      }
     ],
 
-    semi: ["error", "never"],
-  },
-};
+    semi: ["error", "never"]
+  }
+}
 
 export default [
   {
@@ -109,31 +111,31 @@ export default [
       "**/node_modules/**",
       "**/.next/**",
       "**/.tsconfig.tsbuildinfo/**"
-    ],
+    ]
   },
   {
-    rules: eslintJsPlugin.configs.recommended.rules,
+    rules: eslintJsPlugin.configs.recommended.rules
   },
   {
     files: ["**/*.ts"],
 
     languageOptions: {
       parser: typescriptParser,
       globals: {
-        ...globals.node,
-      },
+        ...globals.node
+      }
     },
-    ...commonConfig,
+    ...commonConfig
   },
   {
-    files: ["**/*.js",],
+    files: ["**/*.js"],
 
     languageOptions: {
       globals: {
-        ...globals.node,
-      },
+        ...globals.node
+      }
     },
-    ...commonConfig,
+    ...commonConfig
   },
   {
     files: [ "**/*.{jsx,mjs,cjs,ts,tsx}" ],
@@ -144,14 +146,14 @@ export default [
       parser: typescriptParser,
       parserOptions: {
         ecmaFeatures: {
-          jsx: true,
-        },
-     },
-     globals: {
-        ...globals.browser,
+          jsx: true
+        }
       },
+      globals: {
+        ...globals.browser
+      }
     },
-    ...commonConfig,
+    ...commonConfig
   },
   {
     files: [ "**/__tests__/*.{jsx,mjs,cjs,ts,tsx}" ],
@@ -162,15 +164,15 @@ export default [
       parser: typescriptParser,
       parserOptions: {
         ecmaFeatures: {
-          jsx: true,
-        },
-     },
-     globals: {
+          jsx: true
+        }
+      },
+      globals: {
         ...globals.browser,
         ...globals.jest
-      },
+      }
     },
-    ...commonConfig,
+    ...commonConfig
   },
   {
     files: ["**/tests/**/*.ts"],
@@ -179,9 +181,9 @@ export default [
       parser: typescriptParser,
       globals: {
         ...globals.jest,
-        ...globals.node,
-      },
+        ...globals.node
+      }
     },
-    ...commonConfig,
-  },
-];
+    ...commonConfig
+  }
+]