From 8b175b114d5e7b0e94e96a214b7fa7401f8f9e03 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Sat, 11 Jan 2025 08:14:14 +0000 Subject: [PATCH] uat defect 124 --- actions/azurestorage.js | 1 + components/elements/index.js | 5 ++- components/newappeal/buildchecksection.js | 37 ++++++++++++----------- components/newappeal/buildsection.js | 2 ++ package.json | 4 +++ 5 files changed, 28 insertions(+), 21 deletions(-) diff --git a/actions/azurestorage.js b/actions/azurestorage.js index d51cad93..472a806f 100644 --- a/actions/azurestorage.js +++ b/actions/azurestorage.js @@ -203,6 +203,7 @@ export const getBlobs = async (containerName, casefolderID) => { "caseObj": casefolderID + "/" + casefolderID + "_case.json", "isCurrentVersion": blob.isCurrentVersion, "contentLength": blob.properties.contentLength, + "size": blob.properties.contentLength, "contentType": blob.contentType, "lastModified": blob.properties.lastModified, "filepath": diff --git a/components/elements/index.js b/components/elements/index.js index ebcbbcb2..75e11112 100644 --- a/components/elements/index.js +++ b/components/elements/index.js @@ -2158,13 +2158,12 @@ const RenderFileUpload = (field) => { className="govuk-!-margin-bottom-5 fileThumb" > {" "} - {} - removeFile(file)} > − - + */} { let buildAppealFilesArray = []; //console.log("attached docs: - ", buildAppealFilesArray); - buildAppealFilesArray = props.props.form.appealForm.values.filesList || []; + buildAppealFilesArray = props.props.appealType.fileList?.value[0] || []; + //let filesUploadObj = buildAppealFilesArray; + // let filesUploadObj = props.appealType.fileList.hasOwnProperty("value") + // ? props.appealType.fileList.value[0] + // : []; - let filesUploadObj = props.appealType.fileList.hasOwnProperty("value") - ? props.appealType.fileList.value[0] - : []; - - for (let key in filesUploadObj) { - typeof filesUploadObj[key].name != "undefined" && - buildAppealFilesArray.push({ - "name": filesUploadObj[key].name, - "size": filesUploadObj[key].contentLength, - }); - } + // for (let key in filesUploadObj) { + // typeof filesUploadObj[key].name != "undefined" && + // buildAppealFilesArray.push({ + // "name": filesUploadObj[key].name, + // "size": filesUploadObj[key].contentLength, + // }); + // } buildAppealFilesArray.filter(function (item, idx) { return item.name; @@ -108,6 +108,7 @@ let BuildCheckSection = (props) => { let pdfObj = props.props.form.appealForm.values; Object.assign(pdfObj, { + "filesList": buildAppealFilesArray, "containerID": props.props.accountDetails.containerID, "casefolderID": props.appealType.caseReference.ticketnumber, }); @@ -151,12 +152,12 @@ let BuildCheckSection = (props) => { ) .then((data) => { console.log("have generated pdf:", data); - sendCaseCompleteMessage( - props.props.accountDetails.containerID, - props.appealType.caseReference.ticketnumber, - props.props.accountDetails.accountDetails - .pinswg_typeofinvolvement - ); + // sendCaseCompleteMessage( + // props.props.accountDetails.containerID, + // props.appealType.caseReference.ticketnumber, + // props.props.accountDetails.accountDetails + // .pinswg_typeofinvolvement + // ); }) .then(() => { //console.log("have sent complete message :"); diff --git a/components/newappeal/buildsection.js b/components/newappeal/buildsection.js index 9beaaf3b..98c000c2 100644 --- a/components/newappeal/buildsection.js +++ b/components/newappeal/buildsection.js @@ -104,6 +104,8 @@ let BuildSection = (props) => { return _.includes(key, "pinswg_fileUpload"); }); + fileListObj = []; + //console.log(fileListObj); // console.log( diff --git a/package.json b/package.json index 64288f94..d588389c 100644 --- a/package.json +++ b/package.json @@ -92,6 +92,10 @@ "webpack": "^5.66.0", "xpath": "^0.0.32" }, + "resolutions": { + "@react-pdf/layout": "3.11.5", + "@react-pdf/pdfkit": "3.1.0" + }, "devDependencies": { "eslint": "^9.11.1", "eslint-config-next": "^15.0.3",