uploading files to reps

components/case/representation/index.js

@@ -601,6 +601,7 @@ let MakeRepresentation = (props) => {
         let incidentId = props.appealType.caseReference.incidentid;
         let updateBody = values || {};
         const buildFileArray = [];
+        let newbuildArr = [];
         setSavingStatus(useSaveStatus);
 
         Object.assign(values, {
@@ -724,8 +725,10 @@ let MakeRepresentation = (props) => {
                           "size": Blob.size,
                       })
                   ),
+                  (newbuildArr = buildFileArray.concat(values.filesList)),
+                  console.log(buildFileArray, newbuildArr),
                   Object.assign(values, {
-                      "filesList": buildFileArray,
+                      "filesList": newbuildArr,
                   })),
               generateRepPDF(
                   values,
@@ -738,22 +741,23 @@ let MakeRepresentation = (props) => {
                       ? router.locale + "/myportal"
                       : "/myportal"
               ))
-            : (values.hasOwnProperty("representationDocuments") &&
+            : // (values.hasOwnProperty("representationDocuments") &&
-                  (values.representationDocuments.map((Blob) =>
+              //       (values.representationDocuments.map((Blob) =>
-                      buildFileArray.push({
+              //           buildFileArray.push({
-                          "name": Blob.name,
+              //               "name": Blob.name,
-                          "size": Blob.size,
+              //               "size": Blob.size,
-                      })
+              //           })
-                  ),
+              //       ),
-                  Object.assign(values, {
+              //       Object.assign(values, {
-                      "filesList": buildFileArray,
+              //           "filesList": buildFileArray,
-                  })),
+              //       }))),
-              uploadRepresentationFiles(values),
+              console.log("zxcvbnm"),
-              generateRepPDF(
+            uploadRepresentationFiles(values),
-                  values,
+            generateRepPDF(
-                  props.props.accountDetails.containerID,
+                values,
-                  currentView.caseReference.currentReference
+                props.props.accountDetails.containerID,
-              ));
+                currentView.caseReference.currentReference
+            );
     };
 
     const onHandleSubmit = (values) => {
@@ -881,16 +885,17 @@ let MakeRepresentation = (props) => {
               Object.assign(values, { "locale": router.locale }),
               props.invalid == false &&
                   updateRepresentation(values, false, false),
-              values.hasOwnProperty("representationDocuments") &&
+              console.log("qwerty"),
-                  (values.representationDocuments.map((Blob) =>
+              //   values.hasOwnProperty("representationDocuments") &&
-                      buildFileArray.push({
+              //       (values.representationDocuments.map((Blob) =>
-                          "name": Blob.name,
+              //           buildFileArray.push({
-                          "size": Blob.size,
+              //               "name": Blob.name,
-                      })
+              //               "size": Blob.size,
-                  ),
+              //           })
-                  Object.assign(values, {
+              //       ),
-                      "filesList": buildFileArray,
+              //       Object.assign(values, {
-                  })),
+              //           "filesList": buildFileArray,
+              //       })),
               console.log(
                   "====================== rep lpa payload:\n",
                   JSON.stringify(values)

components/case/representation/representationCompleteSubmit.js

@@ -41,7 +41,7 @@ const RepCompleteSubmit = (props) => {
 
     const repFormData = formObj.representationForm.values;
 
-    // const repDate = new Date();
+    //const repDate = new Date();
 
     // let day = repDate.getDate();
     // let month = repDate.getMonth() + 1;
@@ -135,6 +135,48 @@ const RepCompleteSubmit = (props) => {
         }
     };
 
+    let buildAppealFilesArray = [];
+
+    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,
+            });
+    }
+
+    console.log(
+        buildAppealFilesArray,
+        formObj.representationForm.values.filesList
+    );
+
+    buildAppealFilesArray = formObj.representationForm.values.hasOwnProperty(
+        "filesList"
+    )
+        ? buildAppealFilesArray.concat(
+              formObj.representationForm.values.filesList
+          )
+        : buildAppealFilesArray;
+
+    console.log(buildAppealFilesArray);
+
+    // const arrUniq = [
+    //     ...new Map(buildAppealFilesArray.map((v) => [v.name, v])).values(),
+    // ];
+
+    const arrUniq = buildAppealFilesArray.filter(
+        (obj1, i, arr) => arr.findIndex((obj2) => obj2.name === obj1.name) === i
+    );
+
+    console.log(arrUniq);
+
+    Object.assign(formObj.representationForm.values, {
+        "filesList": arrUniq,
+    });
+
     return (
         <>
             {currentView.representationSubmitConfirmation == true ? (
@@ -303,10 +345,7 @@ const RepCompleteSubmit = (props) => {
                                     </dt>
 
                                     <dd className="govuk-summary-list__value">
-                                        {formObj.representationForm.values.hasOwnProperty(
+                                        {formObj.representationForm.values
-                                            "filesList"
-                                        ) &&
-                                        formObj.representationForm.values
                                             .filesList.length > 0
                                             ? formObj.representationForm.values.filesList.map(
                                                   (blob, i) => (

components/case/representation/representationElements.js

@@ -962,10 +962,7 @@ export const RenderFileUpload = (field) => {
 
     const filelistObj = field.fileList || {};
 
-    // const blobList = jsonpath(
+    console.log("----", filelistObj.length);
-    //     "$..[?(@.documentType=='" + field.documentTypeCode + "')]",
-    //     filelistObj
-    // );
 
     let blobList = filelistObj;
 
@@ -974,13 +971,11 @@ export const RenderFileUpload = (field) => {
     // let filesUploadObj = field.input.value;
 
     // for (let key in filesUploadObj) {
-    //     for (let j in filesUploadObj[key]) {
+    //     typeof filesUploadObj[key].name != "undefined" &&
-    //         typeof filesUploadObj[key][j].name != "undefined" &&
+    //         buildAppealFilesArray.push({
-    //             buildAppealFilesArray.push({
+    //             "name": filesUploadObj[key].name,
-    //                 "name": filesUploadObj[key][j].name,
+    //             "size": filesUploadObj[key].size,
-    //                 "size": filesUploadObj[key][j].size,
+    //         });
-    //             });
-    //     }
     // }
 
     // buildAppealFilesArray = buildAppealFilesArray.concat(blobList);
@@ -1063,7 +1058,7 @@ export const RenderFileUpload = (field) => {
                 <ul>
                     {files.map(
                         (file, i) =>
-                            file.hasOwnProperty("name") && (
+                            typeof file.name != "undefined" && (
                                 <div
                                     key={file.name}
                                     className="govuk-!-margin-bottom-5 fileThumb"
@@ -1103,7 +1098,6 @@ export const RenderFileUpload = (field) => {
                             &minus;
                         </span>
                     </div>
-
                     <img
                         src={getThumbnailIconByExtension(blob.name)}
                         alt={blob.name}

components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js

@@ -1013,7 +1013,7 @@ let S78_Questionnaire = (props) => {
 
 export default S78_Questionnaire;
 
-// const selector = formValueSelector("representationForm"); //<-- same as form name
+//const selector = formValueSelector("representationForm"); //<-- same as form name
 
 // S78_Questionnaire = connect((state) => {
 //     const representationTypeValue = selector(state, "representationType");
@@ -1025,7 +1025,7 @@ export default S78_Questionnaire;
 //     };
 // })(S78_Questionnaire);
 
-// const mapStateToProps = (state, props) => {
+//const mapStateToProps = (state, props) => {
 //     console.log();
 //     return {
 //         search: state.search,

components/case/representationList.js

@@ -18,7 +18,7 @@ const RepresentationList = (props) => {
 
     const router = useRouter();
     const { locale } = router;
-    // const [showSpinnerState, setShowSpinnerState] = useState(false);
+    //const [showSpinnerState, setShowSpinnerState] = useState(false);
 
     // let spinnerState = () => {
     //     showSpinnerState == true