-
-
-
-
-
*/}
- 
-
-
-
- 
{" "}
-
- {" "}
-
-
- {props.accountDetails.accountDetails.firstname}{" "}
- {props.accountDetails.accountDetails.lastname}
- {" - "}
- {
- props.accountDetails.accountDetails[
- "pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue"
- ]
- }
-
-
-
- {
- handleLogout();
- }}
- className="govuk-header__link "
- >
- {t("common:signout-label")}
-
-
- - {router.locale == "cy" - ? jsonpath({ - path: - '$..[?(@ && @.value=="' + - props.accountDetails.accountDetails[ - "pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy', - json: transLookup, - eval: true - }) - : props.accountDetails.accountDetails[ - "pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue" - ]}{" "} + {resolveCrmDisplayValue({ + value: props.accountDetails.accountDetails[ + "pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue" + ], + locale, + translations: transLookup + })}{" "} {t("myportal:lpa-portal-heading")}
{t("myportal:appeal-type-label")}:{" "}
- {router.locale == "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- getFormCollectionByID(
- showTopThreeArr[key]
- .pinswg_appealcasetype
- ).value +
- '")].value_cy',
- json: transLookup,
- eval: true
- })
- : getFormCollectionByID(
- showTopThreeArr[key]
- .pinswg_appealcasetype
- ).value || ""}
+ {resolveCrmDisplayValue({
+ value: getFormCollectionByID(
+ showTopThreeArr[key]
+ .pinswg_appealcasetype
+ ).value,
+ locale,
+ translations: transLookup
+ })}
{t("myportal:case-address")}:{" "}
@@ -302,20 +294,14 @@ const AwaitingSubmissionFromBlob = (props) => {
{router.locale == "cy" ? "ACLl" : "LPA"}
:
- {router.locale == "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- showTopThreeArr[key][
- "pinswg_lpaname"
- ] +
- '")].value_cy',
- json: transLookup,
- eval: true
- })
- : showTopThreeArr[key][
- "pinswg_lpaname"
- ] || ""}
+
+ {resolveCrmDisplayValue({
+ value: showTopThreeArr[key][
+ "pinswg_lpaname"
+ ],
+ locale,
+ translations: transLookup
+ })}
{t("myportal:date-raised")}:
diff --git a/components/myportal/topthree.js b/components/myportal/topthree.js
index 91c0a10c..bc8fe812 100644
--- a/components/myportal/topthree.js
+++ b/components/myportal/topthree.js
@@ -1,4 +1,3 @@
-import { JSONPath as jsonpath } from "jsonpath-plus";
import _ from "lodash";
import useTranslation from "next-translate/useTranslation";
import Link from "next/link";
@@ -33,6 +32,7 @@ import { planningappeals78_pdf } from "../../components/pdftemplates/planningapp
import { other_pdf } from "../../components/pdftemplates/other_pdf";
import { PDFDownloadLink, pdf } from "@react-pdf/renderer";
+import resolveCrmDisplayValue from "../../lib/i18n/crmDisplay/resolveCrmDisplayValue";
const TopThree = (props) => {
let { t } = useTranslation();
@@ -406,20 +406,13 @@ const TopThree = (props) => {
{t("myportal:appeal-type-label")}:{" "}
- {router.locale == "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- showTopThreeArr[key][
- "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
- ] +
- '")].value_cy',
- json: transLookup,
- eval: true
- })
- : showTopThreeArr[key][
- "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
- ] || ""}
+ {resolveCrmDisplayValue({
+ value: showTopThreeArr[key][
+ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
+ ],
+ locale,
+ translations: transLookup
+ })}
{/* )} */}
{/* {topThreeType != "awaitingSubmission" ? ( */}
@@ -484,20 +477,13 @@ const TopThree = (props) => {
)}
{router.locale == "cy" ? "ACLl" : "LPA"}:
- {router.locale == "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- showTopThreeArr[key][
- "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
- ] +
- '")].value_cy',
- json: transLookup,
- eval: true
- })
- : showTopThreeArr[key][
- "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
- ] || ""}
+ {resolveCrmDisplayValue({
+ value: showTopThreeArr[key][
+ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
+ ],
+ locale,
+ translations: transLookup
+ })}
{topThreeType == "awaitingSubmission" ? (
diff --git a/components/myportal/topthree_reps.js b/components/myportal/topthree_reps.js
index 40c3ab99..2d11eb9a 100644
--- a/components/myportal/topthree_reps.js
+++ b/components/myportal/topthree_reps.js
@@ -1,4 +1,3 @@
-import { JSONPath as jsonpath } from "jsonpath-plus";
import useTranslation from "next-translate/useTranslation";
import Link from "next/link";
import { useRouter } from "next/router";
@@ -34,6 +33,7 @@ import {
setWatchedCasesDetails
} from "../../store/watchedCases/action";
import { getFormCollectionByID, getDetailsProxy } from "../utils";
+import resolveCrmDisplayValue from "../../lib/i18n/crmDisplay/resolveCrmDisplayValue";
const TopThree = (props) => {
let { t } = useTranslation();
@@ -196,19 +196,6 @@ const TopThree = (props) => {
{showTopThreeArr[key].pinswg_name}
) : (
{
{t("myportal:representation-type")}:
- {" "}
-
- {router.locale == "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- showTopThreeArr[key].representationType +
- '")].value_cy',
- json: transLookup,
- eval: true
- })
- : showTopThreeArr[key].representationType || ""}
+ {resolveCrmDisplayValue({
+ value: showTopThreeArr[key].representationType,
+ locale,
+ translations: transLookup
+ })}
{t("myportal:capacity")}:
- {" "}
- {router.locale == "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- showTopThreeArr[key]
- .representationCapacity +
- '" ||@.value_cy=="' +
- showTopThreeArr[key]
- .representationCapacity +
- '" )].value_cy',
- json: transLookup,
- eval: true
- })
- : jsonpath({
- path:
- '$..[?(@ && @.value_cy=="' +
- showTopThreeArr[key]
- .representationCapacity +
- '")].value',
- json: transLookup,
- eval: true
- }).length > 0
- ? jsonpath({
- path:
- '$..[?(@ && @.value_cy=="' +
- showTopThreeArr[key]
- .representationCapacity +
- '")].value',
- json: transLookup,
- eval: true
- })
- : showTopThreeArr[key].representationCapacity}
+ {resolveCrmDisplayValue({
+ value: showTopThreeArr[key].representationCapacity,
+ locale,
+ translations: transLookup
+ })}
{t("myportal:date-raised")}:
@@ -348,22 +300,13 @@ const TopThree = (props) => {
{" "}
{router.locale == "cy" ? "ACLl" : "LPA"}:
- {" "}
-
- {router.locale == "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- showTopThreeArr[key][
- "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
- ] +
- '")].value_cy',
- json: transLookup,
- eval: true
- })
- : showTopThreeArr[key][
- "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
- ] || ""}
+ {resolveCrmDisplayValue({
+ value: showTopThreeArr[key][
+ "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
+ ],
+ locale,
+ translations: transLookup
+ })}
{showTopThreeArr[key].hasOwnProperty("repComplete") && (
diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js
index 15af643e..12b9c1ec 100644
--- a/components/myportal/viewall.js
+++ b/components/myportal/viewall.js
@@ -46,6 +46,7 @@ import {
setMyRepresentations,
setMyRepresentationsDetails
} from "../../store/myRepresentations/action";
+import resolveCrmDisplayValue from "../../lib/i18n/crmDisplay/resolveCrmDisplayValue";
const ViewAllResults = (props) => {
const {
@@ -493,86 +494,66 @@ const ViewAllResults = (props) => {
{isAwaitingSubmissionDetails &&
hasOwn(resultItem, "pinswg_lpaname")
- ? router.locale === "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- resultItem.pinswg_lpaname +
- '")].value_cy',
- json: transLookup,
- eval: true
- })
- : resultItem.pinswg_lpaname || "N/A"
+ ? resolveCrmDisplayValue({
+ value: resultItem.pinswg_lpaname,
+ locale: router.locale,
+ translations: transLookup,
+ fallbackValue: "N/A"
+ })
: ""}
{hasOwn(resultItem, [
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
])
- ? router.locale === "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- resultItem[
- "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
- ] +
- '")].value_cy',
- json: transLookup,
- eval: true
- })
- : resultItem[
+ ? resolveCrmDisplayValue({
+ value: resultItem[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
- ] || "N/A"
+ ],
+ locale: router.locale,
+ translations: transLookup,
+ fallbackValue: "N/A"
+ })
: ""}
{hasOwn(searchDetailsObj[key], [
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
])
- ? router.locale === "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- (searchDetailsObj[key][
- "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
- ] ||
- searchDetailsObj[key]?.value[0][
- "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
- ]) +
- '")].value_cy',
- json: transLookup,
- eval: true
- })
- : isMyRepresentations
- ? searchDetailsObj[key].value
- : searchDetailsObj[key].value[0][
- "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
- ] || "N/A"
+ ? resolveCrmDisplayValue({
+ value:
+ searchDetailsObj[key][
+ "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
+ ] ||
+ searchDetailsObj[key]?.value[0][
+ "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
+ ],
+ locale: router.locale,
+ translations: transLookup,
+ fallbackValue: isMyRepresentations
+ ? searchDetailsObj[key].value
+ : searchDetailsObj[key].value[0][
+ "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
+ ] || "N/A"
+ })
: ""}
{hasOwn(resultItem, [
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
])
- ? router.locale === "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- resultItem[
- "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
- ] +
- '")].value_cy',
- json: transLookup,
- eval: true
- })
- : resultItem[
+ ? resolveCrmDisplayValue({
+ value: resultItem[
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
- ] || (isMyRepresentations ? "" : "N/A")
+ ],
+ locale: router.locale,
+ translations: transLookup,
+ fallbackValue: isMyRepresentations
+ ? ""
+ : "N/A"
+ })
: isMyRepresentations &&
router.locale === "cy" &&
- jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- searchDetailsObj[key][
- "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
- ] +
- '")].value_cy',
- json: transLookup,
- eval: true
+ resolveCrmDisplayValue({
+ value: searchDetailsObj[key][
+ "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
+ ],
+ locale: router.locale,
+ translations: transLookup
})}
@@ -581,50 +562,36 @@ const ViewAllResults = (props) => {
{isAwaitingSubmissionDetails
- ? router.locale === "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- getFormCollectionByID(
- item.pinswg_appealcasetype
- ).value +
- '")].value_cy',
- json: transLookup,
- eval: true
- })
- : getFormCollectionByID(
+ ? resolveCrmDisplayValue({
+ value: getFormCollectionByID(
item.pinswg_appealcasetype
- ).value || "N/A"
- : router.locale === "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- item[
- "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
- ] +
- '")].value_cy',
- json: transLookup,
- eval: true
- })
- : item[
- "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
- ] || (isMyRepresentations ? "" : "N/A")}
+ ).value,
+ locale: router.locale,
+ translations: transLookup,
+ fallbackValue: "N/A"
+ })
+ : resolveCrmDisplayValue({
+ value: item[
+ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
+ ],
+ locale: router.locale,
+ translations: transLookup,
+ fallbackValue: isMyRepresentations
+ ? ""
+ : "N/A"
+ })}
{isMyRepresentations &&
- (router.locale === "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- getFormCollectionByID(
- searchDetailsObj[key].appealType
- ).value +
- '")].value_cy',
- json: transLookup,
- eval: true
- })[0]
- : getFormCollectionByID(
- searchDetailsObj[key].appealType
- ).value)}
+ resolveCrmDisplayValue({
+ value: getFormCollectionByID(
+ searchDetailsObj[key].appealType
+ ).value,
+ locale: router.locale,
+ translations: transLookup,
+ fallbackValue: getFormCollectionByID(
+ searchDetailsObj[key].appealType
+ ).value
+ })}
{hasOwn(
searchDetailsObj[key],
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
@@ -658,41 +625,14 @@ const ViewAllResults = (props) => {
}) || "N/A"
: isMyRepresentations
? repRaisedDate(item.repfile_name) // ? router.locale == "cy"
- : // ? jsonpath({path:
- //
- // '$..[?(@ && @.value=="' +
- // searchDetailsObj[key].value[0][
- // "statuscode@OData.Community.Display.V1.FormattedValue"
- // ] +
- // '")].value_cy',transLookup,
- // )
- // : searchDetailsObj[key].value[0][
- // "statuscode@OData.Community.Display.V1.FormattedValue"
- // ] || "N/A"
- // : router.locale == "cy"
- // ? jsonpath({path:
- //
- // '$..[?(@ && @.value=="' +
- // item[
- // "statuscode@OData.Community.Display.V1.FormattedValue"
- // ] +
- // '")].value_cy',transLookup,
- // )
-
- router.locale === "cy"
- ? jsonpath({
- path:
- '$..[?(@ && @.value=="' +
- item[
- "statuscode@OData.Community.Display.V1.FormattedValue"
- ] +
- '")].value_cy',
- json: transLookup,
- eval: true
- })
- : item[
- "statuscode@OData.Community.Display.V1.FormattedValue"
- ] || "N/A"}
+ : resolveCrmDisplayValue({
+ value: item[
+ "statuscode@OData.Community.Display.V1.FormattedValue"
+ ],
+ locale: router.locale,
+ translations: transLookup,
+ fallbackValue: "N/A"
+ })}
{isAwaitingSubmissionDetails && (
diff --git a/components/newappeal/buildcheckrow.js b/components/newappeal/buildcheckrow.js
index 7925320f..a23d6e0e 100644
--- a/components/newappeal/buildcheckrow.js
+++ b/components/newappeal/buildcheckrow.js
@@ -24,6 +24,7 @@ import {
selectRowFieldType,
selectRowLabelDescriptions
} from "../../lib/newappeal/formDerivation";
+import { resolveCrmDisplayValue } from "../../lib/i18n/crmDisplay/resolveCrmDisplayValue";
let BuildCheckRow = (props) => {
let { t } = useTranslation();
@@ -74,14 +75,12 @@ let BuildCheckRow = (props) => {
eval: true
});
- let labelTrans =
- router.locale == "cy"
- ? jsonpath({
- path: '$..[?(@ && @.value=="' + label + '")].value_cy',
- json: formObj,
- eval: true
- })
- : label;
+ let labelTrans = resolveCrmDisplayValue({
+ value: label,
+ locale,
+ translations: formObj
+ });
+
return labelTrans;
};
diff --git a/components/newappeal/buildchecksection.js b/components/newappeal/buildchecksection.js
index a80c7439..2ebda3eb 100644
--- a/components/newappeal/buildchecksection.js
+++ b/components/newappeal/buildchecksection.js
@@ -32,6 +32,7 @@ import DocsOfflineNotice from "./buildCheckSection/DocsOfflineNotice";
import FinalisingStatePanel from "./buildCheckSection/FinalisingStatePanel";
import SectionReviewList from "./buildCheckSection/SectionReviewList";
import SubmitActionsPanel from "./buildCheckSection/SubmitActionsPanel";
+import resolveCrmDisplayValue from "../../lib/i18n/crmDisplay/resolveCrmDisplayValue";
let BuildCheckSection = (props) => {
useEffect(() => {
@@ -144,14 +145,11 @@ let BuildCheckSection = (props) => {
eval: true
});
- let labelTrans =
- router.locale == "cy"
- ? jsonpath({
- path: '$..[?(@ && @.value=="' + label + '")].value_cy',
- json: formObj,
- eval: true
- })
- : label;
+ let labelTrans = resolveCrmDisplayValue({
+ value: label,
+ locale,
+ translations: formObj
+ });
return labelTrans;
};
diff --git a/components/newappeal/createCase.js b/components/newappeal/createCase.js
index 390a1ab4..c7e60792 100644
--- a/components/newappeal/createCase.js
+++ b/components/newappeal/createCase.js
@@ -1,4 +1,3 @@
-import { JSONPath as jsonpath } from "jsonpath-plus";
import useTranslation from "next-translate/useTranslation";
import { useRouter } from "next/router";
import { useState } from "react";
@@ -15,6 +14,7 @@ import {
} from "../../store/appealType/action";
import { getFormCollectionByID, hasOwn } from "../utils";
import Aboutyou from "./aboutyou";
+import resolveCrmDisplayValue from "../../lib/i18n/crmDisplay/resolveCrmDisplayValue";
const RenderLPAList = ({
name,
@@ -52,32 +52,29 @@ const RenderLPAList = ({
className="govuk-select govuk-input--error"
id="lpatypes"
name="lpatypes"
- //onChange={(e) => props.onChangeSelectLPA(e)}
>
- {_.isEmpty(optionsObj)
- ? ""
- : Object.keys(optionsObj).map((key, index) => {
- return (
-
- );
- })}
+
+ {Object.keys(optionsObj || {}).map((key) => {
+ const option = optionsObj[key];
+
+ return (
+
+ );
+ })}
@@ -119,53 +116,33 @@ const RenderAppealTypeList = ({
className="govuk-select"
id="appealTypes"
name={name}
- //onChange={(e) => props.onChangeSelectAppealType(e)}
>
- {_.isEmpty(optionsObj)
- ? ""
- : Object.keys(optionsObj).map((key, index) => {
- return (
-
- );
- })}
+
+ {Object.keys(optionsObj || {}).map((key) => {
+ const option = optionsObj[key];
+
+ return (
+
+ );
+ })}
@@ -305,25 +282,11 @@ function Radiofield(props) {
.slice(1, props.options.length - 1)
.split(",");
- //parentFieldShowOnValue
var showIfHasParentShowValue = parentField != false;
- //debugger;
- // parentField != false &&
- // !_.isEmpty(formProps[form]) &&
- // hasOwn(formProps[form].values, parentField) &&
- // parentFieldShowOnValue.indexOf(
- // formProps[form].values[parentField].toString()
- // ) > -1;
(showIfHasParentShowValue == parentField) != false &&
showIfHasParentShowValue;
- //console.log(
- // datafieldname,
- // showIfHasParentShowValue,
- // formProps[form].values[parentField]
- // );
-
return (
<>
{parentField != false ? (
@@ -466,20 +429,6 @@ let CreateCase = (props) => {
.catch((error) => {
consoleLogger(error);
});
-
- // router.replace(
- // "/newappeal" +
- // "/" +
- // appTypeCollection.UrlName +
- // "?lpa=" +
- // values.lpaTypes +
- // "&apt=" +
- // values.appealTypes.split(",")[0],
- // null,
- // {
- // shallow: true,
- // }
- // );
};
const yesNo = isWelsh ? ["Ydw", "Na"] : ["Yes", "No"];
@@ -488,13 +437,13 @@ let CreateCase = (props) => {
form = "caseForm",
parentFieldShowOnValue = "846040004";
- var showIfHasParentShowValue =
- parentField != false &&
- !_.isEmpty(formProps[form]) &&
- hasOwn(formProps[form].values, parentField) &&
- parentFieldShowOnValue.indexOf(
- formProps[form].values[parentField].toString()
- ) > -1;
+ const values = formProps[form]?.values;
+
+ const showIfHasParentShowValue =
+ parentField !== false &&
+ values &&
+ hasOwn(values, parentField) &&
+ parentFieldShowOnValue.includes(values[parentField].toString());
(showIfHasParentShowValue == parentField) != false &&
showIfHasParentShowValue;
diff --git a/components/pdftemplates/appealRow_pdf.js b/components/pdftemplates/appealRow_pdf.js
index 6e97ad6e..6c8cbe30 100644
--- a/components/pdftemplates/appealRow_pdf.js
+++ b/components/pdftemplates/appealRow_pdf.js
@@ -14,6 +14,7 @@ import Html from "react-pdf-html";
import { DOMParser, XMLSerializer } from "@xmldom/xmldom";
import transLookup from "../../data/lookuptranslations.json";
+import resolveCrmDisplayValue from "../../lib/i18n/crmDisplay/resolveCrmDisplayValue";
export const AppealRow_pdf = (props) => {
let { t } = useTranslation();
@@ -435,32 +436,18 @@ export const AppealRow_pdf = (props) => {
)}