Merged PR 706: updated typo and fix for no web address
updated typo and fix for no webaddress Related work items: #7110
This commit is contained in:
Robert Bond
@@ -2,7 +2,6 @@ import axios from "axios";
|
|||||||
import https from "https";
|
import https from "https";
|
||||||
import CryptoJS from "crypto-js";
|
import CryptoJS from "crypto-js";
|
||||||
import HmacSHA256 from "crypto-js/hmac-sha256";
|
import HmacSHA256 from "crypto-js/hmac-sha256";
|
||||||
import { has, indexOf } from "lodash";
|
|
||||||
|
|
||||||
let BASE_URL;
|
let BASE_URL;
|
||||||
const port = parseInt(process.env.PORT, 10) || 3000;
|
const port = parseInt(process.env.PORT, 10) || 3000;
|
||||||
|
|||||||
+23
-18
@@ -121,23 +121,28 @@ const CaseSummary = (props) => {
|
|||||||
] || "not entered"}
|
] || "not entered"}
|
||||||
</dd>
|
</dd>
|
||||||
</div>
|
</div>
|
||||||
{_.has(detailsObj, "pinswg_agentcontactname") ? (
|
|
||||||
<div className="govuk-summary-list__row">
|
{detailsObj.pinswg_agentcontactname != null &&
|
||||||
<dt className="govuk-summary-list__key">
|
(_.has(
|
||||||
{t("case:summary-agent-label")}
|
detailsObj,
|
||||||
</dt>
|
"pinswg_agentcontactname"
|
||||||
<dd className="govuk-summary-list__value">
|
) ? (
|
||||||
{_.has(
|
<div className="govuk-summary-list__row">
|
||||||
detailsObj,
|
<dt className="govuk-summary-list__key">
|
||||||
"pinswg_agentcontactname"
|
{t("case:summary-agent-label")}
|
||||||
)
|
</dt>
|
||||||
? detailsObj.pinswg_agentcontactname
|
<dd className="govuk-summary-list__value">
|
||||||
: ""}
|
{_.has(
|
||||||
</dd>
|
detailsObj,
|
||||||
</div>
|
"pinswg_agentcontactname"
|
||||||
) : (
|
)
|
||||||
""
|
? 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")}
|
||||||
@@ -235,7 +240,7 @@ const CaseSummary = (props) => {
|
|||||||
<div>
|
<div>
|
||||||
<div className="govuk-grid-row">
|
<div className="govuk-grid-row">
|
||||||
<div className="govuk-grid-column-full">
|
<div className="govuk-grid-column-full">
|
||||||
<h1>Not details currently held</h1>
|
<h1>{t("case:summary-no-details-label")}</h1>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -248,43 +248,46 @@ const Pinswg_dnsid = (props) => {
|
|||||||
: detailsObj.pinswg_recommendation}
|
: detailsObj.pinswg_recommendation}
|
||||||
</dd>
|
</dd>
|
||||||
</div>
|
</div>
|
||||||
<div className="govuk-summary-list__row">
|
|
||||||
<dt className="govuk-summary-list__key">
|
{detailsObj.pinswg_webaddress != null && (
|
||||||
{t(
|
<div className="govuk-summary-list__row">
|
||||||
"case:summary-case-website-label"
|
<dt className="govuk-summary-list__key">
|
||||||
)}
|
{t(
|
||||||
</dt>
|
"case:summary-case-website-label"
|
||||||
<dd className="govuk-summary-list__value">
|
)}
|
||||||
{router.locale == "cy"
|
</dt>
|
||||||
? jsonpath.query(
|
<dd className="govuk-summary-list__value">
|
||||||
transLookup,
|
{router.locale == "cy"
|
||||||
'$..[?(@.value=="' +
|
? jsonpath.query(
|
||||||
detailsObj.pinswg_webaddress +
|
transLookup,
|
||||||
'")].value_cy'
|
'$..[?(@.value=="' +
|
||||||
)
|
detailsObj.pinswg_webaddress +
|
||||||
: (
|
'")].value_cy'
|
||||||
<a
|
)
|
||||||
target="_blank"
|
: (
|
||||||
rel="noreferrer"
|
<a
|
||||||
href={
|
target="_blank"
|
||||||
detailsObj.pinswg_webaddress.indexOf(
|
rel="noreferrer"
|
||||||
"https://"
|
href={
|
||||||
)
|
detailsObj.pinswg_webaddress.indexOf(
|
||||||
? "https://" +
|
"https://"
|
||||||
detailsObj.pinswg_webaddress
|
)
|
||||||
: detailsObj.pinswg_webaddress
|
? "https://" +
|
||||||
}
|
detailsObj.pinswg_webaddress
|
||||||
>
|
: detailsObj.pinswg_webaddress
|
||||||
{
|
}
|
||||||
detailsObj.pinswg_webaddress
|
>
|
||||||
}
|
{
|
||||||
</a>
|
detailsObj.pinswg_webaddress
|
||||||
) ||
|
}
|
||||||
t(
|
</a>
|
||||||
"case:summary-no-date-entered-label"
|
) ||
|
||||||
)}
|
t(
|
||||||
</dd>
|
"case:summary-no-date-entered-label"
|
||||||
</div>
|
)}
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -250,26 +250,28 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dd>
|
</dd>
|
||||||
</div>
|
</div>
|
||||||
<div className="govuk-summary-list__row">
|
{detailsObj.pinswg_webaddress != null && (
|
||||||
<dt className="govuk-summary-list__key">
|
<div className="govuk-summary-list__row">
|
||||||
{t(
|
<dt className="govuk-summary-list__key">
|
||||||
"case:summary-case-website-label"
|
{t(
|
||||||
)}
|
"case:summary-case-website-label"
|
||||||
</dt>
|
)}
|
||||||
<dd className="govuk-summary-list__value">
|
</dt>
|
||||||
{router.locale == "cy"
|
<dd className="govuk-summary-list__value">
|
||||||
? jsonpath.query(
|
{router.locale == "cy"
|
||||||
transLookup,
|
? jsonpath.query(
|
||||||
'$..[?(@.value=="' +
|
transLookup,
|
||||||
detailsObj.pinswg_webaddress +
|
'$..[?(@.value=="' +
|
||||||
'")].value_cy'
|
detailsObj.pinswg_webaddress +
|
||||||
)
|
'")].value_cy'
|
||||||
: detailsObj.pinswg_webaddress ||
|
)
|
||||||
t(
|
: detailsObj.pinswg_webaddress ||
|
||||||
"case:summary-no-date-entered-label"
|
t(
|
||||||
)}
|
"case:summary-no-date-entered-label"
|
||||||
</dd>
|
)}
|
||||||
</div>
|
</dd>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -250,26 +250,28 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dd>
|
</dd>
|
||||||
</div>
|
</div>
|
||||||
<div className="govuk-summary-list__row">
|
{detailsObj.pinswg_webaddress != null && (
|
||||||
<dt className="govuk-summary-list__key">
|
<div className="govuk-summary-list__row">
|
||||||
{t(
|
<dt className="govuk-summary-list__key">
|
||||||
"case:summary-case-website-label"
|
{t(
|
||||||
)}
|
"case:summary-case-website-label"
|
||||||
</dt>
|
)}
|
||||||
<dd className="govuk-summary-list__value">
|
</dt>
|
||||||
{router.locale == "cy"
|
<dd className="govuk-summary-list__value">
|
||||||
? jsonpath.query(
|
{router.locale == "cy"
|
||||||
transLookup,
|
? jsonpath.query(
|
||||||
'$..[?(@.value=="' +
|
transLookup,
|
||||||
detailsObj.pinswg_webaddress +
|
'$..[?(@.value=="' +
|
||||||
'")].value_cy'
|
detailsObj.pinswg_webaddress +
|
||||||
)
|
'")].value_cy'
|
||||||
: detailsObj.pinswg_webaddress ||
|
)
|
||||||
t(
|
: detailsObj.pinswg_webaddress ||
|
||||||
"case:summary-no-date-entered-label"
|
t(
|
||||||
)}
|
"case:summary-no-date-entered-label"
|
||||||
</dd>
|
)}
|
||||||
</div>
|
</dd>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -102,26 +102,28 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dd>
|
</dd>
|
||||||
</div>
|
</div>
|
||||||
<div className="govuk-summary-list__row">
|
{detailsObj.pinswg_webaddress != null && (
|
||||||
<dt className="govuk-summary-list__key">
|
<div className="govuk-summary-list__row">
|
||||||
{t(
|
<dt className="govuk-summary-list__key">
|
||||||
"case:summary-case-website-label"
|
{t(
|
||||||
)}
|
"case:summary-case-website-label"
|
||||||
</dt>
|
)}
|
||||||
<dd className="govuk-summary-list__value">
|
</dt>
|
||||||
{router.locale == "cy"
|
<dd className="govuk-summary-list__value">
|
||||||
? jsonpath.query(
|
{router.locale == "cy"
|
||||||
transLookup,
|
? jsonpath.query(
|
||||||
'$..[?(@.value=="' +
|
transLookup,
|
||||||
detailsObj.pinswg_webaddress +
|
'$..[?(@.value=="' +
|
||||||
'")].value_cy'
|
detailsObj.pinswg_webaddress +
|
||||||
)
|
'")].value_cy'
|
||||||
: detailsObj.pinswg_webaddress ||
|
)
|
||||||
t(
|
: detailsObj.pinswg_webaddress ||
|
||||||
"case:summary-no-date-entered-label"
|
t(
|
||||||
)}
|
"case:summary-no-date-entered-label"
|
||||||
</dd>
|
)}
|
||||||
</div>
|
</dd>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -63,5 +63,7 @@
|
|||||||
"summary-withdrawn-date": "Dyddiad tynnu'n ôl",
|
"summary-withdrawn-date": "Dyddiad tynnu'n ôl",
|
||||||
"summary-written-acceptance-of-notice": "Derbyniad ysgrifenedig o rybudd",
|
"summary-written-acceptance-of-notice": "Derbyniad ysgrifenedig o rybudd",
|
||||||
"summary-case-website-label": "Gwefan",
|
"summary-case-website-label": "Gwefan",
|
||||||
"summary-case-recommendation-label": "Argymhelliad"
|
"summary-case-recommendation-label": "Argymhelliad",
|
||||||
|
"summary-no-details-label": "Nid oes unrhyw fanylion ar gael ar hyn o bryd",
|
||||||
|
"summary-case-relevant-authoritylabel": "Awdurdod perthnasol"
|
||||||
}
|
}
|
||||||
@@ -63,5 +63,7 @@
|
|||||||
"summary-withdrawn-date": "Withdrawn Date",
|
"summary-withdrawn-date": "Withdrawn Date",
|
||||||
"summary-written-acceptance-of-notice": "Written Acceptance of Notice",
|
"summary-written-acceptance-of-notice": "Written Acceptance of Notice",
|
||||||
"summary-case-website-label": "Website",
|
"summary-case-website-label": "Website",
|
||||||
"summary-case-recommendation-label": "Recommendation"
|
"summary-case-recommendation-label": "Recommendation",
|
||||||
|
"summary-no-details-label": "No details currently held",
|
||||||
|
"summary-case-relevant-authoritylabel": "Relevant authority"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user