Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 victorAnumudu
|
78ac5d5b24 |
@@ -44,7 +44,8 @@ export default function MyUploadedFiles({ uploadedFiles }) {
|
||||
currentFiles.map((value, idx) => {
|
||||
let addedDate = value?.added?.split(" ")[0];
|
||||
let formattedSize = formatFileSize(value?.file_size);
|
||||
let imageLink = `${uploadedFiles?.image}${localStorage.getItem('session_token')}/myfile/${value.file_uid}`
|
||||
let downloadLink = value.file_type == 'video/mp4' ? `${process.env.REACT_APP_MEDIA_LINK}/myfile/${value.file_uid}` : `${uploadedFiles?.image}${localStorage.getItem('session_token')}/myfile/${value.file_uid}`
|
||||
|
||||
return (
|
||||
<tr
|
||||
key={value?.file_uid}
|
||||
@@ -103,7 +104,7 @@ export default function MyUploadedFiles({ uploadedFiles }) {
|
||||
<td className="text-right py-4 px-2">
|
||||
<div className="flex justify-center items-center">
|
||||
<a
|
||||
href={imageLink}
|
||||
href={downloadLink}
|
||||
title="download"
|
||||
// className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
|
||||
>
|
||||
|
||||
@@ -443,6 +443,7 @@ export default function UploadProduct({uploadTypes}) {
|
||||
// to="/"
|
||||
onClick={uploadItem}
|
||||
className="sm:w-[126px] h-[46px] w-[100px] flex justify-center items-center btn-gradient sm:text-18 text-sm rounded-full text-white"
|
||||
disabled={uploadTypes.loading || requestStatus.loading}
|
||||
>
|
||||
Upload
|
||||
</button>
|
||||
|
||||
@@ -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,11 +31,12 @@ 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]);
|
||||
// }
|
||||
apiCall.uploadTaskFile(inputs).then(res => {
|
||||
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 => {
|
||||
if(res.data.internal_return < 0){
|
||||
inputFile.current.value = null
|
||||
setRequestStatus({loading: false, status:false, message:'upload failed'})
|
||||
@@ -96,7 +97,6 @@ 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={downloadLink}
|
||||
href={`${uploadedList?.data?.session_image_server}/${localStorage.getItem("session_token")}/jobfile/${item.file_uid}`}
|
||||
>
|
||||
{(item.originalname).toString().length > 30 ? (item.originalname).toString().slice(0, 26) + '..._.' + fileNameExt : (item.originalname).toString()}
|
||||
</a>
|
||||
@@ -139,7 +139,6 @@ 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>
|
||||
@@ -147,7 +146,7 @@ export default function AttachFile({data='', fontSize='text-sm', showOnData=fals
|
||||
target='_blank'
|
||||
alt='download-link'
|
||||
className=''
|
||||
href={downloadLink}
|
||||
href={`${uploadedList?.data?.session_image_server}/${localStorage.getItem("session_token")}/jobfile/${item.file_uid}`}
|
||||
>
|
||||
{(item.originalname).toString().length > 30 ? (item.originalname).toString().slice(0, 26) + '..._.' + fileNameExt : (item.originalname).toString()}
|
||||
</a>
|
||||
|
||||
@@ -908,7 +908,7 @@ class usersService {
|
||||
return this.postAuxEnd("/uploads", postData);
|
||||
}
|
||||
|
||||
// FUNCTION TO UPLOAD RESOURCE FILES
|
||||
// FUNCTION TO SEND FILE UPLOAD
|
||||
uploadFile(reqData) {
|
||||
var postData = {
|
||||
uid: localStorage.getItem("uid"),
|
||||
@@ -926,24 +926,6 @@ 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 = {
|
||||
|
||||
Reference in New Issue
Block a user