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/types.ts

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

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/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/Team/components/MembersTable.tsx

@@ -194,17 +194,19 @@ export const MembersTable = ({
               </StyledTableRow>
             ))}
             {showAddMemberButton && (
-              <TableRow>
-                <TableCell colSpan={5}>
-                  <AddButton
-                    onClick={() => {
-                      addUser();
-                    }}
-                  >
-                    Add a new editor
-                  </AddButton>
-                </TableCell>
-              </TableRow>
+              <Permission.IsPlatformAdmin>
+                <TableRow>
+                  <TableCell colSpan={5}>
+                    <AddButton
+                      onClick={() => {
+                        addUser();
+                      }}
+                    >
+                      Add a new editor
+                    </AddButton>
+                  </TableCell>
+                </TableRow>
+              </Permission.IsPlatformAdmin>
             )}
           </TableBody>
         </Table>

editor.planx.uk/src/pages/FlowEditor/components/Team/tests/TeamMembers.addNewEditor.test.tsx

@@ -129,7 +129,7 @@ describe("when a user is not a platform admin", () => {
     useStore.setState({
       teamMembers: mockTeamMembersData,
       user: mockPlainUser,
-      teamSlug: "templates",
+      teamSlug: "trumptonshire",
     });
   });