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

escape spaces and chars for rep filename

Browse Source
This commit is contained in:
robbond
2024-05-24 14:17:35 +01:00
parent 63c91de09e
commit c546ea6c04
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 +
"_-_" +
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")}
ticketnumber={props.props.caseReference}
hint={"sdsd"}
fileList={[]}
fileList={
props.props.props.props.form[
"representationForm"
].values.filesList || []
}
setFilesForRepresentation={[]}
containerID={props.containerID}
filenamePrefix={props}
filenamePrefix={props.props}
/>
</div>
</fieldset>
components/newappeal/buildchecksection.js
+64 -67
View File
@@ -76,31 +76,30 @@ let BuildCheckSection = (props) => {
let buildAppealFilesArray = [];
//console.log("attached docs: - ", buildAppealFilesArray);
let filesUploadObj = Object.keys(props.props.form.appealForm.values)
.filter(function (k) {
return k.indexOf("pinswg_fileUpload") == 0;
})
.reduce(function (newData, k) {
newData[k] = props.props.form.appealForm.values[k];
return newData;
}, {});
// let filesUploadObj = Object.keys(props.props.form.appealForm.values)
// .filter(function (k) {
// return k.indexOf("pinswg_fileUpload") == 0;
// })
// .reduce(function (newData, k) {
// newData[k] = props.props.form.appealForm.values[k];
// return newData;
// }, {});
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,
});
}
}
// 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,
// });
// }
// }
props.props.form.appealForm.values.filesList.hasOwnProperty("value")
? (buildAppealFilesArray = buildAppealFilesArray.concat(
props.props.form.appealForm.values.filesList.value[0]
))
: (buildAppealFilesArray = buildAppealFilesArray.filesList);
buildAppealFilesArray = props.props.form.appealForm.values.filesList;
buildAppealFilesArray.filter(function (item, idx) {
return item.name;
});
console.log(buildAppealFilesArray);
let pdfObj = props.props.form.appealForm.values;
@@ -180,52 +179,50 @@ let BuildCheckSection = (props) => {
{buildAppealFilesArray.length > 0
? buildAppealFilesArray.map((blob, i) => {
return (
<>
<div
className="govuk-summary-list__row"
key={"9999"}
>
<dt className="govuk-summary-list__key govuk-!-padding-left-5">
<div
key={blob.name + "_" + i}
className="govuk-!-margin-bottom-5 fileThumb "
>
<img
src={getThumbnailIconByExtension(
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
<div
className="govuk-summary-list__row"
key={i}
>
<dt className="govuk-summary-list__key govuk-!-padding-left-5">
<div
key={blob.name + "_" + i}
className="govuk-!-margin-bottom-5 fileThumb "
>
<img
src={getThumbnailIconByExtension(
blob.name
)}
)
</span>
</dt>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#"
onClick={() => {
updateCurrentSection(
sectionCount
);
}}
>
{t(
"newappeal:change-link-label"
)}
</a>
</dd>
</div>
</>
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
)}
)
</span>
</dt>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
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 j in filesUploadObj[key]) {
buildAppealFilesArray.push({
"name": filesUploadObj[key][j].name,
"size": filesUploadObj[key][j].size,
});
typeof filesUploadObj[key][j].name != "undefined" &&
buildAppealFilesArray.push({
"name": filesUploadObj[key][j].name,
"size": filesUploadObj[key][j].size,
});
}
}
console.log(buildAppealFilesArray);
buildAppealFilesArray = buildAppealFilesArray.concat(values.filesList);
buildAppealFilesArray.filter(function (item, idx) {
return item.name;
});
Object.assign(values, { "filesList": buildAppealFilesArray });
setSavingStatus(useSaveStatus);