Merged PR 1104: appeal complete flag on new appeal

Related work items: #10561

components/myportal/awaitingsubmissionfromblob.js

@@ -77,7 +77,13 @@ const AwaitingSubmissionFromBlob = (props) => {
                             <div className="cardModuleDetails">
                                 <div className="cardModuleReference">
                                     <b>{t("myportal:temp-reference")}:</b>
-
+                                    {showTopThreeArr[key].hasOwnProperty(
+                                        "appealComplete"
+                                    ) ? (
+                                        <b>
+                                            {showTopThreeArr[index].pinswg_name}
+                                        </b>
+                                    ) : (
                                         <Link
                                             href={
                                                 (router.locale == "cy"
@@ -93,7 +99,8 @@ const AwaitingSubmissionFromBlob = (props) => {
                                                 showTopThreeArr[key]
                                                     .pinswg_appealcasetype +
                                                 "&casereference=" +
-                                            showTopThreeArr[key].pinswg_name +
+                                                showTopThreeArr[key]
+                                                    .pinswg_name +
                                                 "&inid=" +
                                                 showTopThreeArr[key].incidentid
                                             }
@@ -120,6 +127,7 @@ const AwaitingSubmissionFromBlob = (props) => {
                                         >
                                             {showTopThreeArr[index].pinswg_name}
                                         </Link>
+                                    )}
                                 </div>
                                 <div>
                                     <b>LPA reference:</b>{" "}
@@ -227,7 +235,17 @@ const AwaitingSubmissionFromBlob = (props) => {
                                         showTopThreeArrDets[key].createdon
                                     )}
                                 </div>{" "}
+                                {showTopThreeArr[key].hasOwnProperty(
+                                    "appealComplete"
+                                ) && (
+                                    <div className="cardModuleReference">
+                                        <b>Submission processing.....</b>
                                     </div>
+                                )}
+                            </div>
+                            {!showTopThreeArr[key].hasOwnProperty(
+                                "appealComplete"
+                            ) && (
                                 <div className="">
                                     <button
                                         title={t(
@@ -248,13 +266,15 @@ const AwaitingSubmissionFromBlob = (props) => {
                                             ) &&
                                                 deleteCaseItem(
                                                     props.containerID,
-                                                showTopThreeArr[key].pinswg_name
+                                                    showTopThreeArr[key]
+                                                        .pinswg_name
                                                 );
                                         }}
                                     >
                                         &mdash;
                                     </button>
                                 </div>
+                            )}
                         </div>
                     );
                 })}

components/newappeal/complete.js

@@ -109,14 +109,10 @@ let CompleteAppeal = (props) => {
         <div className="govuk-grid-row">
             <div className="govuk-grid-column-two-thirds">
                 <div className="govuk-panel govuk-panel--confirmation">
-                    <h1 className="govuk-panel__title">Appeal complete</h1>
-                    <div className="govuk-panel__body">
-                        Your reference number
-                        <br />
-                        <strong>
-                            {props.appealType.caseReference.ticketnumber}
-                        </strong>
-                    </div>
+                    <h1 className="govuk-panel__title">
+                        Appeal Submission complete
+                    </h1>
+                    <div className="govuk-panel__body"></div>
                 </div>
 
                 <p className="govuk-body">

pages/api/file/createappealcompletemessage_api.js

@@ -1,7 +1,9 @@
 import { hashAPIPath } from "../../../actions";
 import {
-    getBlobs,
     createCaseCompleteMessage,
+    getProgressBlobs,
+    downloadProgressFile,
+    createBlob,
 } from "../../../actions/azurestorage";
 
 import nextConnect from "next-connect";
@@ -25,8 +27,20 @@ ApiProxy.get(async (req, res) => {
         "&tempcaseref=" +
         tempCaseRef;
 
+    const blobProgress = await getProgressBlobs(
+        containerName,
+        tempCaseRef
+    ).then((data) => {
+        return downloadProgressFile(containerName, data.path, tempCaseRef);
+    });
+
+    Object.assign(blobProgress, {
+        "appealComplete": true,
+    });
+
     //http: if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) {
     await createCaseCompleteMessage(containerName, tempCaseRef).then((data) => {
+        createBlob(JSON.stringify(blobProgress), containerName, tempCaseRef);
         return res.status(200).json(data);
     });
     // } else {

pages/api/file/generateappealpdf.js

@@ -182,14 +182,14 @@ export default async function handler(req, res) {
     );
 
     uploadPDFAppealFiles(
-        process.cwd() + `tmp/${appealBodyObj.pinswg_name}.pdf`,
+        process.cwd() + `/tmp/${appealBodyObj.pinswg_name}.pdf`,
         containerID,
         appealBodyObj.pinswg_name
     );
 
     // then remove from local folder
 
-    //fs.unlinkSync(process.cwd() + `tmp/${appealBodyObj.repfile_name}.pdf`);
+    //fs.unlinkSync(process.cwd() + `/tmp/${appealBodyObj.repfile_name}.pdf`);
 
     return res.status(200).json({
         data: "success",

pages/api/file/generatepdf.js

@@ -219,19 +219,19 @@ export default function handler(req, res) {
 
     ReactPDF.render(
         <MyDocument docProps={reqBodyobj} />,
-        process.cwd() + `tmp/${reqBodyobj.repfile_name}.pdf`
+        process.cwd() + `/tmp/${reqBodyobj.repfile_name}.pdf`
     );
 
     // upload file to storage account
     uploadPDFRepFiles(
-        process.cwd() + `tmp/${reqBodyobj.repfile_name}.pdf`,
+        process.cwd() + `/tmp/${reqBodyobj.repfile_name}.pdf`,
         containerID,
         caseRef + "/" + reqBodyobj.repfile_name,
         repType
     );
 
     // remove from local folder
-    //fs.unlinkSync(process.cwd() + `tmp/${reqBodyobj.repfile_name}.pdf`);
+    //fs.unlinkSync(process.cwd() + `/tmp/${reqBodyobj.repfile_name}.pdf`);
 
     return res.status(200).json({
         data: "success",