Merge branch 'main' of github.com:theopensystemslab/planx-new into je…

…ss/formatted-operations
theopensystemslab · Apr 17, 2024 · 2dd3841 · 2dd3841
2 parents 0a4338f + 8186afc
commit 2dd3841
Show file tree

Hide file tree

Showing 27 changed files with 468 additions and 98 deletions.
diff --git a/api.planx.uk/modules/admin/session/digitalPlanningData.test.ts b/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),
+      );
+  });
 });
diff --git a/api.planx.uk/modules/admin/session/digitalPlanningData.ts b/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) {

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#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",

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#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",

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#7ff62e4",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#15bde6b",
     "axios": "^1.6.8",
     "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/e2e/tests/ui-driven/src/pay.spec.ts b/e2e/tests/ui-driven/src/pay.spec.ts
@@ -225,11 +225,6 @@ test.describe("Gov Pay integration @regression", async () => {
     // retry the payment
     await page.getByText("Retry payment").click();
     await page.getByText("Continue with your payment").click();
-    // Re-enter card details
-    await fillGovUkCardDetails({
-      page,
-      cardNumber: cards.successful_card_number,
-    });
     await submitCardDetails(page);
 
     const { paymentId } = await waitForPaymentResponse(page, context);

diff --git a/editor.planx.uk/package.json b/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",

diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml
diff --git a/editor.planx.uk/src/@planx/components/shared/Preview/SummaryList.tsx b/editor.planx.uk/src/@planx/components/shared/Preview/SummaryList.tsx
@@ -20,63 +20,67 @@ const FIND_PROPERTY_DT = "Property address";
 const DRAW_BOUNDARY_DT = "Location plan";
 
 export const SummaryListTable = styled("dl", {
-  shouldForwardProp: (prop) => prop !== "showChangeButton",
-})<{ showChangeButton?: boolean }>(({ theme, showChangeButton }) => ({
-  display: "grid",
-  gridTemplateColumns: showChangeButton ? "1fr 2fr 100px" : "1fr 2fr",
-  gridRowGap: "10px",
-  marginTop: theme.spacing(2),
-  marginBottom: theme.spacing(4),
-  "& > *": {
-    borderBottom: `1px solid ${theme.palette.border.main}`,
-    paddingBottom: theme.spacing(2),
-    paddingTop: theme.spacing(2),
-    verticalAlign: "top",
-    margin: 0,
-  },
-  "& ul": {
-    listStylePosition: "inside",
-    padding: 0,
-    margin: 0,
-  },
-  "& dt": {
-    // left column
-    fontWeight: FONT_WEIGHT_SEMI_BOLD,
-  },
-  "& dd:nth-of-type(n)": {
-    // middle column
-    paddingLeft: "10px",
-  },
-  "& dd:nth-of-type(2n)": {
-    // right column
-    textAlign: showChangeButton ? "right" : "left",
-  },
-  [theme.breakpoints.down("sm")]: {
-    display: "flex",
-    flexDirection: "column",
+  shouldForwardProp: (prop) =>
+    !["showChangeButton", "dense"].includes(prop as string),
+})<{ showChangeButton?: boolean; dense?: boolean }>(
+  ({ theme, showChangeButton, dense }) => ({
+    display: "grid",
+    gridTemplateColumns: showChangeButton ? "1fr 2fr 100px" : "1fr 2fr",
+    gridRowGap: "10px",
+    marginTop: dense ? theme.spacing(1) : theme.spacing(2),
+    marginBottom: dense ? theme.spacing(2) : theme.spacing(4),
+    fontSize: dense ? theme.typography.body2.fontSize : "inherit",
+    "& > *": {
+      borderBottom: `1px solid ${theme.palette.border.main}`,
+      paddingBottom: dense ? theme.spacing(1) : theme.spacing(2),
+      paddingTop: dense ? theme.spacing(1) : theme.spacing(2),
+      verticalAlign: "top",
+      margin: 0,
+    },
+    "& ul": {
+      listStylePosition: "inside",
+      padding: 0,
+      margin: 0,
+    },
     "& dt": {
-      // top row
-      paddingLeft: theme.spacing(1),
-      paddingTop: theme.spacing(2),
-      marginTop: theme.spacing(1),
-      borderTop: `1px solid ${theme.palette.border.main}`,
-      borderBottom: "none",
+      // left column
       fontWeight: FONT_WEIGHT_SEMI_BOLD,
     },
     "& dd:nth-of-type(n)": {
-      // middle row
-      textAlign: "left",
-      paddingTop: 0,
-      paddingBottom: 0,
-      margin: 0,
-      borderBottom: "none",
+      // middle column
+      paddingLeft: "10px",
     },
     "& dd:nth-of-type(2n)": {
-      // bottom row
-      textAlign: "left",
+      // right column
+      textAlign: showChangeButton ? "right" : "left",
+    },
+    [theme.breakpoints.down("sm")]: {
+      display: "flex",
+      flexDirection: "column",
+      "& dt": {
+        // top row
+        paddingLeft: theme.spacing(1),
+        paddingTop: dense ? theme.spacing(1) : theme.spacing(2),
+        marginTop: theme.spacing(1),
+        borderTop: `1px solid ${theme.palette.border.main}`,
+        borderBottom: "none",
+        fontWeight: FONT_WEIGHT_SEMI_BOLD,
+      },
+      "& dd:nth-of-type(n)": {
+        // middle row
+        textAlign: "left",
+        paddingTop: 0,
+        paddingBottom: 0,
+        margin: 0,
+        borderBottom: "none",
+      },
+      "& dd:nth-of-type(2n)": {
+        // bottom row
+        textAlign: "left",
+      },
     },
-  },
-}));
+  }),
+);
 
 const presentationalComponents: {
   [key in TYPES]: React.FC<ComponentProps> | undefined;

diff --git a/editor.planx.uk/src/@planx/components/shared/PrivateFileUpload/PrivateFileUpload.tsx b/editor.planx.uk/src/@planx/components/shared/PrivateFileUpload/PrivateFileUpload.tsx
@@ -23,6 +23,14 @@ export const PrivateFileUpload: React.FC<PrivateFileUploadProps> = ({
 
   return (
     <>
+      {hasEmptySlots && (
+        <Dropzone
+          slots={slots}
+          setSlots={setSlots}
+          setFileUploadStatus={setFileUploadStatus}
+          maxFiles={maxFiles}
+        />
+      )}
       {slots.map((slot) => {
         return (
           <UploadedFileCard
@@ -38,14 +46,6 @@ export const PrivateFileUpload: React.FC<PrivateFileUploadProps> = ({
         );
       })}
       <FileStatus status={fileUploadStatus} />
-      {hasEmptySlots && (
-        <Dropzone
-          slots={slots}
-          setSlots={setSlots}
-          setFileUploadStatus={setFileUploadStatus}
-          maxFiles={maxFiles}
-        />
-      )}
     </>
   );
 };
diff --git a/editor.planx.uk/src/components/Header.tsx b/editor.planx.uk/src/components/Header.tsx
@@ -554,11 +554,16 @@ const EditorToolbar: React.FC<{
               </MenuItem>
             )}
 
-            {/* Only show global settings link from top-level admin view */}
+            {/* Only show global settings & admin panel links from top-level view */}
             {isGlobalSettingsVisible && (
-              <MenuItem onClick={() => navigate("/global-settings")}>
-                Global Settings
-              </MenuItem>
+              <>
+                <MenuItem onClick={() => navigate("/global-settings")}>
+                  Global Settings
+                </MenuItem>
+                <MenuItem onClick={() => navigate("/admin-panel")}>
+                  Admin Panel
+                </MenuItem>
+              </>
             )}
 
             <MenuItem onClick={() => navigate("/logout")}>Log out</MenuItem>

diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Settings/index.tsx b/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 }) => {

diff --git a/editor.planx.uk/src/pages/FlowEditor/index.tsx b/editor.planx.uk/src/pages/FlowEditor/index.tsx
@@ -117,7 +117,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} />