1703 4 hard delete attachments

.github/workflows/test.yml

@@ -165,12 +165,26 @@ 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
         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 }}
@@ -181,7 +195,18 @@ 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
+          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
+          echo $ATTACHMENTS_BUCKET
+          echo $CYPRESS_ATTACHMENTS_BUCKET
+          pwd
+          yarn test:e2e
         working-directory: ./app
 
   zap-owasp:

.gitignore

@@ -13,3 +13,5 @@ cypress.env.json
 app/cypress.env.json
 dev/db/data
 **/.DS_Store
+
+gha-creds-*.json

app/components/Attachment/AttachmentTableRow.tsx

@@ -1,35 +1,32 @@
 import { Button } from "@button-inc/bcgov-theme";
+import useDiscardProjectAttachmentFormChange from "mutations/attachment/discardProjectAttachmentFormChange";
 import Link from "next/link";
-import { getAttachmentDownloadRoute } from "routes/pageRoutes";
 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 "./hardDeleteAttachment";
+import { useRouter } from "next/router";
 
 interface Props {
   attachment: AttachmentTableRow_attachment$key;
   connectionId: string;
   formChangeRowId: number;
   hideDelete?: boolean;
+  isFirstRevision: boolean;
 }
 
 const AttachmentTableRow: React.FC<Props> = ({
   attachment,
   connectionId,
   formChangeRowId,
   hideDelete,
+  isFirstRevision,
 }) => {
   const [
     discardProjectAttachmentFormChange,
     isDiscardingProjectAttachmentFormChange,
   ] = useDiscardProjectAttachmentFormChange();
-  const {
-    id,
-    fileName,
-    fileType,
-    fileSize,
-    createdAt,
-    cifUserByCreatedBy: { fullName },
-  } = useFragment(
+  const attachmentRow = useFragment(
     graphql`
       fragment AttachmentTableRow_attachment on Attachment {
         id
@@ -45,32 +42,43 @@ const AttachmentTableRow: React.FC<Props> = ({
     attachment
   );
 
-  const handleArchiveAttachment = () => {
-    discardProjectAttachmentFormChange({
-      variables: {
-        input: {
-          formChangeId: formChangeRowId,
+  const router = useRouter();
+  if (!attachmentRow) return null;
+  const { id, fileName, fileType, fileSize, createdAt, cifUserByCreatedBy } =
+    attachmentRow;
+
+  const handleArchiveAttachment = (attachmentId) => {
+    if (isFirstRevision) {
+      console.log("in if handlearchiveattachment");
+      hardDeleteAttachment(attachmentId, formChangeRowId);
+      router.replace(router.asPath);
+    } else {
+      discardProjectAttachmentFormChange({
+        variables: {
+          input: {
+            formChangeId: formChangeRowId,
+          },
+          connections: [connectionId],
         },
-        connections: [connectionId],
-      },
-    });
+      });
+    }
   };
-
+  console.log("connectionid", connectionId);
   return (
     <>
       <tr>
         <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>
             <Button size="small">Download</Button>
           </Link>
           {!hideDelete && (
             <Button
-              onClick={handleArchiveAttachment}
+              onClick={() => handleArchiveAttachment(id)}
               disabled={isDiscardingProjectAttachmentFormChange}
               size="small"
             >

app/components/Attachment/hardDeleteAttachment.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;

app/components/Form/ProjectAttachmentsForm.tsx

@@ -28,10 +28,12 @@ const ProjectAttachmentsForm: React.FC<Props> = ({
   projectRevision,
   onSubmit,
 }) => {
-  const { rowId, projectAttachmentFormChanges } = useFragment(
+  const revision = useFragment(
     graphql`
       fragment ProjectAttachmentsForm_projectRevision on ProjectRevision {
+        id
         rowId
+        isFirstRevision
         projectAttachmentFormChanges: formChangesFor(
           first: 500
           formDataTableName: "project_attachment"
@@ -57,6 +59,7 @@ const ProjectAttachmentsForm: React.FC<Props> = ({
     projectRevision
   );
 
+  const { rowId, projectAttachmentFormChanges, isFirstRevision } = revision;
   const attachmentFormChange = projectAttachmentFormChanges.edges[0]?.node;
   const [createAttachment, isCreatingAttachment] = useCreateAttachment();
   const [createProjectAttachment, isCreatingProjectAttachment] =
@@ -143,14 +146,18 @@ 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}
-          />
-        ))}
+        {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}
+            />
+          );
+        })}
       </Table>
       <Button
         type="submit"

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 ||
@@ -100,6 +99,7 @@ const ProjectAttachmentsFormSummary: React.FC<Props> = ({
                 formChangeRowId={node.rowId}
                 connectionId={revision.summaryProjectAttachmentFormChanges.__id}
                 hideDelete={true}
+                isFirstRevision={revision.isFirstRevision}
               />
             )
           )}

app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js

@@ -167,9 +167,16 @@ describe("when creating a project, the project page", () => {
     cy.findByText(/Submit Annual Reports/i).click();
 
     // Add attachments
+    cy.findByText(/Project Attachments/i).click();
+    cy.findByText(/Add Project Attachments/i).click();
     cy.url().should("include", "/form/8");
-    cy.findByText(/Submit project attachments/i).click();
 
+    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();
     //review and submit
     cy.contains("Review and Submit Project");
 

app/mutations/attachment/discardProjectAttachmentFormChange.ts

@@ -8,7 +8,7 @@ const mutation = graphql`
     $connections: [ID!]!
   ) {
     discardProjectAttachmentFormChange(input: $input) {
-      formChanges {
+      formChange {
         projectRevisionByProjectRevisionId {
           ...TaskList_projectRevision
         }

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 {
   getProjectsPageRoute,
   getProjectRevisionFormPageRoute,
@@ -72,6 +71,7 @@ const pageQuery = graphql`
             }
           }
         }
+
         formChangesByProjectRevisionId {
           edges {
             node {

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 = () => ({

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.