From 9d79e1c709fb059ab85274cf9e7549a9ef6462ec Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Sun, 26 May 2024 22:17:48 +0100
Subject: [PATCH] updated task file download link for video

---
 src/components/attachmentCom/AttachFile.jsx | 23 +++++++++++----------
 src/services/UsersService.js                | 20 +++++++++++++++++-
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/components/attachmentCom/AttachFile.jsx b/src/components/attachmentCom/AttachFile.jsx
index 60e7725..aa20fb3 100644
--- a/src/components/attachmentCom/AttachFile.jsx
+++ b/src/components/attachmentCom/AttachFile.jsx
@@ -7,7 +7,7 @@ import usersService from '../../services/UsersService'
 export default function AttachFile({data='', fontSize='text-sm', showOnData=false}) {
 
     const apiCall = new usersService()
-
+    
     let [uploadedList, setUploadedList] = useState({loading: true, data:{}})
     let [reloadList, setReloadList] = useState(false) // Triggers list of upload reload
 
@@ -19,9 +19,9 @@ export default function AttachFile({data='', fontSize='text-sm', showOnData=fals
         let inputs = {
             file: event.target.files[0],
             job_uid: data?.job_uid,
-            uid: localStorage.getItem("uid"),
+            // uid: localStorage.getItem("uid"),
             // member_id: localStorage.getItem("member_id"),
-            sessionid: localStorage.getItem("session_token"),
+            // sessionid: localStorage.getItem("session_token"),
           };
         setRequestStatus({loading: true, status:false, message:''})
         if(!inputs.file){
@@ -31,12 +31,11 @@ export default function AttachFile({data='', fontSize='text-sm', showOnData=fals
             }, 3000)
             return 
         }
-        const formData = new FormData()
-        for (let input in inputs) {
-            formData.append(input, inputs[input]);
-        }
-
-        axios.post(`${process.env.REACT_APP_MEDIA_LINK}/upload/task`,formData).then(res => {
+        // const formData = new FormData()
+        // for (let input in inputs) {
+        //     formData.append(input, inputs[input]);
+        // }
+        apiCall.uploadTaskFile(inputs).then(res => {
             if(res.data.internal_return < 0){
                 inputFile.current.value = null
                 setRequestStatus({loading: false, status:false, message:'upload failed'})
@@ -97,6 +96,7 @@ export default function AttachFile({data='', fontSize='text-sm', showOnData=fals
                             uploadedList.data.result_list.length > 0 ? 
                                 uploadedList.data.result_list.map((item, index) => {
                                     let fileNameExt = item.originalname.split('.')[item.originalname.split('.').length - 1]
+                                    let downloadLink = fileNameExt == 'mp4' ? `${process.env.REACT_APP_MEDIA_LINK}/mytask/${item.file_uid}` : `${uploadedList?.data?.session_image_server}/${localStorage.getItem("session_token")}/jobfile/${item.file_uid}`
                                     return(
                                         <div key={item.file_uid} className={`my-[6px] flex justify-start gap-2 ${fontSize}`}>
                                             <span>{index + 1}:</span>
@@ -104,7 +104,7 @@ export default function AttachFile({data='', fontSize='text-sm', showOnData=fals
                                                 target='_blank' 
                                                 alt='download-link' 
                                                 className='' 
-                                                href={`${uploadedList?.data?.session_image_server}/${localStorage.getItem("session_token")}/jobfile/${item.file_uid}`}
+                                                href={downloadLink}
                                             >
                                                 {(item.originalname).toString().length > 30 ? (item.originalname).toString().slice(0, 26) + '..._.' + fileNameExt : (item.originalname).toString()}
                                             </a>
@@ -139,6 +139,7 @@ export default function AttachFile({data='', fontSize='text-sm', showOnData=fals
                         <div className='text-[12px] w-full p-2 h-20 overflow-y-auto flex flex-col gap-2'>
                             {uploadedList.data.result_list.map((item, index) => {
                                 let fileNameExt = item.originalname.split('.')[item.originalname.split('.').length - 1]
+                                let downloadLink = fileNameExt == 'mp4' ? `${process.env.REACT_APP_MEDIA_LINK}/mytask/${item.file_uid}` : `${uploadedList?.data?.session_image_server}/${localStorage.getItem("session_token")}/jobfile/${item.file_uid}`
                                 return(
                                     <div key={item.file_uid} className={`my-[6px] flex justify-start gap-2 ${fontSize}`}>
                                         <span>{index + 1}:</span>
@@ -146,7 +147,7 @@ export default function AttachFile({data='', fontSize='text-sm', showOnData=fals
                                             target='_blank' 
                                             alt='download-link'
                                             className='' 
-                                            href={`${uploadedList?.data?.session_image_server}/${localStorage.getItem("session_token")}/jobfile/${item.file_uid}`}
+                                            href={downloadLink}
                                         >
                                             {(item.originalname).toString().length > 30 ? (item.originalname).toString().slice(0, 26) + '..._.' + fileNameExt : (item.originalname).toString()}
                                         </a>
diff --git a/src/services/UsersService.js b/src/services/UsersService.js
index 0c2edba..36ab4bd 100644
--- a/src/services/UsersService.js
+++ b/src/services/UsersService.js
@@ -908,7 +908,7 @@ class usersService {
     return this.postAuxEnd("/uploads", postData);
   }
 
-    // FUNCTION TO SEND FILE UPLOAD
+    // FUNCTION TO UPLOAD RESOURCE FILES
     uploadFile(reqData) {
       var postData = {
         uid: localStorage.getItem("uid"),
@@ -926,6 +926,24 @@ class usersService {
       return this.postAuxEnd("/upload/resources", formData, true);
     }
 
+    // FUNCTION TO UPLOAD TASK FILES
+    uploadTaskFile(reqData) {
+      var postData = {
+        uid: localStorage.getItem("uid"),
+        member_id: localStorage.getItem("member_id"),
+        sessionid: localStorage.getItem("session_token"),
+        // action: apiConst.WRENCHBOARD_CONTRACT_MESSAGE,
+        ...reqData,
+      };
+  
+      const formData = new FormData();
+      for (let data in postData) {
+        formData.append(data, postData[data]);
+      }
+  
+      return this.postAuxEnd("/upload/task", formData, true);
+    }
+
   // END POINT TO DELETE  A JOB
   deleteJob(reqData) {
     var postData = {