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

Merged PR 1409: PII UAT defects 050225

Browse Source 
Related work items: #12956
This commit is contained in:
Robert Bond
2025-02-05 11:25:32 +00:00
parent d048ca56bf 1fe6f48c80
commit 4009fac494
10 changed files with 262 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
actions/azurestorage.js
+73 -45
View File
@@ -673,49 +673,77 @@ export const uploadSingleFile = async (
"\n////////////////////////////" "\n////////////////////////////"
); );
let whichLocation = // let whichLocation =
files[prop][0].fieldName.indexOf("_Statement_of_Case") > 0 || // files[prop][0].fieldName.indexOf("_Statement_of_Case") > 0 ||
files[prop][0].fieldName.indexOf("_-_Statement_of_Case") > 0 || // files[prop][0].fieldName.indexOf("_-_Statement_of_Case") > 0 ||
files[prop][0].fieldName.indexOf("_-_Application_Form") > 0 || // files[prop][0].fieldName.indexOf("_-_Application_Form") > 0 ||
files[prop][0].fieldName.indexOf("_-_Site_Ownership_Certificate") > // files[prop][0].fieldName.indexOf("_-_Site_Ownership_Certificate") >
0 || // 0 ||
files[prop][0].fieldName.indexOf("_-_Decision_Notice") > 0 || // files[prop][0].fieldName.indexOf("_-_Decision_Notice") > 0 ||
files[prop][0].fieldName.indexOf("_-_Site_Location_Plan") > 0 || // files[prop][0].fieldName.indexOf("_-_Site_Location_Plan") > 0 ||
files[prop][0].fieldName.indexOf("_-_Plans_Drawing_Documents") > // files[prop][0].fieldName.indexOf("_-_Plans_Drawing_Documents") >
0 || // 0 ||
files[prop][0].fieldName.indexOf( // files[prop][0].fieldName.indexOf(
"_-_Additional_Plans_Drawings_Documents" // "_-_Additional_Plans_Drawings_Documents"
) > 0 || // ) > 0 ||
files[prop][0].fieldName.indexOf("_-_Design_and_Access_Statement") > // files[prop][0].fieldName.indexOf("_-_Design_and_Access_Statement") >
0 || // 0 ||
files[prop][0].fieldName.indexOf( // files[prop][0].fieldName.indexOf(
"_-_NSB_LPA_Additional_Documents" // "_-_NSB_LPA_Additional_Documents"
) > 0 || // ) > 0 ||
files[prop][0].fieldName.indexOf("_-_LPA_Correspondence") > 0 || // files[prop][0].fieldName.indexOf("_-_LPA_Correspondence") > 0 ||
files[prop][0].fieldName.indexOf("_-_LPA_Original_Permission") > // files[prop][0].fieldName.indexOf("_-_LPA_Original_Permission") >
0 || // 0 ||
files[prop][0].fieldName.indexOf("_-_LPA's_Registration_Letter") > // files[prop][0].fieldName.indexOf("_-_LPA's_Registration_Letter") >
0 || // 0 ||
files[prop][0].fieldName.indexOf("_-_Environmental_Statement") > // files[prop][0].fieldName.indexOf("_-_Environmental_Statement") >
0 || // 0 ||
files[prop][0].fieldName.indexOf("_-_Cost_of_Application") > 0 || // files[prop][0].fieldName.indexOf("_-_Cost_of_Application") > 0 ||
files[prop][0].fieldName.indexOf("_-_Other_Relevant_Material") > // files[prop][0].fieldName.indexOf("_-_Other_Relevant_Material") >
0 || // 0 ||
files[prop][0].fieldName.indexOf( // files[prop][0].fieldName.indexOf(
"_-_S106_Agreement_or_Unilateral_Undertaking" > 0 // "_-_S106_Agreement_or_Unilateral_Undertaking" > 0
) // )
? "846040000" // ? "846040000"
: files[prop][0].fieldName.indexOf("_IP_") > 0 // : files[prop][0].fieldName.indexOf("_IP_") > 0
? "846040005" // ? "846040005"
: files[prop][0].fieldName.indexOf("_Statement_") > 0 // : files[prop][0].fieldName.indexOf("_Statement_") > 0
? "846040002" // ? "846040002"
: files[prop][0].fieldName.indexOf("_Questionnaire_") > 0 // : files[prop][0].fieldName.indexOf("_Questionnaire_") > 0
? "846040001" // ? "846040001"
: files[prop][0].fieldName.indexOf("_Comments_") > 0 // : files[prop][0].fieldName.indexOf("_Comments_") > 0
? "846040003" // ? "846040003"
: files[prop][0].fieldName.indexOf("_Impact_") > 0 // : files[prop][0].fieldName.indexOf("_Impact_") > 0
? "846040001" // ? "846040001"
: "846040000"; // : "846040000";
const fieldName = files[prop][0].fieldName;
// Define the patterns and corresponding values
const patternMapping = [
{
pattern:
/_Statement_of_Case|_-_Statement_of_Case|_-_Application_Form|_-_Site_Ownership_Certificate|_-_Decision_Notice|_-_Site_Location_Plan|_-_Plans_Drawing_Documents|_-_Additional_Plans_Drawings_Documents|_-_Design_and_Access_Statement|_-_NSB_LPA_Additional_Documents|_-_LPA_Correspondence|_-_LPA_Original_Permission|_-_LPA's_Registration_Letter|_-_Environmental_Statement|_-_Cost_of_Application|_-_Other_Relevant_Material|_-_S106_Agreement_or_Unilateral_Undertaking/,
value: "846040000",
},
{ pattern: /_IP_/, value: "846040005" },
{ pattern: /_Statement_/, value: "846040002" },
{ pattern: /_Questionnaire_/, value: "846040001" },
{ pattern: /_Comments_/, value: "846040003" },
{ pattern: /_Impact_/, value: "846040001" },
];
// Find a matching pattern or fallback to default
let whichLocation = "846040000"; // Default value
for (const { pattern, value } of patternMapping) {
if (pattern.test(fieldName)) {
whichLocation = value;
break;
}
}
// return whichLocation;
const tags = { const tags = {
containerid: containerName, containerid: containerName,
@@ -723,6 +751,7 @@ export const uploadSingleFile = async (
documentType: files[prop][0].fieldName.split(".")[1], documentType: files[prop][0].fieldName.split(".")[1],
blobType: "RepresentationFile", blobType: "RepresentationFile",
ishareLocation: whichLocation, ishareLocation: whichLocation,
documentLocationId: whichLocation,
}; };
const withTags = await blockBlobClient.setTags(tags); const withTags = await blockBlobClient.setTags(tags);
const withMeta = await blockBlobClient.setMetadata(tags); const withMeta = await blockBlobClient.setMetadata(tags);
@@ -1275,8 +1304,7 @@ export const getAllProgressBlobs = async (containerName) => {
(value, index, self) => (value, index, self) =>
index === index ===
self.findIndex( self.findIndex(
(t) => (t) => t.name === value.name // Change 'id' to the property you're checking for uniqueness
t.name === value.name // Change 'id' to the property you're checking for uniqueness
) )
); );
return unique; return unique;
components/case/representation/index.js
+1 -1
View File
@@ -113,7 +113,7 @@ let MakeRepresentation = (props) => {
const repDate = new Date(); const repDate = new Date();
let day = ("0" + repDate.getDate()).slice(-2); let day = ("0" + repDate.getDate()).slice(-2);
let month = ("0" + repDate.getMonth() + 1).slice(-2); let month = ("0" + (repDate.getMonth() + 1)).slice(-2);
let year = repDate.getFullYear(); let year = repDate.getFullYear();
switch (values.representationCapacity) { switch (values.representationCapacity) {
components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js
+1 -1
View File
@@ -16,7 +16,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
let repFormData = formObj.representationForm.values; let repFormData = formObj.representationForm.values;
repFormData = updateLinks(formObj); repFormData = updateLinks(repFormData);
return ( return (
<> <>
components/myportal/awaitingsubmissionfromblob.js
+52 -48
View File
@@ -159,15 +159,47 @@ const AwaitingSubmissionFromBlob = (props) => {
} }
</Link> </Link>
)} )}
{!showTopThreeArr[key].hasOwnProperty(
"appealComplete"
) && (
<div className="deleteCase">
<button
title={t(
"case:do-you-want-to-delete-case-label"
)}
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
onClick={() => {
confirm(
t(
"case:do-you-want-to-delete-case-label"
) +
showTopThreeArr[key]
.ticketnumber +
"?\n" +
t(
"case:do-you-want-to-delete-case-disclaimer-label"
)
) &&
deleteCaseItem(
props.containerID,
showTopThreeArr[key]
.ticketnumber
);
}}
>
&mdash;
</button>
</div>
)}
</div> </div>
<div> <div className="cardModuleReference">
<b>{t("myportal:lpa-reference-label")}:</b>{" "} <b>{t("myportal:lpa-reference-label")}:</b>{" "}
{ {
showTopThreeArr[key] showTopThreeArr[key]
.pinswg_lpaapplicationreference .pinswg_lpaapplicationreference
} }
</div> </div>
<div> <div className="cardModuleReference">
<b>{t("myportal:appeal-type-label")}:</b>{" "} <b>{t("myportal:appeal-type-label")}:</b>{" "}
{router.locale == "cy" {router.locale == "cy"
? jsonpath( ? jsonpath(
@@ -184,7 +216,7 @@ const AwaitingSubmissionFromBlob = (props) => {
.pinswg_appealcasetype .pinswg_appealcasetype
).value || ""} ).value || ""}
</div> </div>
<div className="carModuleAddress"> <div className="cardModuleReference">
<b>{t("myportal:case-address")}:</b>{" "} <b>{t("myportal:case-address")}:</b>{" "}
{_.isEmpty(showTopThreeArr) {_.isEmpty(showTopThreeArr)
? t("myportal:case-address-not-entered") ? t("myportal:case-address-not-entered")
@@ -218,7 +250,7 @@ const AwaitingSubmissionFromBlob = (props) => {
</div> </div>
{showTopThreeArr[key].pinswg_appellantagent != {showTopThreeArr[key].pinswg_appellantagent !=
null && ( null && (
<div> <div className="cardModuleReference">
{showTopThreeArr[key] {showTopThreeArr[key]
.pinswg_appellantagent != .pinswg_appellantagent !=
846040000 && ( 846040000 && (
@@ -244,7 +276,7 @@ const AwaitingSubmissionFromBlob = (props) => {
)} )}
{showTopThreeArr[key].pinswg_appellantagent != {showTopThreeArr[key].pinswg_appellantagent !=
846040000 && ( 846040000 && (
<div> <div className="cardModuleReference">
<b> <b>
{t("myportal:on-behalf-of-label")}:{" "} {t("myportal:on-behalf-of-label")}:{" "}
</b> </b>
@@ -255,17 +287,21 @@ const AwaitingSubmissionFromBlob = (props) => {
.pinswg_appellantlastname} .pinswg_appellantlastname}
</div> </div>
)} )}
{router.locale == "cy" <div className="cardModuleReference">
? jsonpath( <b>LPA:</b>
'$..[?(@.value=="' + {router.locale == "cy"
showTopThreeArr[key][ ? jsonpath(
"pinswg_lpaname" '$..[?(@.value=="' +
] + showTopThreeArr[key][
'")].value_cy', "pinswg_lpaname"
transLookup ] +
) '")].value_cy',
: showTopThreeArr[key]["pinswg_lpaname"] || transLookup
""} )
: showTopThreeArr[key][
"pinswg_lpaname"
] || ""}
</div>
<div className="cardModuleReference"> <div className="cardModuleReference">
<b>{t("myportal:date-raised")}:</b> <b>{t("myportal:date-raised")}:</b>
{" "} {" "}
@@ -285,38 +321,6 @@ const AwaitingSubmissionFromBlob = (props) => {
</div> </div>
)} )}
</div> </div>
{!showTopThreeArr[key].hasOwnProperty(
"appealComplete"
) && (
<div className="">
<button
title={t(
"case:do-you-want-to-delete-case-label"
)}
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
onClick={() => {
confirm(
t(
"case:do-you-want-to-delete-case-label"
) +
showTopThreeArr[key]
.ticketnumber +
"?\n" +
t(
"case:do-you-want-to-delete-case-disclaimer-label"
)
) &&
deleteCaseItem(
props.containerID,
showTopThreeArr[key]
.ticketnumber
);
}}
>
&mdash;
</button>
</div>
)}
</div> </div>
); );
})} })}
components/myportal/topthree.js
+77 -18
View File
@@ -266,8 +266,64 @@ const TopThree = (props) => {
]}{" "} ]}{" "}
</Link> </Link>
)} )}
{topThreeType == "watchedCases" && !props.myReps && (
<div className="deleteCase">
<button
title={t(
"case:you-have-stopped-watching-label"
)}
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
onClick={() => {
confirm(
t(
"case:you-have-stopped-watching-label"
) +
showTopThreeArr[key][
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
]
) &&
deleteItem(
showTopThreeArr[key]
.pinswg_watchlistid,
"watchedCases"
);
}}
>
&mdash;
</button>
</div>
)}
{topThreeType == "awaitingSubmission" && (
<div className="deleteCase">
<button
title={t(
"case:do-you-want-to-delete-case-label"
)}
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
onClick={() => {
confirm(
t(
"case:do-you-want-to-delete-case-label"
) +
showTopThreeArr[key]
.ticketnumber +
"?\n" +
t(
"case:do-you-want-to-delete-case-disclaimer-label"
)
) &&
deleteItem(
showTopThreeArr[key].incidentid,
"awaitingSubmission"
);
}}
>
&mdash;
</button>
</div>
)}
</div> </div>
<div> <div className="cardModuleReference">
<b>{t("myportal:appeal-type-label")}:</b>{" "} <b>{t("myportal:appeal-type-label")}:</b>{" "}
{router.locale == "cy" {router.locale == "cy"
? jsonpath( ? jsonpath(
@@ -284,7 +340,7 @@ const TopThree = (props) => {
</div> </div>
{/* )} */} {/* )} */}
{/* {topThreeType != "awaitingSubmission" ? ( */} {/* {topThreeType != "awaitingSubmission" ? ( */}
<div className="carModuleAddress"> <div className="cardModuleReference">
<b>{t("myportal:case-address")}:</b>{" "} <b>{t("myportal:case-address")}:</b>{" "}
{_.isEmpty(showTopThreeArr[key]) {_.isEmpty(showTopThreeArr[key])
? t("myportal:case-address-not-entered") ? t("myportal:case-address-not-entered")
@@ -311,7 +367,7 @@ const TopThree = (props) => {
: "")} : "")}
</div> </div>
{showTopThreeArr[key].pinswg_appellantagent != null && ( {showTopThreeArr[key].pinswg_appellantagent != null && (
<div> <div className="cardModuleReference">
{showTopThreeArr[key].pinswg_appellantagent != {showTopThreeArr[key].pinswg_appellantagent !=
846040000 && ( 846040000 && (
<b>{t("myportal:raised-by-label")}: </b> <b>{t("myportal:raised-by-label")}: </b>
@@ -330,25 +386,28 @@ const TopThree = (props) => {
</div> </div>
)} )}
{showTopThreeArr[key].pinswg_appellantfirstname != null && ( {showTopThreeArr[key].pinswg_appellantfirstname != null && (
<div> <div className="cardModuleReference">
<b>{t("myportal:on-behalf-of-label")}: </b> <b>{t("myportal:on-behalf-of-label")}: </b>
{showTopThreeArr[key].pinswg_appellantfirstname + {showTopThreeArr[key].pinswg_appellantfirstname +
" " + " " +
showTopThreeArr[key].pinswg_appellantlastname} showTopThreeArr[key].pinswg_appellantlastname}
</div> </div>
)} )}
{router.locale == "cy" <div className="cardModuleReference">
? jsonpath( <b>LPA:</b>
'$..[?(@.value=="' + {router.locale == "cy"
showTopThreeArr[key][ ? jsonpath(
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" '$..[?(@.value=="' +
] + showTopThreeArr[key][
'")].value_cy', "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
transLookup ] +
) '")].value_cy',
: showTopThreeArr[key][ transLookup
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" )
] || ""} : showTopThreeArr[key][
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] || ""}
</div>
{topThreeType == "awaitingSubmission" ? ( {topThreeType == "awaitingSubmission" ? (
<div className="carModuleAddress"> <div className="carModuleAddress">
Case Incomplete, not submitted Case Incomplete, not submitted
@@ -387,7 +446,7 @@ const TopThree = (props) => {
</div> </div>
)} )}
</div> </div>
{topThreeType == "watchedCases" && !props.myReps && ( {/* {topThreeType == "watchedCases" && !props.myReps && (
<div className=""> <div className="">
<button <button
title={t("case:you-have-stopped-watching-label")} title={t("case:you-have-stopped-watching-label")}
@@ -432,7 +491,7 @@ const TopThree = (props) => {
&mdash; &mdash;
</button> </button>
</div> </div>
)} )} */}
</div> </div>
); );
}); });
components/myportal/topthree_reps.js
+35 -25
View File
@@ -228,6 +228,41 @@ const TopThree = (props) => {
{showTopThreeArr[key].pinswg_name} {showTopThreeArr[key].pinswg_name}
</Link> </Link>
)} )}
{!showTopThreeArr[key].hasOwnProperty(
"repComplete"
) && (
<div className="deleteCase">
<button
title={t(
"case:do-you-want-to-delete-case-label"
)}
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
onClick={() => {
confirm(
t(
"case:do-you-want-to-delete-case-label"
) +
showTopThreeArr[key]
.pinswg_name +
"?\n" +
t(
"case:do-you-want-to-delete-case-disclaimer-label"
)
) &&
deleteRepItem(
props.accountDetails
.containerID,
showTopThreeArr[key]
.pinswg_name,
showTopThreeArr[key]
.repfile_name
);
}}
>
&mdash;
</button>
</div>
)}
</div> </div>
<div className="cardModuleReference"> <div className="cardModuleReference">
<b>{t("myportal:representation-type")}:</b> <b>{t("myportal:representation-type")}:</b>
@@ -287,31 +322,6 @@ const TopThree = (props) => {
</div> </div>
)} )}
</div> </div>
{!showTopThreeArr[key].hasOwnProperty("repComplete") && (
<div className="">
<button
title={t("case:do-you-want-to-delete-case-label")}
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
onClick={() => {
confirm(
t("case:do-you-want-to-delete-case-label") +
showTopThreeArr[key].pinswg_name +
"?\n" +
t(
"case:do-you-want-to-delete-case-disclaimer-label"
)
) &&
deleteRepItem(
props.accountDetails.containerID,
showTopThreeArr[key].pinswg_name,
showTopThreeArr[key].repfile_name
);
}}
>
&mdash;
</button>
</div>
)}
</div> </div>
); );
}); });
locales/en/myportal.json
+1 -1
View File
@@ -43,7 +43,7 @@
"norecords-awaiting-submissions": "You have no awaiting submissions", "norecords-awaiting-submissions": "You have no awaiting submissions",
"on-behalf-of-label": "On behalf of", "on-behalf-of-label": "On behalf of",
"appeal-type-label": "Appeal type", "appeal-type-label": "Appeal type",
"lpa-reference-label": "LPA reference number", "lpa-reference-label": "LPA reference",
"raised-by-label": "Raised by", "raised-by-label": "Raised by",
"representation-id": "Representation ID", "representation-id": "Representation ID",
"representation-type": "Representation type", "representation-type": "Representation type",
locales/en/search.json
+1 -1
View File
@@ -8,7 +8,7 @@
"county-label": "County", "county-label": "County",
"postcode-label": "Postcode", "postcode-label": "Postcode",
"lpa-label": "Local Planning Authority", "lpa-label": "Local Planning Authority",
"lpa-reference-label": "LPA reference number", "lpa-reference-label": "LPA reference",
"appealtype-label": "Select a case type", "appealtype-label": "Select a case type",
"case-status-label": "Case Status", "case-status-label": "Case Status",
"case-type-label": "Case type", "case-type-label": "Case type",
styles/sass/patterns/_card.scss
+18 -4
View File
@@ -9,7 +9,7 @@
margin-bottom: 2em; margin-bottom: 2em;
} }
@media screen and (min-width: 600px) and (max-width: 900px) { @media screen and (min-width: 769px) and (max-width: 900px) {
.card { .card {
flex-basis: 45.99%; flex-basis: 45.99%;
@@ -252,21 +252,35 @@ div.cardModuleItem:last-of-type {
.cardModuleItem { .cardModuleItem {
display: flex; display: flex;
padding: 10px 10px 10px 0; padding: 10px 0px 10px 0;
border-bottom: 1px solid lightgrey; border-bottom: 1px solid lightgrey;
.cardModuleDetails { .cardModuleDetails {
width: 95%; width: 100%;
} }
.cardModuleReference { .cardModuleReference {
display: flex; display: flex;
justify-content: flex-start;
line-height: 1.5;
b { b {
min-width: 122px; @media screen and (max-width: 600px) {
min-width: 120px;
margin-right: 3px;
}
@media screen and (min-width: 769px) {
min-width: 160px;
}
margin-right: 10px; margin-right: 10px;
} }
.deleteCase {
margin-left: auto
}
} }
styles/sass/welshgov/_application.scss
+3 -1
View File
@@ -379,7 +379,9 @@ a.longLinkBreak {
} }
} }
.govuk-width-container {
max-width: 1000px;
}
.wgForm { .wgForm {
background: $lightgrey_offwhite; background: $lightgrey_offwhite;