Merge branch main into bugfix/CCM-8074_accessibility-issue-fix

Author: Ian-Hodges

.eslintrc.json

@@ -40,14 +40,21 @@
       "error",
       {
         "case": "kebabCase",
-        "ignore": [".tsx"]
+        "ignore": [
+          ".tsx"
+        ]
       }
     ],
     "react/react-in-jsx-scope": "off",
     "react/jsx-filename-extension": "off",
     "react/jsx-props-no-spreading": "off",
     "react/function-component-definition": "off",
-    "react/jsx-no-useless-fragment": ["error", { "allowExpressions": true }],
+    "react/jsx-no-useless-fragment": [
+      "error",
+      {
+        "allowExpressions": true
+      }
+    ],
     "import/prefer-default-export": "off",
     "import/extensions": "off",
     "no-shadow": "off",
@@ -72,21 +79,23 @@
     "prefer-regex-literals": "off",
     "class-methods-use-this": "off",
     "no-underscore-dangle": "off",
-    "import/no-extraneous-dependencies":[
+    "import/no-extraneous-dependencies": [
       "error",
       {
-        "devDependencies":[
-            "jest.config.ts",
-            "jest.setup.ts",
-            "src/__tests__/**"
+        "devDependencies": [
+          "jest.config.ts",
+          "jest.setup.ts",
+          "src/__tests__/**"
         ]
       }
     ],
     "no-empty-function": "off"
   },
   "overrides": [
     {
-      "files": ["*.js"],
+      "files": [
+        "*.js"
+      ],
       "rules": {
         "@typescript-eslint/no-var-requires": "off",
         "@typescript-eslint/no-require-imports": "off",
@@ -95,7 +104,9 @@
       }
     },
     {
-      "files": ["*.test.{ts,tsx}"],
+      "files": [
+        "*.test.{ts,tsx}"
+      ],
       "rules": {
         "unicorn/no-useless-undefined": "off",
         "unicorn/consistent-function-scoping": "off",

.github/workflows/pr_destroy_dynamic_env.yaml

@@ -0,0 +1,48 @@
+name: PR Destroy Environment
+
+on:
+  pull_request:
+    types: [closed]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
+jobs:
+  create-dynamic-environment:
+    name: Destroy Dynamic Environment
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Trigger nhs-notify-internal dynamic environment destruction
+        shell: bash
+        run: |
+          set -x
+          this_repo_name=$(echo ${{ github.repository }} | cut -d'/' -f2)
+
+          DISPATCH_EVENT=$(jq -ncM \
+            --arg infraRepoName "${this_repo_name}" \
+            --arg releaseVersion "main" \
+            --arg targetEnvironment "pr${{ github.event.number }}" \
+            --arg targetAccountGroup "nhs-notify-template-management-dev" \
+            --arg targetComponent "branch" \
+            --arg terraformAction "destroy" \
+            '{ "ref": "main",
+              "inputs": {
+                "infraRepoName": $infraRepoName,
+                "releaseVersion", $releaseVersion,
+                "targetEnvironment", $targetEnvironment,
+                "targetAccountGroup", $targetAccountGroup,
+                "targetComponent", $targetComponent,
+                "terraformAction", $terraformAction,
+                "overrides", $overrides,
+              }
+            }')
+
+          curl --fail -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.PR_TRIGGER_PAT }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/NHSDigital/nhs-notify-internal/actions/workflows/dispatch-deploy-dynamic-env.yaml/dispatches \
+            -d "${DISPATCH_EVENT}"

.gitignore

@@ -81,3 +81,4 @@ tests/test-team/playwright/.cache/
 sandbox_cognito_auth_token.json
 
 frontend/public/testing
+.vscode/launch.json

frontend/amplify/package.json

@@ -4,6 +4,13 @@
   "private": true,
   "main": "index.ts",
   "type": "module",
+  "scripts": {
+    "generate-dependencies": "tsx functions/send-email/generate-dependencies.ts",
+    "lint": "eslint . -c .eslintrc.json",
+    "lint:fix": "eslint . --fix",
+    "test:unit": "jest",
+    "typecheck": "tsc --noEmit"
+  },
   "dependencies": {
     "@aws-amplify/backend": "^1.8.0",
     "@aws-sdk/client-ses": "^3.637.0",
@@ -15,17 +22,11 @@
     "mimetext": "^3.0.24",
     "winston": "^3.17.0"
   },
-  "scripts": {
-    "generate-dependencies": "tsx functions/send-email/generate-dependencies.ts",
-    "lint": "eslint . -c .eslintrc.json",
-    "lint:fix": "eslint . --fix",
-    "test:unit": "jest",
-    "typecheck": "tsc --noEmit",
-    "typescript": "^5.5.4"
-  },
   "devDependencies": {
     "@types/jest": "^29.5.14",
     "@types/node": "^22.10.1",
-    "nhs-notify-web-template-management-utils": "*"
+    "nhs-notify-web-template-management-utils": "*",
+    "tsx": "^4.19.2",
+    "typescript": "^5.5.4"
   }
 }

frontend/jest.config.ts

@@ -30,6 +30,7 @@ const config: Config = {
     'backend.ts',
     'generate-dependencies.ts',
     'jest.config.ts',
+    '.dev.tsx',
   ],
 
   testPathIgnorePatterns: [

frontend/next.config.js

@@ -1,29 +1,60 @@
 /** @type {import('next').NextConfig} */
+
+const { PHASE_DEVELOPMENT_SERVER } = require('next/constants');
+
 const basePath = process.env.NEXT_PUBLIC_BASE_PATH ?? '/templates';
 const domain = process.env.NOTIFY_DOMAIN_NAME ?? 'localhost:3000';
 
-const nextConfig = {
-  basePath,
-  env: {
-    basePath,
-  },
+const nextConfig = (phase) => {
+  const isDevServer = phase === PHASE_DEVELOPMENT_SERVER;
 
-  experimental: {
-    serverActions: {
-      allowedOrigins: [domain, domain.replace('templates', 'web-gateway')],
+  return {
+    basePath,
+    env: {
+      basePath,
     },
-  },
-
-  async redirects() {
-    return [
-      {
-        source: '/',
-        destination: basePath,
-        basePath: false,
-        permanent: false,
+
+    experimental: {
+      serverActions: {
+        allowedOrigins: [domain, domain.replace('templates', 'web-gateway')],
       },
-    ];
-  },
+    },
+
+    async redirects() {
+      return [
+        {
+          source: '/',
+          destination: basePath,
+          basePath: false,
+          permanent: false,
+        },
+      ];
+    },
+
+    async rewrites() {
+      if (isDevServer) {
+        return [
+          {
+            source: '/auth/signout',
+            destination: `http://${domain}${basePath}/auth/signout`,
+            basePath: false,
+          },
+          {
+            source: '/auth',
+            destination: `http://${domain}${basePath}/auth`,
+            basePath: false,
+          },
+        ];
+      }
+
+      return [];
+    },
+
+    // pages with e.g. .dev.tsx extension are only included when running locally
+    pageExtensions: ['ts', 'tsx', 'js', 'jsx'].flatMap((extension) => {
+      return isDevServer ? [`dev.${extension}`, extension] : [extension];
+    }),
+  };
 };
 
 module.exports = nextConfig;

frontend/package.json

@@ -12,14 +12,17 @@
     "app:start": "pm2 start npm -- start",
     "app:wait": "wait-on -l http://localhost:3000/templates/create-and-submit-templates",
     "app:stop": "pm2 kill",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "npm run mock-amplify-outputs && tsc --noEmit",
     "create-sandbox": "pm2 start npx -- ampx sandbox",
-    "destroy-sandbox": "npx ampx sandbox delete --y"
+    "destroy-sandbox": "npx ampx sandbox delete --y",
+    "mock-amplify-outputs": "if [ ! -f ./amplify_outputs.json ]; then echo \"{}\" > ./amplify_outputs.json ; fi"
   },
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.2.23",
     "@aws-amplify/backend": "^1.2.0",
+    "@aws-amplify/ui-react": "^6.3.1",
     "@aws-sdk/client-ses": "^3.637.0",
+    "aws-amplify": "^6.6.0",
     "date-fns": "^4.1.0",
     "markdown-it": "^13.0.1",
     "mimetext": "^3.0.24",
@@ -28,6 +31,7 @@
     "nhs-notify-web-template-management-utils": "*",
     "nhsuk-frontend": "^8.3.0",
     "nhsuk-react-components": "^4.1.1",
+    "path": "^0.12.7",
     "react": "^18",
     "react-dom": "^18",
     "zod": "^3.23.8"

frontend/src/__tests__/app/manage-templates/page.test.tsx

@@ -3,11 +3,11 @@ import { render, screen } from '@testing-library/react';
 import ManageTemplatesPage from '@app/manage-templates/page';
 import content from '@content/content';
 import { getTemplates } from '@utils/form-actions';
-import { Template } from 'nhs-notify-web-template-management-utils/src/types';
 import {
+  Template,
   TemplateStatus,
   TemplateType,
-} from 'nhs-notify-web-template-management-utils/src/enum';
+} from 'nhs-notify-web-template-management-utils';
 
 const manageTemplatesContent = content.pages.manageTemplates;