From 470df49a4baa9bd0cd78b298baf9327be2b8ffee Mon Sep 17 00:00:00 2001
From: Ian Jones <hello@ianjo.uk>
Date: Fri, 28 Jun 2024 15:17:59 +0100
Subject: [PATCH] feat: Fix editor layouts

---
 .../src/components/EditorNavMenu.tsx          |  4 +-
 .../components/Flow/FeedbackPage.tsx          | 96 +++++++++----------
 .../components/Settings/ServiceSettings.tsx   |  5 +-
 .../components/Settings/Submissions/index.tsx | 29 +++---
 .../src/pages/FlowEditor/index.tsx            |  3 +
 .../src/pages/layout/FlowEditorLayout.tsx     | 14 +--
 editor.planx.uk/src/routes/flow.tsx           |  7 +-
 7 files changed, 70 insertions(+), 88 deletions(-)

diff --git a/editor.planx.uk/src/components/EditorNavMenu.tsx b/editor.planx.uk/src/components/EditorNavMenu.tsx
index 6c110307f7..409d8263d1 100644
--- a/editor.planx.uk/src/components/EditorNavMenu.tsx
+++ b/editor.planx.uk/src/components/EditorNavMenu.tsx
@@ -87,7 +87,7 @@ const flowLayoutRoutes: Route[] = [
 ];
 
 const MENU_WIDTH_COMPACT = "52px";
-const MENU_WIDTH_FULL = "184px";
+const MENU_WIDTH_FULL = "178px";
 
 const Root = styled(Box)<{ compact?: boolean }>(({ theme, compact }) => ({
   width: compact ? MENU_WIDTH_COMPACT : MENU_WIDTH_FULL,
@@ -99,7 +99,7 @@ const Root = styled(Box)<{ compact?: boolean }>(({ theme, compact }) => ({
 const MenuWrap = styled("ul")(({ theme }) => ({
   listStyle: "none",
   margin: 0,
-  padding: theme.spacing(2.5, 0.4, 0, 0.4),
+  padding: theme.spacing(1, 0.4, 0, 0.4),
   position: "sticky",
   top: 0,
 }));
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/FeedbackPage.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/FeedbackPage.tsx
index 04c7307dcf..48c42e4fd0 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Flow/FeedbackPage.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Flow/FeedbackPage.tsx
@@ -155,55 +155,53 @@ export const FeedbackPage: React.FC<Props> = ({ feedback }) => {
 
   return (
     <Container maxWidth="contentWrap">
-      <Box py={4}>
-        <SettingsSection>
-          <Typography variant="h2" component="h3" gutterBottom>
-            Feedback log
-          </Typography>
-          <Typography variant="body1">
-            Feedback from users about this service.
-          </Typography>
-        </SettingsSection>
-        <SettingsSection>
-          {feedback.length === 0 ? (
-            <ErrorSummary
-              format="info"
-              heading="No feedback found for this service"
-              message="If you're looking for feedback from more than six months ago, please contact a PlanX developer"
-            />
-          ) : (
-            <Feed>
-              <Table stickyHeader sx={{ tableLayout: "fixed" }}>
-                <TableHead>
-                  <TableRow
-                    sx={{ "& > *": { borderBottomColor: "black !important" } }}
-                  >
-                    <TableCell sx={{ width: 160 }}>
-                      <strong>Type</strong>
-                    </TableCell>
-                    <TableCell sx={{ width: 100 }}>
-                      <strong>Date</strong>
-                    </TableCell>
-                    <TableCell sx={{ width: 340 }}>
-                      <strong>Comment</strong>
-                    </TableCell>
-                    <TableCell sx={{ width: 60 }}></TableCell>
-                  </TableRow>
-                </TableHead>
-                <TableBody>
-                  {feedback.map((item) => (
-                    <CollapsibleRow
-                      key={item.id}
-                      {...item}
-                      displayFeedbackItems={displayFeedbackItems}
-                    />
-                  ))}
-                </TableBody>
-              </Table>
-            </Feed>
-          )}
-        </SettingsSection>
-      </Box>
+      <SettingsSection>
+        <Typography variant="h2" component="h3" gutterBottom>
+          Feedback log
+        </Typography>
+        <Typography variant="body1">
+          Feedback from users about this service.
+        </Typography>
+      </SettingsSection>
+      <SettingsSection>
+        {feedback.length === 0 ? (
+          <ErrorSummary
+            format="info"
+            heading="No feedback found for this service"
+            message="If you're looking for feedback from more than six months ago, please contact a PlanX developer"
+          />
+        ) : (
+          <Feed>
+            <Table stickyHeader sx={{ tableLayout: "fixed" }}>
+              <TableHead>
+                <TableRow
+                  sx={{ "& > *": { borderBottomColor: "black !important" } }}
+                >
+                  <TableCell sx={{ width: 160 }}>
+                    <strong>Type</strong>
+                  </TableCell>
+                  <TableCell sx={{ width: 100 }}>
+                    <strong>Date</strong>
+                  </TableCell>
+                  <TableCell sx={{ width: 340 }}>
+                    <strong>Comment</strong>
+                  </TableCell>
+                  <TableCell sx={{ width: 60 }}></TableCell>
+                </TableRow>
+              </TableHead>
+              <TableBody>
+                {feedback.map((item) => (
+                  <CollapsibleRow
+                    key={item.id}
+                    {...item}
+                    displayFeedbackItems={displayFeedbackItems}
+                  />
+                ))}
+              </TableBody>
+            </Table>
+          </Feed>
+        )}
+      </SettingsSection>
     </Container>
   );
 };
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings.tsx
index 06abc3430d..0e4ef6f895 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings.tsx
@@ -1,6 +1,7 @@
 import Alert from "@mui/material/Alert";
 import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
+import Container from "@mui/material/Container";
 import FormControlLabel, {
   formControlLabelClasses,
 } from "@mui/material/FormControlLabel";
@@ -143,7 +144,7 @@ const ServiceSettings: React.FC = () => {
   });
 
   return (
-    <Box maxWidth="formWrap" mx="auto">
+    <Container maxWidth="formWrap">
       <Box component="form" onSubmit={elementsForm.handleSubmit} mb={2}>
         <SettingsSection>
           <Typography variant="h2" component="h3" gutterBottom>
@@ -309,7 +310,7 @@ const ServiceSettings: React.FC = () => {
           Service settings updated successfully
         </Alert>
       </Snackbar>
-    </Box>
+    </Container>
   );
 };
 
diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/index.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/index.tsx
index 388d700279..73d1e4c247 100644
--- a/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/index.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/index.tsx
@@ -1,5 +1,4 @@
 import { gql, useQuery } from "@apollo/client";
-import Box from "@mui/material/Box";
 import Container from "@mui/material/Container";
 import Typography from "@mui/material/Typography";
 import React, { useMemo } from "react";
@@ -74,23 +73,17 @@ const Submissions: React.FC = () => {
 
   return (
     <Container maxWidth="contentWrap">
-      <Box>
-        <SettingsSection>
-          <Typography variant="h2" component="h3" gutterBottom>
-            Submissions
-          </Typography>
-          <Typography variant="body1">
-            Feed of payment and submission events for this service
-          </Typography>
-        </SettingsSection>
-        <SettingsSection>
-          <EventsLog
-            submissions={submissions}
-            loading={loading}
-            error={error}
-          />
-        </SettingsSection>
-      </Box>
+      <SettingsSection>
+        <Typography variant="h2" component="h3" gutterBottom>
+          Submissions
+        </Typography>
+        <Typography variant="body1">
+          Feed of payment and submission events for this service
+        </Typography>
+      </SettingsSection>
+      <SettingsSection>
+        <EventsLog submissions={submissions} loading={loading} error={error} />
+      </SettingsSection>
     </Container>
   );
 };
diff --git a/editor.planx.uk/src/pages/FlowEditor/index.tsx b/editor.planx.uk/src/pages/FlowEditor/index.tsx
index 5d3aa6cdfa..5f98b067f9 100644
--- a/editor.planx.uk/src/pages/FlowEditor/index.tsx
+++ b/editor.planx.uk/src/pages/FlowEditor/index.tsx
@@ -3,6 +3,7 @@ import "./floweditor.scss";
 
 import Box from "@mui/material/Box";
 import { styled } from "@mui/material/styles";
+import { HEADER_HEIGHT } from "components/Header";
 import React, { useRef } from "react";
 
 import { rootFlowPath } from "../../routes/utils";
@@ -10,11 +11,13 @@ import Flow from "./components/Flow";
 import Sidebar from "./components/Sidebar";
 import { useStore } from "./lib/store";
 import useScrollControlsAndRememberPosition from "./lib/useScrollControlsAndRememberPosition";
+
 const EditorContainer = styled(Box)(() => ({
   display: "flex",
   alignItems: "stretch",
   overflow: "hidden",
   flexGrow: 1,
+  maxHeight: `calc(100vh - ${HEADER_HEIGHT}px)`,
 }));
 
 const FlowEditor: React.FC<any> = ({ flow, breadcrumbs }) => {
diff --git a/editor.planx.uk/src/pages/layout/FlowEditorLayout.tsx b/editor.planx.uk/src/pages/layout/FlowEditorLayout.tsx
index 72813dbbd9..98a3ee97df 100644
--- a/editor.planx.uk/src/pages/layout/FlowEditorLayout.tsx
+++ b/editor.planx.uk/src/pages/layout/FlowEditorLayout.tsx
@@ -1,22 +1,14 @@
-import Box from "@mui/material/Box";
-import { styled } from "@mui/material/styles";
 import EditorNavMenu, { flowLayoutRoutes } from "components/EditorNavMenu";
 import ErrorFallback from "components/ErrorFallback";
 import React, { PropsWithChildren } from "react";
 import { ErrorBoundary } from "react-error-boundary";
-
-const Root = styled(Box)(() => ({
-  display: "flex",
-  alignItems: "stretch",
-  overflow: "hidden",
-  flexGrow: 1,
-}));
+import Dashboard from "ui/editor/Dashboard";
 
 const FlowEditorLayout: React.FC<PropsWithChildren> = ({ children }) => (
-  <Root>
+  <Dashboard>
     <EditorNavMenu compact routes={flowLayoutRoutes} />
     <ErrorBoundary FallbackComponent={ErrorFallback}>{children}</ErrorBoundary>
-  </Root>
+  </Dashboard>
 );
 
 export default FlowEditorLayout;
diff --git a/editor.planx.uk/src/routes/flow.tsx b/editor.planx.uk/src/routes/flow.tsx
index f6d60051b1..ae657d0443 100644
--- a/editor.planx.uk/src/routes/flow.tsx
+++ b/editor.planx.uk/src/routes/flow.tsx
@@ -1,5 +1,4 @@
 import { gql } from "@apollo/client";
-import Box from "@mui/material/Box";
 import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
 import natsort from "natsort";
 import {
@@ -177,11 +176,7 @@ const nodeRoutes = mount({
   "/:parent/nodes/:id/edit": editNode,
 });
 
-const SettingsContainer = () => (
-  <Box sx={{ width: "100%", px: 4, py: 5, overflowY: "auto" }}>
-    <View />
-  </Box>
-);
+const SettingsContainer = () => <View />;
 
 const routes = compose(
   withData((req) => ({