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

hooks fixes and ordering of events

Browse Source
This commit is contained in:
robbond
2024-11-16 07:45:38 +00:00
parent aaf9b3e574
commit 4bf10d97db
6 changed files with 234 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/representation/representationCompleteSubmit.js
+55 -59
View File
@@ -12,6 +12,7 @@ import { bytesToSize, getThumbnailIconByExtension } from "../../utils";
const RepCompleteSubmit = (props) => {
let { t } = useTranslation();
const [confirmSections, setConfirmSections] = useState(false);
const router = useRouter();
const { locale } = router;
@@ -33,8 +34,6 @@ const RepCompleteSubmit = (props) => {
</li>
));
const [confirmSections, setConfirmSections] = useState(false);
const repFormData = formObj.representationForm.values;
//const repDate = new Date();
@@ -133,29 +132,27 @@ const RepCompleteSubmit = (props) => {
let buildAppealFilesArray = [];
let filesUploadObj =
formObj.representationForm.values.representationDocuments;
// 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,
});
}
// 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
);
// console.log(
// buildAppealFilesArray,
// formObj.representationForm.values.filesList
// );
buildAppealFilesArray = formObj.representationForm.values.hasOwnProperty(
"filesList"
)
? buildAppealFilesArray.concat(
formObj.representationForm.values.filesList
)
: buildAppealFilesArray;
? formObj.representationForm.values.filesList
: [];
console.log(buildAppealFilesArray);
@@ -163,19 +160,19 @@ const RepCompleteSubmit = (props) => {
// ...new Map(buildAppealFilesArray.map((v) => [v.name, v])).values(),
// ];
buildAppealFilesArray = buildAppealFilesArray.filter(function (el) {
return el != null;
});
// buildAppealFilesArray = buildAppealFilesArray.filter(function (el) {
// return el != null;
// });
const arrUniq = buildAppealFilesArray.filter(
(obj1, i, arr) => arr.findIndex((obj2) => obj2.name === obj1.name) === i
);
// const arrUniq = buildAppealFilesArray.filter(
// (obj1, i, arr) => arr.findIndex((obj2) => obj2.name === obj1.name) === i
// );
console.log(arrUniq);
// console.log(arrUniq);
Object.assign(formObj.representationForm.values, {
"filesList": arrUniq,
});
// Object.assign(formObj.representationForm.values, {
// "filesList": arrUniq,
// });
let filterFiles = [];
return (
@@ -357,37 +354,36 @@ const RepCompleteSubmit = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{formObj.representationForm.values
.filesList.length > 0
? ((filterFiles =
formObj.representationForm.values.filesList.filter(
function (el) {
return el != null;
}
)),
filterFiles.map((blob, i) => (
<div
key={blob.name + "_" + i}
className="govuk-!-margin-bottom-5 fileThumb "
>
<img
src={getThumbnailIconByExtension(
blob.name
)}
alt={blob.name}
width="50"
/>
{buildAppealFilesArray.length > 0
? buildAppealFilesArray.map(
(blob, i) => (
<div
key={
blob.name +
"_" +
i
}
className="govuk-!-margin-bottom-5 fileThumb "
>
<img
src={getThumbnailIconByExtension(
blob.name
)}
alt={blob.name}
width="50"
/>
<span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
{blob.name} (
{bytesToSize(
blob.size
)}
)
</span>
</div>
)))
: ""}{" "}
<span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
{blob.name} (
{bytesToSize(
blob.size
)}
)
</span>
</div>
)
)
: ""}
</dd>
<dd className="govuk-summary-list__actions">