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

moved alot of stuff from client side

Browse Source
This commit is contained in:
robbond
2024-11-18 19:54:23 +00:00
parent 2c5323c9cf
commit e690bc6725
12 changed files with 686 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/representation/index.js
+254 -206
View File
@@ -389,6 +389,8 @@ let MakeRepresentation = (props) => {
caseReference={caseReference} caseReference={caseReference}
setRepFileName={setRepFileName} setRepFileName={setRepFileName}
updateRepresentation={updateRepresentation} updateRepresentation={updateRepresentation}
setSavingStatus={setSavingStatus}
savingStatus={savingStatus}
/> />
); );
} else { } else {
@@ -408,6 +410,8 @@ let MakeRepresentation = (props) => {
caseReference={caseReference} caseReference={caseReference}
setRepFileName={setRepFileName} setRepFileName={setRepFileName}
updateRepresentation={updateRepresentation} updateRepresentation={updateRepresentation}
setSavingStatus={setSavingStatus}
savingStatus={savingStatus}
/>; />;
break; break;
case "appellant": case "appellant":
@@ -431,6 +435,8 @@ let MakeRepresentation = (props) => {
props={props} props={props}
setRepFileName={setRepFileName} setRepFileName={setRepFileName}
updateRepresentation={updateRepresentation} updateRepresentation={updateRepresentation}
setSavingStatus={setSavingStatus}
savingStatus={savingStatus}
/> />
); );
break; break;
@@ -464,6 +470,8 @@ let MakeRepresentation = (props) => {
questionnaireCount={questionnaireCount} questionnaireCount={questionnaireCount}
setRepFileName={setRepFileName} setRepFileName={setRepFileName}
updateRepresentation={updateRepresentation} updateRepresentation={updateRepresentation}
setSavingStatus={setSavingStatus}
savingStatus={savingStatus}
/> />
); );
break; break;
@@ -488,6 +496,8 @@ let MakeRepresentation = (props) => {
props={props} props={props}
setRepFileName={setRepFileName} setRepFileName={setRepFileName}
updateRepresentation={updateRepresentation} updateRepresentation={updateRepresentation}
setSavingStatus={setSavingStatus}
savingStatus={savingStatus}
/> />
); );
break; break;
@@ -512,6 +522,8 @@ let MakeRepresentation = (props) => {
props={props} props={props}
setRepFileName={setRepFileName} setRepFileName={setRepFileName}
updateRepresentation={updateRepresentation} updateRepresentation={updateRepresentation}
setSavingStatus={setSavingStatus}
savingStatus={savingStatus}
/> />
); );
break; break;
@@ -615,6 +627,10 @@ let MakeRepresentation = (props) => {
const sortFileObj = (filelistObj) => { const sortFileObj = (filelistObj) => {
let blobList = filelistObj; let blobList = filelistObj;
function removeNullObjects(arr) {
return arr.filter((obj) => obj !== null);
}
function removeObjectsWithUndefinedKey(arr, key) { function removeObjectsWithUndefinedKey(arr, key) {
return arr.filter((obj) => obj[key] !== undefined); return arr.filter((obj) => obj[key] !== undefined);
} }
@@ -623,6 +639,7 @@ let MakeRepresentation = (props) => {
return arr.filter((obj) => Object.keys(obj).length > 0); return arr.filter((obj) => Object.keys(obj).length > 0);
} }
blobList = removeNullObjects(blobList);
blobList = removeEmptyObjects(blobList); blobList = removeEmptyObjects(blobList);
blobList = removeObjectsWithUndefinedKey(blobList, "name"); blobList = removeObjectsWithUndefinedKey(blobList, "name");
@@ -819,6 +836,7 @@ let MakeRepresentation = (props) => {
// Object.assign(values, { // Object.assign(values, {
// "filesList": buildFileArray, // "filesList": buildFileArray,
// })), // })),
uploadRepresentationFiles(values), uploadRepresentationFiles(values),
generateRepPDF( generateRepPDF(
values, values,
@@ -931,54 +949,165 @@ let MakeRepresentation = (props) => {
: values.representationCapacity, : values.representationCapacity,
"locale": router.locale, "locale": router.locale,
})); }));
currentView.representationSubmit != true
? _.isEmpty(currentView.representationCapacity) if (currentView.representationSubmit != true) {
? isLPA if (_.isEmpty(currentView.representationCapacity)) {
? setRepresentationCapacity("lpa") if (isLPA) {
: setRepresentationCapacity( setRepresentationCapacity(
values.representationCapacity values.representationCapacity
.replace(/(\band|[\s\-\+\(\)\,\&])/g, "") .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
.toLowerCase() .toLowerCase()
) );
: questionnaireCount != 0 && } else {
showQuestionnaireSection < questionnaireCount setRepresentationCapacity(
? (setShowQuestionnaireSection(showQuestionnaireSection + 1), values.representationCapacity
updateRepresentation(values, false, false)) .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
: (updateRepresentation(values, false, false), .toLowerCase()
setRepresentationSubmit(true)) );
: currentView.representationSubmit == true }
? (console.log("capacity", currentView.representationCapacity), } else {
console.log("has errors:", props.invalid), if (values.representationType == "Questionnaire") {
Object.assign(values, { "locale": router.locale }), if (
props.invalid == false && questionnaireCount != 0 &&
updateRepresentation(values, false, false), showQuestionnaireSection < questionnaireCount
// values.hasOwnProperty("representationDocuments") && ) {
// (values.representationDocuments.map((Blob) => setShowQuestionnaireSection(
// buildFileArray.push({ showQuestionnaireSection + 1
// "name": Blob.name, );
// "size": Blob.size, updateRepresentation(values, false, false);
// }) } else {
// ), updateRepresentation(values, false, false);
// Object.assign(values, { setRepresentationSubmit(true);
// "filesList": buildFileArray, }
// })), } else {
console.log( updateRepresentation(values, false, false);
"====================== rep lpa payload:\n", setRepresentationSubmit(true);
JSON.stringify(values) }
), }
generateRepPDF( } else {
values, if (currentView.representationSubmit == true) {
props.props.accountDetails.containerID, console.log("capacity", currentView.representationCapacity);
currentView.caseReference.currentReference console.log("has errors:", props.invalid);
), Object.assign(values, { "locale": router.locale });
uploadRepresentationFiles(values), props.invalid == false &&
setRepresentationSubmitConfirmation(true)) updateRepresentation(values, false, false);
: console.log("nit updated"); // values.hasOwnProperty("representationDocuments") &&
// (values.representationDocuments.map((Blob) =>
// buildFileArray.push({
// "name": Blob.name,
// "size": Blob.size,
// })
// ),
// Object.assign(values, {
// "filesList": buildFileArray,
// })),
console.log(
"====================== rep lpa payload:\n",
JSON.stringify(values)
);
generateRepPDF(
values,
props.props.accountDetails.containerID,
currentView.caseReference.currentReference
);
uploadRepresentationFiles(values);
setRepresentationSubmitConfirmation(true);
} else {
console.log("nit updated");
}
}
// currentView.representationSubmit != true
// ? _.isEmpty(currentView.representationCapacity)
// ? isLPA
// ? setRepresentationCapacity("lpa")
// : setRepresentationCapacity(
// values.representationCapacity
// .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
// .toLowerCase()
// )
// : questionnaireCount != 0 &&
// showQuestionnaireSection < questionnaireCount
// ? (setShowQuestionnaireSection(showQuestionnaireSection + 1),
// updateRepresentation(values, false, false))
// : (updateRepresentation(values, false, false),
// setRepresentationSubmit(true))
// : currentView.representationSubmit == true
// ? (console.log("capacity", currentView.representationCapacity),
// console.log("has errors:", props.invalid),
// Object.assign(values, { "locale": router.locale }),
// props.invalid == false &&
// updateRepresentation(values, false, false),
// // values.hasOwnProperty("representationDocuments") &&
// // (values.representationDocuments.map((Blob) =>
// // buildFileArray.push({
// // "name": Blob.name,
// // "size": Blob.size,
// // })
// // ),
// // Object.assign(values, {
// // "filesList": buildFileArray,
// // })),
// console.log(
// "====================== rep lpa payload:\n",
// JSON.stringify(values)
// ),
// generateRepPDF(
// values,
// props.props.accountDetails.containerID,
// currentView.caseReference.currentReference
// ),
// uploadRepresentationFiles(values),
// setRepresentationSubmitConfirmation(true))
// : console.log("nit updated");
//window.alert(`You submitted:\n\n${JSON.stringify(values, null, 2)}`); //window.alert(`You submitted:\n\n${JSON.stringify(values, null, 2)}`);
}; };
const cleanFilesList = (blobList) => {
let newblobList = blobList.filesList;
function removeNullObjects(arr) {
if (arr.length === 0) {
return arr;
}
return arr.filter((obj) => obj !== null);
}
function removeObjectsWithUndefinedKey(arr, key) {
if (arr.length === 0) {
return arr;
}
return arr.filter((obj) => obj[key] !== undefined);
}
function removeEmptyObjects(arr) {
if (arr.length === 0) {
return arr;
}
return arr.filter(
(obj) =>
obj &&
typeof obj === "object" &&
Object.keys(obj).length > 0
);
}
newblobList = removeNullObjects(newblobList);
newblobList = removeEmptyObjects(newblobList);
newblobList = removeObjectsWithUndefinedKey(newblobList, "name");
Object.assign(blobList, {
"filesList": newblobList,
});
return blobList;
};
const uploadRepresentationFiles = (values) => { const uploadRepresentationFiles = (values) => {
values = values.hasOwnProperty("filesList")
? cleanFilesList(values)
: values;
// get filelists from values object // get filelists from values object
let fileListObj = _.filter(values, function (v, key) { let fileListObj = _.filter(values, function (v, key) {
return _.includes(key, "representationDocuments"); return _.includes(key, "representationDocuments");
@@ -1011,19 +1140,8 @@ let MakeRepresentation = (props) => {
const repForm = props.props.form; const repForm = props.props.form;
// try {
// let value = props.initialValues;
// setRepresentationCapacity(
// props.initialValues.representationCapacity.toLowerCase()
// );
// //setRepresentationSubmit(false);
// } catch {
// console.log("not has props");
// }
return ( return (
<div> <div>
<div>hello {currentView.representationSubmit ? "yep" : "no"}</div>
<form onSubmit={handleSubmit(onHandleSubmit)}> <form onSubmit={handleSubmit(onHandleSubmit)}>
{currentView.representationSubmit == true ? ( {currentView.representationSubmit == true ? (
<RepCompleteSubmit <RepCompleteSubmit
@@ -1045,7 +1163,7 @@ let MakeRepresentation = (props) => {
/> />
) : ( ) : (
<> <>
{!session ? ( {/* {!session ? (
<> <>
<div> <div>
<p className="govuk-body"> <p className="govuk-body">
@@ -1077,172 +1195,103 @@ let MakeRepresentation = (props) => {
)} )}
</button> </button>
</> </>
) : ( ) : ( */}
<> <>
<h1 className="govuk-heading-l"> <h1 className="govuk-heading-l">
{t( {t(
"myrepresentations:make-a-representation-on-label" "myrepresentations:make-a-representation-on-label"
)}{" "} )}{" "}
{currentView.caseReference.currentReference}{" "} {currentView.caseReference.currentReference}{" "}
</h1> </h1>
{currentView.caseReference.caseReference} <div id="rep-form">
<div id="rep-form"> <div className="govuk-grid-column-three-quarters wgForm">
<div className="govuk-grid-column-three-quarters wgForm"> {whichControl()}
{whichControl()} </div>
</div>
<div className="govuk-grid-column-one-quarter"> <div className="govuk-grid-column-one-quarter">
{" "} {" "}
<div className="card"> <div className="card">
<div className="card-body"> <div className="card-body">
<h2 className="govuk-heading-s"> <h2 className="govuk-heading-s">
{t( {t(
"myrepresentations:timetable-title" "myrepresentations:timetable-title"
)}{" "} )}{" "}
{currentView.caseReference
.appealType == 846040011}
</h2>
<div className="govuk-summary-list">
<div className="govuk-body-s">
{currentView.caseReference {currentView.caseReference
.appealType == .appealType == 846040011
846040011} ? t(
</h2> "myrepresentations:local-impact-report"
<div className="govuk-summary-list"> )
<div className="govuk-body-s"> : t(
{currentView "myrepresentations:questionnaire-due-label"
.caseReference )}
.appealType == :
846040011 <span className="govuk-body-s">
? t( {" "}
"myrepresentations:local-impact-report" {formatDates(
) detailsObj.pinswg_questionnaireduedate ||
: t( detailsObj.pinswg_endofrepresentationperiod
"myrepresentations:questionnaire-due-label" )}
)} </span>
: </div>
<span className="govuk-body-s"> <div className="govuk-body-s">
{" "} {t(
{formatDates( "myrepresentations:statements-due-label"
detailsObj.pinswg_questionnaireduedate || )}
detailsObj.pinswg_endofrepresentationperiod :
)} <span className="govuk-body-s">
</span> {" "}
</div> {formatDates(
detailsObj.pinswg_statementduedate ||
detailsObj.pinswg_statementsduedate ||
detailsObj.pinswg_endofrepresentationperiod
)}
</span>
</div>
{currentView.caseReference
.appealType !=
846040011 && (
<div className="govuk-body-s"> <div className="govuk-body-s">
{t( {t(
"myrepresentations:statements-due-label" "myrepresentations:final-comments-due-label"
)} )}
: :
<span className="govuk-body-s"> <span className="govuk-body-s">
{" "} {" "}
{formatDates( {formatDates(
detailsObj.pinswg_statementduedate || detailsObj.pinswg_finalcommentsduedate
detailsObj.pinswg_statementsduedate ||
detailsObj.pinswg_endofrepresentationperiod
)} )}
</span> </span>
</div> </div>
{currentView.caseReference )}
.appealType !=
846040011 && (
<div className="govuk-body-s">
{t(
"myrepresentations:final-comments-due-label"
)}
:
<span className="govuk-body-s">
{" "}
{formatDates(
detailsObj.pinswg_finalcommentsduedate
)}
</span>
</div>
)}
</div>
</div> </div>
</div>{" "}
{/* {typeof props.props.currentView
.representationCapacity !=
"undefined" &&
props.props.currentView
.representationCapacity.length >
0 && (
<div className="govuk-grid-row">
{savingStatus ? (
<span className=" progress-save-active">
{router.locale ==
"cy"
? "Nôl data"
: "Saving data"}
<img
className="data-loading-icon"
src="/assets/images/loading.gif"
alt={
router.locale ==
"cy"
? "Nôl data"
: "Saving data"
}
/>
</span>
) : (
<button
className="govuk-button govuk-button--secondary progress-save "
onClick={() => {
let valuesObj =
props.props
.form[
props
.form
].values ||
{};
console.log(
"valuesobj:",
valuesObj
);
delete valuesObj[
"_pinswg_appellant_value"
];
console.log(
"on save:",
valuesObj
);
updateRepresentation(
valuesObj,
false,
true
);
}}
>
{t(
"common:save-exit-button"
)}
</button>
)}
ee
</div>
)} */}
<div>
{formObj.hasOwnProperty(
"representationForm"
) &&
formObj[
"representationForm"
].hasOwnProperty("values") &&
formObj[
"representationForm"
].values.hasOwnProperty(
"representationType"
) &&
formObj["representationForm"]
.values
.representationType ==
"Questionnaire" &&
whichProgress()}
</div> </div>
</div> </div>
<div>
{formObj.hasOwnProperty(
"representationForm"
) &&
formObj[
"representationForm"
].hasOwnProperty("values") &&
formObj[
"representationForm"
].values.hasOwnProperty(
"representationType"
) &&
formObj["representationForm"].values
.representationType ==
"Questionnaire" &&
whichProgress()}
</div>
</div> </div>
</> </div>
)} </>
{/* )} */}
</> </>
)} )}
</form> </form>
@@ -1266,7 +1315,6 @@ const mapStateToProps = (state) => {
const mapDispatchToProps = (dispatch) => { const mapDispatchToProps = (dispatch) => {
return { return {
setRepresentationCapacity: (representationCapacity) => { setRepresentationCapacity: (representationCapacity) => {
//dispatch(reset("representationForm"));
dispatch(setRepresentationCapacity(representationCapacity)); dispatch(setRepresentationCapacity(representationCapacity));
}, },
setRepresentationSubmit: (representationSubmit) => { setRepresentationSubmit: (representationSubmit) => {
components/case/representation/representationAgent.js
+3 -2
View File
@@ -27,9 +27,10 @@ const RepAgent = (props) => {
currentView, currentView,
setRepFileName, setRepFileName,
updateRepresentation, updateRepresentation,
setSavingStatus,
savingStatus,
} = props; } = props;
const { acceptedFiles, getRootProps, getInputProps } = useDropzone(); const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
const [savingStatus, setSavingStatus] = useState(false);
setRepFileName(formObj.representationForm.values); setRepFileName(formObj.representationForm.values);
@@ -179,7 +180,7 @@ const RepAgent = (props) => {
props.props.props.accountDetails props.props.props.accountDetails
.containerID .containerID
} }
filenamePrefix={props} filenamePrefix={props.formObj}
/> />
</div> </div>
{props.currentView.caseReference.hasOwnProperty( {props.currentView.caseReference.hasOwnProperty(
components/case/representation/representationAppellant.js
+3 -2
View File
@@ -30,9 +30,10 @@ const RepAppellant = (props) => {
currentView, currentView,
setRepFileName, setRepFileName,
updateRepresentation, updateRepresentation,
setSavingStatus,
savingStatus,
} = props; } = props;
const { acceptedFiles, getRootProps, getInputProps } = useDropzone(); const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
const [savingStatus, setSavingStatus] = useState(false);
setRepFileName(formObj.representationForm.values); setRepFileName(formObj.representationForm.values);
@@ -157,7 +158,7 @@ const RepAppellant = (props) => {
props.props.props.accountDetails props.props.props.accountDetails
.containerID .containerID
} }
filenamePrefix={props} filenamePrefix={props.formObj}
/> />
</div> </div>
{props.currentView.caseReference.hasOwnProperty( {props.currentView.caseReference.hasOwnProperty(
components/case/representation/representationElements.js
+33 -5
View File
@@ -966,16 +966,33 @@ export const RenderFileUpload = (field) => {
let blobList = filelistObj; let blobList = filelistObj;
function removeNullObjects(arr) {
if (arr.length === 0) {
return arr;
}
return arr.filter((obj) => obj !== null);
}
function removeObjectsWithUndefinedKey(arr, key) { function removeObjectsWithUndefinedKey(arr, key) {
if (arr.length === 0) {
return arr;
}
return arr.filter((obj) => obj[key] !== undefined); return arr.filter((obj) => obj[key] !== undefined);
} }
function removeEmptyObjects(arr) { function removeEmptyObjects(arr) {
return arr.filter((obj) => Object.keys(obj).length > 0); if (arr.length === 0) {
return arr;
}
return arr.filter(
(obj) =>
obj && typeof obj === "object" && Object.keys(obj).length > 0
);
} }
blobList = removeEmptyObjects(blobList); blobList = removeEmptyObjects(blobList);
blobList = removeObjectsWithUndefinedKey(blobList, "name"); blobList = removeObjectsWithUndefinedKey(blobList, "name");
blobList = removeNullObjects(blobList);
let buildAppealFilesArray = []; let buildAppealFilesArray = [];
@@ -1079,7 +1096,7 @@ export const RenderFileUpload = (field) => {
{field.meta.touched && field.meta.error && ( {field.meta.touched && field.meta.error && (
<span className="error">{field.meta.error}</span> <span className="error">{field.meta.error}</span>
)} )}
{blobList && Array.isArray(files) && ( {/* {files && Array.isArray(files) && (
<ul> <ul>
{files.map( {files.map(
(file, i) => (file, i) =>
@@ -1100,7 +1117,7 @@ export const RenderFileUpload = (field) => {
) )
)} )}
</ul> </ul>
)} )} */}
{blobList.map((blob, i) => ( {blobList.map((blob, i) => (
<div <div
key={blob.name + "_" + i} key={blob.name + "_" + i}
@@ -1169,8 +1186,19 @@ export function FileUploadField(props) {
setFilesForAppeal={props.setFilesForAppeal} setFilesForAppeal={props.setFilesForAppeal}
containerID={props.containerID} containerID={props.containerID}
filenamePrefix={ filenamePrefix={
props.filenamePrefix.formObj.representationForm.values props.filenamePrefix.hasOwnProperty("representationForm") &&
.repfile_name props.filenamePrefix.representationForm.hasOwnProperty(
"values"
) &&
props.filenamePrefix.representationForm.values.hasOwnProperty(
"repfile_name"
)
? props.filenamePrefix.representationForm.values
.repfile_name
: props.filenamePrefix.hasOwnProperty("formObj")
? props.filenamePrefix.formObj["representationForm"]
.values.repfile_name
: ""
} }
/> />
</> </>
components/case/representation/representationInterestedPartyPerson.js
+3 -2
View File
@@ -26,11 +26,12 @@ const RepInterestedPartyPerson = (props) => {
setRepresentationSubmit, setRepresentationSubmit,
setRepFileName, setRepFileName,
updateRepresentation, updateRepresentation,
setSavingStatus,
savingStatus,
} = props; } = props;
const required = (value) => (value ? undefined : "Required"); const required = (value) => (value ? undefined : "Required");
const { acceptedFiles, getRootProps, getInputProps } = useDropzone(); const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
const [savingStatus, setSavingStatus] = useState(false);
setRepFileName(formObj.representationForm.values); setRepFileName(formObj.representationForm.values);
@@ -175,7 +176,7 @@ const RepInterestedPartyPerson = (props) => {
props.props.props.accountDetails props.props.props.accountDetails
.containerID .containerID
} }
filenamePrefix={props} filenamePrefix={props.formObj}
/> />
</div> </div>
{props.currentView.caseReference.hasOwnProperty( {props.currentView.caseReference.hasOwnProperty(
components/case/representation/representationLPA.js
+61 -8
View File
@@ -19,7 +19,6 @@ import S78_Questionnaire from "./representationQuestionnaires/representationLPAQ
let RepLPA = (props) => { let RepLPA = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
const router = useRouter(); const router = useRouter();
const { locale } = router; const { locale } = router;
const { const {
@@ -38,9 +37,11 @@ let RepLPA = (props) => {
setQuestionnaireCount, setQuestionnaireCount,
setRepFileName, setRepFileName,
updateRepresentation, updateRepresentation,
setSavingStatus,
savingStatus,
} = props; } = props;
const { acceptedFiles, getRootProps, getInputProps } = useDropzone(); const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
const [savingStatus, setSavingStatus] = useState(false);
const files = acceptedFiles.map((file) => ( const files = acceptedFiles.map((file) => (
<li key={file.path}> <li key={file.path}>
{file.path} - {file.size} bytes {file.path} - {file.size} bytes
@@ -197,6 +198,13 @@ let RepLPA = (props) => {
) && ) &&
setRepFileName(props.formObj["representationForm"].values); setRepFileName(props.formObj["representationForm"].values);
let filesListObj =
props.formObj.hasOwnProperty("representationForm") &&
props.formObj["representationForm"].hasOwnProperty("values") &&
props.formObj["representationForm"].values.hasOwnProperty("filesList")
? props.formObj["representationForm"].values.filesList
: {};
return ( return (
<> <>
<div className="govuk-grid-row"> <div className="govuk-grid-row">
@@ -291,6 +299,35 @@ let RepLPA = (props) => {
> >
{" "} {" "}
<div className="govuk-form-group govuk-!-margin-bottom-9"> <div className="govuk-form-group govuk-!-margin-bottom-9">
{console.log(
"--------",
props.formObj.hasOwnProperty(
"representationForm"
) &&
props.formObj[
"representationForm"
].hasOwnProperty("values") &&
props.formObj[
"representationForm"
].values.hasOwnProperty(
"filesList"
)
? props.props.props.form[
"representationForm"
].values.filesList
: ""
)}
{/* {props.formObj.hasOwnProperty(
"representationForm"
) &&
props.formObj[
"representationForm"
].hasOwnProperty("values") &&
props.formObj[
"representationForm"
].values.hasOwnProperty(
"filesList"
) && ( */}
<FileUploadField <FileUploadField
name={"representationDocuments"} name={"representationDocuments"}
id={"representationDocuments"} id={"representationDocuments"}
@@ -302,17 +339,32 @@ let RepLPA = (props) => {
} }
hint={"sdsd"} hint={"sdsd"}
fileList={ fileList={
props.props.props.form[ (props.formObj.hasOwnProperty(
"representationForm" "representationForm"
].values.filesList || [] ) &&
props.formObj[
"representationForm"
].hasOwnProperty(
"values"
) &&
props.formObj[
"representationForm"
].values.hasOwnProperty(
"filesList"
) &&
props.props.props.form[
"representationForm"
].values.filesList) ||
[]
} }
setFilesForRepresentation={[]} setFilesForRepresentation={[]}
containerID={ containerID={
props.props.props.accountDetails props.props.props.accountDetails
.containerID .containerID
} }
filenamePrefix={props} filenamePrefix={props.formObj}
/> />
{/* // )} */}
</div> </div>
</fieldset> </fieldset>
</> </>
@@ -434,7 +486,7 @@ let RepLPA = (props) => {
className="govuk-button" className="govuk-button"
data-module="govuk-button" data-module="govuk-button"
> >
{t("common:continue-button")} wwwww {t("common:continue-button")}
</button> </button>
{/* {router.query.state != "edit" && ( {/* {router.query.state != "edit" && (
<a <a
@@ -471,8 +523,9 @@ let RepLPA = (props) => {
className="govuk-button progress-save " className="govuk-button progress-save "
onClick={() => { onClick={() => {
let valuesObj = let valuesObj =
props.props.form[props.form] props.props.props.form[
.values || {}; props.form
].values || {};
console.log( console.log(
"valuesobj:", "valuesobj:",
components/myportal/topthree_reps.js
+1
View File
@@ -197,6 +197,7 @@ const TopThree = (props) => {
query: { query: {
case: showTopThreeArr[key].caseRef, case: showTopThreeArr[key].caseRef,
state: "edit", state: "edit",
created: showTopThreeArr[key].repfile_name,
}, },
}} }}
className="govuk-link--no-underline" className="govuk-link--no-underline"
components/representation.js
+1
View File
@@ -24,6 +24,7 @@ const CaseRepresentation = (props) => {
caseReference={props.caseReference} caseReference={props.caseReference}
currentType={props.currentType} currentType={props.currentType}
searchResultsObj={props.searchResultsObj} searchResultsObj={props.searchResultsObj}
searchDetailsObj={props.searchDetailsObj}
searchString={props.searchString} searchString={props.searchString}
props={props.props} props={props.props}
/> />
next.config.js
+1
View File
@@ -58,6 +58,7 @@ const buildId = Date.now().toString();
module.exports = { module.exports = {
//output: "standalone", //output: "standalone",
reactStrictMode: false,
env: { env: {
BUILD_ID_ENV: buildId, BUILD_ID_ENV: buildId,
}, },
package.json
+2 -2
View File
@@ -28,7 +28,7 @@
"@redux-devtools/extension": "^3.3.0", "@redux-devtools/extension": "^3.3.0",
"@xmldom/xmldom": "^0.8.10", "@xmldom/xmldom": "^0.8.10",
"applicationinsights": "^2.9.1", "applicationinsights": "^2.9.1",
"axios": "^1.6.2", "axios": "^1.7.7",
"compression": "^1.7.4", "compression": "^1.7.4",
"cookie-cutter": "^0.2.0", "cookie-cutter": "^0.2.0",
"crypto-js": "^4.2.0", "crypto-js": "^4.2.0",
@@ -97,4 +97,4 @@
"eslint-plugin-jsdoc": "^48.2.3", "eslint-plugin-jsdoc": "^48.2.3",
"prisma": "^5.0.0" "prisma": "^5.0.0"
} }
} }
pages/api/file/generatepdf.js
+43
View File
@@ -109,6 +109,49 @@ export default async function handler(req, res) {
var checkHash = req.query.hash; var checkHash = req.query.hash;
let reqBodyobj = req.body; //JSON.parse(req.body); let reqBodyobj = req.body; //JSON.parse(req.body);
const cleanFilesList = (blobList) => {
let newblobList = blobList.filesList;
function removeNullObjects(arr) {
if (arr.length === 0) {
return arr;
}
return arr.filter((obj) => obj !== null);
}
function removeObjectsWithUndefinedKey(arr, key) {
if (arr.length === 0) {
return arr;
}
return arr.filter((obj) => obj[key] !== undefined);
}
function removeEmptyObjects(arr) {
if (arr.length === 0) {
return arr;
}
return arr.filter(
(obj) =>
obj &&
typeof obj === "object" &&
Object.keys(obj).length > 0
);
}
newblobList = removeEmptyObjects(newblobList);
newblobList = removeObjectsWithUndefinedKey(newblobList, "name");
newblobList = removeNullObjects(newblobList);
Object.assign(blobList, {
"filesList": newblobList,
});
return blobList;
};
reqBodyobj = reqBodyobj.hasOwnProperty("filesList")
? cleanFilesList(reqBodyobj)
: reqBodyobj;
console.log( console.log(
"//////////////////////\nreqBodyobj" + "//////////////////////\nreqBodyobj" +
req + req +
pages/myportal/representation.js
+281 -71
View File
@@ -5,7 +5,16 @@ import { useEffect } from "react";
import { getSession, useSession } from "next-auth/react"; import { getSession, useSession } from "next-auth/react";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { connect, useDispatch } from "react-redux"; import { connect, useDispatch } from "react-redux";
import { getPersonalAccount, getPortalLoginProxy } from "../../actions"; import {
getPersonalAccount,
getPortalLoginProxy,
getPortalLogin,
getRepsFromBlob,
getCase,
getPortalModuleDetails,
getBasicSearch,
} from "../../actions";
import { getFormCollectionByID } from "../../components/utils";
import Breadcrumbs from "../../components/breadcrumbs"; import Breadcrumbs from "../../components/breadcrumbs";
import CookieBanner from "../../components/cookieBanner"; import CookieBanner from "../../components/cookieBanner";
import Footer from "../../components/footer"; import Footer from "../../components/footer";
@@ -16,13 +25,33 @@ import {
setContainerID, setContainerID,
setLoggedInUserId, setLoggedInUserId,
} from "../../store/accountDetails/action"; } from "../../store/accountDetails/action";
import { wrapper } from "../../store/store";
import { getSearchDetails } from "../../components/utils";
import {
setCurrentReference,
setCurrentView,
setRepresentationCapacity,
} from "../../store/currentView/action";
import {
setSearchDetails,
setSearchResults,
} from "../../store/searchOutput/action";
import { setSearch } from "../../store/search/action";
import NoSessionWarning from "../../components/nosession"; import NoSessionWarning from "../../components/nosession";
import ServiceBanner from "../../components/myportal/servicebanner"; import ServiceBanner from "../../components/myportal/servicebanner";
import TimeOut from "../../components/timeout"; import TimeOut from "../../components/timeout";
import {
setMyRepresentations,
setMyRepresentationsDetails,
setMySubmittedReps,
setMySubmittedRepsDetails,
} from "../../store/myRepresentations/action";
const RepresentationF = (props) => { const RepresentationF = (props) => {
const { footerLinks, pages, accountDetails } = props; const { footerLinks, pages } = props;
let { t, lang } = useTranslation(); let { t, lang } = useTranslation();
const router = useRouter(); const router = useRouter();
@@ -31,34 +60,34 @@ const RepresentationF = (props) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
useEffect(() => { // useEffect(() => {
const updateAccountStore = async () => { // const updateAccountStore = async () => {
const thisSession = await getSession(); // const thisSession = await getSession();
if (thisSession) { // if (thisSession) {
let loggedInUser = await getPortalLoginProxy( // let loggedInUser = await getPortalLoginProxy(
thisSession.user.email // thisSession.user.email
); // );
dispatch( // dispatch(
setAccountDetails( // setAccountDetails(
await getPersonalAccount( // await getPersonalAccount(
loggedInUser.value[0].contactid // loggedInUser.value[0].contactid
) // )
) // )
); // );
dispatch(setContainerID(thisSession.user.id)); // dispatch(setContainerID(thisSession.user.id));
dispatch(setLoggedInUserId(loggedInUser.value[0].contactid)); // dispatch(setLoggedInUserId(loggedInUser.value[0].contactid));
//dispatch(setRepresentationSubmit(true)); // //dispatch(setRepresentationSubmit(true));
} // }
}; // };
updateAccountStore(); // updateAccountStore();
}, [dispatch]); // }, [dispatch]);
const { data: session, status } = useSession(); const { data: session, status } = useSession();
if (status === "loading") { // if (status === "loading") {
return <NoSessionWarning loading={true} />; // return <NoSessionWarning loading={true} />;
} // }
return ( return (
<div> <div>
@@ -169,60 +198,241 @@ const RepresentationF = (props) => {
); );
}; };
// export const getServerSideProps = wrapper.getServerSideProps( export const getServerSideProps = wrapper.getServerSideProps(
// (store) => async (ctx) => { (store) => async (ctx) => {
// const { query, req, res } = ctx; const { query, req, res } = ctx;
// console.log("The query", query); console.log("The query", query);
// const { cookies } = req; const { cookies } = req;
// let loggedInUserCookie = cookies.pinsUser; let loggedInUserCookie = cookies.pinsUser;
// let thisSession = await getSession(ctx); let thisSession = await getSession(ctx);
// let loggedInUser = {}; let loggedInUser = {};
// if (!thisSession) { if (!thisSession) {
// console.log("not has sesssion......."); console.log("not has sesssion.......");
// return { return {
// redirect: { redirect: {
// destination: "/auth/signin", destination: "/auth/signin",
// permanent: false, permanent: false,
// }, },
// }; };
// } else { } else {
// [loggedInUser] = await Promise.all([ [loggedInUser] = await Promise.all([
// await getPortalLogin(thisSession.user.email), await getPortalLogin(thisSession.user.email),
// ]); ]);
// console.log( console.log(
// "=====//////////=====", "=====//////////=====",
// thisSession, thisSession,
// thisSession.user.email, thisSession.user.email,
// loggedInUser loggedInUser
// ); );
// loggedInUser = loggedInUser.value[0].contactid; loggedInUser = loggedInUser.value[0].contactid;
// } }
// const accountDetails = await getPersonalAccount(loggedInUser); const [accountDetails, myRepresentations] = await Promise.all([
await getPersonalAccount(loggedInUser),
await getRepsFromBlob(thisSession.user.id),
]);
// console.log(accountDetails); const myRepresentationsDetails = await getDetails(
// store.dispatch(setAccountDetails(accountDetails)); myRepresentations,
// return { "myRepresentations"
// props: { );
// containerID: thisSession.user.id,
// },
// };
// }
// );
const mapDispatchToProps = (dispatch) => { console.log(accountDetails);
return {
setAccountDetails: (loggedInUser) => { const isLPA =
dispatch(setAccountDetails(loggedInUser)); accountDetails[
}, "pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue"
}; ] == "LPA"
? true
: false;
isLPA && store.dispatch(setRepresentationCapacity("lpa"));
if (query.hasOwnProperty("state")) {
console.log("is lpa?:", isLPA);
store.dispatch(setContainerID(thisSession.user.id));
store.dispatch(setMyRepresentations(myRepresentations));
store.dispatch(
setMyRepresentationsDetails(myRepresentationsDetails)
);
function findObjectByKeyValue(arr, key, value) {
return arr.find((obj) => obj[key] === value);
}
const result = findObjectByKeyValue(
myRepresentations.value,
"repfile_name",
query.created
);
store.dispatch(
setCurrentReference({
"ticketnumber": result.ticketnumber,
"currentReference": result.caseRef,
"currentType": "myRepresentations",
"incidentid": result.incidentID,
"appealType": result.appealType,
"repDetails": result,
})
);
store.dispatch(setAccountDetails(accountDetails));
return {
props: {
containerID: thisSession.user.id,
},
};
} else {
const searchResultsObj = await getBasicSearch(query.case);
const searchDetailsObj = await getSearchDetails(searchResultsObj);
store.dispatch(setContainerID(thisSession.user.id));
store.dispatch(setSearchResults(searchResultsObj));
store.dispatch(setSearchDetails(searchDetailsObj));
store.dispatch(setSearch(query.case));
store.dispatch(
setCurrentView({
"viewName": "My Representations",
"viewKey": "myRepresentations",
})
);
store.dispatch(
setCurrentReference({
"ticketnumber": searchResultsObj.value[0].ticketnumber,
"currentReference": searchResultsObj.value[0].title,
"currentType": "myRepresentations",
"incidentid": searchResultsObj.value[0].incidentid,
"appealType":
searchResultsObj.value[0].pinswg_appealcasetype,
"specialistProcess":
searchDetailsObj[0].value[0]
.pinswg_speacialistcaseprocess != null ||
searchDetailsObj[0].value[0]
.pinswg_specialistcaseprocess != null
? searchDetailsObj[0].value[0]
.pinswg_speacialistcaseprocess ||
searchDetailsObj[0].value[0]
.pinswg_specialistcaseprocess
: "",
})
);
store.dispatch(setAccountDetails(accountDetails));
// return {
// props: {
// searchResultsObj: {
// searchResultsObj: searchResultsObj,
// searchDetailsObj: searchDetailsObj,
// },
// containerID: thisSession.user.id,
// },
// };
}
}
);
const getDetails = (resultsObj, detailsType) => {
let detailsArr = [];
resultsObj =
detailsType == "mySubmittedReps" ? resultsObj : resultsObj.value;
if (detailsType == "myRepresentations") {
const repsObj = resultsObj.map((searchDetail, index) => {
detailsArr.push(
getCase(searchDetail["incidentID"]).then((data) => {
let caseID = "";
switch (detailsType) {
case "myCases":
caseID = data.pinswg_title;
break;
case "myWatchedCases":
case "mySubmittedReps":
caseID =
data[
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
];
break;
case "awaitingSubmission":
case "myRepresentations":
caseID = data.ticketnumber;
break;
default:
caseID = data.pinswg_title;
}
return getPortalModuleDetails(
getFormCollectionByID(data.pinswg_appealcasetype)
.LogicalCollectionName,
caseID
);
})
);
});
}
// const detailsObj = resultsObj.map(async (searchDetail, index) => {
// let caseID = "";
// switch (detailsType) {
// case "myCases":
// caseID = searchDetail.pinswg_title;
// break;
// case "myWatchedCases":
// case "mySubmittedReps":
// caseID =
// searchDetail[
// "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
// ];
// break;
// case "awaitingSubmission":
// caseID = searchDetail.ticketnumber;
// break;
// case "myRepresentations":
// caseID = searchDetail.casereference;
// break;
// default:
// caseID = searchDetail.pinswg_title;
// }
// console.log(detailsType, " case id : ", caseID);
// searchDetail.pinswg_appealcasetype != null &&
// detailsArr.push(
// getPortalModuleDetails(
// getFormCollectionByID(searchDetail.pinswg_appealcasetype)
// .LogicalCollectionName,
// caseID
// // detailsType != "myWatchedCases"
// // ? searchDetail.ticketnumber
// // : searchDetail[
// // "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
// // ]
// )
// );
// });
let detArr = Promise.all(detailsArr);
console.log(detArr);
return detArr;
}; };
// const mapDispatchToProps = (dispatch) => {
// return {
// setAccountDetails: (loggedInUser) => {
// dispatch(setAccountDetails(loggedInUser));
// },
// };
// };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
return { return {
accountDetails: state.accountDetails, accountDetails: state.accountDetails,
@@ -239,4 +449,4 @@ const mapStateToProps = (state) => {
}; };
}; };
export default connect(mapStateToProps, mapDispatchToProps)(RepresentationF); export default connect(mapStateToProps)(RepresentationF);