Merge pull request #1050 from bcgov/Download-map-files-with-plan-PDF

Download map files with plan PDF
bcgov · Nov 20, 2023 · 4db12d8 · 4db12d8
2 parents 1a8492d + b83f370
commit 4db12d8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 19 deletions.
diff --git a/src/components/rangeUsePlanPage/attachments/AttachmentRow.js b/src/components/rangeUsePlanPage/attachments/AttachmentRow.js
@@ -32,6 +32,24 @@ export const attachmentAccess = [
   }
 ]
 
+export const downloadAttachment = async (attachmentId, attachmentName) => {
+  const res = await axios.get(
+    GET_SIGNED_DOWNLOAD_URL(attachmentId),
+    getAuthHeaderConfig()
+  )
+  const fileRes = await axios.get(res.data.url, {
+    responseType: 'blob',
+    skipAuthorizationHeader: true
+  })
+  const url = window.URL.createObjectURL(fileRes.data)
+  const link = document.createElement('a')
+  link.href = url
+  link.setAttribute('download', attachmentName)
+  document.body.appendChild(link)
+  link.click()
+  link.parentNode.removeChild(link)
+}
+
 const AttachmentRow = ({ attachment, index, onDelete, error }) => {
   const [isDownloading, setDownloading] = useState(false)
   const [errorDownloading, setErrorDownloading] = useState()
@@ -40,26 +58,10 @@ const AttachmentRow = ({ attachment, index, onDelete, error }) => {
     setErrorDownloading(null)
     setDownloading(true)
     try {
-      const res = await axios.get(
-        GET_SIGNED_DOWNLOAD_URL(attachment.id),
-        getAuthHeaderConfig()
-      )
-      const fileRes = await axios.get(res.data.url, {
-        responseType: 'blob',
-        skipAuthorizationHeader: true
-      })
-
-      const url = window.URL.createObjectURL(fileRes.data)
-      const link = document.createElement('a')
-      link.href = url
-      link.setAttribute('download', attachment.name)
-      document.body.appendChild(link)
-      link.click()
-      link.parentNode.removeChild(link)
+      downloadAttachment(attachment.id, attachment.name);
     } catch (e) {
       setErrorDownloading(e)
     }
-
     setDownloading(false)
   }
 

diff --git a/src/components/rangeUsePlanPage/index.js b/src/components/rangeUsePlanPage/index.js
@@ -215,7 +215,9 @@ const Base = ({
                   <Button type="button" onClick={closePDFModal}>
                     Close
                   </Button>
-                  <PDFView match={match} agreementId={currentPlan.agreement.id} />
+                  <PDFView match={match} agreementId={currentPlan.agreement.id} mapAttachments={currentPlan.files.filter((item) => {
+                    return item.type === 'mapAttachments'
+                  })} />
                 </Modal.Actions>
               </Modal>
             ))

diff --git a/src/components/rangeUsePlanPage/pdf/PDFView.js b/src/components/rangeUsePlanPage/pdf/PDFView.js
@@ -1,8 +1,9 @@
 import React, { useState } from 'react'
 import { generatePDF } from '../../../api'
 import { PrimaryButton } from '../../common'
+import { downloadAttachment } from '../attachments/AttachmentRow'
 
-const PDFView = ({ match, agreementId }) => {
+const PDFView = ({ match, agreementId, mapAttachments }) => {
   const { planId } = match.params
   const hasError = !!error
   const [loading, setLoading] = useState(false)
@@ -22,6 +23,9 @@ const PDFView = ({ match, agreementId }) => {
       link.click()
       link.parentNode.removeChild(link)
       setLoading(false)
+      mapAttachments.forEach(attachment => {
+        downloadAttachment(attachment.id, attachment.name);
+      });
     } catch (e) {
       setLoading(false)
       setError(e)