diff --git a/components/case/representation/index.js b/components/case/representation/index.js index 552cb170..c6960ea0 100644 --- a/components/case/representation/index.js +++ b/components/case/representation/index.js @@ -601,6 +601,7 @@ let MakeRepresentation = (props) => { let incidentId = props.appealType.caseReference.incidentid; let updateBody = values || {}; const buildFileArray = []; + let newbuildArr = []; setSavingStatus(useSaveStatus); Object.assign(values, { @@ -724,8 +725,10 @@ let MakeRepresentation = (props) => { "size": Blob.size, }) ), + (newbuildArr = buildFileArray.concat(values.filesList)), + console.log(buildFileArray, newbuildArr), Object.assign(values, { - "filesList": buildFileArray, + "filesList": newbuildArr, })), generateRepPDF( values, @@ -738,22 +741,23 @@ let MakeRepresentation = (props) => { ? router.locale + "/myportal" : "/myportal" )) - : (values.hasOwnProperty("representationDocuments") && - (values.representationDocuments.map((Blob) => - buildFileArray.push({ - "name": Blob.name, - "size": Blob.size, - }) - ), - Object.assign(values, { - "filesList": buildFileArray, - })), - uploadRepresentationFiles(values), - generateRepPDF( - values, - props.props.accountDetails.containerID, - currentView.caseReference.currentReference - )); + : // (values.hasOwnProperty("representationDocuments") && + // (values.representationDocuments.map((Blob) => + // buildFileArray.push({ + // "name": Blob.name, + // "size": Blob.size, + // }) + // ), + // Object.assign(values, { + // "filesList": buildFileArray, + // }))), + console.log("zxcvbnm"), + uploadRepresentationFiles(values), + generateRepPDF( + values, + props.props.accountDetails.containerID, + currentView.caseReference.currentReference + ); }; const onHandleSubmit = (values) => { @@ -881,16 +885,17 @@ let MakeRepresentation = (props) => { Object.assign(values, { "locale": router.locale }), props.invalid == false && updateRepresentation(values, false, false), - values.hasOwnProperty("representationDocuments") && - (values.representationDocuments.map((Blob) => - buildFileArray.push({ - "name": Blob.name, - "size": Blob.size, - }) - ), - Object.assign(values, { - "filesList": buildFileArray, - })), + console.log("qwerty"), + // values.hasOwnProperty("representationDocuments") && + // (values.representationDocuments.map((Blob) => + // buildFileArray.push({ + // "name": Blob.name, + // "size": Blob.size, + // }) + // ), + // Object.assign(values, { + // "filesList": buildFileArray, + // })), console.log( "====================== rep lpa payload:\n", JSON.stringify(values) diff --git a/components/case/representation/representationCompleteSubmit.js b/components/case/representation/representationCompleteSubmit.js index 616b0990..f493477f 100644 --- a/components/case/representation/representationCompleteSubmit.js +++ b/components/case/representation/representationCompleteSubmit.js @@ -41,7 +41,7 @@ const RepCompleteSubmit = (props) => { const repFormData = formObj.representationForm.values; - // const repDate = new Date(); + //const repDate = new Date(); // let day = repDate.getDate(); // let month = repDate.getMonth() + 1; @@ -135,6 +135,48 @@ const RepCompleteSubmit = (props) => { } }; + let buildAppealFilesArray = []; + + let filesUploadObj = + formObj.representationForm.values.representationDocuments; + + for (let key in filesUploadObj) { + typeof filesUploadObj[key].name != "undefined" && + buildAppealFilesArray.push({ + "name": filesUploadObj[key].name, + "size": filesUploadObj[key].size, + }); + } + + console.log( + buildAppealFilesArray, + formObj.representationForm.values.filesList + ); + + buildAppealFilesArray = formObj.representationForm.values.hasOwnProperty( + "filesList" + ) + ? buildAppealFilesArray.concat( + formObj.representationForm.values.filesList + ) + : buildAppealFilesArray; + + console.log(buildAppealFilesArray); + + // const arrUniq = [ + // ...new Map(buildAppealFilesArray.map((v) => [v.name, v])).values(), + // ]; + + const arrUniq = buildAppealFilesArray.filter( + (obj1, i, arr) => arr.findIndex((obj2) => obj2.name === obj1.name) === i + ); + + console.log(arrUniq); + + Object.assign(formObj.representationForm.values, { + "filesList": arrUniq, + }); + return ( <> {currentView.representationSubmitConfirmation == true ? ( @@ -303,10 +345,7 @@ const RepCompleteSubmit = (props) => {
- {formObj.representationForm.values.hasOwnProperty( - "filesList" - ) && - formObj.representationForm.values + {formObj.representationForm.values .filesList.length > 0 ? formObj.representationForm.values.filesList.map( (blob, i) => ( diff --git a/components/case/representation/representationElements.js b/components/case/representation/representationElements.js index 63e2d498..cf53217c 100644 --- a/components/case/representation/representationElements.js +++ b/components/case/representation/representationElements.js @@ -962,10 +962,7 @@ export const RenderFileUpload = (field) => { const filelistObj = field.fileList || {}; - // const blobList = jsonpath( - // "$..[?(@.documentType=='" + field.documentTypeCode + "')]", - // filelistObj - // ); + console.log("----", filelistObj.length); let blobList = filelistObj; @@ -974,13 +971,11 @@ export const RenderFileUpload = (field) => { // let filesUploadObj = field.input.value; // for (let key in filesUploadObj) { - // for (let j in filesUploadObj[key]) { - // typeof filesUploadObj[key][j].name != "undefined" && - // buildAppealFilesArray.push({ - // "name": filesUploadObj[key][j].name, - // "size": filesUploadObj[key][j].size, - // }); - // } + // typeof filesUploadObj[key].name != "undefined" && + // buildAppealFilesArray.push({ + // "name": filesUploadObj[key].name, + // "size": filesUploadObj[key].size, + // }); // } // buildAppealFilesArray = buildAppealFilesArray.concat(blobList); @@ -1063,7 +1058,7 @@ export const RenderFileUpload = (field) => {