Skip to content

Commit

Permalink
Merge pull request #69 from ONSdigital/BLAIS5-4665
Browse files Browse the repository at this point in the history
Promote from BLAIS5-4665 to main
  • Loading branch information
Willst1 authored Feb 28, 2025
2 parents 901fd9d + f8a8ef5 commit e32f26b
Show file tree
Hide file tree
Showing 4 changed files with 1,539 additions and 1,217 deletions.
31 changes: 17 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "blaise-editing-service-poc",
"name": "blaise-editing-service",
"version": "0.1.0",
"private": true,
"target": "esnext",
Expand Down Expand Up @@ -43,27 +43,28 @@
]
},
"resolutions": {
"blaise-api-node-client": "git+https://github.com/ONSdigital/blaise-api-node-client#1.3.0-beta",
"blaise-design-system-react-components": "git+https://github.com/ONSdigital/blaise-design-system-react-components#0.15.0"
"blaise-api-node-client": "git+https://github.com/ONSdigital/blaise-api-node-client#2.0.0",
"blaise-design-system-react-components": "git+https://github.com/ONSdigital/blaise-design-system-react-components#1.0.0",
"@babel/traverse": "^7.23.2"
},
"dependencies": {
"@google-cloud/logging-winston": "^6.0.0",
"axios": "^1.7.9",
"blaise-api-node-client": "git+https://github.com/ONSdigital/blaise-api-node-client#1.3.0-beta",
"blaise-design-system-react-components": "git+https://github.com/ONSdigital/blaise-design-system-react-components#0.15.0",
"blaise-login-react-client": "https://gitpkg.now.sh/ONSdigital/blaise-login-react/blaise-login-react-client?716d71e8b501bf200e8715f1a4d959d0b7e0b992",
"blaise-login-react-server": "https://gitpkg.now.sh/ONSdigital/blaise-login-react/blaise-login-react-server?716d71e8b501bf200e8715f1a4d959d0b7e0b992",
"blaise-api-node-client": "git+https://github.com/ONSdigital/blaise-api-node-client#2.0.0",
"blaise-design-system-react-components": "git+https://github.com/ONSdigital/blaise-design-system-react-components#1.0.0",
"blaise-login-react-client": "https://gitpkg.now.sh/ONSdigital/blaise-login-react/blaise-login-react-client?7cc580d590d1b002ffae72e33845f7a7e9cec3d6",
"blaise-login-react-server": "https://gitpkg.now.sh/ONSdigital/blaise-login-react/blaise-login-react-server?7cc580d590d1b002ffae72e33845f7a7e9cec3d6",
"concurrently": "^8.1.0",
"cors": "^2.8.5",
"dotenv": "^16.3.1",
"ejs": "^3.1.10",
"eslint-plugin-jsx-a11y": "^6.6.1",
"express": "^4.20.0",
"moment": "^2.30.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.11.2",
"react-scripts": "5.0.1",
"typescript": "^4.9.5",
"web-vitals": "^2.1.0",
"winston": "^3.17.0"
},
Expand All @@ -73,17 +74,18 @@
"@testing-library/react": "^13.0.0",
"@testing-library/user-event": "^13.2.1",
"@types/ejs": "^3.1.2",
"@types/express": "^4.17.12",
"@types/express": "^4.17.13",
"@types/express-list-endpoints": "^6.0.0",
"@types/jest": "^27.0.1",
"@types/node": "^16.7.13",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@types/react-router-dom": "^5.3.3",
"@types/supertest": "^2.0.12",
"@typescript-eslint/eslint-plugin": "^5.43.0",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^6.20.0",
"axios-mock-adapter": "^1.21.5",
"eslint": "^8.0.1",
"eslint": "^8.8.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-plugin-import": "^2.25.2",
Expand All @@ -92,11 +94,12 @@
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"express-list-endpoints": "^6.0.0",
"jest": "^29.6.0",
"jest-environment-jsdom": "^29.6.1",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"nodemon": "^2.0.22",
"supertest": "^6.3.3",
"ts-jest": "^29.1.1",
"typemoq": "^2.1.0"
"typemoq": "^2.1.0",
"typescript": "^4.9.5"
}
}
6 changes: 3 additions & 3 deletions src/client/Supervisor/Components/SupervisorContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ export default function SupervisorContent({ questionnaire, supervisorInformation
{' | '}
<Link to={`/questionnaires/${questionnaire.questionnaireName}/cases/search`}>Search</Link>
</td>
<td className="ons-table__cell" />
<td className="ons-table__cell" />
<td className="ons-table__cell" />
<td className="ons-table__cell" aria-label="1" />
<td className="ons-table__cell" aria-label="2" />
<td className="ons-table__cell" aria-label="3" />
</tr>
</>
</ONSTable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1195,12 +1195,15 @@ exports[`Given there are surveys available in blaise should render the superviso
</a>
</td>
<td
aria-label="1"
class="ons-table__cell"
/>
<td
aria-label="2"
class="ons-table__cell"
/>
<td
aria-label="3"
class="ons-table__cell"
/>
</tr>
Expand Down Expand Up @@ -1528,12 +1531,15 @@ exports[`Given there are surveys available in blaise should render the superviso
</a>
</td>
<td
aria-label="1"
class="ons-table__cell"
/>
<td
aria-label="2"
class="ons-table__cell"
/>
<td
aria-label="3"
class="ons-table__cell"
/>
</tr>
Expand Down
Loading

0 comments on commit e32f26b

Please sign in to comment.