Production deploy

api.planx.uk/modules/admin/session/digitalPlanningData.test.ts

@@ -66,4 +66,15 @@ describe("Digital Planning Application payload admin endpoint", () => {
         expect(res.body).toEqual(expectedPlanningPermissionPayload),
       );
   });
+
+  it("returns an invalid JSON payload if the skipValidation query param is set", async () => {
+    await supertest(app)
+      .get(endpoint`123`.concat("?skipValidation=true"))
+      .set(authHeader({ role: "platformAdmin" }))
+      .expect(200)
+      .expect("content-type", "application/json; charset=utf-8")
+      .then((res) =>
+        expect(res.body).toEqual(expectedPlanningPermissionPayload),
+      );
+  });
 });

api.planx.uk/modules/admin/session/digitalPlanningData.ts

@@ -11,6 +11,11 @@ import { $api } from "../../../client";
  *      - admin
  *    parameters:
  *      - $ref: '#/components/parameters/sessionId'
+ *      - in: query
+ *        name: skipValidation
+ *        type: boolean
+ *        required: false
+ *        description: If invalid JSON data should still be returned, instead of logging validation errors
  *    security:
  *      - bearerAuth: []
  */
@@ -20,9 +25,17 @@ export const getDigitalPlanningApplicationPayload = async (
   next: NextFunction,
 ) => {
   try {
+    let skipValidation = false;
+    if (req.query?.skipValidation) {
+      skipValidation =
+        (req.query.skipValidation as string).toLowerCase() === "true";
+    }
+
     const data = await $api.export.digitalPlanningDataPayload(
       req.params.sessionId,
+      skipValidation,
     );
+
     res.set("content-type", "application/json");
     return res.send(data);
   } catch (error) {

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#7ff62e4",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#15bde6b",
     "@types/isomorphic-fetch": "^0.0.36",
     "adm-zip": "^0.5.10",
     "aws-sdk": "^2.1467.0",

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#7ff62e4",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#15bde6b",
     "axios": "^1.6.8",
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",

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#7ff62e4",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#15bde6b",
     "axios": "^1.6.8",
     "dotenv": "^16.3.1",
     "eslint": "^8.56.0",

editor.planx.uk/package.json

@@ -12,7 +12,7 @@
     "@mui/material": "^5.15.2",
     "@mui/utils": "^5.15.2",
     "@opensystemslab/map": "^0.8.1",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#7ff62e4",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#15bde6b",
     "@tiptap/core": "^2.0.3",
     "@tiptap/extension-bold": "^2.0.3",
     "@tiptap/extension-bubble-menu": "^2.1.13",

editor.planx.uk/src/pages/FlowEditor/components/Settings/index.tsx

@@ -105,6 +105,7 @@ const Root = styled(Box)(({ theme }) => ({
     backgroundColor: "#f2f2f2",
     zIndex: 0,
   },
+  zIndex: theme.zIndex.appBar,
 }));
 
 const Settings: React.FC<SettingsProps> = ({ currentTab, tabs }) => {

editor.planx.uk/src/pages/FlowEditor/index.tsx

@@ -99,7 +99,14 @@ const FlowEditor: React.FC<any> = ({ flow, breadcrumbs }) => {
 
   return (
     <Box id="editor-container">
-      <Box sx={{ display: "flex", flexDirection: "column", width: "100%" }}>
+      <Box
+        sx={{
+          display: "flex",
+          flexDirection: "column",
+          width: "100%",
+          overflowX: "auto",
+        }}
+      >
         <LastEdited />
         <Box id="editor" ref={scrollContainerRef} sx={{ position: "relative" }}>
           <Flow flow={flow} breadcrumbs={breadcrumbs} />

scripts/encrypt/decrypt.ts

@@ -0,0 +1,33 @@
+import { decrypt } from "@opensystemslab/planx-core";
+
+/**
+ * Decrypt a secret
+ * Currently used to read secure secrets from the team_integrations table back to plain text
+ * e.g using API keys in another context, checking values
+ *
+ * @param encryptionKey - The encryption key - a 32-byte string
+ * @param secret - The encrypted secret and initialization vector in the format ${secret}:${iv}
+ * @returns The decrypted secret
+ * @example pnpm decrypt <encryptionKey> <secret>
+ */
+function main() {
+  try {
+    if (process.argv.length < 4) {
+      console.error("Usage: pnpm decrypt <encryptionKey> <secret>");
+      process.exit(1);
+    }
+
+    const encryptionKey = process.argv[2];
+    const secret = process.argv[3];
+    const decrypted = decrypt(secret, encryptionKey);
+
+    console.log("Success!");
+    console.log(decrypted);
+  } catch (error) {
+    console.log("Error!");
+    console.error(error);
+    process.exit(1);
+  }
+}
+
+main();

scripts/encrypt/index.ts → scripts/encrypt/encrypt.ts

@@ -5,20 +5,20 @@ import { encrypt } from "@opensystemslab/planx-core";
  * Currently used to generate secure secrets for the team_integrations table
  * e.g converting plain text 3rd-part API keys (such as BOPS tokens) to encrypted strings
  *
- * @param secret - The secret to be encrypted.
  * @param encryptionKey - The encryption key - a 32-byte string
+ * @param secret - The secret to be encrypted.
  * @returns The encrypted secret and initialization vector in the format ${secret}:${iv}
- * @example pnpm encode <secret> <encryptionKey> 
+ * @example pnpm encrypt <encryptionKey> <secret>
  */
 function main() {
   try {
     if (process.argv.length < 4) {
-      console.error("Usage: pnpm encode <secret> <encryptionKey>");
+      console.error("Usage: pnpm encrypt <encryptionKey> <secret>");
       process.exit(1);
     }
 
-    const secret = process.argv[2];
-    const encryptionKey = process.argv[3];
+    const encryptionKey = process.argv[2];
+    const secret = process.argv[3];
     const encrypted = encrypt(secret, encryptionKey);
 
     console.log("Success!");

scripts/encrypt/package.json

@@ -4,7 +4,8 @@
   "description": "",
   "main": "index.ts",
   "scripts": {
-    "encrypt": "ts-node index.ts"
+    "encrypt": "ts-node encrypt.ts",
+    "decrypt": "ts-node decrypt.ts"
   },
   "keywords": [],
   "dependencies": {