diff --git a/api.planx.uk/admin/session/html.ts b/api.planx.uk/admin/session/html.ts
index 493bd58dd5..e6c88eba1a 100644
--- a/api.planx.uk/admin/session/html.ts
+++ b/api.planx.uk/admin/session/html.ts
@@ -24,8 +24,9 @@ export const getHTMLExport: HTMLExportHandler = async (req, res, next) => {
if (!session) throw Error(`Unable to find session ${req.params.sessionId}`);
const responses = await $api.export.csvData(req.params.sessionId);
- const boundingBox =
- session.data.passport.data["property.boundary.site.buffered"];
+ const boundingBox = session.data.passport.data[
+ "property.boundary.site.buffered"
+ ] as unknown as GeoJSON.Feature;
const html = generateApplicationHTML({
planXExportData: responses as PlanXExportData[],
@@ -66,8 +67,9 @@ export const getRedactedHTMLExport: HTMLExportHandler = async (
const redactedResponses = await $api.export.csvDataRedacted(
req.params.sessionId,
);
- const boundingBox =
- session.data.passport.data["property.boundary.site.buffered"];
+ const boundingBox = session.data.passport.data[
+ "property.boundary.site.buffered"
+ ] as unknown as GeoJSON.Feature;
const html = generateApplicationHTML({
planXExportData: redactedResponses as PlanXExportData[],
diff --git a/api.planx.uk/inviteToPay/createPaymentSendEvents.ts b/api.planx.uk/inviteToPay/createPaymentSendEvents.ts
index 75f1245ed5..055a884afd 100644
--- a/api.planx.uk/inviteToPay/createPaymentSendEvents.ts
+++ b/api.planx.uk/inviteToPay/createPaymentSendEvents.ts
@@ -88,9 +88,11 @@ const createPaymentSendEvents = async (
if (destinations.includes(Destination.Uniform)) {
// Bucks has 3 instances of Uniform for 4 legacy councils, set teamSlug to pre-merger council name
if (teamSlug === "buckinghamshire") {
- teamSlug = session.data?.passport?.data?.[
+ const localAuthorities: string[] = session.data?.passport?.data?.[
"property.localAuthorityDistrict"
- ]
+ ] as string[];
+
+ teamSlug = localAuthorities
?.filter((name: string) => name !== "Buckinghamshire")[0]
?.toLowerCase()
?.replace(/\W+/g, "-");
diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json
index da3fb4607a..2a7eaa6d57 100644
--- a/api.planx.uk/package.json
+++ b/api.planx.uk/package.json
@@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@airbrake/node": "^2.1.8",
- "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#2b7fa5b",
+ "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#69c797c",
"@types/isomorphic-fetch": "^0.0.36",
"adm-zip": "^0.5.10",
"aws-sdk": "^2.1467.0",
diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml
index b7ac1979a5..14a6d16250 100644
--- a/api.planx.uk/pnpm-lock.yaml
+++ b/api.planx.uk/pnpm-lock.yaml
@@ -9,8 +9,8 @@ dependencies:
specifier: ^2.1.8
version: 2.1.8
'@opensystemslab/planx-core':
- specifier: git+https://github.com/theopensystemslab/planx-core#2b7fa5b
- version: github.com/theopensystemslab/planx-core/2b7fa5b
+ specifier: git+https://github.com/theopensystemslab/planx-core#69c797c
+ version: github.com/theopensystemslab/planx-core/69c797c
'@types/isomorphic-fetch':
specifier: ^0.0.36
version: 0.0.36
@@ -1669,8 +1669,8 @@ packages:
resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==}
dev: false
- /@mui/base@5.0.0-beta.19(react-dom@18.2.0)(react@18.2.0):
- resolution: {integrity: sha512-maNBgAscddyPNzFZQUJDF/puxM27Li+NqSBsr/lAP8TLns2VvWS2SoL3OKFOIoRnAMKGY/Ic6Aot6gCYeQnssA==}
+ /@mui/base@5.0.0-beta.21(react-dom@18.2.0)(react@18.2.0):
+ resolution: {integrity: sha512-eTKWx3WV/nwmRUK4z4K1MzlMyWCsi3WJ3RtV4DiXZeRh4qd4JCyp1Zzzi8Wv9xM4dEBmqQntFoei716PzwmFfA==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
@@ -1686,8 +1686,8 @@ packages:
dependencies:
'@babel/runtime': 7.23.2
'@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0)
- '@mui/types': 7.2.6
- '@mui/utils': 5.14.13(react@18.2.0)
+ '@mui/types': 7.2.7
+ '@mui/utils': 5.14.15(react@18.2.0)
'@popperjs/core': 2.11.8
clsx: 2.0.0
prop-types: 15.8.1
@@ -1695,12 +1695,12 @@ packages:
react-dom: 18.2.0(react@18.2.0)
dev: false
- /@mui/core-downloads-tracker@5.14.13:
- resolution: {integrity: sha512-3ZUbzcH4yloLKlV6Y+S0Edn2wef9t+EGHSfEkwVCn8E0ULdshifEFgfEroKRegQifDIwcKS/ofccxuZ8njTAYg==}
+ /@mui/core-downloads-tracker@5.14.15:
+ resolution: {integrity: sha512-ZCDzBWtCKjAYAlKKM3PA/jG/3uVIDT9ZitOtVixIVmTCQyc5jSV1qhJX8+qIGz4RQZ9KLzPWO2tXd0O5hvzouQ==}
dev: false
- /@mui/material@5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react-dom@18.2.0)(react@18.2.0):
- resolution: {integrity: sha512-iPEFwhoVG789UVsXX4gqd1eJUlcLW1oceqwJYQN8Z4MpcAKfL9Lv3fda65AwG7pQ5lf+d7IbHzm4m48SWZxI2g==}
+ /@mui/material@5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react-dom@18.2.0)(react@18.2.0):
+ resolution: {integrity: sha512-Gq65rHjvLzkxmhG8bvag851Oqsmru7qkUb/cCI2xu7dQzmY345f9xJRJi72sRGjhaqHXWeRKw/yIwp/7oQoeXg==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@emotion/react': ^11.5.0
@@ -1723,11 +1723,11 @@ packages:
'@babel/runtime': 7.23.2
'@emotion/react': 11.11.1(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.1)(react@18.2.0)
- '@mui/base': 5.0.0-beta.19(react-dom@18.2.0)(react@18.2.0)
- '@mui/core-downloads-tracker': 5.14.13
- '@mui/system': 5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
- '@mui/types': 7.2.6
- '@mui/utils': 5.14.13(react@18.2.0)
+ '@mui/base': 5.0.0-beta.21(react-dom@18.2.0)(react@18.2.0)
+ '@mui/core-downloads-tracker': 5.14.15
+ '@mui/system': 5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
+ '@mui/types': 7.2.7
+ '@mui/utils': 5.14.15(react@18.2.0)
'@types/react-transition-group': 4.4.7
clsx: 2.0.0
csstype: 3.1.2
@@ -1738,8 +1738,8 @@ packages:
react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0)
dev: false
- /@mui/private-theming@5.14.13(react@18.2.0):
- resolution: {integrity: sha512-5EFqk4tqiSwPguj4NW/6bUf4u1qoUWXy9lrKfNh9H6oAohM+Ijv/7qSxFjnxPGBctj469/Sc5aKAR35ILBKZLQ==}
+ /@mui/private-theming@5.14.15(react@18.2.0):
+ resolution: {integrity: sha512-V2Xh+Tu6A07NoSpup0P9m29GwvNMYl5DegsGWqlOTJyAV7cuuVjmVPqxgvL8xBng4R85xqIQJRMjtYYktoPNuQ==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
@@ -1751,13 +1751,13 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.23.2
- '@mui/utils': 5.14.13(react@18.2.0)
+ '@mui/utils': 5.14.15(react@18.2.0)
prop-types: 15.8.1
react: 18.2.0
dev: false
- /@mui/styled-engine@5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
- resolution: {integrity: sha512-1ff/egFQl26hiwcUtCMKAkp4Sgqpm3qIewmXq+GN27fb44lDIACquehMFBuadOjceOFmbIXbayzbA46ZyqFYzA==}
+ /@mui/styled-engine@5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
+ resolution: {integrity: sha512-mbOjRf867BysNpexe5Z/P8s3bWzDPNowmKhi7gtNDP/LPEeqAfiDSuC4WPTXmtvse1dCl30Nl755OLUYuoi7Mw==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@emotion/react': ^11.4.1
@@ -1780,8 +1780,8 @@ packages:
react: 18.2.0
dev: false
- /@mui/system@5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
- resolution: {integrity: sha512-+5+Dx50lG4csbx2sGjrKLozXQJeCpJ4dIBZolyFLkZ+XphD1keQWouLUvJkPQ3MSglLLKuD37pp52YjMncZMEQ==}
+ /@mui/system@5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
+ resolution: {integrity: sha512-zr0Gdk1RgKiEk+tCMB900LaOpEC8NaGvxtkmMdL/CXgkqQZSVZOt2PQsxJWaw7kE4YVkIe4VukFVc43qcq9u3w==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@emotion/react': ^11.5.0
@@ -1801,18 +1801,18 @@ packages:
'@babel/runtime': 7.23.2
'@emotion/react': 11.11.1(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.1)(react@18.2.0)
- '@mui/private-theming': 5.14.13(react@18.2.0)
- '@mui/styled-engine': 5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
- '@mui/types': 7.2.6
- '@mui/utils': 5.14.13(react@18.2.0)
+ '@mui/private-theming': 5.14.15(react@18.2.0)
+ '@mui/styled-engine': 5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
+ '@mui/types': 7.2.7
+ '@mui/utils': 5.14.15(react@18.2.0)
clsx: 2.0.0
csstype: 3.1.2
prop-types: 15.8.1
react: 18.2.0
dev: false
- /@mui/types@7.2.6:
- resolution: {integrity: sha512-7sjLQrUmBwufm/M7jw/quNiPK/oor2+pGUQP2CULRcFCArYTq78oJ3D5esTaL0UMkXKJvDqXn6Ike69yAOBQng==}
+ /@mui/types@7.2.7:
+ resolution: {integrity: sha512-sofpWmcBqOlTzRbr1cLQuUDKaUYVZTw8ENQrtL39TECRNENEzwgnNPh6WMfqMZlMvf1Aj9DLg74XPjnLr0izUQ==}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
peerDependenciesMeta:
@@ -1820,8 +1820,8 @@ packages:
optional: true
dev: false
- /@mui/utils@5.14.13(react@18.2.0):
- resolution: {integrity: sha512-2AFpyXWw7uDCIqRu7eU2i/EplZtks5LAMzQvIhC79sPV9IhOZU2qwOWVnPtdctRXiQJOAaXulg+A37pfhEueQw==}
+ /@mui/utils@5.14.15(react@18.2.0):
+ resolution: {integrity: sha512-QBfHovAvTa0J1jXuYDaXGk+Yyp7+Fm8GSqx6nK2JbezGqzCFfirNdop/+bL9Flh/OQ/64PeXcW4HGDdOge+n3A==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
@@ -5867,10 +5867,6 @@ packages:
resolution: {integrity: sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==}
dev: false
- /lodash.property@4.4.2:
- resolution: {integrity: sha512-WVnsHSCea5NFrsWGdZilCFJWhHFtb/nqVrDXzR1bIXmOxIykrsAKOpRaYu9rCYoHYuq1SnG6G4A0inMwShV4dg==}
- dev: false
-
/lodash.set@4.3.2:
resolution: {integrity: sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==}
dev: false
@@ -8152,8 +8148,8 @@ packages:
resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==}
dev: false
- github.com/theopensystemslab/planx-core/2b7fa5b:
- resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/2b7fa5b}
+ github.com/theopensystemslab/planx-core/69c797c:
+ resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/69c797c}
name: '@opensystemslab/planx-core'
version: 1.0.0
prepare: true
@@ -8161,7 +8157,7 @@ packages:
dependencies:
'@emotion/react': 11.11.1(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.1)(react@18.2.0)
- '@mui/material': 5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react-dom@18.2.0)(react@18.2.0)
+ '@mui/material': 5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react-dom@18.2.0)(react@18.2.0)
'@types/geojson': 7946.0.11
ajv: 8.12.0
ajv-formats: 2.1.1(ajv@8.12.0)
@@ -8180,7 +8176,6 @@ packages:
lodash.isnil: 4.0.0
lodash.kebabcase: 4.1.1
lodash.omit: 4.5.0
- lodash.property: 4.4.2
lodash.set: 4.3.2
lodash.startcase: 4.4.0
prettier: 3.0.3
diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json
index 561c7b0250..d9240d2846 100644
--- a/e2e/tests/api-driven/package.json
+++ b/e2e/tests/api-driven/package.json
@@ -6,7 +6,7 @@
},
"dependencies": {
"@cucumber/cucumber": "^9.3.0",
- "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#2b7fa5b",
+ "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#69c797c",
"axios": "^1.4.0",
"dotenv": "^16.3.1",
"dotenv-expand": "^10.0.0",
diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml
index 50b9bc0bcc..b0852544da 100644
--- a/e2e/tests/api-driven/pnpm-lock.yaml
+++ b/e2e/tests/api-driven/pnpm-lock.yaml
@@ -9,8 +9,8 @@ dependencies:
specifier: ^9.3.0
version: 9.3.0
'@opensystemslab/planx-core':
- specifier: git+https://github.com/theopensystemslab/planx-core#2b7fa5b
- version: github.com/theopensystemslab/planx-core/2b7fa5b
+ specifier: git+https://github.com/theopensystemslab/planx-core#69c797c
+ version: github.com/theopensystemslab/planx-core/69c797c
axios:
specifier: ^1.4.0
version: 1.4.0
@@ -494,8 +494,8 @@ packages:
resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==}
dev: false
- /@mui/base@5.0.0-beta.19(react-dom@18.2.0)(react@18.2.0):
- resolution: {integrity: sha512-maNBgAscddyPNzFZQUJDF/puxM27Li+NqSBsr/lAP8TLns2VvWS2SoL3OKFOIoRnAMKGY/Ic6Aot6gCYeQnssA==}
+ /@mui/base@5.0.0-beta.21(react-dom@18.2.0)(react@18.2.0):
+ resolution: {integrity: sha512-eTKWx3WV/nwmRUK4z4K1MzlMyWCsi3WJ3RtV4DiXZeRh4qd4JCyp1Zzzi8Wv9xM4dEBmqQntFoei716PzwmFfA==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
@@ -507,8 +507,8 @@ packages:
dependencies:
'@babel/runtime': 7.23.2
'@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0)
- '@mui/types': 7.2.6
- '@mui/utils': 5.14.13(react@18.2.0)
+ '@mui/types': 7.2.7
+ '@mui/utils': 5.14.15(react@18.2.0)
'@popperjs/core': 2.11.8
clsx: 2.0.0
prop-types: 15.8.1
@@ -516,12 +516,12 @@ packages:
react-dom: 18.2.0(react@18.2.0)
dev: false
- /@mui/core-downloads-tracker@5.14.13:
- resolution: {integrity: sha512-3ZUbzcH4yloLKlV6Y+S0Edn2wef9t+EGHSfEkwVCn8E0ULdshifEFgfEroKRegQifDIwcKS/ofccxuZ8njTAYg==}
+ /@mui/core-downloads-tracker@5.14.15:
+ resolution: {integrity: sha512-ZCDzBWtCKjAYAlKKM3PA/jG/3uVIDT9ZitOtVixIVmTCQyc5jSV1qhJX8+qIGz4RQZ9KLzPWO2tXd0O5hvzouQ==}
dev: false
- /@mui/material@5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react-dom@18.2.0)(react@18.2.0):
- resolution: {integrity: sha512-iPEFwhoVG789UVsXX4gqd1eJUlcLW1oceqwJYQN8Z4MpcAKfL9Lv3fda65AwG7pQ5lf+d7IbHzm4m48SWZxI2g==}
+ /@mui/material@5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react-dom@18.2.0)(react@18.2.0):
+ resolution: {integrity: sha512-Gq65rHjvLzkxmhG8bvag851Oqsmru7qkUb/cCI2xu7dQzmY345f9xJRJi72sRGjhaqHXWeRKw/yIwp/7oQoeXg==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@emotion/react': ^11.5.0
@@ -540,11 +540,11 @@ packages:
'@babel/runtime': 7.23.2
'@emotion/react': 11.11.1(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.1)(react@18.2.0)
- '@mui/base': 5.0.0-beta.19(react-dom@18.2.0)(react@18.2.0)
- '@mui/core-downloads-tracker': 5.14.13
- '@mui/system': 5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
- '@mui/types': 7.2.6
- '@mui/utils': 5.14.13(react@18.2.0)
+ '@mui/base': 5.0.0-beta.21(react-dom@18.2.0)(react@18.2.0)
+ '@mui/core-downloads-tracker': 5.14.15
+ '@mui/system': 5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
+ '@mui/types': 7.2.7
+ '@mui/utils': 5.14.15(react@18.2.0)
'@types/react-transition-group': 4.4.7
clsx: 2.0.0
csstype: 3.1.2
@@ -555,8 +555,8 @@ packages:
react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0)
dev: false
- /@mui/private-theming@5.14.13(react@18.2.0):
- resolution: {integrity: sha512-5EFqk4tqiSwPguj4NW/6bUf4u1qoUWXy9lrKfNh9H6oAohM+Ijv/7qSxFjnxPGBctj469/Sc5aKAR35ILBKZLQ==}
+ /@mui/private-theming@5.14.15(react@18.2.0):
+ resolution: {integrity: sha512-V2Xh+Tu6A07NoSpup0P9m29GwvNMYl5DegsGWqlOTJyAV7cuuVjmVPqxgvL8xBng4R85xqIQJRMjtYYktoPNuQ==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
@@ -566,13 +566,13 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.23.2
- '@mui/utils': 5.14.13(react@18.2.0)
+ '@mui/utils': 5.14.15(react@18.2.0)
prop-types: 15.8.1
react: 18.2.0
dev: false
- /@mui/styled-engine@5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
- resolution: {integrity: sha512-1ff/egFQl26hiwcUtCMKAkp4Sgqpm3qIewmXq+GN27fb44lDIACquehMFBuadOjceOFmbIXbayzbA46ZyqFYzA==}
+ /@mui/styled-engine@5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
+ resolution: {integrity: sha512-mbOjRf867BysNpexe5Z/P8s3bWzDPNowmKhi7gtNDP/LPEeqAfiDSuC4WPTXmtvse1dCl30Nl755OLUYuoi7Mw==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@emotion/react': ^11.4.1
@@ -593,8 +593,8 @@ packages:
react: 18.2.0
dev: false
- /@mui/system@5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
- resolution: {integrity: sha512-+5+Dx50lG4csbx2sGjrKLozXQJeCpJ4dIBZolyFLkZ+XphD1keQWouLUvJkPQ3MSglLLKuD37pp52YjMncZMEQ==}
+ /@mui/system@5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
+ resolution: {integrity: sha512-zr0Gdk1RgKiEk+tCMB900LaOpEC8NaGvxtkmMdL/CXgkqQZSVZOt2PQsxJWaw7kE4YVkIe4VukFVc43qcq9u3w==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@emotion/react': ^11.5.0
@@ -612,18 +612,18 @@ packages:
'@babel/runtime': 7.23.2
'@emotion/react': 11.11.1(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.1)(react@18.2.0)
- '@mui/private-theming': 5.14.13(react@18.2.0)
- '@mui/styled-engine': 5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
- '@mui/types': 7.2.6
- '@mui/utils': 5.14.13(react@18.2.0)
+ '@mui/private-theming': 5.14.15(react@18.2.0)
+ '@mui/styled-engine': 5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
+ '@mui/types': 7.2.7
+ '@mui/utils': 5.14.15(react@18.2.0)
clsx: 2.0.0
csstype: 3.1.2
prop-types: 15.8.1
react: 18.2.0
dev: false
- /@mui/types@7.2.6:
- resolution: {integrity: sha512-7sjLQrUmBwufm/M7jw/quNiPK/oor2+pGUQP2CULRcFCArYTq78oJ3D5esTaL0UMkXKJvDqXn6Ike69yAOBQng==}
+ /@mui/types@7.2.7:
+ resolution: {integrity: sha512-sofpWmcBqOlTzRbr1cLQuUDKaUYVZTw8ENQrtL39TECRNENEzwgnNPh6WMfqMZlMvf1Aj9DLg74XPjnLr0izUQ==}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
peerDependenciesMeta:
@@ -631,8 +631,8 @@ packages:
optional: true
dev: false
- /@mui/utils@5.14.13(react@18.2.0):
- resolution: {integrity: sha512-2AFpyXWw7uDCIqRu7eU2i/EplZtks5LAMzQvIhC79sPV9IhOZU2qwOWVnPtdctRXiQJOAaXulg+A37pfhEueQw==}
+ /@mui/utils@5.14.15(react@18.2.0):
+ resolution: {integrity: sha512-QBfHovAvTa0J1jXuYDaXGk+Yyp7+Fm8GSqx6nK2JbezGqzCFfirNdop/+bL9Flh/OQ/64PeXcW4HGDdOge+n3A==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
@@ -1835,10 +1835,6 @@ packages:
resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
dev: false
- /lodash.property@4.4.2:
- resolution: {integrity: sha512-WVnsHSCea5NFrsWGdZilCFJWhHFtb/nqVrDXzR1bIXmOxIykrsAKOpRaYu9rCYoHYuq1SnG6G4A0inMwShV4dg==}
- dev: false
-
/lodash.set@4.3.2:
resolution: {integrity: sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==}
dev: false
@@ -2715,8 +2711,8 @@ packages:
resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==}
dev: false
- github.com/theopensystemslab/planx-core/2b7fa5b:
- resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/2b7fa5b}
+ github.com/theopensystemslab/planx-core/69c797c:
+ resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/69c797c}
name: '@opensystemslab/planx-core'
version: 1.0.0
prepare: true
@@ -2724,7 +2720,7 @@ packages:
dependencies:
'@emotion/react': 11.11.1(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.1)(react@18.2.0)
- '@mui/material': 5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react-dom@18.2.0)(react@18.2.0)
+ '@mui/material': 5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react-dom@18.2.0)(react@18.2.0)
'@types/geojson': 7946.0.11
ajv: 8.12.0
ajv-formats: 2.1.1(ajv@8.12.0)
@@ -2743,7 +2739,6 @@ packages:
lodash.isnil: 4.0.0
lodash.kebabcase: 4.1.1
lodash.omit: 4.5.0
- lodash.property: 4.4.2
lodash.set: 4.3.2
lodash.startcase: 4.4.0
prettier: 3.0.3
diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json
index 483598cc75..e409d89dcd 100644
--- a/e2e/tests/ui-driven/package.json
+++ b/e2e/tests/ui-driven/package.json
@@ -8,7 +8,7 @@
"postinstall": "./install-dependencies.sh"
},
"dependencies": {
- "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#2b7fa5b",
+ "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#69c797c",
"axios": "^1.4.0",
"dotenv": "^16.3.1",
"eslint": "^8.44.0",
diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml
index 894fd3d4b7..da1e6d7790 100644
--- a/e2e/tests/ui-driven/pnpm-lock.yaml
+++ b/e2e/tests/ui-driven/pnpm-lock.yaml
@@ -6,8 +6,8 @@ settings:
dependencies:
'@opensystemslab/planx-core':
- specifier: git+https://github.com/theopensystemslab/planx-core#2b7fa5b
- version: github.com/theopensystemslab/planx-core/2b7fa5b
+ specifier: git+https://github.com/theopensystemslab/planx-core#69c797c
+ version: github.com/theopensystemslab/planx-core/69c797c
axios:
specifier: ^1.4.0
version: 1.4.0
@@ -343,8 +343,8 @@ packages:
resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==}
dev: false
- /@mui/base@5.0.0-beta.19(react-dom@18.2.0)(react@18.2.0):
- resolution: {integrity: sha512-maNBgAscddyPNzFZQUJDF/puxM27Li+NqSBsr/lAP8TLns2VvWS2SoL3OKFOIoRnAMKGY/Ic6Aot6gCYeQnssA==}
+ /@mui/base@5.0.0-beta.21(react-dom@18.2.0)(react@18.2.0):
+ resolution: {integrity: sha512-eTKWx3WV/nwmRUK4z4K1MzlMyWCsi3WJ3RtV4DiXZeRh4qd4JCyp1Zzzi8Wv9xM4dEBmqQntFoei716PzwmFfA==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
@@ -356,8 +356,8 @@ packages:
dependencies:
'@babel/runtime': 7.23.2
'@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0)
- '@mui/types': 7.2.6
- '@mui/utils': 5.14.13(react@18.2.0)
+ '@mui/types': 7.2.7
+ '@mui/utils': 5.14.15(react@18.2.0)
'@popperjs/core': 2.11.8
clsx: 2.0.0
prop-types: 15.8.1
@@ -365,12 +365,12 @@ packages:
react-dom: 18.2.0(react@18.2.0)
dev: false
- /@mui/core-downloads-tracker@5.14.13:
- resolution: {integrity: sha512-3ZUbzcH4yloLKlV6Y+S0Edn2wef9t+EGHSfEkwVCn8E0ULdshifEFgfEroKRegQifDIwcKS/ofccxuZ8njTAYg==}
+ /@mui/core-downloads-tracker@5.14.15:
+ resolution: {integrity: sha512-ZCDzBWtCKjAYAlKKM3PA/jG/3uVIDT9ZitOtVixIVmTCQyc5jSV1qhJX8+qIGz4RQZ9KLzPWO2tXd0O5hvzouQ==}
dev: false
- /@mui/material@5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react-dom@18.2.0)(react@18.2.0):
- resolution: {integrity: sha512-iPEFwhoVG789UVsXX4gqd1eJUlcLW1oceqwJYQN8Z4MpcAKfL9Lv3fda65AwG7pQ5lf+d7IbHzm4m48SWZxI2g==}
+ /@mui/material@5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react-dom@18.2.0)(react@18.2.0):
+ resolution: {integrity: sha512-Gq65rHjvLzkxmhG8bvag851Oqsmru7qkUb/cCI2xu7dQzmY345f9xJRJi72sRGjhaqHXWeRKw/yIwp/7oQoeXg==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@emotion/react': ^11.5.0
@@ -389,11 +389,11 @@ packages:
'@babel/runtime': 7.23.2
'@emotion/react': 11.11.1(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.1)(react@18.2.0)
- '@mui/base': 5.0.0-beta.19(react-dom@18.2.0)(react@18.2.0)
- '@mui/core-downloads-tracker': 5.14.13
- '@mui/system': 5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
- '@mui/types': 7.2.6
- '@mui/utils': 5.14.13(react@18.2.0)
+ '@mui/base': 5.0.0-beta.21(react-dom@18.2.0)(react@18.2.0)
+ '@mui/core-downloads-tracker': 5.14.15
+ '@mui/system': 5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
+ '@mui/types': 7.2.7
+ '@mui/utils': 5.14.15(react@18.2.0)
'@types/react-transition-group': 4.4.7
clsx: 2.0.0
csstype: 3.1.2
@@ -404,8 +404,8 @@ packages:
react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0)
dev: false
- /@mui/private-theming@5.14.13(react@18.2.0):
- resolution: {integrity: sha512-5EFqk4tqiSwPguj4NW/6bUf4u1qoUWXy9lrKfNh9H6oAohM+Ijv/7qSxFjnxPGBctj469/Sc5aKAR35ILBKZLQ==}
+ /@mui/private-theming@5.14.15(react@18.2.0):
+ resolution: {integrity: sha512-V2Xh+Tu6A07NoSpup0P9m29GwvNMYl5DegsGWqlOTJyAV7cuuVjmVPqxgvL8xBng4R85xqIQJRMjtYYktoPNuQ==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
@@ -415,13 +415,13 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.23.2
- '@mui/utils': 5.14.13(react@18.2.0)
+ '@mui/utils': 5.14.15(react@18.2.0)
prop-types: 15.8.1
react: 18.2.0
dev: false
- /@mui/styled-engine@5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
- resolution: {integrity: sha512-1ff/egFQl26hiwcUtCMKAkp4Sgqpm3qIewmXq+GN27fb44lDIACquehMFBuadOjceOFmbIXbayzbA46ZyqFYzA==}
+ /@mui/styled-engine@5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
+ resolution: {integrity: sha512-mbOjRf867BysNpexe5Z/P8s3bWzDPNowmKhi7gtNDP/LPEeqAfiDSuC4WPTXmtvse1dCl30Nl755OLUYuoi7Mw==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@emotion/react': ^11.4.1
@@ -442,8 +442,8 @@ packages:
react: 18.2.0
dev: false
- /@mui/system@5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
- resolution: {integrity: sha512-+5+Dx50lG4csbx2sGjrKLozXQJeCpJ4dIBZolyFLkZ+XphD1keQWouLUvJkPQ3MSglLLKuD37pp52YjMncZMEQ==}
+ /@mui/system@5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
+ resolution: {integrity: sha512-zr0Gdk1RgKiEk+tCMB900LaOpEC8NaGvxtkmMdL/CXgkqQZSVZOt2PQsxJWaw7kE4YVkIe4VukFVc43qcq9u3w==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@emotion/react': ^11.5.0
@@ -461,18 +461,18 @@ packages:
'@babel/runtime': 7.23.2
'@emotion/react': 11.11.1(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.1)(react@18.2.0)
- '@mui/private-theming': 5.14.13(react@18.2.0)
- '@mui/styled-engine': 5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
- '@mui/types': 7.2.6
- '@mui/utils': 5.14.13(react@18.2.0)
+ '@mui/private-theming': 5.14.15(react@18.2.0)
+ '@mui/styled-engine': 5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
+ '@mui/types': 7.2.7
+ '@mui/utils': 5.14.15(react@18.2.0)
clsx: 2.0.0
csstype: 3.1.2
prop-types: 15.8.1
react: 18.2.0
dev: false
- /@mui/types@7.2.6:
- resolution: {integrity: sha512-7sjLQrUmBwufm/M7jw/quNiPK/oor2+pGUQP2CULRcFCArYTq78oJ3D5esTaL0UMkXKJvDqXn6Ike69yAOBQng==}
+ /@mui/types@7.2.7:
+ resolution: {integrity: sha512-sofpWmcBqOlTzRbr1cLQuUDKaUYVZTw8ENQrtL39TECRNENEzwgnNPh6WMfqMZlMvf1Aj9DLg74XPjnLr0izUQ==}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
peerDependenciesMeta:
@@ -480,8 +480,8 @@ packages:
optional: true
dev: false
- /@mui/utils@5.14.13(react@18.2.0):
- resolution: {integrity: sha512-2AFpyXWw7uDCIqRu7eU2i/EplZtks5LAMzQvIhC79sPV9IhOZU2qwOWVnPtdctRXiQJOAaXulg+A37pfhEueQw==}
+ /@mui/utils@5.14.15(react@18.2.0):
+ resolution: {integrity: sha512-QBfHovAvTa0J1jXuYDaXGk+Yyp7+Fm8GSqx6nK2JbezGqzCFfirNdop/+bL9Flh/OQ/64PeXcW4HGDdOge+n3A==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
@@ -1678,10 +1678,6 @@ packages:
resolution: {integrity: sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==}
dev: false
- /lodash.property@4.4.2:
- resolution: {integrity: sha512-WVnsHSCea5NFrsWGdZilCFJWhHFtb/nqVrDXzR1bIXmOxIykrsAKOpRaYu9rCYoHYuq1SnG6G4A0inMwShV4dg==}
- dev: false
-
/lodash.set@4.3.2:
resolution: {integrity: sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==}
dev: false
@@ -2498,8 +2494,8 @@ packages:
resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==}
dev: false
- github.com/theopensystemslab/planx-core/2b7fa5b:
- resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/2b7fa5b}
+ github.com/theopensystemslab/planx-core/69c797c:
+ resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/69c797c}
name: '@opensystemslab/planx-core'
version: 1.0.0
prepare: true
@@ -2507,7 +2503,7 @@ packages:
dependencies:
'@emotion/react': 11.11.1(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.1)(react@18.2.0)
- '@mui/material': 5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react-dom@18.2.0)(react@18.2.0)
+ '@mui/material': 5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react-dom@18.2.0)(react@18.2.0)
'@types/geojson': 7946.0.11
ajv: 8.12.0
ajv-formats: 2.1.1(ajv@8.12.0)
@@ -2526,7 +2522,6 @@ packages:
lodash.isnil: 4.0.0
lodash.kebabcase: 4.1.1
lodash.omit: 4.5.0
- lodash.property: 4.4.2
lodash.set: 4.3.2
lodash.startcase: 4.4.0
prettier: 3.0.3
diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json
index b64e5dcedc..326a421c10 100644
--- a/editor.planx.uk/package.json
+++ b/editor.planx.uk/package.json
@@ -14,7 +14,7 @@
"@mui/styles": "^5.14.5",
"@mui/utils": "^5.14.5",
"@opensystemslab/map": "^0.7.5",
- "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#2b7fa5b",
+ "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#69c797c",
"@tiptap/core": "^2.0.3",
"@tiptap/extension-bold": "^2.0.3",
"@tiptap/extension-bubble-menu": "^2.1.6",
diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml
index f603686b45..093c67f9df 100644
--- a/editor.planx.uk/pnpm-lock.yaml
+++ b/editor.planx.uk/pnpm-lock.yaml
@@ -46,8 +46,8 @@ dependencies:
specifier: ^0.7.5
version: 0.7.5
'@opensystemslab/planx-core':
- specifier: git+https://github.com/theopensystemslab/planx-core#2b7fa5b
- version: github.com/theopensystemslab/planx-core/2b7fa5b(@types/react@18.2.20)
+ specifier: git+https://github.com/theopensystemslab/planx-core#69c797c
+ version: github.com/theopensystemslab/planx-core/69c797c(@types/react@18.2.20)
'@tiptap/core':
specifier: ^2.0.3
version: 2.0.3(@tiptap/pm@2.0.3)
@@ -5274,8 +5274,8 @@ packages:
react-is: 18.2.0
dev: false
- /@mui/base@5.0.0-beta.19(@types/react@18.2.20)(react-dom@18.2.0)(react@18.2.0):
- resolution: {integrity: sha512-maNBgAscddyPNzFZQUJDF/puxM27Li+NqSBsr/lAP8TLns2VvWS2SoL3OKFOIoRnAMKGY/Ic6Aot6gCYeQnssA==}
+ /@mui/base@5.0.0-beta.21(@types/react@18.2.20)(react-dom@18.2.0)(react@18.2.0):
+ resolution: {integrity: sha512-eTKWx3WV/nwmRUK4z4K1MzlMyWCsi3WJ3RtV4DiXZeRh4qd4JCyp1Zzzi8Wv9xM4dEBmqQntFoei716PzwmFfA==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@types/react': ^17.0.0 || ^18.0.0
@@ -5287,8 +5287,8 @@ packages:
dependencies:
'@babel/runtime': 7.23.2
'@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0)
- '@mui/types': 7.2.6(@types/react@18.2.20)
- '@mui/utils': 5.14.13(@types/react@18.2.20)(react@18.2.0)
+ '@mui/types': 7.2.7(@types/react@18.2.20)
+ '@mui/utils': 5.14.15(@types/react@18.2.20)(react@18.2.0)
'@popperjs/core': 2.11.8
'@types/react': 18.2.20
clsx: 2.0.0
@@ -5297,8 +5297,8 @@ packages:
react-dom: 18.2.0(react@18.2.0)
dev: false
- /@mui/core-downloads-tracker@5.14.13:
- resolution: {integrity: sha512-3ZUbzcH4yloLKlV6Y+S0Edn2wef9t+EGHSfEkwVCn8E0ULdshifEFgfEroKRegQifDIwcKS/ofccxuZ8njTAYg==}
+ /@mui/core-downloads-tracker@5.14.15:
+ resolution: {integrity: sha512-ZCDzBWtCKjAYAlKKM3PA/jG/3uVIDT9ZitOtVixIVmTCQyc5jSV1qhJX8+qIGz4RQZ9KLzPWO2tXd0O5hvzouQ==}
dev: false
/@mui/core-downloads-tracker@5.14.5:
@@ -5322,8 +5322,8 @@ packages:
react: 18.2.0
dev: false
- /@mui/material@5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.20)(react-dom@18.2.0)(react@18.2.0):
- resolution: {integrity: sha512-iPEFwhoVG789UVsXX4gqd1eJUlcLW1oceqwJYQN8Z4MpcAKfL9Lv3fda65AwG7pQ5lf+d7IbHzm4m48SWZxI2g==}
+ /@mui/material@5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.20)(react-dom@18.2.0)(react@18.2.0):
+ resolution: {integrity: sha512-Gq65rHjvLzkxmhG8bvag851Oqsmru7qkUb/cCI2xu7dQzmY345f9xJRJi72sRGjhaqHXWeRKw/yIwp/7oQoeXg==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@emotion/react': ^11.5.0
@@ -5342,11 +5342,11 @@ packages:
'@babel/runtime': 7.23.2
'@emotion/react': 11.11.1(@types/react@18.2.20)(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.2.20)(react@18.2.0)
- '@mui/base': 5.0.0-beta.19(@types/react@18.2.20)(react-dom@18.2.0)(react@18.2.0)
- '@mui/core-downloads-tracker': 5.14.13
- '@mui/system': 5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.20)(react@18.2.0)
- '@mui/types': 7.2.6(@types/react@18.2.20)
- '@mui/utils': 5.14.13(@types/react@18.2.20)(react@18.2.0)
+ '@mui/base': 5.0.0-beta.21(@types/react@18.2.20)(react-dom@18.2.0)(react@18.2.0)
+ '@mui/core-downloads-tracker': 5.14.15
+ '@mui/system': 5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.20)(react@18.2.0)
+ '@mui/types': 7.2.7(@types/react@18.2.20)
+ '@mui/utils': 5.14.15(@types/react@18.2.20)(react@18.2.0)
'@types/react': 18.2.20
'@types/react-transition-group': 4.4.7
clsx: 2.0.0
@@ -5405,7 +5405,24 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.23.2
- '@mui/utils': 5.14.13(@types/react@18.2.20)(react@18.2.0)
+ '@mui/utils': 5.14.15(@types/react@18.2.20)(react@18.2.0)
+ '@types/react': 18.2.20
+ prop-types: 15.8.1
+ react: 18.2.0
+ dev: false
+
+ /@mui/private-theming@5.14.15(@types/react@18.2.20)(react@18.2.0):
+ resolution: {integrity: sha512-V2Xh+Tu6A07NoSpup0P9m29GwvNMYl5DegsGWqlOTJyAV7cuuVjmVPqxgvL8xBng4R85xqIQJRMjtYYktoPNuQ==}
+ engines: {node: '>=12.0.0'}
+ peerDependencies:
+ '@types/react': ^17.0.0 || ^18.0.0
+ react: ^17.0.0 || ^18.0.0
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+ dependencies:
+ '@babel/runtime': 7.23.2
+ '@mui/utils': 5.14.15(@types/react@18.2.20)(react@18.2.0)
'@types/react': 18.2.20
prop-types: 15.8.1
react: 18.2.0
@@ -5450,6 +5467,28 @@ packages:
react: 18.2.0
dev: false
+ /@mui/styled-engine@5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
+ resolution: {integrity: sha512-mbOjRf867BysNpexe5Z/P8s3bWzDPNowmKhi7gtNDP/LPEeqAfiDSuC4WPTXmtvse1dCl30Nl755OLUYuoi7Mw==}
+ engines: {node: '>=12.0.0'}
+ peerDependencies:
+ '@emotion/react': ^11.4.1
+ '@emotion/styled': ^11.3.0
+ react: ^17.0.0 || ^18.0.0
+ peerDependenciesMeta:
+ '@emotion/react':
+ optional: true
+ '@emotion/styled':
+ optional: true
+ dependencies:
+ '@babel/runtime': 7.23.2
+ '@emotion/cache': 11.11.0
+ '@emotion/react': 11.11.1(@types/react@18.2.20)(react@18.2.0)
+ '@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.2.20)(react@18.2.0)
+ csstype: 3.1.2
+ prop-types: 15.8.1
+ react: 18.2.0
+ dev: false
+
/@mui/styles@5.14.5(@types/react@18.2.20)(react@18.2.0):
resolution: {integrity: sha512-yss4BRGae6ib4gq6YpVLnPyhHiuSIENwlDPWrTEqgc1UhTMmDBGZ7ZCdZ15YGdwviJuNDDf5Bcp3GK4rE5wZNQ==}
engines: {node: '>=12.0.0'}
@@ -5481,8 +5520,8 @@ packages:
react: 18.2.0
dev: false
- /@mui/system@5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.20)(react@18.2.0):
- resolution: {integrity: sha512-+5+Dx50lG4csbx2sGjrKLozXQJeCpJ4dIBZolyFLkZ+XphD1keQWouLUvJkPQ3MSglLLKuD37pp52YjMncZMEQ==}
+ /@mui/system@5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.20)(react@18.2.0):
+ resolution: {integrity: sha512-zr0Gdk1RgKiEk+tCMB900LaOpEC8NaGvxtkmMdL/CXgkqQZSVZOt2PQsxJWaw7kE4YVkIe4VukFVc43qcq9u3w==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@emotion/react': ^11.5.0
@@ -5500,10 +5539,10 @@ packages:
'@babel/runtime': 7.23.2
'@emotion/react': 11.11.1(@types/react@18.2.20)(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.2.20)(react@18.2.0)
- '@mui/private-theming': 5.14.13(@types/react@18.2.20)(react@18.2.0)
- '@mui/styled-engine': 5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
- '@mui/types': 7.2.6(@types/react@18.2.20)
- '@mui/utils': 5.14.13(@types/react@18.2.20)(react@18.2.0)
+ '@mui/private-theming': 5.14.15(@types/react@18.2.20)(react@18.2.0)
+ '@mui/styled-engine': 5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
+ '@mui/types': 7.2.7(@types/react@18.2.20)
+ '@mui/utils': 5.14.15(@types/react@18.2.20)(react@18.2.0)
'@types/react': 18.2.20
clsx: 2.0.0
csstype: 3.1.2
@@ -5563,6 +5602,17 @@ packages:
'@types/react': 18.2.20
dev: false
+ /@mui/types@7.2.7(@types/react@18.2.20):
+ resolution: {integrity: sha512-sofpWmcBqOlTzRbr1cLQuUDKaUYVZTw8ENQrtL39TECRNENEzwgnNPh6WMfqMZlMvf1Aj9DLg74XPjnLr0izUQ==}
+ peerDependencies:
+ '@types/react': ^17.0.0 || ^18.0.0
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+ dependencies:
+ '@types/react': 18.2.20
+ dev: false
+
/@mui/utils@5.14.13(@types/react@18.2.20)(react@18.2.0):
resolution: {integrity: sha512-2AFpyXWw7uDCIqRu7eU2i/EplZtks5LAMzQvIhC79sPV9IhOZU2qwOWVnPtdctRXiQJOAaXulg+A37pfhEueQw==}
engines: {node: '>=12.0.0'}
@@ -5581,6 +5631,24 @@ packages:
react-is: 18.2.0
dev: false
+ /@mui/utils@5.14.15(@types/react@18.2.20)(react@18.2.0):
+ resolution: {integrity: sha512-QBfHovAvTa0J1jXuYDaXGk+Yyp7+Fm8GSqx6nK2JbezGqzCFfirNdop/+bL9Flh/OQ/64PeXcW4HGDdOge+n3A==}
+ engines: {node: '>=12.0.0'}
+ peerDependencies:
+ '@types/react': ^17.0.0 || ^18.0.0
+ react: ^17.0.0 || ^18.0.0
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+ dependencies:
+ '@babel/runtime': 7.23.2
+ '@types/prop-types': 15.7.8
+ '@types/react': 18.2.20
+ prop-types: 15.8.1
+ react: 18.2.0
+ react-is: 18.2.0
+ dev: false
+
/@mui/utils@5.14.5(react@18.2.0):
resolution: {integrity: sha512-6Hzw63VR9C5xYv+CbjndoRLU6Gntal8rJ5W+GUzkyHrGWIyYPWZPa6AevnyGioySNETATe1H9oXS8f/7qgIHJA==}
engines: {node: '>=12.0.0'}
@@ -14903,10 +14971,6 @@ packages:
resolution: {integrity: sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==}
dev: false
- /lodash.property@4.4.2:
- resolution: {integrity: sha512-WVnsHSCea5NFrsWGdZilCFJWhHFtb/nqVrDXzR1bIXmOxIykrsAKOpRaYu9rCYoHYuq1SnG6G4A0inMwShV4dg==}
- dev: false
-
/lodash.set@4.3.2:
resolution: {integrity: sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==}
dev: false
@@ -20948,9 +21012,9 @@ packages:
use-sync-external-store: 1.2.0(react@18.2.0)
dev: false
- github.com/theopensystemslab/planx-core/2b7fa5b(@types/react@18.2.20):
- resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/2b7fa5b}
- id: github.com/theopensystemslab/planx-core/2b7fa5b
+ github.com/theopensystemslab/planx-core/69c797c(@types/react@18.2.20):
+ resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/69c797c}
+ id: github.com/theopensystemslab/planx-core/69c797c
name: '@opensystemslab/planx-core'
version: 1.0.0
prepare: true
@@ -20958,7 +21022,7 @@ packages:
dependencies:
'@emotion/react': 11.11.1(@types/react@18.2.20)(react@18.2.0)
'@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.2.20)(react@18.2.0)
- '@mui/material': 5.14.13(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.20)(react-dom@18.2.0)(react@18.2.0)
+ '@mui/material': 5.14.15(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.2.20)(react-dom@18.2.0)(react@18.2.0)
'@types/geojson': 7946.0.11
ajv: 8.12.0
ajv-formats: 2.1.1(ajv@8.12.0)
@@ -20977,7 +21041,6 @@ packages:
lodash.isnil: 4.0.0
lodash.kebabcase: 4.1.1
lodash.omit: 4.5.0
- lodash.property: 4.4.2
lodash.set: 4.3.2
lodash.startcase: 4.4.0
prettier: 3.0.3
diff --git a/editor.planx.uk/src/@planx/components/Result/Editor.tsx b/editor.planx.uk/src/@planx/components/Result/Editor.tsx
index 3949d16386..d41351f3c6 100644
--- a/editor.planx.uk/src/@planx/components/Result/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Result/Editor.tsx
@@ -14,7 +14,12 @@ import { TYPES } from "../types";
import { ICONS } from "../ui";
import type { Result } from "./model";
-const flags = groupBy(flatFlags, (f) => f.category);
+type FlagWithValue = Flag & { value: NonNullable };
+
+const flagsWithValues = flatFlags.filter((flag): flag is FlagWithValue =>
+ Boolean(flag.value),
+);
+const flags = groupBy(flagsWithValues, (f) => f.category);
interface FormData {
flagSet: FlagSet;
diff --git a/editor.planx.uk/src/pages/FlowEditor/lib/store/preview.ts b/editor.planx.uk/src/pages/FlowEditor/lib/store/preview.ts
index 629982166e..a2a1795d3b 100644
--- a/editor.planx.uk/src/pages/FlowEditor/lib/store/preview.ts
+++ b/editor.planx.uk/src/pages/FlowEditor/lib/store/preview.ts
@@ -102,7 +102,9 @@ export const previewStore: StateCreator<
const possibleFlags = flatFlags.filter(
(f) => f.category === DEFAULT_FLAG_CATEGORY,
);
- const flagKeys: string[] = possibleFlags.map((f) => f.value);
+ const flagKeys: string[] = possibleFlags
+ .map((flag) => flag.value)
+ .filter((value): value is string => Boolean(value));
const breadcrumbIds = Object.keys(breadcrumbs);