robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged PR 1160: escape spaces and chars for rep filename

Browse Source 
escape spaces and chars for rep filename

Related work items: #11180
This commit is contained in:
Robert Bond
2024-05-24 13:19:33 +00:00
parent 63c91de09e c546ea6c04
commit cf798f57cf
4 changed files with 89 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/representation/index.js
+8 -2
View File
@@ -160,9 +160,15 @@ let MakeRepresentation = (props) => {
"_-_" + "_-_" +
repType + repType +
"_-_" + "_-_" +
values.lastname + values.lastname.replace(
/[\s~`!@#$%^&*(){}\[\];:"'<,.>?\/\\|_+=-]/g,
""
) +
"_" + "_" +
values.firstname, values.firstname.replace(
/[\s~`!@#$%^&*(){}\[\];:"'<,.>?\/\\|_+=-]/g,
""
),
}); });
} }
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
+6 -2
View File
@@ -1117,10 +1117,14 @@ let Enforcement_Questionnaire = (props) => {
label={t("myrepresentations:add-files-label")} label={t("myrepresentations:add-files-label")}
ticketnumber={props.props.caseReference} ticketnumber={props.props.caseReference}
hint={"sdsd"} hint={"sdsd"}
fileList={[]} fileList={
props.props.props.props.form[
"representationForm"
].values.filesList || []
}
setFilesForRepresentation={[]} setFilesForRepresentation={[]}
containerID={props.containerID} containerID={props.containerID}
filenamePrefix={props} filenamePrefix={props.props}
/> />
</div> </div>
</fieldset> </fieldset>
components/newappeal/buildchecksection.js
+64 -67
View File
@@ -76,31 +76,30 @@ let BuildCheckSection = (props) => {
let buildAppealFilesArray = []; let buildAppealFilesArray = [];
//console.log("attached docs: - ", buildAppealFilesArray); //console.log("attached docs: - ", buildAppealFilesArray);
let filesUploadObj = Object.keys(props.props.form.appealForm.values) // let filesUploadObj = Object.keys(props.props.form.appealForm.values)
.filter(function (k) { // .filter(function (k) {
return k.indexOf("pinswg_fileUpload") == 0; // return k.indexOf("pinswg_fileUpload") == 0;
}) // })
.reduce(function (newData, k) { // .reduce(function (newData, k) {
newData[k] = props.props.form.appealForm.values[k]; // newData[k] = props.props.form.appealForm.values[k];
return newData; // return newData;
}, {}); // }, {});
for (let key in filesUploadObj) { // for (let key in filesUploadObj) {
for (let j in filesUploadObj[key]) { // for (let j in filesUploadObj[key]) {
typeof filesUploadObj[key][j].name != "undefined" && // typeof filesUploadObj[key][j].name != "undefined" &&
buildAppealFilesArray.push({ // buildAppealFilesArray.push({
"name": filesUploadObj[key][j].name, // "name": filesUploadObj[key][j].name,
"size": filesUploadObj[key][j].size, // "size": filesUploadObj[key][j].size,
}); // });
} // }
} // }
props.props.form.appealForm.values.filesList.hasOwnProperty("value") buildAppealFilesArray = props.props.form.appealForm.values.filesList;
? (buildAppealFilesArray = buildAppealFilesArray.concat(
props.props.form.appealForm.values.filesList.value[0]
))
: (buildAppealFilesArray = buildAppealFilesArray.filesList);
buildAppealFilesArray.filter(function (item, idx) {
return item.name;
});
console.log(buildAppealFilesArray); console.log(buildAppealFilesArray);
let pdfObj = props.props.form.appealForm.values; let pdfObj = props.props.form.appealForm.values;
@@ -180,52 +179,50 @@ let BuildCheckSection = (props) => {
{buildAppealFilesArray.length > 0 {buildAppealFilesArray.length > 0
? buildAppealFilesArray.map((blob, i) => { ? buildAppealFilesArray.map((blob, i) => {
return ( return (
<> <div
<div className="govuk-summary-list__row"
className="govuk-summary-list__row" key={i}
key={"9999"} >
> <dt className="govuk-summary-list__key govuk-!-padding-left-5">
<dt className="govuk-summary-list__key govuk-!-padding-left-5"> <div
<div key={blob.name + "_" + i}
key={blob.name + "_" + i} className="govuk-!-margin-bottom-5 fileThumb "
className="govuk-!-margin-bottom-5 fileThumb " >
> <img
<img src={getThumbnailIconByExtension(
src={getThumbnailIconByExtension( blob.name
blob.name
)}
alt={blob.name}
width="50"
/>
</div>
</dt>
<dt className="govuk-summary-list__value">
<span className="govuk-body govuk-!-font-size-14">
{blob.name} (
{bytesToSize(
blob.size ||
blob.contentLength
)} )}
) alt={blob.name}
</span> width="50"
</dt> />
<dd className="govuk-summary-list__actions"> </div>
<a </dt>
className="govuk-link" <dt className="govuk-summary-list__value">
href="#" <span className="govuk-body govuk-!-font-size-14">
onClick={() => { {blob.name} (
updateCurrentSection( {bytesToSize(
sectionCount blob.size ||
); blob.contentLength
}} )}
> )
{t( </span>
"newappeal:change-link-label" </dt>
)} <dd className="govuk-summary-list__actions">
</a> <a
</dd> className="govuk-link"
</div> href="#"
</> onClick={() => {
updateCurrentSection(
sectionCount
);
}}
>
{t(
"newappeal:change-link-label"
)}
</a>
</dd>
</div>
); );
}) })
: ""} : ""}
components/newappeal/buildsection.js
+11 -4
View File
@@ -154,15 +154,22 @@ let BuildSection = (props) => {
for (let key in filesUploadObj) { for (let key in filesUploadObj) {
for (let j in filesUploadObj[key]) { for (let j in filesUploadObj[key]) {
buildAppealFilesArray.push({ typeof filesUploadObj[key][j].name != "undefined" &&
"name": filesUploadObj[key][j].name, buildAppealFilesArray.push({
"size": filesUploadObj[key][j].size, "name": filesUploadObj[key][j].name,
}); "size": filesUploadObj[key][j].size,
});
} }
} }
console.log(buildAppealFilesArray); console.log(buildAppealFilesArray);
buildAppealFilesArray = buildAppealFilesArray.concat(values.filesList);
buildAppealFilesArray.filter(function (item, idx) {
return item.name;
});
Object.assign(values, { "filesList": buildAppealFilesArray }); Object.assign(values, { "filesList": buildAppealFilesArray });
setSavingStatus(useSaveStatus); setSavingStatus(useSaveStatus);