From e99a0263af419844ca32f52e29f6014883f7c042 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Tue, 5 Mar 2024 10:48:25 +0000 Subject: [PATCH] added key to top three row for appeal sunbmission card --- .env.local | 5 +- actions/index.js | 8 +- .../myportal/awaitingsubmissionfromblob.js | 374 +++++++++--------- components/newappeal/buildchecksection.js | 3 +- 4 files changed, 201 insertions(+), 189 deletions(-) diff --git a/.env.local b/.env.local index 8ee37a0e..826a78c9 100644 --- a/.env.local +++ b/.env.local @@ -65,7 +65,10 @@ AZURE_TENANT_ID = $TENANT AZURE_CLIENT_SECRET = $CLIENT_SECRET //AZURE_STORAGE_ACCOUNT_NAME= "pedwdev" AZURE_STORAGE_ACCOUNT_NAME= "pedwtest" -AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg== +// dev key +//AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg== +//test key +AZURE_STORAGE_ACCOUNT_KEY = Dl8qUVEnR2mglklQorttMurmjUpe2lI3oMWl9V245U6BOLutXDwmpU36afeTrGLK+zfzNVLErsWM+AStiYsimw== //AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net AZURE_PEDW_STORAGE_ENDPOINT = https://pedwtest.blob.core.windows.net diff --git a/actions/index.js b/actions/index.js index 18a75fb3..a460487a 100644 --- a/actions/index.js +++ b/actions/index.js @@ -1465,8 +1465,7 @@ export const getFilesFromBlobHashed = ( ) => { return axios .get( - BASE_URL + - "/api/file/getbloblist?container=" + + "/api/file/getbloblist?container=" + containerName + "&casefolderID=" + casefolderID + @@ -1489,8 +1488,7 @@ export const deleteBlob = async ( ) => { try { const res = await axios.get( - BASE_URL + - "/api/file/deleteblob?container=" + + "/api/file/deleteblob?container=" + containerName + "&casefolderID=" + casefolderID + @@ -1664,7 +1662,7 @@ export const sendCaseCompleteMessage = async (containerID, caseReference) => { return res.data; }) .catch((error) => { - //console.log("API call error", error); + consoleLogger(error); }); }; diff --git a/components/myportal/awaitingsubmissionfromblob.js b/components/myportal/awaitingsubmissionfromblob.js index 9bb20776..1b73320b 100644 --- a/components/myportal/awaitingsubmissionfromblob.js +++ b/components/myportal/awaitingsubmissionfromblob.js @@ -60,181 +60,6 @@ const AwaitingSubmissionFromBlob = (props) => { }; let topThreeOnlyArr = showTopThreeArr.slice(0, 3); - //console.log(showTopThreeArr); - Object.keys(topThreeOnlyArr).map((key, index) => { - //console.log(key, showTopThreeArr[key].pinswg_appealcasetype); - //console.log("subsssss:", showTopThreeArr[key]); - let urlname = getFormCollectionByID( - showTopThreeArr[key].pinswg_appealcasetype - ).UrlName; - - topthreeRowArr.push( - <> -
-
-
- {t("myportal:temp-reference")}: - - { - props.setCurrentReference({ - "currentReference": - showTopThreeArr[key].ticketnumber, - - "currentType": "awaitingSubmission", - - "incidentid": - showTopThreeArr[key].incidentid, - - "appealType": - showTopThreeArr[key] - .pinswg_appealcasetype, - }); - }} - > - {showTopThreeArr[index].pinswg_name} - -
-
- LPA reference:{" "} - { - showTopThreeArr[key] - .pinswg_lpaapplicationreference - } -
-
- {t("myportal:appeal-type-label")}:{" "} - { - getFormCollectionByID( - showTopThreeArr[key].pinswg_appealcasetype - ).value - } -
-
- {t("myportal:case-address")}:{" "} - {_.isEmpty(showTopThreeArr) - ? t("myportal:case-address-not-entered") - : _.isEmpty(showTopThreeArr[index]) - ? t("myportal:case-address-not-entered") - : _.isEmpty(showTopThreeArr[index]) - ? t("myportal:case-address-not-entered") - : _.isEmpty( - showTopThreeArr[index] - .pinswg_siteaddressline1 - ) - ? t("myportal:case-address-not-entered") - : showTopThreeArr[index] - .pinswg_siteaddressline1 + - (!_.isEmpty( - showTopThreeArr[index] - .pinswg_siteaddressline2 - ) - ? ", " + - showTopThreeArr[index] - .pinswg_siteaddressline2 - : "") + - (!_.isEmpty( - showTopThreeArr[index] - .pinswg_siteaddresstown - ) - ? ", " + - showTopThreeArr[index] - .pinswg_siteaddresstown - : "")} -
- {showTopThreeArrDets[key].pinswg_appellantagent != - null && ( -
- {showTopThreeArrDets[key] - .pinswg_appellantagent != 846040000 && ( - {t("myportal:raised-by-label")}: - )} - {showTopThreeArrDets[key] - .pinswg_appellantagent != 846040000 && - (showTopThreeArrDets[key] - .pinswg_agentcompanyname != null && - showTopThreeArrDets[key] - .pinswg_agentcompanyname + ", ") + - showTopThreeArrDets[key] - .pinswg_agentfirstname + - " " + - showTopThreeArrDets[key] - .pinswg_agentlastname} -
- )} - {showTopThreeArrDets[key].pinswg_appellantfirstname != - null && ( -
- {t("myportal:on-behalf-of-label")}: - {showTopThreeArrDets[key] - .pinswg_appellantfirstname + - " " + - showTopThreeArrDets[key] - .pinswg_appellantlastname} -
- )} - {router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + - showTopThreeArrDets[key][ - "pinswg_lpaname" - ] + - '")].value_cy', - transLookup - ) - : showTopThreeArrDets[key]["pinswg_lpaname"] || ""} -
- {t("myportal:date-raised")}: - {" "} - {raisedDate(showTopThreeArrDets[key].createdon)} -
{" "} -
-
- -
-
- - ); - }); const TopThreeRow = () => { return ( @@ -242,7 +67,197 @@ const AwaitingSubmissionFromBlob = (props) => { className="cardModuleContainer" key={"cttr_" + Math.floor(Math.random() * 5)} > - {topthreeRowArr} + {Object.keys(topThreeOnlyArr).map((key, index) => { + let urlname = getFormCollectionByID( + showTopThreeArr[key].pinswg_appealcasetype + ).UrlName; + + return ( +
+
+
+ {t("myportal:temp-reference")}: + + { + props.setCurrentReference({ + "currentReference": + showTopThreeArr[key] + .ticketnumber, + + "currentType": + "awaitingSubmission", + + "incidentid": + showTopThreeArr[key] + .incidentid, + + "appealType": + showTopThreeArr[key] + .pinswg_appealcasetype, + }); + }} + > + {showTopThreeArr[index].pinswg_name} + +
+
+ LPA reference:{" "} + { + showTopThreeArr[key] + .pinswg_lpaapplicationreference + } +
+
+ {t("myportal:appeal-type-label")}:{" "} + { + getFormCollectionByID( + showTopThreeArr[key] + .pinswg_appealcasetype + ).value + } +
+
+ {t("myportal:case-address")}:{" "} + {_.isEmpty(showTopThreeArr) + ? t("myportal:case-address-not-entered") + : _.isEmpty(showTopThreeArr[index]) + ? t("myportal:case-address-not-entered") + : _.isEmpty(showTopThreeArr[index]) + ? t("myportal:case-address-not-entered") + : _.isEmpty( + showTopThreeArr[index] + .pinswg_siteaddressline1 + ) + ? t("myportal:case-address-not-entered") + : showTopThreeArr[index] + .pinswg_siteaddressline1 + + (!_.isEmpty( + showTopThreeArr[index] + .pinswg_siteaddressline2 + ) + ? ", " + + showTopThreeArr[index] + .pinswg_siteaddressline2 + : "") + + (!_.isEmpty( + showTopThreeArr[index] + .pinswg_siteaddresstown + ) + ? ", " + + showTopThreeArr[index] + .pinswg_siteaddresstown + : "")} +
+ {showTopThreeArrDets[key] + .pinswg_appellantagent != null && ( +
+ {showTopThreeArrDets[key] + .pinswg_appellantagent != + 846040000 && ( + + {t("myportal:raised-by-label")}:{" "} + + )} + {showTopThreeArrDets[key] + .pinswg_appellantagent != + 846040000 && + (showTopThreeArrDets[key] + .pinswg_agentcompanyname != + null && + showTopThreeArrDets[key] + .pinswg_agentcompanyname + + ", ") + + showTopThreeArrDets[key] + .pinswg_agentfirstname + + " " + + showTopThreeArrDets[key] + .pinswg_agentlastname} +
+ )} + {showTopThreeArrDets[key] + .pinswg_appellantfirstname != null && ( +
+ + {t("myportal:on-behalf-of-label")}:{" "} + + {showTopThreeArrDets[key] + .pinswg_appellantfirstname + + " " + + showTopThreeArrDets[key] + .pinswg_appellantlastname} +
+ )} + {router.locale == "cy" + ? jsonpath( + '$..[?(@.value=="' + + showTopThreeArrDets[key][ + "pinswg_lpaname" + ] + + '")].value_cy', + transLookup + ) + : showTopThreeArrDets[key][ + "pinswg_lpaname" + ] || ""} +
+ {t("myportal:date-raised")}: + {" "} + {raisedDate( + showTopThreeArrDets[key].createdon + )} +
{" "} +
+
+ +
+
+ ); + })} ); }; @@ -258,12 +273,7 @@ const AwaitingSubmissionFromBlob = (props) => { {t("myportal:awatitingsubmission-card-title")} - - {/* */} + {props.awaitingSubmissionFromBlob["@odata.count"] > 3 && (
diff --git a/components/newappeal/buildchecksection.js b/components/newappeal/buildchecksection.js index 1ee3b638..adfb5a8d 100644 --- a/components/newappeal/buildchecksection.js +++ b/components/newappeal/buildchecksection.js @@ -182,7 +182,8 @@ let BuildCheckSection = (props) => { props.props.accountDetails.containerID, props.appealType.caseReference.ticketnumber, router.query.appealtypes, - props.appealType.fileList + pdfObj.filesList + // props.appealType.fileList ); }} >