Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
22.22.0
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ coverage
apps/e2e/cypress/fixtures/*
.vscode
.build
.turbo
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ Most of the apps are built with [Express.js](https://expressjs.com/), and the fr

### Node.js

The current node version can be found in the package.json at the root of the project. It is recommended to use a node version manager, such as [nvm](https://github.com/nvm-sh/nvm#installing-and-updating).
The current node version is **Node.js 22.22.0 LTS**. The version can be found in `.nvmrc` and in the `engines` field of package.json files. It is recommended to use a node version manager, such as [nvm](https://github.com/nvm-sh/nvm#installing-and-updating).
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert to the original comment, otherwise this will need to be updated with every node update and can be missed

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverted


Example node installation, using `nvm`:

```
nvm install 20.11.1
nvm use 20.11.1
nvm alias default 20
nvm install 22
nvm use 22
nvm alias default 22
```

### Database Setup
Expand Down
2 changes: 1 addition & 1 deletion apps/api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20-alpine3.20
FROM node:22-alpine3.22
WORKDIR /src/app

ARG GIT_SHA
Expand Down
2 changes: 1 addition & 1 deletion apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"description": "PINS Back Office API App",
"engines": {
"node": ">=20.0.0 <21.0.0"
"node": ">=22.0.0 <23.0.0"
},
"prisma": {
"schema": "src/database/schema.prisma",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ export class GeographicalInformationSection extends SectionBase {
}

fillLocation(location) {
// Debug: Check if we're on the right page
cy.get('body').then(($body) => {
cy.log('Current page body HTML snippet: ' + $body.html().substring(0, 500));
});

// Debug: List all form inputs on the page
cy.get('input').then(($inputs) => {
const inputIds = $inputs.map((i, el) => el.id).get();
cy.log('Available input IDs: ' + inputIds.join(', '));
});

Comment on lines +16 to +26
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why has this been included?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed it in my local, I didn't commit it earlier.

removed.

this.elements.location().clear().type(location);
}

Expand Down
2 changes: 1 addition & 1 deletion apps/functions/applications-background-jobs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.0",
"private": true,
"engines": {
"node": ">=20.0.0 <21.0.0"
"node": ">=22.0.0 <23.0.0"
},
"description": "Azure functions related to Background Jobs",
"type": "module",
Expand Down
4 changes: 2 additions & 2 deletions apps/web/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage 1/2 - Builder
FROM node:20-alpine3.20 AS pins-web-builder
FROM node:22-alpine3.22 AS pins-web-builder

RUN apk update

Expand Down Expand Up @@ -30,7 +30,7 @@ RUN npm run build:release
# --------------------------------

# Stage 2/2 - App run
FROM node:20-alpine3.20
FROM node:22-alpine3.22

ARG GIT_SHA

Expand Down
2 changes: 1 addition & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"description": "PINS Back Office Web App",
"engines": {
"node": ">=20.0.0 <21.0.0"
"node": ">=22.0.0 <23.0.0"
},
"type": "module",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23355,7 +23355,7 @@ exports[`applications documentation Document search GET /case/123/project-docume
<li class="govuk-pagination__item"><a class="govuk-link govuk-pagination__link" href="/applications-service/case/123/project-documentation/search-results?q=word&amp;page=2"
aria-label="Page 2"> 2</a>
</li>
<li class="govuk-pagination__item govuk-pagination__item--ellipses">&ctdot;</li>
<li class="govuk-pagination__item govuk-pagination__item--ellipsis">&ctdot;</li>
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's unusual. How come the snapshot was out of date without a corresponding template change? Also, the CSS and template is still using the old spelling, so I am a bit confused where is this coming from?

<li class="govuk-pagination__item"><a class="govuk-link govuk-pagination__link" href="/applications-service/case/123/project-documentation/search-results?q=word&amp;page=8"
aria-label="Page 8"> 8</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ extends:
# install function specific node_modules
- template: azure-pipelines-package-function-dep-install.yml@self
parameters:
nodeVersion: 20
nodeVersion: 22
appsFolderNames:
- 'applications-migration'
- 'applications-background-jobs'
Expand Down
18 changes: 9 additions & 9 deletions azure-pipelines-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,35 +42,35 @@ extends:
displayName: Cache npm
- template: ../steps/node_script.yml
parameters:
nodeVersion: 20
nodeVersion: 22
script: npm ci
environmentVariables:
npm_config_cache: $(npm_config_cache)
- template: ../steps/node_script.yml
parameters:
# only run commitlint on branches, not main
condition: ne(variables['Build.SourceBranchName'], 'main')
nodeVersion: 20
nodeVersion: 22
script: npm run commitlint
- template: ../steps/node_script.yml
parameters:
nodeVersion: 20
nodeVersion: 22
script: npm run tscheck
environmentVariables:
TURBO_TEAM: $(TURBO_TEAM)
TURBO_API: $(TURBO_API)
TURBO_TOKEN: $(TURBO_TOKEN)
- template: ../steps/node_script.yml
parameters:
nodeVersion: 20
nodeVersion: 22
script: npm run lint:js
- template: ../steps/node_script.yml
parameters:
nodeVersion: 20
nodeVersion: 22
script: npm run format-check
- template: ../steps/node_script.yml
parameters:
nodeVersion: 20
nodeVersion: 22
# Run tests for a subset of apps on Agent A
script: npx turbo run test --filter=./apps/api
environmentVariables:
Expand All @@ -88,13 +88,13 @@ extends:
displayName: Cache npm
- template: ../steps/node_script.yml
parameters:
nodeVersion: 20
nodeVersion: 22
script: npm ci
environmentVariables:
npm_config_cache: $(npm_config_cache)
- template: ../steps/node_script.yml
parameters:
nodeVersion: 20
nodeVersion: 22
# Run tests for the remaining apps on Agent B
script: npx turbo run test --filter=./apps/web --filter=./apps/api-testing --filter=./apps/functions/*
environmentVariables:
Expand All @@ -103,7 +103,7 @@ extends:
TURBO_TOKEN: $(TURBO_TOKEN)
- template: ../steps/node_script.yml
parameters:
nodeVersion: 20
nodeVersion: 22
script: npm run build:release
environmentVariables:
TURBO_TEAM: $(TURBO_TEAM)
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines-regenerate-api-key.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ jobs:
- checkout: self
- template: steps/node_script.yml@templates
parameters:
nodeVersion: 20
nodeVersion: 22
script: npm ci --workspaces=@pins/packages.scripts
- template: steps/node_script.yml@templates
parameters:
condition: or(eq('${{ parameters.environment }}', '*'), eq('${{ parameters.environment }}', 'Dev'))
nodeVersion: 20
nodeVersion: 22
environmentVariables:
AZURE_CLIENT_ID: $(AZURE_CLIENT_ID)
AZURE_CLIENT_SECRET: $(AZURE_CLIENT_SECRET)
Expand All @@ -63,7 +63,7 @@ jobs:
- template: steps/node_script.yml@templates
parameters:
condition: or(eq('${{ parameters.environment }}', '*'), eq('${{ parameters.environment }}', 'Test'))
nodeVersion: 20
nodeVersion: 22
environmentVariables:
AZURE_CLIENT_ID: $(AZURE_CLIENT_ID)
AZURE_CLIENT_SECRET: $(AZURE_CLIENT_SECRET)
Expand All @@ -85,7 +85,7 @@ jobs:
- template: steps/node_script.yml@templates
parameters:
condition: or(eq('${{ parameters.environment }}', '*'), eq('${{ parameters.environment }}', 'Prod'))
nodeVersion: 20
nodeVersion: 22
environmentVariables:
AZURE_CLIENT_ID: $(AZURE_CLIENT_ID)
AZURE_CLIENT_SECRET: $(AZURE_CLIENT_SECRET)
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines-remove-specified-cases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- checkout: self
- template: steps/node_script.yml@templates
parameters:
nodeVersion: 20
nodeVersion: 22
script: npm ci
- template: steps/azure_auth.yml@templates
- template: steps/azure_get_secrets.yml@templates
Expand All @@ -71,14 +71,14 @@ jobs:
variable: DATABASE_URL
- template: steps/node_script.yml@templates
parameters:
nodeVersion: 20
nodeVersion: 22
environmentVariables:
DATABASE_URL: $(DATABASE_URL)
script: npm run prisma-generate
workingDirectory: $(Build.Repository.LocalPath)/apps/api
- template: steps/node_script.yml@templates
parameters:
nodeVersion: 20
nodeVersion: 22
environmentVariables:
DATABASE_URL: $(DATABASE_URL)
SPECIFIED_CASES: ${{parameters.specifiedCases}}
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines-remove-training-cases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- checkout: self
- template: steps/node_script.yml@templates
parameters:
nodeVersion: 20
nodeVersion: 22
script: npm ci
- template: steps/azure_auth.yml@templates
- template: steps/azure_get_secrets.yml@templates
Expand All @@ -68,14 +68,14 @@ jobs:
variable: DATABASE_URL
- template: steps/node_script.yml@templates
parameters:
nodeVersion: 20
nodeVersion: 22
environmentVariables:
DATABASE_URL: $(DATABASE_URL)
script: npm run prisma-generate
workingDirectory: $(Build.Repository.LocalPath)/apps/api
- template: steps/node_script.yml@templates
parameters:
nodeVersion: 20
nodeVersion: 22
environmentVariables:
DATABASE_URL: $(DATABASE_URL)
REMOVE_ALL_CASES: ${{parameters.removeAllCases}}
Expand Down
Loading
Loading