From 121c41ba6286e5b329af20bf99c0dc61fbc6bdc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dafydd=20Ll=C5=B7r=20Pearson?= Date: Thu, 25 Jan 2024 17:53:14 +0000 Subject: [PATCH] chore: Bump planx-core --- api.planx.uk/modules/send/bops/bops.ts | 20 ++++++-------------- api.planx.uk/package.json | 2 +- api.planx.uk/pnpm-lock.yaml | 8 ++++---- e2e/tests/api-driven/package.json | 2 +- e2e/tests/api-driven/pnpm-lock.yaml | 8 ++++---- e2e/tests/ui-driven/package.json | 2 +- e2e/tests/ui-driven/pnpm-lock.yaml | 8 ++++---- editor.planx.uk/package.json | 2 +- editor.planx.uk/pnpm-lock.yaml | 10 +++++----- 9 files changed, 27 insertions(+), 35 deletions(-) diff --git a/api.planx.uk/modules/send/bops/bops.ts b/api.planx.uk/modules/send/bops/bops.ts index 1dd5006f9e..a89c982065 100644 --- a/api.planx.uk/modules/send/bops/bops.ts +++ b/api.planx.uk/modules/send/bops/bops.ts @@ -46,12 +46,8 @@ const sendToBOPS = async (req: Request, res: Response, next: NextFunction) => { const localAuthority = req.params.localAuthority; const env = process.env.APP_ENVIRONMENT === "production" ? "production" : "staging"; - const bopsSubmissionURL = await $api.team.getBopsSubmissionURL( - localAuthority, - env, - ); - const isSupported = Boolean(bopsSubmissionURL); - if (!isSupported) { + const details = await $api.team.getBopsSubmissionDetails(localAuthority, env); + if (!details?.submissionURL) { return next( new ServerError({ status: 400, @@ -59,7 +55,7 @@ const sendToBOPS = async (req: Request, res: Response, next: NextFunction) => { }), ); } - const target = `${bopsSubmissionURL}/api/v1/planning_applications`; + const target = `${details.submissionURL}/api/v1/planning_applications`; const exportData = await $api.export.bopsPayload(payload?.sessionId); try { @@ -181,12 +177,8 @@ const sendToBOPSV2 = async ( const localAuthority = req.params.localAuthority; const env = process.env.APP_ENVIRONMENT === "production" ? "production" : "staging"; - const bopsSubmissionURL = await $api.team.getBopsSubmissionURL( - localAuthority, - env, - ); - const isSupported = Boolean(bopsSubmissionURL); - if (!isSupported) { + const details = await $api.team.getBopsSubmissionDetails(localAuthority, env); + if (!details?.submissionURL) { return next( new ServerError({ status: 400, @@ -194,7 +186,7 @@ const sendToBOPSV2 = async ( }), ); } - const target = `${bopsSubmissionURL}/api/v2/planning_applications`; + const target = `${details?.submissionURL}/api/v2/planning_applications`; const exportData = await $api.export.digitalPlanningDataPayload( payload?.sessionId, ); diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json index b18cb7196b..5f4373931b 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#80579a0", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#7134e85", "@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 f1b1c73a3a..b5b2770aec 100644 --- a/api.planx.uk/pnpm-lock.yaml +++ b/api.planx.uk/pnpm-lock.yaml @@ -12,8 +12,8 @@ dependencies: specifier: ^2.1.8 version: 2.1.8 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#80579a0 - version: github.com/theopensystemslab/planx-core/80579a0 + specifier: git+https://github.com/theopensystemslab/planx-core#7134e85 + version: github.com/theopensystemslab/planx-core/7134e85 '@types/isomorphic-fetch': specifier: ^0.0.36 version: 0.0.36 @@ -8319,8 +8319,8 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false - github.com/theopensystemslab/planx-core/80579a0: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/80579a0} + github.com/theopensystemslab/planx-core/7134e85: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/7134e85} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json index cbb163571a..a19477e36e 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#80579a0", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#7134e85", "axios": "^1.6.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 7701c23358..9442a5458f 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#80579a0 - version: github.com/theopensystemslab/planx-core/80579a0 + specifier: git+https://github.com/theopensystemslab/planx-core#7134e85 + version: github.com/theopensystemslab/planx-core/7134e85 axios: specifier: ^1.6.0 version: 1.6.5 @@ -2821,8 +2821,8 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false - github.com/theopensystemslab/planx-core/80579a0: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/80579a0} + github.com/theopensystemslab/planx-core/7134e85: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/7134e85} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json index c1414f3b49..5ed4d75026 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#80579a0", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#7134e85", "axios": "^1.6.2", "dotenv": "^16.3.1", "eslint": "^8.56.0", diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml index 388927d7f9..4e86258a00 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#80579a0 - version: github.com/theopensystemslab/planx-core/80579a0 + specifier: git+https://github.com/theopensystemslab/planx-core#7134e85 + version: github.com/theopensystemslab/planx-core/7134e85 axios: specifier: ^1.6.2 version: 1.6.5 @@ -2568,8 +2568,8 @@ packages: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false - github.com/theopensystemslab/planx-core/80579a0: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/80579a0} + github.com/theopensystemslab/planx-core/7134e85: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/7134e85} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json index 847cb396a7..bb2cbc05fe 100644 --- a/editor.planx.uk/package.json +++ b/editor.planx.uk/package.json @@ -14,7 +14,7 @@ "@mui/styles": "^5.15.2", "@mui/utils": "^5.15.2", "@opensystemslab/map": "^0.8.0", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#80579a0", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#7134e85", "@tiptap/core": "^2.0.3", "@tiptap/extension-bold": "^2.0.3", "@tiptap/extension-bubble-menu": "^2.1.13", diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml index 6d62a47bb6..3de15fe79d 100644 --- a/editor.planx.uk/pnpm-lock.yaml +++ b/editor.planx.uk/pnpm-lock.yaml @@ -46,8 +46,8 @@ dependencies: specifier: ^0.8.0 version: 0.8.0 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#80579a0 - version: github.com/theopensystemslab/planx-core/80579a0(@types/react@18.2.45) + specifier: git+https://github.com/theopensystemslab/planx-core#7134e85 + version: github.com/theopensystemslab/planx-core/7134e85(@types/react@18.2.45) '@tiptap/core': specifier: ^2.0.3 version: 2.0.3(@tiptap/pm@2.0.3) @@ -21085,9 +21085,9 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - github.com/theopensystemslab/planx-core/80579a0(@types/react@18.2.45): - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/80579a0} - id: github.com/theopensystemslab/planx-core/80579a0 + github.com/theopensystemslab/planx-core/7134e85(@types/react@18.2.45): + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/7134e85} + id: github.com/theopensystemslab/planx-core/7134e85 name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true