From 39a055e6700e09d796d4009e6f1bb5aea055d03f Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Wed, 4 Dec 2024 11:18:20 +0000 Subject: [PATCH] lpa unseen docs and remove uploaded files --- actions/azurestorage.js | 6 ++--- components/elements/index.js | 28 +++++++++++++++--------- components/pdftemplates/appealRow_pdf.js | 2 +- data/formsxml/planningappeals78.xml | 2 +- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/actions/azurestorage.js b/actions/azurestorage.js index 58fe06c4..739f0214 100644 --- a/actions/azurestorage.js +++ b/actions/azurestorage.js @@ -195,14 +195,14 @@ const getDocumentTypeFromFilename = (filename) => { doctypeCode = "000006"; else if (filename.indexOf("_-_Design_and_Access_Statement") > 0) doctypeCode = "000007"; - else if (filename.indexOf("_-_Green_Infrastructure_Statement") > 0) + else if (filename.indexOf("_-_NSB_LPA_Additional_Documents") > 0) doctypeCode = "000008"; else if (filename.indexOf("_-_LPA_Correspondence") > 0) doctypeCode = "000009"; else if (filename.indexOf("_-_LPA_Original_Permission") > 0) doctypeCode = "000010"; else if (filename.indexOf("_-_LPA's_Registration_Letter") > 0) - doctypeCode = "000010"; + doctypeCode = "000011"; else if (filename.indexOf(+"_-_Environmental_Statement") > 0) doctypeCode = "000012"; else if (filename.indexOf("_-_Cost_of_Application") > 0) @@ -597,7 +597,7 @@ export const uploadFile = async (formContent, containerName, foldername) => { files[prop][0].fieldName.indexOf("_-_Design_and_Access_Statement") > 0 || files[prop][0].fieldName.indexOf( - "_-_Green_Infrastructure_Statement" + "_-_NSB_LPA_Additional_Documents" ) > 0 || files[prop][0].fieldName.indexOf("_-_LPA_Correspondence") > 0 || files[prop][0].fieldName.indexOf("_-_LPA_Original_Permission") > diff --git a/components/elements/index.js b/components/elements/index.js index f115d812..404f615c 100644 --- a/components/elements/index.js +++ b/components/elements/index.js @@ -1847,9 +1847,7 @@ const RenderFileUpload = (field) => { return pdfFileNameDateStamp + "_-_Design_and_Access_Statement"; break; case "000008": - return ( - pdfFileNameDateStamp + "_-_Green_Infrastructure_Statement" - ); + return pdfFileNameDateStamp + "_-_NSB_LPA_Additional_Documents"; break; case "000009": return pdfFileNameDateStamp + "_-_LPA_Correspondence"; @@ -1908,6 +1906,12 @@ const RenderFileUpload = (field) => { }); }; + const removeFile = (file) => { + const newFilesArr = files.filter((user) => user.name != file.name); + files == newFilesArr; + field.input.onChange(newFilesArr); + }; + return ( <> { > {({ getRootProps, getInputProps }) => ( <> - {/* {field.hint != false && ( -
ss{t(field.hint)}
- )} -
*/}
{" "} @@ -1972,7 +1972,9 @@ const RenderFileUpload = (field) => { {field.meta.error} )} {files && Array.isArray(files) && ( -
    + <> + {files.length > 0 &&

    New files

    } + {files.map( (file, i) => typeof file.name != "undefined" && ( @@ -1982,20 +1984,26 @@ const RenderFileUpload = (field) => { > {" "} {} + removeFile(file)} + > + − + {file.name} - {/* {file.name.slice(file.name.indexOf("_") + 1)} ( */}{" "} {file.name}( ({bytesToSize(file.size)})
) )} - + )} + {blobList.length > 0 &&

Previously added files

} {blobList.map( (blob, i) => blob.documentType == field.documentTypeCode && ( diff --git a/components/pdftemplates/appealRow_pdf.js b/components/pdftemplates/appealRow_pdf.js index 9f5c3dc5..ea2d4ca5 100644 --- a/components/pdftemplates/appealRow_pdf.js +++ b/components/pdftemplates/appealRow_pdf.js @@ -169,7 +169,7 @@ export const AppealRow_pdf = (props) => { doctypeCode = "000006"; else if (filename.indexOf("_-_Design_and_Access_Statement") > 0) doctypeCode = "000007"; - else if (filename.indexOf("_-_Green_Infrastructure_Statement") > 0) + else if (filename.indexOf("_-_NSB_LPA_Additional_Documents") > 0) doctypeCode = "000008"; else if (filename.indexOf("_-_LPA_Correspondence") > 0) doctypeCode = "000009"; diff --git a/data/formsxml/planningappeals78.xml b/data/formsxml/planningappeals78.xml index 33a5df56..bbc92d95 100644 --- a/data/formsxml/planningappeals78.xml +++ b/data/formsxml/planningappeals78.xml @@ -398,7 +398,7 @@ -