Merged PR 2442: remove lodash dependecies on _.has
Related work items: #23754
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
import { DefaultAzureCredential } from "@azure/identity";
|
import { DefaultAzureCredential } from "@azure/identity";
|
||||||
import _ from "lodash";
|
import _ from "lodash";
|
||||||
import { hashAPIPath, consoleLogger } from ".";
|
import { hashAPIPath, consoleLogger } from ".";
|
||||||
import { getDocumentTypeFromFilename } from "../components/utils";
|
import { getDocumentTypeFromFilename, hasOwn } from "../components/utils";
|
||||||
|
|
||||||
const {
|
const {
|
||||||
ContainerClient,
|
ContainerClient,
|
||||||
@@ -316,7 +316,7 @@ export const createBlob = async (formContent, containerName, caseref) => {
|
|||||||
formContent = JSON.parse(formContent);
|
formContent = JSON.parse(formContent);
|
||||||
let caseID = "";
|
let caseID = "";
|
||||||
|
|
||||||
caseID = _.has(formContent, "pinswg_name")
|
caseID = hasOwn(formContent, "pinswg_name")
|
||||||
? formContent.pinswg_name
|
? formContent.pinswg_name
|
||||||
: caseref;
|
: caseref;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ export const BASE_URL =
|
|||||||
? window.apiRoot
|
? window.apiRoot
|
||||||
: process.env.API_ROOT || `http://localhost:${port}`;
|
: process.env.API_ROOT || `http://localhost:${port}`;
|
||||||
|
|
||||||
export const API_PATH = "/api/data/v8.2/";
|
export const API_PATH = "/api/data/v9.2/";
|
||||||
|
|
||||||
export const WEBAPI_URL =
|
export const WEBAPI_URL =
|
||||||
process.env.RELAY_ROOT ||
|
process.env.RELAY_ROOT ||
|
||||||
|
|||||||
+26
-32
@@ -1,4 +1,4 @@
|
|||||||
import _ from "lodash";
|
import { hasOwn } from "../../components/utils";
|
||||||
|
|
||||||
const MASK = "[REDACTED]";
|
const MASK = "[REDACTED]";
|
||||||
|
|
||||||
@@ -50,44 +50,38 @@ export const consoleLogger = (err) => {
|
|||||||
redactSensitive(err) +
|
redactSensitive(err) +
|
||||||
"\n\n/////////////////////////////////////////////////\n"
|
"\n\n/////////////////////////////////////////////////\n"
|
||||||
);
|
);
|
||||||
var errStr =
|
|
||||||
"\n\n/////////////////////////////////////////////////\nServer Error " +
|
const errStr =
|
||||||
"\n" +
|
"\n\n/////////////////////////////////////////////////\nServer Error\n" +
|
||||||
(_.has(err, "name") ? "Name: " + err.name + "\n" : "") +
|
(hasOwn(err, "name") ? `Name: ${err.name}\n` : "") +
|
||||||
(_.has(err, "code") ? "Code: " + err.code + "\n" : "") +
|
(hasOwn(err, "code") ? `Code: ${err.code}\n` : "") +
|
||||||
(_.has(err, "query") ? "Query: " + err.query + "\n" : "") +
|
(hasOwn(err, "query") ? `Query: ${err.query}\n` : "") +
|
||||||
(_.has(err, "message") ? "Message: " + err.message + "\n" : "") +
|
(hasOwn(err, "message") ? `Message: ${err.message}\n` : "") +
|
||||||
(_.has(err, "request.url")
|
(err?.request?.url ? `request.url: ${err.request.url}\n` : "") +
|
||||||
? "request.url: " + err.request.url + "\n"
|
(err?.response?.status ? `Status: ${err.response.status}\n` : "") +
|
||||||
|
(err?.response?.statusText
|
||||||
|
? `StatusText: ${err.response.statusText}\n`
|
||||||
: "") +
|
: "") +
|
||||||
(_.has(err, "response.status") ? "Status: " + err.code + "\n" : "") +
|
(err?.response?.request?.socket?.remoteAddress
|
||||||
(_.has(err, "response.statusText")
|
? `Request IP: ${err.response.request.socket.remoteAddress}\n`
|
||||||
? "\nStatusText: " + err.response.status + "\n"
|
|
||||||
: "") +
|
: "") +
|
||||||
(_.has(err, "response.request.socket.remoteAddress")
|
(err?.response?.data?.error?.message
|
||||||
? "\nRequest IP: " +
|
? `Message: ${redactSensitive(err.response.data.error.message)}\n`
|
||||||
err.response.request.socket.remoteAddress +
|
|
||||||
"\n"
|
|
||||||
: "") +
|
: "") +
|
||||||
(_.has(err, "response.data.error.message")
|
(err?.response?.config?.url
|
||||||
? "\nMessage: " +
|
? `Request URL: ${redactSensitive(err.response.config.url)}\n`
|
||||||
redactSensitive(err.response.data.error.message) +
|
|
||||||
"\n"
|
|
||||||
: "") +
|
: "") +
|
||||||
(_.has(err, "response.config.url")
|
(err?.response?.headers?.date
|
||||||
? "\nRequest URL: " + redactSensitive(err.config.url) + "\n"
|
? `Request Time: ${err.response.headers.date}\n`
|
||||||
: "") +
|
: "") +
|
||||||
(_.has(err, "response.headers.date")
|
(err?.config?.url
|
||||||
? "\nRequest Time: " + err.response.headers.date + "\n"
|
? `Axios config url: ${redactSensitive(err.config.url)}\n`
|
||||||
: "") +
|
: "") +
|
||||||
(_.has(err, "config.url")
|
(err?.message
|
||||||
? "\nAxios config url: " + redactSensitive(err.config.url) + "\n"
|
? `Axios message: ${redactSensitive(err.message)}\n`
|
||||||
: "") +
|
: "") +
|
||||||
(_.has(err, "config.url")
|
(err?.config?.data
|
||||||
? "\nAxios message url: " + redactSensitive(err.message) + "\n"
|
? `Request payload: ${redactSensitive(err.config.data)}\n`
|
||||||
: "") +
|
|
||||||
(_.has(err, "config.data")
|
|
||||||
? "\nRequest payload: " + redactSensitive(err.config.data) + "\n"
|
|
||||||
: "") +
|
: "") +
|
||||||
"\n/////////////////////////////////////////////////\n";
|
"\n/////////////////////////////////////////////////\n";
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import Link from "next/link";
|
|||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import CRMError from "./crmError";
|
import CRMError from "./crmError";
|
||||||
import SearchResults from "./search/addresssearchresults";
|
import SearchResults from "./search/addresssearchresults";
|
||||||
|
import { hasOwn } from "./utils";
|
||||||
|
|
||||||
export default function Search(props) {
|
export default function Search(props) {
|
||||||
const {
|
const {
|
||||||
@@ -12,14 +13,14 @@ export default function Search(props) {
|
|||||||
myportal,
|
myportal,
|
||||||
watchedCases,
|
watchedCases,
|
||||||
isLinkedCase,
|
isLinkedCase,
|
||||||
showLoginCheck,
|
showLoginCheck
|
||||||
} = props;
|
} = props;
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { locale } = router;
|
const { locale } = router;
|
||||||
|
|
||||||
var hasError = _.has(searchResultsObj.searchResultsObj, "errorCode")
|
var hasError = hasOwn(searchResultsObj.searchResultsObj, "errorCode")
|
||||||
? true
|
? true
|
||||||
: false;
|
: false;
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import {
|
|||||||
setSearchDetails
|
setSearchDetails
|
||||||
} from "../../../store/searchOutput/action";
|
} from "../../../store/searchOutput/action";
|
||||||
|
|
||||||
import { getDetailsProxy, getSearchDetailsPaged } from "../../utils";
|
import { getDetailsProxy, getSearchDetailsPaged, hasOwn } from "../../utils";
|
||||||
import { getAdvancedSearchPaged } from "../../../actions/services/searchService";
|
import { getAdvancedSearchPaged } from "../../../actions/services/searchService";
|
||||||
import { getNewAppealsPage } from "../../../actions/services/adminService";
|
import { getNewAppealsPage } from "../../../actions/services/adminService";
|
||||||
import {
|
import {
|
||||||
@@ -306,7 +306,7 @@ function AppealsTab(props) {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_projectlocation"
|
"pinswg_projectlocation"
|
||||||
)
|
)
|
||||||
@@ -325,7 +325,7 @@ function AppealsTab(props) {
|
|||||||
)[0]
|
)[0]
|
||||||
: ""
|
: ""
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
)
|
)
|
||||||
@@ -335,52 +335,52 @@ function AppealsTab(props) {
|
|||||||
{/* {detailsObj.pinswg_siteaddressline1 !=
|
{/* {detailsObj.pinswg_siteaddressline1 !=
|
||||||
null && <br />} */}
|
null && <br />} */}
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline1 !=
|
detailsObj.pinswg_siteaddressline1 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddressline2
|
? detailsObj.pinswg_siteaddressline2
|
||||||
: ""}
|
: ""}
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline2"
|
"pinswg_siteaddressline2"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline2 !=
|
detailsObj.pinswg_siteaddressline2 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresstown"
|
"pinswg_siteaddresstown"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddresstown
|
? detailsObj.pinswg_siteaddresstown
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresstown"
|
"pinswg_siteaddresstown"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresstown !=
|
detailsObj.pinswg_siteaddresstown !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresscounty"
|
"pinswg_siteaddresscounty"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddresscounty
|
? detailsObj.pinswg_siteaddresscounty
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresscounty"
|
"pinswg_siteaddresscounty"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresscounty !=
|
detailsObj.pinswg_siteaddresscounty !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresspostcode"
|
"pinswg_siteaddresspostcode"
|
||||||
)
|
)
|
||||||
@@ -398,7 +398,7 @@ function AppealsTab(props) {
|
|||||||
? item.pinswg_appellantfirstname +
|
? item.pinswg_appellantfirstname +
|
||||||
" " +
|
" " +
|
||||||
item.pinswg_appellantlastname
|
item.pinswg_appellantlastname
|
||||||
: _.has(detailsObj, [
|
: hasOwn(detailsObj, [
|
||||||
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
||||||
])
|
])
|
||||||
? detailsObj[
|
? detailsObj[
|
||||||
@@ -413,7 +413,7 @@ function AppealsTab(props) {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(item, [
|
{hasOwn(item, [
|
||||||
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
||||||
])
|
])
|
||||||
? router.locale == "cy"
|
? router.locale == "cy"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { useRouter } from "next/router";
|
|||||||
import { useCallback, useEffect, useRef, useState } from "react";
|
import { useCallback, useEffect, useRef, useState } from "react";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import transLookup from "../../../data/lookuptranslations.json";
|
import transLookup from "../../../data/lookuptranslations.json";
|
||||||
import { formatDates, getDocLink } from "../../utils";
|
import { formatDates, getDocLink, hasOwn } from "../../utils";
|
||||||
import PaginationControl from "../../../components/case/pagination";
|
import PaginationControl from "../../../components/case/pagination";
|
||||||
import DocumentLink from "../../utils/downloads";
|
import DocumentLink from "../../utils/downloads";
|
||||||
import { useDownloadQueue } from "../../utils/downloadmanager";
|
import { useDownloadQueue } from "../../utils/downloadmanager";
|
||||||
@@ -754,7 +754,7 @@ const DocumentsTab = (props) => {
|
|||||||
// )}
|
// )}
|
||||||
// :
|
// :
|
||||||
// </span>
|
// </span>
|
||||||
// {_.has(
|
// {hasOwn(
|
||||||
// detailsObj,
|
// detailsObj,
|
||||||
// "pinswg_name"
|
// "pinswg_name"
|
||||||
// )
|
// )
|
||||||
@@ -789,7 +789,7 @@ const DocumentsTab = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_name"
|
"pinswg_name"
|
||||||
)
|
)
|
||||||
@@ -805,7 +805,7 @@ const DocumentsTab = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_name"
|
"pinswg_name"
|
||||||
)
|
)
|
||||||
@@ -848,7 +848,7 @@ const DocumentsTab = (props) => {
|
|||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"createdon"
|
"createdon"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { useRouter } from "next/router";
|
|||||||
import { useCallback, useEffect, useRef, useState } from "react";
|
import { useCallback, useEffect, useRef, useState } from "react";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import transLookup from "../../data/lookuptranslations.json";
|
import transLookup from "../../data/lookuptranslations.json";
|
||||||
import { formatDates, getDocLink } from "../utils";
|
import { formatDates, getDocLink, hasOwn } from "../utils";
|
||||||
import PaginationControl from "./pagination";
|
import PaginationControl from "./pagination";
|
||||||
import { sendGAEvent } from "@next/third-parties/google";
|
import { sendGAEvent } from "@next/third-parties/google";
|
||||||
|
|
||||||
@@ -349,7 +349,7 @@ const DocumentDetails = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_name"
|
"pinswg_name"
|
||||||
)
|
)
|
||||||
@@ -364,7 +364,7 @@ const DocumentDetails = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_name"
|
"pinswg_name"
|
||||||
)
|
)
|
||||||
@@ -405,7 +405,7 @@ const DocumentDetails = (props) => {
|
|||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_latestpublisheddate"
|
"pinswg_latestpublisheddate"
|
||||||
)
|
)
|
||||||
@@ -785,7 +785,7 @@ const DocumentDetails = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_name"
|
"pinswg_name"
|
||||||
)
|
)
|
||||||
@@ -801,7 +801,7 @@ const DocumentDetails = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_name"
|
"pinswg_name"
|
||||||
)
|
)
|
||||||
@@ -844,7 +844,7 @@ const DocumentDetails = (props) => {
|
|||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_latestpublisheddate"
|
"pinswg_latestpublisheddate"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import _ from "lodash";
|
|
||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
@@ -13,6 +12,7 @@ import {
|
|||||||
bytesToSize,
|
bytesToSize,
|
||||||
getThumbnailIconByExtension,
|
getThumbnailIconByExtension,
|
||||||
formatDates,
|
formatDates,
|
||||||
|
hasOwn,
|
||||||
updateLinks,
|
updateLinks,
|
||||||
getDocLink
|
getDocLink
|
||||||
} from "../../utils";
|
} from "../../utils";
|
||||||
@@ -399,7 +399,7 @@ const RepCompleteSubmit = (props) => {
|
|||||||
</a> */}
|
</a> */}
|
||||||
</dd>
|
</dd>
|
||||||
</div>
|
</div>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
repFormData,
|
repFormData,
|
||||||
"representationOnBehalfOf"
|
"representationOnBehalfOf"
|
||||||
) && (
|
) && (
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { JSONPath as jsonpath } from "jsonpath-plus";
|
import { JSONPath as jsonpath } from "jsonpath-plus";
|
||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const RepDetails = (props) => {
|
const RepDetails = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -17,8 +18,8 @@ const RepDetails = (props) => {
|
|||||||
? props.myRepresentations.myRepresentations
|
? props.myRepresentations.myRepresentations
|
||||||
: props.searchResultsObj.searchDetailsObj
|
: props.searchResultsObj.searchDetailsObj
|
||||||
: props.currentType == "watchedCases"
|
: props.currentType == "watchedCases"
|
||||||
? props.props.props.props.watchedCases.watchedCasesDetails
|
? props.props.props.props.watchedCases.watchedCasesDetails
|
||||||
: props.props.props.searchResultsObj.searchDetailsObj;
|
: props.props.props.searchResultsObj.searchDetailsObj;
|
||||||
|
|
||||||
var detailsObj = {};
|
var detailsObj = {};
|
||||||
|
|
||||||
@@ -31,7 +32,7 @@ const RepDetails = (props) => {
|
|||||||
detailsObj = jsonpath({
|
detailsObj = jsonpath({
|
||||||
path: '$..[?(@ && @.ticketnumber=="' + ticketnumber + '")]',
|
path: '$..[?(@ && @.ticketnumber=="' + ticketnumber + '")]',
|
||||||
json: setCaseDetailsObj,
|
json: setCaseDetailsObj,
|
||||||
eval: true,
|
eval: true
|
||||||
});
|
});
|
||||||
|
|
||||||
detailsObj = detailsObj[0];
|
detailsObj = detailsObj[0];
|
||||||
@@ -61,34 +62,43 @@ const RepDetails = (props) => {
|
|||||||
{t("case:summary-site-address-label")}
|
{t("case:summary-site-address-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(detailsObj, "pinswg_siteaddressline1")
|
{hasOwn(detailsObj, "pinswg_siteaddressline1")
|
||||||
? detailsObj.pinswg_siteaddressline1
|
? detailsObj.pinswg_siteaddressline1
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(detailsObj, "pinswg_siteaddressline1") &&
|
{hasOwn(
|
||||||
|
detailsObj,
|
||||||
|
"pinswg_siteaddressline1"
|
||||||
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline1 !=
|
detailsObj.pinswg_siteaddressline1 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(detailsObj, "pinswg_siteaddressline2")
|
{hasOwn(detailsObj, "pinswg_siteaddressline2")
|
||||||
? detailsObj.pinswg_siteaddressline2
|
? detailsObj.pinswg_siteaddressline2
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(detailsObj, "pinswg_siteaddressline2") &&
|
{hasOwn(
|
||||||
|
detailsObj,
|
||||||
|
"pinswg_siteaddressline2"
|
||||||
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline2 !=
|
detailsObj.pinswg_siteaddressline2 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(detailsObj, "pinswg_siteaddresstown")
|
{hasOwn(detailsObj, "pinswg_siteaddresstown")
|
||||||
? detailsObj.pinswg_siteaddresstown
|
? detailsObj.pinswg_siteaddresstown
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(detailsObj, "pinswg_siteaddresstown") &&
|
{hasOwn(detailsObj, "pinswg_siteaddresstown") &&
|
||||||
detailsObj.pinswg_siteaddresstown !=
|
detailsObj.pinswg_siteaddresstown !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(detailsObj, "pinswg_siteaddresscounty")
|
{hasOwn(detailsObj, "pinswg_siteaddresscounty")
|
||||||
? detailsObj.pinswg_siteaddresscounty
|
? detailsObj.pinswg_siteaddresscounty
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresscounty"
|
"pinswg_siteaddresscounty"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresscounty !=
|
detailsObj.pinswg_siteaddresscounty !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(detailsObj, "pinswg_siteaddresspostcode")
|
{hasOwn(
|
||||||
|
detailsObj,
|
||||||
|
"pinswg_siteaddresspostcode"
|
||||||
|
)
|
||||||
? detailsObj.pinswg_siteaddresspostcode
|
? detailsObj.pinswg_siteaddresspostcode
|
||||||
: ""}
|
: ""}
|
||||||
</dd>
|
</dd>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { JSONPath as jsonpath } from "jsonpath-plus";
|
import { JSONPath as jsonpath } from "jsonpath-plus";
|
||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const RepLPADetails = (props) => {
|
const RepLPADetails = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -15,15 +16,15 @@ const RepLPADetails = (props) => {
|
|||||||
? props.props.myRepresentations.myRepresentations
|
? props.props.myRepresentations.myRepresentations
|
||||||
: props.searchResultsObj.searchDetailsObj
|
: props.searchResultsObj.searchDetailsObj
|
||||||
: props.currentType == "watchedCases"
|
: props.currentType == "watchedCases"
|
||||||
? props.props.props.watchedCases.watchedCasesDetails
|
? props.props.props.watchedCases.watchedCasesDetails
|
||||||
: props.props.searchResultsObj.searchDetailsObj;
|
: props.props.searchResultsObj.searchDetailsObj;
|
||||||
|
|
||||||
var detailsObj = {};
|
var detailsObj = {};
|
||||||
|
|
||||||
detailsObj = jsonpath({
|
detailsObj = jsonpath({
|
||||||
path: '$..[?(@ && @.ticketnumber=="' + ticketnumber + '")]',
|
path: '$..[?(@ && @.ticketnumber=="' + ticketnumber + '")]',
|
||||||
json: setCaseDetailsObj,
|
json: setCaseDetailsObj,
|
||||||
eval: true,
|
eval: true
|
||||||
});
|
});
|
||||||
|
|
||||||
detailsObj = detailsObj[0];
|
detailsObj = detailsObj[0];
|
||||||
@@ -51,34 +52,43 @@ const RepLPADetails = (props) => {
|
|||||||
{t("case:summary-site-address-label")}
|
{t("case:summary-site-address-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(detailsObj, "pinswg_siteaddressline1")
|
{hasOwn(detailsObj, "pinswg_siteaddressline1")
|
||||||
? detailsObj.pinswg_siteaddressline1
|
? detailsObj.pinswg_siteaddressline1
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(detailsObj, "pinswg_siteaddressline1") &&
|
{hasOwn(
|
||||||
|
detailsObj,
|
||||||
|
"pinswg_siteaddressline1"
|
||||||
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline1 !=
|
detailsObj.pinswg_siteaddressline1 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(detailsObj, "pinswg_siteaddressline2")
|
{hasOwn(detailsObj, "pinswg_siteaddressline2")
|
||||||
? detailsObj.pinswg_siteaddressline2
|
? detailsObj.pinswg_siteaddressline2
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(detailsObj, "pinswg_siteaddressline2") &&
|
{hasOwn(
|
||||||
|
detailsObj,
|
||||||
|
"pinswg_siteaddressline2"
|
||||||
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline2 !=
|
detailsObj.pinswg_siteaddressline2 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(detailsObj, "pinswg_siteaddresstown")
|
{hasOwn(detailsObj, "pinswg_siteaddresstown")
|
||||||
? detailsObj.pinswg_siteaddresstown
|
? detailsObj.pinswg_siteaddresstown
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(detailsObj, "pinswg_siteaddresstown") &&
|
{hasOwn(detailsObj, "pinswg_siteaddresstown") &&
|
||||||
detailsObj.pinswg_siteaddresstown !=
|
detailsObj.pinswg_siteaddresstown !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(detailsObj, "pinswg_siteaddresscounty")
|
{hasOwn(detailsObj, "pinswg_siteaddresscounty")
|
||||||
? detailsObj.pinswg_siteaddresscounty
|
? detailsObj.pinswg_siteaddresscounty
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresscounty"
|
"pinswg_siteaddresscounty"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresscounty !=
|
detailsObj.pinswg_siteaddresscounty !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(detailsObj, "pinswg_siteaddresspostcode")
|
{hasOwn(
|
||||||
|
detailsObj,
|
||||||
|
"pinswg_siteaddresspostcode"
|
||||||
|
)
|
||||||
? detailsObj.pinswg_siteaddresspostcode
|
? detailsObj.pinswg_siteaddresspostcode
|
||||||
: ""}
|
: ""}
|
||||||
</dd>
|
</dd>
|
||||||
|
|||||||
+62
-63
@@ -1,6 +1,5 @@
|
|||||||
import _ from "lodash";
|
|
||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import { formatDates, updateLinks } from "../../../utils";
|
import { formatDates, hasOwn, updateLinks } from "../../../utils";
|
||||||
|
|
||||||
let RepLPAQuestionnaireCheck_s78 = (props) => {
|
let RepLPAQuestionnaireCheck_s78 = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -11,7 +10,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
showQuestionnaireSection,
|
showQuestionnaireSection,
|
||||||
setShowQuestionnaireSection,
|
setShowQuestionnaireSection,
|
||||||
setRepresentationSubmit,
|
setRepresentationSubmit,
|
||||||
questionnaireCount,
|
questionnaireCount
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
let repFormData = formObj.representationForm.values;
|
let repFormData = formObj.representationForm.values;
|
||||||
@@ -22,7 +21,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<>
|
<>
|
||||||
{showQuestionnaireSection}
|
{showQuestionnaireSection}
|
||||||
|
|
||||||
{_.has(repFormData, "procedureType") && (
|
{hasOwn(repFormData, "procedureType") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -84,7 +83,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "enterToView") && (
|
{hasOwn(repFormData, "enterToView") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -117,7 +116,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "enterNeighbouringLandToViewSite") && (
|
{hasOwn(repFormData, "enterNeighbouringLandToViewSite") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -160,7 +159,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.enterNeighbouringLandToViewSiteEvidence,
|
__html: repFormData.enterNeighbouringLandToViewSiteEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -187,7 +186,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "enterNeighbouringLandAccessRequired") && (
|
{hasOwn(repFormData, "enterNeighbouringLandAccessRequired") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -231,7 +230,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.enterNeighbouringLandAccessRequiredEvidence,
|
__html: repFormData.enterNeighbouringLandAccessRequiredEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -258,7 +257,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "healthAndSafetyIssues") && (
|
{hasOwn(repFormData, "healthAndSafetyIssues") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -301,7 +300,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.healthAndSafetyIssuesEvidence,
|
__html: repFormData.healthAndSafetyIssuesEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -337,11 +336,11 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
</dt>
|
</dt>
|
||||||
|
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(repFormData, "LPAcontactDetails") ? (
|
{hasOwn(repFormData, "LPAcontactDetails") ? (
|
||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.LPAcontactDetails,
|
__html: repFormData.LPAcontactDetails
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
@@ -378,11 +377,11 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
</dt>
|
</dt>
|
||||||
|
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(repFormData, "LPAcaseFileAndReps") ? (
|
{hasOwn(repFormData, "LPAcaseFileAndReps") ? (
|
||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.LPAcaseFileAndReps,
|
__html: repFormData.LPAcaseFileAndReps
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
@@ -419,11 +418,11 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
</dt>
|
</dt>
|
||||||
|
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(repFormData, "LPAldpAndMap") ? (
|
{hasOwn(repFormData, "LPAldpAndMap") ? (
|
||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.LPAldpAndMap,
|
__html: repFormData.LPAldpAndMap
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
@@ -460,11 +459,11 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
</dt>
|
</dt>
|
||||||
|
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(repFormData, "LPAlocalGuidance") ? (
|
{hasOwn(repFormData, "LPAlocalGuidance") ? (
|
||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.LPAlocalGuidance,
|
__html: repFormData.LPAlocalGuidance
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
@@ -493,7 +492,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
|
|
||||||
{_.has(repFormData, "LPAintentionToSubmitFullStatement") && (
|
{hasOwn(repFormData, "LPAintentionToSubmitFullStatement") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -526,7 +525,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "AONB") && (
|
{hasOwn(repFormData, "AONB") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -558,7 +557,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "ROW") && (
|
{hasOwn(repFormData, "ROW") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -600,7 +599,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.ROWEvidence,
|
__html: repFormData.ROWEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -627,7 +626,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "conservationArea") && (
|
{hasOwn(repFormData, "conservationArea") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -670,7 +669,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.conservationAreaEvidence,
|
__html: repFormData.conservationAreaEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -697,7 +696,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "affectListedBuilding") && (
|
{hasOwn(repFormData, "affectListedBuilding") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -740,7 +739,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.affectListedBuildingEvidence,
|
__html: repFormData.affectListedBuildingEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -767,7 +766,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "TPO") && (
|
{hasOwn(repFormData, "TPO") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -810,7 +809,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.TPOEvidence,
|
__html: repFormData.TPOEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -837,7 +836,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "natureConservationSite") && (
|
{hasOwn(repFormData, "natureConservationSite") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -880,7 +879,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.natureConservationSiteEvidence,
|
__html: repFormData.natureConservationSiteEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -907,7 +906,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "protectedSpecies") && (
|
{hasOwn(repFormData, "protectedSpecies") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -950,7 +949,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.protectedSpeciesEvidence,
|
__html: repFormData.protectedSpeciesEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -977,7 +976,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "gypsyTravellerInvolvment") && (
|
{hasOwn(repFormData, "gypsyTravellerInvolvment") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1010,7 +1009,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "governmentDepartmentComments") && (
|
{hasOwn(repFormData, "governmentDepartmentComments") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1053,7 +1052,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.governmentDepartmentCommentsEvidence,
|
__html: repFormData.governmentDepartmentCommentsEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -1080,7 +1079,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "developmentNotBeginLaterThanFiveYears") && (
|
{hasOwn(repFormData, "developmentNotBeginLaterThanFiveYears") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1113,7 +1112,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "developmentCarriedOutInAccordance") && (
|
{hasOwn(repFormData, "developmentCarriedOutInAccordance") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1156,7 +1155,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.developmentCarriedOutInAccordanceEvidence,
|
__html: repFormData.developmentCarriedOutInAccordanceEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -1183,7 +1182,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "developmentNotTakePlaceBiodiversity") && (
|
{hasOwn(repFormData, "developmentNotTakePlaceBiodiversity") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1216,7 +1215,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "developmentNotTakePlaceBroadband") && (
|
{hasOwn(repFormData, "developmentNotTakePlaceBroadband") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1259,7 +1258,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.developmentNotTakePlaceBroadbandEvidence,
|
__html: repFormData.developmentNotTakePlaceBroadbandEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -1286,7 +1285,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "developmentAnyOtherConditions") && (
|
{hasOwn(repFormData, "developmentAnyOtherConditions") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1329,7 +1328,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.developmentAnyOtherConditionsEvidence,
|
__html: repFormData.developmentAnyOtherConditionsEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -1356,7 +1355,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "copyOfApplicantsCertificate") && (
|
{hasOwn(repFormData, "copyOfApplicantsCertificate") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1399,7 +1398,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.copyOfApplicantsCertificateEvidence,
|
__html: repFormData.copyOfApplicantsCertificateEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -1426,7 +1425,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "advertismentGiven") && (
|
{hasOwn(repFormData, "advertismentGiven") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1469,7 +1468,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.advertismentGivenEvidence,
|
__html: repFormData.advertismentGivenEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -1496,7 +1495,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "copyOfLetterOfAppealNotification") && (
|
{hasOwn(repFormData, "copyOfLetterOfAppealNotification") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1539,7 +1538,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.copyOfLetterOfAppealNotificationEvidence,
|
__html: repFormData.copyOfLetterOfAppealNotificationEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -1566,7 +1565,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "lpaEIAOS") && (
|
{hasOwn(repFormData, "lpaEIAOS") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1609,7 +1608,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.lpaEIAOSEvidence,
|
__html: repFormData.lpaEIAOSEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -1636,7 +1635,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "advertismentConsentDiscontinuanceNotice") && (
|
{hasOwn(repFormData, "advertismentConsentDiscontinuanceNotice") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1681,7 +1680,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.advertismentConsentDiscontinuanceNoticeEvidence,
|
__html: repFormData.advertismentConsentDiscontinuanceNoticeEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -1708,7 +1707,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "detailsOfOtherAppeals") && (
|
{hasOwn(repFormData, "detailsOfOtherAppeals") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1751,7 +1750,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.detailsOfOtherAppeals,
|
__html: repFormData.detailsOfOtherAppeals
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -1778,7 +1777,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "detailsOfPreviousAppeals") && (
|
{hasOwn(repFormData, "detailsOfPreviousAppeals") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1821,7 +1820,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.detailsOfPreviousAppealsEvidence,
|
__html: repFormData.detailsOfPreviousAppealsEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -1848,7 +1847,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "otherRelevantInformation") && (
|
{hasOwn(repFormData, "otherRelevantInformation") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1891,7 +1890,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
<div
|
<div
|
||||||
className="govuk-summary-list-check-ellipsis"
|
className="govuk-summary-list-check-ellipsis"
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: repFormData.otherRelevantInformationEvidence,
|
__html: repFormData.otherRelevantInformationEvidence
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</dd>
|
</dd>
|
||||||
@@ -1918,7 +1917,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "signedDate") && (
|
{hasOwn(repFormData, "signedDate") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1950,7 +1949,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "caseOfficer") && (
|
{hasOwn(repFormData, "caseOfficer") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
@@ -1983,7 +1982,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{_.has(repFormData, "onBehalfOfLPA") && (
|
{hasOwn(repFormData, "onBehalfOfLPA") && (
|
||||||
<>
|
<>
|
||||||
<div className="govuk-summary-list__row">
|
<div className="govuk-summary-list__row">
|
||||||
<dt className="govuk-summary-list__key">
|
<dt className="govuk-summary-list__key">
|
||||||
|
|||||||
+47
-47
@@ -32,7 +32,7 @@ import {
|
|||||||
|
|
||||||
import { signIn, useSession } from "next-auth/react";
|
import { signIn, useSession } from "next-auth/react";
|
||||||
import { destroyCookie, parseCookies, setCookie } from "nookies";
|
import { destroyCookie, parseCookies, setCookie } from "nookies";
|
||||||
import { getFormCollectionByID, getDetailsProxy } from "../utils";
|
import { getFormCollectionByID, getDetailsProxy, hasOwn } from "../utils";
|
||||||
import {
|
import {
|
||||||
getLivePublishedEvent,
|
getLivePublishedEvent,
|
||||||
isEventLiveNow
|
isEventLiveNow
|
||||||
@@ -639,7 +639,7 @@ const CaseSummary = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
{detailsObj.pinswg_agentcontactname !=
|
{detailsObj.pinswg_agentcontactname !=
|
||||||
null &&
|
null &&
|
||||||
(_.has(
|
(hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_agentcontactname"
|
"pinswg_agentcontactname"
|
||||||
) ? (
|
) ? (
|
||||||
@@ -650,7 +650,7 @@ const CaseSummary = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_agentcontactname"
|
"pinswg_agentcontactname"
|
||||||
)
|
)
|
||||||
@@ -694,103 +694,103 @@ const CaseSummary = (props) => {
|
|||||||
)[0]
|
)[0]
|
||||||
: ""
|
: ""
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddressline1
|
? detailsObj.pinswg_siteaddressline1
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addressline1"
|
"pinswg_addressline1"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_addressline1
|
? detailsObj.pinswg_addressline1
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline1 !=
|
detailsObj.pinswg_siteaddressline1 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addressline1"
|
"pinswg_addressline1"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_addressline1 !=
|
detailsObj.pinswg_addressline1 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline2"
|
"pinswg_siteaddressline2"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddressline2
|
? detailsObj.pinswg_siteaddressline2
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addressline2"
|
"pinswg_addressline2"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_addressline2
|
? detailsObj.pinswg_addressline2
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addressline2"
|
"pinswg_addressline2"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_addressline2 !=
|
detailsObj.pinswg_addressline2 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresstown"
|
"pinswg_siteaddresstown"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddresstown
|
? detailsObj.pinswg_siteaddresstown
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addresstown"
|
"pinswg_addresstown"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_addresstown
|
? detailsObj.pinswg_addresstown
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresstown"
|
"pinswg_siteaddresstown"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresstown !=
|
detailsObj.pinswg_siteaddresstown !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addresstown"
|
"pinswg_addresstown"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_addresstown !=
|
detailsObj.pinswg_addresstown !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresscounty"
|
"pinswg_siteaddresscounty"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddresscounty
|
? detailsObj.pinswg_siteaddresscounty
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addresscounty"
|
"pinswg_addresscounty"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_addresscounty
|
? detailsObj.pinswg_addresscounty
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresscounty"
|
"pinswg_siteaddresscounty"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresscounty !=
|
detailsObj.pinswg_siteaddresscounty !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addresscounty"
|
"pinswg_addresscounty"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_addresscounty !=
|
detailsObj.pinswg_addresscounty !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresspostcode"
|
"pinswg_siteaddresspostcode"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddresspostcode
|
? detailsObj.pinswg_siteaddresspostcode
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_postcode"
|
"pinswg_postcode"
|
||||||
)
|
)
|
||||||
@@ -1444,7 +1444,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">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_startdate"
|
"pinswg_startdate"
|
||||||
) &&
|
) &&
|
||||||
@@ -1577,103 +1577,103 @@ const CaseSummary = (props) => {
|
|||||||
)[0]
|
)[0]
|
||||||
: ""
|
: ""
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddressline1
|
? detailsObj.pinswg_siteaddressline1
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addressline1"
|
"pinswg_addressline1"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_addressline1
|
? detailsObj.pinswg_addressline1
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline1 !=
|
detailsObj.pinswg_siteaddressline1 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addressline1"
|
"pinswg_addressline1"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_addressline1 !=
|
detailsObj.pinswg_addressline1 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline2"
|
"pinswg_siteaddressline2"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddressline2
|
? detailsObj.pinswg_siteaddressline2
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addressline2"
|
"pinswg_addressline2"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_addressline2
|
? detailsObj.pinswg_addressline2
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addressline2"
|
"pinswg_addressline2"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_addressline2 !=
|
detailsObj.pinswg_addressline2 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresstown"
|
"pinswg_siteaddresstown"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddresstown
|
? detailsObj.pinswg_siteaddresstown
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addresstown"
|
"pinswg_addresstown"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_addresstown
|
? detailsObj.pinswg_addresstown
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresstown"
|
"pinswg_siteaddresstown"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresstown !=
|
detailsObj.pinswg_siteaddresstown !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addresstown"
|
"pinswg_addresstown"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_addresstown !=
|
detailsObj.pinswg_addresstown !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresscounty"
|
"pinswg_siteaddresscounty"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddresscounty
|
? detailsObj.pinswg_siteaddresscounty
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addresscounty"
|
"pinswg_addresscounty"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_addresscounty
|
? detailsObj.pinswg_addresscounty
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresscounty"
|
"pinswg_siteaddresscounty"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresscounty !=
|
detailsObj.pinswg_siteaddresscounty !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addresscounty"
|
"pinswg_addresscounty"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_addresscounty !=
|
detailsObj.pinswg_addresscounty !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresspostcode"
|
"pinswg_siteaddresspostcode"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddresspostcode
|
? detailsObj.pinswg_siteaddresspostcode
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_postcode"
|
"pinswg_postcode"
|
||||||
)
|
)
|
||||||
@@ -1710,7 +1710,7 @@ const CaseSummary = (props) => {
|
|||||||
Screening start date
|
Screening start date
|
||||||
</dt>{" "}
|
</dt>{" "}
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_screeningstartdate"
|
"pinswg_screeningstartdate"
|
||||||
)
|
)
|
||||||
@@ -1733,7 +1733,7 @@ const CaseSummary = (props) => {
|
|||||||
EIA target date
|
EIA target date
|
||||||
</dt>{" "}
|
</dt>{" "}
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_eiatargetdate"
|
"pinswg_eiatargetdate"
|
||||||
)
|
)
|
||||||
@@ -1761,7 +1761,7 @@ const CaseSummary = (props) => {
|
|||||||
Target Extended
|
Target Extended
|
||||||
</dt>{" "}
|
</dt>{" "}
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_targetextended"
|
"pinswg_targetextended"
|
||||||
)
|
)
|
||||||
@@ -1786,7 +1786,7 @@ const CaseSummary = (props) => {
|
|||||||
Date
|
Date
|
||||||
</dt>{" "}
|
</dt>{" "}
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_directionissueddate"
|
"pinswg_directionissueddate"
|
||||||
)
|
)
|
||||||
@@ -1816,7 +1816,7 @@ const CaseSummary = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_eiarequired"
|
"pinswg_eiarequired"
|
||||||
)
|
)
|
||||||
@@ -1852,7 +1852,7 @@ const CaseSummary = (props) => {
|
|||||||
Scoping Start Date
|
Scoping Start Date
|
||||||
</dt>{" "}
|
</dt>{" "}
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_scopingstartdate"
|
"pinswg_scopingstartdate"
|
||||||
)
|
)
|
||||||
@@ -1875,7 +1875,7 @@ const CaseSummary = (props) => {
|
|||||||
Scoping Target Date
|
Scoping Target Date
|
||||||
</dt>{" "}
|
</dt>{" "}
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_scopingtargetdate"
|
"pinswg_scopingtargetdate"
|
||||||
)
|
)
|
||||||
@@ -1903,7 +1903,7 @@ const CaseSummary = (props) => {
|
|||||||
Extended
|
Extended
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_scopingtargetextended"
|
"pinswg_scopingtargetextended"
|
||||||
)
|
)
|
||||||
@@ -1928,7 +1928,7 @@ const CaseSummary = (props) => {
|
|||||||
Issued Date
|
Issued Date
|
||||||
</dt>{" "}
|
</dt>{" "}
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_scopingoutcomeissueddate"
|
"pinswg_scopingoutcomeissueddate"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_advertsid = (props) => {
|
const Pinswg_advertsid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -192,7 +193,7 @@ const Pinswg_advertsid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -231,7 +232,7 @@ const Pinswg_advertsid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -239,7 +240,7 @@ const Pinswg_advertsid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -256,7 +257,7 @@ const Pinswg_advertsid = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -275,7 +276,7 @@ const Pinswg_advertsid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -288,7 +289,7 @@ const Pinswg_advertsid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -308,7 +309,7 @@ const Pinswg_advertsid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -325,7 +326,7 @@ const Pinswg_advertsid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateoftheevent")
|
hasOwn(detailsObj, "pinswg_startdateoftheevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateoftheevent
|
detailsObj.pinswg_startdateoftheevent
|
||||||
)
|
)
|
||||||
@@ -341,7 +342,7 @@ const Pinswg_advertsid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_callinss77id = (props) => {
|
const Pinswg_callinss77id = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +171,7 @@ const Pinswg_callinss77id = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -209,7 +210,7 @@ const Pinswg_callinss77id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -217,7 +218,7 @@ const Pinswg_callinss77id = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -233,7 +234,7 @@ const Pinswg_callinss77id = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -253,7 +254,7 @@ const Pinswg_callinss77id = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateexportedtoiss"
|
"pinswg_dateexportedtoiss"
|
||||||
)
|
)
|
||||||
@@ -275,7 +276,7 @@ const Pinswg_callinss77id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementsduedate")
|
hasOwn(detailsObj, "pinswg_statementsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementsduedate
|
detailsObj.pinswg_statementsduedate
|
||||||
)
|
)
|
||||||
@@ -293,7 +294,7 @@ const Pinswg_callinss77id = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -306,7 +307,7 @@ const Pinswg_callinss77id = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -327,7 +328,7 @@ const Pinswg_callinss77id = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -347,7 +348,7 @@ const Pinswg_callinss77id = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -368,7 +369,7 @@ const Pinswg_callinss77id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -384,7 +385,7 @@ const Pinswg_callinss77id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateofevent")
|
hasOwn(detailsObj, "pinswg_startdateofevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateofevent
|
detailsObj.pinswg_startdateofevent
|
||||||
)
|
)
|
||||||
@@ -400,7 +401,7 @@ const Pinswg_callinss77id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_commonlandid = (props) => {
|
const Pinswg_commonlandid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +171,7 @@ const Pinswg_commonlandid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -234,7 +235,7 @@ const Pinswg_commonlandid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -242,7 +243,7 @@ const Pinswg_commonlandid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -259,7 +260,7 @@ const Pinswg_commonlandid = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -276,7 +277,7 @@ const Pinswg_commonlandid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementsduedate")
|
hasOwn(detailsObj, "pinswg_statementsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementsduedate
|
detailsObj.pinswg_statementsduedate
|
||||||
)
|
)
|
||||||
@@ -295,7 +296,7 @@ const Pinswg_commonlandid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -308,7 +309,7 @@ const Pinswg_commonlandid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -330,7 +331,7 @@ const Pinswg_commonlandid = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -350,7 +351,7 @@ const Pinswg_commonlandid = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -371,7 +372,7 @@ const Pinswg_commonlandid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -388,7 +389,7 @@ const Pinswg_commonlandid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_starttimeoftheevent")
|
hasOwn(detailsObj, "pinswg_starttimeoftheevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_starttimeoftheevent
|
detailsObj.pinswg_starttimeoftheevent
|
||||||
)
|
)
|
||||||
@@ -404,7 +405,7 @@ const Pinswg_commonlandid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_communityinfrastructurelevyid = (props) => {
|
const Pinswg_communityinfrastructurelevyid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +171,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -209,7 +210,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -217,7 +218,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -233,7 +234,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -246,7 +247,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -268,7 +269,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -285,7 +286,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -302,7 +303,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateoftheevent")
|
hasOwn(detailsObj, "pinswg_startdateoftheevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateoftheevent
|
detailsObj.pinswg_startdateoftheevent
|
||||||
)
|
)
|
||||||
@@ -318,7 +319,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { useRouter } from "next/router";
|
|||||||
import transLookup from "../../../data/lookuptranslations.json";
|
import transLookup from "../../../data/lookuptranslations.json";
|
||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_compulsorypurchaseordersid = (props) => {
|
const Pinswg_compulsorypurchaseordersid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -155,7 +156,9 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, [
|
||||||
|
"numberofchildincidents"
|
||||||
|
])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -219,7 +222,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -227,7 +230,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -244,7 +247,10 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(
|
||||||
|
detailsObj,
|
||||||
|
"pinswg_questionnaireduedate"
|
||||||
|
)
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -261,7 +267,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -280,7 +286,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -293,7 +299,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -315,7 +321,10 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(
|
||||||
|
detailsObj,
|
||||||
|
"pinswg_finalcommentsduedate"
|
||||||
|
)
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -335,7 +344,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -356,7 +365,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -373,7 +382,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateofevent")
|
hasOwn(detailsObj, "pinswg_startdateofevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateofevent
|
detailsObj.pinswg_startdateofevent
|
||||||
)
|
)
|
||||||
@@ -389,7 +398,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
import MapComponent from "../../mapping/";
|
import MapComponent from "../../mapping/";
|
||||||
|
|
||||||
@@ -243,7 +244,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
"case:summary-case-officer-label"
|
"case:summary-case-officer-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(casesObj, "_ownerid_value")
|
hasOwn(casesObj, "_ownerid_value")
|
||||||
? casesObj[
|
? casesObj[
|
||||||
"_ownerid_value@OData.Community.Display.V1.FormattedValue"
|
"_ownerid_value@OData.Community.Display.V1.FormattedValue"
|
||||||
]
|
]
|
||||||
@@ -276,7 +277,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
"case:summary-start-event-date-label"
|
"case:summary-start-event-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_startdateofevent"
|
"pinswg_startdateofevent"
|
||||||
)
|
)
|
||||||
@@ -299,7 +300,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
"case:summary-event-date-label"
|
"case:summary-event-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateeventrequested"
|
"pinswg_dateeventrequested"
|
||||||
)
|
)
|
||||||
@@ -355,7 +356,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
"case:summary-decision-date-label"
|
"case:summary-decision-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofdecision"
|
"pinswg_dateofdecision"
|
||||||
)
|
)
|
||||||
@@ -381,7 +382,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, [
|
{hasOwn(casesObj, [
|
||||||
"numberofchildincidents"
|
"numberofchildincidents"
|
||||||
])
|
])
|
||||||
? casesObj.numberofchildincidents >
|
? casesObj.numberofchildincidents >
|
||||||
@@ -447,7 +448,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
"case:summary-valid-notice-of-intention-to-submit-an-application"
|
"case:summary-valid-notice-of-intention-to-submit-an-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_validnoticeofintentiontosubmitanapplicati"
|
"pinswg_validnoticeofintentiontosubmitanapplicati"
|
||||||
)
|
)
|
||||||
@@ -470,7 +471,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
"case:summary-written-acceptance-of-notice"
|
"case:summary-written-acceptance-of-notice"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_writtenacceptanceofnotification"
|
"pinswg_writtenacceptanceofnotification"
|
||||||
)
|
)
|
||||||
@@ -493,7 +494,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
"case:summary-deadline-for-submission-of-application"
|
"case:summary-deadline-for-submission-of-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_deadlineforsubmissionofapplication"
|
"pinswg_deadlineforsubmissionofapplication"
|
||||||
)
|
)
|
||||||
@@ -516,7 +517,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
"case:summary-date-of-submission-of-application"
|
"case:summary-date-of-submission-of-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofsubmissionofapplication"
|
"pinswg_dateofsubmissionofapplication"
|
||||||
)
|
)
|
||||||
@@ -534,7 +535,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_applicationacceptedasvalid"
|
"pinswg_applicationacceptedasvalid"
|
||||||
) &&
|
) &&
|
||||||
@@ -558,7 +559,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_applicationrejectedasinvalid"
|
"pinswg_applicationrejectedasinvalid"
|
||||||
) &&
|
) &&
|
||||||
@@ -587,7 +588,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
"case:summary-end-of-representation-period"
|
"case:summary-end-of-representation-period"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_endofrepresentationperiod"
|
"pinswg_endofrepresentationperiod"
|
||||||
)
|
)
|
||||||
@@ -606,7 +607,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofrequesttovarytheapplication"
|
"pinswg_dateofrequesttovarytheapplication"
|
||||||
) &&
|
) &&
|
||||||
@@ -631,14 +632,14 @@ const Pinswg_dnsid = (props) => {
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_confirmrequesttovaryapplication"
|
"pinswg_confirmrequesttovaryapplication"
|
||||||
) &&
|
) &&
|
||||||
!_.isEmpty(
|
!_.isEmpty(
|
||||||
detailsObj.pinswg_confirmrequesttovaryapplication
|
detailsObj.pinswg_confirmrequesttovaryapplication
|
||||||
) &&
|
) &&
|
||||||
(_.has(
|
(hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_rejectrequesttovaryapplication"
|
"pinswg_rejectrequesttovaryapplication"
|
||||||
) &&
|
) &&
|
||||||
@@ -664,14 +665,14 @@ const Pinswg_dnsid = (props) => {
|
|||||||
) : (
|
) : (
|
||||||
""
|
""
|
||||||
))}
|
))}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_rejectrequesttovaryapplication"
|
"pinswg_rejectrequesttovaryapplication"
|
||||||
) &&
|
) &&
|
||||||
!_.isEmpty(
|
!_.isEmpty(
|
||||||
detailsObj.pinswg_rejectrequesttovaryapplication
|
detailsObj.pinswg_rejectrequesttovaryapplication
|
||||||
) &&
|
) &&
|
||||||
(_.has(
|
(hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_confirmrequesttovaryapplication"
|
"pinswg_confirmrequesttovaryapplication"
|
||||||
) &&
|
) &&
|
||||||
@@ -697,7 +698,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
) : (
|
) : (
|
||||||
""
|
""
|
||||||
))}
|
))}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensionstartdates"
|
"pinswg_suspensionstartdates"
|
||||||
) &&
|
) &&
|
||||||
@@ -727,7 +728,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
"case:summary-suspension-end-dates"
|
"case:summary-suspension-end-dates"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensionenddates"
|
"pinswg_suspensionenddates"
|
||||||
)
|
)
|
||||||
@@ -748,7 +749,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-report-due-by")}
|
label={t("case:summary-report-due-by")}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_reportdueby"
|
"pinswg_reportdueby"
|
||||||
)
|
)
|
||||||
@@ -769,7 +770,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
{/* <SummaryRow
|
{/* <SummaryRow
|
||||||
label={t("case:summary-suspension-dates")}
|
label={t("case:summary-suspension-dates")}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensiondates"
|
"pinswg_suspensiondates"
|
||||||
)
|
)
|
||||||
@@ -792,7 +793,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
"case:summary-inspector-report-submission-to-welsh-government"
|
"case:summary-inspector-report-submission-to-welsh-government"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_inspectorreportsubmittedtowelshgovernment"
|
"pinswg_inspectorreportsubmittedtowelshgovernment"
|
||||||
)
|
)
|
||||||
@@ -810,7 +811,7 @@ const Pinswg_dnsid = (props) => {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_withdrawndate"
|
"pinswg_withdrawndate"
|
||||||
) &&
|
) &&
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_electricityactid = (props) => {
|
const Pinswg_electricityactid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -133,7 +134,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
{" "}
|
{" "}
|
||||||
{/* {casesObj.caseDetails.caseOfficer ||
|
{/* {casesObj.caseDetails.caseOfficer ||
|
||||||
""} */}
|
""} */}
|
||||||
{_.has(casesObj, "_ownerid_value")
|
{hasOwn(casesObj, "_ownerid_value")
|
||||||
? casesObj[
|
? casesObj[
|
||||||
"_ownerid_value@OData.Community.Display.V1.FormattedValue"
|
"_ownerid_value@OData.Community.Display.V1.FormattedValue"
|
||||||
]
|
]
|
||||||
@@ -244,7 +245,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, [
|
{hasOwn(casesObj, [
|
||||||
"numberofchildincidents"
|
"numberofchildincidents"
|
||||||
])
|
])
|
||||||
? casesObj.numberofchildincidents >
|
? casesObj.numberofchildincidents >
|
||||||
@@ -336,7 +337,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-event-date-label"
|
"case:summary-event-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateeventrequested"
|
"pinswg_dateeventrequested"
|
||||||
)
|
)
|
||||||
@@ -359,7 +360,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-decision-date-label"
|
"case:summary-decision-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_casedecisiondate"
|
"pinswg_casedecisiondate"
|
||||||
)
|
)
|
||||||
@@ -383,7 +384,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-application-accepted-as-valid"
|
"case:summary-application-accepted-as-valid"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_applicationacceptedasvalid"
|
"pinswg_applicationacceptedasvalid"
|
||||||
)
|
)
|
||||||
@@ -406,7 +407,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-application-rejected-as-invalid"
|
"case:summary-application-rejected-as-invalid"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_applicationrejectedasinvalid"
|
"pinswg_applicationrejectedasinvalid"
|
||||||
)
|
)
|
||||||
@@ -429,7 +430,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-confirm-request-to-vary-application"
|
"case:summary-confirm-request-to-vary-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_confirmrequesttovaryapplication"
|
"pinswg_confirmrequesttovaryapplication"
|
||||||
)
|
)
|
||||||
@@ -452,7 +453,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-date-of-decisions"
|
"case:summary-date-of-decisions"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofdecision"
|
"pinswg_dateofdecision"
|
||||||
)
|
)
|
||||||
@@ -475,7 +476,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-date-of-request-to-vary"
|
"case:summary-date-of-request-to-vary"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofrequesttovarytheapplication"
|
"pinswg_dateofrequesttovarytheapplication"
|
||||||
)
|
)
|
||||||
@@ -498,7 +499,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-date-of-submission-of-application"
|
"case:summary-date-of-submission-of-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofsubmissionofapplication"
|
"pinswg_dateofsubmissionofapplication"
|
||||||
)
|
)
|
||||||
@@ -521,7 +522,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-date-project-published-to-website"
|
"case:summary-date-project-published-to-website"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateprojectpublishedonwebsite"
|
"pinswg_dateprojectpublishedonwebsite"
|
||||||
)
|
)
|
||||||
@@ -544,7 +545,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-deadline-for-submission-of-application"
|
"case:summary-deadline-for-submission-of-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_deadlineforsubmissionofapplication"
|
"pinswg_deadlineforsubmissionofapplication"
|
||||||
)
|
)
|
||||||
@@ -567,7 +568,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-end-of-representation-period"
|
"case:summary-end-of-representation-period"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_endofrepresentationperiod"
|
"pinswg_endofrepresentationperiod"
|
||||||
)
|
)
|
||||||
@@ -590,7 +591,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-inspector-report-submission-to-welsh-government"
|
"case:summary-inspector-report-submission-to-welsh-government"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_inspectorreportsubmittedtowelshgovernment"
|
"pinswg_inspectorreportsubmittedtowelshgovernment"
|
||||||
)
|
)
|
||||||
@@ -613,7 +614,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-procedure-confirmed"
|
"case:summary-procedure-confirmed"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_procedureconfirmed"
|
"pinswg_procedureconfirmed"
|
||||||
)
|
)
|
||||||
@@ -636,7 +637,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-reject-request-to-vary-application"
|
"case:summary-reject-request-to-vary-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_rejectrequesttovaryapplication"
|
"pinswg_rejectrequesttovaryapplication"
|
||||||
)
|
)
|
||||||
@@ -657,7 +658,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-report-due-by")}
|
label={t("case:summary-report-due-by")}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_reportdueby"
|
"pinswg_reportdueby"
|
||||||
)
|
)
|
||||||
@@ -680,7 +681,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-suspension-dates"
|
"case:summary-suspension-dates"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensiondates"
|
"pinswg_suspensiondates"
|
||||||
)
|
)
|
||||||
@@ -703,7 +704,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-suspension-end-dates"
|
"case:summary-suspension-end-dates"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensionenddates"
|
"pinswg_suspensionenddates"
|
||||||
)
|
)
|
||||||
@@ -726,7 +727,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-suspension-start-dates"
|
"case:summary-suspension-start-dates"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensionstartdates"
|
"pinswg_suspensionstartdates"
|
||||||
)
|
)
|
||||||
@@ -749,7 +750,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-valid-notice-of-intention-to-submit-an-application"
|
"case:summary-valid-notice-of-intention-to-submit-an-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_validnoticeofintentiontosubmitanapplicati"
|
"pinswg_validnoticeofintentiontosubmitanapplicati"
|
||||||
)
|
)
|
||||||
@@ -770,7 +771,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-withdrawn-date")}
|
label={t("case:summary-withdrawn-date")}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_withdrawndate"
|
"pinswg_withdrawndate"
|
||||||
)
|
)
|
||||||
@@ -793,7 +794,7 @@ const Pinswg_electricityactid = (props) => {
|
|||||||
"case:summary-written-acceptance-of-notice"
|
"case:summary-written-acceptance-of-notice"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_writtenacceptanceofnotification"
|
"pinswg_writtenacceptanceofnotification"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +171,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -209,7 +210,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -217,7 +218,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -234,7 +235,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -251,7 +252,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -270,7 +271,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -283,7 +284,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -305,7 +306,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -325,7 +326,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -346,7 +347,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -363,7 +364,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateofevent")
|
hasOwn(detailsObj, "pinswg_startdateofevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateofevent
|
detailsObj.pinswg_startdateofevent
|
||||||
)
|
)
|
||||||
@@ -379,7 +380,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_enforcementnoticeappeals174id = (props) => {
|
const Pinswg_enforcementnoticeappeals174id = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +171,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -209,7 +210,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -217,7 +218,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -234,7 +235,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -251,7 +252,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -270,7 +271,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -283,7 +284,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -305,7 +306,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -322,7 +323,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
|
|||||||
label={t(
|
label={t(
|
||||||
"case:summary-inquiry-evidence-date-label"
|
"case:summary-inquiry-evidence-date-label"
|
||||||
)}
|
)}
|
||||||
value={_.has(
|
value={hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -342,7 +343,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -359,7 +360,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateoftheevent")
|
hasOwn(detailsObj, "pinswg_startdateoftheevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateoftheevent
|
detailsObj.pinswg_startdateoftheevent
|
||||||
)
|
)
|
||||||
@@ -375,7 +376,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_environmentalpermittingid = (props) => {
|
const Pinswg_environmentalpermittingid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +171,7 @@ const Pinswg_environmentalpermittingid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -234,7 +235,7 @@ const Pinswg_environmentalpermittingid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -242,7 +243,7 @@ const Pinswg_environmentalpermittingid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -259,7 +260,7 @@ const Pinswg_environmentalpermittingid = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -276,7 +277,7 @@ const Pinswg_environmentalpermittingid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -295,7 +296,7 @@ const Pinswg_environmentalpermittingid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -308,7 +309,7 @@ const Pinswg_environmentalpermittingid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -330,7 +331,7 @@ const Pinswg_environmentalpermittingid = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -347,7 +348,7 @@ const Pinswg_environmentalpermittingid = (props) => {
|
|||||||
label={t(
|
label={t(
|
||||||
"case:summary-inquiry-evidence-date-label"
|
"case:summary-inquiry-evidence-date-label"
|
||||||
)}
|
)}
|
||||||
value={_.has(
|
value={hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -367,7 +368,7 @@ const Pinswg_environmentalpermittingid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -384,7 +385,7 @@ const Pinswg_environmentalpermittingid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateofevent")
|
hasOwn(detailsObj, "pinswg_startdateofevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateofevent
|
detailsObj.pinswg_startdateofevent
|
||||||
)
|
)
|
||||||
@@ -400,7 +401,7 @@ const Pinswg_environmentalpermittingid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_harbourrevisionorderid = (props) => {
|
const Pinswg_harbourrevisionorderid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -133,7 +134,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
{" "}
|
{" "}
|
||||||
{/* {casesObj.caseDetails.caseOfficer ||
|
{/* {casesObj.caseDetails.caseOfficer ||
|
||||||
""} */}
|
""} */}
|
||||||
{_.has(casesObj, "_ownerid_value")
|
{hasOwn(casesObj, "_ownerid_value")
|
||||||
? casesObj[
|
? casesObj[
|
||||||
"_ownerid_value@OData.Community.Display.V1.FormattedValue"
|
"_ownerid_value@OData.Community.Display.V1.FormattedValue"
|
||||||
]
|
]
|
||||||
@@ -223,7 +224,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, [
|
{hasOwn(casesObj, [
|
||||||
"numberofchildincidents"
|
"numberofchildincidents"
|
||||||
])
|
])
|
||||||
? casesObj.numberofchildincidents >
|
? casesObj.numberofchildincidents >
|
||||||
@@ -315,7 +316,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-event-date-label"
|
"case:summary-event-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateeventrequested"
|
"pinswg_dateeventrequested"
|
||||||
)
|
)
|
||||||
@@ -338,7 +339,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-decision-date-label"
|
"case:summary-decision-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_casedecisiondate"
|
"pinswg_casedecisiondate"
|
||||||
)
|
)
|
||||||
@@ -362,7 +363,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-application-accepted-as-valid"
|
"case:summary-application-accepted-as-valid"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_applicationacceptedasvalid"
|
"pinswg_applicationacceptedasvalid"
|
||||||
)
|
)
|
||||||
@@ -385,7 +386,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-application-rejected-as-invalid"
|
"case:summary-application-rejected-as-invalid"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_applicationrejectedasinvalid"
|
"pinswg_applicationrejectedasinvalid"
|
||||||
)
|
)
|
||||||
@@ -408,7 +409,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-confirm-request-to-vary-application"
|
"case:summary-confirm-request-to-vary-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_confirmrequesttovaryapplication"
|
"pinswg_confirmrequesttovaryapplication"
|
||||||
)
|
)
|
||||||
@@ -431,7 +432,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-date-of-decisions"
|
"case:summary-date-of-decisions"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofdecision"
|
"pinswg_dateofdecision"
|
||||||
)
|
)
|
||||||
@@ -454,7 +455,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-date-of-request-to-vary"
|
"case:summary-date-of-request-to-vary"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofrequesttovarytheapplication"
|
"pinswg_dateofrequesttovarytheapplication"
|
||||||
)
|
)
|
||||||
@@ -477,7 +478,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-date-of-submission-of-application"
|
"case:summary-date-of-submission-of-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofsubmissionofapplication"
|
"pinswg_dateofsubmissionofapplication"
|
||||||
)
|
)
|
||||||
@@ -500,7 +501,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-date-project-published-to-website"
|
"case:summary-date-project-published-to-website"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateprojectpublishedonwebsite"
|
"pinswg_dateprojectpublishedonwebsite"
|
||||||
)
|
)
|
||||||
@@ -523,7 +524,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-deadline-for-submission-of-application"
|
"case:summary-deadline-for-submission-of-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_deadlineforsubmissionofapplication"
|
"pinswg_deadlineforsubmissionofapplication"
|
||||||
)
|
)
|
||||||
@@ -546,7 +547,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-end-of-representation-period"
|
"case:summary-end-of-representation-period"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_endofrepresentationperiod"
|
"pinswg_endofrepresentationperiod"
|
||||||
)
|
)
|
||||||
@@ -569,7 +570,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-inspector-report-submission-to-welsh-government"
|
"case:summary-inspector-report-submission-to-welsh-government"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_inspectorreportsubmittedtowelshgovernment"
|
"pinswg_inspectorreportsubmittedtowelshgovernment"
|
||||||
)
|
)
|
||||||
@@ -592,7 +593,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-procedure-confirmed"
|
"case:summary-procedure-confirmed"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_procedureconfirmed"
|
"pinswg_procedureconfirmed"
|
||||||
)
|
)
|
||||||
@@ -615,7 +616,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-reject-request-to-vary-application"
|
"case:summary-reject-request-to-vary-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_rejectrequesttovaryapplication"
|
"pinswg_rejectrequesttovaryapplication"
|
||||||
)
|
)
|
||||||
@@ -636,7 +637,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-report-due-by")}
|
label={t("case:summary-report-due-by")}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_reportdueby"
|
"pinswg_reportdueby"
|
||||||
)
|
)
|
||||||
@@ -659,7 +660,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-suspension-dates"
|
"case:summary-suspension-dates"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensiondates"
|
"pinswg_suspensiondates"
|
||||||
)
|
)
|
||||||
@@ -682,7 +683,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-suspension-end-dates"
|
"case:summary-suspension-end-dates"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensionenddates"
|
"pinswg_suspensionenddates"
|
||||||
)
|
)
|
||||||
@@ -705,7 +706,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-suspension-start-dates"
|
"case:summary-suspension-start-dates"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensionstartdates"
|
"pinswg_suspensionstartdates"
|
||||||
)
|
)
|
||||||
@@ -728,7 +729,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-valid-notice-of-intention-to-submit-an-application"
|
"case:summary-valid-notice-of-intention-to-submit-an-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_validnoticeofintentiontosubmitanapplicati"
|
"pinswg_validnoticeofintentiontosubmitanapplicati"
|
||||||
)
|
)
|
||||||
@@ -749,7 +750,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-withdrawn-date")}
|
label={t("case:summary-withdrawn-date")}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_withdrawndate"
|
"pinswg_withdrawndate"
|
||||||
)
|
)
|
||||||
@@ -772,7 +773,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
|
|||||||
"case:summary-written-acceptance-of-notice"
|
"case:summary-written-acceptance-of-notice"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_writtenacceptanceofnotification"
|
"pinswg_writtenacceptanceofnotification"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -191,7 +192,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -255,7 +256,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -263,7 +264,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -280,7 +281,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -297,7 +298,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -316,7 +317,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -329,7 +330,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -351,7 +352,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -368,7 +369,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
|||||||
label={t(
|
label={t(
|
||||||
"case:summary-inquiry-evidence-date-label"
|
"case:summary-inquiry-evidence-date-label"
|
||||||
)}
|
)}
|
||||||
value={_.has(
|
value={hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -388,7 +389,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -405,7 +406,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateoftheevent")
|
hasOwn(detailsObj, "pinswg_startdateoftheevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateoftheevent
|
detailsObj.pinswg_startdateoftheevent
|
||||||
)
|
)
|
||||||
@@ -421,7 +422,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_householderappealhasid = (props) => {
|
const Pinswg_householderappealhasid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -151,7 +152,7 @@ const Pinswg_householderappealhasid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -190,7 +191,7 @@ const Pinswg_householderappealhasid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -198,7 +199,7 @@ const Pinswg_householderappealhasid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -215,7 +216,7 @@ const Pinswg_householderappealhasid = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -232,7 +233,7 @@ const Pinswg_householderappealhasid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -251,7 +252,7 @@ const Pinswg_householderappealhasid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_otherpartiesstmt")
|
hasOwn(detailsObj, "pinswg_otherpartiesstmt")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_otherpartiesstmt
|
detailsObj.pinswg_otherpartiesstmt
|
||||||
)
|
)
|
||||||
@@ -261,7 +262,7 @@ const Pinswg_householderappealhasid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstmt"
|
"pinswg_otherpartiesstmt"
|
||||||
)
|
)
|
||||||
@@ -280,7 +281,7 @@ const Pinswg_householderappealhasid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -297,7 +298,7 @@ const Pinswg_householderappealhasid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateofevent")
|
hasOwn(detailsObj, "pinswg_startdateofevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateofevent
|
detailsObj.pinswg_startdateofevent
|
||||||
)
|
)
|
||||||
@@ -313,7 +314,7 @@ const Pinswg_householderappealhasid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +171,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -209,7 +210,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -217,7 +218,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -234,7 +235,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -251,7 +252,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -270,7 +271,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -283,7 +284,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -305,7 +306,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -322,7 +323,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
|||||||
label={t(
|
label={t(
|
||||||
"case:summary-inquiry-evidence-date-label"
|
"case:summary-inquiry-evidence-date-label"
|
||||||
)}
|
)}
|
||||||
value={_.has(
|
value={hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -342,7 +343,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -359,7 +360,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateoftheevent")
|
hasOwn(detailsObj, "pinswg_startdateoftheevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateoftheevent
|
detailsObj.pinswg_startdateoftheevent
|
||||||
)
|
)
|
||||||
@@ -375,7 +376,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_ldpid = (props) => {
|
const Pinswg_ldpid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -153,7 +154,7 @@ const Pinswg_ldpid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -192,7 +193,7 @@ const Pinswg_ldpid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -200,7 +201,7 @@ const Pinswg_ldpid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -217,7 +218,7 @@ const Pinswg_ldpid = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -234,7 +235,7 @@ const Pinswg_ldpid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -253,7 +254,7 @@ const Pinswg_ldpid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -266,7 +267,7 @@ const Pinswg_ldpid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -288,7 +289,7 @@ const Pinswg_ldpid = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -305,7 +306,7 @@ const Pinswg_ldpid = (props) => {
|
|||||||
label={t(
|
label={t(
|
||||||
"case:summary-inquiry-evidence-date-label"
|
"case:summary-inquiry-evidence-date-label"
|
||||||
)}
|
)}
|
||||||
value={_.has(
|
value={hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -325,7 +326,7 @@ const Pinswg_ldpid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -342,7 +343,7 @@ const Pinswg_ldpid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateofevent")
|
hasOwn(detailsObj, "pinswg_startdateofevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateofevent
|
detailsObj.pinswg_startdateofevent
|
||||||
)
|
)
|
||||||
@@ -358,7 +359,7 @@ const Pinswg_ldpid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_listedbuildingandconservationrid = (props) => {
|
const Pinswg_listedbuildingandconservationrid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +171,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -209,7 +210,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -217,7 +218,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -234,7 +235,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -251,7 +252,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -270,7 +271,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -283,7 +284,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -305,7 +306,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -322,7 +323,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
|
|||||||
label={t(
|
label={t(
|
||||||
"case:summary-inquiry-evidence-date-label"
|
"case:summary-inquiry-evidence-date-label"
|
||||||
)}
|
)}
|
||||||
value={_.has(
|
value={hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -342,7 +343,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -359,7 +360,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_starttimeofevent")
|
hasOwn(detailsObj, "pinswg_starttimeofevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_starttimeofevent
|
detailsObj.pinswg_starttimeofevent
|
||||||
)
|
)
|
||||||
@@ -375,7 +376,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_maintenanceoflands217id = (props) => {
|
const Pinswg_maintenanceoflands217id = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +171,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -209,7 +210,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -217,7 +218,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -234,7 +235,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -251,7 +252,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -270,7 +271,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -283,7 +284,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -305,7 +306,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -322,7 +323,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
|
|||||||
label={t(
|
label={t(
|
||||||
"case:summary-inquiry-evidence-date-label"
|
"case:summary-inquiry-evidence-date-label"
|
||||||
)}
|
)}
|
||||||
value={_.has(
|
value={hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -342,7 +343,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -359,7 +360,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateofevent")
|
hasOwn(detailsObj, "pinswg_startdateofevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateofevent
|
detailsObj.pinswg_startdateofevent
|
||||||
)
|
)
|
||||||
@@ -375,7 +376,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_miscellaneouscasewordid = (props) => {
|
const Pinswg_miscellaneouscasewordid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +171,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -234,7 +235,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -242,7 +243,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -259,7 +260,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -276,7 +277,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -295,7 +296,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -308,7 +309,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -330,7 +331,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -347,7 +348,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
|
|||||||
label={t(
|
label={t(
|
||||||
"case:summary-inquiry-evidence-date-label"
|
"case:summary-inquiry-evidence-date-label"
|
||||||
)}
|
)}
|
||||||
value={_.has(
|
value={hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -367,7 +368,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -384,7 +385,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateofevent")
|
hasOwn(detailsObj, "pinswg_startdateofevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateofevent
|
detailsObj.pinswg_startdateofevent
|
||||||
)
|
)
|
||||||
@@ -400,7 +401,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_nonvalidationid = (props) => {
|
const Pinswg_nonvalidationid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -120,7 +121,7 @@ const Pinswg_nonvalidationid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_validdate")
|
hasOwn(detailsObj, "pinswg_validdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_validdate)
|
? !_.isEmpty(detailsObj.pinswg_validdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_validdate
|
detailsObj.pinswg_validdate
|
||||||
@@ -128,7 +129,7 @@ const Pinswg_nonvalidationid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -143,7 +144,7 @@ const Pinswg_nonvalidationid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_decisionissueddate")
|
hasOwn(detailsObj, "pinswg_decisionissueddate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_decisionissueddate
|
detailsObj.pinswg_decisionissueddate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -5,7 +5,11 @@ import { useRouter } from "next/router";
|
|||||||
import transLookup from "../../../data/lookuptranslations.json";
|
import transLookup from "../../../data/lookuptranslations.json";
|
||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayValue, getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import {
|
||||||
|
getCaseLpaDisplayValue,
|
||||||
|
getCaseLpaDisplayLines
|
||||||
|
} from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_planningappeals78id = (props) => {
|
const Pinswg_planningappeals78id = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +174,7 @@ const Pinswg_planningappeals78id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
@@ -189,7 +193,9 @@ const Pinswg_planningappeals78id = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, [
|
||||||
|
"numberofchildincidents"
|
||||||
|
])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -228,7 +234,7 @@ const Pinswg_planningappeals78id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -236,7 +242,7 @@ const Pinswg_planningappeals78id = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -253,7 +259,10 @@ const Pinswg_planningappeals78id = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(
|
||||||
|
detailsObj,
|
||||||
|
"pinswg_questionnaireduedate"
|
||||||
|
)
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -272,7 +281,7 @@ const Pinswg_planningappeals78id = (props) => {
|
|||||||
"case:summary-statement-interested-party-due-date-label"
|
"case:summary-statement-interested-party-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -291,7 +300,7 @@ const Pinswg_planningappeals78id = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -304,7 +313,7 @@ const Pinswg_planningappeals78id = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -326,7 +335,10 @@ const Pinswg_planningappeals78id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-final-comments-date-label")}
|
label={t("case:summary-final-comments-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(
|
||||||
|
detailsObj,
|
||||||
|
"pinswg_finalcommentsduedate"
|
||||||
|
)
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -344,7 +356,7 @@ const Pinswg_planningappeals78id = (props) => {
|
|||||||
"case:summary-inquiry-evidence-date-label"
|
"case:summary-inquiry-evidence-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -365,7 +377,7 @@ const Pinswg_planningappeals78id = (props) => {
|
|||||||
{/* <SummaryRow
|
{/* <SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateeventrequested"
|
"pinswg_dateeventrequested"
|
||||||
)
|
)
|
||||||
@@ -387,7 +399,7 @@ const Pinswg_planningappeals78id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_startdatetimeiftheevent"
|
"pinswg_startdatetimeiftheevent"
|
||||||
)
|
)
|
||||||
@@ -410,7 +422,7 @@ const Pinswg_planningappeals78id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-time-label")}
|
label={t("case:summary-start-event-time-label")}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_startdatetimeiftheevent"
|
"pinswg_startdatetimeiftheevent"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_planningconditionss73s79id = (props) => {
|
const Pinswg_planningconditionss73s79id = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +171,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -209,7 +210,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -217,7 +218,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -234,7 +235,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -251,7 +252,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -270,7 +271,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -283,7 +284,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -305,7 +306,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -323,7 +324,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
|
|||||||
"case:summary-inquiry-evidence-date-label"
|
"case:summary-inquiry-evidence-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -344,7 +345,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -361,7 +362,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateofevent")
|
hasOwn(detailsObj, "pinswg_startdateofevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateofevent
|
detailsObj.pinswg_startdateofevent
|
||||||
)
|
)
|
||||||
@@ -377,7 +378,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_planningobligationappeals106id = (props) => {
|
const Pinswg_planningobligationappeals106id = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +171,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -209,7 +210,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -217,7 +218,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -234,7 +235,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -251,7 +252,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -270,7 +271,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -283,7 +284,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -305,7 +306,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -322,7 +323,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
|
|||||||
label={t(
|
label={t(
|
||||||
"case:summary-inquiry-evidence-date-label"
|
"case:summary-inquiry-evidence-date-label"
|
||||||
)}
|
)}
|
||||||
value={_.has(
|
value={hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -342,7 +343,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -359,7 +360,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateoftheevent")
|
hasOwn(detailsObj, "pinswg_startdateoftheevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateoftheevent
|
detailsObj.pinswg_startdateoftheevent
|
||||||
)
|
)
|
||||||
@@ -375,7 +376,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_rowid = (props) => {
|
const Pinswg_rowid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -191,7 +192,7 @@ const Pinswg_rowid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -255,7 +256,7 @@ const Pinswg_rowid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -263,7 +264,7 @@ const Pinswg_rowid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -280,7 +281,7 @@ const Pinswg_rowid = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -297,7 +298,7 @@ const Pinswg_rowid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -316,7 +317,7 @@ const Pinswg_rowid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -329,7 +330,7 @@ const Pinswg_rowid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -351,7 +352,7 @@ const Pinswg_rowid = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -368,7 +369,7 @@ const Pinswg_rowid = (props) => {
|
|||||||
label={t(
|
label={t(
|
||||||
"case:summary-inquiry-evidence-date-label"
|
"case:summary-inquiry-evidence-date-label"
|
||||||
)}
|
)}
|
||||||
value={_.has(
|
value={hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -388,7 +389,7 @@ const Pinswg_rowid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -405,7 +406,7 @@ const Pinswg_rowid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateoftheevent")
|
hasOwn(detailsObj, "pinswg_startdateoftheevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateoftheevent
|
detailsObj.pinswg_startdateoftheevent
|
||||||
)
|
)
|
||||||
@@ -421,7 +422,7 @@ const Pinswg_rowid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
import MapComponent from "../../mapping";
|
import MapComponent from "../../mapping";
|
||||||
|
|
||||||
@@ -315,7 +316,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
"case:summary-case-officer-label"
|
"case:summary-case-officer-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(casesObj, "_ownerid_value")
|
hasOwn(casesObj, "_ownerid_value")
|
||||||
? casesObj[
|
? casesObj[
|
||||||
"_ownerid_value@OData.Community.Display.V1.FormattedValue"
|
"_ownerid_value@OData.Community.Display.V1.FormattedValue"
|
||||||
]
|
]
|
||||||
@@ -349,7 +350,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_startdateofevent"
|
"pinswg_startdateofevent"
|
||||||
)
|
)
|
||||||
@@ -375,7 +376,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateeventrequested"
|
"pinswg_dateeventrequested"
|
||||||
)
|
)
|
||||||
@@ -431,7 +432,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
"case:summary-decision-date-label"
|
"case:summary-decision-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofdecision"
|
"pinswg_dateofdecision"
|
||||||
)
|
)
|
||||||
@@ -457,7 +458,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
)}
|
)}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, [
|
{hasOwn(casesObj, [
|
||||||
"numberofchildincidents"
|
"numberofchildincidents"
|
||||||
])
|
])
|
||||||
? casesObj.numberofchildincidents >
|
? casesObj.numberofchildincidents >
|
||||||
@@ -570,7 +571,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
"case:summary-valid-notice-of-intention-to-submit-an-application"
|
"case:summary-valid-notice-of-intention-to-submit-an-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_validnoticeofintentiontosubmit"
|
"pinswg_validnoticeofintentiontosubmit"
|
||||||
)
|
)
|
||||||
@@ -593,7 +594,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
"case:summary-written-acceptance-of-notice"
|
"case:summary-written-acceptance-of-notice"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_writtenacceptanceofnotification"
|
"pinswg_writtenacceptanceofnotification"
|
||||||
)
|
)
|
||||||
@@ -616,7 +617,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
"case:summary-deadline-for-submission-of-application"
|
"case:summary-deadline-for-submission-of-application"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_deadlineforsubmissionofapplication"
|
"pinswg_deadlineforsubmissionofapplication"
|
||||||
)
|
)
|
||||||
@@ -665,7 +666,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
"case:summary-validation-deadline-extension"
|
"case:summary-validation-deadline-extension"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_validationdeadlineextension"
|
"pinswg_validationdeadlineextension"
|
||||||
)
|
)
|
||||||
@@ -693,7 +694,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
"case:summary-case-suspension-start-date"
|
"case:summary-case-suspension-start-date"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_casesuspensionstartdate"
|
"pinswg_casesuspensionstartdate"
|
||||||
)
|
)
|
||||||
@@ -721,7 +722,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
"case:summary-case-suspension-end-date"
|
"case:summary-case-suspension-end-date"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_casesuspensionenddate"
|
"pinswg_casesuspensionenddate"
|
||||||
)
|
)
|
||||||
@@ -772,7 +773,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
"case:summary-report-issued-to-welsh-ministers"
|
"case:summary-report-issued-to-welsh-ministers"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_reportissuedtowelshministers"
|
"pinswg_reportissuedtowelshministers"
|
||||||
)
|
)
|
||||||
@@ -800,7 +801,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
"case:summary-decision-issued-to-applicant"
|
"case:summary-decision-issued-to-applicant"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_decisionissuedtoapplicant"
|
"pinswg_decisionissuedtoapplicant"
|
||||||
)
|
)
|
||||||
@@ -828,7 +829,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
"case:summary-decision-outcome"
|
"case:summary-decision-outcome"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_decisionoutcome"
|
"pinswg_decisionoutcome"
|
||||||
)
|
)
|
||||||
@@ -872,7 +873,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
"case:summary-post-decision-redetermination-label"
|
"case:summary-post-decision-redetermination-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_redetermination@OData.Community.Display.V1.FormattedValue"
|
"pinswg_redetermination@OData.Community.Display.V1.FormattedValue"
|
||||||
)
|
)
|
||||||
@@ -902,7 +903,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
"case:summary-post-decision-redetermination-deadline-label"
|
"case:summary-post-decision-redetermination-deadline-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_redeterminationconsultationdeadline"
|
"pinswg_redeterminationconsultationdeadline"
|
||||||
)
|
)
|
||||||
@@ -937,7 +938,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_screeningstartdate"
|
"pinswg_screeningstartdate"
|
||||||
)
|
)
|
||||||
@@ -963,7 +964,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_eiatargetdate"
|
"pinswg_eiatargetdate"
|
||||||
)
|
)
|
||||||
@@ -994,7 +995,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_targetextended"
|
"pinswg_targetextended"
|
||||||
)
|
)
|
||||||
@@ -1021,7 +1022,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_directionissueddate"
|
"pinswg_directionissueddate"
|
||||||
)
|
)
|
||||||
@@ -1054,7 +1055,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_eiarequired"
|
"pinswg_eiarequired"
|
||||||
)
|
)
|
||||||
@@ -1089,7 +1090,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_scopingstartdate"
|
"pinswg_scopingstartdate"
|
||||||
)
|
)
|
||||||
@@ -1115,7 +1116,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_scopingtargetdate"
|
"pinswg_scopingtargetdate"
|
||||||
)
|
)
|
||||||
@@ -1145,7 +1146,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_scopingtargetextended"
|
"pinswg_scopingtargetextended"
|
||||||
)
|
)
|
||||||
@@ -1172,7 +1173,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_scopingoutcomeissueddate"
|
"pinswg_scopingoutcomeissueddate"
|
||||||
)
|
)
|
||||||
@@ -1203,7 +1204,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofsubmissionofapplication"
|
"pinswg_dateofsubmissionofapplication"
|
||||||
)
|
)
|
||||||
@@ -1223,7 +1224,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_applicationacceptedasvalid"
|
"pinswg_applicationacceptedasvalid"
|
||||||
) &&
|
) &&
|
||||||
@@ -1252,7 +1253,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_applicationrejectedasinvalid"
|
"pinswg_applicationrejectedasinvalid"
|
||||||
) &&
|
) &&
|
||||||
@@ -1289,7 +1290,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_endofrepresentationperiod"
|
"pinswg_endofrepresentationperiod"
|
||||||
)
|
)
|
||||||
@@ -1310,7 +1311,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofrequesttovarytheapplication"
|
"pinswg_dateofrequesttovarytheapplication"
|
||||||
) &&
|
) &&
|
||||||
@@ -1340,14 +1341,14 @@ const Pinswg_sipscase = (props) => {
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_confirmrequesttovaryapplication"
|
"pinswg_confirmrequesttovaryapplication"
|
||||||
) &&
|
) &&
|
||||||
!_.isEmpty(
|
!_.isEmpty(
|
||||||
detailsObj.pinswg_confirmrequesttovaryapplication
|
detailsObj.pinswg_confirmrequesttovaryapplication
|
||||||
) &&
|
) &&
|
||||||
(_.has(
|
(hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_rejectrequesttovaryapplication"
|
"pinswg_rejectrequesttovaryapplication"
|
||||||
) &&
|
) &&
|
||||||
@@ -1378,14 +1379,14 @@ const Pinswg_sipscase = (props) => {
|
|||||||
) : (
|
) : (
|
||||||
""
|
""
|
||||||
))}
|
))}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_rejectrequesttovaryapplication"
|
"pinswg_rejectrequesttovaryapplication"
|
||||||
) &&
|
) &&
|
||||||
!_.isEmpty(
|
!_.isEmpty(
|
||||||
detailsObj.pinswg_rejectrequesttovaryapplication
|
detailsObj.pinswg_rejectrequesttovaryapplication
|
||||||
) &&
|
) &&
|
||||||
(_.has(
|
(hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_confirmrequesttovaryapplication"
|
"pinswg_confirmrequesttovaryapplication"
|
||||||
) &&
|
) &&
|
||||||
@@ -1416,7 +1417,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
) : (
|
) : (
|
||||||
""
|
""
|
||||||
))}
|
))}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensionstartdates"
|
"pinswg_suspensionstartdates"
|
||||||
) &&
|
) &&
|
||||||
@@ -1457,7 +1458,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
value={
|
value={
|
||||||
|
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensionenddates"
|
"pinswg_suspensionenddates"
|
||||||
)
|
)
|
||||||
@@ -1485,7 +1486,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_reportdueby"
|
"pinswg_reportdueby"
|
||||||
)
|
)
|
||||||
@@ -1511,7 +1512,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensiondates"
|
"pinswg_suspensiondates"
|
||||||
)
|
)
|
||||||
@@ -1539,7 +1540,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_inspectorreportsubmittedtowelshgovernment"
|
"pinswg_inspectorreportsubmittedtowelshgovernment"
|
||||||
)
|
)
|
||||||
@@ -1559,7 +1560,7 @@ const Pinswg_sipscase = (props) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_withdrawndate"
|
"pinswg_withdrawndate"
|
||||||
) &&
|
) &&
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { useRouter } from "next/router";
|
|||||||
import transLookup from "../../../data/lookuptranslations.json";
|
import transLookup from "../../../data/lookuptranslations.json";
|
||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_transportandworkactid = (props) => {
|
const Pinswg_transportandworkactid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -62,11 +63,10 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
|
|
||||||
<dl className="govuk-summary-list govuk-!-font-size-16 govuk-!-margin-bottom-9">
|
<dl className="govuk-summary-list govuk-!-font-size-16 govuk-!-margin-bottom-9">
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
label={t(
|
||||||
label={t("case:summary-case-type-label")}
|
"case:summary-case-type-label"
|
||||||
|
)}
|
||||||
value={
|
value={
|
||||||
|
|
||||||
router.locale == "cy"
|
router.locale == "cy"
|
||||||
? jsonpath({
|
? jsonpath({
|
||||||
path:
|
path:
|
||||||
@@ -76,7 +76,7 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
] +
|
] +
|
||||||
'")].value_cy',
|
'")].value_cy',
|
||||||
json: transLookup,
|
json: transLookup,
|
||||||
eval: true,
|
eval: true
|
||||||
})
|
})
|
||||||
: casesObj[
|
: casesObj[
|
||||||
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
|
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
|
||||||
@@ -84,18 +84,13 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
t(
|
t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-eia-required-label"
|
"case:summary-eia-required-label"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
router.locale == "cy"
|
router.locale == "cy"
|
||||||
? jsonpath(
|
? jsonpath(
|
||||||
'$..[?(@.value=="' +
|
'$..[?(@.value=="' +
|
||||||
@@ -111,22 +106,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
t(
|
t(
|
||||||
"case:summary-to-be-confirmed-label"
|
"case:summary-to-be-confirmed-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-case-recommendation-label"
|
"case:summary-case-recommendation-label"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
|
|
||||||
router.locale == "cy"
|
router.locale == "cy"
|
||||||
? jsonpath({
|
? jsonpath({
|
||||||
path:
|
path:
|
||||||
@@ -134,27 +121,20 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
detailsObj.pinswg_recommendation +
|
detailsObj.pinswg_recommendation +
|
||||||
'")].value_cy',
|
'")].value_cy',
|
||||||
json: transLookup,
|
json: transLookup,
|
||||||
eval: true,
|
eval: true
|
||||||
})
|
})
|
||||||
: detailsObj.pinswg_recommendation ||
|
: detailsObj.pinswg_recommendation ||
|
||||||
t(
|
t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/>
|
/>
|
||||||
{detailsObj.pinswg_webaddress != null && (
|
{detailsObj.pinswg_webaddress != null && (
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-case-website-label"
|
"case:summary-case-website-label"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
|
||||||
router.locale == "cy"
|
router.locale == "cy"
|
||||||
? jsonpath({
|
? jsonpath({
|
||||||
path:
|
path:
|
||||||
@@ -162,15 +142,13 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
detailsObj.pinswg_webaddress +
|
detailsObj.pinswg_webaddress +
|
||||||
'")].value_cy',
|
'")].value_cy',
|
||||||
json: transLookup,
|
json: transLookup,
|
||||||
eval: true,
|
eval: true
|
||||||
})
|
})
|
||||||
: detailsObj.pinswg_webaddress ||
|
: detailsObj.pinswg_webaddress ||
|
||||||
t(
|
t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</dl>
|
</dl>
|
||||||
@@ -185,12 +163,11 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
</h3>
|
</h3>
|
||||||
<dl className="govuk-summary-list govuk-!-font-size-16 govuk-!-margin-bottom-9">
|
<dl className="govuk-summary-list govuk-!-font-size-16 govuk-!-margin-bottom-9">
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
label={t(
|
||||||
label={t("case:summary-event-date-label")}
|
"case:summary-event-date-label"
|
||||||
|
)}
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateeventrequested"
|
"pinswg_dateeventrequested"
|
||||||
)
|
)
|
||||||
@@ -206,19 +183,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-decision-date-label"
|
"case:summary-decision-date-label"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_casedecisiondate"
|
"pinswg_casedecisiondate"
|
||||||
)
|
)
|
||||||
@@ -234,23 +206,15 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-application-accepted-as-valid"
|
"case:summary-application-accepted-as-valid"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
|
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_applicationacceptedasvalid"
|
"pinswg_applicationacceptedasvalid"
|
||||||
)
|
)
|
||||||
@@ -266,21 +230,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-application-rejected-as-invalid"
|
"case:summary-application-rejected-as-invalid"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_applicationrejectedasinvalid"
|
"pinswg_applicationrejectedasinvalid"
|
||||||
)
|
)
|
||||||
@@ -296,19 +253,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-confirm-request-to-vary-application"
|
"case:summary-confirm-request-to-vary-application"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_confirmrequesttovaryapplication"
|
"pinswg_confirmrequesttovaryapplication"
|
||||||
)
|
)
|
||||||
@@ -324,19 +276,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-date-of-decisions"
|
"case:summary-date-of-decisions"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofdecision"
|
"pinswg_dateofdecision"
|
||||||
)
|
)
|
||||||
@@ -352,19 +299,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-date-of-request-to-vary"
|
"case:summary-date-of-request-to-vary"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofrequesttovarytheapplication"
|
"pinswg_dateofrequesttovarytheapplication"
|
||||||
)
|
)
|
||||||
@@ -380,19 +322,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-date-of-submission-of-application"
|
"case:summary-date-of-submission-of-application"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateofsubmissionofapplication"
|
"pinswg_dateofsubmissionofapplication"
|
||||||
)
|
)
|
||||||
@@ -408,19 +345,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-date-project-published-to-website"
|
"case:summary-date-project-published-to-website"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_dateprojectpublishedonwebsite"
|
"pinswg_dateprojectpublishedonwebsite"
|
||||||
)
|
)
|
||||||
@@ -436,19 +368,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-deadline-for-submission-of-application"
|
"case:summary-deadline-for-submission-of-application"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_deadlineforsubmissionofapplication"
|
"pinswg_deadlineforsubmissionofapplication"
|
||||||
)
|
)
|
||||||
@@ -464,19 +391,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-end-of-representation-period"
|
"case:summary-end-of-representation-period"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_endofrepresentationperiod"
|
"pinswg_endofrepresentationperiod"
|
||||||
)
|
)
|
||||||
@@ -492,19 +414,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-inspector-report-submission-to-welsh-government"
|
"case:summary-inspector-report-submission-to-welsh-government"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_inspectorreportsubmittedtowelshgovernment"
|
"pinswg_inspectorreportsubmittedtowelshgovernment"
|
||||||
)
|
)
|
||||||
@@ -520,19 +437,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-procedure-confirmed"
|
"case:summary-procedure-confirmed"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_procedureconfirmed"
|
"pinswg_procedureconfirmed"
|
||||||
)
|
)
|
||||||
@@ -548,19 +460,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-reject-request-to-vary-application"
|
"case:summary-reject-request-to-vary-application"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_rejectrequesttovaryapplication"
|
"pinswg_rejectrequesttovaryapplication"
|
||||||
)
|
)
|
||||||
@@ -576,17 +483,12 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t("case:summary-report-due-by")}
|
label={t("case:summary-report-due-by")}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_reportdueby"
|
"pinswg_reportdueby"
|
||||||
)
|
)
|
||||||
@@ -602,17 +504,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
label={t(
|
||||||
label={t("case:summary-suspension-dates")}
|
"case:summary-suspension-dates"
|
||||||
|
)}
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensiondates"
|
"pinswg_suspensiondates"
|
||||||
)
|
)
|
||||||
@@ -628,19 +527,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-suspension-end-dates"
|
"case:summary-suspension-end-dates"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensionenddates"
|
"pinswg_suspensionenddates"
|
||||||
)
|
)
|
||||||
@@ -656,19 +550,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-suspension-start-dates"
|
"case:summary-suspension-start-dates"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_suspensionstartdates"
|
"pinswg_suspensionstartdates"
|
||||||
)
|
)
|
||||||
@@ -684,19 +573,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-valid-notice-of-intention-to-submit-an-application"
|
"case:summary-valid-notice-of-intention-to-submit-an-application"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_validnoticeofintentiontosubmitanapplicati"
|
"pinswg_validnoticeofintentiontosubmitanapplicati"
|
||||||
)
|
)
|
||||||
@@ -712,17 +596,12 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t("case:summary-withdrawn-date")}
|
label={t("case:summary-withdrawn-date")}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_withdrawndate"
|
"pinswg_withdrawndate"
|
||||||
)
|
)
|
||||||
@@ -738,19 +617,14 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
<SummaryRow
|
<SummaryRow
|
||||||
|
|
||||||
label={t(
|
label={t(
|
||||||
"case:summary-written-acceptance-of-notice"
|
"case:summary-written-acceptance-of-notice"
|
||||||
)}
|
)}
|
||||||
|
|
||||||
value={
|
value={
|
||||||
|
hasOwn(
|
||||||
_.has(
|
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_writtenacceptanceofnotification"
|
"pinswg_writtenacceptanceofnotification"
|
||||||
)
|
)
|
||||||
@@ -766,9 +640,7 @@ const Pinswg_transportandworkactid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/>
|
/>
|
||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import transLookup from "../../../data/lookuptranslations.json";
|
|||||||
import SummaryCard from "../summary/components/SummaryCard";
|
import SummaryCard from "../summary/components/SummaryCard";
|
||||||
import SummaryRow from "../summary/components/SummaryRow";
|
import SummaryRow from "../summary/components/SummaryRow";
|
||||||
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
import { getCaseLpaDisplayLines } from "../../utils/getCaseLpaDisplayValue";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const Pinswg_wayleaveid = (props) => {
|
const Pinswg_wayleaveid = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -170,7 +171,7 @@ const Pinswg_wayleaveid = (props) => {
|
|||||||
{t("case:summary-case-link-status-label")}
|
{t("case:summary-case-link-status-label")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd className="govuk-summary-list__value">
|
<dd className="govuk-summary-list__value">
|
||||||
{_.has(casesObj, ["numberofchildincidents"])
|
{hasOwn(casesObj, ["numberofchildincidents"])
|
||||||
? casesObj.numberofchildincidents > 0
|
? casesObj.numberofchildincidents > 0
|
||||||
? t(
|
? t(
|
||||||
"case:summary-case-link-status-linked"
|
"case:summary-case-link-status-linked"
|
||||||
@@ -234,7 +235,7 @@ const Pinswg_wayleaveid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-date-label")}
|
label={t("case:summary-start-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdate")
|
hasOwn(detailsObj, "pinswg_startdate")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdate)
|
? !_.isEmpty(detailsObj.pinswg_startdate)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdate
|
detailsObj.pinswg_startdate
|
||||||
@@ -242,7 +243,7 @@ const Pinswg_wayleaveid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(detailsObj, "pinswg_startdates")
|
: hasOwn(detailsObj, "pinswg_startdates")
|
||||||
? !_.isEmpty(detailsObj.pinswg_startdates)
|
? !_.isEmpty(detailsObj.pinswg_startdates)
|
||||||
? formatDates(
|
? formatDates(
|
||||||
detailsObj.pinswg_startdates
|
detailsObj.pinswg_startdates
|
||||||
@@ -259,7 +260,7 @@ const Pinswg_wayleaveid = (props) => {
|
|||||||
"case:summary-questionnaire-due-date-label"
|
"case:summary-questionnaire-due-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_questionnaireduedate")
|
hasOwn(detailsObj, "pinswg_questionnaireduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_questionnaireduedate
|
detailsObj.pinswg_questionnaireduedate
|
||||||
)
|
)
|
||||||
@@ -276,7 +277,7 @@ const Pinswg_wayleaveid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-statement-due-date-label")}
|
label={t("case:summary-statement-due-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_statementduedate")
|
hasOwn(detailsObj, "pinswg_statementduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_statementduedate
|
detailsObj.pinswg_statementduedate
|
||||||
)
|
)
|
||||||
@@ -295,7 +296,7 @@ const Pinswg_wayleaveid = (props) => {
|
|||||||
"case:summary-interested-party-date-label"
|
"case:summary-interested-party-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(
|
hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatement"
|
"pinswg_otherpartiesstatement"
|
||||||
)
|
)
|
||||||
@@ -308,7 +309,7 @@ const Pinswg_wayleaveid = (props) => {
|
|||||||
: t(
|
: t(
|
||||||
"case:summary-no-date-entered-label"
|
"case:summary-no-date-entered-label"
|
||||||
)
|
)
|
||||||
: _.has(
|
: hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_otherpartiesstatements"
|
"pinswg_otherpartiesstatements"
|
||||||
)
|
)
|
||||||
@@ -330,7 +331,7 @@ const Pinswg_wayleaveid = (props) => {
|
|||||||
"case:summary-applicant-final-comments-date-label"
|
"case:summary-applicant-final-comments-date-label"
|
||||||
)}
|
)}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_finalcommentsduedate")
|
hasOwn(detailsObj, "pinswg_finalcommentsduedate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_finalcommentsduedate
|
detailsObj.pinswg_finalcommentsduedate
|
||||||
)
|
)
|
||||||
@@ -347,7 +348,7 @@ const Pinswg_wayleaveid = (props) => {
|
|||||||
label={t(
|
label={t(
|
||||||
"case:summary-inquiry-evidence-date-label"
|
"case:summary-inquiry-evidence-date-label"
|
||||||
)}
|
)}
|
||||||
value={_.has(
|
value={hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
"pinswg_proofsofevidencewrittenstatementsofeviden"
|
||||||
)
|
)
|
||||||
@@ -367,7 +368,7 @@ const Pinswg_wayleaveid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-event-date-label")}
|
label={t("case:summary-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_dateeventrequested")
|
hasOwn(detailsObj, "pinswg_dateeventrequested")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_dateeventrequested
|
detailsObj.pinswg_dateeventrequested
|
||||||
)
|
)
|
||||||
@@ -384,7 +385,7 @@ const Pinswg_wayleaveid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-start-event-date-label")}
|
label={t("case:summary-start-event-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_startdateofevent")
|
hasOwn(detailsObj, "pinswg_startdateofevent")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_startdateofevent
|
detailsObj.pinswg_startdateofevent
|
||||||
)
|
)
|
||||||
@@ -400,7 +401,7 @@ const Pinswg_wayleaveid = (props) => {
|
|||||||
<SummaryRow
|
<SummaryRow
|
||||||
label={t("case:summary-decision-date-label")}
|
label={t("case:summary-decision-date-label")}
|
||||||
value={
|
value={
|
||||||
_.has(detailsObj, "pinswg_casedecisiondate")
|
hasOwn(detailsObj, "pinswg_casedecisiondate")
|
||||||
? !_.isEmpty(
|
? !_.isEmpty(
|
||||||
detailsObj.pinswg_casedecisiondate
|
detailsObj.pinswg_casedecisiondate
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
|
import { hasOwn } from "./utils";
|
||||||
|
|
||||||
const CRMError = (props) => {
|
const CRMError = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -9,7 +10,7 @@ const CRMError = (props) => {
|
|||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { locale } = router;
|
const { locale } = router;
|
||||||
|
|
||||||
const errorSwitch = _.has(props, "whichError")
|
const errorSwitch = hasOwn(props, "whichError")
|
||||||
? "LPAData"
|
? "LPAData"
|
||||||
: "searchResultsObj";
|
: "searchResultsObj";
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import useTranslation from "next-translate/useTranslation";
|
|||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import CRMError from "./crmError";
|
import CRMError from "./crmError";
|
||||||
import DNSSearchResults from "./search/dnssearchresults";
|
import DNSSearchResults from "./search/dnssearchresults";
|
||||||
|
import { hasOwn } from "./utils";
|
||||||
|
|
||||||
export default function Search(props) {
|
export default function Search(props) {
|
||||||
const {
|
const {
|
||||||
@@ -18,7 +19,7 @@ export default function Search(props) {
|
|||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { locale } = router;
|
const { locale } = router;
|
||||||
|
|
||||||
var hasError = _.has(searchResultsObj.searchResultsObj, "errorCode")
|
var hasError = hasOwn(searchResultsObj.searchResultsObj, "errorCode")
|
||||||
? true
|
? true
|
||||||
: false;
|
: false;
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import useTranslation from "next-translate/useTranslation";
|
|||||||
import { Field } from "redux-form";
|
import { Field } from "redux-form";
|
||||||
import { RenderDatePicker } from "./renderDatePicker";
|
import { RenderDatePicker } from "./renderDatePicker";
|
||||||
import { validateField } from "../validationUtils";
|
import { validateField } from "../validationUtils";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const dateDiffInDays = (a, b) => {
|
const dateDiffInDays = (a, b) => {
|
||||||
const _MS_PER_DAY = 1000 * 60 * 60 * 24;
|
const _MS_PER_DAY = 1000 * 60 * 60 * 24;
|
||||||
@@ -31,7 +32,7 @@ export function DateFieldPicker(props) {
|
|||||||
const showIfHasParentShowValue =
|
const showIfHasParentShowValue =
|
||||||
parentField != false &&
|
parentField != false &&
|
||||||
!_.isEmpty(formProps[form]) &&
|
!_.isEmpty(formProps[form]) &&
|
||||||
_.has(formProps[form].values, parentField) &&
|
hasOwn(formProps[form].values, parentField) &&
|
||||||
formProps[form].values[parentField] == parentFieldShowOnValue;
|
formProps[form].values[parentField] == parentFieldShowOnValue;
|
||||||
|
|
||||||
const requiredMessage = t("newappeal:is-required-label");
|
const requiredMessage = t("newappeal:is-required-label");
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { Field } from "redux-form";
|
|||||||
import { RenderTextfield } from "./renderTextfield";
|
import { RenderTextfield } from "./renderTextfield";
|
||||||
import { RenderDecimalField } from "./renderDecimalField";
|
import { RenderDecimalField } from "./renderDecimalField";
|
||||||
import { validateField } from "../validationUtils";
|
import { validateField } from "../validationUtils";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
const isVisibleByInclusion = ({
|
const isVisibleByInclusion = ({
|
||||||
parentField,
|
parentField,
|
||||||
form,
|
form,
|
||||||
@@ -14,7 +14,7 @@ const isVisibleByInclusion = ({
|
|||||||
}) =>
|
}) =>
|
||||||
parentField != false &&
|
parentField != false &&
|
||||||
!_.isEmpty(formProps[form]) &&
|
!_.isEmpty(formProps[form]) &&
|
||||||
_.has(formProps[form].values, parentField) &&
|
hasOwn(formProps[form].values, parentField) &&
|
||||||
parentFieldShowOnValue.indexOf(
|
parentFieldShowOnValue.indexOf(
|
||||||
formProps[form].values[parentField].toString()
|
formProps[form].values[parentField].toString()
|
||||||
) > -1;
|
) > -1;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import _ from "lodash";
|
|||||||
import { FieldArray, change } from "redux-form";
|
import { FieldArray, change } from "redux-form";
|
||||||
import { useDispatch } from "react-redux";
|
import { useDispatch } from "react-redux";
|
||||||
import { RenderSubFields } from "./renderSubFields";
|
import { RenderSubFields } from "./renderSubFields";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
export const FieldArrayForm = (props) => {
|
export const FieldArrayForm = (props) => {
|
||||||
const {
|
const {
|
||||||
name,
|
name,
|
||||||
@@ -19,7 +19,7 @@ export const FieldArrayForm = (props) => {
|
|||||||
var showIfHasParentShowValue =
|
var showIfHasParentShowValue =
|
||||||
parentField != false &&
|
parentField != false &&
|
||||||
!_.isEmpty(formProps[form]) &&
|
!_.isEmpty(formProps[form]) &&
|
||||||
_.has(formProps[form].values, parentField) &&
|
hasOwn(formProps[form].values, parentField) &&
|
||||||
parentFieldShowOnValue.indexOf(
|
parentFieldShowOnValue.indexOf(
|
||||||
formProps[form].values[parentField].toString()
|
formProps[form].values[parentField].toString()
|
||||||
) > -1;
|
) > -1;
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import useTranslation from "next-translate/useTranslation";
|
|||||||
import { Field } from "redux-form";
|
import { Field } from "redux-form";
|
||||||
import { RenderTextfield } from "./renderTextfield";
|
import { RenderTextfield } from "./renderTextfield";
|
||||||
import { validateField } from "../validationUtils";
|
import { validateField } from "../validationUtils";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
const isVisibleByInclusion = ({
|
const isVisibleByInclusion = ({
|
||||||
parentField,
|
parentField,
|
||||||
form,
|
form,
|
||||||
@@ -13,7 +13,7 @@ const isVisibleByInclusion = ({
|
|||||||
}) =>
|
}) =>
|
||||||
parentField != false &&
|
parentField != false &&
|
||||||
!_.isEmpty(formProps[form]) &&
|
!_.isEmpty(formProps[form]) &&
|
||||||
_.has(formProps[form].values, parentField) &&
|
hasOwn(formProps[form].values, parentField) &&
|
||||||
parentFieldShowOnValue.indexOf(
|
parentFieldShowOnValue.indexOf(
|
||||||
formProps[form].values[parentField].toString()
|
formProps[form].values[parentField].toString()
|
||||||
) > -1;
|
) > -1;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import useTranslation from "next-translate/useTranslation";
|
|||||||
import { Field } from "redux-form";
|
import { Field } from "redux-form";
|
||||||
import { RenderRadio } from "./renderRadio";
|
import { RenderRadio } from "./renderRadio";
|
||||||
import { validateField } from "../validationUtils";
|
import { validateField } from "../validationUtils";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
const isVisibleByInclusion = ({
|
const isVisibleByInclusion = ({
|
||||||
parentField,
|
parentField,
|
||||||
@@ -13,7 +14,7 @@ const isVisibleByInclusion = ({
|
|||||||
}) =>
|
}) =>
|
||||||
parentField != false &&
|
parentField != false &&
|
||||||
!_.isEmpty(formProps[form]) &&
|
!_.isEmpty(formProps[form]) &&
|
||||||
_.has(formProps[form].values, parentField) &&
|
hasOwn(formProps[form].values, parentField) &&
|
||||||
parentFieldShowOnValue.indexOf(
|
parentFieldShowOnValue.indexOf(
|
||||||
formProps[form].values[parentField].toString()
|
formProps[form].values[parentField].toString()
|
||||||
) > -1;
|
) > -1;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import useTranslation from "next-translate/useTranslation";
|
|||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import { Field } from "redux-form";
|
import { Field } from "redux-form";
|
||||||
import { RenderYesNo } from "./renderYesNo";
|
import { RenderYesNo } from "./renderYesNo";
|
||||||
|
import { hasOwn } from "../../utils";
|
||||||
|
|
||||||
export function YesNofield(props) {
|
export function YesNofield(props) {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
@@ -17,7 +18,7 @@ export function YesNofield(props) {
|
|||||||
const showIfHasParentShowValue =
|
const showIfHasParentShowValue =
|
||||||
parentField != false &&
|
parentField != false &&
|
||||||
!_.isEmpty(formProps[form]) &&
|
!_.isEmpty(formProps[form]) &&
|
||||||
_.has(formProps[form].values, parentField) &&
|
hasOwn(formProps[form].values, parentField) &&
|
||||||
parentFieldShowOnValue.indexOf(
|
parentFieldShowOnValue.indexOf(
|
||||||
formProps[form].values[parentField].toString()
|
formProps[form].values[parentField].toString()
|
||||||
) > -1;
|
) > -1;
|
||||||
@@ -36,7 +37,7 @@ export function YesNofield(props) {
|
|||||||
validate={[required]}
|
validate={[required]}
|
||||||
errorMsg={t("newappeal:select-an-option-label")}
|
errorMsg={t("newappeal:select-an-option-label")}
|
||||||
component={RenderYesNo}
|
component={RenderYesNo}
|
||||||
inline={_.has(props, "inline") ? props.inline : "true"}
|
inline={hasOwn(props, "inline") ? props.inline : "true"}
|
||||||
requiredDocumentLabel={props.requiredDocumentLabel}
|
requiredDocumentLabel={props.requiredDocumentLabel}
|
||||||
requiredDocumentValue={props.requiredDocumentValue}
|
requiredDocumentValue={props.requiredDocumentValue}
|
||||||
setDocumentsList={props.setDocumentsList}
|
setDocumentsList={props.setDocumentsList}
|
||||||
@@ -54,7 +55,7 @@ export function YesNofield(props) {
|
|||||||
validate={[required]}
|
validate={[required]}
|
||||||
errorMsg={t("newappeal:select-an-option-label")}
|
errorMsg={t("newappeal:select-an-option-label")}
|
||||||
component={RenderYesNo}
|
component={RenderYesNo}
|
||||||
inline={_.has(props, "inline") ? props.inline : "true"}
|
inline={hasOwn(props, "inline") ? props.inline : "true"}
|
||||||
requiredDocumentLabel={props.requiredDocumentLabel}
|
requiredDocumentLabel={props.requiredDocumentLabel}
|
||||||
requiredDocumentValue={props.requiredDocumentValue}
|
requiredDocumentValue={props.requiredDocumentValue}
|
||||||
setDocumentsList={props.setDocumentsList}
|
setDocumentsList={props.setDocumentsList}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import _ from "lodash";
|
import _ from "lodash";
|
||||||
|
import { hasOwn } from "../utils";
|
||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import React, { useEffect } from "react";
|
import React, { useEffect } from "react";
|
||||||
@@ -40,7 +41,7 @@ const getValidationMessages = (t) => ({
|
|||||||
const hasParentFieldValue = ({ parentField, form, formProps }) =>
|
const hasParentFieldValue = ({ parentField, form, formProps }) =>
|
||||||
parentField != false &&
|
parentField != false &&
|
||||||
!_.isEmpty(formProps[form]) &&
|
!_.isEmpty(formProps[form]) &&
|
||||||
_.has(formProps[form].values, parentField);
|
hasOwn(formProps[form].values, parentField);
|
||||||
|
|
||||||
const isVisibleByEquality = ({
|
const isVisibleByEquality = ({
|
||||||
parentField,
|
parentField,
|
||||||
|
|||||||
@@ -4,8 +4,7 @@ import Link from "next/link";
|
|||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import TimeOut from "../components/timeout";
|
import TimeOut from "../components/timeout";
|
||||||
import AwaitingSubmissionFromBlob from "./myportal/awaitingsubmissionfromblob";
|
import AwaitingSubmissionFromBlob from "./myportal/awaitingsubmissionfromblob";
|
||||||
|
import { hasOwn } from "./utils";
|
||||||
import _ from "lodash";
|
|
||||||
import Dns from "./myportal/dns";
|
import Dns from "./myportal/dns";
|
||||||
import MakeNewAppeal from "./myportal/makenewappeal";
|
import MakeNewAppeal from "./myportal/makenewappeal";
|
||||||
import MyCases from "./myportal/mycases";
|
import MyCases from "./myportal/mycases";
|
||||||
@@ -133,7 +132,7 @@ const MyPortal = (props) => {
|
|||||||
)} */}
|
)} */}
|
||||||
|
|
||||||
{!isLPA &&
|
{!isLPA &&
|
||||||
_.has(props.awaitingSubmission, [
|
hasOwnhas(props.awaitingSubmission, [
|
||||||
"awaitingSubmissionFromBlob",
|
"awaitingSubmissionFromBlob",
|
||||||
"@odata.count"
|
"@odata.count"
|
||||||
]) &&
|
]) &&
|
||||||
|
|||||||
@@ -20,7 +20,11 @@ import {
|
|||||||
} from "../../actions/services/portalService";
|
} from "../../actions/services/portalService";
|
||||||
import { splitWatchedCasesBySubmissionState } from "../../lib/domain/dashboard-policy";
|
import { splitWatchedCasesBySubmissionState } from "../../lib/domain/dashboard-policy";
|
||||||
import { consoleLogger } from "../../actions/core/logger";
|
import { consoleLogger } from "../../actions/core/logger";
|
||||||
import { getDetailsProxy, getFormCollectionByID } from "../../components/utils";
|
import {
|
||||||
|
getDetailsProxy,
|
||||||
|
getFormCollectionByID,
|
||||||
|
hasOwn
|
||||||
|
} from "../../components/utils";
|
||||||
import transLookup from "../../data/lookuptranslations.json";
|
import transLookup from "../../data/lookuptranslations.json";
|
||||||
import { setAwaitingSubmissionFromBlob } from "../../store/awaitingSubmission/action";
|
import { setAwaitingSubmissionFromBlob } from "../../store/awaitingSubmission/action";
|
||||||
import {
|
import {
|
||||||
@@ -469,7 +473,7 @@ const ViewAllResults = (props) => {
|
|||||||
</span>
|
</span>
|
||||||
{isAwaitingSubmissionDetails
|
{isAwaitingSubmissionDetails
|
||||||
? formatDates(item.createdon)
|
? formatDates(item.createdon)
|
||||||
: _.has(detailsObj, [
|
: hasOwn(detailsObj, [
|
||||||
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
||||||
])
|
])
|
||||||
? detailsObj[
|
? detailsObj[
|
||||||
@@ -488,7 +492,7 @@ const ViewAllResults = (props) => {
|
|||||||
{t("search:searchresults-authority-label")}:
|
{t("search:searchresults-authority-label")}:
|
||||||
</span>
|
</span>
|
||||||
{isAwaitingSubmissionDetails &&
|
{isAwaitingSubmissionDetails &&
|
||||||
_.has(resultItem, "pinswg_lpaname")
|
hasOwn(resultItem, "pinswg_lpaname")
|
||||||
? router.locale === "cy"
|
? router.locale === "cy"
|
||||||
? jsonpath({
|
? jsonpath({
|
||||||
path:
|
path:
|
||||||
@@ -500,7 +504,7 @@ const ViewAllResults = (props) => {
|
|||||||
})
|
})
|
||||||
: resultItem.pinswg_lpaname || "N/A"
|
: resultItem.pinswg_lpaname || "N/A"
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(resultItem, [
|
{hasOwn(resultItem, [
|
||||||
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
||||||
])
|
])
|
||||||
? router.locale === "cy"
|
? router.locale === "cy"
|
||||||
@@ -518,7 +522,7 @@ const ViewAllResults = (props) => {
|
|||||||
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
||||||
] || "N/A"
|
] || "N/A"
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(searchDetailsObj[key], [
|
{hasOwn(searchDetailsObj[key], [
|
||||||
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
|
||||||
])
|
])
|
||||||
? router.locale === "cy"
|
? router.locale === "cy"
|
||||||
@@ -541,7 +545,7 @@ const ViewAllResults = (props) => {
|
|||||||
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
|
||||||
] || "N/A"
|
] || "N/A"
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(resultItem, [
|
{hasOwn(resultItem, [
|
||||||
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
|
||||||
])
|
])
|
||||||
? router.locale === "cy"
|
? router.locale === "cy"
|
||||||
@@ -621,7 +625,7 @@ const ViewAllResults = (props) => {
|
|||||||
: getFormCollectionByID(
|
: getFormCollectionByID(
|
||||||
searchDetailsObj[key].appealType
|
searchDetailsObj[key].appealType
|
||||||
).value)}
|
).value)}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
searchDetailsObj[key],
|
searchDetailsObj[key],
|
||||||
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -313,7 +313,7 @@ function Radiofield(props) {
|
|||||||
//debugger;
|
//debugger;
|
||||||
// parentField != false &&
|
// parentField != false &&
|
||||||
// !_.isEmpty(formProps[form]) &&
|
// !_.isEmpty(formProps[form]) &&
|
||||||
// _.has(formProps[form].values, parentField) &&
|
// hasOwn(formProps[form].values, parentField) &&
|
||||||
// parentFieldShowOnValue.indexOf(
|
// parentFieldShowOnValue.indexOf(
|
||||||
// formProps[form].values[parentField].toString()
|
// formProps[form].values[parentField].toString()
|
||||||
// ) > -1;
|
// ) > -1;
|
||||||
|
|||||||
@@ -21,7 +21,12 @@ import {
|
|||||||
setNewAppealProgress,
|
setNewAppealProgress,
|
||||||
setFileCount
|
setFileCount
|
||||||
} from "../../store/appealType/action";
|
} from "../../store/appealType/action";
|
||||||
import { getFormCollectionByID, getProgressObj, updateLinks } from "../utils";
|
import {
|
||||||
|
getFormCollectionByID,
|
||||||
|
getProgressObj,
|
||||||
|
updateLinks,
|
||||||
|
hasOwn
|
||||||
|
} from "../utils";
|
||||||
import BuildRow from "./buildrow";
|
import BuildRow from "./buildrow";
|
||||||
import {
|
import {
|
||||||
parseXml,
|
parseXml,
|
||||||
@@ -436,7 +441,7 @@ let BuildSection = (props) => {
|
|||||||
data-module="govuk-button"
|
data-module="govuk-button"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
getErrors();
|
getErrors();
|
||||||
let valuesObj = _.has(
|
let valuesObj = hasOwn(
|
||||||
legacyFormState[props.form],
|
legacyFormState[props.form],
|
||||||
"values"
|
"values"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import {
|
|||||||
setAppealTypeID,
|
setAppealTypeID,
|
||||||
setAppealTypeTitle
|
setAppealTypeTitle
|
||||||
} from "../../store/appealType/action";
|
} from "../../store/appealType/action";
|
||||||
import { getFormCollectionByID } from "../utils";
|
import { getFormCollectionByID, hasOwn } from "../utils";
|
||||||
import Aboutyou from "./aboutyou";
|
import Aboutyou from "./aboutyou";
|
||||||
|
|
||||||
const RenderLPAList = ({
|
const RenderLPAList = ({
|
||||||
@@ -310,7 +310,7 @@ function Radiofield(props) {
|
|||||||
//debugger;
|
//debugger;
|
||||||
// parentField != false &&
|
// parentField != false &&
|
||||||
// !_.isEmpty(formProps[form]) &&
|
// !_.isEmpty(formProps[form]) &&
|
||||||
// _.has(formProps[form].values, parentField) &&
|
// hasOwn(formProps[form].values, parentField) &&
|
||||||
// parentFieldShowOnValue.indexOf(
|
// parentFieldShowOnValue.indexOf(
|
||||||
// formProps[form].values[parentField].toString()
|
// formProps[form].values[parentField].toString()
|
||||||
// ) > -1;
|
// ) > -1;
|
||||||
@@ -491,7 +491,7 @@ let CreateCase = (props) => {
|
|||||||
var showIfHasParentShowValue =
|
var showIfHasParentShowValue =
|
||||||
parentField != false &&
|
parentField != false &&
|
||||||
!_.isEmpty(formProps[form]) &&
|
!_.isEmpty(formProps[form]) &&
|
||||||
_.has(formProps[form].values, parentField) &&
|
hasOwn(formProps[form].values, parentField) &&
|
||||||
parentFieldShowOnValue.indexOf(
|
parentFieldShowOnValue.indexOf(
|
||||||
formProps[form].values[parentField].toString()
|
formProps[form].values[parentField].toString()
|
||||||
) > -1;
|
) > -1;
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import {
|
|||||||
setWatchedCasesDetails
|
setWatchedCasesDetails
|
||||||
} from "../../store/watchedCases/action";
|
} from "../../store/watchedCases/action";
|
||||||
|
|
||||||
import { getDetailsProxy } from "../utils";
|
import { getDetailsProxy, hasOwn } from "../utils";
|
||||||
import PaginationControl from "./pagination";
|
import PaginationControl from "./pagination";
|
||||||
|
|
||||||
import { signIn, useSession } from "next-auth/react";
|
import { signIn, useSession } from "next-auth/react";
|
||||||
@@ -410,7 +410,7 @@ const SearchResults = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_projectlocation"
|
"pinswg_projectlocation"
|
||||||
)
|
)
|
||||||
@@ -433,7 +433,7 @@ const SearchResults = (props) => {
|
|||||||
highlightQuery
|
highlightQuery
|
||||||
)
|
)
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
)
|
)
|
||||||
@@ -442,7 +442,7 @@ const SearchResults = (props) => {
|
|||||||
highlightQuery
|
highlightQuery
|
||||||
)
|
)
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addressline1"
|
"pinswg_addressline1"
|
||||||
)
|
)
|
||||||
@@ -453,19 +453,19 @@ const SearchResults = (props) => {
|
|||||||
: ""}
|
: ""}
|
||||||
{/* {detailsObj.pinswg_siteaddressline1 !=
|
{/* {detailsObj.pinswg_siteaddressline1 !=
|
||||||
null && <br />} */}
|
null && <br />} */}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline1 !=
|
detailsObj.pinswg_siteaddressline1 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addressline1"
|
"pinswg_addressline1"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_addressline1 !=
|
detailsObj.pinswg_addressline1 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
)
|
)
|
||||||
@@ -474,7 +474,7 @@ const SearchResults = (props) => {
|
|||||||
highlightQuery
|
highlightQuery
|
||||||
)
|
)
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addressline1"
|
"pinswg_addressline1"
|
||||||
)
|
)
|
||||||
@@ -483,19 +483,19 @@ const SearchResults = (props) => {
|
|||||||
highlightQuery
|
highlightQuery
|
||||||
)
|
)
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline2"
|
"pinswg_siteaddressline2"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline2 !=
|
detailsObj.pinswg_siteaddressline2 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addressline2"
|
"pinswg_addressline2"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_addressline2 !=
|
detailsObj.pinswg_addressline2 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresstown"
|
"pinswg_siteaddresstown"
|
||||||
)
|
)
|
||||||
@@ -504,25 +504,28 @@ const SearchResults = (props) => {
|
|||||||
highlightQuery
|
highlightQuery
|
||||||
)
|
)
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(detailsObj, "pinswg_addresstown")
|
{hasOwn(
|
||||||
|
detailsObj,
|
||||||
|
"pinswg_addresstown"
|
||||||
|
)
|
||||||
? highlightText(
|
? highlightText(
|
||||||
detailsObj.pinswg_addresstown,
|
detailsObj.pinswg_addresstown,
|
||||||
highlightQuery
|
highlightQuery
|
||||||
)
|
)
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresstown"
|
"pinswg_siteaddresstown"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresstown !=
|
detailsObj.pinswg_siteaddresstown !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addresstown"
|
"pinswg_addresstown"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_addresstown !=
|
detailsObj.pinswg_addresstown !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresscounty"
|
"pinswg_siteaddresscounty"
|
||||||
)
|
)
|
||||||
@@ -531,7 +534,7 @@ const SearchResults = (props) => {
|
|||||||
highlightQuery
|
highlightQuery
|
||||||
)
|
)
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addresscounty"
|
"pinswg_addresscounty"
|
||||||
)
|
)
|
||||||
@@ -540,19 +543,19 @@ const SearchResults = (props) => {
|
|||||||
highlightQuery
|
highlightQuery
|
||||||
)
|
)
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresscounty"
|
"pinswg_siteaddresscounty"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresscounty !=
|
detailsObj.pinswg_siteaddresscounty !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_addresscounty"
|
"pinswg_addresscounty"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_addresscounty !=
|
detailsObj.pinswg_addresscounty !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresspostcode"
|
"pinswg_siteaddresspostcode"
|
||||||
)
|
)
|
||||||
@@ -561,7 +564,7 @@ const SearchResults = (props) => {
|
|||||||
highlightQuery
|
highlightQuery
|
||||||
)
|
)
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(detailsObj, "pinswg_postcode")
|
{hasOwn(detailsObj, "pinswg_postcode")
|
||||||
? highlightText(
|
? highlightText(
|
||||||
detailsObj.pinswg_postcode,
|
detailsObj.pinswg_postcode,
|
||||||
highlightQuery
|
highlightQuery
|
||||||
@@ -575,9 +578,10 @@ const SearchResults = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(detailsObj, [
|
{hasOwn(
|
||||||
|
detailsObj,
|
||||||
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
||||||
])
|
)
|
||||||
? detailsObj[
|
? detailsObj[
|
||||||
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
||||||
]
|
]
|
||||||
@@ -590,9 +594,10 @@ const SearchResults = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(item, [
|
{hasOwn(
|
||||||
|
item,
|
||||||
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
|
||||||
])
|
)
|
||||||
? router.locale == "cy"
|
? router.locale == "cy"
|
||||||
? jsonpath({
|
? jsonpath({
|
||||||
path:
|
path:
|
||||||
@@ -608,9 +613,10 @@ const SearchResults = (props) => {
|
|||||||
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
|
||||||
] || "N/A"
|
] || "N/A"
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(item, [
|
{hasOwn(
|
||||||
|
item,
|
||||||
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
||||||
])
|
)
|
||||||
? router.locale == "cy"
|
? router.locale == "cy"
|
||||||
? jsonpath({
|
? jsonpath({
|
||||||
path:
|
path:
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { JSONPath as jsonpath } from "jsonpath-plus";
|
import { JSONPath as jsonpath } from "jsonpath-plus";
|
||||||
import _ from "lodash";
|
|
||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
@@ -35,7 +34,7 @@ import {
|
|||||||
setWatchedCases,
|
setWatchedCases,
|
||||||
setWatchedCasesDetails
|
setWatchedCasesDetails
|
||||||
} from "../../store/watchedCases/action";
|
} from "../../store/watchedCases/action";
|
||||||
import { getDetailsProxy, getSearchDetailsPaged } from "../utils";
|
import { getDetailsProxy, getSearchDetailsPaged, hasOwn } from "../utils";
|
||||||
import { signIn, useSession } from "next-auth/react";
|
import { signIn, useSession } from "next-auth/react";
|
||||||
|
|
||||||
const DNSSearchResults = (props) => {
|
const DNSSearchResults = (props) => {
|
||||||
@@ -489,7 +488,7 @@ const DNSSearchResults = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_projectlocation"
|
"pinswg_projectlocation"
|
||||||
)
|
)
|
||||||
@@ -528,55 +527,55 @@ const DNSSearchResults = (props) => {
|
|||||||
: ""
|
: ""
|
||||||
: ""}
|
: ""}
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddressline1
|
? detailsObj.pinswg_siteaddressline1
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline1 !=
|
detailsObj.pinswg_siteaddressline1 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline2"
|
"pinswg_siteaddressline2"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddressline2
|
? detailsObj.pinswg_siteaddressline2
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline2"
|
"pinswg_siteaddressline2"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline2 !=
|
detailsObj.pinswg_siteaddressline2 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddresstown
|
? detailsObj.pinswg_siteaddresstown
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresstown"
|
"pinswg_siteaddresstown"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresstown !=
|
detailsObj.pinswg_siteaddresstown !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddresscounty
|
? detailsObj.pinswg_siteaddresscounty
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresscounty"
|
"pinswg_siteaddresscounty"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresscounty !=
|
detailsObj.pinswg_siteaddresscounty !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
)
|
)
|
||||||
@@ -590,9 +589,10 @@ const DNSSearchResults = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(detailsObj, [
|
{hasOwn(
|
||||||
|
detailsObj,
|
||||||
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
||||||
])
|
)
|
||||||
? detailsObj[
|
? detailsObj[
|
||||||
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
||||||
]
|
]
|
||||||
@@ -605,9 +605,10 @@ const DNSSearchResults = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(detailsObj, [
|
{hasOwn(
|
||||||
|
detailsObj,
|
||||||
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
||||||
])
|
)
|
||||||
? router.locale == "cy"
|
? router.locale == "cy"
|
||||||
? jsonpath({
|
? jsonpath({
|
||||||
path:
|
path:
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { JSONPath as jsonpath } from "jsonpath-plus";
|
import { JSONPath as jsonpath } from "jsonpath-plus";
|
||||||
import _ from "lodash";
|
|
||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
@@ -27,7 +26,7 @@ import {
|
|||||||
setWatchedCasesDetails
|
setWatchedCasesDetails
|
||||||
} from "../../store/watchedCases/action";
|
} from "../../store/watchedCases/action";
|
||||||
|
|
||||||
import { getDetailsProxy, getSearchDetailsPaged } from "../utils";
|
import { getDetailsProxy, getSearchDetailsPaged, hasOwn } from "../utils";
|
||||||
import PaginationControl from "./pagination";
|
import PaginationControl from "./pagination";
|
||||||
|
|
||||||
import { signIn, useSession } from "next-auth/react";
|
import { signIn, useSession } from "next-auth/react";
|
||||||
@@ -485,7 +484,7 @@ const SearchResults = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_projectlocation"
|
"pinswg_projectlocation"
|
||||||
)
|
)
|
||||||
@@ -521,7 +520,7 @@ const SearchResults = (props) => {
|
|||||||
// )[0]
|
// )[0]
|
||||||
// : ""
|
// : ""
|
||||||
""}
|
""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
)
|
)
|
||||||
@@ -531,52 +530,52 @@ const SearchResults = (props) => {
|
|||||||
{/* {detailsObj.pinswg_siteaddressline1 !=
|
{/* {detailsObj.pinswg_siteaddressline1 !=
|
||||||
null && <br />} */}
|
null && <br />} */}
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline1 !=
|
detailsObj.pinswg_siteaddressline1 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline1"
|
"pinswg_siteaddressline1"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddressline2
|
? detailsObj.pinswg_siteaddressline2
|
||||||
: ""}
|
: ""}
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddressline2"
|
"pinswg_siteaddressline2"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddressline2 !=
|
detailsObj.pinswg_siteaddressline2 !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresstown"
|
"pinswg_siteaddresstown"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddresstown
|
? detailsObj.pinswg_siteaddresstown
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresstown"
|
"pinswg_siteaddresstown"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresstown !=
|
detailsObj.pinswg_siteaddresstown !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
|
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresscounty"
|
"pinswg_siteaddresscounty"
|
||||||
)
|
)
|
||||||
? detailsObj.pinswg_siteaddresscounty
|
? detailsObj.pinswg_siteaddresscounty
|
||||||
: ""}
|
: ""}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresscounty"
|
"pinswg_siteaddresscounty"
|
||||||
) &&
|
) &&
|
||||||
detailsObj.pinswg_siteaddresscounty !=
|
detailsObj.pinswg_siteaddresscounty !=
|
||||||
null && <br />}
|
null && <br />}
|
||||||
{_.has(
|
{hasOwn(
|
||||||
detailsObj,
|
detailsObj,
|
||||||
"pinswg_siteaddresspostcode"
|
"pinswg_siteaddresspostcode"
|
||||||
)
|
)
|
||||||
@@ -594,9 +593,10 @@ const SearchResults = (props) => {
|
|||||||
? item.pinswg_appellantfirstname +
|
? item.pinswg_appellantfirstname +
|
||||||
" " +
|
" " +
|
||||||
item.pinswg_appellantlastname
|
item.pinswg_appellantlastname
|
||||||
: _.has(detailsObj, [
|
: hasOwn(
|
||||||
|
detailsObj,
|
||||||
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
||||||
])
|
)
|
||||||
? detailsObj[
|
? detailsObj[
|
||||||
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
|
||||||
]
|
]
|
||||||
@@ -609,9 +609,10 @@ const SearchResults = (props) => {
|
|||||||
)}
|
)}
|
||||||
:
|
:
|
||||||
</span>
|
</span>
|
||||||
{_.has(item, [
|
{hasOwn(
|
||||||
|
item,
|
||||||
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
||||||
])
|
)
|
||||||
? router.locale == "cy"
|
? router.locale == "cy"
|
||||||
? jsonpath({
|
? jsonpath({
|
||||||
path:
|
path:
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import Link from "next/link";
|
|||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import CRMError from "./crmError";
|
import CRMError from "./crmError";
|
||||||
import SearchResults from "./search/searchresults";
|
import SearchResults from "./search/searchresults";
|
||||||
|
import { hasOwn } from "./utils";
|
||||||
|
|
||||||
export default function Search(props) {
|
export default function Search(props) {
|
||||||
const {
|
const {
|
||||||
@@ -12,14 +13,14 @@ export default function Search(props) {
|
|||||||
myportal,
|
myportal,
|
||||||
watchedCases,
|
watchedCases,
|
||||||
isLinkedCase,
|
isLinkedCase,
|
||||||
showLoginCheck,
|
showLoginCheck
|
||||||
} = props;
|
} = props;
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { locale } = router;
|
const { locale } = router;
|
||||||
|
|
||||||
var hasError = _.has(searchResultsObj.searchResultsObj, "errorCode")
|
var hasError = hasOwn(searchResultsObj.searchResultsObj, "errorCode")
|
||||||
? true
|
? true
|
||||||
: false;
|
: false;
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,10 @@ import data from "../../data/collections.json";
|
|||||||
|
|
||||||
import xpath from "xpath";
|
import xpath from "xpath";
|
||||||
|
|
||||||
|
export function hasOwn(obj, key) {
|
||||||
|
return obj != null && Object.prototype.hasOwnProperty.call(obj, key);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Get the lookup collection by the appeal type entity
|
* Get the lookup collection by the appeal type entity
|
||||||
* @param String formtype - string from appeal entity name
|
* @param String formtype - string from appeal entity name
|
||||||
@@ -372,10 +376,10 @@ export const getProgressObj = (
|
|||||||
"totalFields": formObj[key].fieldsTotal,
|
"totalFields": formObj[key].fieldsTotal,
|
||||||
"allFieldsComplete":
|
"allFieldsComplete":
|
||||||
titleList[key].value == "Upload documents"
|
titleList[key].value == "Upload documents"
|
||||||
? (_.has(props.props.appealType.fileList, "value") &&
|
? (hasOwn(props.props.appealType.fileList, "value") &&
|
||||||
props.props.appealType.fileList.value.length >
|
props.props.appealType.fileList.value.length >
|
||||||
0) ||
|
0) ||
|
||||||
(_.has(props.props.form.appealForm, "values") &&
|
(hasOwn(props.props.form.appealForm, "values") &&
|
||||||
Object.keys(
|
Object.keys(
|
||||||
props.props.form.appealForm.values
|
props.props.form.appealForm.values
|
||||||
).filter((k) => k.startsWith("pinswg_fileUpload"))
|
).filter((k) => k.startsWith("pinswg_fileUpload"))
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import _ from "lodash";
|
|
||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import Head from "next/head";
|
import Head from "next/head";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
@@ -10,6 +9,7 @@ import CRMError from "../components/crmError";
|
|||||||
import Footer from "../components/footer";
|
import Footer from "../components/footer";
|
||||||
import Header from "../components/header";
|
import Header from "../components/header";
|
||||||
import ServiceBanner from "../components/servicebanner";
|
import ServiceBanner from "../components/servicebanner";
|
||||||
|
import { hasOwn } from "../components/utils";
|
||||||
|
|
||||||
const Home = (props) => {
|
const Home = (props) => {
|
||||||
const { footerLinks, pages } = props;
|
const { footerLinks, pages } = props;
|
||||||
@@ -20,8 +20,8 @@ const Home = (props) => {
|
|||||||
const { appealtypes } = router.query;
|
const { appealtypes } = router.query;
|
||||||
|
|
||||||
var hasError =
|
var hasError =
|
||||||
_.has(props.LPAData.LPAData, "errorCode") ||
|
hasOwn(props.LPAData.LPAData, "errorCode") ||
|
||||||
_.has(props.appealType.appealType, "errorCode")
|
hasOwn(props.appealType.appealType, "errorCode")
|
||||||
? true
|
? true
|
||||||
: false;
|
: false;
|
||||||
|
|
||||||
@@ -120,7 +120,7 @@ const mapStateToProps = (state) => {
|
|||||||
appealType: state.appealType,
|
appealType: state.appealType,
|
||||||
LPAData: state.LPAData,
|
LPAData: state.LPAData,
|
||||||
//form: state.form,
|
//form: state.form,
|
||||||
accountDetails: state.accountDetails,
|
accountDetails: state.accountDetails
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import _ from "lodash";
|
|
||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import Head from "next/head";
|
import Head from "next/head";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
@@ -19,6 +18,7 @@ import { setLPA, setCaseStatus } from "../store/lpa/action";
|
|||||||
import { wrapper } from "../store/store";
|
import { wrapper } from "../store/store";
|
||||||
import ServiceBanner from "../components/servicebanner";
|
import ServiceBanner from "../components/servicebanner";
|
||||||
import { getCaseStatus } from "../actions/services/caseDirectService";
|
import { getCaseStatus } from "../actions/services/caseDirectService";
|
||||||
|
import { hasOwn } from "../components/utils";
|
||||||
|
|
||||||
const Home = (props) => {
|
const Home = (props) => {
|
||||||
const { footerLinks, pages } = props;
|
const { footerLinks, pages } = props;
|
||||||
@@ -29,8 +29,8 @@ const Home = (props) => {
|
|||||||
const { appealtypes } = router.query;
|
const { appealtypes } = router.query;
|
||||||
|
|
||||||
var hasError =
|
var hasError =
|
||||||
_.has(props.LPAData.LPAData, "errorCode") ||
|
hasOwn(props.LPAData.LPAData, "errorCode") ||
|
||||||
_.has(props.appealType.appealType, "errorCode")
|
hasOwn(props.appealType.appealType, "errorCode")
|
||||||
? true
|
? true
|
||||||
: false;
|
: false;
|
||||||
|
|
||||||
|
|||||||
@@ -17,10 +17,10 @@
|
|||||||
|
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import CryptoJS from "crypto-js";
|
import CryptoJS from "crypto-js";
|
||||||
import _ from "lodash";
|
|
||||||
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
|
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
|
||||||
import { consoleLogger } from "../../../actions/core/logger";
|
import { consoleLogger } from "../../../actions/core/logger";
|
||||||
import { getToken } from "../../../actions/core/token";
|
import { getToken } from "../../../actions/core/token";
|
||||||
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { hashAPIPath } from "../../../actions/core/hash";
|
import { hashAPIPath } from "../../../actions/core/hash";
|
||||||
import { respondError, respondSuccess } from "../middleware/apiResponse";
|
import { respondError, respondSuccess } from "../middleware/apiResponse";
|
||||||
const WORDKEY = process.env.HASHKEY;
|
const WORDKEY = process.env.HASHKEY;
|
||||||
@@ -152,9 +152,9 @@ export default async function ApiProxy(req, res) {
|
|||||||
|
|
||||||
let dataStr;
|
let dataStr;
|
||||||
|
|
||||||
_.has(data, "@odata.nextLink") == true &&
|
hasOwn(data, "@odata.nextLink") == true &&
|
||||||
((dataStr = JSON.stringify(data["@odata.nextLink"])),
|
((dataStr = JSON.stringify(data["@odata.nextLink"])),
|
||||||
(data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
|
(data["@odata.nextLink"] = dataStr.split("/v9.2/")[1]));
|
||||||
return respondSuccess(res, data);
|
return respondSuccess(res, data);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
consoleLogger(error);
|
consoleLogger(error);
|
||||||
|
|||||||
@@ -16,11 +16,11 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import _ from "lodash";
|
|
||||||
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
|
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
|
||||||
import { getToken } from "../../../actions/core/token";
|
import { getToken } from "../../../actions/core/token";
|
||||||
import { consoleLogger } from "../../../actions/core/logger";
|
import { consoleLogger } from "../../../actions/core/logger";
|
||||||
import { hashAPIPath } from "../../../actions/core/hash";
|
import { hashAPIPath } from "../../../actions/core/hash";
|
||||||
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { respondError, respondSuccess } from "../middleware/apiResponse";
|
import { respondError, respondSuccess } from "../middleware/apiResponse";
|
||||||
|
|
||||||
const WEBAPI_URL =
|
const WEBAPI_URL =
|
||||||
@@ -60,9 +60,9 @@ export default async function ApiProxy(req, res) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
let dataStr;
|
let dataStr;
|
||||||
_.has(data, "@odata.nextLink") == true &&
|
hasOwn(data, "@odata.nextLink") == true &&
|
||||||
((dataStr = JSON.stringify(data["@odata.nextLink"])),
|
((dataStr = JSON.stringify(data["@odata.nextLink"])),
|
||||||
(data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
|
(data["@odata.nextLink"] = dataStr.split("/v9.2/")[1]));
|
||||||
return respondSuccess(res, data);
|
return respondSuccess(res, data);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
consoleLogger(error);
|
consoleLogger(error);
|
||||||
|
|||||||
@@ -47,10 +47,10 @@
|
|||||||
// * description: Success
|
// * description: Success
|
||||||
// */
|
// */
|
||||||
|
|
||||||
import _ from "lodash";
|
|
||||||
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
|
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
|
||||||
import { respondError } from "../middleware/apiResponse";
|
import { respondError } from "../middleware/apiResponse";
|
||||||
import { relayGet } from "../middleware/relayForwarding";
|
import { relayGet } from "../middleware/relayForwarding";
|
||||||
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { RELAY_POLICY_SEARCH_PAGED } from "../middleware/relayPolicyPresets";
|
import { RELAY_POLICY_SEARCH_PAGED } from "../middleware/relayPolicyPresets";
|
||||||
|
|
||||||
export default async function ApiProxy(req, res) {
|
export default async function ApiProxy(req, res) {
|
||||||
@@ -109,7 +109,7 @@ export default async function ApiProxy(req, res) {
|
|||||||
var queryString = "";
|
var queryString = "";
|
||||||
|
|
||||||
queryString +=
|
queryString +=
|
||||||
_.has(searchString, "q") && searchString.q != null
|
hasOwn(searchString, "q") && searchString.q != null
|
||||||
? "(contains(title, '" +
|
? "(contains(title, '" +
|
||||||
searchString.q.replace(/\'/g, "''") +
|
searchString.q.replace(/\'/g, "''") +
|
||||||
"') or contains(ticketnumber,'" +
|
"') or contains(ticketnumber,'" +
|
||||||
@@ -118,25 +118,25 @@ export default async function ApiProxy(req, res) {
|
|||||||
: "";
|
: "";
|
||||||
|
|
||||||
queryString +=
|
queryString +=
|
||||||
_.has(searchString, "lpaRef") && searchString.lpaRef != null
|
hasOwn(searchString, "lpaRef") && searchString.lpaRef != null
|
||||||
? "(contains(pinswg_lpareference, '" +
|
? "(contains(pinswg_lpareference, '" +
|
||||||
searchString.lpaRef.replace(/\'/g, "''") +
|
searchString.lpaRef.replace(/\'/g, "''") +
|
||||||
"')) and"
|
"')) and"
|
||||||
: "";
|
: "";
|
||||||
|
|
||||||
queryString +=
|
queryString +=
|
||||||
(_.has(searchString, "lpa") || _.has(searchString, "LPA")) &&
|
(hasOwn(searchString, "lpa") || hasOwn(searchString, "LPA")) &&
|
||||||
searchString.lpa != null
|
searchString.lpa != null
|
||||||
? " _pinswg_associatedlpa_value eq " + searchString.lpa + " and"
|
? " _pinswg_associatedlpa_value eq " + searchString.lpa + " and"
|
||||||
: "";
|
: "";
|
||||||
|
|
||||||
queryString +=
|
queryString +=
|
||||||
_.has(searchString, "apt") && searchString.apt != null
|
hasOwn(searchString, "apt") && searchString.apt != null
|
||||||
? " pinswg_appealcasetype eq " + searchString.apt + " and"
|
? " pinswg_appealcasetype eq " + searchString.apt + " and"
|
||||||
: "";
|
: "";
|
||||||
|
|
||||||
queryString +=
|
queryString +=
|
||||||
_.has(searchString, "statuscode") && searchString.statuscode != null
|
hasOwn(searchString, "statuscode") && searchString.statuscode != null
|
||||||
? " statuscode eq " + searchString.statuscode + " and"
|
? " statuscode eq " + searchString.statuscode + " and"
|
||||||
: "";
|
: "";
|
||||||
|
|
||||||
@@ -152,7 +152,7 @@ export default async function ApiProxy(req, res) {
|
|||||||
? "&$skiptoken=" + ('<cookie pagenumber="' + pageNumber + '" />')
|
? "&$skiptoken=" + ('<cookie pagenumber="' + pageNumber + '" />')
|
||||||
: "");
|
: "");
|
||||||
|
|
||||||
if (_.has(searchString, "projecttype")) {
|
if (hasOwn(searchString, "projecttype")) {
|
||||||
const sipsFilters = [
|
const sipsFilters = [
|
||||||
"pinswg_sips_pinswg_sipsprojecttype/any(pt: pt/pinswg_sipsprojecttypeid eq " +
|
"pinswg_sips_pinswg_sipsprojecttype/any(pt: pt/pinswg_sipsprojecttypeid eq " +
|
||||||
searchString.projecttype +
|
searchString.projecttype +
|
||||||
@@ -215,7 +215,7 @@ export default async function ApiProxy(req, res) {
|
|||||||
relayPolicy,
|
relayPolicy,
|
||||||
transformData: (data) => {
|
transformData: (data) => {
|
||||||
let dataStr;
|
let dataStr;
|
||||||
_.has(data, "@odata.nextLink") === true &&
|
hasOwn(data, "@odata.nextLink") === true &&
|
||||||
((dataStr = JSON.stringify(data["@odata.nextLink"])),
|
((dataStr = JSON.stringify(data["@odata.nextLink"])),
|
||||||
(data["@odata.nextLink"] = dataStr.split("/v9.2/")[1]));
|
(data["@odata.nextLink"] = dataStr.split("/v9.2/")[1]));
|
||||||
|
|
||||||
|
|||||||
@@ -16,8 +16,8 @@
|
|||||||
* description: Success
|
* description: Success
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import _ from "lodash";
|
|
||||||
import { azureHeadersPaged } from "../../../actions/core/headers";
|
import { azureHeadersPaged } from "../../../actions/core/headers";
|
||||||
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { respondError } from "../middleware/apiResponse";
|
import { respondError } from "../middleware/apiResponse";
|
||||||
import { relayGet } from "../middleware/relayForwarding";
|
import { relayGet } from "../middleware/relayForwarding";
|
||||||
|
|
||||||
@@ -30,9 +30,9 @@ export default async function ApiProxy(req, res) {
|
|||||||
res,
|
res,
|
||||||
requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
|
requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
|
||||||
transformData: (data) => {
|
transformData: (data) => {
|
||||||
if (_.has(data, "@odata.nextLink") === true) {
|
if (hasOwn(data, "@odata.nextLink") === true) {
|
||||||
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
||||||
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
|
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
|
|||||||
@@ -9,9 +9,9 @@
|
|||||||
* 200:
|
* 200:
|
||||||
* description: Success
|
* description: Success
|
||||||
*/
|
*/
|
||||||
import _ from "lodash";
|
|
||||||
import { azureHeadersPaged } from "../../../actions/core/headers";
|
import { azureHeadersPaged } from "../../../actions/core/headers";
|
||||||
import { getSelectQuery } from "../../../actions/selectQueryTypes";
|
import { getSelectQuery } from "../../../actions/selectQueryTypes";
|
||||||
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { respondError } from "../middleware/apiResponse";
|
import { respondError } from "../middleware/apiResponse";
|
||||||
import { relayGet } from "../middleware/relayForwarding";
|
import { relayGet } from "../middleware/relayForwarding";
|
||||||
|
|
||||||
@@ -41,9 +41,9 @@ export default async function ApiProxy(req, res) {
|
|||||||
res,
|
res,
|
||||||
requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
|
requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
|
||||||
transformData: (data) => {
|
transformData: (data) => {
|
||||||
if (_.has(data, "@odata.nextLink") === true) {
|
if (hasOwn(data, "@odata.nextLink") === true) {
|
||||||
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
||||||
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
|
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
|
|||||||
@@ -41,8 +41,7 @@
|
|||||||
* 200:
|
* 200:
|
||||||
* description: Success
|
* description: Success
|
||||||
*/
|
*/
|
||||||
|
import { hasOwn } from "../../../components/utils";
|
||||||
import _ from "lodash";
|
|
||||||
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
|
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
|
||||||
import { respondError } from "../middleware/apiResponse";
|
import { respondError } from "../middleware/apiResponse";
|
||||||
import { relayGet } from "../middleware/relayForwarding";
|
import { relayGet } from "../middleware/relayForwarding";
|
||||||
@@ -96,9 +95,9 @@ export default async function ApiProxy(req, res) {
|
|||||||
requestOptionsBuilder: (accessToken) =>
|
requestOptionsBuilder: (accessToken) =>
|
||||||
azureHeadersPagedCustom(accessToken, showNumberOfRecords),
|
azureHeadersPagedCustom(accessToken, showNumberOfRecords),
|
||||||
transformData: (data) => {
|
transformData: (data) => {
|
||||||
if (_.has(data, "@odata.nextLink") === true) {
|
if (hasOwn(data, "@odata.nextLink") === true) {
|
||||||
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
||||||
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
|
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
|
|||||||
@@ -16,8 +16,8 @@
|
|||||||
* description: Success
|
* description: Success
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import _ from "lodash";
|
|
||||||
import { azureHeadersPaged } from "../../../actions/core/headers";
|
import { azureHeadersPaged } from "../../../actions/core/headers";
|
||||||
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { respondError } from "../middleware/apiResponse";
|
import { respondError } from "../middleware/apiResponse";
|
||||||
import { relayGet } from "../middleware/relayForwarding";
|
import { relayGet } from "../middleware/relayForwarding";
|
||||||
|
|
||||||
@@ -47,9 +47,9 @@ export default async function ApiProxy(req, res) {
|
|||||||
requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
|
requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
|
||||||
transformData: (data) => {
|
transformData: (data) => {
|
||||||
let dataStr;
|
let dataStr;
|
||||||
_.has(data, "@odata.nextLink") === true &&
|
hasOwn(data, "@odata.nextLink") === true &&
|
||||||
((dataStr = JSON.stringify(data["@odata.nextLink"])),
|
((dataStr = JSON.stringify(data["@odata.nextLink"])),
|
||||||
(data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
|
(data["@odata.nextLink"] = dataStr.split("/v9.2/")[1]));
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -29,10 +29,10 @@
|
|||||||
* description: Success
|
* description: Success
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import _ from "lodash";
|
|
||||||
import { azureHeaders, azureHeadersPaged } from "../../../actions/core/headers";
|
import { azureHeaders, azureHeadersPaged } from "../../../actions/core/headers";
|
||||||
import { getSelectQuery } from "../../../actions/selectQueryTypes";
|
import { getSelectQuery } from "../../../actions/selectQueryTypes";
|
||||||
import { getNavigationPropertyByPrimaryAttribute } from "../../../components/utils";
|
import { getNavigationPropertyByPrimaryAttribute } from "../../../components/utils";
|
||||||
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { respondError, respondSuccess } from "../middleware/apiResponse";
|
import { respondError, respondSuccess } from "../middleware/apiResponse";
|
||||||
import { relayGetData } from "../middleware/relayForwarding";
|
import { relayGetData } from "../middleware/relayForwarding";
|
||||||
|
|
||||||
@@ -138,7 +138,7 @@ export default async function ApiProxy(req, res) {
|
|||||||
additionalLPAs
|
additionalLPAs
|
||||||
}));
|
}));
|
||||||
|
|
||||||
if (_.has(data, "@odata.nextLink") === true) {
|
if (hasOwn(data, "@odata.nextLink") === true) {
|
||||||
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
||||||
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
|
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,10 +42,10 @@
|
|||||||
* description: Success
|
* description: Success
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import _ from "lodash";
|
|
||||||
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
|
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
|
||||||
import { respondError } from "../middleware/apiResponse";
|
import { respondError } from "../middleware/apiResponse";
|
||||||
import { relayGet } from "../middleware/relayForwarding";
|
import { relayGet } from "../middleware/relayForwarding";
|
||||||
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { RELAY_POLICY_SEARCH_PAGED } from "../middleware/relayPolicyPresets";
|
import { RELAY_POLICY_SEARCH_PAGED } from "../middleware/relayPolicyPresets";
|
||||||
|
|
||||||
export default async function ApiProxy(req, res) {
|
export default async function ApiProxy(req, res) {
|
||||||
@@ -121,9 +121,9 @@ export default async function ApiProxy(req, res) {
|
|||||||
azureHeadersPagedCustom(accessToken, showNumberOfRecords),
|
azureHeadersPagedCustom(accessToken, showNumberOfRecords),
|
||||||
relayPolicy,
|
relayPolicy,
|
||||||
transformData: (data) => {
|
transformData: (data) => {
|
||||||
if (_.has(data, "@odata.nextLink") === true) {
|
if (hasOwn(data, "@odata.nextLink") === true) {
|
||||||
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
||||||
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
|
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
* description: Success
|
* description: Success
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import _ from "lodash";
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { respondError } from "../middleware/apiResponse";
|
import { respondError } from "../middleware/apiResponse";
|
||||||
import { relayGet } from "../middleware/relayForwarding";
|
import { relayGet } from "../middleware/relayForwarding";
|
||||||
|
|
||||||
@@ -34,9 +34,9 @@ export default async function ApiProxy(req, res) {
|
|||||||
queryUrl,
|
queryUrl,
|
||||||
res,
|
res,
|
||||||
transformData: (data) => {
|
transformData: (data) => {
|
||||||
if (_.has(data, "@odata.nextLink") === true) {
|
if (hasOwn(data, "@odata.nextLink") === true) {
|
||||||
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
||||||
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
|
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
* description: Success
|
* description: Success
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import _ from "lodash";
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { respondError } from "../middleware/apiResponse";
|
import { respondError } from "../middleware/apiResponse";
|
||||||
import { relayGet } from "../middleware/relayForwarding";
|
import { relayGet } from "../middleware/relayForwarding";
|
||||||
|
|
||||||
@@ -31,9 +31,9 @@ export default async function ApiProxy(req, res) {
|
|||||||
queryUrl,
|
queryUrl,
|
||||||
res,
|
res,
|
||||||
transformData: (data) => {
|
transformData: (data) => {
|
||||||
if (_.has(data, "@odata.nextLink") === true) {
|
if (hasOwn(data, "@odata.nextLink") === true) {
|
||||||
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
||||||
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
|
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
return [data];
|
return [data];
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import _ from "lodash";
|
|
||||||
import { azureHeaders } from "../../../actions/core/headers";
|
import { azureHeaders } from "../../../actions/core/headers";
|
||||||
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { respondError } from "../middleware/apiResponse";
|
import { respondError } from "../middleware/apiResponse";
|
||||||
import { relayGet } from "../middleware/relayForwarding";
|
import { relayGet } from "../middleware/relayForwarding";
|
||||||
|
|
||||||
@@ -14,9 +14,9 @@ export default async function ApiProxy(req, res) {
|
|||||||
transformData: (data) => {
|
transformData: (data) => {
|
||||||
let dataStr;
|
let dataStr;
|
||||||
|
|
||||||
_.has(data, "@odata.nextLink") === true &&
|
hasOwn(data, "@odata.nextLink") === true &&
|
||||||
((dataStr = JSON.stringify(data["@odata.nextLink"])),
|
((dataStr = JSON.stringify(data["@odata.nextLink"])),
|
||||||
(data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
|
(data["@odata.nextLink"] = dataStr.split("/v9.2/")[1]));
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import _ from "lodash";
|
|
||||||
import { azureHeadersPaged } from "../../../actions/core/headers";
|
import { azureHeadersPaged } from "../../../actions/core/headers";
|
||||||
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { respondError } from "../middleware/apiResponse";
|
import { respondError } from "../middleware/apiResponse";
|
||||||
import { relayGet } from "../middleware/relayForwarding";
|
import { relayGet } from "../middleware/relayForwarding";
|
||||||
|
|
||||||
@@ -29,9 +29,9 @@ export default async function ApiProxy(req, res) {
|
|||||||
requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
|
requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
|
||||||
transformData: (data) => {
|
transformData: (data) => {
|
||||||
let dataStr;
|
let dataStr;
|
||||||
_.has(data, "@odata.nextLink") === true &&
|
hasOwn(data, "@odata.nextLink") === true &&
|
||||||
((dataStr = JSON.stringify(data["@odata.nextLink"])),
|
((dataStr = JSON.stringify(data["@odata.nextLink"])),
|
||||||
(data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
|
(data["@odata.nextLink"] = dataStr.split("/v9.2/")[1]));
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
import CryptoJS from "crypto-js";
|
import CryptoJS from "crypto-js";
|
||||||
import _ from "lodash";
|
import _ from "lodash";
|
||||||
import { azureHeadersPaged } from "../../../actions/core/headers";
|
import { azureHeadersPaged } from "../../../actions/core/headers";
|
||||||
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { respondError } from "../middleware/apiResponse";
|
import { respondError } from "../middleware/apiResponse";
|
||||||
import { relayGet } from "../middleware/relayForwarding";
|
import { relayGet } from "../middleware/relayForwarding";
|
||||||
|
|
||||||
@@ -70,9 +71,9 @@ export default async function ApiProxy(req, res) {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
if (_.has(data, "@odata.nextLink") === true) {
|
if (hasOwn(data, "@odata.nextLink") === true) {
|
||||||
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
||||||
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
|
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
|
|||||||
@@ -43,8 +43,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import CryptoJS from "crypto-js";
|
import CryptoJS from "crypto-js";
|
||||||
import _ from "lodash";
|
|
||||||
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
|
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
|
||||||
|
import { hasOwn } from "../../../components/utils";
|
||||||
import { respondError } from "../middleware/apiResponse";
|
import { respondError } from "../middleware/apiResponse";
|
||||||
import { relayGet } from "../middleware/relayForwarding";
|
import { relayGet } from "../middleware/relayForwarding";
|
||||||
|
|
||||||
@@ -175,9 +175,9 @@ export default async function ApiProxy(req, res) {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
if (_.has(data, "@odata.nextLink") === true) {
|
if (hasOwn(data, "@odata.nextLink") === true) {
|
||||||
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
const dataStr = JSON.stringify(data["@odata.nextLink"]);
|
||||||
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
|
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ export default async function ApiProxy(req, res) {
|
|||||||
const crmUrl = "https://" + process.env.CRMURL;
|
const crmUrl = "https://" + process.env.CRMURL;
|
||||||
|
|
||||||
const data = {
|
const data = {
|
||||||
"@odata.id": crmUrl + "/api/data/v8.2/contacts(" + contactid + ")"
|
"@odata.id": crmUrl + "/api/data/v9.2/contacts(" + contactid + ")"
|
||||||
};
|
};
|
||||||
|
|
||||||
const config = {
|
const config = {
|
||||||
|
|||||||
+1
-1
@@ -30,4 +30,4 @@ pinswg_ldp
|
|||||||
pinswg_maintenanceoflands217
|
pinswg_maintenanceoflands217
|
||||||
pinswg_electricityact
|
pinswg_electricityact
|
||||||
|
|
||||||
https://devcrm2016.llcdt.gov.wales/DVPINS/api/data/v8.2/EntityDefinitions(LogicalName='incident')/Attributes(LogicalName='pinswg_appealcasetype')/Microsoft.Dynamics.CRM.PicklistAttributeMetadata?$select=LogicalName&$expand=GlobalOptionSet($select=Options)
|
https://devcrm2016.llcdt.gov.wales/DVPINS/api/data/v9.2/EntityDefinitions(LogicalName='incident')/Attributes(LogicalName='pinswg_appealcasetype')/Microsoft.Dynamics.CRM.PicklistAttributeMetadata?$select=LogicalName&$expand=GlobalOptionSet($select=Options)
|
||||||
+2
-3
@@ -9,9 +9,8 @@ import Footer from "../../components/footer";
|
|||||||
import Header from "../../components/header";
|
import Header from "../../components/header";
|
||||||
import { wrapper } from "../../store/store";
|
import { wrapper } from "../../store/store";
|
||||||
|
|
||||||
import _ from "lodash";
|
|
||||||
import Breadcrumbs from "../../components/breadcrumbs";
|
import Breadcrumbs from "../../components/breadcrumbs";
|
||||||
import { getSearchDetails } from "../../components/utils";
|
import { getSearchDetails, hasOwn } from "../../components/utils";
|
||||||
import { setSearch } from "../../store/search/action";
|
import { setSearch } from "../../store/search/action";
|
||||||
import {
|
import {
|
||||||
setSearchDetails,
|
setSearchDetails,
|
||||||
@@ -58,7 +57,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
|
|||||||
);
|
);
|
||||||
|
|
||||||
let searchResultsObj = await getDNSList();
|
let searchResultsObj = await getDNSList();
|
||||||
if (_.has(searchResultsObj, "status") != false) {
|
if (hasOwn(searchResultsObj, "status") != false) {
|
||||||
if (searchResultsObj.status == 400) {
|
if (searchResultsObj.status == 400) {
|
||||||
return {
|
return {
|
||||||
redirect: {
|
redirect: {
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import CookieBanner from "../components/cookieBanner";
|
|||||||
import DNSSearchResults from "../components/dnssearchresults";
|
import DNSSearchResults from "../components/dnssearchresults";
|
||||||
import Footer from "../components/footer";
|
import Footer from "../components/footer";
|
||||||
import Header from "../components/header";
|
import Header from "../components/header";
|
||||||
import { getSearchDetails } from "../components/utils";
|
import { getSearchDetails, hasOwn } from "../components/utils";
|
||||||
import { setSearch } from "../store/search/action";
|
import { setSearch } from "../store/search/action";
|
||||||
import {
|
import {
|
||||||
setSearchDetails,
|
setSearchDetails,
|
||||||
@@ -143,7 +143,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
|
|||||||
const showMapCheck = process.env.SHOWMAPS || false;
|
const showMapCheck = process.env.SHOWMAPS || false;
|
||||||
const mapTarget = process.env.MAP_TARGET || "pedw-dev";
|
const mapTarget = process.env.MAP_TARGET || "pedw-dev";
|
||||||
|
|
||||||
// if (_.has(searchResultsObj, "status") == true) {
|
// if (hasOwn(searchResultsObj, "status") == true) {
|
||||||
// return {
|
// return {
|
||||||
// redirect: {
|
// redirect: {
|
||||||
// //destination: "/dns-not-found",
|
// //destination: "/dns-not-found",
|
||||||
|
|||||||
+2
-1
@@ -18,6 +18,7 @@ import AIPolicyNotice from "../components/AIPolicyNotice";
|
|||||||
import { setContainerID } from "../store/accountDetails/action";
|
import { setContainerID } from "../store/accountDetails/action";
|
||||||
import { setShowReps } from "../store/currentView/action";
|
import { setShowReps } from "../store/currentView/action";
|
||||||
import { wrapper } from "../store/store";
|
import { wrapper } from "../store/store";
|
||||||
|
import { hasOwn } from "../components/utils";
|
||||||
|
|
||||||
const Home = (props) => {
|
const Home = (props) => {
|
||||||
const {
|
const {
|
||||||
@@ -49,7 +50,7 @@ const Home = (props) => {
|
|||||||
|
|
||||||
hasLoginCode == false
|
hasLoginCode == false
|
||||||
? "" //console.log("no session")
|
? "" //console.log("no session")
|
||||||
: _.has(loggedInUserId, "value")
|
: hasOwn(loggedInUserId, "value")
|
||||||
? _.isEmpty(loggedInUserId.value)
|
? _.isEmpty(loggedInUserId.value)
|
||||||
? router.replace({
|
? router.replace({
|
||||||
pathname:
|
pathname:
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
//import fs from "fs";
|
//import fs from "fs";
|
||||||
import _ from "lodash";
|
|
||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import Head from "next/head";
|
import Head from "next/head";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
@@ -12,6 +11,7 @@ import Header from "../../components/header";
|
|||||||
import Search from "../../components/myportal/addresssearch";
|
import Search from "../../components/myportal/addresssearch";
|
||||||
import ServiceBanner from "../../components/myportal/servicebanner";
|
import ServiceBanner from "../../components/myportal/servicebanner";
|
||||||
import TimeOut from "../../components/timeout";
|
import TimeOut from "../../components/timeout";
|
||||||
|
import { hasOwn } from "../../components/utils";
|
||||||
|
|
||||||
const Home = (props) => {
|
const Home = (props) => {
|
||||||
const { footerLinks, pages } = props;
|
const { footerLinks, pages } = props;
|
||||||
@@ -22,8 +22,8 @@ const Home = (props) => {
|
|||||||
const { appealtypes } = router.query;
|
const { appealtypes } = router.query;
|
||||||
|
|
||||||
var hasError =
|
var hasError =
|
||||||
_.has(props.LPAData.LPAData, "errorCode") ||
|
hasOwn(props.LPAData.LPAData, "errorCode") ||
|
||||||
_.has(props.appealType.appealType, "errorCode")
|
hasOwn(props.appealType.appealType, "errorCode")
|
||||||
? true
|
? true
|
||||||
: false;
|
: false;
|
||||||
|
|
||||||
@@ -123,7 +123,7 @@ const mapStateToProps = (state) => {
|
|||||||
appealType: state.appealType,
|
appealType: state.appealType,
|
||||||
LPAData: state.LPAData,
|
LPAData: state.LPAData,
|
||||||
//form: state.form,
|
//form: state.form,
|
||||||
accountDetails: state.accountDetails,
|
accountDetails: state.accountDetails
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import _ from "lodash";
|
|
||||||
import { getSession } from "next-auth/react";
|
import { getSession } from "next-auth/react";
|
||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import Head from "next/head";
|
import Head from "next/head";
|
||||||
@@ -28,6 +27,7 @@ import { setLPA, setCaseStatus } from "../../store/lpa/action";
|
|||||||
import { wrapper } from "../../store/store";
|
import { wrapper } from "../../store/store";
|
||||||
import ServiceBanner from "../../components/myportal/servicebanner";
|
import ServiceBanner from "../../components/myportal/servicebanner";
|
||||||
import { getCaseStatus } from "../../actions/services/caseDirectService";
|
import { getCaseStatus } from "../../actions/services/caseDirectService";
|
||||||
|
import { hasOwn } from "../../components/utils";
|
||||||
|
|
||||||
const Home = (props) => {
|
const Home = (props) => {
|
||||||
const { footerLinks, pages } = props;
|
const { footerLinks, pages } = props;
|
||||||
@@ -38,8 +38,8 @@ const Home = (props) => {
|
|||||||
const { appealtypes } = router.query;
|
const { appealtypes } = router.query;
|
||||||
|
|
||||||
var hasError =
|
var hasError =
|
||||||
_.has(props.LPAData.LPAData, "errorCode") ||
|
hasOwn(props.LPAData.LPAData, "errorCode") ||
|
||||||
_.has(props.appealType.appealType, "errorCode")
|
hasOwn(props.appealType.appealType, "errorCode")
|
||||||
? true
|
? true
|
||||||
: false;
|
: false;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import Head from "next/head";
|
import Head from "next/head";
|
||||||
import { getSession, useSession } from "next-auth/react";
|
import { getSession, useSession } from "next-auth/react";
|
||||||
import _ from "lodash";
|
|
||||||
|
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
@@ -148,15 +147,6 @@ export const getServerSideProps = wrapper.getServerSideProps(
|
|||||||
let thisSession = await getSession(ctx);
|
let thisSession = await getSession(ctx);
|
||||||
//console.log("nextAuth Session:", thisSession);
|
//console.log("nextAuth Session:", thisSession);
|
||||||
|
|
||||||
// if (_.has(thisSession, "user") == false) {
|
|
||||||
// return {
|
|
||||||
// redirect: {
|
|
||||||
// destination: "/error",
|
|
||||||
// permanent: false,
|
|
||||||
// },
|
|
||||||
// };
|
|
||||||
// }
|
|
||||||
|
|
||||||
if (!thisSession) {
|
if (!thisSession) {
|
||||||
console.log("not has sesssion.......");
|
console.log("not has sesssion.......");
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import _ from "lodash";
|
|
||||||
import useTranslation from "next-translate/useTranslation";
|
import useTranslation from "next-translate/useTranslation";
|
||||||
import Head from "next/head";
|
import Head from "next/head";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
@@ -132,34 +131,6 @@ export const getServerSideProps = wrapper.getServerSideProps(
|
|||||||
const showLoginCheck = process.env.SHOWLOGIN || false;
|
const showLoginCheck = process.env.SHOWLOGIN || false;
|
||||||
const showReps = process.env.SHOWREPRESENTATIONS || false;
|
const showReps = process.env.SHOWREPRESENTATIONS || false;
|
||||||
store.dispatch(setShowReps(showReps, showLoginCheck));
|
store.dispatch(setShowReps(showReps, showLoginCheck));
|
||||||
|
|
||||||
// let searchResultsObj = await getBasicSearch(query.q);
|
|
||||||
|
|
||||||
// searchResultsObj =
|
|
||||||
// searchResultsObj.status == 502
|
|
||||||
// ? {
|
|
||||||
// value: [],
|
|
||||||
// errorCode: searchResultsObj.status,
|
|
||||||
// errorMsg: searchResultsObj.statusText,
|
|
||||||
// }
|
|
||||||
// : searchResultsObj;
|
|
||||||
|
|
||||||
// if (_.has(searchResultsObj, "status") == true) {
|
|
||||||
// return {
|
|
||||||
// redirect: {
|
|
||||||
// //destination: "/dns-not-found",
|
|
||||||
// destination: "/error",
|
|
||||||
// permanent: false,
|
|
||||||
// },
|
|
||||||
// };
|
|
||||||
// } else {
|
|
||||||
// // const searchDetailsObj = await getSearchDetails(searchResultsObj);
|
|
||||||
|
|
||||||
// store.dispatch(setSearchResults(searchResultsObj));
|
|
||||||
// // store.dispatch(setSearchDetails(searchDetailsObj));
|
|
||||||
// store.dispatch(setSearch(query.q));
|
|
||||||
// }
|
|
||||||
|
|
||||||
store.dispatch(setSearch(query?.q || ""));
|
store.dispatch(setSearch(query?.q || ""));
|
||||||
return {
|
return {
|
||||||
props: {
|
props: {
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ test("getdnslist_api still returns 200 and preserves nextLink transform", async
|
|||||||
data: {
|
data: {
|
||||||
value: [{ id: 1 }],
|
value: [{ id: 1 }],
|
||||||
"@odata.nextLink":
|
"@odata.nextLink":
|
||||||
"https://example.test/v8.2/incidents?$skiptoken=abc"
|
"https://example.test/v9.2/incidents?$skiptoken=abc"
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ test("getbasicdnssearch_api still returns 200 and preserves nextLink transform",
|
|||||||
data: {
|
data: {
|
||||||
value: [{ id: 1 }],
|
value: [{ id: 1 }],
|
||||||
"@odata.nextLink":
|
"@odata.nextLink":
|
||||||
"https://example.test/v8.2/incidents?$skiptoken=dns"
|
"https://example.test/v9.2/incidents?$skiptoken=dns"
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -116,7 +116,7 @@ test("getbasicdnsurlsearch_api valid searchString still returns 200", async () =
|
|||||||
data: {
|
data: {
|
||||||
value: [{ id: 1 }],
|
value: [{ id: 1 }],
|
||||||
"@odata.nextLink":
|
"@odata.nextLink":
|
||||||
"https://example.test/v8.2/incidents?$skiptoken=url"
|
"https://example.test/v9.2/incidents?$skiptoken=url"
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user