Production deploy

api.planx.uk/helpers.test.ts

@@ -38,7 +38,7 @@ describe("getEnvironment function", () => {
 
   test("Development env", () => {
     process.env.NODE_ENV = "development";
-    expect(getFormattedEnvironment()).toBe("Development");
+    expect(getFormattedEnvironment()).toBe("Local");
   });
 });
 

api.planx.uk/helpers.ts

@@ -247,6 +247,10 @@ const getFormattedEnvironment = (): string => {
     const pizzaNumber = new URL(process.env.API_URL_EXT!).href.split(".")[1];
     environment += ` ${pizzaNumber}`;
   }
+  // For readability redefine development as local for slack warnings
+  if (environment === "development") {
+    environment = "local";
+  }
   return capitalize(environment);
 };
 

api.planx.uk/modules/webhooks/service/sanitiseApplicationData/mocks/queries.ts

@@ -67,3 +67,13 @@ export const mockGetExpiredSessionIdsQuery = {
     lowcal_sessions: [{ id: "id1" }, { id: "id2" }, { id: "id3" }],
   },
 };
+
+export const mockDeleteFeedbackMutation = {
+  name: "DeleteFeedback",
+  matchOnVariables: false,
+  data: {
+    feedback: {
+      returning: mockIds,
+    },
+  },
+};

api.planx.uk/modules/webhooks/service/sanitiseApplicationData/operations.test.ts

@@ -9,6 +9,7 @@ import {
   mockSanitiseUniformApplicationsMutation,
   mockGetExpiredSessionIdsQuery,
   mockDeletePaymentRequests,
+  mockDeleteFeedbackMutation,
 } from "./mocks/queries";
 import {
   deleteHasuraEventLogs,
@@ -23,6 +24,7 @@ import {
   deleteApplicationFiles,
   deletePaymentRequests,
   deleteHasuraScheduledEventsForSubmittedSessions,
+  deleteFeedback,
 } from "./operations";
 
 jest.mock("../../../../lib/hasura/schema");
@@ -142,6 +144,10 @@ describe("Data sanitation operations", () => {
         operation: deletePaymentRequests,
         query: mockDeletePaymentRequests,
       },
+      {
+        operation: deleteFeedback,
+        query: mockDeleteFeedbackMutation,
+      },
     ];
 
     for (const { operation, query } of testCases) {

api.planx.uk/modules/webhooks/service/sanitiseApplicationData/operations.ts

@@ -32,6 +32,9 @@ export const getOperations = (): Operation[] => [
 
   // Queued up scheduled events (backup method to PG function/trigger)
   deleteHasuraScheduledEventsForSubmittedSessions,
+
+  // Feedback records
+  deleteFeedback,
 ];
 
 export const operationHandler = async (
@@ -292,3 +295,23 @@ export const deleteHasuraScheduledEventsForSubmittedSessions: Operation =
     const [_column_name, ...ids] = response?.result?.flat() || [];
     return ids;
   };
+
+export const deleteFeedback: Operation = async () => {
+  const mutation = gql`
+    mutation DeleteFeedback($retentionPeriod: timestamptz) {
+      feedback: delete_feedback(
+        where: { created_at: { _lt: $retentionPeriod } }
+      ) {
+        returning {
+          id
+        }
+      }
+    }
+  `;
+  const {
+    feedback: { returning: result },
+  } = await $api.client.request<{ feedback: Result }>(mutation, {
+    retentionPeriod: getRetentionPeriod(),
+  });
+  return result;
+};

editor.planx.uk/src/@planx/components/Confirmation/Public.test.tsx

@@ -3,6 +3,16 @@ import { axe, setup } from "testUtils";
 
 import ConfirmationComponent from "./Public";
 
+jest.mock("@opensystemslab/planx-core", () => {
+  return {
+    CoreDomainClient: jest.fn().mockImplementation(() => ({
+      export: {
+        csvData: () => jest.fn(),
+      },
+    })),
+  };
+});
+
 it("should not have any accessibility violations", async () => {
   const { container } = setup(
     <ConfirmationComponent

editor.planx.uk/src/@planx/components/Confirmation/Public.tsx

@@ -2,16 +2,16 @@ import Check from "@mui/icons-material/Check";
 import Box from "@mui/material/Box";
 import { styled } from "@mui/material/styles";
 import Typography from "@mui/material/Typography";
+import { QuestionAndResponses } from "@opensystemslab/planx-core/types";
 import Card from "@planx/components/shared/Preview/Card";
 import { PublicProps } from "@planx/components/ui";
 import { useStore } from "pages/FlowEditor/lib/store";
-import React from "react";
+import React, { useEffect, useState } from "react";
 import Banner from "ui/public/Banner";
 import FileDownload from "ui/public/FileDownload";
 import NumberedList from "ui/public/NumberedList";
 import ReactMarkdownOrHtml from "ui/shared/ReactMarkdownOrHtml";
 
-import { makeCsvData } from "../Send/uniform";
 import type { Confirmation } from "./model";
 
 const Table = styled("table")(({ theme }) => ({
@@ -31,23 +31,27 @@ const Table = styled("table")(({ theme }) => ({
 export type Props = PublicProps<Confirmation>;
 
 export default function ConfirmationComponent(props: Props) {
-  const [breadcrumbs, flow, passport, sessionId, flowName] = useStore(
-    (state) => [
-      state.breadcrumbs,
-      state.flow,
-      state.computePassport(),
-      state.sessionId,
-      state.flowName,
-    ],
-  );
+  const [data, setData] = useState<QuestionAndResponses[]>([]);
+
+  const [sessionId, saveToEmail, $public] = useStore((state) => [
+    state.sessionId,
+    state.saveToEmail,
+    state.$public,
+  ]);
+
+  useEffect(() => {
+    const makeCsvData = async () => {
+      if (sessionId && saveToEmail) {
+        const csvData = await $public({
+          session: { sessionId: sessionId, email: saveToEmail },
+        }).export.csvData(sessionId);
+        setData(csvData);
+      }
+    };
 
-  // make a CSV data structure based on the payloads we Send to BOPs/Uniform
-  const data = makeCsvData({
-    breadcrumbs,
-    flow,
-    flowName,
-    passport,
-    sessionId,
+    if (data?.length < 1) {
+      makeCsvData();
+    }
   });
 
   return (
@@ -80,14 +84,7 @@ export default function ConfirmationComponent(props: Props) {
           </Table>
         )}
 
-        {
-          <FileDownload
-            data={data}
-            filename={
-              props.details?.["Planning Application Reference"] || "application"
-            }
-          />
-        }
+        {<FileDownload data={data} filename={sessionId || "application"} />}
 
         {props.nextSteps && Boolean(props.nextSteps?.length) && (
           <Box pt={3}>

editor.planx.uk/src/@planx/components/DrawBoundary/Public/Public.test.tsx

@@ -2,7 +2,7 @@ import { Breadcrumbs } from "@opensystemslab/planx-core/types";
 import { PASSPORT_REQUESTED_FILES_KEY } from "@planx/components/FileUploadAndLabel/model";
 import { screen } from "@testing-library/react";
 import axios from "axios";
-import { useStore, vanillaStore } from "pages/FlowEditor/lib/store";
+import { vanillaStore } from "pages/FlowEditor/lib/store";
 import React from "react";
 import { act } from "react-dom/test-utils";
 import { axe, setup } from "testUtils";
@@ -341,9 +341,7 @@ test("appends to existing '_requestedFiles' value", async () => {
   );
 
   // Check current passport setup
-  const passport = getState().computePassport();
-  const existingRequestedFiles = passport.data?.[PASSPORT_REQUESTED_FILES_KEY];
-  expect(existingRequestedFiles).toBeDefined();
+  const existingRequestedFiles = getState().requestedFiles();
   expect(existingRequestedFiles).toMatchObject({
     required: ["floorPlan", "utilityBill"],
     recommended: ["elevations.existing"],

editor.planx.uk/src/@planx/components/DrawBoundary/Public/index.tsx

@@ -137,9 +137,9 @@ export default function Component(props: Props) {
             DrawBoundaryUserAction.Upload;
 
           // Track as requested file
-          const { required, recommended, optional } = passport.data?.[
-            PASSPORT_REQUESTED_FILES_KEY
-          ] || { required: [], recommended: [], optional: [] };
+          const { required, recommended, optional } = useStore
+            .getState()
+            .requestedFiles();
 
           newPassportData[PASSPORT_REQUESTED_FILES_KEY] = {
             required: [...required, PASSPORT_UPLOAD_KEY],

editor.planx.uk/src/@planx/components/FileUpload/Public.tsx

@@ -69,17 +69,9 @@ const FileUpload: React.FC<Props> = (props) => {
     );
 
   const updatedRequestedFiles = () => {
-    // const { required, recommended, optional } = useStore
-    //   .getState()
-    //   .requestedFiles();
-
     const { required, recommended, optional } = useStore
       .getState()
-      .computePassport().data?.[PASSPORT_REQUESTED_FILES_KEY] || {
-      required: [],
-      recommended: [],
-      optional: [],
-    };
+      .requestedFiles();
 
     return {
       [PASSPORT_REQUESTED_FILES_KEY]: {

editor.planx.uk/src/@planx/components/FileUploadAndLabel/model.ts

@@ -234,17 +234,9 @@ const hasSlots = (userFile: UserFile): userFile is UserFileWithSlots =>
   Boolean(userFile?.slots);
 
 const getUpdatedRequestedFiles = (fileList: FileList) => {
-  // const { required, recommended, optional } = useStore
-  //   .getState()
-  //   .requestedFiles();
-
   const { required, recommended, optional } = useStore
     .getState()
-    .computePassport().data?.[PASSPORT_REQUESTED_FILES_KEY] || {
-    required: [],
-    recommended: [],
-    optional: [],
-  };
+    .requestedFiles();
 
   return {
     [PASSPORT_REQUESTED_FILES_KEY]: {