Production deploy

README.md

@@ -114,13 +114,19 @@ Once a deployment is completed, a Slack notification will be sent to the #planx-
 
 ### Troubleshooting
 
+**Diverging branches**
+
 If the commit history of `main` and `production` diverge and `production` contains commit hashes that are NOT on main, try running this command from `production` to reset and then follow the original deploy steps above:
 ```bash
 git reset --hard <most recent commit hash **matching** main> && git push --force
 ```
 
 You'll have to temporarily turn off branch protection rules to make this change, so run it by another dev to confirm.
 
+**Unmet peer dependencies**
+
+Make sure `pnpm` is installed globally at version 8.6.6 `pnpm add -g [email protected]`, otherwise you may hit some unmet peer dependencies issues. 
+
 ## Audits
 
 ### Accessibility

api.planx.uk/modules/webhooks/docs.yaml

@@ -17,26 +17,23 @@ components:
     BopsSubmission:
       type: object
       properties:
-        body:
+        event:
           type: object
           properties:
-            event:
+            data:
               type: object
               properties:
-                data:
+                new:
                   type: object
                   properties:
-                    new:
-                      type: object
-                      properties:
-                        session_id:
-                          type: string
-                        bops_id:
-                          type: string
-                        destination_url:
-                          type: string
+                    session_id:
+                      type: string
+                    bops_id:
+                      type: string
+                    destination_url:
+                      type: string
       required:
-        - body
+        - event
     UniformSubmission:
       type: object
       properties:
@@ -66,53 +63,47 @@ components:
     EmailSubmission:
       type: object
       properties:
-        body:
+        event:
           type: object
           properties:
-            event:
+            data:
               type: object
               properties:
-                data:
+                new:
                   type: object
                   properties:
-                    new:
+                    session_id:
+                      type: string
+                    team_slug:
+                      type: string
+                    request:
                       type: object
                       properties:
-                        session_id:
-                          type: string
-                        team_slug:
-                          type: string
-                        request:
+                        personalisation:
                           type: object
                           properties:
-                            personalisation:
-                              type: object
-                              properties:
-                                serviceName:
-                                  type: string
+                            serviceName:
+                              type: string
       required:
-        - body
+        - event
     S3Submission:
       type: object
       properties:
-        body:
+        event:
           type: object
           properties:
-            event:
+            data:
               type: object
               properties:
-                data:
+                new:
                   type: object
                   properties:
-                    new:
-                      type: object
-                      properties:
-                        session_id:
-                          type: string
-                        team_slug:
-                          type: string
+                    session_id:
+                      type: string
+                    team_slug:
+                      type: string
       required:
-        - body
+        - event
     SendSlackNotification:
       oneOf:
         - $ref: "#/components/schemas/BopsSubmission"
@@ -253,7 +244,7 @@ components:
                 type: string
                 description: A message returned to the client
 paths:
-  /webhooks/hasura/sendSlackNotification:
+  /webhooks/hasura/send-slack-notification:
     post:
       tags: ["webhooks"]
       security:

api.planx.uk/package.json

@@ -5,7 +5,7 @@
   "packageManager": "[email protected]",
   "dependencies": {
     "@airbrake/node": "^2.1.8",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#dd24b0a",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#6b2fd26",
     "@types/isomorphic-fetch": "^0.0.36",
     "adm-zip": "^0.5.10",
     "aws-sdk": "^2.1467.0",

e2e/tests/api-driven/package.json

@@ -7,7 +7,7 @@
   "packageManager": "[email protected]",
   "dependencies": {
     "@cucumber/cucumber": "^9.3.0",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#dd24b0a",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#6b2fd26",
     "axios": "^1.7.2",
     "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#dd24b0a",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#6b2fd26",
     "axios": "^1.7.2",
     "dotenv": "^16.3.1",
     "eslint": "^8.56.0",

editor.planx.uk/package.json

@@ -14,7 +14,7 @@
     "@mui/material": "^5.15.10",
     "@mui/utils": "^5.15.11",
     "@opensystemslab/map": "^0.8.3",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#0336fd4",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#6b2fd26",
     "@tiptap/core": "^2.4.0",
     "@tiptap/extension-bold": "^2.0.3",
     "@tiptap/extension-bubble-menu": "^2.1.13",

editor.planx.uk/public/.well-known/microsoft-identity-association.json

@@ -0,0 +1,7 @@
+{
+  "associatedApplications": [
+    {
+      "applicationId": "4469ee56-9275-47f3-b29d-e0df0991099a"
+    }
+  ]
+}

editor.planx.uk/src/@planx/components/Content/Editor.tsx

@@ -41,6 +41,7 @@ const ContentComponent: React.FC<Props> = (props) => {
           </InputRow>
           <ColorPicker
             inline
+            label="Background colour"
             color={formik.values.color}
             onChange={(color) => {
               formik.setFieldValue("color", color);

editor.planx.uk/src/@planx/components/MapAndLabel/Editor.tsx

@@ -13,6 +13,7 @@ import InputLabel from "ui/public/InputLabel";
 import Input from "ui/shared/Input";
 import InputRow from "ui/shared/InputRow";
 import InputRowItem from "ui/shared/InputRowItem";
+import InputRowLabel from "ui/shared/InputRowLabel";
 
 import BasicRadio from "../shared/Radio/BasicRadio";
 import { EditorProps, ICONS, InternalNotes, MoreInformation } from "../ui";
@@ -78,8 +79,7 @@ function MapAndLabelComponent(props: Props) {
             <InputRow>
               <InputRowItem>
                 <ColorPicker
-                  label="Drawing Colour"
-                  inline={false}
+                  label="Drawing colour"
                   color={formik.values.drawColor}
                   onChange={(color) => {
                     formik.setFieldValue("drawColor", color);

editor.planx.uk/src/@planx/components/Notice/Editor.tsx

@@ -56,6 +56,7 @@ const NoticeEditor: React.FC<NoticeEditorProps> = (props) => {
           </InputRow>
           <ColorPicker
             inline
+            label="Background colour"
             color={props.value.color}
             onChange={(color) => {
               props.onChange({

editor.planx.uk/src/@planx/components/shared/Preview/MapContainer.tsx

@@ -18,6 +18,11 @@ export const MapContainer = styled(Box)<MapContainerProps>(
       // Only increase map size in Published, Preview, and Draft routes
       height:
         size === "large" && environment === "standalone" ? "70vh" : "50vh",
+      // Ensure map is not reduced to an unusable height
+      minHeight: "400px",
+      [theme.breakpoints.up("md")]: {
+        minHeight: "480px",
+      },
     },
   }),
 );