From 571ccf0923a9515097894c29923c56f3efa3ce18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dafydd=20Ll=C5=B7r=20Pearson?= <DafyddLlyr@gmail.com>
Date: Sun, 27 Oct 2024 10:24:00 +0000
Subject: [PATCH 1/2] chore: Turn off `no-empty-function` lint rule in
 Storybook files (#3858)

---
 editor.planx.uk/.eslintrc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/editor.planx.uk/.eslintrc b/editor.planx.uk/.eslintrc
index 54d1d6fbfd..98bfbe6b35 100644
--- a/editor.planx.uk/.eslintrc
+++ b/editor.planx.uk/.eslintrc
@@ -97,6 +97,12 @@
       "extends": [
         "plugin:testing-library/react"
       ]
+    },
+    {
+      "files": [ "*.stories.tsx" ],
+      "rules": {
+        "@typescript-eslint/no-empty-function": "off"
+      }
     }
   ]
 }
\ No newline at end of file

From 5ede8b2cb5151989ecc4b4b498bb754529b5e859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dafydd=20Ll=C5=B7r=20Pearson?= <DafyddLlyr@gmail.com>
Date: Sun, 27 Oct 2024 10:24:14 +0000
Subject: [PATCH 2/2] fix: Flow breadcrumb missing in `Header` component
 (#3857)

---
 editor.planx.uk/src/components/Header.tsx      | 1 -
 editor.planx.uk/src/routes/feedback.tsx        | 1 +
 editor.planx.uk/src/routes/serviceSettings.tsx | 1 +
 editor.planx.uk/src/routes/submissionsLog.tsx  | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/editor.planx.uk/src/components/Header.tsx b/editor.planx.uk/src/components/Header.tsx
index d4c1b46886..2b9e3648b6 100644
--- a/editor.planx.uk/src/components/Header.tsx
+++ b/editor.planx.uk/src/components/Header.tsx
@@ -1,6 +1,5 @@
 import Edit from "@mui/icons-material/Edit";
 import KeyboardArrowDown from "@mui/icons-material/KeyboardArrowDown";
-import MenuOpenIcon from "@mui/icons-material/MenuOpen";
 import OpenInNewIcon from "@mui/icons-material/OpenInNew";
 import OpenInNewOffIcon from "@mui/icons-material/OpenInNewOff";
 import Person from "@mui/icons-material/Person";
diff --git a/editor.planx.uk/src/routes/feedback.tsx b/editor.planx.uk/src/routes/feedback.tsx
index c744505f73..1cd9dd382f 100644
--- a/editor.planx.uk/src/routes/feedback.tsx
+++ b/editor.planx.uk/src/routes/feedback.tsx
@@ -26,6 +26,7 @@ export interface Feedback {
 const feedbackRoutes = compose(
   withData((req) => ({
     mountpath: req.mountpath,
+    flow: req.params.flow.split(",")[0],
   })),
 
   mount({
diff --git a/editor.planx.uk/src/routes/serviceSettings.tsx b/editor.planx.uk/src/routes/serviceSettings.tsx
index ca4a16e8b5..fb8f223999 100644
--- a/editor.planx.uk/src/routes/serviceSettings.tsx
+++ b/editor.planx.uk/src/routes/serviceSettings.tsx
@@ -47,6 +47,7 @@ export const getFlowSettings = async (req: NaviRequest) => {
 const serviceSettingsRoutes = compose(
   withData((req) => ({
     mountpath: req.mountpath,
+    flow: req.params.flow.split(",")[0],
   })),
 
   mount({
diff --git a/editor.planx.uk/src/routes/submissionsLog.tsx b/editor.planx.uk/src/routes/submissionsLog.tsx
index 8d9bd29516..8f379699e0 100644
--- a/editor.planx.uk/src/routes/submissionsLog.tsx
+++ b/editor.planx.uk/src/routes/submissionsLog.tsx
@@ -6,6 +6,7 @@ import { makeTitle } from "./utils";
 const submissionsLogRoutes = compose(
   withData((req) => ({
     mountpath: req.mountpath,
+    flow: req.params.flow.split(",")[0],
   })),
 
   mount({