Production deploy

api.planx.uk/modules/pay/service/inviteToPay/sendConfirmationEmail.test.ts

@@ -70,6 +70,7 @@ describe("sendAgentAndPayeeConfirmationEmail", () => {
         helpOpeningHours: "9-5",
         helpPhone: "123",
         serviceName: "Some Flow",
+        sessionId: "mockSessionId",
       },
     };
     await sendAgentAndPayeeConfirmationEmail("mockSessionId");

api.planx.uk/modules/pay/service/inviteToPay/sendConfirmationEmail.ts

@@ -2,7 +2,10 @@ import { formatRawProjectTypes } from "@opensystemslab/planx-core";
 import { gql } from "graphql-request";
 import { $api } from "../../../../client/index.js";
 import { sendEmail } from "../../../../lib/notify/index.js";
-import type { AgentAndPayeeSubmissionNotifyConfig } from "../../../../types.js";
+import type {
+  AgentAndPayeeSubmissionNotifyConfig,
+  AgentAndPayeeSubmissionNotifyPersonalisation,
+} from "../../../../types.js";
 
 export async function sendAgentAndPayeeConfirmationEmail(sessionId: string) {
   const { personalisation, applicantEmail, payeeEmail, projectTypes } =
@@ -22,16 +25,10 @@ export async function sendAgentAndPayeeConfirmationEmail(sessionId: string) {
 }
 
 type PayeeAndAgentEmailData = {
-  personalisation: {
-    emailReplyToId: string;
-    helpEmail: string;
-    helpOpeningHours: string;
-    helpPhone: string;
-    serviceName: string;
-    payeeName: string;
-    address: string;
-    applicantName: string;
-  };
+  personalisation: Omit<
+    AgentAndPayeeSubmissionNotifyPersonalisation,
+    "projectType"
+  >;
   applicantEmail: string;
   payeeEmail: string;
   projectTypes: string[];
@@ -45,6 +42,7 @@ async function getDataForPayeeAndAgentEmails(
       lowcal_sessions(where: { id: { _eq: $sessionId } }, limit: 1) {
         email
         flow {
+          name
           slug
           team {
             notifyPersonalisation: team_settings {
@@ -109,6 +107,7 @@ async function getDataForPayeeAndAgentEmails(
       payeeName,
       address,
       applicantName,
+      sessionId,
     },
     applicantEmail,
     payeeEmail,

api.planx.uk/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@airbrake/node": "^2.1.8",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#5781880",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#6a83682",
     "@types/isomorphic-fetch": "^0.0.36",
     "adm-zip": "^0.5.10",
     "aws-sdk": "^2.1467.0",

api.planx.uk/types.ts

@@ -137,6 +137,8 @@ export interface AgentAndPayeeSubmissionNotifyPersonalisation
   payeeName: string;
   address: string;
   projectType: string;
+  serviceName: string;
+  sessionId: string;
 }
 
 export interface AgentAndPayeeSubmissionNotifyConfig {

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#5781880",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#6a83682",
     "axios": "^1.7.4",
     "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#5781880",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#6a83682",
     "axios": "^1.7.4",
     "dotenv": "^16.3.1",
     "eslint": "^8.56.0",

e2e/tests/ui-driven/src/refresh-page.spec.ts

@@ -73,6 +73,7 @@ test.describe("Refresh page", () => {
 
     const teamSlugInHeader = page.getByRole("link", {
       name: context.team.slug,
+      exact: true,
     });
     await expect(teamSlugInHeader).toBeVisible();
 

editor.planx.uk/package.json

@@ -15,7 +15,7 @@
     "@mui/material": "^5.15.10",
     "@mui/utils": "^5.15.11",
     "@opensystemslab/map": "1.0.0-alpha.3",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#0ade7fa",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#6a83682",
     "@tiptap/core": "^2.4.0",
     "@tiptap/extension-bold": "^2.0.3",
     "@tiptap/extension-bubble-menu": "^2.1.13",

editor.planx.uk/src/components/EditorNavMenu.tsx

@@ -62,21 +62,6 @@ const MenuTitle = styled(Typography)(({ theme }) => ({
   textAlign: "left",
 })) as typeof Typography;
 
-const TooltipWrap = styled(({ className, ...props }: TooltipProps) => (
-  <Tooltip {...props} arrow placement="right" classes={{ popper: className }} />
-))(() => ({
-  [`& .${tooltipClasses.arrow}`]: {
-    color: "#2c2c2c",
-  },
-  [`& .${tooltipClasses.tooltip}`]: {
-    backgroundColor: "#2c2c2c",
-    left: "-5px",
-    fontSize: "0.8em",
-    borderRadius: 0,
-    fontWeight: FONT_WEIGHT_SEMI_BOLD,
-  },
-}));
-
 const MenuButton = styled(IconButton, {
   shouldForwardProp: (prop) => prop !== "isActive",
 })<{ isActive: boolean }>(({ theme, isActive, disabled }) => ({
@@ -273,7 +258,7 @@ function EditorNavMenu() {
         {visibleRoutes.map(({ title, Icon, route, disabled }) => (
           <MenuItem key={title}>
             {compact ? (
-              <TooltipWrap title={title}>
+              <Tooltip title={title} placement="right">
                 <Box component="span">
                   <MenuButton
                     isActive={isActive(route)}
@@ -284,7 +269,7 @@ function EditorNavMenu() {
                     <Icon />
                   </MenuButton>
                 </Box>
-              </TooltipWrap>
+              </Tooltip>
             ) : (
               <MenuButton
                 isActive={isActive(route)}

editor.planx.uk/src/index.tsx

@@ -33,6 +33,13 @@ if (!window.customElements.get("my-map")) {
   window.customElements.define("my-map", MyMap);
 }
 
+// Refresh window if user hits "Failed to fetch dynamically imported module" due to renamed assets following re-build after deploy
+// Docs: https://vite.dev/guide/build#load-error-handling
+window.addEventListener("vite:preloadError", (event) => {
+  event.preventDefault();
+  window.location.reload();
+});
+
 const hasJWT = (): boolean | void => {
   // This cookie indicates the presence of the secure httpOnly "jwt" cookie
   const authCookie = getCookie("auth");

editor.planx.uk/src/pages/FlowEditor/components/FlowEditor/ToggleTagsButton.tsx

@@ -2,26 +2,9 @@ import LabelIcon from "@mui/icons-material/Label";
 import LabelOffIcon from "@mui/icons-material/LabelOff";
 import Box from "@mui/material/Box";
 import IconButton from "@mui/material/IconButton";
-import { styled } from "@mui/material/styles";
-import Tooltip, { tooltipClasses, TooltipProps } from "@mui/material/Tooltip";
+import Tooltip from "@mui/material/Tooltip";
 import { useStore } from "pages/FlowEditor/lib/store";
 import React from "react";
-import { FONT_WEIGHT_SEMI_BOLD } from "theme";
-
-const TooltipWrap = styled(({ className, ...props }: TooltipProps) => (
-  <Tooltip {...props} arrow placement="right" classes={{ popper: className }} />
-))(() => ({
-  [`& .${tooltipClasses.arrow}`]: {
-    color: "#2c2c2c",
-  },
-  [`& .${tooltipClasses.tooltip}`]: {
-    backgroundColor: "#2c2c2c",
-    left: "-5px",
-    fontSize: "0.8em",
-    borderRadius: 0,
-    fontWeight: FONT_WEIGHT_SEMI_BOLD,
-  },
-}));
 
 export const ToggleTagsButton: React.FC = () => {
   const [showTags, toggleShowTags] = useStore((state) => [
@@ -41,7 +24,7 @@ export const ToggleTagsButton: React.FC = () => {
         background: theme.palette.background.paper,
       })}
     >
-      <TooltipWrap title="Toggle tags">
+      <Tooltip title="Toggle tags" placement="right">
         <IconButton
           aria-label="Toggle tags"
           onClick={toggleShowTags}
@@ -55,7 +38,7 @@ export const ToggleTagsButton: React.FC = () => {
         >
           {showTags ? <LabelIcon /> : <LabelOffIcon />}
         </IconButton>
-      </TooltipWrap>
+      </Tooltip>
     </Box>
   );
 };