From 423015f2efb7cd869fc70f67a8e1288285fd9782 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Wed, 28 Jun 2023 10:48:11 -0700
Subject: [PATCH 01/77] chore: create and use attachmentDeleteRouter

---
 app/server/index.ts                           |  3 ++
 .../middleware/attachmentDeleteRouter.ts      | 42 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 app/server/middleware/attachmentDeleteRouter.ts

diff --git a/app/server/index.ts b/app/server/index.ts
index c6eeee1e46..7d3d1a929f 100644
--- a/app/server/index.ts
+++ b/app/server/index.ts
@@ -18,6 +18,7 @@ import ssoMiddleware from "./middleware/sso";
 import graphqlUploadExpress from "graphql-upload/graphqlUploadExpress.js";
 import config from "../config";
 import attachmentDownloadRouter from "./middleware/attachmentDownloadRouter";
+import { attachmentDeleteRouter } from "/home/briannacerkiewicz/cas-cif/app/server/middleware/attachmentDeleteRouter";
 
 const port = config.get("port");
 const dev = config.get("env") !== "production";
@@ -61,6 +62,8 @@ app.prepare().then(async () => {
   server.use(graphqlUploadExpress());
   server.use(attachmentDownloadRouter);
 
+  server.use(attachmentDeleteRouter);
+
   server.get("*", async (req, res) => {
     return handle(req, res);
   });
diff --git a/app/server/middleware/attachmentDeleteRouter.ts b/app/server/middleware/attachmentDeleteRouter.ts
new file mode 100644
index 0000000000..f316610f7f
--- /dev/null
+++ b/app/server/middleware/attachmentDeleteRouter.ts
@@ -0,0 +1,42 @@
+import { Router } from "express";
+import { performQuery } from "./graphql";
+import { Storage } from "@google-cloud/storage";
+import config from "../../config";
+
+export const attachmentDeleteRouter = Router();
+
+const attachmentDetailsQuery = `query AttachmentDetailsQuery($attachmentId: ID!){
+  attachment(id: $attachmentId) {
+    file
+  }
+}`;
+
+export const handleDelete = async (req, res, next) => {
+  try {
+    const attachmentQueryVariables = {
+      attachmentId: req.params.attachmentId,
+    };
+
+    const result = await performQuery(
+      attachmentDetailsQuery,
+      attachmentQueryVariables,
+      req
+    );
+
+    const {
+      data: {
+        attachment: { file },
+      },
+    } = result;
+
+    const storageClient = new Storage();
+    const bucketName = config.get("attachmentsBucket");
+
+    const response = await storageClient.bucket(bucketName).file(file).delete();
+    return res.sendStatus(response[0].statusCode);
+  } catch (error) {
+    next(error);
+  }
+};
+
+attachmentDeleteRouter.get("/delete/:attachmentId", handleDelete);

From bb785d0d5a5baf950f79228905b18aef27016080 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Wed, 28 Jun 2023 10:52:03 -0700
Subject: [PATCH 02/77] test: jest test attachmentDeleteRouter

---
 .../attachmentDeleteRouter.test.tsx           | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 app/tests/unit/server/middleware/attachmentDeleteRouter.test.tsx

diff --git a/app/tests/unit/server/middleware/attachmentDeleteRouter.test.tsx b/app/tests/unit/server/middleware/attachmentDeleteRouter.test.tsx
new file mode 100644
index 0000000000..47edf8378d
--- /dev/null
+++ b/app/tests/unit/server/middleware/attachmentDeleteRouter.test.tsx
@@ -0,0 +1,36 @@
+/**
+ * @jest-environment node
+ */
+
+import {
+  attachmentDeleteRouter,
+  handleDelete,
+} from "server/middleware/attachmentDeleteRouter";
+
+describe("The attachment delete router", () => {
+  beforeEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it("is configured with the right route and handler", () => {
+    const routerUnderTest = attachmentDeleteRouter;
+
+    expect(routerUnderTest.stack).toHaveLength(1);
+    expect(routerUnderTest.stack[0].route.path).toBe("/delete/:attachmentId");
+    expect(attachmentDeleteRouter.stack[0].route.stack[0].handle).toBe(
+      handleDelete
+    );
+  });
+
+  it("calls next() with the error if an exception is thrown", async () => {
+    const error = new TypeError(
+      "Cannot read properties of undefined (reading 'attachmentId')"
+    );
+    const next = jest.fn();
+    const handlerUnderTest = handleDelete;
+
+    handlerUnderTest({ garbage: "i will cause an error" }, {}, next);
+
+    expect(next).toHaveBeenCalledWith(error);
+  });
+});

From dec1096ce9d4b1a3e15a9cdaa653c8c3c24f2e49 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Wed, 28 Jun 2023 13:51:33 -0700
Subject: [PATCH 03/77] chore: create delete page route

---
 app/routes/pageRoutes.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/routes/pageRoutes.ts b/app/routes/pageRoutes.ts
index ba1dfd6410..3387bc8497 100644
--- a/app/routes/pageRoutes.ts
+++ b/app/routes/pageRoutes.ts
@@ -149,6 +149,10 @@ export const getAttachmentDownloadRoute = (attachmentId: string) => ({
   pathname: `/download/${attachmentId}`,
 });
 
+export const getAttachmentDeleteRoute = (attachmentId: string) => ({
+  pathname: `/delete/${attachmentId}`,
+});
+
 //// External User
 
 export const getExternalUserLandingPageRoute = () => ({

From f8070c3352cff78a9a61500e845745d2ec1d3066 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Wed, 28 Jun 2023 13:52:07 -0700
Subject: [PATCH 04/77] feat: hard delete attachments from GCS

---
 .../Attachment/AttachmentTableRow.tsx         | 35 +++++---
 .../Form/ProjectAttachmentsForm.tsx           |  4 +-
 .../[projectRevision]/index.tsx               | 85 ++++++++++++++-----
 .../middleware/attachmentDeleteRouter.ts      |  2 +-
 4 files changed, 93 insertions(+), 33 deletions(-)

diff --git a/app/components/Attachment/AttachmentTableRow.tsx b/app/components/Attachment/AttachmentTableRow.tsx
index 94ad3cc2c6..7a1e02d78d 100644
--- a/app/components/Attachment/AttachmentTableRow.tsx
+++ b/app/components/Attachment/AttachmentTableRow.tsx
@@ -1,6 +1,9 @@
 import { Button } from "@button-inc/bcgov-theme";
 import Link from "next/link";
-import { getAttachmentDownloadRoute } from "routes/pageRoutes";
+import {
+  getAttachmentDeleteRoute,
+  getAttachmentDownloadRoute,
+} from "routes/pageRoutes";
 import { graphql, useFragment } from "react-relay";
 import useDiscardProjectAttachmentFormChange from "mutations/attachment/discardProjectAttachmentFormChange";
 import { AttachmentTableRow_attachment$key } from "__generated__/AttachmentTableRow_attachment.graphql";
@@ -10,6 +13,7 @@ interface Props {
   connectionId: string;
   formChangeRowId: number;
   hideDelete?: boolean;
+  isFirstRevision: boolean;
 }
 
 const AttachmentTableRow: React.FC<Props> = ({
@@ -17,6 +21,7 @@ const AttachmentTableRow: React.FC<Props> = ({
   connectionId,
   formChangeRowId,
   hideDelete,
+  isFirstRevision,
 }) => {
   const [
     discardProjectAttachmentFormChange,
@@ -45,15 +50,25 @@ const AttachmentTableRow: React.FC<Props> = ({
     attachment
   );
 
-  const handleArchiveAttachment = () => {
-    discardProjectAttachmentFormChange({
-      variables: {
-        input: {
-          formChangeId: formChangeRowId,
+  const handleArchiveAttachment = (attachmentId) => {
+    const deleteFromApp = () =>
+      discardProjectAttachmentFormChange({
+        variables: {
+          input: {
+            formChangeId: formChangeRowId,
+          },
+          connections: [connectionId],
         },
-        connections: [connectionId],
-      },
-    });
+      });
+
+    if (isFirstRevision) {
+      // delete from cloud storage
+      fetch(getAttachmentDeleteRoute(attachmentId).pathname).then(() => {
+        return deleteFromApp();
+      });
+    } else {
+      deleteFromApp();
+    }
   };
 
   return (
@@ -70,7 +85,7 @@ const AttachmentTableRow: React.FC<Props> = ({
           </Link>
           {!hideDelete && (
             <Button
-              onClick={handleArchiveAttachment}
+              onClick={() => handleArchiveAttachment(id)}
               disabled={isDiscardingProjectAttachmentFormChange}
               size="small"
             >
diff --git a/app/components/Form/ProjectAttachmentsForm.tsx b/app/components/Form/ProjectAttachmentsForm.tsx
index 99cb3da789..81b8c4c7c4 100644
--- a/app/components/Form/ProjectAttachmentsForm.tsx
+++ b/app/components/Form/ProjectAttachmentsForm.tsx
@@ -28,10 +28,11 @@ const ProjectAttachmentsForm: React.FC<Props> = ({
   projectRevision,
   onSubmit,
 }) => {
-  const { rowId, projectAttachmentFormChanges } = useFragment(
+  const { rowId, projectAttachmentFormChanges, isFirstRevision } = useFragment(
     graphql`
       fragment ProjectAttachmentsForm_projectRevision on ProjectRevision {
         rowId
+        isFirstRevision
         projectAttachmentFormChanges: formChangesFor(
           first: 500
           formDataTableName: "project_attachment"
@@ -149,6 +150,7 @@ const ProjectAttachmentsForm: React.FC<Props> = ({
             attachment={node.asProjectAttachment.attachmentByAttachmentId}
             formChangeRowId={node.rowId}
             connectionId={projectAttachmentFormChanges.__id}
+            isFirstRevision={isFirstRevision}
           />
         ))}
       </Table>
diff --git a/app/pages/cif/project-revision/[projectRevision]/index.tsx b/app/pages/cif/project-revision/[projectRevision]/index.tsx
index b617ca0d80..b27edea344 100644
--- a/app/pages/cif/project-revision/[projectRevision]/index.tsx
+++ b/app/pages/cif/project-revision/[projectRevision]/index.tsx
@@ -14,7 +14,7 @@ import { useDeleteProjectRevisionMutation } from "mutations/ProjectRevision/dele
 import SavingIndicator from "components/Form/SavingIndicator";
 import { faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-
+import { getAttachmentDeleteRoute } from "routes/pageRoutes";
 import {
   getProjectsPageRoute,
   getProjectRevisionFormPageRoute,
@@ -33,6 +33,7 @@ import ProjectSummaryReportFormSummary from "components/Form/ProjectSummaryRepor
 import DangerAlert from "lib/theme/ConfirmationAlert";
 import { useCommitProjectRevision } from "mutations/ProjectRevision/useCommitProjectRevision";
 import ProjectAttachmentsFormSummary from "components/Form/ProjectAttachmentsFormSummary";
+import next from "next";
 
 const pageQuery = graphql`
   query ProjectRevisionQuery($projectRevision: ID!) {
@@ -72,6 +73,23 @@ const pageQuery = graphql`
             }
           }
         }
+        projectAttachmentFormChanges: formChangesFor(
+          first: 500
+          formDataTableName: "project_attachment"
+          filter: { operation: { notEqualTo: ARCHIVE } }
+        ) @connection(key: "connection_projectAttachmentFormChanges") {
+          totalCount
+          edges {
+            node {
+              id
+              asProjectAttachment {
+                attachmentByAttachmentId {
+                  id
+                }
+              }
+            }
+          }
+        }
         formChangesByProjectRevisionId {
           edges {
             node {
@@ -164,27 +182,52 @@ export function ProjectRevision({
   };
 
   const discardRevision = async () => {
-    await discardProjectRevision({
-      variables: {
-        input: {
-          revisionId: query.projectRevision.rowId,
+    const deleteFromApp = () =>
+      discardProjectRevision({
+        variables: {
+          input: {
+            revisionId: query.projectRevision.rowId,
+          },
         },
-      },
-      onCompleted: async () => {
-        if (query.projectRevision.isFirstRevision)
-          await router.push(getProjectsPageRoute());
-        else
-          await router.push(
-            getProjectRevisionPageRoute(
-              query.projectRevision.projectByProjectId
-                .latestCommittedProjectRevision.id
-            )
-          );
-      },
-      onError: async (e) => {
-        console.error("Error discarding the project", e);
-      },
-    });
+        onCompleted: async () => {
+          if (query.projectRevision.isFirstRevision)
+            await router.push(getProjectsPageRoute());
+          else
+            await router.push(
+              getProjectRevisionPageRoute(
+                query.projectRevision.projectByProjectId
+                  .latestCommittedProjectRevision.id
+              )
+            );
+        },
+        onError: async (e) => {
+          console.error("Error discarding the project", e);
+        },
+      });
+    // attachments should only be hard deleted if it's the first revision
+    if (
+      query.projectRevision.projectAttachmentFormChanges.totalCount === 0 ||
+      (!query.projectRevision.isFirstRevision &&
+        query.projectRevision.projectAttachmentFormChanges.totalCount > 0)
+    ) {
+      deleteFromApp();
+    } else {
+      await Promise.all(
+        query.projectRevision.projectAttachmentFormChanges.edges.map(
+          async ({ node }) => {
+            try {
+              fetch(
+                getAttachmentDeleteRoute(
+                  node.asProjectAttachment.attachmentByAttachmentId.id
+                ).pathname
+              );
+            } catch (err) {
+              next(err);
+            }
+          }
+        )
+      ).then(() => deleteFromApp());
+    }
   };
 
   let mode: TaskListMode;
diff --git a/app/server/middleware/attachmentDeleteRouter.ts b/app/server/middleware/attachmentDeleteRouter.ts
index f316610f7f..ebd09b824c 100644
--- a/app/server/middleware/attachmentDeleteRouter.ts
+++ b/app/server/middleware/attachmentDeleteRouter.ts
@@ -16,7 +16,6 @@ export const handleDelete = async (req, res, next) => {
     const attachmentQueryVariables = {
       attachmentId: req.params.attachmentId,
     };
-
     const result = await performQuery(
       attachmentDetailsQuery,
       attachmentQueryVariables,
@@ -33,6 +32,7 @@ export const handleDelete = async (req, res, next) => {
     const bucketName = config.get("attachmentsBucket");
 
     const response = await storageClient.bucket(bucketName).file(file).delete();
+
     return res.sendStatus(response[0].statusCode);
   } catch (error) {
     next(error);

From e1e4dd37d6792663844ca940b074b2ff7d73b3b9 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Wed, 28 Jun 2023 14:35:17 -0700
Subject: [PATCH 05/77] test: add file upload to cypress test

---
 app/cypress/e2e/cif/fixtures/mock.pdf           | Bin 0 -> 12700 bytes
 .../create-first-project-revision.cy.js         |  13 ++++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 app/cypress/e2e/cif/fixtures/mock.pdf

diff --git a/app/cypress/e2e/cif/fixtures/mock.pdf b/app/cypress/e2e/cif/fixtures/mock.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..8a0b6a4f583b72ffa82eeda195bc1df5140e643e
GIT binary patch
literal 12700
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
SDQ4W<PggN0#T3L*k^T?%!{PS;

literal 0
HcmV?d00001

diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index b8bbeb0591..aaaaba3795 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -167,9 +167,12 @@ describe("when creating a project, the project page", () => {
     cy.findByText(/Submit Annual Reports/i).click();
 
     // Add attachments
+
     cy.url().should("include", "/form/8");
-    cy.findByText(/Submit project attachments/i).click();
+    cy.get("input[type=file]").selectFile("cypress/e2e/cif/fixtures/mock.pdf");
+    cy.findByText("mock.pdf").should("be.visible");
 
+    cy.findByText(/Submit project attachments/i).click();
     //review and submit
     cy.contains("Review and Submit Project");
 
@@ -288,6 +291,14 @@ describe("when creating a project, the project page", () => {
     cy.findByText("TEST-123-12345").should("be.visible");
     // this checks that the project view list shows the milestone report status vs. the other report statuses
     cy.findAllByRole("status").should("have.text", "Complete");
+
+    // cleanup attachments
+
+    cy.request({
+      method: "GET",
+      url: "http://localhost:3004/delete/WyJhdHRhY2htZW50cyIsMV0=",
+      failOnStatusCode: false,
+    });
   });
 
   it("allows an admin user to create an IA project", () => {

From 27f8a4462c250ac82666f58d6391ccef443c6451 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 6 Jul 2023 14:03:35 -0700
Subject: [PATCH 06/77] feat: hard delete attachments from GCS

---
 app/components/Form/ProjectAttachmentsFormSummary.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/components/Form/ProjectAttachmentsFormSummary.tsx b/app/components/Form/ProjectAttachmentsFormSummary.tsx
index dbde74e8f5..76a788b9c1 100644
--- a/app/components/Form/ProjectAttachmentsFormSummary.tsx
+++ b/app/components/Form/ProjectAttachmentsFormSummary.tsx
@@ -100,6 +100,7 @@ const ProjectAttachmentsFormSummary: React.FC<Props> = ({
                 formChangeRowId={node.rowId}
                 connectionId={revision.summaryProjectAttachmentFormChanges.__id}
                 hideDelete={true}
+                isFirstRevision={revision.isFirstRevision}
               />
             )
           )}

From be0fb2aa820c252747ff96ecf92a1427c3159812 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 6 Jul 2023 14:24:03 -0700
Subject: [PATCH 07/77] chore: create and use attachmentDeleteRouter

---
 app/server/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/server/index.ts b/app/server/index.ts
index 7d3d1a929f..e978667dff 100644
--- a/app/server/index.ts
+++ b/app/server/index.ts
@@ -18,7 +18,7 @@ import ssoMiddleware from "./middleware/sso";
 import graphqlUploadExpress from "graphql-upload/graphqlUploadExpress.js";
 import config from "../config";
 import attachmentDownloadRouter from "./middleware/attachmentDownloadRouter";
-import { attachmentDeleteRouter } from "/home/briannacerkiewicz/cas-cif/app/server/middleware/attachmentDeleteRouter";
+import { attachmentDeleteRouter } from "./middleware/attachmentDeleteRouter";
 
 const port = config.get("port");
 const dev = config.get("env") !== "production";

From 5dff0e4503cd7141d8d0e8e07f3c6a44a39c77f4 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 6 Jul 2023 14:41:28 -0700
Subject: [PATCH 08/77] test: add file upload to cypress test

---
 .../create-first-project-revision.cy.js             |   2 +-
 .../e2e/cif/fixtures => schema/data/e2e}/mock.pdf   | Bin
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {app/cypress/e2e/cif/fixtures => schema/data/e2e}/mock.pdf (100%)

diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index aaaaba3795..2bce4252e0 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -169,7 +169,7 @@ describe("when creating a project, the project page", () => {
     // Add attachments
 
     cy.url().should("include", "/form/8");
-    cy.get("input[type=file]").selectFile("cypress/e2e/cif/fixtures/mock.pdf");
+    cy.get("input[type=file]").selectFile(cy.fixture("e2e/mock.pdf"));
     cy.findByText("mock.pdf").should("be.visible");
 
     cy.findByText(/Submit project attachments/i).click();
diff --git a/app/cypress/e2e/cif/fixtures/mock.pdf b/schema/data/e2e/mock.pdf
similarity index 100%
rename from app/cypress/e2e/cif/fixtures/mock.pdf
rename to schema/data/e2e/mock.pdf

From a63612f438031d6e8cf469f7ffdbef35d630d10b Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 6 Jul 2023 15:52:24 -0700
Subject: [PATCH 09/77] spec work

---
 .../Attachment/AttachmentTableRow.tsx         | 28 +++++++----
 .../[projectRevision]/index.tsx               |  2 +-
 .../middleware/attachmentDeleteRouter.ts      | 48 +++++++++++++++++--
 .../middleware/attachmentDownloadRouter.ts    |  4 +-
 4 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/app/components/Attachment/AttachmentTableRow.tsx b/app/components/Attachment/AttachmentTableRow.tsx
index 7a1e02d78d..7ee360b47c 100644
--- a/app/components/Attachment/AttachmentTableRow.tsx
+++ b/app/components/Attachment/AttachmentTableRow.tsx
@@ -51,7 +51,25 @@ const AttachmentTableRow: React.FC<Props> = ({
   );
 
   const handleArchiveAttachment = (attachmentId) => {
-    const deleteFromApp = () =>
+    // safer to delete from our app and then delete from GCS, then if breaks in the middle we don't have weird data, just storing extra stuff
+    // best to do it as middleware so it's one request, if it fails the whole thing fails
+    // have the server call the graphql endpoint
+
+    if (isFirstRevision) {
+      // delete from cloud storage and call discard mutation
+      fetch(getAttachmentDeleteRoute(attachmentId).pathname, {
+        method: "DELETE",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          variables: {
+            input: {
+              formChangeId: formChangeRowId,
+            },
+            // connections: [connectionId],
+          },
+        }),
+      });
+    } else {
       discardProjectAttachmentFormChange({
         variables: {
           input: {
@@ -60,14 +78,6 @@ const AttachmentTableRow: React.FC<Props> = ({
           connections: [connectionId],
         },
       });
-
-    if (isFirstRevision) {
-      // delete from cloud storage
-      fetch(getAttachmentDeleteRoute(attachmentId).pathname).then(() => {
-        return deleteFromApp();
-      });
-    } else {
-      deleteFromApp();
     }
   };
 
diff --git a/app/pages/cif/project-revision/[projectRevision]/index.tsx b/app/pages/cif/project-revision/[projectRevision]/index.tsx
index b27edea344..d3afc2fa0c 100644
--- a/app/pages/cif/project-revision/[projectRevision]/index.tsx
+++ b/app/pages/cif/project-revision/[projectRevision]/index.tsx
@@ -226,7 +226,7 @@ export function ProjectRevision({
             }
           }
         )
-      ).then(() => deleteFromApp());
+      );
     }
   };
 
diff --git a/app/server/middleware/attachmentDeleteRouter.ts b/app/server/middleware/attachmentDeleteRouter.ts
index ebd09b824c..61f9fb988c 100644
--- a/app/server/middleware/attachmentDeleteRouter.ts
+++ b/app/server/middleware/attachmentDeleteRouter.ts
@@ -8,15 +8,33 @@ export const attachmentDeleteRouter = Router();
 const attachmentDetailsQuery = `query AttachmentDetailsQuery($attachmentId: ID!){
   attachment(id: $attachmentId) {
     file
+    id
   }
 }`;
 
+const discardProjectAttachmentFormChangeMutation = `mutation discardProjectAttachmentFormChangeMutation($input: DiscardProjectAttachmentFormChangeInput!){
+  discardProjectAttachmentFormChange(input:$input) {
+    formChanges {
+      id 
+    }
+  }
+}`;
+
+const deleteAttachmentMutation = `mutation deleteAttachmentMutation($input: DeleteAttachmentInput!) {
+  deleteAttachment(input:$input){
+    attachment {
+      id
+    }
+  }
+}
+`;
+
 export const handleDelete = async (req, res, next) => {
   try {
     const attachmentQueryVariables = {
       attachmentId: req.params.attachmentId,
     };
-    const result = await performQuery(
+    const queryResponse = await performQuery(
       attachmentDetailsQuery,
       attachmentQueryVariables,
       req
@@ -24,9 +42,31 @@ export const handleDelete = async (req, res, next) => {
 
     const {
       data: {
-        attachment: { file },
+        attachment: { file, id },
       },
-    } = result;
+    } = queryResponse;
+
+    // delete the form_change related to the attachment
+    const attachmentFormChangeResponse = await performQuery(
+      discardProjectAttachmentFormChangeMutation,
+      req.body.variables,
+      req
+    );
+
+    // delete the attachment from the attachment table
+    const deleteAttachmentResponse = await performQuery(
+      deleteAttachmentMutation,
+      { input: { id } },
+      req
+    );
+
+    if (
+      queryResponse.errors ||
+      attachmentFormChangeResponse.errors ||
+      deleteAttachmentResponse.errors
+    ) {
+      throw new Error(`Failed to delete attachment`);
+    }
 
     const storageClient = new Storage();
     const bucketName = config.get("attachmentsBucket");
@@ -39,4 +79,4 @@ export const handleDelete = async (req, res, next) => {
   }
 };
 
-attachmentDeleteRouter.get("/delete/:attachmentId", handleDelete);
+attachmentDeleteRouter.delete("/delete/:attachmentId", handleDelete);
diff --git a/app/server/middleware/attachmentDownloadRouter.ts b/app/server/middleware/attachmentDownloadRouter.ts
index 8818bd505f..b3bed2a8f0 100644
--- a/app/server/middleware/attachmentDownloadRouter.ts
+++ b/app/server/middleware/attachmentDownloadRouter.ts
@@ -5,6 +5,8 @@ import config from "../../config";
 
 const attachmentDownloadRouter = Router();
 
+// this would be a graphql mutation deleting the file. AttachmentDetailsDeleteMutation
+// add some documentationv
 const attachmentDetailsQuery = `query AttachmentDetailsQuery($attachmentId: ID!){
   attachment(id: $attachmentId) {
     file
@@ -52,7 +54,7 @@ export const handleDownload = async (req, res, next) => {
     next(error);
   }
 };
-
+// whichever route makes the most sense, readability
 attachmentDownloadRouter.get("/download/:attachmentId", handleDownload);
 
 export default attachmentDownloadRouter;

From 68f42581511ae52543ed867c01da3ae2508a8968 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 13 Jul 2023 09:02:40 -0700
Subject: [PATCH 10/77] chore: add delete permissions to attachment table

---
 .../attachment_002_delete_permission.sql       | 18 ++++++++++++++++++
 .../attachment_002_delete_permission.sql       |  9 +++++++++
 schema/sqitch.plan                             |  1 +
 .../attachment_002_delete_permission.sql       | 11 +++++++++++
 4 files changed, 39 insertions(+)
 create mode 100644 schema/deploy/tables/attachment_002_delete_permission.sql
 create mode 100644 schema/revert/tables/attachment_002_delete_permission.sql
 create mode 100644 schema/verify/tables/attachment_002_delete_permission.sql

diff --git a/schema/deploy/tables/attachment_002_delete_permission.sql b/schema/deploy/tables/attachment_002_delete_permission.sql
new file mode 100644
index 0000000000..27faf7b78b
--- /dev/null
+++ b/schema/deploy/tables/attachment_002_delete_permission.sql
@@ -0,0 +1,18 @@
+-- Deploy cif:attachment_002_delete_permission to pg
+
+begin;
+
+do
+$grant$
+begin
+
+-- Grant cif_internal permissions
+perform cif_private.grant_permissions('delete', 'attachment', 'cif_internal');
+
+-- Grant cif_admin permissions
+perform cif_private.grant_permissions('delete', 'attachment', 'cif_admin');
+
+end
+$grant$;
+
+commit;
diff --git a/schema/revert/tables/attachment_002_delete_permission.sql b/schema/revert/tables/attachment_002_delete_permission.sql
new file mode 100644
index 0000000000..35d5e8a2bd
--- /dev/null
+++ b/schema/revert/tables/attachment_002_delete_permission.sql
@@ -0,0 +1,9 @@
+-- Revert cif:attachment_002_delete_permission from pg
+
+begin;
+
+revoke delete on cif.attachment from cif_internal;
+revoke delete on cif.attachment from cif_admin;
+
+
+commit;
diff --git a/schema/sqitch.plan b/schema/sqitch.plan
index 9f2a86e63d..d20b61f7e4 100644
--- a/schema/sqitch.plan
+++ b/schema/sqitch.plan
@@ -348,3 +348,4 @@ mutations/update_milestone_form_change [mutations/update_milestone_form_change@1
 functions/handle_milestone_form_change_commit [functions/handle_milestone_form_change_commit@1.10.0] 2023-07-25T19:29:40Z Sepehr Sobhani <sepehr.sobhani@gov.bc.ca> # Update commit handler to support reports that are not associated with expense
 computed_columns/form_change_maximum_performance_milestone_amount 2023-07-26T16:05:38Z Brianna Cerkiewicz <briannacerkiewicz@pop-os> # Create computed column to calculate maximum performance mmilestone amount
 data/015_insert_json_schema_form_data_add_max_performance_milestone 2023-07-26T20:23:07Z Brianna Cerkiewicz <briannacerkiewicz@pop-os> # Add new maximum performance milestone calculation to emission_intensity schema
+tables/attachment_002_delete_permission 2023-07-13T15:51:16Z Brianna Cerkiewicz <briannacerkiewicz@pop-os> # Allow hard deletion of attachments
diff --git a/schema/verify/tables/attachment_002_delete_permission.sql b/schema/verify/tables/attachment_002_delete_permission.sql
new file mode 100644
index 0000000000..70cdb76e38
--- /dev/null
+++ b/schema/verify/tables/attachment_002_delete_permission.sql
@@ -0,0 +1,11 @@
+-- Verify cif:attachment_002_delete_permission on pg
+
+begin;
+
+-- cif_internal Grants
+select cif_private.verify_grant('delete', 'attachment', 'cif_internal');
+
+-- cif_admin Grants
+select cif_private.verify_grant('delete', 'attachment', 'cif_admin');
+
+rollback;

From 1b5db6c868375016910cbfb6da13ee6c45aed11c Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 13 Jul 2023 10:44:52 -0700
Subject: [PATCH 11/77] feat: hard delete attachments from GCS

---
 .../Attachment/AttachmentTableRow.tsx         | 24 +++----------------
 .../Attachment/hardDeleteAttachement.tsx      | 17 +++++++++++++
 2 files changed, 20 insertions(+), 21 deletions(-)
 create mode 100644 app/components/Attachment/hardDeleteAttachement.tsx

diff --git a/app/components/Attachment/AttachmentTableRow.tsx b/app/components/Attachment/AttachmentTableRow.tsx
index 7ee360b47c..064bbc4a4c 100644
--- a/app/components/Attachment/AttachmentTableRow.tsx
+++ b/app/components/Attachment/AttachmentTableRow.tsx
@@ -1,12 +1,10 @@
 import { Button } from "@button-inc/bcgov-theme";
 import Link from "next/link";
-import {
-  getAttachmentDeleteRoute,
-  getAttachmentDownloadRoute,
-} from "routes/pageRoutes";
+import { getAttachmentDownloadRoute } from "routes/pageRoutes";
 import { graphql, useFragment } from "react-relay";
 import useDiscardProjectAttachmentFormChange from "mutations/attachment/discardProjectAttachmentFormChange";
 import { AttachmentTableRow_attachment$key } from "__generated__/AttachmentTableRow_attachment.graphql";
+import hardDeleteAttachment from "./hardDeleteAttachement";
 
 interface Props {
   attachment: AttachmentTableRow_attachment$key;
@@ -51,24 +49,8 @@ const AttachmentTableRow: React.FC<Props> = ({
   );
 
   const handleArchiveAttachment = (attachmentId) => {
-    // safer to delete from our app and then delete from GCS, then if breaks in the middle we don't have weird data, just storing extra stuff
-    // best to do it as middleware so it's one request, if it fails the whole thing fails
-    // have the server call the graphql endpoint
-
     if (isFirstRevision) {
-      // delete from cloud storage and call discard mutation
-      fetch(getAttachmentDeleteRoute(attachmentId).pathname, {
-        method: "DELETE",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          variables: {
-            input: {
-              formChangeId: formChangeRowId,
-            },
-            // connections: [connectionId],
-          },
-        }),
-      });
+      hardDeleteAttachment(attachmentId, formChangeRowId);
     } else {
       discardProjectAttachmentFormChange({
         variables: {
diff --git a/app/components/Attachment/hardDeleteAttachement.tsx b/app/components/Attachment/hardDeleteAttachement.tsx
new file mode 100644
index 0000000000..401824c216
--- /dev/null
+++ b/app/components/Attachment/hardDeleteAttachement.tsx
@@ -0,0 +1,17 @@
+import { getAttachmentDeleteRoute } from "routes/pageRoutes";
+
+const hardDeleteAttachment = (attachmentId, formChangeRowId) => {
+  fetch(getAttachmentDeleteRoute(attachmentId).pathname, {
+    method: "DELETE",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      variables: {
+        input: {
+          formChangeId: formChangeRowId,
+        },
+      },
+    }),
+  });
+};
+
+export default hardDeleteAttachment;

From 22295d34840ec5632bc618f9653552db491400ba Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 13 Jul 2023 10:45:14 -0700
Subject: [PATCH 12/77] test: test AttachmentTableRow

---
 .../Attachment/AttachmentTableRow.test.tsx    | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/tests/unit/components/Attachment/AttachmentTableRow.test.tsx b/app/tests/unit/components/Attachment/AttachmentTableRow.test.tsx
index 64ed4859c3..8b8d8085d5 100644
--- a/app/tests/unit/components/Attachment/AttachmentTableRow.test.tsx
+++ b/app/tests/unit/components/Attachment/AttachmentTableRow.test.tsx
@@ -1,11 +1,14 @@
 import { act, screen } from "@testing-library/react";
 import AttachmentTableRow from "components/Attachment/AttachmentTableRow";
+import hardDeleteAttachment from "components/Attachment/hardDeleteAttachement";
+import { mocked } from "jest-mock";
 import { graphql } from "react-relay";
 import ComponentTestingHelper from "tests/helpers/componentTestingHelper";
 import compiledAttachmentTableRowTestQuery, {
   AttachmentTableRowTestQuery,
 } from "__generated__/AttachmentTableRowTestQuery.graphql";
 import { AttachmentTableRow_attachment$data } from "__generated__/AttachmentTableRow_attachment.graphql";
+jest.mock("components/Attachment/hardDeleteAttachement");
 
 const testQuery = graphql`
   query AttachmentTableRowTestQuery @relay_test_operation {
@@ -46,6 +49,8 @@ const TestWrapper: React.FC = (props: any) => {
   );
 };
 
+const defaultComponentProps = { isFirstRevision: false };
+
 const componentTestingHelper =
   new ComponentTestingHelper<AttachmentTableRowTestQuery>({
     component: TestWrapper,
@@ -57,6 +62,7 @@ const componentTestingHelper =
       formChangeRowId: "test-form-change-row-id",
       connectionId: "test-attachment-form-change-connection-id",
     }),
+    defaultComponentProps,
   });
 
 describe("The Attachment table row component", () => {
@@ -96,7 +102,7 @@ describe("The Attachment table row component", () => {
       expect.anything()
     );
   });
-  it("calls the discardProjectAttachmentFormChangeMutation when the delete button is clicked", () => {
+  it("calls the discardProjectAttachmentFormChangeMutation when the delete button is clicked and it is not the first revision", () => {
     componentTestingHelper.loadQuery();
     componentTestingHelper.renderComponent();
 
@@ -113,4 +119,18 @@ describe("The Attachment table row component", () => {
       }
     );
   });
+  it("hits the delete endpoint when the delete button is clicked if it's the first revision", () => {
+    componentTestingHelper.loadQuery();
+    componentTestingHelper.renderComponent(undefined, {
+      ...defaultComponentProps,
+      isFirstRevision: true,
+    });
+    const mockHardDelete = jest.fn();
+    mocked(hardDeleteAttachment).mockImplementation(mockHardDelete);
+
+    const deleteButton = screen.getAllByText("Delete")[0];
+    act(() => deleteButton.click());
+
+    expect(mockHardDelete).toHaveBeenCalled();
+  });
 });

From 68b179883f11eecc5f47e0aee6bd6174fd08ec7b Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 13 Jul 2023 14:04:19 -0700
Subject: [PATCH 13/77] chore: spec work

---
 .../Attachment/AttachmentTableRow.tsx         | 38 ++++++++-----------
 .../[projectRevision]/index.test.tsx          |  3 ++
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/app/components/Attachment/AttachmentTableRow.tsx b/app/components/Attachment/AttachmentTableRow.tsx
index 064bbc4a4c..441c9b7100 100644
--- a/app/components/Attachment/AttachmentTableRow.tsx
+++ b/app/components/Attachment/AttachmentTableRow.tsx
@@ -25,28 +25,22 @@ const AttachmentTableRow: React.FC<Props> = ({
     discardProjectAttachmentFormChange,
     isDiscardingProjectAttachmentFormChange,
   ] = useDiscardProjectAttachmentFormChange();
-  const {
-    id,
-    fileName,
-    fileType,
-    fileSize,
-    createdAt,
-    cifUserByCreatedBy: { fullName },
-  } = useFragment(
-    graphql`
-      fragment AttachmentTableRow_attachment on Attachment {
-        id
-        fileName
-        fileType
-        fileSize
-        createdAt
-        cifUserByCreatedBy {
-          fullName
+  const { id, fileName, fileType, fileSize, createdAt, cifUserByCreatedBy } =
+    useFragment(
+      graphql`
+        fragment AttachmentTableRow_attachment on Attachment {
+          id
+          fileName
+          fileType
+          fileSize
+          createdAt
+          cifUserByCreatedBy {
+            fullName
+          }
         }
-      }
-    `,
-    attachment
-  );
+      `,
+      attachment
+    );
 
   const handleArchiveAttachment = (attachmentId) => {
     if (isFirstRevision) {
@@ -69,7 +63,7 @@ const AttachmentTableRow: React.FC<Props> = ({
         <td>{fileName}</td>
         <td>{fileType}</td>
         <td>{fileSize}</td>
-        <td>{fullName}</td>
+        <td>{cifUserByCreatedBy?.fullName}</td>
         <td>{createdAt}</td>
         <td className="links">
           <Link href={getAttachmentDownloadRoute(id)} passHref>
diff --git a/app/tests/unit/pages/project-revision/[projectRevision]/index.test.tsx b/app/tests/unit/pages/project-revision/[projectRevision]/index.test.tsx
index d4a7178a76..d9321e0bec 100644
--- a/app/tests/unit/pages/project-revision/[projectRevision]/index.test.tsx
+++ b/app/tests/unit/pages/project-revision/[projectRevision]/index.test.tsx
@@ -88,6 +88,9 @@ describe("The Create Project page", () => {
           summaryMilestonePaymentFormChanges: {
             edges: [],
           },
+          summaryProjectAttachmentFormChanges: {
+            edges: [],
+          },
         };
       },
     });

From 1ab56994873b7f46ca401de9df40ad368551e807 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 13 Jul 2023 15:17:03 -0700
Subject: [PATCH 14/77] test: jest tests

---
 .../[projectRevision]/index.tsx               | 51 ++++++++-----------
 .../[projectRevision]/index.test.tsx          | 18 +++++++
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/app/pages/cif/project-revision/[projectRevision]/index.tsx b/app/pages/cif/project-revision/[projectRevision]/index.tsx
index d3afc2fa0c..0eb61da6ad 100644
--- a/app/pages/cif/project-revision/[projectRevision]/index.tsx
+++ b/app/pages/cif/project-revision/[projectRevision]/index.tsx
@@ -14,7 +14,6 @@ import { useDeleteProjectRevisionMutation } from "mutations/ProjectRevision/dele
 import SavingIndicator from "components/Form/SavingIndicator";
 import { faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { getAttachmentDeleteRoute } from "routes/pageRoutes";
 import {
   getProjectsPageRoute,
   getProjectRevisionFormPageRoute,
@@ -34,6 +33,7 @@ import DangerAlert from "lib/theme/ConfirmationAlert";
 import { useCommitProjectRevision } from "mutations/ProjectRevision/useCommitProjectRevision";
 import ProjectAttachmentsFormSummary from "components/Form/ProjectAttachmentsFormSummary";
 import next from "next";
+import hardDeleteAttachment from "components/Attachment/hardDeleteAttachement";
 
 const pageQuery = graphql`
   query ProjectRevisionQuery($projectRevision: ID!) {
@@ -83,9 +83,7 @@ const pageQuery = graphql`
             node {
               id
               asProjectAttachment {
-                attachmentByAttachmentId {
-                  id
-                }
+                attachmentId
               }
             }
           }
@@ -182,8 +180,26 @@ export function ProjectRevision({
   };
 
   const discardRevision = async () => {
-    const deleteFromApp = () =>
-      discardProjectRevision({
+    // attachments should only be hard deleted if it's the first revision
+    if (
+      query.projectRevision.projectAttachmentFormChanges.totalCount === 0 ||
+      (!query.projectRevision.isFirstRevision &&
+        query.projectRevision.projectAttachmentFormChanges.totalCount > 0)
+    ) {
+      query.projectRevision.projectAttachmentFormChanges.edges.map(
+        async ({ node }) => {
+          try {
+            hardDeleteAttachment(
+              node.asProjectAttachment.attachmentId,
+              node.id
+            );
+          } catch (err) {
+            next(err);
+          }
+        }
+      );
+    } else {
+      await discardProjectRevision({
         variables: {
           input: {
             revisionId: query.projectRevision.rowId,
@@ -204,29 +220,6 @@ export function ProjectRevision({
           console.error("Error discarding the project", e);
         },
       });
-    // attachments should only be hard deleted if it's the first revision
-    if (
-      query.projectRevision.projectAttachmentFormChanges.totalCount === 0 ||
-      (!query.projectRevision.isFirstRevision &&
-        query.projectRevision.projectAttachmentFormChanges.totalCount > 0)
-    ) {
-      deleteFromApp();
-    } else {
-      await Promise.all(
-        query.projectRevision.projectAttachmentFormChanges.edges.map(
-          async ({ node }) => {
-            try {
-              fetch(
-                getAttachmentDeleteRoute(
-                  node.asProjectAttachment.attachmentByAttachmentId.id
-                ).pathname
-              );
-            } catch (err) {
-              next(err);
-            }
-          }
-        )
-      );
     }
   };
 
diff --git a/app/tests/unit/pages/project-revision/[projectRevision]/index.test.tsx b/app/tests/unit/pages/project-revision/[projectRevision]/index.test.tsx
index d9321e0bec..ba8cae22a8 100644
--- a/app/tests/unit/pages/project-revision/[projectRevision]/index.test.tsx
+++ b/app/tests/unit/pages/project-revision/[projectRevision]/index.test.tsx
@@ -44,6 +44,9 @@ const defaultMockResolver = {
       summaryMilestonePaymentFormChanges: {
         edges: [],
       },
+      projectAttachmentFormChanges: {
+        edges: [],
+      },
     };
   },
 };
@@ -91,6 +94,9 @@ describe("The Create Project page", () => {
           summaryProjectAttachmentFormChanges: {
             edges: [],
           },
+          projectAttachmentFormChanges: {
+            edges: [],
+          },
         };
       },
     });
@@ -148,6 +154,9 @@ describe("The Create Project page", () => {
           summaryMilestonePaymentFormChanges: {
             edges: [],
           },
+          projectAttachmentFormChanges: {
+            edges: [],
+          },
         };
       },
     });
@@ -232,6 +241,9 @@ describe("The Create Project page", () => {
           summaryMilestonePaymentFormChanges: {
             edges: [],
           },
+          projectAttachmentFormChanges: {
+            edges: [],
+          },
           projectManagerFormChangesByLabel: {
             edges: [
               {
@@ -569,6 +581,9 @@ describe("The Create Project page", () => {
           summaryMilestonePaymentFormChanges: {
             edges: [],
           },
+          projectAttachmentFormChanges: {
+            edges: [],
+          },
         };
       },
     };
@@ -617,6 +632,9 @@ describe("The Create Project page", () => {
           summaryMilestonePaymentFormChanges: {
             edges: [],
           },
+          projectAttachmentFormChanges: {
+            edges: [],
+          },
         };
       },
     };

From b4a866ae301d718bf4bd08c4131f11b776a18145 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 13 Jul 2023 16:00:12 -0700
Subject: [PATCH 15/77] feat: hard delete attachments from GCS

---
 .../[projectRevision]/index.tsx               | 78 +++++--------------
 .../middleware/attachmentDeleteRouter.ts      |  2 +-
 2 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/app/pages/cif/project-revision/[projectRevision]/index.tsx b/app/pages/cif/project-revision/[projectRevision]/index.tsx
index 0eb61da6ad..1c06b8fcdc 100644
--- a/app/pages/cif/project-revision/[projectRevision]/index.tsx
+++ b/app/pages/cif/project-revision/[projectRevision]/index.tsx
@@ -32,8 +32,6 @@ import ProjectSummaryReportFormSummary from "components/Form/ProjectSummaryRepor
 import DangerAlert from "lib/theme/ConfirmationAlert";
 import { useCommitProjectRevision } from "mutations/ProjectRevision/useCommitProjectRevision";
 import ProjectAttachmentsFormSummary from "components/Form/ProjectAttachmentsFormSummary";
-import next from "next";
-import hardDeleteAttachment from "components/Attachment/hardDeleteAttachement";
 
 const pageQuery = graphql`
   query ProjectRevisionQuery($projectRevision: ID!) {
@@ -73,21 +71,7 @@ const pageQuery = graphql`
             }
           }
         }
-        projectAttachmentFormChanges: formChangesFor(
-          first: 500
-          formDataTableName: "project_attachment"
-          filter: { operation: { notEqualTo: ARCHIVE } }
-        ) @connection(key: "connection_projectAttachmentFormChanges") {
-          totalCount
-          edges {
-            node {
-              id
-              asProjectAttachment {
-                attachmentId
-              }
-            }
-          }
-        }
+
         formChangesByProjectRevisionId {
           edges {
             node {
@@ -180,47 +164,27 @@ export function ProjectRevision({
   };
 
   const discardRevision = async () => {
-    // attachments should only be hard deleted if it's the first revision
-    if (
-      query.projectRevision.projectAttachmentFormChanges.totalCount === 0 ||
-      (!query.projectRevision.isFirstRevision &&
-        query.projectRevision.projectAttachmentFormChanges.totalCount > 0)
-    ) {
-      query.projectRevision.projectAttachmentFormChanges.edges.map(
-        async ({ node }) => {
-          try {
-            hardDeleteAttachment(
-              node.asProjectAttachment.attachmentId,
-              node.id
-            );
-          } catch (err) {
-            next(err);
-          }
-        }
-      );
-    } else {
-      await discardProjectRevision({
-        variables: {
-          input: {
-            revisionId: query.projectRevision.rowId,
-          },
-        },
-        onCompleted: async () => {
-          if (query.projectRevision.isFirstRevision)
-            await router.push(getProjectsPageRoute());
-          else
-            await router.push(
-              getProjectRevisionPageRoute(
-                query.projectRevision.projectByProjectId
-                  .latestCommittedProjectRevision.id
-              )
-            );
-        },
-        onError: async (e) => {
-          console.error("Error discarding the project", e);
+    await discardProjectRevision({
+      variables: {
+        input: {
+          revisionId: query.projectRevision.rowId,
         },
-      });
-    }
+      },
+      onCompleted: async () => {
+        if (query.projectRevision.isFirstRevision)
+          await router.push(getProjectsPageRoute());
+        else
+          await router.push(
+            getProjectRevisionPageRoute(
+              query.projectRevision.projectByProjectId
+                .latestCommittedProjectRevision.id
+            )
+          );
+      },
+      onError: async (e) => {
+        console.error("Error discarding the project", e);
+      },
+    });
   };
 
   let mode: TaskListMode;
diff --git a/app/server/middleware/attachmentDeleteRouter.ts b/app/server/middleware/attachmentDeleteRouter.ts
index 61f9fb988c..de268bd49b 100644
--- a/app/server/middleware/attachmentDeleteRouter.ts
+++ b/app/server/middleware/attachmentDeleteRouter.ts
@@ -15,7 +15,7 @@ const attachmentDetailsQuery = `query AttachmentDetailsQuery($attachmentId: ID!)
 const discardProjectAttachmentFormChangeMutation = `mutation discardProjectAttachmentFormChangeMutation($input: DiscardProjectAttachmentFormChangeInput!){
   discardProjectAttachmentFormChange(input:$input) {
     formChanges {
-      id 
+      id
     }
   }
 }`;

From 05686ce4bf76124bcd2dda12df6801f638c8944e Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 13 Jul 2023 16:00:29 -0700
Subject: [PATCH 16/77] test: jest

---
 .../[projectRevision]/index.test.tsx          | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/app/tests/unit/pages/project-revision/[projectRevision]/index.test.tsx b/app/tests/unit/pages/project-revision/[projectRevision]/index.test.tsx
index ba8cae22a8..c021cd0631 100644
--- a/app/tests/unit/pages/project-revision/[projectRevision]/index.test.tsx
+++ b/app/tests/unit/pages/project-revision/[projectRevision]/index.test.tsx
@@ -44,9 +44,6 @@ const defaultMockResolver = {
       summaryMilestonePaymentFormChanges: {
         edges: [],
       },
-      projectAttachmentFormChanges: {
-        edges: [],
-      },
     };
   },
 };
@@ -94,9 +91,6 @@ describe("The Create Project page", () => {
           summaryProjectAttachmentFormChanges: {
             edges: [],
           },
-          projectAttachmentFormChanges: {
-            edges: [],
-          },
         };
       },
     });
@@ -154,9 +148,6 @@ describe("The Create Project page", () => {
           summaryMilestonePaymentFormChanges: {
             edges: [],
           },
-          projectAttachmentFormChanges: {
-            edges: [],
-          },
         };
       },
     });
@@ -241,9 +232,7 @@ describe("The Create Project page", () => {
           summaryMilestonePaymentFormChanges: {
             edges: [],
           },
-          projectAttachmentFormChanges: {
-            edges: [],
-          },
+
           projectManagerFormChangesByLabel: {
             edges: [
               {
@@ -581,9 +570,6 @@ describe("The Create Project page", () => {
           summaryMilestonePaymentFormChanges: {
             edges: [],
           },
-          projectAttachmentFormChanges: {
-            edges: [],
-          },
         };
       },
     };
@@ -632,9 +618,6 @@ describe("The Create Project page", () => {
           summaryMilestonePaymentFormChanges: {
             edges: [],
           },
-          projectAttachmentFormChanges: {
-            edges: [],
-          },
         };
       },
     };

From 177cf380e8adad5e6d41ccdc7e6f9657513381b0 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 14 Jul 2023 08:33:42 -0700
Subject: [PATCH 17/77] test: update pgtap tests

---
 ...orm_changes_to_single_form_change_test.sql | 42 +++++++++----------
 schema/test/unit/tables/attachment_test.sql   | 18 ++++----
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/schema/test/unit/functions/migration_emission_intensity_report_form_changes_to_single_form_change_test.sql b/schema/test/unit/functions/migration_emission_intensity_report_form_changes_to_single_form_change_test.sql
index fd3b825497..36a50cf87b 100644
--- a/schema/test/unit/functions/migration_emission_intensity_report_form_changes_to_single_form_change_test.sql
+++ b/schema/test/unit/functions/migration_emission_intensity_report_form_changes_to_single_form_change_test.sql
@@ -74,8 +74,8 @@ values
             'project_id',2,
             'reportType','TEIMP',
             'reportingRequirementIndex', 1,
-            'reportDueDate', '2023-06-15T00:00:00+00:00',
-            'submittedDate', '2023-06-30T00:00:00+00:00',
+            'reportDueDate', '2023-06-15'::timestamptz,
+            'submittedDate', '2023-06-30'::timestamptz,
             'comments', 'comments'
             )::jsonb,
         'create',
@@ -90,10 +90,10 @@ values
             'reportingRequirementId', 2,
             'adjustedEmissionsIntensityPerformance', 98,
             'baselineEmissionIntensity', 324.25364,
-            'dateSentToCsnr', '2023-07-01T00:00:00+00:00',
+            'dateSentToCsnr', '2023-07-01T00:00:00-07:00',
             'emissionFunctionalUnit','tCO2e',
-            'measurementPeriodEndDate','2023-07-01T00:00:00+00:00',
-            'measurementPeriodStartDate', '2023-06-01T00:00:00+00:00',
+            'measurementPeriodEndDate','2023-07-01T00:00:00-07:00',
+            'measurementPeriodStartDate', '2023-06-01T00:00:00-07:00',
             'postProjectEmissionIntensity', 124.35,
             'productionFunctionalUnit', 'unit',
             'targetEmissionIntensity', 23.2357,
@@ -112,8 +112,8 @@ values
             "comments": "comments",
             "project_id": 3,
             "reportType": "TEIMP",
-            "reportDueDate": "2023-06-01T00:00:00+00:00",
-            "submittedDate": "2023-06-15T00:00:00+00:00",
+            "reportDueDate": "2023-06-01T00:00:00-07:00",
+            "submittedDate": "2023-06-15T00:00:00-07:00",
             "reportingRequirementIndex": 1
             }'::jsonb,
         'create',
@@ -128,7 +128,7 @@ values
             "teimpReporting": {
               "emissionFunctionalUnit": "tCO2e",
               "targetEmissionIntensity": 466.555588,
-              "measurementPeriodEndDate": "2023-06-15T00:00:00+00:00",
+              "measurementPeriodEndDate": "2023-06-15T00:00:00-07:00",
               "productionFunctionalUnit": "unit",
               "baselineEmissionIntensity": 2569.555,
               "measurementPeriodStartDate": "2023-06-01T23: 59: 59.999-07:00",
@@ -141,13 +141,13 @@ values
             },
             "emissionFunctionalUnit": "tCO2e",
             "targetEmissionIntensity": 466.555588,
-            "measurementPeriodEndDate": "2023-06-15T00:00:00+00:00",
+            "measurementPeriodEndDate": "2023-06-15T00:00:00-07:00",
             "productionFunctionalUnit": "unit",
             "baselineEmissionIntensity": 2569.555,
-            "measurementPeriodStartDate": "2021-06-15T00:00:00+00:00",
+            "measurementPeriodStartDate": "2021-06-15T00:00:00-07:00",
             "postProjectEmissionIntensity": 654.12345678,
             "adjustedEmissionsIntensityPerformance": 95.86,
-            "dateSentToCsnr": "2023-06-22T00:00:00+00:00",
+            "dateSentToCsnr": "2023-06-22T00:00:00-07:00",
             "totalLifetimeEmissionReduction": 66,
             "reportingRequirementId": 3
           }'::jsonb,
@@ -245,16 +245,16 @@ select results_eq(
             "adjustedEmissionsIntensityPerformance": 98,
             "baselineEmissionIntensity": 324.25364,
             "comments": "comments",
-            "dateSentToCsnr": "2023-07-01T00:00:00+00:00",
+            "dateSentToCsnr": "2023-07-01T00:00:00-07:00",
             "emissionFunctionalUnit":"tCO2e",
-            "measurementPeriodEndDate":"2023-07-01T00:00:00+00:00",
-            "measurementPeriodStartDate": "2023-06-01T00:00:00+00:00",
+            "measurementPeriodEndDate":"2023-07-01T00:00:00-07:00",
+            "measurementPeriodStartDate": "2023-06-01T00:00:00-07:00",
             "postProjectEmissionIntensity": 124.35,
             "productionFunctionalUnit": "unit",
-            "reportDueDate": "2023-06-15T00:00:00+00:00",
+            "reportDueDate": "2023-06-15T00:00:00-07:00",
             "reportType": "TEIMP",
             "reportingRequirementIndex": 1,
-            "submittedDate": "2023-06-30T00:00:00+00:00",
+            "submittedDate": "2023-06-30T00:00:00-07:00",
             "targetEmissionIntensity": 23.2357,
             "totalLifetimeEmissionReduction": 44.4224,
             "projectId": 2
@@ -263,18 +263,18 @@ select results_eq(
             "comments": "comments",
             "projectId": 3,
             "reportType": "TEIMP",
-            "reportDueDate": "2023-06-01T00:00:00+00:00",
-            "submittedDate": "2023-06-15T00:00:00+00:00",
+            "reportDueDate": "2023-06-01T00:00:00-07:00",
+            "submittedDate": "2023-06-15T00:00:00-07:00",
             "reportingRequirementIndex": 1,
             "emissionFunctionalUnit": "tCO2e",
             "targetEmissionIntensity": 466.555588,
-            "measurementPeriodEndDate": "2023-06-15T00:00:00+00:00",
+            "measurementPeriodEndDate": "2023-06-15T00:00:00-07:00",
             "productionFunctionalUnit": "unit",
             "baselineEmissionIntensity": 2569.555,
-            "measurementPeriodStartDate": "2021-06-15T00:00:00+00:00",
+            "measurementPeriodStartDate": "2021-06-15T00:00:00-07:00",
             "postProjectEmissionIntensity": 654.12345678,
             "totalLifetimeEmissionReduction": 66,
-            "dateSentToCsnr": "2023-06-22T00:00:00+00:00",
+            "dateSentToCsnr": "2023-06-22T00:00:00-07:00",
             "adjustedEmissionsIntensityPerformance": 95.86,
             "totalLifetimeEmissionReduction": 66
           }'::jsonb)
diff --git a/schema/test/unit/tables/attachment_test.sql b/schema/test/unit/tables/attachment_test.sql
index 185562bba5..4d022f8185 100644
--- a/schema/test/unit/tables/attachment_test.sql
+++ b/schema/test/unit/tables/attachment_test.sql
@@ -75,12 +75,11 @@ select results_eq(
     'Data was archived by cif_admin'
 );
 
-select throws_like(
+select lives_ok(
   $$
     delete from cif.attachment where id=4;
   $$,
-  'permission denied%',
-    'Administrator cannot delete rows from table attachment'
+    'cif_admin can delete data in attachment table'
 );
 
 -- -- cif_internal
@@ -91,7 +90,7 @@ select results_eq(
   $$
     select count(*) from cif.attachment
   $$,
-  ARRAY[4::bigint],
+  ARRAY[3::bigint],
     'cif_internal can view all data from attachment table'
 );
 
@@ -102,24 +101,23 @@ select lives_ok(
     'cif_internal can insert data in attachment table'
 );
 
-select throws_like(
+select lives_ok(
   $$
-    delete from cif.attachment where id=5;
+    delete from cif.attachment where id=4;
   $$,
-  'permission denied%',
-    'cif_internal cannot delete rows from attachment table'
+    'cif_internal can delete rows from attachment table'
 );
 
 select lives_ok(
   $$
-    update cif.attachment set archived_at = now() where id=5;
+    update cif.attachment set archived_at = now() where id=3;
   $$,
     'cif_internal can archive/update data in the attachment table'
 );
 
 select results_eq(
   $$
-    select count(id) from cif.attachment where id=5 and archived_at is not null
+    select count(id) from cif.attachment where id=3 and archived_at is not null
   $$,
   ARRAY[1::bigint],
     'Data was archived by cif_internal'

From dc218e838b9eaa5013cde3a5c5ab19c5b0d3360a Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 14 Jul 2023 08:42:46 -0700
Subject: [PATCH 18/77] test: debug CI cypress tests

---
 .../cif/project-revision/create-first-project-revision.cy.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index 2bce4252e0..9000130027 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -169,7 +169,10 @@ describe("when creating a project, the project page", () => {
     // Add attachments
 
     cy.url().should("include", "/form/8");
-    cy.get("input[type=file]").selectFile(cy.fixture("e2e/mock.pdf"));
+
+    cy.fixture("e2e/mock.pdf").as("mockFile");
+    cy.get("input[type=file]").selectFile("@mockFile");
+
     cy.findByText("mock.pdf").should("be.visible");
 
     cy.findByText(/Submit project attachments/i).click();

From ff55ff6e87271fe5eb4fe8c0e04a8e52668ec220 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Tue, 18 Jul 2023 11:32:50 -0700
Subject: [PATCH 19/77] chore: spec work

---
 .../Attachment/AttachmentTableRow.tsx         | 39 ++++++++++---------
 .../Attachment/hardDeleteAttachement.tsx      |  3 +-
 .../middleware/attachmentDeleteRouter.ts      | 13 +++++--
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/app/components/Attachment/AttachmentTableRow.tsx b/app/components/Attachment/AttachmentTableRow.tsx
index 441c9b7100..cdf77d4734 100644
--- a/app/components/Attachment/AttachmentTableRow.tsx
+++ b/app/components/Attachment/AttachmentTableRow.tsx
@@ -25,26 +25,29 @@ const AttachmentTableRow: React.FC<Props> = ({
     discardProjectAttachmentFormChange,
     isDiscardingProjectAttachmentFormChange,
   ] = useDiscardProjectAttachmentFormChange();
-  const { id, fileName, fileType, fileSize, createdAt, cifUserByCreatedBy } =
-    useFragment(
-      graphql`
-        fragment AttachmentTableRow_attachment on Attachment {
-          id
-          fileName
-          fileType
-          fileSize
-          createdAt
-          cifUserByCreatedBy {
-            fullName
-          }
+  const attachmentRow = useFragment(
+    graphql`
+      fragment AttachmentTableRow_attachment on Attachment {
+        id
+        fileName
+        fileType
+        fileSize
+        createdAt
+        cifUserByCreatedBy {
+          fullName
         }
-      `,
-      attachment
-    );
-
+      }
+    `,
+    attachment
+  );
+  if (!attachmentRow) return null;
+  console.log("attachment", attachment);
+  console.log("attachmentRow", attachmentRow);
+  const { id, fileName, fileType, fileSize, createdAt, cifUserByCreatedBy } =
+    attachmentRow;
   const handleArchiveAttachment = (attachmentId) => {
     if (isFirstRevision) {
-      hardDeleteAttachment(attachmentId, formChangeRowId);
+      hardDeleteAttachment(attachmentId, formChangeRowId, connectionId);
     } else {
       discardProjectAttachmentFormChange({
         variables: {
@@ -56,7 +59,7 @@ const AttachmentTableRow: React.FC<Props> = ({
       });
     }
   };
-
+  console.log("connectionid", connectionId);
   return (
     <>
       <tr>
diff --git a/app/components/Attachment/hardDeleteAttachement.tsx b/app/components/Attachment/hardDeleteAttachement.tsx
index 401824c216..d63c213be9 100644
--- a/app/components/Attachment/hardDeleteAttachement.tsx
+++ b/app/components/Attachment/hardDeleteAttachement.tsx
@@ -1,6 +1,6 @@
 import { getAttachmentDeleteRoute } from "routes/pageRoutes";
 
-const hardDeleteAttachment = (attachmentId, formChangeRowId) => {
+const hardDeleteAttachment = (attachmentId, formChangeRowId, connectionId) => {
   fetch(getAttachmentDeleteRoute(attachmentId).pathname, {
     method: "DELETE",
     headers: { "Content-Type": "application/json" },
@@ -9,6 +9,7 @@ const hardDeleteAttachment = (attachmentId, formChangeRowId) => {
         input: {
           formChangeId: formChangeRowId,
         },
+        connections: [connectionId],
       },
     }),
   });
diff --git a/app/server/middleware/attachmentDeleteRouter.ts b/app/server/middleware/attachmentDeleteRouter.ts
index de268bd49b..b80a41137e 100644
--- a/app/server/middleware/attachmentDeleteRouter.ts
+++ b/app/server/middleware/attachmentDeleteRouter.ts
@@ -12,10 +12,13 @@ const attachmentDetailsQuery = `query AttachmentDetailsQuery($attachmentId: ID!)
   }
 }`;
 
-const discardProjectAttachmentFormChangeMutation = `mutation discardProjectAttachmentFormChangeMutation($input: DiscardProjectAttachmentFormChangeInput!){
-  discardProjectAttachmentFormChange(input:$input) {
+const discardProjectAttachmentFormChangeMutation = `mutation discardProjectAttachmentFormChangeMutation(
+  $input: DiscardProjectAttachmentFormChangeInput!
+  $connections: [ID!]!
+) {
+  discardProjectAttachmentFormChange(input: $input) {
     formChanges {
-      id
+      id @deleteEdge(connections: $connections)
     }
   }
 }`;
@@ -45,7 +48,7 @@ export const handleDelete = async (req, res, next) => {
         attachment: { file, id },
       },
     } = queryResponse;
-
+    console.log("req.body.variables", req.body.variables);
     // delete the form_change related to the attachment
     const attachmentFormChangeResponse = await performQuery(
       discardProjectAttachmentFormChangeMutation,
@@ -53,6 +56,8 @@ export const handleDelete = async (req, res, next) => {
       req
     );
 
+    console.log("attachmentFormChangeResponse", attachmentFormChangeResponse);
+
     // delete the attachment from the attachment table
     const deleteAttachmentResponse = await performQuery(
       deleteAttachmentMutation,

From 8684a93f5f4ba325e62956c1b2c4173d725b7d8b Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Tue, 18 Jul 2023 13:11:44 -0700
Subject: [PATCH 20/77] test: debug CI cypress tests

---
 .../project-revision/create-first-project-revision.cy.js   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index 9000130027..e90714c541 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -169,10 +169,15 @@ describe("when creating a project, the project page", () => {
     // Add attachments
 
     cy.url().should("include", "/form/8");
+    cy.intercept("POST", "http://localhost:3004/graphql", (req) => {
+      aliasOperation(req, "addProjectAttachment");
+    });
 
     cy.fixture("e2e/mock.pdf").as("mockFile");
     cy.get("input[type=file]").selectFile("@mockFile");
-
+    cy.wait("@gqladdProjectAttachment")
+      .its("response")
+      .should("have.property", "body");
     cy.findByText("mock.pdf").should("be.visible");
 
     cy.findByText(/Submit project attachments/i).click();

From e87f6c5163be3688628af628e42ae091b761c310 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Wed, 19 Jul 2023 15:14:23 -0700
Subject: [PATCH 21/77] test: debug CI cypress tests

---
 .../cif/project-revision/create-first-project-revision.cy.js   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index e90714c541..384be1fc0b 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -11,7 +11,7 @@ describe("when creating a project, the project page", () => {
     cy.get("button").contains("Add a Project").click();
   });
 
-  it("allows an admin user to create an EP project", () => {
+  it.only("allows an admin user to create an EP project", () => {
     //add new
     cy.fillAndCheckNewProjectForm("Emissions Performance", "2020");
     cy.happoAndAxe("EP Project New Form", "filled", "main");
@@ -178,6 +178,7 @@ describe("when creating a project, the project page", () => {
     cy.wait("@gqladdProjectAttachment")
       .its("response")
       .should("have.property", "body");
+    cy.wait(3000);
     cy.findByText("mock.pdf").should("be.visible");
 
     cy.findByText(/Submit project attachments/i).click();

From 024ab2b04b28d2d0640a32dab4f4fe0b01e125cf Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 20 Jul 2023 08:02:56 -0700
Subject: [PATCH 22/77] test: debug CI cypress tests

---
 .../create-first-project-revision.cy.js              | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index 384be1fc0b..e1c753c2f4 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -1,5 +1,10 @@
+import { aliasOperation } from "../../../utils/graphql-test-utils";
+
 describe("when creating a project, the project page", () => {
   beforeEach(() => {
+    cy.intercept("POST", "http://localhost:3004/graphql", (req) => {
+      aliasOperation(req, "addProjectAttachmentToRevisionMutation");
+    });
     cy.useMockedTime(new Date("June 10, 2020 09:00:00"));
     cy.sqlFixture("e2e/dbReset");
     cy.sqlFixture("dev/001_cif_user");
@@ -169,16 +174,13 @@ describe("when creating a project, the project page", () => {
     // Add attachments
 
     cy.url().should("include", "/form/8");
-    cy.intercept("POST", "http://localhost:3004/graphql", (req) => {
-      aliasOperation(req, "addProjectAttachment");
-    });
 
     cy.fixture("e2e/mock.pdf").as("mockFile");
     cy.get("input[type=file]").selectFile("@mockFile");
-    cy.wait("@gqladdProjectAttachment")
+    cy.wait("@gqladdProjectAttachmentToRevisionMutation")
       .its("response")
       .should("have.property", "body");
-    cy.wait(3000);
+    // cy.wait(3000);
     cy.findByText("mock.pdf").should("be.visible");
 
     cy.findByText(/Submit project attachments/i).click();

From aa879331f08318027b649c46c66f0f79888a46a2 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 20 Jul 2023 08:10:40 -0700
Subject: [PATCH 23/77] test: go back to original emissions migration test

---
 ...orm_changes_to_single_form_change_test.sql | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/schema/test/unit/functions/migration_emission_intensity_report_form_changes_to_single_form_change_test.sql b/schema/test/unit/functions/migration_emission_intensity_report_form_changes_to_single_form_change_test.sql
index 36a50cf87b..fd3b825497 100644
--- a/schema/test/unit/functions/migration_emission_intensity_report_form_changes_to_single_form_change_test.sql
+++ b/schema/test/unit/functions/migration_emission_intensity_report_form_changes_to_single_form_change_test.sql
@@ -74,8 +74,8 @@ values
             'project_id',2,
             'reportType','TEIMP',
             'reportingRequirementIndex', 1,
-            'reportDueDate', '2023-06-15'::timestamptz,
-            'submittedDate', '2023-06-30'::timestamptz,
+            'reportDueDate', '2023-06-15T00:00:00+00:00',
+            'submittedDate', '2023-06-30T00:00:00+00:00',
             'comments', 'comments'
             )::jsonb,
         'create',
@@ -90,10 +90,10 @@ values
             'reportingRequirementId', 2,
             'adjustedEmissionsIntensityPerformance', 98,
             'baselineEmissionIntensity', 324.25364,
-            'dateSentToCsnr', '2023-07-01T00:00:00-07:00',
+            'dateSentToCsnr', '2023-07-01T00:00:00+00:00',
             'emissionFunctionalUnit','tCO2e',
-            'measurementPeriodEndDate','2023-07-01T00:00:00-07:00',
-            'measurementPeriodStartDate', '2023-06-01T00:00:00-07:00',
+            'measurementPeriodEndDate','2023-07-01T00:00:00+00:00',
+            'measurementPeriodStartDate', '2023-06-01T00:00:00+00:00',
             'postProjectEmissionIntensity', 124.35,
             'productionFunctionalUnit', 'unit',
             'targetEmissionIntensity', 23.2357,
@@ -112,8 +112,8 @@ values
             "comments": "comments",
             "project_id": 3,
             "reportType": "TEIMP",
-            "reportDueDate": "2023-06-01T00:00:00-07:00",
-            "submittedDate": "2023-06-15T00:00:00-07:00",
+            "reportDueDate": "2023-06-01T00:00:00+00:00",
+            "submittedDate": "2023-06-15T00:00:00+00:00",
             "reportingRequirementIndex": 1
             }'::jsonb,
         'create',
@@ -128,7 +128,7 @@ values
             "teimpReporting": {
               "emissionFunctionalUnit": "tCO2e",
               "targetEmissionIntensity": 466.555588,
-              "measurementPeriodEndDate": "2023-06-15T00:00:00-07:00",
+              "measurementPeriodEndDate": "2023-06-15T00:00:00+00:00",
               "productionFunctionalUnit": "unit",
               "baselineEmissionIntensity": 2569.555,
               "measurementPeriodStartDate": "2023-06-01T23: 59: 59.999-07:00",
@@ -141,13 +141,13 @@ values
             },
             "emissionFunctionalUnit": "tCO2e",
             "targetEmissionIntensity": 466.555588,
-            "measurementPeriodEndDate": "2023-06-15T00:00:00-07:00",
+            "measurementPeriodEndDate": "2023-06-15T00:00:00+00:00",
             "productionFunctionalUnit": "unit",
             "baselineEmissionIntensity": 2569.555,
-            "measurementPeriodStartDate": "2021-06-15T00:00:00-07:00",
+            "measurementPeriodStartDate": "2021-06-15T00:00:00+00:00",
             "postProjectEmissionIntensity": 654.12345678,
             "adjustedEmissionsIntensityPerformance": 95.86,
-            "dateSentToCsnr": "2023-06-22T00:00:00-07:00",
+            "dateSentToCsnr": "2023-06-22T00:00:00+00:00",
             "totalLifetimeEmissionReduction": 66,
             "reportingRequirementId": 3
           }'::jsonb,
@@ -245,16 +245,16 @@ select results_eq(
             "adjustedEmissionsIntensityPerformance": 98,
             "baselineEmissionIntensity": 324.25364,
             "comments": "comments",
-            "dateSentToCsnr": "2023-07-01T00:00:00-07:00",
+            "dateSentToCsnr": "2023-07-01T00:00:00+00:00",
             "emissionFunctionalUnit":"tCO2e",
-            "measurementPeriodEndDate":"2023-07-01T00:00:00-07:00",
-            "measurementPeriodStartDate": "2023-06-01T00:00:00-07:00",
+            "measurementPeriodEndDate":"2023-07-01T00:00:00+00:00",
+            "measurementPeriodStartDate": "2023-06-01T00:00:00+00:00",
             "postProjectEmissionIntensity": 124.35,
             "productionFunctionalUnit": "unit",
-            "reportDueDate": "2023-06-15T00:00:00-07:00",
+            "reportDueDate": "2023-06-15T00:00:00+00:00",
             "reportType": "TEIMP",
             "reportingRequirementIndex": 1,
-            "submittedDate": "2023-06-30T00:00:00-07:00",
+            "submittedDate": "2023-06-30T00:00:00+00:00",
             "targetEmissionIntensity": 23.2357,
             "totalLifetimeEmissionReduction": 44.4224,
             "projectId": 2
@@ -263,18 +263,18 @@ select results_eq(
             "comments": "comments",
             "projectId": 3,
             "reportType": "TEIMP",
-            "reportDueDate": "2023-06-01T00:00:00-07:00",
-            "submittedDate": "2023-06-15T00:00:00-07:00",
+            "reportDueDate": "2023-06-01T00:00:00+00:00",
+            "submittedDate": "2023-06-15T00:00:00+00:00",
             "reportingRequirementIndex": 1,
             "emissionFunctionalUnit": "tCO2e",
             "targetEmissionIntensity": 466.555588,
-            "measurementPeriodEndDate": "2023-06-15T00:00:00-07:00",
+            "measurementPeriodEndDate": "2023-06-15T00:00:00+00:00",
             "productionFunctionalUnit": "unit",
             "baselineEmissionIntensity": 2569.555,
-            "measurementPeriodStartDate": "2021-06-15T00:00:00-07:00",
+            "measurementPeriodStartDate": "2021-06-15T00:00:00+00:00",
             "postProjectEmissionIntensity": 654.12345678,
             "totalLifetimeEmissionReduction": 66,
-            "dateSentToCsnr": "2023-06-22T00:00:00-07:00",
+            "dateSentToCsnr": "2023-06-22T00:00:00+00:00",
             "adjustedEmissionsIntensityPerformance": 95.86,
             "totalLifetimeEmissionReduction": 66
           }'::jsonb)

From ea8088d797646c828dfb7c52a06354d271030ebb Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 20 Jul 2023 08:37:22 -0700
Subject: [PATCH 24/77] test: debug CI cypress tests

---
 .../project-revision/create-first-project-revision.cy.js  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index e1c753c2f4..12049fd47d 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -177,10 +177,10 @@ describe("when creating a project, the project page", () => {
 
     cy.fixture("e2e/mock.pdf").as("mockFile");
     cy.get("input[type=file]").selectFile("@mockFile");
-    cy.wait("@gqladdProjectAttachmentToRevisionMutation")
-      .its("response")
-      .should("have.property", "body");
-    // cy.wait(3000);
+    // cy.wait("@gqladdProjectAttachmentToRevisionMutation")
+    //   .its("response")
+    //   .should("have.property", "body");
+    cy.wait(10000);
     cy.findByText("mock.pdf").should("be.visible");
 
     cy.findByText(/Submit project attachments/i).click();

From e22887fed44c326ab7098699ee874fc5e3fd5383 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 20 Jul 2023 10:42:55 -0700
Subject: [PATCH 25/77] test: debug CI cypress tests

---
 .github/workflows/test.yml                          | 13 +++++++++++--
 .../create-first-project-revision.cy.js             | 11 +++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5137b3db6e..82ceb24a0f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -171,7 +171,8 @@ jobs:
         uses: ./.github/actions/dev-env-setup
       - name: run app locally
         uses: ./.github/actions/local-app-run
-      - name: run e2e tests
+      - name: Cypress run with env
+        uses: cypress-io/github-action@v5
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}
           CYPRESS_TEST_INTERNAL_PASSWORD: ${{ secrets.TEST_INTERNAL_PASSWORD }}
@@ -181,7 +182,15 @@ jobs:
           CYPRESS_TEST_UNAUTHORIZED_PASSWORD: ${{ secrets.TEST_UNAUTHORIZED_PASSWORD }}
           HAPPO_API_KEY: ${{ secrets.HAPPO_API_KEY }}
           HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}
-        run: yarn test:e2e
+      - name: artifacts
+        uses: actions/upload-artifact@v3
+          # add the line below to store screenshots only on failures
+          # if: failure()
+          with:
+            name: cypress-screenshots
+            path: cypress/screenshots
+            if-no-files-found: ignore # 'warn' or 'error' are also available, defaults to `warn`
+        # run: yarn test:e2e
         working-directory: ./app
 
   zap-owasp:
diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index 12049fd47d..e12c19f73c 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -4,6 +4,7 @@ describe("when creating a project, the project page", () => {
   beforeEach(() => {
     cy.intercept("POST", "http://localhost:3004/graphql", (req) => {
       aliasOperation(req, "addProjectAttachmentToRevisionMutation");
+      // aliasOperation(req, "createAttachmentMutation");
     });
     cy.useMockedTime(new Date("June 10, 2020 09:00:00"));
     cy.sqlFixture("e2e/dbReset");
@@ -177,10 +178,12 @@ describe("when creating a project, the project page", () => {
 
     cy.fixture("e2e/mock.pdf").as("mockFile");
     cy.get("input[type=file]").selectFile("@mockFile");
-    // cy.wait("@gqladdProjectAttachmentToRevisionMutation")
-    //   .its("response")
-    //   .should("have.property", "body");
-    cy.wait(10000);
+    cy.screenshot();
+
+    cy.wait("@gqladdProjectAttachmentToRevisionMutation")
+      .its("response")
+      .should("have.property", "body");
+    // cy.wait(10000);
     cy.findByText("mock.pdf").should("be.visible");
 
     cy.findByText(/Submit project attachments/i).click();

From 21249692127716c1dd7c7f815ac769ba3d1e5c77 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 20 Jul 2023 15:01:20 -0700
Subject: [PATCH 26/77] chore: add GCS auth to github e2e action

---
 .github/workflows/test.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 82ceb24a0f..1ec9e256f6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -167,12 +167,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - id: "auth"
+        name: "Authenticate to Google Cloud"
+        uses: "google-github-actions/auth@v1"
+        with:
+          credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
       - name: dev env setup
         uses: ./.github/actions/dev-env-setup
       - name: run app locally
         uses: ./.github/actions/local-app-run
-      - name: Cypress run with env
-        uses: cypress-io/github-action@v5
+      - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}
           CYPRESS_TEST_INTERNAL_PASSWORD: ${{ secrets.TEST_INTERNAL_PASSWORD }}
@@ -182,15 +186,7 @@ jobs:
           CYPRESS_TEST_UNAUTHORIZED_PASSWORD: ${{ secrets.TEST_UNAUTHORIZED_PASSWORD }}
           HAPPO_API_KEY: ${{ secrets.HAPPO_API_KEY }}
           HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}
-      - name: artifacts
-        uses: actions/upload-artifact@v3
-          # add the line below to store screenshots only on failures
-          # if: failure()
-          with:
-            name: cypress-screenshots
-            path: cypress/screenshots
-            if-no-files-found: ignore # 'warn' or 'error' are also available, defaults to `warn`
-        # run: yarn test:e2e
+        run: yarn test:e2e
         working-directory: ./app
 
   zap-owasp:

From 8a31ac0c6f67b619193978f53b51ee840cddd88f Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 20 Jul 2023 15:27:59 -0700
Subject: [PATCH 27/77] test: debug CI cypress tests

---
 .../project-revision/create-first-project-revision.cy.js  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index e12c19f73c..6ed30ffd24 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -180,10 +180,10 @@ describe("when creating a project, the project page", () => {
     cy.get("input[type=file]").selectFile("@mockFile");
     cy.screenshot();
 
-    cy.wait("@gqladdProjectAttachmentToRevisionMutation")
-      .its("response")
-      .should("have.property", "body");
-    // cy.wait(10000);
+    // cy.wait("@gqladdProjectAttachmentToRevisionMutation")
+    //   .its("response")
+    //   .should("have.property", "body");
+    cy.wait(10000);
     cy.findByText("mock.pdf").should("be.visible");
 
     cy.findByText(/Submit project attachments/i).click();

From 3d8196bd09a27db91ee50cc0b4b84aa44388e4d6 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 20 Jul 2023 15:37:56 -0700
Subject: [PATCH 28/77] chore: remove loop from discard mutation

---
 ...discard_project_attachment_form_change.sql | 14 ++++-----
 ..._project_attachment_form_change@1.10.0.sql | 30 +++++++++++++++++++
 ...discard_project_attachment_form_change.sql | 28 +++++++++++++++--
 ..._project_attachment_form_change@1.10.0.sql |  8 +++++
 schema/sqitch.plan                            |  1 +
 ..._project_attachment_form_change@1.10.0.sql |  7 +++++
 6 files changed, 76 insertions(+), 12 deletions(-)
 create mode 100644 schema/deploy/mutations/discard_project_attachment_form_change@1.10.0.sql
 create mode 100644 schema/revert/mutations/discard_project_attachment_form_change@1.10.0.sql
 create mode 100644 schema/verify/mutations/discard_project_attachment_form_change@1.10.0.sql

diff --git a/schema/deploy/mutations/discard_project_attachment_form_change.sql b/schema/deploy/mutations/discard_project_attachment_form_change.sql
index 743f7c8964..ed0ff06142 100644
--- a/schema/deploy/mutations/discard_project_attachment_form_change.sql
+++ b/schema/deploy/mutations/discard_project_attachment_form_change.sql
@@ -2,26 +2,22 @@
 
 begin;
 
-create or replace function cif.discard_project_attachment_form_change(form_change_id int)
-returns setof cif.form_change
+drop function cif.discard_project_attachment_form_change;
+create function cif.discard_project_attachment_form_change(form_change_id int)
+returns cif.form_change
 as $discard_project_attachment_form_change$
 declare
 form_change_record record;
 
 begin
 
-  for form_change_record in select * from cif.form_change
-    where id = $1
-    and form_data_table_name = 'project_attachment'
-  loop
     if form_change_record.operation = 'create' then
       delete from cif.form_change where id = $1;
-      return next form_change_record;
+      return form_change_record;
     else
       update cif.form_change set operation = 'archive' where id = $1;
-      return next form_change_record;
+      return form_change_record;
     end if;
-  end loop;
 
 end;
 
diff --git a/schema/deploy/mutations/discard_project_attachment_form_change@1.10.0.sql b/schema/deploy/mutations/discard_project_attachment_form_change@1.10.0.sql
new file mode 100644
index 0000000000..743f7c8964
--- /dev/null
+++ b/schema/deploy/mutations/discard_project_attachment_form_change@1.10.0.sql
@@ -0,0 +1,30 @@
+-- Deploy cif:mutations/discard_project_attachment_form_change to pg
+
+begin;
+
+create or replace function cif.discard_project_attachment_form_change(form_change_id int)
+returns setof cif.form_change
+as $discard_project_attachment_form_change$
+declare
+form_change_record record;
+
+begin
+
+  for form_change_record in select * from cif.form_change
+    where id = $1
+    and form_data_table_name = 'project_attachment'
+  loop
+    if form_change_record.operation = 'create' then
+      delete from cif.form_change where id = $1;
+      return next form_change_record;
+    else
+      update cif.form_change set operation = 'archive' where id = $1;
+      return next form_change_record;
+    end if;
+  end loop;
+
+end;
+
+$discard_project_attachment_form_change$ language plpgsql volatile;
+
+commit;
diff --git a/schema/revert/mutations/discard_project_attachment_form_change.sql b/schema/revert/mutations/discard_project_attachment_form_change.sql
index a0a65f5455..743f7c8964 100644
--- a/schema/revert/mutations/discard_project_attachment_form_change.sql
+++ b/schema/revert/mutations/discard_project_attachment_form_change.sql
@@ -1,8 +1,30 @@
--- Revert cif:mutations/discard_project_attachment_form_change from pg
-
+-- Deploy cif:mutations/discard_project_attachment_form_change to pg
 
 begin;
 
-drop function cif.discard_project_attachment_form_change;
+create or replace function cif.discard_project_attachment_form_change(form_change_id int)
+returns setof cif.form_change
+as $discard_project_attachment_form_change$
+declare
+form_change_record record;
+
+begin
+
+  for form_change_record in select * from cif.form_change
+    where id = $1
+    and form_data_table_name = 'project_attachment'
+  loop
+    if form_change_record.operation = 'create' then
+      delete from cif.form_change where id = $1;
+      return next form_change_record;
+    else
+      update cif.form_change set operation = 'archive' where id = $1;
+      return next form_change_record;
+    end if;
+  end loop;
+
+end;
+
+$discard_project_attachment_form_change$ language plpgsql volatile;
 
 commit;
diff --git a/schema/revert/mutations/discard_project_attachment_form_change@1.10.0.sql b/schema/revert/mutations/discard_project_attachment_form_change@1.10.0.sql
new file mode 100644
index 0000000000..a0a65f5455
--- /dev/null
+++ b/schema/revert/mutations/discard_project_attachment_form_change@1.10.0.sql
@@ -0,0 +1,8 @@
+-- Revert cif:mutations/discard_project_attachment_form_change from pg
+
+
+begin;
+
+drop function cif.discard_project_attachment_form_change;
+
+commit;
diff --git a/schema/sqitch.plan b/schema/sqitch.plan
index d20b61f7e4..5aff98f552 100644
--- a/schema/sqitch.plan
+++ b/schema/sqitch.plan
@@ -349,3 +349,4 @@ functions/handle_milestone_form_change_commit [functions/handle_milestone_form_c
 computed_columns/form_change_maximum_performance_milestone_amount 2023-07-26T16:05:38Z Brianna Cerkiewicz <briannacerkiewicz@pop-os> # Create computed column to calculate maximum performance mmilestone amount
 data/015_insert_json_schema_form_data_add_max_performance_milestone 2023-07-26T20:23:07Z Brianna Cerkiewicz <briannacerkiewicz@pop-os> # Add new maximum performance milestone calculation to emission_intensity schema
 tables/attachment_002_delete_permission 2023-07-13T15:51:16Z Brianna Cerkiewicz <briannacerkiewicz@pop-os> # Allow hard deletion of attachments
+mutations/discard_project_attachment_form_change [mutations/discard_project_attachment_form_change@1.10.0] 2023-07-20T22:33:07Z Brianna Cerkiewicz <briannacerkiewicz@pop-os> # Remove loop from discard mutation
diff --git a/schema/verify/mutations/discard_project_attachment_form_change@1.10.0.sql b/schema/verify/mutations/discard_project_attachment_form_change@1.10.0.sql
new file mode 100644
index 0000000000..cafd09fafc
--- /dev/null
+++ b/schema/verify/mutations/discard_project_attachment_form_change@1.10.0.sql
@@ -0,0 +1,7 @@
+-- Verify cif:mutations/discard_project_attachment_form_change on pg
+
+begin;
+
+select pg_get_functiondef('cif.discard_project_attachment_form_change(int)'::regprocedure);
+
+rollback;

From 3f773f2913b93f669ca39c6d57c292b95e56f8a5 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 20 Jul 2023 15:53:13 -0700
Subject: [PATCH 29/77] chore: spec work

---
 .../Attachment/AttachmentTableRow.tsx         | 17 ++++++---
 .../Attachment/hardDeleteAttachement.tsx      |  3 +-
 .../Form/ProjectAttachmentsForm.tsx           | 35 +++++++++++++------
 .../middleware/attachmentDeleteRouter.ts      |  5 ++-
 4 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/app/components/Attachment/AttachmentTableRow.tsx b/app/components/Attachment/AttachmentTableRow.tsx
index cdf77d4734..9f84459232 100644
--- a/app/components/Attachment/AttachmentTableRow.tsx
+++ b/app/components/Attachment/AttachmentTableRow.tsx
@@ -1,8 +1,9 @@
 import { Button } from "@button-inc/bcgov-theme";
+import useDiscardProjectAttachmentFormChange from "mutations/attachment/discardProjectAttachmentFormChange";
 import Link from "next/link";
-import { getAttachmentDownloadRoute } from "routes/pageRoutes";
+// import { useEffect } from "react";
 import { graphql, useFragment } from "react-relay";
-import useDiscardProjectAttachmentFormChange from "mutations/attachment/discardProjectAttachmentFormChange";
+import { getAttachmentDownloadRoute } from "routes/pageRoutes";
 import { AttachmentTableRow_attachment$key } from "__generated__/AttachmentTableRow_attachment.graphql";
 import hardDeleteAttachment from "./hardDeleteAttachement";
 
@@ -12,6 +13,8 @@ interface Props {
   formChangeRowId: number;
   hideDelete?: boolean;
   isFirstRevision: boolean;
+  triggerRefresh?: boolean;
+  setTriggerRefresh?: any;
 }
 
 const AttachmentTableRow: React.FC<Props> = ({
@@ -20,6 +23,8 @@ const AttachmentTableRow: React.FC<Props> = ({
   formChangeRowId,
   hideDelete,
   isFirstRevision,
+  triggerRefresh,
+  setTriggerRefresh,
 }) => {
   const [
     discardProjectAttachmentFormChange,
@@ -40,14 +45,16 @@ const AttachmentTableRow: React.FC<Props> = ({
     `,
     attachment
   );
+
   if (!attachmentRow) return null;
-  console.log("attachment", attachment);
-  console.log("attachmentRow", attachmentRow);
   const { id, fileName, fileType, fileSize, createdAt, cifUserByCreatedBy } =
     attachmentRow;
+
   const handleArchiveAttachment = (attachmentId) => {
     if (isFirstRevision) {
-      hardDeleteAttachment(attachmentId, formChangeRowId, connectionId);
+      console.log("in if handlearchiveattachment");
+      hardDeleteAttachment(attachmentId, formChangeRowId);
+      setTriggerRefresh(!triggerRefresh);
     } else {
       discardProjectAttachmentFormChange({
         variables: {
diff --git a/app/components/Attachment/hardDeleteAttachement.tsx b/app/components/Attachment/hardDeleteAttachement.tsx
index d63c213be9..401824c216 100644
--- a/app/components/Attachment/hardDeleteAttachement.tsx
+++ b/app/components/Attachment/hardDeleteAttachement.tsx
@@ -1,6 +1,6 @@
 import { getAttachmentDeleteRoute } from "routes/pageRoutes";
 
-const hardDeleteAttachment = (attachmentId, formChangeRowId, connectionId) => {
+const hardDeleteAttachment = (attachmentId, formChangeRowId) => {
   fetch(getAttachmentDeleteRoute(attachmentId).pathname, {
     method: "DELETE",
     headers: { "Content-Type": "application/json" },
@@ -9,7 +9,6 @@ const hardDeleteAttachment = (attachmentId, formChangeRowId, connectionId) => {
         input: {
           formChangeId: formChangeRowId,
         },
-        connections: [connectionId],
       },
     }),
   });
diff --git a/app/components/Form/ProjectAttachmentsForm.tsx b/app/components/Form/ProjectAttachmentsForm.tsx
index 81b8c4c7c4..1686454457 100644
--- a/app/components/Form/ProjectAttachmentsForm.tsx
+++ b/app/components/Form/ProjectAttachmentsForm.tsx
@@ -9,6 +9,7 @@ import { useCreateAttachment } from "mutations/attachment/createAttachment";
 import { graphql, useFragment } from "react-relay";
 import { ProjectAttachmentsForm_projectRevision$key } from "__generated__/ProjectAttachmentsForm_projectRevision.graphql";
 import { useStageFormChange } from "mutations/FormChange/stageFormChange";
+import { useState } from "react";
 
 const tableFilters = [
   new TextFilter("File Name", "fileName"),
@@ -28,9 +29,10 @@ const ProjectAttachmentsForm: React.FC<Props> = ({
   projectRevision,
   onSubmit,
 }) => {
-  const { rowId, projectAttachmentFormChanges, isFirstRevision } = useFragment(
+  const brianna = useFragment(
     graphql`
       fragment ProjectAttachmentsForm_projectRevision on ProjectRevision {
+        id
         rowId
         isFirstRevision
         projectAttachmentFormChanges: formChangesFor(
@@ -58,6 +60,14 @@ const ProjectAttachmentsForm: React.FC<Props> = ({
     projectRevision
   );
 
+  const [triggerRefresh, setTriggerRefresh] = useState(false);
+
+  // brianna - this is infinite rendering but it doesn't seem to trigger relay anyway
+  // useEffect(
+  //   () => setTriggerRefresh && setTriggerRefresh(!triggerRefresh),
+  //   [triggerRefresh]
+  // );
+  const { rowId, projectAttachmentFormChanges, isFirstRevision } = brianna;
   const attachmentFormChange = projectAttachmentFormChanges.edges[0]?.node;
   const [createAttachment, isCreatingAttachment] = useCreateAttachment();
   const [createProjectAttachment, isCreatingProjectAttachment] =
@@ -144,15 +154,20 @@ const ProjectAttachmentsForm: React.FC<Props> = ({
         totalRowCount={projectAttachmentFormChanges.totalCount}
         filters={tableFilters}
       >
-        {projectAttachmentFormChanges.edges.map(({ node }) => (
-          <AttachmentTableRow
-            key={node.id}
-            attachment={node.asProjectAttachment.attachmentByAttachmentId}
-            formChangeRowId={node.rowId}
-            connectionId={projectAttachmentFormChanges.__id}
-            isFirstRevision={isFirstRevision}
-          />
-        ))}
+        {projectAttachmentFormChanges.edges.map(({ node }) => {
+          if (!node) return null;
+          return (
+            <AttachmentTableRow
+              key={node.id}
+              attachment={node.asProjectAttachment.attachmentByAttachmentId}
+              formChangeRowId={node.rowId}
+              connectionId={projectAttachmentFormChanges.__id}
+              isFirstRevision={isFirstRevision}
+              triggerRefresh={triggerRefresh}
+              setTriggerRefresh={setTriggerRefresh}
+            />
+          );
+        })}
       </Table>
       <Button
         type="submit"
diff --git a/app/server/middleware/attachmentDeleteRouter.ts b/app/server/middleware/attachmentDeleteRouter.ts
index b80a41137e..32092b2dc9 100644
--- a/app/server/middleware/attachmentDeleteRouter.ts
+++ b/app/server/middleware/attachmentDeleteRouter.ts
@@ -14,11 +14,10 @@ const attachmentDetailsQuery = `query AttachmentDetailsQuery($attachmentId: ID!)
 
 const discardProjectAttachmentFormChangeMutation = `mutation discardProjectAttachmentFormChangeMutation(
   $input: DiscardProjectAttachmentFormChangeInput!
-  $connections: [ID!]!
 ) {
   discardProjectAttachmentFormChange(input: $input) {
     formChanges {
-      id @deleteEdge(connections: $connections)
+      id
     }
   }
 }`;
@@ -55,7 +54,7 @@ export const handleDelete = async (req, res, next) => {
       req.body.variables,
       req
     );
-
+    // brianna this isn't working since change to the discard mutation
     console.log("attachmentFormChangeResponse", attachmentFormChangeResponse);
 
     // delete the attachment from the attachment table

From 51395b30c59ad4175e7c7f0061412e6557a4191a Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 21 Jul 2023 09:22:22 -0700
Subject: [PATCH 30/77] chore: refresh after delete

---
 app/components/Attachment/AttachmentTableRow.tsx |  9 +++------
 app/components/Form/ProjectAttachmentsForm.tsx   | 10 ----------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/app/components/Attachment/AttachmentTableRow.tsx b/app/components/Attachment/AttachmentTableRow.tsx
index 9f84459232..6ed59b52b8 100644
--- a/app/components/Attachment/AttachmentTableRow.tsx
+++ b/app/components/Attachment/AttachmentTableRow.tsx
@@ -1,11 +1,11 @@
 import { Button } from "@button-inc/bcgov-theme";
 import useDiscardProjectAttachmentFormChange from "mutations/attachment/discardProjectAttachmentFormChange";
 import Link from "next/link";
-// import { useEffect } from "react";
 import { graphql, useFragment } from "react-relay";
 import { getAttachmentDownloadRoute } from "routes/pageRoutes";
 import { AttachmentTableRow_attachment$key } from "__generated__/AttachmentTableRow_attachment.graphql";
 import hardDeleteAttachment from "./hardDeleteAttachement";
+import { useRouter } from "next/router";
 
 interface Props {
   attachment: AttachmentTableRow_attachment$key;
@@ -13,8 +13,6 @@ interface Props {
   formChangeRowId: number;
   hideDelete?: boolean;
   isFirstRevision: boolean;
-  triggerRefresh?: boolean;
-  setTriggerRefresh?: any;
 }
 
 const AttachmentTableRow: React.FC<Props> = ({
@@ -23,8 +21,6 @@ const AttachmentTableRow: React.FC<Props> = ({
   formChangeRowId,
   hideDelete,
   isFirstRevision,
-  triggerRefresh,
-  setTriggerRefresh,
 }) => {
   const [
     discardProjectAttachmentFormChange,
@@ -46,6 +42,7 @@ const AttachmentTableRow: React.FC<Props> = ({
     attachment
   );
 
+  const router = useRouter();
   if (!attachmentRow) return null;
   const { id, fileName, fileType, fileSize, createdAt, cifUserByCreatedBy } =
     attachmentRow;
@@ -54,7 +51,7 @@ const AttachmentTableRow: React.FC<Props> = ({
     if (isFirstRevision) {
       console.log("in if handlearchiveattachment");
       hardDeleteAttachment(attachmentId, formChangeRowId);
-      setTriggerRefresh(!triggerRefresh);
+      router.replace(router.asPath);
     } else {
       discardProjectAttachmentFormChange({
         variables: {
diff --git a/app/components/Form/ProjectAttachmentsForm.tsx b/app/components/Form/ProjectAttachmentsForm.tsx
index 1686454457..73fb3b98b4 100644
--- a/app/components/Form/ProjectAttachmentsForm.tsx
+++ b/app/components/Form/ProjectAttachmentsForm.tsx
@@ -9,7 +9,6 @@ import { useCreateAttachment } from "mutations/attachment/createAttachment";
 import { graphql, useFragment } from "react-relay";
 import { ProjectAttachmentsForm_projectRevision$key } from "__generated__/ProjectAttachmentsForm_projectRevision.graphql";
 import { useStageFormChange } from "mutations/FormChange/stageFormChange";
-import { useState } from "react";
 
 const tableFilters = [
   new TextFilter("File Name", "fileName"),
@@ -60,13 +59,6 @@ const ProjectAttachmentsForm: React.FC<Props> = ({
     projectRevision
   );
 
-  const [triggerRefresh, setTriggerRefresh] = useState(false);
-
-  // brianna - this is infinite rendering but it doesn't seem to trigger relay anyway
-  // useEffect(
-  //   () => setTriggerRefresh && setTriggerRefresh(!triggerRefresh),
-  //   [triggerRefresh]
-  // );
   const { rowId, projectAttachmentFormChanges, isFirstRevision } = brianna;
   const attachmentFormChange = projectAttachmentFormChanges.edges[0]?.node;
   const [createAttachment, isCreatingAttachment] = useCreateAttachment();
@@ -163,8 +155,6 @@ const ProjectAttachmentsForm: React.FC<Props> = ({
               formChangeRowId={node.rowId}
               connectionId={projectAttachmentFormChanges.__id}
               isFirstRevision={isFirstRevision}
-              triggerRefresh={triggerRefresh}
-              setTriggerRefresh={setTriggerRefresh}
             />
           );
         })}

From ed8f5ba6d47e201974cfda63fd4f6405e8d2096a Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 21 Jul 2023 10:04:17 -0700
Subject: [PATCH 31/77] test: debug CI cypress tests

---
 .github/workflows/test.yml                                 | 1 +
 .../project-revision/create-first-project-revision.cy.js   | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1ec9e256f6..dc4749ceab 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -177,6 +177,7 @@ jobs:
       - name: run app locally
         uses: ./.github/actions/local-app-run
       - name: run e2e tests
+        uses: mxschmitt/action-tmate@v3
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}
           CYPRESS_TEST_INTERNAL_PASSWORD: ${{ secrets.TEST_INTERNAL_PASSWORD }}
diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index 6ed30ffd24..5cca6ff38d 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -180,10 +180,9 @@ describe("when creating a project, the project page", () => {
     cy.get("input[type=file]").selectFile("@mockFile");
     cy.screenshot();
 
-    // cy.wait("@gqladdProjectAttachmentToRevisionMutation")
-    //   .its("response")
-    //   .should("have.property", "body");
-    cy.wait(10000);
+    cy.wait("@gqladdProjectAttachmentToRevisionMutation")
+      .its("response")
+      .should("have.property", "body");
     cy.findByText("mock.pdf").should("be.visible");
 
     cy.findByText(/Submit project attachments/i).click();

From f8d9309452e295b49d8c7ff449755b294cdb9dde Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 21 Jul 2023 11:08:23 -0700
Subject: [PATCH 32/77] chore: spec work

---
 app/server/middleware/attachmentDeleteRouter.ts   | 4 ++--
 app/server/middleware/attachmentDownloadRouter.ts | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/server/middleware/attachmentDeleteRouter.ts b/app/server/middleware/attachmentDeleteRouter.ts
index 32092b2dc9..414983f290 100644
--- a/app/server/middleware/attachmentDeleteRouter.ts
+++ b/app/server/middleware/attachmentDeleteRouter.ts
@@ -16,7 +16,7 @@ const discardProjectAttachmentFormChangeMutation = `mutation discardProjectAttac
   $input: DiscardProjectAttachmentFormChangeInput!
 ) {
   discardProjectAttachmentFormChange(input: $input) {
-    formChanges {
+    formChange {
       id
     }
   }
@@ -54,7 +54,7 @@ export const handleDelete = async (req, res, next) => {
       req.body.variables,
       req
     );
-    // brianna this isn't working since change to the discard mutation
+    // brianna this isn't working since change to the discard mutation--I think this middleware isn't actually transactional. If this doesn't work the next mutation still fires
     console.log("attachmentFormChangeResponse", attachmentFormChangeResponse);
 
     // delete the attachment from the attachment table
diff --git a/app/server/middleware/attachmentDownloadRouter.ts b/app/server/middleware/attachmentDownloadRouter.ts
index b3bed2a8f0..8818bd505f 100644
--- a/app/server/middleware/attachmentDownloadRouter.ts
+++ b/app/server/middleware/attachmentDownloadRouter.ts
@@ -5,8 +5,6 @@ import config from "../../config";
 
 const attachmentDownloadRouter = Router();
 
-// this would be a graphql mutation deleting the file. AttachmentDetailsDeleteMutation
-// add some documentationv
 const attachmentDetailsQuery = `query AttachmentDetailsQuery($attachmentId: ID!){
   attachment(id: $attachmentId) {
     file
@@ -54,7 +52,7 @@ export const handleDownload = async (req, res, next) => {
     next(error);
   }
 };
-// whichever route makes the most sense, readability
+
 attachmentDownloadRouter.get("/download/:attachmentId", handleDownload);
 
 export default attachmentDownloadRouter;

From 7e009e224ccd0794ec26e96c151cfa317d0f83c1 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 21 Jul 2023 11:42:54 -0700
Subject: [PATCH 33/77] chore: remove loop from discard mutation

---
 .../discard_project_attachment_form_change.sql     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/schema/deploy/mutations/discard_project_attachment_form_change.sql b/schema/deploy/mutations/discard_project_attachment_form_change.sql
index ed0ff06142..dddda2ac2e 100644
--- a/schema/deploy/mutations/discard_project_attachment_form_change.sql
+++ b/schema/deploy/mutations/discard_project_attachment_form_change.sql
@@ -11,14 +11,14 @@ form_change_record record;
 
 begin
 
-    if form_change_record.operation = 'create' then
-      delete from cif.form_change where id = $1;
-      return form_change_record;
-    else
-      update cif.form_change set operation = 'archive' where id = $1;
-      return form_change_record;
-    end if;
+  select * from cif.form_change where id = $1 into form_change_record;
 
+  if form_change_record.operation = 'create' then
+    delete from cif.form_change where id = form_change_record.id;
+  else
+    update cif.form_change set operation = 'archive' where id = form_change_record.id;
+  end if;
+  return form_change_record;
 end;
 
 $discard_project_attachment_form_change$ language plpgsql volatile;

From 4b6ce7cb7b6d34380eae05a2fe867e07c9af4b2d Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 21 Jul 2023 11:48:47 -0700
Subject: [PATCH 34/77] chore: spec work

---
 .../discardProjectAttachmentFormChange.ts     |   2 +-
 app/schema/schema.graphql                     |  26 +++-
 app/schema/schema.json                        | 113 ++++++++++++++++--
 3 files changed, 132 insertions(+), 9 deletions(-)

diff --git a/app/mutations/attachment/discardProjectAttachmentFormChange.ts b/app/mutations/attachment/discardProjectAttachmentFormChange.ts
index 547c3bb514..1896c55dbf 100644
--- a/app/mutations/attachment/discardProjectAttachmentFormChange.ts
+++ b/app/mutations/attachment/discardProjectAttachmentFormChange.ts
@@ -8,7 +8,7 @@ const mutation = graphql`
     $connections: [ID!]!
   ) {
     discardProjectAttachmentFormChange(input: $input) {
-      formChanges {
+      formChange {
         projectRevisionByProjectRevisionId {
           ...TaskList_projectRevision
         }
diff --git a/app/schema/schema.graphql b/app/schema/schema.graphql
index db36bdb582..3fe5cd67da 100644
--- a/app/schema/schema.graphql
+++ b/app/schema/schema.graphql
@@ -44200,12 +44200,36 @@ input DiscardProjectAttachmentFormChangeInput {
 
 """The output of our `discardProjectAttachmentFormChange` mutation."""
 type DiscardProjectAttachmentFormChangePayload {
+  """Reads a single `ChangeStatus` that is related to this `FormChange`."""
+  changeStatusByChangeStatus: ChangeStatus
+
+  """Reads a single `CifUser` that is related to this `FormChange`."""
+  cifUserByCreatedBy: CifUser
+
+  """Reads a single `CifUser` that is related to this `FormChange`."""
+  cifUserByUpdatedBy: CifUser
+
   """
   The exact same `clientMutationId` that was provided in the mutation input,
   unchanged and unused. May be used by a client to track mutations.
   """
   clientMutationId: String
-  formChanges: [FormChange]
+
+  """Reads a single `Form` that is related to this `FormChange`."""
+  formByJsonSchemaName: Form
+  formChange: FormChange
+
+  """Reads a single `FormChange` that is related to this `FormChange`."""
+  formChangeByPreviousFormChangeId: FormChange
+
+  """An edge for our `FormChange`. May be used by Relay 1."""
+  formChangeEdge(
+    """The method to use when ordering `FormChange`."""
+    orderBy: [FormChangesOrderBy!] = [PRIMARY_KEY_ASC]
+  ): FormChangesEdge
+
+  """Reads a single `ProjectRevision` that is related to this `FormChange`."""
+  projectRevisionByProjectRevisionId: ProjectRevision
 
   """
   Our root query field type. Allows us to run any query from our mutation payload.
diff --git a/app/schema/schema.json b/app/schema/schema.json
index 186573999c..30a5ee446b 100644
--- a/app/schema/schema.json
+++ b/app/schema/schema.json
@@ -146181,6 +146181,42 @@
           "name": "DiscardProjectAttachmentFormChangePayload",
           "description": "The output of our `discardProjectAttachmentFormChange` mutation.",
           "fields": [
+            {
+              "name": "changeStatusByChangeStatus",
+              "description": "Reads a single `ChangeStatus` that is related to this `FormChange`.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "ChangeStatus",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "cifUserByCreatedBy",
+              "description": "Reads a single `CifUser` that is related to this `FormChange`.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CifUser",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "cifUserByUpdatedBy",
+              "description": "Reads a single `CifUser` that is related to this `FormChange`.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "CifUser",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "clientMutationId",
               "description": "The exact same `clientMutationId` that was provided in the mutation input,\nunchanged and unused. May be used by a client to track mutations.",
@@ -146194,17 +146230,80 @@
               "deprecationReason": null
             },
             {
-              "name": "formChanges",
+              "name": "formByJsonSchemaName",
+              "description": "Reads a single `Form` that is related to this `FormChange`.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "Form",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "formChange",
               "description": null,
               "args": [],
               "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "OBJECT",
-                  "name": "FormChange",
-                  "ofType": null
+                "kind": "OBJECT",
+                "name": "FormChange",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "formChangeByPreviousFormChangeId",
+              "description": "Reads a single `FormChange` that is related to this `FormChange`.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "FormChange",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "formChangeEdge",
+              "description": "An edge for our `FormChange`. May be used by Relay 1.",
+              "args": [
+                {
+                  "name": "orderBy",
+                  "description": "The method to use when ordering `FormChange`.",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "NON_NULL",
+                      "name": null,
+                      "ofType": {
+                        "kind": "ENUM",
+                        "name": "FormChangesOrderBy",
+                        "ofType": null
+                      }
+                    }
+                  },
+                  "defaultValue": "[PRIMARY_KEY_ASC]"
                 }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "FormChangesEdge",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "projectRevisionByProjectRevisionId",
+              "description": "Reads a single `ProjectRevision` that is related to this `FormChange`.",
+              "args": [],
+              "type": {
+                "kind": "OBJECT",
+                "name": "ProjectRevision",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null

From 683b97cc9083a6edcc06437e157dfdc2e5c06997 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 21 Jul 2023 13:19:17 -0700
Subject: [PATCH 35/77] chore: debug cypress CI

---
 .github/workflows/test.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dc4749ceab..cefc88402f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -176,8 +176,9 @@ jobs:
         uses: ./.github/actions/dev-env-setup
       - name: run app locally
         uses: ./.github/actions/local-app-run
-      - name: run e2e tests
+      - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
+      - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}
           CYPRESS_TEST_INTERNAL_PASSWORD: ${{ secrets.TEST_INTERNAL_PASSWORD }}
@@ -187,7 +188,7 @@ jobs:
           CYPRESS_TEST_UNAUTHORIZED_PASSWORD: ${{ secrets.TEST_UNAUTHORIZED_PASSWORD }}
           HAPPO_API_KEY: ${{ secrets.HAPPO_API_KEY }}
           HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}
-        run: yarn test:e2e
+        # run: yarn test:e2e
         working-directory: ./app
 
   zap-owasp:

From 8fda6aeb9dac7a9758343143f40d48cae212fb29 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 24 Jul 2023 07:34:59 -0700
Subject: [PATCH 36/77] chore: debug cypress CI

---
 .github/workflows/test.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cefc88402f..4f5cf3ac1b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -167,17 +167,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - id: "auth"
-        name: "Authenticate to Google Cloud"
-        uses: "google-github-actions/auth@v1"
-        with:
-          credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
+      # - id: "auth"
+      #   name: "Authenticate to Google Cloud"
+      #   uses: "google-github-actions/auth@v1"
+      #   with:
+      #     credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
       - name: dev env setup
         uses: ./.github/actions/dev-env-setup
       - name: run app locally
         uses: ./.github/actions/local-app-run
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
       - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}

From 9b1a7f782cd577b903a187b633da4db3c2544929 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 24 Jul 2023 07:38:05 -0700
Subject: [PATCH 37/77] chore: debug cypress CI

---
 .github/workflows/test.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4f5cf3ac1b..5137b3db6e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -167,17 +167,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      # - id: "auth"
-      #   name: "Authenticate to Google Cloud"
-      #   uses: "google-github-actions/auth@v1"
-      #   with:
-      #     credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
       - name: dev env setup
         uses: ./.github/actions/dev-env-setup
       - name: run app locally
         uses: ./.github/actions/local-app-run
-      # - name: Setup tmate session
-      #   uses: mxschmitt/action-tmate@v3
       - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}
@@ -188,7 +181,7 @@ jobs:
           CYPRESS_TEST_UNAUTHORIZED_PASSWORD: ${{ secrets.TEST_UNAUTHORIZED_PASSWORD }}
           HAPPO_API_KEY: ${{ secrets.HAPPO_API_KEY }}
           HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}
-        # run: yarn test:e2e
+        run: yarn test:e2e
         working-directory: ./app
 
   zap-owasp:

From f5fc5e5d06e67a443611159311e9fd427e82c442 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 24 Jul 2023 07:39:19 -0700
Subject: [PATCH 38/77] chore: debug cypress CI

---
 .github/workflows/test.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5137b3db6e..1ec9e256f6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -167,6 +167,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - id: "auth"
+        name: "Authenticate to Google Cloud"
+        uses: "google-github-actions/auth@v1"
+        with:
+          credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
       - name: dev env setup
         uses: ./.github/actions/dev-env-setup
       - name: run app locally

From aa109e74834a5b6b4017dca077ce23ac5a9b9365 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 24 Jul 2023 07:40:38 -0700
Subject: [PATCH 39/77] chore: debug cypress CI

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1ec9e256f6..118c77ecae 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -174,6 +174,8 @@ jobs:
           credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
       - name: dev env setup
         uses: ./.github/actions/dev-env-setup
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
       - name: run app locally
         uses: ./.github/actions/local-app-run
       - name: run e2e tests

From 9689b56c534562b7e37aa528c9d8844a236e5a4e Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 24 Jul 2023 08:23:09 -0700
Subject: [PATCH 40/77] chore: debug cypress CI-bucket error

---
 .../create-first-project-revision.cy.js       | 300 +++++++++---------
 app/mutations/attachment/createAttachment.ts  |   3 +-
 app/mutations/useMutationWithErrorMessage.ts  |   1 +
 3 files changed, 156 insertions(+), 148 deletions(-)

diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index 5cca6ff38d..ab8fef403a 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -25,161 +25,167 @@ describe("when creating a project, the project page", () => {
 
     // add overview
     cy.url().should("include", "/form/0");
-    cy.findByText("Emissions Performance - 2020");
-    cy.fillOverviewForm(
-      "first operator legal name (AB1234567)",
-      "Cement",
-      "TEST-123-12345",
-      "Foo",
-      "Bar",
-      "100",
-      "Project in Progress",
-      "Some comments",
-      "78.456"
-    );
-    cy.contains("Changes saved").should("be.visible");
-    cy.findByText("Rank").next().should("have.text", "1");
-    cy.happoAndAxe("Project Overview Form", "filled", "main", true);
-    cy.findByRole("button", { name: /^submit/i }).click();
-
-    // add managers
-    cy.url().should("include", "/form/1");
-    cy.fillManagersForm("Swanson", "Ludgate", "Knope");
-    cy.contains("Changes saved").should("be.visible");
-    cy.wait(1000);
-    cy.happoAndAxe("Project manager Form", "filled", "main");
-    cy.findByRole("button", { name: /^submit/i }).click();
-
-    // add contacts
-    cy.url().should("include", "/form/2");
-    cy.fillContactsForm(
-      "Loblaw003",
-      "bob.l003@example.com",
-      "Loblaw004",
-      "bob.l004@example.com"
-    );
-    cy.contains("Changes saved").should("be.visible");
-    cy.happoAndAxe("Project Contacts Form", "filled", "main");
-    cy.findByRole("button", { name: /^submit/i }).click();
-
-    // add budgets, expenses, and payments
-    cy.url().should("include", "/form/3");
-    cy.findByText(/Yes/i).click();
-    cy.contains("Changes saved").should("be.visible");
-    // checking default values
-    cy.get('[aria-label="Province\'s Share Percentage"]').should(
-      "have.value",
-      "50.00 %"
-    );
-    cy.get('[aria-label="Performance Milestone Holdback Percentage"]').should(
-      "have.value",
-      "10.00 %"
-    );
-
-    cy.fillFundingAgreementForm(
-      222,
-      60,
-      333,
-      800,
-      "2020-01-01",
-      "2020-02-02",
-      20
-    );
-    cy.findByText(/Total Project Value$/i)
-      .next()
-      .should("have.text", "$1,022.00"); // check that calculated value updates
-    cy.findByText(/Proponent's Share Percentage$/i)
-      .next()
-      .should("have.text", "78.27%"); // check that calculated value updates
-
-    cy.findByRole("button", { name: /Add funding source/i }).click();
-    cy.fillAdditionalFundingSourceForm("Test Source 1", 111, "Approved", 1);
-    cy.contains("Changes saved").should("be.visible");
-    cy.happoAndAxe("EP Project budgets Form", "filled", "main");
-    cy.findByRole("button", { name: /^submit/i }).click();
+    // cy.findByText("Emissions Performance - 2020");
+    // cy.fillOverviewForm(
+    //   "first operator legal name (AB1234567)",
+    //   "Cement",
+    //   "TEST-123-12345",
+    //   "Foo",
+    //   "Bar",
+    //   "100",
+    //   "Project in Progress",
+    //   "Some comments",
+    //   "78.456"
+    // );
+    // cy.contains("Changes saved").should("be.visible");
+    // cy.findByText("Rank").next().should("have.text", "1");
+    // cy.happoAndAxe("Project Overview Form", "filled", "main", true);
+    // cy.findByRole("button", { name: /^submit/i }).click();
+
+    // // add managers
+    // cy.url().should("include", "/form/1");
+    // cy.fillManagersForm("Swanson", "Ludgate", "Knope");
+    // cy.contains("Changes saved").should("be.visible");
+    // cy.wait(1000);
+    // cy.happoAndAxe("Project manager Form", "filled", "main");
+    // cy.findByRole("button", { name: /^submit/i }).click();
+
+    // // add contacts
+    // cy.url().should("include", "/form/2");
+    // cy.fillContactsForm(
+    //   "Loblaw003",
+    //   "bob.l003@example.com",
+    //   "Loblaw004",
+    //   "bob.l004@example.com"
+    // );
+    // cy.contains("Changes saved").should("be.visible");
+    // cy.happoAndAxe("Project Contacts Form", "filled", "main");
+    // cy.findByRole("button", { name: /^submit/i }).click();
+
+    // // add budgets, expenses, and payments
+    // cy.url().should("include", "/form/3");
+    // cy.findByText(/Yes/i).click();
+    // cy.contains("Changes saved").should("be.visible");
+    // // checking default values
+    // cy.get('[aria-label="Province\'s Share Percentage"]').should(
+    //   "have.value",
+    //   "50.00 %"
+    // );
+    // cy.get('[aria-label="Performance Milestone Holdback Percentage"]').should(
+    //   "have.value",
+    //   "10.00 %"
+    // );
+
+    // cy.fillFundingAgreementForm(
+    //   222,
+    //   60,
+    //   333,
+    //   800,
+    //   "2020-01-01",
+    //   "2020-02-02",
+    //   20
+    // );
+    // cy.findByText(/Total Project Value$/i)
+    //   .next()
+    //   .should("have.text", "$1,022.00"); // check that calculated value updates
+    // cy.findByText(/Proponent's Share Percentage$/i)
+    //   .next()
+    //   .should("have.text", "78.27%"); // check that calculated value updates
+
+    // cy.findByRole("button", { name: /Add funding source/i }).click();
+    // cy.fillAdditionalFundingSourceForm("Test Source 1", 111, "Approved", 1);
+    // cy.contains("Changes saved").should("be.visible");
+    // cy.happoAndAxe("EP Project budgets Form", "filled", "main");
+    // cy.findByRole("button", { name: /^submit/i }).click();
 
     // add milestone reports
-    cy.addMilestoneReport(
-      1,
-      "desc",
-      "General",
-      "1991-05-17",
-      "Professional Engineer",
-      true,
-      "2020-01-01",
-      "2020-01-01"
-    );
-    cy.contains("Changes saved").should("be.visible");
-    cy.get('[aria-label*="Report Due Date"').contains(/Jun(\.)? 16, 1991/i);
-    cy.get('[aria-label="Gross Payment Amount This Milestone"]').contains(
-      "$60.00"
-    );
-    cy.get('[aria-label="Net Payment Amount This Milestone"]').contains(
-      "$48.00"
-    );
-    cy.get('[aria-label="Holdback Amount This Milestone"]').contains("$12.00");
-    cy.happoAndAxe("Project milestone reports Form", "filled", "main");
-    cy.findByRole("button", { name: /^submit/i }).click();
-
-    // add emissions intensity reports
-    cy.url().should("include", "/form/5");
-    cy.findByRole("button", {
-      name: /Add Emissions Intensity Report/i,
-    }).click();
-    cy.findByLabelText(/^Functional Unit/i).should("have.value", "tCO2e");
-    cy.findAllByText("tCO2e").should("have.length", 4);
-    cy.addEmissionIntensityReport(
-      "2022-01-01",
-      "2022-02-02",
-      "tCO",
-      "1",
-      "2",
-      "3",
-      "G",
-      100
-    );
-    cy.contains(/Duration: 1 month, 1 day/i).should("be.visible");
-    cy.contains("Changes saved").should("be.visible");
-    cy.findByLabelText("GHG Emission Intensity Performance").should(
-      "have.text",
-      "200.00%"
-    );
-    cy.findByLabelText(
-      "Payment Percentage of Performance Milestone Amount (%)"
-    ).should("have.text", "100.00%");
-    cy.findByLabelText("Maximum Performance Milestone Amount").should(
-      "have.text",
-      "$12.00"
-    );
-    cy.findByLabelText("Actual Performance Milestone Amount").should(
-      "have.text",
-      "$12.00"
-    );
-    cy.happoAndAxe("Emission Intensity Form", "filled", "main");
-    cy.findByText(/Submit Emissions Intensity Report/).click();
-
-    // Add Quarterly Reports
-    cy.url().should("include", "/form/6");
-    cy.addQuarterlyReport(1, "2020-01-01", "2020-02-02", "1st comment");
-    cy.addQuarterlyReport(2, "2022-01-01", "2022-02-02", "2nd comment");
-    cy.findAllByRole("status").first().should("have.text", "Complete");
-    cy.contains("Changes saved").should("be.visible");
-    cy.happoAndAxe("Project quarterly reports Form", "filled", "main");
-    cy.contains("Changes saved").should("be.visible");
-    cy.findByText(/^submit/i).click();
-
-    // No annual reports
-    cy.url().should("include", "/form/7");
-    cy.findByText(/Submit Annual Reports/i).click();
+    // cy.addMilestoneReport(
+    //   1,
+    //   "desc",
+    //   "General",
+    //   "1991-05-17",
+    //   "Professional Engineer",
+    //   true,
+    //   "2020-01-01",
+    //   "2020-01-01"
+    // );
+    // cy.contains("Changes saved").should("be.visible");
+    // cy.get('[aria-label*="Report Due Date"').contains(/Jun(\.)? 16, 1991/i);
+    // cy.get('[aria-label="Gross Payment Amount This Milestone"]').contains(
+    //   "$60.00"
+    // );
+    // cy.get('[aria-label="Net Payment Amount This Milestone"]').contains(
+    //   "$48.00"
+    // );
+    // cy.get('[aria-label="Holdback Amount This Milestone"]').contains("$12.00");
+    // cy.happoAndAxe("Project milestone reports Form", "filled", "main");
+    // cy.findByRole("button", { name: /^submit/i }).click();
+    
+
+    // // add emissions intensity reports
+    // cy.url().should("include", "/form/5");
+    // cy.findByRole("button", {
+    //   name: /Add Emissions Intensity Report/i,
+    // }).click();
+    // cy.findByLabelText(/^Functional Unit/i).should("have.value", "tCO2e");
+    // cy.findAllByText("tCO2e").should("have.length", 4);
+    // cy.addEmissionIntensityReport(
+    //   "2022-01-01",
+    //   "2022-02-02",
+    //   "tCO",
+    //   "1",
+    //   "2",
+    //   "3",
+    //   "G",
+    //   100
+    // );
+    // cy.contains(/Duration: 1 month, 1 day/i).should("be.visible");
+    // cy.contains("Changes saved").should("be.visible");
+    // cy.findByLabelText("GHG Emission Intensity Performance").should(
+    //   "have.text",
+    //   "200.00%"
+    // );
+    // cy.findByLabelText(
+    //   "Payment Percentage of Performance Milestone Amount (%)"
+    // ).should("have.text", "100.00%");
+    // cy.findByLabelText("Maximum Performance Milestone Amount").should(
+    //   "have.text",
+    //   "$12.00"
+    // );
+    // cy.findByLabelText("Actual Performance Milestone Amount").should(
+    //   "have.text",
+    //   "$12.00"
+    // );
+    // cy.happoAndAxe("Emission Intensity Form", "filled", "main");
+    // cy.findByText(/Submit Emissions Intensity Report/).click();
+
+    // // Add Quarterly Reports
+    // cy.url().should("include", "/form/6");
+    // cy.addQuarterlyReport(1, "2020-01-01", "2020-02-02", "1st comment");
+    // cy.addQuarterlyReport(2, "2022-01-01", "2022-02-02", "2nd comment");
+    // cy.findAllByRole("status").first().should("have.text", "Complete");
+    // cy.contains("Changes saved").should("be.visible");
+    // cy.happoAndAxe("Project quarterly reports Form", "filled", "main");
+    // cy.contains("Changes saved").should("be.visible");
+    // cy.findByText(/^submit/i).click();
+
+    // // No annual reports
+    // cy.url().should("include", "/form/7");
+    // cy.findByText(/Submit Annual Reports/i).click();
 
     // Add attachments
-
+    // Add attachments
+    cy.findByText(/Project Attachments/i).click();
+    cy.findByText(/Add Project Attachments/i).click();
     cy.url().should("include", "/form/8");
 
     cy.fixture("e2e/mock.pdf").as("mockFile");
     cy.get("input[type=file]").selectFile("@mockFile");
-    cy.screenshot();
-
+    // cy.screenshot();
+    cy.findByText(
+      /Relay request for `createAttachmentMutation` failed by the following reasons:/i
+    ).should("exist");
+    cy.findByText(/ The specified bucket does not exist./i).should("exist");
     cy.wait("@gqladdProjectAttachmentToRevisionMutation")
       .its("response")
       .should("have.property", "body");
diff --git a/app/mutations/attachment/createAttachment.ts b/app/mutations/attachment/createAttachment.ts
index fd381f8a58..e4de4c14c0 100644
--- a/app/mutations/attachment/createAttachment.ts
+++ b/app/mutations/attachment/createAttachment.ts
@@ -20,7 +20,8 @@ const mutation = graphql`
 const useCreateAttachment = () =>
   useMutationWithErrorMessage<createAttachmentMutation>(
     mutation,
-    () => "An error occurred while attempting to create an attachment."
+    (error) =>
+      `"An error occurred while attempting to create an attachment."|${error}|`
   );
 
 export { mutation, useCreateAttachment };
diff --git a/app/mutations/useMutationWithErrorMessage.ts b/app/mutations/useMutationWithErrorMessage.ts
index de8ff42740..b5fa3bc6e0 100644
--- a/app/mutations/useMutationWithErrorMessage.ts
+++ b/app/mutations/useMutationWithErrorMessage.ts
@@ -29,6 +29,7 @@ export default function useMutationWithErrorMessage<
     const commitConfig: MutationConfig<TMutation> = {
       ...config,
       onError: (error) => {
+        console.log("error", error);
         config.onError?.(error);
         setError(getErrorMessage(error));
         Sentry.captureException(error);

From a7d7a390f1c128f5338a3e27ec42dba289f07ca6 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 24 Jul 2023 08:43:26 -0700
Subject: [PATCH 41/77] chore: debug cypress CI-missing file

---
 .github/workflows/test.yml                                    | 4 ++--
 .../cif/project-revision/create-first-project-revision.cy.js  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 118c77ecae..cdfb30ce58 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -174,8 +174,8 @@ jobs:
           credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
       - name: dev env setup
         uses: ./.github/actions/dev-env-setup
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
       - name: run app locally
         uses: ./.github/actions/local-app-run
       - name: run e2e tests
diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index ab8fef403a..d870ef31bc 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -185,7 +185,8 @@ describe("when creating a project, the project page", () => {
     cy.findByText(
       /Relay request for `createAttachmentMutation` failed by the following reasons:/i
     ).should("exist");
-    cy.findByText(/ The specified bucket does not exist./i).should("exist");
+    // cy.findByText(/ The specified bucket does not exist./i).should("exist");
+    cy.findByText(/The file at/i).should("exist");
     cy.wait("@gqladdProjectAttachmentToRevisionMutation")
       .its("response")
       .should("have.property", "body");

From eb3188974deae5f13499aa0cf7b18a20852fb528 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 24 Jul 2023 09:30:40 -0700
Subject: [PATCH 42/77] chore: debug cypress CI-tmate

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cdfb30ce58..118c77ecae 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -174,8 +174,8 @@ jobs:
           credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
       - name: dev env setup
         uses: ./.github/actions/dev-env-setup
-      # - name: Setup tmate session
-      #   uses: mxschmitt/action-tmate@v3
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
       - name: run app locally
         uses: ./.github/actions/local-app-run
       - name: run e2e tests

From 3141e11b520b52907766b374a0407dd28ad87aca Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 24 Jul 2023 10:20:01 -0700
Subject: [PATCH 43/77] chore: add to gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 44a91e988f..22c37b0f0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ cypress.env.json
 app/cypress.env.json
 dev/db/data
 **/.DS_Store
+
+gha-creds-*.json

From e6102b911854aea1e318ac2be5388182288fd731 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 24 Jul 2023 10:22:37 -0700
Subject: [PATCH 44/77] chore: debug cypress CI-reorder CI steps

---
 .github/workflows/test.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 118c77ecae..2716aea28e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -167,17 +167,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - id: "auth"
-        name: "Authenticate to Google Cloud"
-        uses: "google-github-actions/auth@v1"
-        with:
-          credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
       - name: dev env setup
         uses: ./.github/actions/dev-env-setup
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
       - name: run app locally
         uses: ./.github/actions/local-app-run
+      - id: "auth"
+        name: "Authenticate to Google Cloud"
+        uses: "google-github-actions/auth@v1"
+        with:
+          credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
       - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}

From c27cb1beb76e12bf54fc2dfd9f38ab89d21dfe53 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 24 Jul 2023 10:36:25 -0700
Subject: [PATCH 45/77] chore: debug cypress CI--try to set default credentials

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2716aea28e..5adef6987e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -178,6 +178,7 @@ jobs:
         uses: "google-github-actions/auth@v1"
         with:
           credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
+        run: gcloud auth application-default login
       - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}

From ec02b03bb81689a2729c79b962da90556716928d Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 24 Jul 2023 10:47:28 -0700
Subject: [PATCH 46/77] chore: fix stuck CI

---
 .github/workflows/test.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5adef6987e..5137b3db6e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -169,16 +169,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: dev env setup
         uses: ./.github/actions/dev-env-setup
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
       - name: run app locally
         uses: ./.github/actions/local-app-run
-      - id: "auth"
-        name: "Authenticate to Google Cloud"
-        uses: "google-github-actions/auth@v1"
-        with:
-          credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
-        run: gcloud auth application-default login
       - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}

From e3456e3c4bcbaa20a43d81bd436addd8e07049c4 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 24 Jul 2023 10:47:58 -0700
Subject: [PATCH 47/77] chore: debug cypress CI--try to set default credentials

---
 .github/workflows/test.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5137b3db6e..5adef6987e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -169,8 +169,16 @@ jobs:
       - uses: actions/checkout@v3
       - name: dev env setup
         uses: ./.github/actions/dev-env-setup
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
       - name: run app locally
         uses: ./.github/actions/local-app-run
+      - id: "auth"
+        name: "Authenticate to Google Cloud"
+        uses: "google-github-actions/auth@v1"
+        with:
+          credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
+        run: gcloud auth application-default login
       - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}

From ba5422a13f41ba08d6ed7fec331492ca2e49029b Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 24 Jul 2023 10:51:49 -0700
Subject: [PATCH 48/77] chore: debug cypress CI--try to set default credentials

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5adef6987e..df04212384 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -169,8 +169,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: dev env setup
         uses: ./.github/actions/dev-env-setup
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
       - name: run app locally
         uses: ./.github/actions/local-app-run
       - id: "auth"
@@ -178,7 +178,7 @@ jobs:
         uses: "google-github-actions/auth@v1"
         with:
           credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
-        run: gcloud auth application-default login
+        # run: gcloud auth application-default login
       - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}

From b250a328a69ea7540187c3bffd7d087a592089e1 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Tue, 25 Jul 2023 10:23:12 -0700
Subject: [PATCH 49/77] chore: remove some whitespace to trigger CI

---
 app/components/Form/ProjectAttachmentsFormSummary.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/components/Form/ProjectAttachmentsFormSummary.tsx b/app/components/Form/ProjectAttachmentsFormSummary.tsx
index 76a788b9c1..62e1071077 100644
--- a/app/components/Form/ProjectAttachmentsFormSummary.tsx
+++ b/app/components/Form/ProjectAttachmentsFormSummary.tsx
@@ -59,7 +59,6 @@ const ProjectAttachmentsFormSummary: React.FC<Props> = ({
 
   const attachmentsSummary =
     revision.summaryProjectAttachmentFormChanges.edges[0]?.node;
-
   const projectAttachmentsFormNotUpdated = useMemo(
     () =>
       !attachmentsSummary ||

From d9ae1b0ecc80e1c62c706eff334d08698d16de69 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Tue, 25 Jul 2023 11:13:38 -0700
Subject: [PATCH 50/77] chore: debug cypress CI

---
 .github/workflows/test.yml                                    | 4 ++--
 .../cif/project-revision/create-first-project-revision.cy.js  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index df04212384..46d88aa945 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -169,8 +169,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: dev env setup
         uses: ./.github/actions/dev-env-setup
-      # - name: Setup tmate session
-      #   uses: mxschmitt/action-tmate@v3
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
       - name: run app locally
         uses: ./.github/actions/local-app-run
       - id: "auth"
diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index d870ef31bc..44daaf7e9e 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -182,7 +182,7 @@ describe("when creating a project, the project page", () => {
     cy.fixture("e2e/mock.pdf").as("mockFile");
     cy.get("input[type=file]").selectFile("@mockFile");
     // cy.screenshot();
-    cy.findByText(
+    cy.findAllByText(
       /Relay request for `createAttachmentMutation` failed by the following reasons:/i
     ).should("exist");
     // cy.findByText(/ The specified bucket does not exist./i).should("exist");

From f40c808c01c22d1971aac0db3af5ca4f5e00569f Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Tue, 25 Jul 2023 12:48:46 -0700
Subject: [PATCH 51/77] test: add detached true to tmate session

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 46d88aa945..a885e38cbd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -171,6 +171,8 @@ jobs:
         uses: ./.github/actions/dev-env-setup
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
+        with:
+          detached: true
       - name: run app locally
         uses: ./.github/actions/local-app-run
       - id: "auth"

From d6c4922c2903d64f508ef9e3ad0cc80c09b542cb Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Tue, 25 Jul 2023 14:08:51 -0700
Subject: [PATCH 52/77] test: workflow uses federated identity

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a885e38cbd..c96fbc208f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -179,8 +179,8 @@ jobs:
         name: "Authenticate to Google Cloud"
         uses: "google-github-actions/auth@v1"
         with:
-          credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}"
-        # run: gcloud auth application-default login
+          workload_identity_provider: ${{secrets.IDENTITY_PROVIDER}}
+          service_account: ${{secrets.GCS_SERVICE_ACCOUNT}}
       - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}

From c8460cfbdc696d96239603cd2317a4b64c02dd30 Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Tue, 25 Jul 2023 14:27:27 -0700
Subject: [PATCH 53/77] test: add token permissions to e2e job

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c96fbc208f..932ef33987 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -165,6 +165,9 @@ jobs:
   e2e:
     needs: ["docker-build", "install-dev-tools"]
     runs-on: ubuntu-latest
+    permissions:
+      contents: "read"
+      id-token: "write"
     steps:
       - uses: actions/checkout@v3
       - name: dev env setup

From 71efa3e1a1229fed919910e3ca089e2f2f2ea5e5 Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Tue, 25 Jul 2023 14:34:50 -0700
Subject: [PATCH 54/77] test: export env vars in workflow

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 932ef33987..d8c1989a64 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -182,6 +182,7 @@ jobs:
         name: "Authenticate to Google Cloud"
         uses: "google-github-actions/auth@v1"
         with:
+          export_environment_variables: true
           workload_identity_provider: ${{secrets.IDENTITY_PROVIDER}}
           service_account: ${{secrets.GCS_SERVICE_ACCOUNT}}
       - name: run e2e tests

From 39dc67175efe7c2479e894dcb8b5a88e1bea51fe Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Tue, 25 Jul 2023 15:07:33 -0700
Subject: [PATCH 55/77] test: set env var in gh env

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d8c1989a64..17bcda3e80 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -185,6 +185,8 @@ jobs:
           export_environment_variables: true
           workload_identity_provider: ${{secrets.IDENTITY_PROVIDER}}
           service_account: ${{secrets.GCS_SERVICE_ACCOUNT}}
+        run: | # pragma: allowlist secret
+          echo $GOOGLE_APPLICATION_CREDENTIALS >> $GITHUB_ENV
       - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}

From c8275f208b978d2d67a7301318ee3a936e1b3708 Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Wed, 26 Jul 2023 09:29:16 -0700
Subject: [PATCH 56/77] chore: add test env

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 17bcda3e80..c832199361 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -197,6 +197,7 @@ jobs:
           CYPRESS_TEST_UNAUTHORIZED_PASSWORD: ${{ secrets.TEST_UNAUTHORIZED_PASSWORD }}
           HAPPO_API_KEY: ${{ secrets.HAPPO_API_KEY }}
           HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}
+          TEST_ENV: "test"
         run: yarn test:e2e
         working-directory: ./app
 

From 6aeb5c196100a324385443ffe8f4b5594586adc1 Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Wed, 26 Jul 2023 13:18:31 -0700
Subject: [PATCH 57/77] test: remove run block, it was breaking CI

---
 .github/workflows/test.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c832199361..7b0697cfcf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -185,8 +185,6 @@ jobs:
           export_environment_variables: true
           workload_identity_provider: ${{secrets.IDENTITY_PROVIDER}}
           service_account: ${{secrets.GCS_SERVICE_ACCOUNT}}
-        run: | # pragma: allowlist secret
-          echo $GOOGLE_APPLICATION_CREDENTIALS >> $GITHUB_ENV
       - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}

From f7d6592502dc5130f1dfb60c50264286dd4041f0 Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Wed, 26 Jul 2023 13:48:30 -0700
Subject: [PATCH 58/77] test: debugging ci

---
 .github/workflows/test.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7b0697cfcf..07dca2f11c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -178,13 +178,13 @@ jobs:
           detached: true
       - name: run app locally
         uses: ./.github/actions/local-app-run
-      - id: "auth"
-        name: "Authenticate to Google Cloud"
-        uses: "google-github-actions/auth@v1"
-        with:
-          export_environment_variables: true
-          workload_identity_provider: ${{secrets.IDENTITY_PROVIDER}}
-          service_account: ${{secrets.GCS_SERVICE_ACCOUNT}}
+      # - id: "auth"
+      #   name: "Authenticate to Google Cloud"
+      #   uses: "google-github-actions/auth@v1"
+      #   with:
+      #     export_environment_variables: true
+      #     workload_identity_provider: ${{secrets.IDENTITY_PROVIDER}}
+      #     service_account: ${{secrets.GCS_SERVICE_ACCOUNT}}
       - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}

From ecea111b447cc6d20de3c9a31250bfdaac30d74f Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Wed, 26 Jul 2023 14:03:11 -0700
Subject: [PATCH 59/77] test: debugging ci

---
 .github/workflows/test.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 07dca2f11c..829bdb07ec 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -178,13 +178,13 @@ jobs:
           detached: true
       - name: run app locally
         uses: ./.github/actions/local-app-run
-      # - id: "auth"
-      #   name: "Authenticate to Google Cloud"
-      #   uses: "google-github-actions/auth@v1"
-      #   with:
-      #     export_environment_variables: true
-      #     workload_identity_provider: ${{secrets.IDENTITY_PROVIDER}}
-      #     service_account: ${{secrets.GCS_SERVICE_ACCOUNT}}
+      - id: "auth"
+        name: "Authenticate to Google Cloud"
+        uses: "google-github-actions/auth@v1"
+        with:
+          export_environment_variables: true
+          workload_identity_provider: ${{secrets.IDENTITY_PROVIDER}}
+          service_account: ${{secrets.GCS_SERVICE_ACCOUNT}}
       - name: run e2e tests
         env:
           CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}
@@ -196,6 +196,7 @@ jobs:
           HAPPO_API_KEY: ${{ secrets.HAPPO_API_KEY }}
           HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}
           TEST_ENV: "test"
+          GOOGLE_APPLICATION_CREDENTIALS: ${{env.GOOGLE_APPLICATION_CREDENTIALS}}
         run: yarn test:e2e
         working-directory: ./app
 

From 19361ef8efafc17f74ef074031eabcaf07d23aae Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Wed, 26 Jul 2023 14:15:07 -0700
Subject: [PATCH 60/77] test: debugging ci

---
 .github/workflows/test.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 829bdb07ec..ae5f7c4fa6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -197,7 +197,10 @@ jobs:
           HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}
           TEST_ENV: "test"
           GOOGLE_APPLICATION_CREDENTIALS: ${{env.GOOGLE_APPLICATION_CREDENTIALS}}
-        run: yarn test:e2e
+        run: |
+          echo $GOOGLE_APPLICATION_CREDENTIALS
+          echo $TEST_ENV
+          yarn test:e2e
         working-directory: ./app
 
   zap-owasp:

From c1e14a7b3cd37e1f68c59730bb62835795f29826 Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Wed, 26 Jul 2023 14:28:07 -0700
Subject: [PATCH 61/77] test: debugging ci

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ae5f7c4fa6..920e2c79ea 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -200,6 +200,7 @@ jobs:
         run: |
           echo $GOOGLE_APPLICATION_CREDENTIALS
           echo $TEST_ENV
+          pwd
           yarn test:e2e
         working-directory: ./app
 

From 5d4dfec047a2941b53095c1f5a71153528915a0b Mon Sep 17 00:00:00 2001
From: Dylan Leard <dylan@button.is>
Date: Wed, 26 Jul 2023 14:31:03 -0700
Subject: [PATCH 62/77] test: debugging ci

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 920e2c79ea..c4fc18a20f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -201,6 +201,7 @@ jobs:
           echo $GOOGLE_APPLICATION_CREDENTIALS
           echo $TEST_ENV
           pwd
+          echo $ATTACHMENTS_BUCKET
           yarn test:e2e
         working-directory: ./app
 

From 389fed2fa3a77aa11c641801ec5b9b1985517366 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 28 Jul 2023 10:29:07 -0700
Subject: [PATCH 63/77] chore: rename cyress env variables

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c4fc18a20f..c99eb4e98c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -196,7 +196,7 @@ jobs:
           HAPPO_API_KEY: ${{ secrets.HAPPO_API_KEY }}
           HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}
           TEST_ENV: "test"
-          GOOGLE_APPLICATION_CREDENTIALS: ${{env.GOOGLE_APPLICATION_CREDENTIALS}}
+          CYPRESS_GOOGLE_APPLICATION_CREDENTIALS: ${{env.GOOGLE_APPLICATION_CREDENTIALS}}
         run: |
           echo $GOOGLE_APPLICATION_CREDENTIALS
           echo $TEST_ENV

From d3b0747102835254ec120702b55b6676b2c529bb Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 31 Jul 2023 13:19:44 -0700
Subject: [PATCH 64/77] chore: debug cypress

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c99eb4e98c..d04e3fc10a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -197,6 +197,7 @@ jobs:
           HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}
           TEST_ENV: "test"
           CYPRESS_GOOGLE_APPLICATION_CREDENTIALS: ${{env.GOOGLE_APPLICATION_CREDENTIALS}}
+          CYPRESS_ATTACHMENTS_BUCKET: ${{env.ATTACHMENTS_BUCKET}}
         run: |
           echo $GOOGLE_APPLICATION_CREDENTIALS
           echo $TEST_ENV

From 6a036c14b2d2b19ad7c842af0ca4fbf8a20bf204 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 31 Jul 2023 13:35:24 -0700
Subject: [PATCH 65/77] chore: debug cypress

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d04e3fc10a..96491ba0f6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -201,8 +201,8 @@ jobs:
         run: |
           echo $GOOGLE_APPLICATION_CREDENTIALS
           echo $TEST_ENV
-          pwd
           echo $ATTACHMENTS_BUCKET
+          pwd
           yarn test:e2e
         working-directory: ./app
 

From 08239d2d1ef1433b6b0bfd97aaf30823a616fe98 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Mon, 31 Jul 2023 13:35:41 -0700
Subject: [PATCH 66/77] chore: debug cypress

---
 .github/workflows/test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 96491ba0f6..1ca053b413 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -172,10 +172,10 @@ jobs:
       - uses: actions/checkout@v3
       - name: dev env setup
         uses: ./.github/actions/dev-env-setup
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        with:
-          detached: true
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
+      #   with:
+      #     detached: true
       - name: run app locally
         uses: ./.github/actions/local-app-run
       - id: "auth"

From 5c9b5df36a19b3085b24ba920929097c5aa05120 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Tue, 1 Aug 2023 11:14:31 -0700
Subject: [PATCH 67/77] chore: debug CI

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1ca053b413..6a00b3df49 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -200,8 +200,10 @@ jobs:
           CYPRESS_ATTACHMENTS_BUCKET: ${{env.ATTACHMENTS_BUCKET}}
         run: |
           echo $GOOGLE_APPLICATION_CREDENTIALS
+          echo $CYPRESS_GOOGLE_APPLICATION_CREDENTIALS
           echo $TEST_ENV
           echo $ATTACHMENTS_BUCKET
+          echo $CYPRESS_ATTACHMENTS_BUCKET
           pwd
           yarn test:e2e
         working-directory: ./app

From 9c3161932ba7572d4285b207d3e8f9bb929bd5b1 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Tue, 1 Aug 2023 11:33:32 -0700
Subject: [PATCH 68/77] chore: debug CI

---
 .github/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6a00b3df49..2be0cf426a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -199,7 +199,6 @@ jobs:
           CYPRESS_GOOGLE_APPLICATION_CREDENTIALS: ${{env.GOOGLE_APPLICATION_CREDENTIALS}}
           CYPRESS_ATTACHMENTS_BUCKET: ${{env.ATTACHMENTS_BUCKET}}
         run: |
-          echo $GOOGLE_APPLICATION_CREDENTIALS
           echo $CYPRESS_GOOGLE_APPLICATION_CREDENTIALS
           echo $TEST_ENV
           echo $ATTACHMENTS_BUCKET

From 8861bbc4a85e5936b020bdfa042df88aa9eb2649 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Tue, 1 Aug 2023 11:40:24 -0700
Subject: [PATCH 69/77] chore: debug CI

---
 .github/workflows/test.yml | 228 -------------------------------------
 1 file changed, 228 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2be0cf426a..e69de29bb2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,228 +0,0 @@
-name: Test CIF App
-
-on:
-  push:
-    branches: [develop, main]
-  pull_request:
-    branches: [develop, main]
-
-env:
-  PGUSER: postgres
-  PROGRAM_DIRECTOR_NAME: director name
-  PROGRAM_DIRECTOR_EMAIL: director@email.com
-
-jobs:
-  install-dev-tools:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: dev env setup
-        uses: ./.github/actions/dev-env-setup
-      - run: make install_dev_tools
-      - run: make stop_pg # cleanly stop the database, otherwise it will complain in the subsequent jobs
-      - run: yarn install --frozen-lockfile
-        working-directory: ./app
-
-  yarn-test:
-    needs: install-dev-tools
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: dev env setup
-        uses: ./.github/actions/dev-env-setup
-      - run: yarn test
-        working-directory: ./app
-  yarn-audit:
-    needs: install-dev-tools
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: dev env setup
-        uses: ./.github/actions/dev-env-setup
-      - run: yarn audit-deps
-        working-directory: ./app
-  db-schema-is-up-to-date:
-    needs: install-dev-tools
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: dev env setup
-        uses: ./.github/actions/dev-env-setup
-      - run: make deploy_db_migrations
-      - run: yarn build:schema
-        working-directory: ./app
-      - run: git diff --exit-code || (echo 'The contents of the `schema` folder are out of sync with `app/server/schema.graphql`. Did you forget to \"yarn build:schema\"?' && false)
-  db-revert-migrations:
-    needs: install-dev-tools
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: dev env setup
-        uses: ./.github/actions/dev-env-setup
-      - run: make test_revert_migrations
-  db-tests:
-    needs: install-dev-tools
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: dev env setup
-        uses: ./.github/actions/dev-env-setup
-      - run: make db_unit_tests
-      - run: make db_style_tests
-
-  pre-commit:
-    needs: install-dev-tools
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: dev env setup
-        uses: ./.github/actions/dev-env-setup
-      - name: set pre-commit cache directory
-        run: |
-          echo "PRE_COMMIT_HOME=$GITHUB_WORKSPACE/.pre-commit-cache" >> $GITHUB_ENV
-      - name: set PY
-        run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
-      - name: create commitlint COMMIT_EDITMSG if not exists
-        run: |
-          if test -f ".git/COMMIT_EDITMSG"; then
-              echo "COMMIT_EDITMSG EXISTS, skipping"
-          else
-              touch .git/COMMIT_EDITMSG
-          fi
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ./.pre-commit-cache
-          key: pre-commit-${{ env.PY }}-${{ hashFiles('.pre-commit-config.yaml') }}-v3
-      - run: pre-commit run --all-files
-
-  docker-build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - image: ghcr.io/bcgov/cas-cif-app
-            context: .
-            dockerfile: app/Dockerfile
-            name: app
-          - image: ghcr.io/bcgov/cas-cif-schema
-            context: .
-            dockerfile: schema/Dockerfile
-            name: schema
-          - image: ghcr.io/bcgov/cas-cif-test-backups
-            context: .
-            dockerfile: database_backup_test/Dockerfile
-            name: testBackups
-    name: Build ${{ matrix.name }} docker image
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          install: true
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ${{ matrix.image }}
-          tags: |
-            type=sha,format=long,prefix=
-            latest
-            type=ref,event=pr
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ matrix.name }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-${{ matrix.name }}
-      - name: Build image
-        uses: docker/build-push-action@v3
-        with:
-          context: ${{ matrix.context }}
-          builder: ${{ steps.buildx.outputs.name }}
-          push: true
-          file: ${{ matrix.dockerfile }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
-        # Temp fix
-        # https://github.com/docker/build-push-action/issues/252
-        # https://github.com/moby/buildkit/issues/1896
-      - name: Move cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-
-  e2e:
-    needs: ["docker-build", "install-dev-tools"]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: "read"
-      id-token: "write"
-    steps:
-      - uses: actions/checkout@v3
-      - name: dev env setup
-        uses: ./.github/actions/dev-env-setup
-      # - name: Setup tmate session
-      #   uses: mxschmitt/action-tmate@v3
-      #   with:
-      #     detached: true
-      - name: run app locally
-        uses: ./.github/actions/local-app-run
-      - id: "auth"
-        name: "Authenticate to Google Cloud"
-        uses: "google-github-actions/auth@v1"
-        with:
-          export_environment_variables: true
-          workload_identity_provider: ${{secrets.IDENTITY_PROVIDER}}
-          service_account: ${{secrets.GCS_SERVICE_ACCOUNT}}
-      - name: run e2e tests
-        env:
-          CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}
-          CYPRESS_TEST_INTERNAL_PASSWORD: ${{ secrets.TEST_INTERNAL_PASSWORD }}
-          CYPRESS_TEST_ADMIN_USERNAME: ${{ secrets.TEST_ADMIN_USERNAME }}
-          CYPRESS_TEST_ADMIN_PASSWORD: ${{ secrets.TEST_ADMIN_PASSWORD }}
-          CYPRESS_TEST_UNAUTHORIZED_USERNAME: ${{ secrets.TEST_UNAUTHORIZED_USERNAME }}
-          CYPRESS_TEST_UNAUTHORIZED_PASSWORD: ${{ secrets.TEST_UNAUTHORIZED_PASSWORD }}
-          HAPPO_API_KEY: ${{ secrets.HAPPO_API_KEY }}
-          HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}
-          TEST_ENV: "test"
-          CYPRESS_GOOGLE_APPLICATION_CREDENTIALS: ${{env.GOOGLE_APPLICATION_CREDENTIALS}}
-          CYPRESS_ATTACHMENTS_BUCKET: ${{env.ATTACHMENTS_BUCKET}}
-        run: |
-          echo $CYPRESS_GOOGLE_APPLICATION_CREDENTIALS
-          echo $TEST_ENV
-          echo $ATTACHMENTS_BUCKET
-          echo $CYPRESS_ATTACHMENTS_BUCKET
-          pwd
-          yarn test:e2e
-        working-directory: ./app
-
-  zap-owasp:
-    needs: ["docker-build", "install-dev-tools"]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: dev env setup
-        uses: ./.github/actions/dev-env-setup
-      - name: run app locally
-        uses: ./.github/actions/local-app-run
-      - name: ZAP Base Scan
-        uses: zaproxy/action-baseline@v0.6.1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          docker_name: "owasp/zap2docker-stable"
-          target: "http://localhost:3004/"
-          rules_file_name: ".zap/rules.tsv"
-          cmd_options: "-a -d -T 5 -m 2"
-          issue_title: OWASP Baseline
-          fail_action: false

From 0d0fccd67284a2330fecae7e2307d967636e0e4d Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Tue, 1 Aug 2023 11:40:40 -0700
Subject: [PATCH 70/77] chore: debug CI

---
 .github/workflows/test.yml | 228 +++++++++++++++++++++++++++++++++++++
 1 file changed, 228 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e69de29bb2..2be0cf426a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -0,0 +1,228 @@
+name: Test CIF App
+
+on:
+  push:
+    branches: [develop, main]
+  pull_request:
+    branches: [develop, main]
+
+env:
+  PGUSER: postgres
+  PROGRAM_DIRECTOR_NAME: director name
+  PROGRAM_DIRECTOR_EMAIL: director@email.com
+
+jobs:
+  install-dev-tools:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: dev env setup
+        uses: ./.github/actions/dev-env-setup
+      - run: make install_dev_tools
+      - run: make stop_pg # cleanly stop the database, otherwise it will complain in the subsequent jobs
+      - run: yarn install --frozen-lockfile
+        working-directory: ./app
+
+  yarn-test:
+    needs: install-dev-tools
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: dev env setup
+        uses: ./.github/actions/dev-env-setup
+      - run: yarn test
+        working-directory: ./app
+  yarn-audit:
+    needs: install-dev-tools
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: dev env setup
+        uses: ./.github/actions/dev-env-setup
+      - run: yarn audit-deps
+        working-directory: ./app
+  db-schema-is-up-to-date:
+    needs: install-dev-tools
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: dev env setup
+        uses: ./.github/actions/dev-env-setup
+      - run: make deploy_db_migrations
+      - run: yarn build:schema
+        working-directory: ./app
+      - run: git diff --exit-code || (echo 'The contents of the `schema` folder are out of sync with `app/server/schema.graphql`. Did you forget to \"yarn build:schema\"?' && false)
+  db-revert-migrations:
+    needs: install-dev-tools
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: dev env setup
+        uses: ./.github/actions/dev-env-setup
+      - run: make test_revert_migrations
+  db-tests:
+    needs: install-dev-tools
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: dev env setup
+        uses: ./.github/actions/dev-env-setup
+      - run: make db_unit_tests
+      - run: make db_style_tests
+
+  pre-commit:
+    needs: install-dev-tools
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: dev env setup
+        uses: ./.github/actions/dev-env-setup
+      - name: set pre-commit cache directory
+        run: |
+          echo "PRE_COMMIT_HOME=$GITHUB_WORKSPACE/.pre-commit-cache" >> $GITHUB_ENV
+      - name: set PY
+        run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
+      - name: create commitlint COMMIT_EDITMSG if not exists
+        run: |
+          if test -f ".git/COMMIT_EDITMSG"; then
+              echo "COMMIT_EDITMSG EXISTS, skipping"
+          else
+              touch .git/COMMIT_EDITMSG
+          fi
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ./.pre-commit-cache
+          key: pre-commit-${{ env.PY }}-${{ hashFiles('.pre-commit-config.yaml') }}-v3
+      - run: pre-commit run --all-files
+
+  docker-build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - image: ghcr.io/bcgov/cas-cif-app
+            context: .
+            dockerfile: app/Dockerfile
+            name: app
+          - image: ghcr.io/bcgov/cas-cif-schema
+            context: .
+            dockerfile: schema/Dockerfile
+            name: schema
+          - image: ghcr.io/bcgov/cas-cif-test-backups
+            context: .
+            dockerfile: database_backup_test/Dockerfile
+            name: testBackups
+    name: Build ${{ matrix.name }} docker image
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          install: true
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ${{ matrix.image }}
+          tags: |
+            type=sha,format=long,prefix=
+            latest
+            type=ref,event=pr
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ matrix.name }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-${{ matrix.name }}
+      - name: Build image
+        uses: docker/build-push-action@v3
+        with:
+          context: ${{ matrix.context }}
+          builder: ${{ steps.buildx.outputs.name }}
+          push: true
+          file: ${{ matrix.dockerfile }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
+        # Temp fix
+        # https://github.com/docker/build-push-action/issues/252
+        # https://github.com/moby/buildkit/issues/1896
+      - name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+
+  e2e:
+    needs: ["docker-build", "install-dev-tools"]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: "read"
+      id-token: "write"
+    steps:
+      - uses: actions/checkout@v3
+      - name: dev env setup
+        uses: ./.github/actions/dev-env-setup
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
+      #   with:
+      #     detached: true
+      - name: run app locally
+        uses: ./.github/actions/local-app-run
+      - id: "auth"
+        name: "Authenticate to Google Cloud"
+        uses: "google-github-actions/auth@v1"
+        with:
+          export_environment_variables: true
+          workload_identity_provider: ${{secrets.IDENTITY_PROVIDER}}
+          service_account: ${{secrets.GCS_SERVICE_ACCOUNT}}
+      - name: run e2e tests
+        env:
+          CYPRESS_TEST_INTERNAL_USERNAME: ${{ secrets.TEST_INTERNAL_USERNAME }}
+          CYPRESS_TEST_INTERNAL_PASSWORD: ${{ secrets.TEST_INTERNAL_PASSWORD }}
+          CYPRESS_TEST_ADMIN_USERNAME: ${{ secrets.TEST_ADMIN_USERNAME }}
+          CYPRESS_TEST_ADMIN_PASSWORD: ${{ secrets.TEST_ADMIN_PASSWORD }}
+          CYPRESS_TEST_UNAUTHORIZED_USERNAME: ${{ secrets.TEST_UNAUTHORIZED_USERNAME }}
+          CYPRESS_TEST_UNAUTHORIZED_PASSWORD: ${{ secrets.TEST_UNAUTHORIZED_PASSWORD }}
+          HAPPO_API_KEY: ${{ secrets.HAPPO_API_KEY }}
+          HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}
+          TEST_ENV: "test"
+          CYPRESS_GOOGLE_APPLICATION_CREDENTIALS: ${{env.GOOGLE_APPLICATION_CREDENTIALS}}
+          CYPRESS_ATTACHMENTS_BUCKET: ${{env.ATTACHMENTS_BUCKET}}
+        run: |
+          echo $CYPRESS_GOOGLE_APPLICATION_CREDENTIALS
+          echo $TEST_ENV
+          echo $ATTACHMENTS_BUCKET
+          echo $CYPRESS_ATTACHMENTS_BUCKET
+          pwd
+          yarn test:e2e
+        working-directory: ./app
+
+  zap-owasp:
+    needs: ["docker-build", "install-dev-tools"]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: dev env setup
+        uses: ./.github/actions/dev-env-setup
+      - name: run app locally
+        uses: ./.github/actions/local-app-run
+      - name: ZAP Base Scan
+        uses: zaproxy/action-baseline@v0.6.1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          docker_name: "owasp/zap2docker-stable"
+          target: "http://localhost:3004/"
+          rules_file_name: ".zap/rules.tsv"
+          cmd_options: "-a -d -T 5 -m 2"
+          issue_title: OWASP Baseline
+          fail_action: false

From 65f30516815d055e6cf80062af6e590b0ad91d33 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 3 Aug 2023 08:02:18 -0700
Subject: [PATCH 71/77] chore: debug CI

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2be0cf426a..6c88c562b2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -197,7 +197,7 @@ jobs:
           HAPPO_API_SECRET: ${{ secrets.HAPPO_API_SECRET }}
           TEST_ENV: "test"
           CYPRESS_GOOGLE_APPLICATION_CREDENTIALS: ${{env.GOOGLE_APPLICATION_CREDENTIALS}}
-          CYPRESS_ATTACHMENTS_BUCKET: ${{env.ATTACHMENTS_BUCKET}}
+          CYPRESS_ATTACHMENTS_BUCKET: ${{secrets.ATTACHMENTS_BUCKET}}
         run: |
           echo $CYPRESS_GOOGLE_APPLICATION_CREDENTIALS
           echo $TEST_ENV

From 8bb143263d2c264a33dafe47b290a40ae417ba89 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Thu, 3 Aug 2023 08:12:58 -0700
Subject: [PATCH 72/77] chore: debug CI

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6c88c562b2..472d1ad924 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -198,6 +198,8 @@ jobs:
           TEST_ENV: "test"
           CYPRESS_GOOGLE_APPLICATION_CREDENTIALS: ${{env.GOOGLE_APPLICATION_CREDENTIALS}}
           CYPRESS_ATTACHMENTS_BUCKET: ${{secrets.ATTACHMENTS_BUCKET}}
+          GOOGLE_APPLICATION_CREDENTIALS: ${{env.GOOGLE_APPLICATION_CREDENTIALS}}
+          ATTACHMENTS_BUCKET: ${{secrets.ATTACHMENTS_BUCKET}}
         run: |
           echo $CYPRESS_GOOGLE_APPLICATION_CREDENTIALS
           echo $TEST_ENV

From a981b277c5ea58a40a50d599ff96e8c3f18c0b13 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 4 Aug 2023 08:28:39 -0700
Subject: [PATCH 73/77] test: attachments e2e test

---
 .../create-first-project-revision.cy.js       | 317 ++++++++----------
 1 file changed, 146 insertions(+), 171 deletions(-)

diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index 44daaf7e9e..38359e86fb 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -1,11 +1,5 @@
-import { aliasOperation } from "../../../utils/graphql-test-utils";
-
 describe("when creating a project, the project page", () => {
   beforeEach(() => {
-    cy.intercept("POST", "http://localhost:3004/graphql", (req) => {
-      aliasOperation(req, "addProjectAttachmentToRevisionMutation");
-      // aliasOperation(req, "createAttachmentMutation");
-    });
     cy.useMockedTime(new Date("June 10, 2020 09:00:00"));
     cy.sqlFixture("e2e/dbReset");
     cy.sqlFixture("dev/001_cif_user");
@@ -17,7 +11,7 @@ describe("when creating a project, the project page", () => {
     cy.get("button").contains("Add a Project").click();
   });
 
-  it.only("allows an admin user to create an EP project", () => {
+  it("allows an admin user to create an EP project", () => {
     //add new
     cy.fillAndCheckNewProjectForm("Emissions Performance", "2020");
     cy.happoAndAxe("EP Project New Form", "filled", "main");
@@ -25,155 +19,153 @@ describe("when creating a project, the project page", () => {
 
     // add overview
     cy.url().should("include", "/form/0");
-    // cy.findByText("Emissions Performance - 2020");
-    // cy.fillOverviewForm(
-    //   "first operator legal name (AB1234567)",
-    //   "Cement",
-    //   "TEST-123-12345",
-    //   "Foo",
-    //   "Bar",
-    //   "100",
-    //   "Project in Progress",
-    //   "Some comments",
-    //   "78.456"
-    // );
-    // cy.contains("Changes saved").should("be.visible");
-    // cy.findByText("Rank").next().should("have.text", "1");
-    // cy.happoAndAxe("Project Overview Form", "filled", "main", true);
-    // cy.findByRole("button", { name: /^submit/i }).click();
-
-    // // add managers
-    // cy.url().should("include", "/form/1");
-    // cy.fillManagersForm("Swanson", "Ludgate", "Knope");
-    // cy.contains("Changes saved").should("be.visible");
-    // cy.wait(1000);
-    // cy.happoAndAxe("Project manager Form", "filled", "main");
-    // cy.findByRole("button", { name: /^submit/i }).click();
-
-    // // add contacts
-    // cy.url().should("include", "/form/2");
-    // cy.fillContactsForm(
-    //   "Loblaw003",
-    //   "bob.l003@example.com",
-    //   "Loblaw004",
-    //   "bob.l004@example.com"
-    // );
-    // cy.contains("Changes saved").should("be.visible");
-    // cy.happoAndAxe("Project Contacts Form", "filled", "main");
-    // cy.findByRole("button", { name: /^submit/i }).click();
-
-    // // add budgets, expenses, and payments
-    // cy.url().should("include", "/form/3");
-    // cy.findByText(/Yes/i).click();
-    // cy.contains("Changes saved").should("be.visible");
-    // // checking default values
-    // cy.get('[aria-label="Province\'s Share Percentage"]').should(
-    //   "have.value",
-    //   "50.00 %"
-    // );
-    // cy.get('[aria-label="Performance Milestone Holdback Percentage"]').should(
-    //   "have.value",
-    //   "10.00 %"
-    // );
-
-    // cy.fillFundingAgreementForm(
-    //   222,
-    //   60,
-    //   333,
-    //   800,
-    //   "2020-01-01",
-    //   "2020-02-02",
-    //   20
-    // );
-    // cy.findByText(/Total Project Value$/i)
-    //   .next()
-    //   .should("have.text", "$1,022.00"); // check that calculated value updates
-    // cy.findByText(/Proponent's Share Percentage$/i)
-    //   .next()
-    //   .should("have.text", "78.27%"); // check that calculated value updates
-
-    // cy.findByRole("button", { name: /Add funding source/i }).click();
-    // cy.fillAdditionalFundingSourceForm("Test Source 1", 111, "Approved", 1);
-    // cy.contains("Changes saved").should("be.visible");
-    // cy.happoAndAxe("EP Project budgets Form", "filled", "main");
-    // cy.findByRole("button", { name: /^submit/i }).click();
+    cy.findByText("Emissions Performance - 2020");
+    cy.fillOverviewForm(
+      "first operator legal name (AB1234567)",
+      "Cement",
+      "TEST-123-12345",
+      "Foo",
+      "Bar",
+      "100",
+      "Project in Progress",
+      "Some comments",
+      "78.456"
+    );
+    cy.contains("Changes saved").should("be.visible");
+    cy.findByText("Rank").next().should("have.text", "1");
+    cy.happoAndAxe("Project Overview Form", "filled", "main", true);
+    cy.findByRole("button", { name: /^submit/i }).click();
+
+    // add managers
+    cy.url().should("include", "/form/1");
+    cy.fillManagersForm("Swanson", "Ludgate", "Knope");
+    cy.contains("Changes saved").should("be.visible");
+    cy.wait(1000);
+    cy.happoAndAxe("Project manager Form", "filled", "main");
+    cy.findByRole("button", { name: /^submit/i }).click();
+
+    // add contacts
+    cy.url().should("include", "/form/2");
+    cy.fillContactsForm(
+      "Loblaw003",
+      "bob.l003@example.com",
+      "Loblaw004",
+      "bob.l004@example.com"
+    );
+    cy.contains("Changes saved").should("be.visible");
+    cy.happoAndAxe("Project Contacts Form", "filled", "main");
+    cy.findByRole("button", { name: /^submit/i }).click();
+
+    // add budgets, expenses, and payments
+    cy.url().should("include", "/form/3");
+    cy.findByText(/Yes/i).click();
+    cy.contains("Changes saved").should("be.visible");
+    // checking default values
+    cy.get('[aria-label="Province\'s Share Percentage"]').should(
+      "have.value",
+      "50.00 %"
+    );
+    cy.get('[aria-label="Performance Milestone Holdback Percentage"]').should(
+      "have.value",
+      "10.00 %"
+    );
+
+    cy.fillFundingAgreementForm(
+      222,
+      60,
+      333,
+      800,
+      "2020-01-01",
+      "2020-02-02",
+      20
+    );
+    cy.findByText(/Total Project Value$/i)
+      .next()
+      .should("have.text", "$1,022.00"); // check that calculated value updates
+    cy.findByText(/Proponent's Share Percentage$/i)
+      .next()
+      .should("have.text", "78.27%"); // check that calculated value updates
+
+    cy.findByRole("button", { name: /Add funding source/i }).click();
+    cy.fillAdditionalFundingSourceForm("Test Source 1", 111, "Approved", 1);
+    cy.contains("Changes saved").should("be.visible");
+    cy.happoAndAxe("EP Project budgets Form", "filled", "main");
+    cy.findByRole("button", { name: /^submit/i }).click();
 
     // add milestone reports
-    // cy.addMilestoneReport(
-    //   1,
-    //   "desc",
-    //   "General",
-    //   "1991-05-17",
-    //   "Professional Engineer",
-    //   true,
-    //   "2020-01-01",
-    //   "2020-01-01"
-    // );
-    // cy.contains("Changes saved").should("be.visible");
-    // cy.get('[aria-label*="Report Due Date"').contains(/Jun(\.)? 16, 1991/i);
-    // cy.get('[aria-label="Gross Payment Amount This Milestone"]').contains(
-    //   "$60.00"
-    // );
-    // cy.get('[aria-label="Net Payment Amount This Milestone"]').contains(
-    //   "$48.00"
-    // );
-    // cy.get('[aria-label="Holdback Amount This Milestone"]').contains("$12.00");
-    // cy.happoAndAxe("Project milestone reports Form", "filled", "main");
-    // cy.findByRole("button", { name: /^submit/i }).click();
-    
-
-    // // add emissions intensity reports
-    // cy.url().should("include", "/form/5");
-    // cy.findByRole("button", {
-    //   name: /Add Emissions Intensity Report/i,
-    // }).click();
-    // cy.findByLabelText(/^Functional Unit/i).should("have.value", "tCO2e");
-    // cy.findAllByText("tCO2e").should("have.length", 4);
-    // cy.addEmissionIntensityReport(
-    //   "2022-01-01",
-    //   "2022-02-02",
-    //   "tCO",
-    //   "1",
-    //   "2",
-    //   "3",
-    //   "G",
-    //   100
-    // );
-    // cy.contains(/Duration: 1 month, 1 day/i).should("be.visible");
-    // cy.contains("Changes saved").should("be.visible");
-    // cy.findByLabelText("GHG Emission Intensity Performance").should(
-    //   "have.text",
-    //   "200.00%"
-    // );
-    // cy.findByLabelText(
-    //   "Payment Percentage of Performance Milestone Amount (%)"
-    // ).should("have.text", "100.00%");
-    // cy.findByLabelText("Maximum Performance Milestone Amount").should(
-    //   "have.text",
-    //   "$12.00"
-    // );
-    // cy.findByLabelText("Actual Performance Milestone Amount").should(
-    //   "have.text",
-    //   "$12.00"
-    // );
-    // cy.happoAndAxe("Emission Intensity Form", "filled", "main");
-    // cy.findByText(/Submit Emissions Intensity Report/).click();
-
-    // // Add Quarterly Reports
-    // cy.url().should("include", "/form/6");
-    // cy.addQuarterlyReport(1, "2020-01-01", "2020-02-02", "1st comment");
-    // cy.addQuarterlyReport(2, "2022-01-01", "2022-02-02", "2nd comment");
-    // cy.findAllByRole("status").first().should("have.text", "Complete");
-    // cy.contains("Changes saved").should("be.visible");
-    // cy.happoAndAxe("Project quarterly reports Form", "filled", "main");
-    // cy.contains("Changes saved").should("be.visible");
-    // cy.findByText(/^submit/i).click();
-
-    // // No annual reports
-    // cy.url().should("include", "/form/7");
-    // cy.findByText(/Submit Annual Reports/i).click();
+    cy.addMilestoneReport(
+      1,
+      "desc",
+      "General",
+      "1991-05-17",
+      "Professional Engineer",
+      true,
+      "2020-01-01",
+      "2020-01-01"
+    );
+    cy.contains("Changes saved").should("be.visible");
+    cy.get('[aria-label*="Report Due Date"').contains(/Jun(\.)? 16, 1991/i);
+    cy.get('[aria-label="Gross Payment Amount This Milestone"]').contains(
+      "$60.00"
+    );
+    cy.get('[aria-label="Net Payment Amount This Milestone"]').contains(
+      "$48.00"
+    );
+    cy.get('[aria-label="Holdback Amount This Milestone"]').contains("$12.00");
+    cy.happoAndAxe("Project milestone reports Form", "filled", "main");
+    cy.findByRole("button", { name: /^submit/i }).click();
+
+    // add emissions intensity reports
+    cy.url().should("include", "/form/5");
+    cy.findByRole("button", {
+      name: /Add Emissions Intensity Report/i,
+    }).click();
+    cy.findByLabelText(/^Functional Unit/i).should("have.value", "tCO2e");
+    cy.findAllByText("tCO2e").should("have.length", 4);
+    cy.addEmissionIntensityReport(
+      "2022-01-01",
+      "2022-02-02",
+      "tCO",
+      "1",
+      "2",
+      "3",
+      "G",
+      100
+    );
+    cy.contains(/Duration: 1 month, 1 day/i).should("be.visible");
+    cy.contains("Changes saved").should("be.visible");
+    cy.findByLabelText("GHG Emission Intensity Performance").should(
+      "have.text",
+      "200.00%"
+    );
+    cy.findByLabelText(
+      "Payment Percentage of Performance Milestone Amount (%)"
+    ).should("have.text", "100.00%");
+    cy.findByLabelText("Maximum Performance Milestone Amount").should(
+      "have.text",
+      "$12.00"
+    );
+    cy.findByLabelText("Actual Performance Milestone Amount").should(
+      "have.text",
+      "$12.00"
+    );
+    cy.happoAndAxe("Emission Intensity Form", "filled", "main");
+    cy.findByText(/Submit Emissions Intensity Report/).click();
+
+    // Add Quarterly Reports
+    cy.url().should("include", "/form/6");
+    cy.addQuarterlyReport(1, "2020-01-01", "2020-02-02", "1st comment");
+    cy.addQuarterlyReport(2, "2022-01-01", "2022-02-02", "2nd comment");
+    cy.findAllByRole("status").first().should("have.text", "Complete");
+    cy.contains("Changes saved").should("be.visible");
+    cy.happoAndAxe("Project quarterly reports Form", "filled", "main");
+    cy.contains("Changes saved").should("be.visible");
+    cy.findByText(/^submit/i).click();
+
+    // No annual reports
+    cy.url().should("include", "/form/7");
+    cy.findByText(/Submit Annual Reports/i).click();
 
-    // Add attachments
     // Add attachments
     cy.findByText(/Project Attachments/i).click();
     cy.findByText(/Add Project Attachments/i).click();
@@ -181,16 +173,7 @@ describe("when creating a project, the project page", () => {
 
     cy.fixture("e2e/mock.pdf").as("mockFile");
     cy.get("input[type=file]").selectFile("@mockFile");
-    // cy.screenshot();
-    cy.findAllByText(
-      /Relay request for `createAttachmentMutation` failed by the following reasons:/i
-    ).should("exist");
-    // cy.findByText(/ The specified bucket does not exist./i).should("exist");
-    cy.findByText(/The file at/i).should("exist");
-    cy.wait("@gqladdProjectAttachmentToRevisionMutation")
-      .its("response")
-      .should("have.property", "body");
-    cy.findByText("mock.pdf").should("be.visible");
+    cy.happoAndAxe("Project attachments", "filled", "main", true);
 
     cy.findByText(/Submit project attachments/i).click();
     //review and submit
@@ -311,14 +294,6 @@ describe("when creating a project, the project page", () => {
     cy.findByText("TEST-123-12345").should("be.visible");
     // this checks that the project view list shows the milestone report status vs. the other report statuses
     cy.findAllByRole("status").should("have.text", "Complete");
-
-    // cleanup attachments
-
-    cy.request({
-      method: "GET",
-      url: "http://localhost:3004/delete/WyJhdHRhY2htZW50cyIsMV0=",
-      failOnStatusCode: false,
-    });
   });
 
   it("allows an admin user to create an IA project", () => {

From 10ea51192bd8b0d644e223da574eb8264f6ad62d Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 4 Aug 2023 10:58:48 -0700
Subject: [PATCH 74/77] chore: fix revert

---
 .../mutations/discard_project_attachment_form_change.sql      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/schema/revert/mutations/discard_project_attachment_form_change.sql b/schema/revert/mutations/discard_project_attachment_form_change.sql
index 743f7c8964..6433dd636e 100644
--- a/schema/revert/mutations/discard_project_attachment_form_change.sql
+++ b/schema/revert/mutations/discard_project_attachment_form_change.sql
@@ -2,7 +2,9 @@
 
 begin;
 
-create or replace function cif.discard_project_attachment_form_change(form_change_id int)
+drop function cif.discard_project_attachment_form_change(integer);
+
+create function cif.discard_project_attachment_form_change(form_change_id int)
 returns setof cif.form_change
 as $discard_project_attachment_form_change$
 declare

From 8e881ab5a59b9533f70bced5a3768d5ed6745ac3 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 4 Aug 2023 11:02:25 -0700
Subject: [PATCH 75/77] chore: clean up spec work

---
 app/components/Attachment/AttachmentTableRow.tsx              | 2 +-
 .../{hardDeleteAttachement.tsx => hardDeleteAttachment.tsx}   | 0
 app/components/Form/ProjectAttachmentsForm.tsx                | 4 ++--
 app/mutations/attachment/createAttachment.ts                  | 3 +--
 app/mutations/useMutationWithErrorMessage.ts                  | 1 -
 .../unit/components/Attachment/AttachmentTableRow.test.tsx    | 4 ++--
 6 files changed, 6 insertions(+), 8 deletions(-)
 rename app/components/Attachment/{hardDeleteAttachement.tsx => hardDeleteAttachment.tsx} (100%)

diff --git a/app/components/Attachment/AttachmentTableRow.tsx b/app/components/Attachment/AttachmentTableRow.tsx
index 6ed59b52b8..48f6c0003c 100644
--- a/app/components/Attachment/AttachmentTableRow.tsx
+++ b/app/components/Attachment/AttachmentTableRow.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
 import { graphql, useFragment } from "react-relay";
 import { getAttachmentDownloadRoute } from "routes/pageRoutes";
 import { AttachmentTableRow_attachment$key } from "__generated__/AttachmentTableRow_attachment.graphql";
-import hardDeleteAttachment from "./hardDeleteAttachement";
+import hardDeleteAttachment from "./hardDeleteAttachment";
 import { useRouter } from "next/router";
 
 interface Props {
diff --git a/app/components/Attachment/hardDeleteAttachement.tsx b/app/components/Attachment/hardDeleteAttachment.tsx
similarity index 100%
rename from app/components/Attachment/hardDeleteAttachement.tsx
rename to app/components/Attachment/hardDeleteAttachment.tsx
diff --git a/app/components/Form/ProjectAttachmentsForm.tsx b/app/components/Form/ProjectAttachmentsForm.tsx
index 73fb3b98b4..65733965a2 100644
--- a/app/components/Form/ProjectAttachmentsForm.tsx
+++ b/app/components/Form/ProjectAttachmentsForm.tsx
@@ -28,7 +28,7 @@ const ProjectAttachmentsForm: React.FC<Props> = ({
   projectRevision,
   onSubmit,
 }) => {
-  const brianna = useFragment(
+  const revision = useFragment(
     graphql`
       fragment ProjectAttachmentsForm_projectRevision on ProjectRevision {
         id
@@ -59,7 +59,7 @@ const ProjectAttachmentsForm: React.FC<Props> = ({
     projectRevision
   );
 
-  const { rowId, projectAttachmentFormChanges, isFirstRevision } = brianna;
+  const { rowId, projectAttachmentFormChanges, isFirstRevision } = revision;
   const attachmentFormChange = projectAttachmentFormChanges.edges[0]?.node;
   const [createAttachment, isCreatingAttachment] = useCreateAttachment();
   const [createProjectAttachment, isCreatingProjectAttachment] =
diff --git a/app/mutations/attachment/createAttachment.ts b/app/mutations/attachment/createAttachment.ts
index e4de4c14c0..fd381f8a58 100644
--- a/app/mutations/attachment/createAttachment.ts
+++ b/app/mutations/attachment/createAttachment.ts
@@ -20,8 +20,7 @@ const mutation = graphql`
 const useCreateAttachment = () =>
   useMutationWithErrorMessage<createAttachmentMutation>(
     mutation,
-    (error) =>
-      `"An error occurred while attempting to create an attachment."|${error}|`
+    () => "An error occurred while attempting to create an attachment."
   );
 
 export { mutation, useCreateAttachment };
diff --git a/app/mutations/useMutationWithErrorMessage.ts b/app/mutations/useMutationWithErrorMessage.ts
index b5fa3bc6e0..de8ff42740 100644
--- a/app/mutations/useMutationWithErrorMessage.ts
+++ b/app/mutations/useMutationWithErrorMessage.ts
@@ -29,7 +29,6 @@ export default function useMutationWithErrorMessage<
     const commitConfig: MutationConfig<TMutation> = {
       ...config,
       onError: (error) => {
-        console.log("error", error);
         config.onError?.(error);
         setError(getErrorMessage(error));
         Sentry.captureException(error);
diff --git a/app/tests/unit/components/Attachment/AttachmentTableRow.test.tsx b/app/tests/unit/components/Attachment/AttachmentTableRow.test.tsx
index 8b8d8085d5..7e48314661 100644
--- a/app/tests/unit/components/Attachment/AttachmentTableRow.test.tsx
+++ b/app/tests/unit/components/Attachment/AttachmentTableRow.test.tsx
@@ -1,6 +1,6 @@
 import { act, screen } from "@testing-library/react";
 import AttachmentTableRow from "components/Attachment/AttachmentTableRow";
-import hardDeleteAttachment from "components/Attachment/hardDeleteAttachement";
+import hardDeleteAttachment from "components/Attachment/hardDeleteAttachment";
 import { mocked } from "jest-mock";
 import { graphql } from "react-relay";
 import ComponentTestingHelper from "tests/helpers/componentTestingHelper";
@@ -8,7 +8,7 @@ import compiledAttachmentTableRowTestQuery, {
   AttachmentTableRowTestQuery,
 } from "__generated__/AttachmentTableRowTestQuery.graphql";
 import { AttachmentTableRow_attachment$data } from "__generated__/AttachmentTableRow_attachment.graphql";
-jest.mock("components/Attachment/hardDeleteAttachement");
+jest.mock("components/Attachment/hardDeleteAttachment");
 
 const testQuery = graphql`
   query AttachmentTableRowTestQuery @relay_test_operation {

From 353c4cd5b426102a6770ad01ef067d632cdb1638 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 4 Aug 2023 11:03:56 -0700
Subject: [PATCH 76/77] chore: fix revert

---
 .../mutations/discard_project_attachment_form_change.sql       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/schema/revert/mutations/discard_project_attachment_form_change.sql b/schema/revert/mutations/discard_project_attachment_form_change.sql
index 6433dd636e..7befc9d40b 100644
--- a/schema/revert/mutations/discard_project_attachment_form_change.sql
+++ b/schema/revert/mutations/discard_project_attachment_form_change.sql
@@ -2,8 +2,7 @@
 
 begin;
 
-drop function cif.discard_project_attachment_form_change(integer);
-
+drop function cif.discard_project_attachment_form_change;
 create function cif.discard_project_attachment_form_change(form_change_id int)
 returns setof cif.form_change
 as $discard_project_attachment_form_change$

From 46eb659859b21ce4b61f61776aeeb880f6cbaf03 Mon Sep 17 00:00:00 2001
From: Brianna Cerkiewicz <brianna@button.is>
Date: Fri, 4 Aug 2023 11:34:24 -0700
Subject: [PATCH 77/77] chore: add wait to see what shows in happo

---
 .../e2e/cif/project-revision/create-first-project-revision.cy.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
index 38359e86fb..7e59b49d15 100644
--- a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
+++ b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -173,6 +173,7 @@ describe("when creating a project, the project page", () => {
 
     cy.fixture("e2e/mock.pdf").as("mockFile");
     cy.get("input[type=file]").selectFile("@mockFile");
+    cy.wait(30000);
     cy.happoAndAxe("Project attachments", "filled", "main", true);
 
     cy.findByText(/Submit project attachments/i).click();