PRMDR-464 Remove hardcoded port numbers

.github/workflows/full-ui-dispatch-deploy.yml

@@ -77,7 +77,8 @@ jobs:
 
       - uses: dkershner6/aws-ssm-getparameters-action@v1
         with:
-          parameterPairs: '/ndr/${{ github.event.client_payload.sandbox }}/api_endpoint = DOC_STORE_API_ENDPOINT'
+          parameterPairs: '/ndr/${{ github.event.client_payload.sandbox }}/api_endpoint = DOC_STORE_API_ENDPOINT, 
+            /ndr/${{ github.event.client_payload.sandbox }}/container_port = CONTAINER_PORT'
           withDecryption: 'true' # defaults to true
 
       - name: Configure React environment vars
@@ -97,8 +98,9 @@ jobs:
           ECR_REPOSITORY: ndr-${{ github.event.client_payload.sandbox }}-app
           IMAGE_TAG: latest
           IMAGE_TAG_SHA: ${{ github.sha }}
+          CONTAINER_PORT: ${{ env.CONTAINER_PORT }}
         run: |
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
+          docker build --build-arg="CONTAINER_PORT=$CONTAINER_PORT" -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA
           echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA" >> $GITHUB_OUTPUT

.github/workflows/new-ui-deploy-feature-to-sandbox-manual.yml

@@ -104,7 +104,8 @@ jobs:
 
       - uses: dkershner6/aws-ssm-getparameters-action@v1
         with:
-          parameterPairs: '/ndr/${{ inputs.sandbox }}/api_endpoint = DOC_STORE_API_ENDPOINT'
+          parameterPairs: '/ndr/${{ inputs.sandbox }}/api_endpoint = DOC_STORE_API_ENDPOINT, 
+            /ndr/${{ inputs.sandbox }}/container_port = CONTAINER_PORT'
           withDecryption: 'true' # defaults to true
 
       - name: Configure React environment vars
@@ -124,8 +125,9 @@ jobs:
           ECR_REPOSITORY: ndr-${{ inputs.sandbox }}-app
           IMAGE_TAG: latest
           IMAGE_TAG_SHA: ${{ github.sha }}
+          CONTAINER_PORT: ${{ env.CONTAINER_PORT }}
         run: |
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
+          docker build --build-arg="CONTAINER_PORT=$CONTAINER_PORT" -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA
           echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA" >> $GITHUB_OUTPUT

.github/workflows/ui-deploy-to-perf-manual.yml

@@ -80,7 +80,8 @@ jobs:
 
       - uses: dkershner6/aws-ssm-getparameters-action@v1
         with:
-          parameterPairs: '/ndr/${{ vars.BUILD_ENV }}/api_endpoint = DOC_STORE_API_ENDPOINT'
+          parameterPairs: '/ndr/${{ vars.BUILD_ENV }}/api_endpoint = DOC_STORE_API_ENDPOINT, 
+            /ndr/${{ vars.BUILD_ENV }}/container_port = CONTAINER_PORT'
           withDecryption: 'true' # defaults to true
 
       - name: Configure React environment vars
@@ -99,8 +100,9 @@ jobs:
           ECR_REPOSITORY: ${{ secrets.AWS_ECR_REPO_NAME }}
           IMAGE_TAG: perf-${{ github.event.inputs.tagVersion}}
           IMAGE_TAG_SHA: ${{ github.sha }}
+          CONTAINER_PORT: ${{ env.CONTAINER_PORT }}
         run: |
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
+          docker build --build-arg="CONTAINER_PORT=$CONTAINER_PORT" -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA
           echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA" >> $GITHUB_OUTPUT

.github/workflows/ui-deploy-to-pre-prod-manual.yml

@@ -126,8 +126,8 @@ jobs:
           name: build
           path: ./app/build
         env:
-          CYPRESS_BASE_URL: 'http://localhost:3000'
-          CYPRESS_RUN_AS_SMOKETEST: false
+          CYPRESS_BASE_URL: ${{ vars.CYPRESS_BASE_URL }}
+          CYPRESS_grepTags: 'regression'
 
       # Npm run will run the app locally, we want to test the built application with env vars using serve
       - name: Install serve globally
@@ -176,8 +176,8 @@ jobs:
           browser: firefox
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: 'http://localhost:3000'
-          CYPRESS_RUN_AS_SMOKETEST: false
+          CYPRESS_BASE_URL: ${{ vars.CYPRESS_BASE_URL }}
+          CYPRESS_grepTags: 'regression'
 
   cypress-run-edge:
     runs-on: ubuntu-22.04
@@ -209,8 +209,8 @@ jobs:
           browser: edge
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: 'http://localhost:3000'
-          CYPRESS_RUN_AS_SMOKETEST: false
+          CYPRESS_BASE_URL: ${{ vars.CYPRESS_BASE_URL }}
+          CYPRESS_grepTags: 'regression'
 
   react_build_and_deploy_docker_image:
     runs-on: ubuntu-latest
@@ -245,7 +245,8 @@ jobs:
 
       - uses: dkershner6/aws-ssm-getparameters-action@v1
         with:
-          parameterPairs: '/ndr/${{ vars.BUILD_ENV }}/api_endpoint = DOC_STORE_API_ENDPOINT'
+          parameterPairs: '/ndr/${{ vars.BUILD_ENV }}/api_endpoint = DOC_STORE_API_ENDPOINT, 
+            /ndr/${{ vars.BUILD_ENV }}/container_port = CONTAINER_PORT'
           withDecryption: 'true' # defaults to true
 
       - name: Configure React environment vars
@@ -264,8 +265,9 @@ jobs:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           ECR_REPOSITORY: ${{ secrets.AWS_ECR_REPO_NAME }}
           IMAGE_TAG: ${{needs.tag_and_release.outputs.tag}}
+          CONTAINER_PORT: ${{ env.CONTAINER_PORT }}
         run: |
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:latest .
+          docker build --build-arg="CONTAINER_PORT=$CONTAINER_PORT" -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:latest .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest
           echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT

.github/workflows/ui-deploy-to-prod-manual.yml

@@ -119,8 +119,8 @@ jobs:
           browser: chrome
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: 'http://localhost:3000'
-          CYPRESS_RUN_AS_SMOKETEST: false
+          CYPRESS_BASE_URL: ${{ vars.CYPRESS_BASE_URL }}
+          CYPRESS_grepTags: 'regression'
 
   cypress-run-firefox:
     runs-on: ubuntu-22.04
@@ -152,8 +152,8 @@ jobs:
           browser: firefox
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: 'http://localhost:3000'
-          CYPRESS_RUN_AS_SMOKETEST: false
+          CYPRESS_BASE_URL: ${{ vars.CYPRESS_BASE_URL }}
+          CYPRESS_grepTags: 'regression'
 
   cypress-run-edge:
     runs-on: ubuntu-22.04
@@ -185,8 +185,8 @@ jobs:
           browser: edge
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: 'http://localhost:3000'
-          CYPRESS_RUN_AS_SMOKETEST: false
+          CYPRESS_BASE_URL: ${{ vars.CYPRESS_BASE_URL }}
+          CYPRESS_grepTags: 'regression'
 
   react_build_and_deploy_docker_image:
     runs-on: ubuntu-latest
@@ -215,7 +215,8 @@ jobs:
 
       - uses: dkershner6/aws-ssm-getparameters-action@v1
         with:
-          parameterPairs: '/ndr/${{ vars.BUILD_ENV }}/api_endpoint = DOC_STORE_API_ENDPOINT'
+          parameterPairs: '/ndr/${{ vars.BUILD_ENV }}/api_endpoint = DOC_STORE_API_ENDPOINT, 
+            /ndr/${{ vars.BUILD_ENV }}/container_port = CONTAINER_PORT'
           withDecryption: 'true' # defaults to true
 
       - name: Configure React environment vars
@@ -234,8 +235,9 @@ jobs:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           ECR_REPOSITORY: ${{ secrets.AWS_ECR_REPO_NAME }}
           IMAGE_TAG: prod-${{ github.event.inputs.tagVersion}}
+          CONTAINER_PORT: ${{ env.CONTAINER_PORT }}
         run: |
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:latest .
+          docker build --build-arg="CONTAINER_PORT=$CONTAINER_PORT" -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:latest .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest
           echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT

.github/workflows/ui-deploy-to-test-manual.yml

@@ -117,8 +117,8 @@ jobs:
           browser: chrome
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: 'http://localhost:3000'
-          CYPRESS_RUN_AS_SMOKETEST: false
+          CYPRESS_BASE_URL: ${{ vars.CYPRESS_BASE_URL }}
+          CYPRESS_grepTags: 'regression'
 
   cypress-run-firefox:
     runs-on: ubuntu-22.04
@@ -150,8 +150,8 @@ jobs:
           browser: firefox
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: 'http://localhost:3000'
-          CYPRESS_RUN_AS_SMOKETEST: false
+          CYPRESS_BASE_URL: ${{ vars.CYPRESS_BASE_URL }}
+          CYPRESS_grepTags: 'regression'
 
   cypress-run-edge:
     runs-on: ubuntu-22.04
@@ -183,8 +183,8 @@ jobs:
           browser: edge
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: 'http://localhost:3000'
-          CYPRESS_RUN_AS_SMOKETEST: false
+          CYPRESS_BASE_URL: ${{ vars.CYPRESS_BASE_URL }}
+          CYPRESS_grepTags: 'regression'
 
   react_build_and_deploy_docker_image:
     runs-on: ubuntu-latest
@@ -232,8 +232,9 @@ jobs:
           ECR_REPOSITORY: ${{ secrets.AWS_ECR_REPO_NAME }}
           IMAGE_TAG: latest
           IMAGE_TAG_SHA: ${{ github.sha }}
+          CONTAINER_PORT: ${{ env.CONTAINER_PORT }}
         run: |
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
+          docker build --build-arg="CONTAINER_PORT=$CONTAINER_PORT"  -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA
           echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA" >> $GITHUB_OUTPUT

.github/workflows/ui-dev-to-main-ci.yml

@@ -120,9 +120,9 @@ jobs:
           browser: chrome
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: 'http://localhost:3000/'
-          CYPRESS_RUN_AS_SMOKETEST: false
-      
+          CYPRESS_BASE_URL: ${{ vars.CYPRESS_BASE_URL }}
+          CYPRESS_grepTags: 'regression'
+
   cypress-run-firefox:
     runs-on: ubuntu-22.04
     needs: install-cypress-build
@@ -153,8 +153,8 @@ jobs:
           browser: firefox
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: 'http://localhost:3000/'
-          CYPRESS_RUN_AS_SMOKETEST: false
+          CYPRESS_BASE_URL: ${{ vars.CYPRESS_BASE_URL }}
+          CYPRESS_grepTags: 'regression'
 
   cypress-run-edge:
     runs-on: ubuntu-22.04
@@ -190,8 +190,8 @@ jobs:
           browser: edge
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: 'http://localhost:3000/'
-          CYPRESS_RUN_AS_SMOKETEST: false
+          CYPRESS_BASE_URL: ${{ vars.CYPRESS_BASE_URL }}
+          CYPRESS_grepTags: 'regression'
 
   react_build_and_deploy_docker_image:
     runs-on: ubuntu-latest
@@ -218,7 +218,8 @@ jobs:
 
       - uses: dkershner6/aws-ssm-getparameters-action@v1
         with:
-          parameterPairs: '/ndr/${{ vars.BUILD_ENV }}/api_endpoint = DOC_STORE_API_ENDPOINT'
+          parameterPairs: '/ndr/${{ vars.BUILD_ENV }}/api_endpoint = DOC_STORE_API_ENDPOINT, 
+            /ndr/${{ vars.BUILD_ENV }}/container_port = CONTAINER_PORT'
           withDecryption: 'true' # defaults to true
 
       - name: Configure React environment vars
@@ -238,8 +239,9 @@ jobs:
           ECR_REPOSITORY: ${{ secrets.AWS_ECR_REPO_NAME }}
           IMAGE_TAG: latest
           IMAGE_TAG_SHA: ${{ github.sha }}
+          CONTAINER_PORT: ${{ env.CONTAINER_PORT }}
         run: |
-          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
+          docker build --build-arg="CONTAINER_PORT=$CONTAINER_PORT" -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA
           echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA" >> $GITHUB_OUTPUT

.github/workflows/ui-smoketest.yml

@@ -1,36 +1,34 @@
 # .github/workflows/terraform-dev
-name: 'SMOKETEST UI'
+name: 'SANDBOX - Smoke Test'
 
 on:
   workflow_dispatch:
     inputs:
-      buildBranch:
-        description: 'Feature branch to push to test?'
+      build_branch:
+        description: 'Branch with smoke tests.'
         required: true
         type: 'string'
-      smokeUrl:
-        description: 'What URL to run smoketest against'
+        default: 'main'
+      sandbox:
+        description: 'Sandbox to run the smoke tests on.'
         required: true
-        default: 'https://ndr-dev.access-request-fulfilment.patient-deductions.nhs.uk/'
         type: 'string'
+        default: 'ndr'
 
 permissions:
   pull-requests: write
   id-token: write # This is required for requesting the JWT
   contents: read # This is required for actions/checkout
 
 jobs:
-
   cypress-run-chrome:
     runs-on: ubuntu-22.04
-    needs: install-cypress-build
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-
-      # Npm run will run the app locally, we want to test the built application with env vars using serve
-      - name: Install serve globally
-        run: npm install -g serve
+        with:
+          repository: 'nhsconnect/national-document-repository'
+          ref: ${{ github.event.inputs.build_branch}}
 
       - name: Cypress install
         run: |
@@ -44,18 +42,17 @@ jobs:
           browser: chrome
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: '${{ github.event.inputs.smokeUrl}}'
+          CYPRESS_BASE_URL: 'https://${{ github.event.inputs.sandbox }}.access-request-fulfilment.patient-deductions.nhs.uk'
+          CYPRESS_grepTags: 'smoke'
 
   cypress-run-firefox:
     runs-on: ubuntu-22.04
-    needs: install-cypress-build
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-
-      # Npm run will run the app locally, we want to test the built application with env vars using serve
-      - name: Install serve globally
-        run: npm install -g serve
+        with:
+          repository: 'nhsconnect/national-document-repository'
+          ref: ${{ github.event.inputs.build_branch}}
 
       - name: Cypress install
         run: |
@@ -69,14 +66,17 @@ jobs:
           browser: firefox
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: '${{ github.event.inputs.smokeUrl}}'
+          CYPRESS_BASE_URL: 'https://${{ github.event.inputs.sandbox }}.access-request-fulfilment.patient-deductions.nhs.uk'
+          CYPRESS_grepTags: 'smoke'
 
   cypress-run-edge:
     runs-on: ubuntu-22.04
-    needs: install-cypress-build
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          repository: 'nhsconnect/national-document-repository'
+          ref: ${{ github.event.inputs.build_branch}}
 
       - name: Cypress install
         run: |
@@ -90,5 +90,5 @@ jobs:
           browser: edge
           working-directory: ./app
         env:
-          CYPRESS_BASE_URL: '${{ github.event.inputs.smokeUrl}}'
-
+          CYPRESS_BASE_URL: 'https://${{ github.event.inputs.sandbox }}.access-request-fulfilment.patient-deductions.nhs.uk'
+          CYPRESS_grepTags: 'smoke'

.gitignore

@@ -52,6 +52,8 @@ coverage.xml
 .hypothesis/
 .pytest_cache/
 cover/
+app/mochawesome-report/
+app/mochawesomemerged.json
 
 # Translations
 *.mo

app/.dockerignore

@@ -1 +1,2 @@
-/node_modules
+/node_modules
+Dockerfile

app/.env.template

@@ -3,4 +3,8 @@ REACT_APP_DOC_STORE_API_ENDPOINT=%DOC_STORE_API_ENDPOINT%
 REACT_APP_AWS_REGION=%AWS_REGION%
 REACT_APP_OIDC_PROVIDER_ID=%OIDC_PROVIDER_ID%
 REACT_APP_ENVIRONMENT=%BUILD_ENV% # 'local'
-REACT_APP_IMAGE_VERSION="%IMAGE_VERSION%"
+REACT_APP_IMAGE_VERSION="%IMAGE_VERSION%"
+CONTAINER_PORT=xx    # Port number within the container. Needed for building the docker image
+HOST_PORT=xxxx    # Port number that the docker-compose localhost exposes. Only need this if we run docker-compose
+PORT=xxxx   # Port number of the localhost dev server when we run `make start`
+CYPRESS_BASE_URL=http://localhost:xxxx  # Use the port number same as above PORT