chore: Bump planx-core

theopensystemslab · Jan 25, 2024 · 121c41b · 121c41b
1 parent 3593095
commit 121c41b
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 35 deletions.
diff --git a/api.planx.uk/modules/send/bops/bops.ts b/api.planx.uk/modules/send/bops/bops.ts
@@ -46,20 +46,16 @@ 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,
         message: `Back-office Planning System (BOPS) is not enabled for this local authority (${localAuthority})`,
       }),
     );
   }
-  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,20 +177,16 @@ 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,
         message: `Back-office Planning System (BOPS) is not enabled for this local authority (${localAuthority})`,
       }),
     );
   }
-  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
@@ -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
diff --git 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
diff --git 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
diff --git 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