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

Merged PR 456: Deployment to test

Browse Source 
Related work items: #6211, #6212
This commit is contained in:
Robert Bond
2021-09-21 12:43:00 +00:00
parent f99bf3583e 18030111b0
commit 1123a4c7f1
21 changed files with 1201 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
actions/index.js
+28
View File
@@ -130,6 +130,19 @@ export const getBasicSearch = (searchString) => {
}); });
}; };
export const getBasicDNSSearch = (searchString) => {
return axios
.get(
WEBAPI_URL +
"incidents?$select=_accountid_value,_customerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=pinswg_appealcasetype eq 846040011&$count=true",
azureHeaders
)
.then((res) => res.data)
.catch((error) => {
console.log("thiserror", error);
});
};
export const getBasicSearchDetails = (appealType, caseReference) => { export const getBasicSearchDetails = (appealType, caseReference) => {
return axios return axios
.get( .get(
@@ -146,6 +159,21 @@ export const getBasicSearchDetails = (appealType, caseReference) => {
}); });
}; };
export const getBasicDNSSearchDetails = (appealType, caseReference) => {
return axios
.get(
WEBAPI_URL +
"pinswg_dnses?$filter=pinswg_name eq '" +
caseReference +
"'&$count=true",
azureHeaders
)
.then((res) => res.data)
.catch((error) => {
console.log("thiserror", error);
});
};
export const getFormData = (whichForm) => { export const getFormData = (whichForm) => {
//console.log("got to axios", whichForm); //console.log("got to axios", whichForm);
//console.log("api_root: ", BASE_URL); //console.log("api_root: ", BASE_URL);
components/breadcrumbs.js
+127 -21
View File
@@ -45,18 +45,20 @@ const Breadcrumbs = (props) => {
<div className="govuk-breadcrumbs "> <div className="govuk-breadcrumbs ">
<ol className="govuk-breadcrumbs__list"> <ol className="govuk-breadcrumbs__list">
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="http://www.gov.wales"> <Link href={t("common:gov-wales-link")}>
<a className="govuk-breadcrumbs__link">GOV.WALES</a> <a className="govuk-breadcrumbs__link">
{t("common:gov-wales-label")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
href={ href={
router.pathname.includes("dns") ? "/dns" : "/" router.pathname.includes("/dns/") ? "/dns" : "/"
} }
> >
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{router.pathname.includes("dns") {router.pathname.includes("/dns/")
? t("dnsCommon:service-name") ? t("dnsCommon:service-name")
: t("common:service-name")} : t("common:service-name")}
</a> </a>
@@ -72,7 +74,13 @@ const Breadcrumbs = (props) => {
{router.pathname == "/myportal/searchresults" ? ( {router.pathname == "/myportal/searchresults" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/myportal"> <Link
href={
router.locale != "en"
? router.locale + "/myportal"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a> </a>
@@ -97,7 +105,13 @@ const Breadcrumbs = (props) => {
{router.pathname == "/newappeal" ? ( {router.pathname == "/newappeal" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/myportal"> <Link
href={
router.locale != "en"
? router.locale + "/myportal"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{t("newappeal:parent-page-title")} {t("newappeal:parent-page-title")}
</a> </a>
@@ -113,14 +127,26 @@ const Breadcrumbs = (props) => {
{router.pathname == "/newappeal/selectappeal" ? ( {router.pathname == "/newappeal/selectappeal" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/myportal"> <Link
href={
router.locale != "en"
? router.locale + "/myportal"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{t("newappeal:parent-page-title")} {t("newappeal:parent-page-title")}
</a> </a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/myportal"> <Link
href={
router.locale != "en"
? router.locale + "/myportal"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{t("newappeal:page-title")} {t("newappeal:page-title")}
</a> </a>
@@ -136,7 +162,13 @@ const Breadcrumbs = (props) => {
{router.pathname == "/viewall" ? ( {router.pathname == "/viewall" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/myportal"> <Link
href={
router.locale != "en"
? router.locale + "/myportal"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a> </a>
@@ -152,7 +184,13 @@ const Breadcrumbs = (props) => {
{router.pathname == "/myportal/viewall" ? ( {router.pathname == "/myportal/viewall" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/myportal"> <Link
href={
router.locale != "en"
? router.locale + "/myportal"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a> </a>
@@ -168,14 +206,26 @@ const Breadcrumbs = (props) => {
{router.pathname == "/myportal/case" ? ( {router.pathname == "/myportal/case" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/myportal"> <Link
href={
router.locale != "en"
? router.locale + "/myportal"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a> </a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/viewall"> <Link
href={
router.locale != "en"
? router.locale + "/viewall"
: "/viewall"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
Your cases{" "} Your cases{" "}
</a> </a>
@@ -197,8 +247,12 @@ const Breadcrumbs = (props) => {
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link <Link
href={ href={
"/searchresults?q=" + router.locale != "en"
props.props.search.searchString ? router.locale +
"/searchresults?q=" +
props.props.search.searchString
: "/searchresults?q=" +
props.props.search.searchString
} }
> >
<a <a
@@ -223,7 +277,13 @@ const Breadcrumbs = (props) => {
{router.pathname == "/myportal/representation" ? ( {router.pathname == "/myportal/representation" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/myportal"> <Link
href={
router.locale != "en"
? router.locale + "/myportal"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a> </a>
@@ -243,7 +303,13 @@ const Breadcrumbs = (props) => {
{router.pathname == "/account/personaldetails" ? ( {router.pathname == "/account/personaldetails" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/myportal"> <Link
href={
router.locale != "en"
? router.locale + "/myportal"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a> </a>
@@ -268,7 +334,13 @@ const Breadcrumbs = (props) => {
{router.pathname == "/account/changepassword" ? ( {router.pathname == "/account/changepassword" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/myportal"> <Link
href={
router.locale != "en"
? router.locale + "/myportal"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a> </a>
@@ -284,7 +356,13 @@ const Breadcrumbs = (props) => {
{router.pathname == "/dns" ? ( {router.pathname == "/dns" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/dns"> <Link
href={
router.locale != "en"
? router.locale + "/dns"
: "/dns"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{t("dnsCommon:service-name")} {t("dnsCommon:service-name")}
</a> </a>
@@ -294,6 +372,15 @@ const Breadcrumbs = (props) => {
) : ( ) : (
"" ""
)} )}
{router.pathname == "/dnsapplications" ? (
<>
<li className="govuk-breadcrumbs__list-item">
{t("dnsCommon:service-name")}
</li>
</>
) : (
""
)}
{router.pathname == "/dns/application-process" ? ( {router.pathname == "/dns/application-process" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -333,7 +420,14 @@ const Breadcrumbs = (props) => {
{router.pathname == "/dns/application-view" ? ( {router.pathname == "/dns/application-view" ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/dns/applications"> <Link
href={
router.locale != "en"
? router.locale +
"/dns/applications"
: "/dns/applications"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{t( {t(
"dnsApplicationView:page-parent-title" "dnsApplicationView:page-parent-title"
@@ -351,14 +445,26 @@ const Breadcrumbs = (props) => {
{!_.isEmpty(slug) ? ( {!_.isEmpty(slug) ? (
<> <>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/myportal"> <Link
href={
router.locale != "en"
? router.locale + "/myportal"
: "/myportal"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a> </a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href="/newappeal"> <Link
href={
router.locale != "en"
? router.locale + "/newappeal"
: "/newappeal"
}
>
<a className="govuk-breadcrumbs__link"> <a className="govuk-breadcrumbs__link">
New Appeal New Appeal
</a> </a>
components/case/summary.js
+130 -60
View File
@@ -3,6 +3,7 @@ import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import jsonpath from "jsonpath"; import jsonpath from "jsonpath";
import _ from "lodash"; import _ from "lodash";
import transLookup from "../../data/lookuptranslations.json";
const CaseSummary = (props) => { const CaseSummary = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
@@ -20,6 +21,8 @@ const CaseSummary = (props) => {
currentType, currentType,
} = props; } = props;
const noRepresentationLink = ["/case", "/dnsdetails"];
let setCaseQueryObj = props[currentType]; let setCaseQueryObj = props[currentType];
let setCaseDetailsObj = props[currentType + "Details"]; let setCaseDetailsObj = props[currentType + "Details"];
@@ -72,16 +75,23 @@ const CaseSummary = (props) => {
] || "not entered"} ] || "not entered"}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> {_.has(detailsObj, "pinswg_agentcontactname") ? (
<dt className="govuk-summary-list__key"> <div className="govuk-summary-list__row">
{t("case:summary-agent-label")} <dt className="govuk-summary-list__key">
</dt> {t("case:summary-agent-label")}
<dd className="govuk-summary-list__value"> </dt>
{_.has(detailsObj, "pinswg_agentcontactname") <dd className="govuk-summary-list__value">
? detailsObj.pinswg_agentcontactname {_.has(
: ""} detailsObj,
</dd> "pinswg_agentcontactname"
</div> )
? detailsObj.pinswg_agentcontactname
: ""}
</dd>
</div>
) : (
""
)}
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t("case:summary-site-address-label")} {t("case:summary-site-address-label")}
@@ -91,19 +101,19 @@ const CaseSummary = (props) => {
? detailsObj.pinswg_siteaddressline1 ? detailsObj.pinswg_siteaddressline1
: ""} : ""}
<br /> <br />
{_.has(detailsObj, "pinswg_siteaddressline1") {_.has(detailsObj, "pinswg_siteaddressline2")
? detailsObj.pinswg_siteaddressline2 ? detailsObj.pinswg_siteaddressline2
: ""} : ""}
<br /> <br />
{_.has(detailsObj, "pinswg_siteaddressline1") {_.has(detailsObj, "pinswg_siteaddresstown")
? detailsObj.pinswg_siteaddresstown ? detailsObj.pinswg_siteaddresstown
: ""} : ""}
<br /> <br />
{_.has(detailsObj, "pinswg_siteaddressline1") {_.has(detailsObj, "pinswg_siteaddresscounty")
? detailsObj.pinswg_siteaddresscounty ? detailsObj.pinswg_siteaddresscounty
: ""} : ""}
<br /> <br />
{_.has(detailsObj, "pinswg_siteaddressline1") {_.has(detailsObj, "pinswg_siteaddresspostcode")
? detailsObj.pinswg_siteaddresspostcode ? detailsObj.pinswg_siteaddresspostcode
: ""} : ""}
</dd> </dd>
@@ -114,19 +124,19 @@ const CaseSummary = (props) => {
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<div className="govuk-button-group"> <div className="govuk-button-group">
{router.pathname != "/case" ? ( {noRepresentationLink.includes(router.pathname) ==
<> true ? (
<Link href="/representation">
<a className="govuk-button">
{t(
"case:summary-make-representation-label"
)}
</a>
</Link>
</>
) : (
"" ""
) : (
<Link href="/representation">
<a className="govuk-button">
{t(
"case:summary-make-representation-label"
)}
</a>
</Link>
)} )}
<a <a
onClick={() => router.back()} onClick={() => router.back()}
className="govuk-button govuk-button--secondary" className="govuk-button govuk-button--secondary"
@@ -151,9 +161,21 @@ const CaseSummary = (props) => {
{t("case:summary-case-type-label")} {t("case:summary-case-type-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{casesObj[ {router.locale == "cy"
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ? jsonpath.query(
] || "N/A"} transLookup,
'$..[?(@.value=="' +
casesObj[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
)
: casesObj[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] ||
t(
"case:summary-no-date-entered-label"
)}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -161,16 +183,21 @@ const CaseSummary = (props) => {
{t("case:summary-lpa-label")} {t("case:summary-lpa-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{_.has(detailsObj, [ {router.locale == "cy"
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue", ? jsonpath.query(
]) transLookup,
? detailsObj[ '$..[?(@.value=="' +
detailsObj[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
)
: detailsObj[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] ] || ""}
: ""}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> {/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t( {t(
"case:summary-case-summary-label" "case:summary-case-summary-label"
@@ -184,7 +211,7 @@ const CaseSummary = (props) => {
? detailsObj.pinswg_casedescription ? detailsObj.pinswg_casedescription
: ""} : ""}
</dd> </dd>
</div> </div> */}
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t( {t(
@@ -208,13 +235,18 @@ const CaseSummary = (props) => {
{t("case:summary-procedure-label")} {t("case:summary-procedure-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{_.has(detailsObj, [ {router.locale == "cy"
"pinswg_procedure@OData.Community.Display.V1.FormattedValue", ? jsonpath.query(
]) transLookup,
? detailsObj[ '$..[?(@.value=="' +
detailsObj[
"pinswg_procedure@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
)
: detailsObj[
"pinswg_procedure@OData.Community.Display.V1.FormattedValue" "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
] ] || ""}
: ""}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -222,9 +254,21 @@ const CaseSummary = (props) => {
{t("case:summary-status-label")} {t("case:summary-status-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{casesObj[ {router.locale == "cy"
"statuscode@OData.Community.Display.V1.FormattedValue" ? jsonpath.query(
] || ""} transLookup,
'$..[?(@.value=="' +
casesObj[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
)
: casesObj[
"statuscode@OData.Community.Display.V1.FormattedValue"
] ||
t(
"case:summary-no-date-entered-label"
)}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -232,13 +276,21 @@ const CaseSummary = (props) => {
{t("case:summary-decision-label")} {t("case:summary-decision-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{_.has(detailsObj, [ {router.locale == "cy"
"pinswg_decision@OData.Community.Display.V1.FormattedValue", ? jsonpath.query(
]) transLookup,
? detailsObj[ '$..[?(@.value=="' +
detailsObj[
"pinswg_decision@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
)
: detailsObj[
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_decision@OData.Community.Display.V1.FormattedValue"
] ] ||
: ""} t(
"case:summary-no-date-entered-label"
)}
<br /> <br />
{/* <Link href="/"> {/* <Link href="/">
@@ -262,7 +314,9 @@ const CaseSummary = (props) => {
? detailsObj[ ? detailsObj[
"pinswg_linkedstatus@OData.Community.Display.V1.FormattedValue" "pinswg_linkedstatus@OData.Community.Display.V1.FormattedValue"
] ]
: "Not linked"} : t(
"case:summary-case-link-status-not-linked"
)}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -299,7 +353,9 @@ const CaseSummary = (props) => {
? detailsObj[ ? detailsObj[
"pinswg_startdate@OData.Community.Display.V1.FormattedValue" "pinswg_startdate@OData.Community.Display.V1.FormattedValue"
] ]
: "N/A"} : t(
"case:summary-no-date-entered-label"
)}
</dd> </dd>
</div> </div>
@@ -317,7 +373,9 @@ const CaseSummary = (props) => {
? detailsObj[ ? detailsObj[
"pinswg_questionnaireduedate@OData.Community.Display.V1.FormattedValue" "pinswg_questionnaireduedate@OData.Community.Display.V1.FormattedValue"
] ]
: "N/A"} : t(
"case:summary-no-date-entered-label"
)}
</dd> </dd>
</div> </div>
@@ -335,7 +393,9 @@ const CaseSummary = (props) => {
? detailsObj[ ? detailsObj[
"pinswg_statementduedate@OData.Community.Display.V1.FormattedValue" "pinswg_statementduedate@OData.Community.Display.V1.FormattedValue"
] ]
: "N/A"} : t(
"case:summary-no-date-entered-label"
)}
</dd> </dd>
</div> </div>
@@ -353,7 +413,9 @@ const CaseSummary = (props) => {
? detailsObj[ ? detailsObj[
"pinswg_otherpartiesstatement@OData.Community.Display.V1.FormattedValue" "pinswg_otherpartiesstatement@OData.Community.Display.V1.FormattedValue"
] ]
: "N/A"} : t(
"case:summary-no-date-entered-label"
)}
</dd> </dd>
</div> </div>
@@ -371,7 +433,9 @@ const CaseSummary = (props) => {
? detailsObj[ ? detailsObj[
"pinswg_finalcommentsduedate@OData.Community.Display.V1.FormattedValue" "pinswg_finalcommentsduedate@OData.Community.Display.V1.FormattedValue"
] ]
: "N/A"} : t(
"case:summary-no-date-entered-label"
)}
</dd> </dd>
</div> </div>
@@ -389,7 +453,9 @@ const CaseSummary = (props) => {
? detailsObj[ ? detailsObj[
"pinswg_finalcommentsduedate@OData.Community.Display.V1.FormattedValue" "pinswg_finalcommentsduedate@OData.Community.Display.V1.FormattedValue"
] ]
: "N/A"} : t(
"case:summary-no-date-entered-label"
)}
</dd> </dd>
</div> </div>
@@ -405,7 +471,9 @@ const CaseSummary = (props) => {
? detailsObj[ ? detailsObj[
"pinswg_dateeventrequested@OData.Community.Display.V1.FormattedValue" "pinswg_dateeventrequested@OData.Community.Display.V1.FormattedValue"
] ]
: "N/A"} : t(
"case:summary-no-date-entered-label"
)}
</dd> </dd>
</div> </div>
@@ -423,7 +491,9 @@ const CaseSummary = (props) => {
? detailsObj[ ? detailsObj[
"pinswg_dateoflpadecision@OData.Community.Display.V1.FormattedValue" "pinswg_dateoflpadecision@OData.Community.Display.V1.FormattedValue"
] ]
: "N/A"} : t(
"case:summary-no-date-entered-label"
)}
</dd> </dd>
</div> </div>
</dl> </dl>
components/dnssearchresults.js
+32
View File
@@ -0,0 +1,32 @@
import Link from "next/link";
import { useRouter } from "next/router";
import { useContext } from "react";
import useTranslation from "next-translate/useTranslation";
import SearchForCase from "./search/searchforcase";
import DNSSearchResults from "./search/dnssearchresults";
export default function Search(props) {
const { searchString, searchResultsObj } = props;
let { t } = useTranslation();
const router = useRouter();
const { locale } = router;
return (
<main
className="govuk-main-wrapper govuk-main-wrapper--auto-spacing"
id="main-content"
role="main"
>
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<DNSSearchResults
searchString={searchString}
searchResultsObj={searchResultsObj.searchResultsObj}
searchDetailsObj={searchResultsObj.searchDetailsObj}
/>
</div>
</div>
</main>
);
}
components/header.js
+3
View File
@@ -20,6 +20,9 @@ const Header = (props) => {
"/dns/application-view", "/dns/application-view",
"/searchresults", "/searchresults",
"/case", "/case",
"advancedsearch",
"/dnsapplications",
"/dnsdetails",
]; ];
const hasContactLink = [ const hasContactLink = [
"/dns", "/dns",
components/homepage/dns.js
+5 -3
View File
@@ -17,9 +17,11 @@ export default function Dns() {
</p> </p>
</div> </div>
<div className="govuk-form-group"> <div className="govuk-form-group">
<button type="submit" className="govuk-button"> <Link href="/dnsapplications">
{t("home:dns-card-button")} <a className="govuk-button">
</button> {t("home:dns-card-button")}
</a>
</Link>
</div> </div>
</div> </div>
</div> </div>
components/newappeal/complete.js
+6 -1
View File
@@ -65,7 +65,12 @@ let CompleteAppeal = (props) => {
primaryAttribute, primaryAttribute,
props.appealType.caseReference.ticketnumber props.appealType.caseReference.ticketnumber
); );
}, [props.appealType.caseReference, props.props.form.appealForm.values]); }, [
props.appealType.caseReference,
props.props.form.appealForm.values,
props.appealType.appealLPA,
props.props.accountDetails.loggedinUserId,
]);
const getFormCollection = (formtype) => { const getFormCollection = (formtype) => {
const collectionName = jsonpath.query( const collectionName = jsonpath.query(
components/search/dnssearchresults.js
+222
View File
@@ -0,0 +1,222 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { setCurrentReference } from "../../store/currentView/action";
import { connect } from "react-redux";
import jsonpath from "jsonpath";
import _ from "lodash";
import transLookup from "../../data/lookuptranslations.json";
const DNSSearchResults = (props) => {
const {
searchString,
searchResultsObj,
searchDetailsObj,
setCurrentReference,
} = props;
let { t } = useTranslation();
const router = useRouter();
const { locale } = router;
var resultsArr = searchResultsObj.value || [{}];
return (
<>
<div className="govuk-grid-row">
<div className="govuk-grid-column-two-thirds">
<h1 className="govuk-heading-l">
{t("dnsCommon:service-name")}{" "}
{t("dnsApplications:page-title")}
</h1>
<p className="govuk-body">
{t("dnsApplications:page-intro-paragraph-1")}
</p>
<ul className="govuk-list govuk-list--bullet">
<li> {t("dnsApplications:page-intro-list-item-1")}</li>
<li> {t("dnsApplications:page-intro-list-item-2")}</li>
<li> {t("dnsApplications:page-intro-list-item-3")}</li>
</ul>
</div>
</div>
<div className="govuk-grid-row govuk-!-margin-top-9">
<div className="govuk-grid-column-full">
<dl className="govuk-summary-list govuk-!-margin-bottom-9 results">
<div className="govuk-summary-list__row results-headings">
<dd className="govuk-summary-list__key govuk-!-font-size-14 results_wider ">
{t("search:searchresults-case-reference-label")}
</dd>
<dd className="govuk-summary-list__key govuk-!-font-size-14">
{t("search:searchresults-site-address-label")}
</dd>
<dd className="govuk-summary-list__key govuk-!-font-size-14">
{t("search:searchresults-applicant-label")}
</dd>
<dd className="govuk-summary-list__key govuk-!-font-size-14">
{t("search:searchresults-authority-label")}
</dd>
<dd className="govuk-summary-list__key govuk-!-font-size-14">
{t("search:searchresults-status-label")}
</dd>
</div>
{resultsArr.map((item, key) => {
let detailsObj = jsonpath.query(
searchDetailsObj,
"$..value[?(@.pinswg_name=='" +
item.title +
"')]"
);
detailsObj = detailsObj[0];
return (
<div
className="govuk-summary-list__row"
key={key}
>
<dd className="govuk-summary-list__value govuk-!-font-size-14 ">
<Link href="/dnsdetails">
<a
onClick={() => {
setCurrentReference({
"currentReference":
item.title,
"currentType":
"searchResultsObj",
});
}}
>
<span className="results-visually-hidden">
{t(
"search:searchresults-case-reference-label"
)}
:
</span>
{item.title}
</a>
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-14">
<span className="results-visually-hidden">
{t(
"search:searchresults-site-address-label"
)}
:
</span>
{_.has(
detailsObj,
"pinswg_siteaddressline1"
)
? detailsObj.pinswg_siteaddressline1
: ""}
<br />
{_.has(
detailsObj,
"pinswg_siteaddressline1"
)
? detailsObj.pinswg_siteaddressline2
: ""}
<br />
{_.has(
detailsObj,
"pinswg_siteaddressline1"
)
? detailsObj.pinswg_siteaddresstown
: ""}
<br />
{_.has(
detailsObj,
"pinswg_siteaddressline1"
)
? detailsObj.pinswg_siteaddresscounty
: ""}
<br />
{_.has(
detailsObj,
"pinswg_siteaddressline1"
)
? detailsObj.pinswg_siteaddresspostcode
: ""}
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-14">
<span className="results-visually-hidden">
{t(
"search:searchresults-applicant-label"
)}
:
</span>
{_.has(detailsObj, [
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue",
])
? detailsObj[
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
]
: ""}
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-14">
<span className="results-visually-hidden">
{t(
"search:searchresults-authority-label"
)}
:
</span>
{_.has(detailsObj, [
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue",
])
? router.locale == "cy"
? jsonpath.query(
transLookup,
'$..[?(@.value=="' +
detailsObj[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
)
: detailsObj[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] || "N/A"
: ""}
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-14">
<span className="results-visually-hidden">
{t(
"search:searchresults-status-label"
)}
:
</span>
{router.locale == "cy"
? jsonpath.query(
transLookup,
'$..[?(@.value=="' +
item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
)
: item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
</dd>
</div>
);
})}
</dl>
</div>
</div>
</>
);
};
const mapDispatchToProps = (dispatch) => {
return {
setCurrentReference: (currentReference) => {
dispatch(setCurrentReference(currentReference));
},
};
};
export default connect(null, mapDispatchToProps)(DNSSearchResults);
components/search/searchresults.js
+62 -20
View File
@@ -5,6 +5,7 @@ import { setCurrentReference } from "../../store/currentView/action";
import { connect } from "react-redux"; import { connect } from "react-redux";
import jsonpath from "jsonpath"; import jsonpath from "jsonpath";
import _ from "lodash"; import _ from "lodash";
import transLookup from "../../data/lookuptranslations.json";
const SearchResults = (props) => { const SearchResults = (props) => {
const { const {
@@ -30,7 +31,8 @@ const SearchResults = (props) => {
{t("search:searchresults-count-label", { {t("search:searchresults-count-label", {
count: searchResultsObj["@odata.count"].toString(), count: searchResultsObj["@odata.count"].toString(),
})} })}
. You searched for <em>&quot;{searchString}&quot;</em> . {t("search:searchresults-case-count-label")}{" "}
<em>&quot;{searchString}&quot;</em>
</p> </p>
<dl className="govuk-summary-list govuk-!-margin-bottom-9 results"> <dl className="govuk-summary-list govuk-!-margin-bottom-9 results">
<div className="govuk-summary-list__row results-headings"> <div className="govuk-summary-list__row results-headings">
@@ -76,7 +78,10 @@ const SearchResults = (props) => {
}} }}
> >
<span className="results-visually-hidden"> <span className="results-visually-hidden">
Case Reference: {t(
"search:searchresults-case-reference-label"
)}
:
</span> </span>
{item.title} {item.title}
</a> </a>
@@ -84,7 +89,10 @@ const SearchResults = (props) => {
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-14"> <dd className="govuk-summary-list__value govuk-!-font-size-14">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
Site Address:{" "} {t(
"search:searchresults-site-address-label"
)}
:
</span> </span>
{_.has( {_.has(
detailsObj, detailsObj,
@@ -123,7 +131,10 @@ const SearchResults = (props) => {
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-14"> <dd className="govuk-summary-list__value govuk-!-font-size-14">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
Appellant/Applicant: {t(
"search:searchresults-applicant-label"
)}
:
</span> </span>
{_.has(detailsObj, [ {_.has(detailsObj, [
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue", "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue",
@@ -135,35 +146,66 @@ const SearchResults = (props) => {
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-14"> <dd className="govuk-summary-list__value govuk-!-font-size-14">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
Authority: {t(
"search:searchresults-authority-label"
)}
:
</span> </span>
{_.has(detailsObj, [ {_.has(detailsObj, [
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue", "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue",
]) ])
? detailsObj[ ? router.locale == "cy"
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ? jsonpath.query(
] transLookup,
'$..[?(@.value=="' +
detailsObj[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
)
: detailsObj[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] || "N/A"
: ""} : ""}
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-14"> <dd className="govuk-summary-list__value govuk-!-font-size-14">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
Case Type: {t(
"search:searchresults-case-type-label"
)}
:
</span> </span>
{ {router.locale == "cy"
item[ ? jsonpath.query(
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" transLookup,
] '$..[?(@.value=="' +
} item[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
)
: item[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-14"> <dd className="govuk-summary-list__value govuk-!-font-size-14">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
Status: {t("search:searchresults-status-label")}
:
</span> </span>
{
item[ {router.locale == "cy"
"statuscode@OData.Community.Display.V1.FormattedValue" ? jsonpath.query(
] transLookup,
} '$..[?(@.value=="' +
item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
)
: item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
</dd> </dd>
</div> </div>
); );
data/lookuptranslations.json
+347
View File
@@ -0,0 +1,347 @@
{
"appealTypes": [
{
"value": "Planning Appeal - S78",
"value_cy": "Apêl Cynllunio - S78",
"stringmapid": "cb4aa9f2-e275-eb11-aabd-00224800be9c",
"attributevalue": 846040000
},
{
"value": "Planning Conditions - S73 + S79",
"value_cy": "Amodau Cynllunio - S73 + S79",
"stringmapid": "cc4aa9f2-e275-eb11-aabd-00224800be9c",
"attributevalue": 846040001
},
{
"value": "Planning Obligation Appeal - S106",
"value_cy": "Apêl Rhwymedigaeth Cynllunio - S106",
"stringmapid": "ce4aa9f2-e275-eb11-aabd-00224800be9c",
"attributevalue": 846040003
},
{
"value": "Householder Appeal (HAS)",
"value_cy": "Apêl Deiliaid Tai (HAS)",
"stringmapid": "cf4aa9f2-e275-eb11-aabd-00224800be9c",
"attributevalue": 846040004
},
{
"value": "Enforcement Notice Appeal - S174",
"value_cy": "Apêl Rhybudd Gorfodi - S174",
"stringmapid": "b656f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040005
},
{
"value": "Enforcement Listed Building and Conservation Appeal - S39",
"value_cy": "Apêl Adeiladu a Chadwraeth Rhestredig Gorfodi - S39",
"stringmapid": "b756f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040006
},
{
"value": "Maintenance of Land - S217",
"value_cy": "Cynnal a Chadw Tir - S217",
"stringmapid": "b856f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040007
},
{
"value": "Lawful Development Certificate Appeal - S194 + 195",
"value_cy": "Apêl Tystysgrif Datblygu Cyfreithlon - S194 + 195",
"stringmapid": "b956f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040008
},
{
"value": "Community Infrastructure Levy - S117, 118, & 119",
"value_cy": "Ardoll Seilwaith Cymunedol - S117, 118, & 119",
"stringmapid": "ba56f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040009
},
{
"value": "Call-Ins - S77",
"value_cy": "Galw-i-Mewn - S77",
"stringmapid": "bb56f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040010
},
{
"value": "DNS",
"value_cy": "DNS",
"stringmapid": "bc56f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040011
},
{
"value": "Electricity Act",
"value_cy": "Deddf Trydan",
"stringmapid": "bd56f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040012
},
{
"value": "Transport and Works Act",
"value_cy": "Deddf Trafnidiaeth a Gwaith",
"stringmapid": "be56f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040013
},
{
"value": "Harbour Revision Order",
"value_cy": "Gorchymyn Adolygu'r Harbwr",
"stringmapid": "bf56f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040014
},
{
"value": "ROW",
"value_cy": "ROW",
"stringmapid": "c056f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040015
},
{
"value": "Common Land",
"value_cy": "Tir Cyffredin",
"stringmapid": "c156f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040016
},
{
"value": "High Hedges, Tree Preservation orders, Hedgerows, Tree Replacement Notice.",
"value_cy": "Gwrychoedd Uchel, Gorchmynion Cadw Coed, Gwrychoedd, Rhybudd Amnewid Coed.",
"stringmapid": "c256f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040017
},
{
"value": "Adverts",
"value_cy": "Hysbysebion",
"stringmapid": "c356f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040018
},
{
"value": "Compulsory Purchase Orders",
"value_cy": "Gorchmynion Prynu Gorfodol",
"stringmapid": "c456f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040019
},
{
"value": "Environmental Permitting",
"value_cy": "Caniatáu Amgylcheddol",
"stringmapid": "c556f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040020
},
{
"value": "Wayleave",
"value_cy": "Wayleave",
"stringmapid": "c656f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040021
},
{
"value": "Misc Casework",
"value_cy": "Gwaith Achos Amrywiol",
"stringmapid": "c756f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040022
},
{
"value": "LDP",
"value_cy": "LDP",
"stringmapid": "c856f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040023
},
{
"value": "Non-Validation",
"value_cy": "Peidio â dilysu",
"stringmapid": "c956f05c-7f90-eb11-aac2-00224800be9c",
"attributevalue": 846040024
},
{
"value": "Listed Building and Conservation Area Consent S73 + S79",
"value_cy": "Cydsyniad Ardal Adeiladu a Chadwraeth Rhestredig S73 + S79",
"stringmapid": "977522df-8aef-eb11-aac7-00224800be9c",
"attributevalue": 846040025
}
],
"statusCodes": [
{
"value": "Active",
"value_cy": "Egnïol",
"statuscode": 1
},
{
"value": "In Progress",
"value_cy": "Ar y gweill",
"statuscode": 2
},
{
"value": "On Hold",
"value_cy": "Ar Ddal",
"statuscode": 3
},
{
"value": "Waiting for a Decision",
"value_cy": "Aros am Benderfyniad",
"statuscode": 4
},
{
"value": "Researching",
"value_cy": "Ymchwilio",
"statuscode": 5
},
{
"value": "Problem Solved",
"value_cy": "Datrys Problemau",
"statuscode": 6
}
],
"pinswg_decision": [
{
"value": "Dismissed",
"value_cy": "Diswyddo",
"pinswg_decision": 846040001
},
{
"value": "Split Decision",
"value_cy": "Penderfyniad Hollt",
"pinswg_decision": 846040002
}
],
"pinswg_lpa": [
{
"value": "Blaenau Gwent County Borough Council",
"value_cy": "Cyngor Bwrdeistref Sirol Blaenau Gwent",
"pinswg_lpa": 0
},
{
"value": "Bridgend County Borough Council",
"value_cy": "Cyngor Bwrdeistref Sirol Pen-y-bont ar Ogwr",
"pinswg_lpa": 0
},
{
"value": "Caerphilly County Borough Council",
"value_cy": "Cyngor Bwrdeistref Sirol Caerffili",
"pinswg_lpa": 0
},
{
"value": "Cardiff Council",
"value_cy": "Cyngor Caerdydd",
"pinswg_lpa": 0
},
{
"value": "Cardiff City Council",
"value_cy": "Cyngor Caerdydd",
"pinswg_lpa": 0
},
{
"value": "Carmarthenshire County Council",
"value_cy": "Cyngor Sir Gaerfyrddin",
"pinswg_lpa": 0
},
{
"value": "Ceredigion County Council",
"value_cy": "Cyngor Sir Ceredigion",
"pinswg_lpa": 0
},
{
"value": "Conwy County Borough Council",
"value_cy": "Cyngor Bwrdeistref Sirol Conwy",
"pinswg_lpa": 0
},
{
"value": "Denbighshire County Council",
"value_cy": "Cyngor Sir Ddinbych",
"pinswg_lpa": 0
},
{
"value": "Flintshire County Council",
"value_cy": "Cyngor Sir y Fflint",
"pinswg_lpa": 0
},
{
"value": "Gwynedd Council",
"value_cy": "Cyngor Gwynedd",
"pinswg_lpa": 0
},
{
"value": "Isle of Anglesey County Council",
"value_cy": "Cyngor Sir Ynys Môn",
"pinswg_lpa": 0
},
{
"value": "Merthyr Tydfil County Borough Council",
"value_cy": "Cyngor Bwrdeistref Sirol Merthyr Tudful",
"pinswg_lpa": 0
},
{
"value": "Monmouthshire County Council",
"value_cy": "Cyngor Sir Fynwy",
"pinswg_lpa": 0
},
{
"value": "Neath Port Talbot County Borough Council",
"value_cy": "Cyngor Bwrdeistref Sirol Castell-nedd Port Talbot",
"pinswg_lpa": 0
},
{
"value": "Newport City Council",
"value_cy": "Cyngor Dinas Casnewydd",
"pinswg_lpa": 0
},
{
"value": "Pembrokeshire County Council",
"value_cy": "Cyngor Sir Penfro",
"pinswg_lpa": 0
},
{
"value": "Powys County Council",
"value_cy": "Cyngor Sir Powys",
"pinswg_lpa": 0
},
{
"value": "Rhondda Cynon Taf County Borough Council",
"value_cy": "Cyngor Bwrdeistref Sirol Rhondda Cynon Taf",
"pinswg_lpa": 0
},
{
"value": "Swansea Council",
"value_cy": "Cyngor a Dinas Abertawe",
"pinswg_lpa": 0
},
{
"value": "Torfaen County Borough Council",
"value_cy": "Cyngor Bwrdeistref Sirol Torfaen",
"pinswg_lpa": 0
},
{
"value": "Vale of Glamorgan Council",
"value_cy": "Cyngor Bro Morgannwg",
"pinswg_lpa": 0
},
{
"value": "Wrexham County Borough Council",
"value_cy": "Cyngor Bwrdeistref Sirol Wrecsam",
"pinswg_lpa": 0
},
{
"value": "Brecon Beacons National Park",
"value_cy": "Parc Cenedlaethol Bannau Brycheiniog",
"pinswg_lpa": 0
},
{
"value": "Pembrokeshire Coast National Park",
"value_cy": "Parc Cenedlaethol Arfordir Penfro",
"pinswg_lpa": 0
},
{
"value": "Snowdonia National Park",
"value_cy": "Parc Cenedlaethol Eryri",
"pinswg_lpa": 0
}
],
"pinswg_procedure": [
{
"value": "Written representation",
"value_cy": "Cynrychiolaeth ysgrifenedig",
"pinswg_procedure": 0
},
{
"value": "Hearing",
"value_cy": "Clyw",
"pinswg_procedure": 0
},
{
"value": "Inquiry",
"value_cy": "Ymholiad",
"pinswg_procedure": 0
}
]
}
i18n.json
+8
View File
@@ -64,6 +64,14 @@
"/dns/application-view": [ "/dns/application-view": [
"dnsCommon", "dnsCommon",
"dnsApplicationView" "dnsApplicationView"
],
"/dnsapplications": [
"search",
"dnsCommon",
"dnsApplications"
],
"/dnsdetails": [
"case"
] ]
} }
} }
locales/cy/case.json
+2
View File
@@ -15,8 +15,10 @@
"summary-status-label": "Statws", "summary-status-label": "Statws",
"summary-decision-label": "Penderfyniad a chanlyniad", "summary-decision-label": "Penderfyniad a chanlyniad",
"summary-case-link-status-label": "Statws cysylltiad yr Achos", "summary-case-link-status-label": "Statws cysylltiad yr Achos",
"summary-case-link-status-not-linked": "Heb gysylltiad",
"summary-linked-cases-label": "Achosion cysylltiedig", "summary-linked-cases-label": "Achosion cysylltiedig",
"summary-dates-label": "Dyddiadau", "summary-dates-label": "Dyddiadau",
"summary-no-date-entered-label": "dim dyddiad wedi'i nodi",
"summary-start-date-label": "Dyddiad Dechrau", "summary-start-date-label": "Dyddiad Dechrau",
"summary-questionnaire-due-date-label": "Holiadur i ddod", "summary-questionnaire-due-date-label": "Holiadur i ddod",
"summary-statement-due-date-label": "Datganiad (au) i ddod", "summary-statement-due-date-label": "Datganiad (au) i ddod",
locales/cy/common.json
+3 -1
View File
@@ -1,4 +1,6 @@
{ {
"gov-wales-link": "https://llyw.cymru",
"gov-wales-label": "LLYW.CYMRU",
"service-name": "Cynllunio gwaith achos", "service-name": "Cynllunio gwaith achos",
"breadcrumb-back-link": "Yn ôl", "breadcrumb-back-link": "Yn ôl",
"error-radio": "Dewiswch opsiwn", "error-radio": "Dewiswch opsiwn",
@@ -17,7 +19,7 @@
"back-to-top-link": "Nôl i dop y dudalen", "back-to-top-link": "Nôl i dop y dudalen",
"social-bar-share-link": "Rhannu’r dudalen hon", "social-bar-share-link": "Rhannu’r dudalen hon",
"social-bar-share-via-link": "Rhannu’r dudalen hon ar", "social-bar-share-via-link": "Rhannu’r dudalen hon ar",
"breadcrumb-search-results" : "Canlyniadau chwilio", "breadcrumb-search-results": "Canlyniadau chwilio",
"breadcrumb-my-portal": "Fy mhorth", "breadcrumb-my-portal": "Fy mhorth",
"breadcrumb-case-reference": "Cyfeirnod Achos" "breadcrumb-case-reference": "Cyfeirnod Achos"
} }
locales/cy/search.json
+1
View File
@@ -48,6 +48,7 @@
"searchresults-title-label": "Crynodeb o’r Achos ar gyfer", "searchresults-title-label": "Crynodeb o’r Achos ar gyfer",
"searchresults-count-label": "Cafodd eich chwiliad {{count}} o ganlyniadau", "searchresults-count-label": "Cafodd eich chwiliad {{count}} o ganlyniadau",
"searchresults-case-reference-label": "Cyfeirnod yr Achos", "searchresults-case-reference-label": "Cyfeirnod yr Achos",
"searchresults-case-count-label": "Fe wnaethoch chi chwilio am",
"searchresults-site-address-label": "Cyfeiriad y Safle", "searchresults-site-address-label": "Cyfeiriad y Safle",
"searchresults-applicant-label": "Apelydd/Ymgeisydd", "searchresults-applicant-label": "Apelydd/Ymgeisydd",
"searchresults-authority-label": "ACLl", "searchresults-authority-label": "ACLl",
locales/en/case.json
+2
View File
@@ -15,8 +15,10 @@
"summary-status-label": "Status", "summary-status-label": "Status",
"summary-decision-label": "Decision and Outcome", "summary-decision-label": "Decision and Outcome",
"summary-case-link-status-label": "Case Link Status", "summary-case-link-status-label": "Case Link Status",
"summary-case-link-status-not-linked": "Not linked",
"summary-linked-cases-label": "Linked Cases", "summary-linked-cases-label": "Linked Cases",
"summary-dates-label": "Dates", "summary-dates-label": "Dates",
"summary-no-date-entered-label": "no date entered",
"summary-start-date-label": "Start Date", "summary-start-date-label": "Start Date",
"summary-questionnaire-due-date-label": "Questionnaire due", "summary-questionnaire-due-date-label": "Questionnaire due",
"summary-statement-due-date-label": "Statement(s) due", "summary-statement-due-date-label": "Statement(s) due",
locales/en/common.json
+3 -1
View File
@@ -1,4 +1,6 @@
{ {
"gov-wales-link": "https://www.gov.wales",
"gov-wales-label": "GOV.WALES",
"service-name": "Planning casework", "service-name": "Planning casework",
"breadcrumb-back-link": "Back", "breadcrumb-back-link": "Back",
"error-radio": "Choose an option", "error-radio": "Choose an option",
@@ -17,7 +19,7 @@
"back-to-top-link": "Back to top", "back-to-top-link": "Back to top",
"social-bar-share-link": "Share this page", "social-bar-share-link": "Share this page",
"social-bar-share-via-link": "Share this page via", "social-bar-share-via-link": "Share this page via",
"breadcrumb-search-results" : "Search results", "breadcrumb-search-results": "Search results",
"breadcrumb-my-portal": "My portal", "breadcrumb-my-portal": "My portal",
"breadcrumb-case-reference": "Case Reference" "breadcrumb-case-reference": "Case Reference"
} }
locales/en/search.json
+1
View File
@@ -48,6 +48,7 @@
"searchresults-title-label": "Search for a case", "searchresults-title-label": "Search for a case",
"searchresults-count-label": "Your search returned {{count}} results", "searchresults-count-label": "Your search returned {{count}} results",
"searchresults-case-reference-label": "Case reference", "searchresults-case-reference-label": "Case reference",
"searchresults-case-count-label": "You searched for",
"searchresults-site-address-label": "Site address", "searchresults-site-address-label": "Site address",
"searchresults-applicant-label": "Appellant/Applicant", "searchresults-applicant-label": "Appellant/Applicant",
"searchresults-authority-label": "Authority", "searchresults-authority-label": "Authority",
pages/dnsapplications.js
+128
View File
@@ -0,0 +1,128 @@
import _ from "lodash";
import Head from "next/head";
import Header from "../components/header";
import Banner from "../components/banner";
import CookieBanner from "../components/cookieBanner";
import Breadcrumbs from "../components/breadcrumbs";
import DNSSearchResults from "../components/dnssearchresults";
import Footer from "../components/footer";
import Errorpage from "../components/errorpage";
import styles from "../styles/Home.module.css";
import { useSelector, shallowEqual, connect } from "react-redux";
import { wrapper } from "../store/store";
import Cookies from "cookies";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import jsonpath from "jsonpath";
import data from "../data/collections.json";
import { setSearch, getSearchObj } from "../store/search/action";
import {
setSearchResults,
setSearchDetails,
getSearchResultsObj,
} from "../store/searchOutput/action";
import { getBasicDNSSearch, getBasicSearchDetails } from "../actions";
const Home = (props) => {
const { footerLinks, pages } = props;
let { t, lang } = useTranslation();
const router = useRouter();
const { locale } = router;
const { appealtypes } = router.query;
return (
<div>
<Head>
<title>
{t("search:page-title")} - {t("common:service-name")}
</title>
</Head>
<div id="page_wrapper">
<CookieBanner />
<Header courseName={t("common:service-name")} />
<div className="govuk-width-container">
<Banner />
<Breadcrumbs slug={appealtypes} />
<DNSSearchResults
searchString="DNS"
searchResultsObj={props.searchResultsObj}
/>
</div>
<Footer footerLinks={footerLinks} />
</div>
</div>
);
};
export const getServerSideProps = wrapper.getServerSideProps(
(store) =>
async ({ query, req, res }) => {
console.log("query-", query);
const searchResultsObj = await getBasicDNSSearch();
//console.log(searchResultsObj);
const searchDetailsObj = await getSearchDetails(searchResultsObj);
//console.log(searchDetailsObj);
store.dispatch(setSearchResults(searchResultsObj));
store.dispatch(setSearchDetails(searchDetailsObj));
store.dispatch(setSearch("DNS"));
}
);
const getFormCollection = (formtype) => {
const collectionName = jsonpath.query(
data,
"$..[?(@.LogicalName=='" + formtype + "')].LogicalCollectionName"
);
//console.log(collectionName[0]);
return collectionName[0];
};
const getSearchDetails = (searchResultsObj) => {
//console.log(searchResultsObj);
let detailsArr = [];
searchResultsObj = searchResultsObj.value;
const detailsObj = searchResultsObj.map((searchDetail, index) => {
if (searchDetail.pinswg_appealcasetype == null) {
console.log(searchDetail.ticketnumber);
} else {
detailsArr.push(
getBasicSearchDetails(
getFormCollection(
"pinswg_" +
searchDetail[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
]
.replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
.toLowerCase()
.slice(0, 39)
),
searchDetail.ticketnumber
)
);
}
});
//console.log(detailsArr);
return Promise.all(detailsArr);
};
const mapStateToProps = (state) => {
return {
currentView: state.currentView,
search: state.search,
searchResultsObj: state.searchResultsObj,
formData: state.formData,
appealType: state.appealType,
form: state.form,
myCases: state.myCases,
watchedCases: state.watchedCases,
myRepresentations: state.myRepresentations,
awaitingSubmission: state.awaitingSubmission,
};
};
export default connect(mapStateToProps)(Home);
pages/dnsdetails.js
+89
View File
@@ -0,0 +1,89 @@
import _ from "lodash";
import Head from "next/head";
import Header from "../components/header";
import Banner from "../components/banner";
import CookieBanner from "../components/cookieBanner";
import Breadcrumbs from "../components/breadcrumbs";
import CaseSummary from "../components/case";
import Footer from "../components/footer";
import Errorpage from "../components/errorpage";
import styles from "../styles/Home.module.css";
import { useSelector, shallowEqual, connect } from "react-redux";
import { wrapper } from "../store/store";
import Cookies from "cookies";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import Case from "../components/case";
const Home = (props) => {
const { footerLinks, pages } = props;
let { t, lang } = useTranslation();
const router = useRouter();
const { locale } = router;
const { appealtypes } = router.query;
return (
<div>
<Head>
<title>
{t("case:page-title")}:{" "}
{props.currentView.caseReference.currentReference}{" "}
{t("common:service-name")}
</title>
</Head>
<div id="page_wrapper">
<CookieBanner />
<Header courseName={t("common:service-name")} />
<div className="govuk-width-container">
<Banner />
<Breadcrumbs slug={appealtypes} props={props} />
<Case
props={props}
myCases={props.myCases.myCases}
myCasesDetails={props.myCases.myCasesDetails}
searchResultsObj={
props.searchResultsObj.searchResultsObj
}
searchDetailsObj={
props.searchResultsObj.searchDetailsObj
}
myRepresentations={
props.myRepresentations.myRepresentations
}
watchedCases={props.watchedCases.watchedCases}
awaitingSubmission={
props.awaitingSubmission.awaitingSubmission
}
caseReference={
props.currentView.caseReference.currentReference
}
currentType={
props.currentView.caseReference.currentType
}
/>
</div>
<Footer footerLinks={footerLinks} />
</div>
</div>
);
};
const mapStateToProps = (state) => {
//console.log(state);
return {
currentView: state.currentView,
search: state.search,
searchResultsObj: state.searchResultsObj,
formData: state.formData,
appealType: state.appealType,
form: state.form,
myCases: state.myCases,
watchedCases: state.watchedCases,
myRepresentations: state.myRepresentations,
awaitingSubmission: state.awaitingSubmission,
};
};
export default connect(mapStateToProps)(Home);
pages/searchresults.js
+1
View File
@@ -101,6 +101,7 @@ const getSearchDetails = (searchResultsObj) => {
] ]
.replace(/(\band|[\s\-\+\(\)\,\&])/g, "") .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
.toLowerCase() .toLowerCase()
.slice(0, 39)
), ),
searchDetail.ticketnumber searchDetail.ticketnumber
) )