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

fixed empty project description

Browse Source
This commit is contained in:
robbond
2021-10-27 11:47:19 +01:00
parent 5106cc918b
commit aa3fbb10cf
12 changed files with 258 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.local
+10 -10
View File
@@ -1,9 +1,9 @@
// dev
//RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
//RELAYURI = "dev-pedw-ns.servicebus.windows.net"
//RELAYPATH = "dev-pedw-hc"
//SASKEY = "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y="
//SASKEYNAME = "devpedwnspolicy"
RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
RELAYURI = "dev-pedw-ns.servicebus.windows.net"
RELAYPATH = "dev-pedw-hc"
SASKEY = "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y="
SASKEYNAME = "devpedwnspolicy"
PORT= "3000"
@@ -23,11 +23,11 @@ I18N_DOMAIN = "cymru.local"
//preprod
RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/
RELAYURI = "pp-pedw-ns.servicebus.windows.net"
RELAYPATH = "pp-pedw-hc"
SASKEY = "JzrOYfMTsGBD1cZHH2nkzqsbfDCqg0brO6jyiIDNVPo="
SASKEYNAME = "pppedwnspolicy"
//RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/
//RELAYURI = "pp-pedw-ns.servicebus.windows.net"
//RELAYPATH = "pp-pedw-hc"
//SASKEY = "JzrOYfMTsGBD1cZHH2nkzqsbfDCqg0brO6jyiIDNVPo="
//SASKEYNAME = "pppedwnspolicy"
GOOGLE_TAG_MANAGER = GTM-T78CBC3
actions/index.js
+1 -1
View File
@@ -642,7 +642,7 @@ export const getLPA = (token) => {
azureHeaders(token)
)
.then((res) => {
// console.log(res.data);
console.log(res.data);
return res.data;
})
.catch((error) => {
components/case/documents.js
+6 -2
View File
@@ -52,9 +52,13 @@ const DocumentDetails = (props) => {
return (
<>
<p>
{t("case:documents-count-label-1")}{" "}
{documentDetailsObj["@odata.count"] > 1
? t("case:documents-count-label-1")
: t("case:documents-count-label-1a")}{" "}
{documentDetailsObj["@odata.count"]}{" "}
{t("case:documents-count-label-2")}
{documentDetailsObj["@odata.count"] > 1
? t("case:documents-count-label-2")
: t("case:documents-count-label-2a")}
</p>
<dl className="documentList govuk-summary-list govuk-!-margin-bottom-9 results">
<div className="govuk-summary-list__row results-headings">
components/case/pagination.js
+70 -67
View File
@@ -73,81 +73,84 @@ const PaginationControl = (props) => {
return (
<>
{" "}
<div className="govuk-!-margin-bottom-7 ">
<div className="govuk-grid-row paginationWrapper">
<div className="govuk-grid-column-one-quarter paginationPrevious">
{currentPage != 1 ? (
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem leftTextButton"
onClick={() => {
spinnerState(),
getDocumentResults(currentPage - 1);
}}
>
{t("common:previous-link-button")}
</span>
) : (
<span className="govuk-body leftTextButton govuk-!-font-weight-bold">
{t("common:previous-link-button")}
</span>
)}
</div>
<div className="govuk-grid-column-one-half paginationContainer">
{paginationArray.map((e, i) =>
currentPage == i + 1 ? (
{pagesCount > 1 ? (
<div className="govuk-!-margin-bottom-7 ">
<div className="govuk-grid-row paginationWrapper">
<div className="govuk-grid-column-one-quarter paginationPrevious">
{currentPage != 1 ? (
<span
key={i}
className=" govuk-body govuk-!-padding-2 govuk-!-font-weight-bold "
>
{e}
</span>
) : e == "..." ? (
<span
key={i}
className=" govuk-body govuk-!-padding-2 govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem"
>
{e}
</span>
) : (
<span
className="govuk-body govuk-link govuk-!-padding-2 govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem"
key={i}
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem leftTextButton"
onClick={() => {
spinnerState();
console.log(i + 1);
getDocumentResults(i + 1);
spinnerState(),
getDocumentResults(currentPage - 1);
}}
>
{e}
{t("common:previous-link-button")}
</span>
)
)}
) : (
<span className="govuk-body leftTextButton govuk-!-font-weight-bold">
{t("common:previous-link-button")}
</span>
)}
</div>
<div className="govuk-grid-column-one-half paginationContainer">
{paginationArray.map((e, i) =>
currentPage == i + 1 ? (
<span
key={i}
className=" govuk-body govuk-!-padding-2 govuk-!-font-weight-bold "
>
{e}
</span>
) : e == "..." ? (
<span
key={i}
className=" govuk-body govuk-!-padding-2 govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem"
>
{e}
</span>
) : (
<span
className="govuk-body govuk-link govuk-!-padding-2 govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem"
key={i}
onClick={() => {
spinnerState();
console.log(i + 1);
getDocumentResults(i + 1);
}}
>
{e}
</span>
)
)}
</div>
<div className="govuk-grid-column-one-quarter paginationNext">
{currentPage != pagesCount ? (
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem rightTextButton"
onClick={() => {
spinnerState(),
getDocumentResults(currentPage + 1);
}}
>
{t("common:next-link-button")}
</span>
) : (
<span className="govuk-body rightTextButton govuk-!-font-weight-bold">
{" "}
{t("common:next-link-button")}
</span>
)}
</div>
</div>
<div className="govuk-grid-column-one-quarter paginationNext">
{currentPage != pagesCount ? (
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem rightTextButton"
onClick={() => {
spinnerState(),
getDocumentResults(currentPage + 1);
}}
>
{t("common:next-link-button")}
</span>
) : (
<span className="govuk-body rightTextButton govuk-!-font-weight-bold">
{" "}
{t("common:next-link-button")}
</span>
)}
<div className="govuk-body-s mobilePageCount">
{t("common:pages-label")} {currentPage}{" "}
{t("common:of-label")} {pagesCount}
</div>
</div>
<div className="govuk-body-s mobilePageCount">
{t("common:pages-label")} {currentPage}{" "}
{t("common:of-label")} {pagesCount}
</div>
</div>
) : (
""
)}
</>
);
};
components/case/summary.js
+25
View File
@@ -282,6 +282,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -292,6 +293,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -302,6 +304,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -312,6 +315,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -323,6 +327,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -333,6 +338,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -343,6 +349,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -353,6 +360,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -363,6 +371,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -373,6 +382,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -383,6 +393,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -393,6 +404,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -403,6 +415,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -413,6 +426,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -423,6 +437,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -433,6 +448,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -443,6 +459,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -453,6 +470,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -463,6 +481,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -473,6 +492,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -484,6 +504,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -495,6 +516,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -505,6 +527,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -515,6 +538,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
@@ -525,6 +549,7 @@ const CaseSummary = (props) => {
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
components/case/summaryTypes/pinswg_dnsid.js
+35 -26
View File
@@ -12,35 +12,44 @@ const Pinswg_dnsid = (props) => {
const { locale } = router;
return (
<>
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
{t("case:summary-project-details-label")}
</h2>
<p className="govuk-body">
{router.locale == "cy"
? detailsObj.pinswg_projectdescription.split(
";"
)[1]
: detailsObj.pinswg_projectdescription.split(
";"
)[0]}
</p>
{detailsObj.pinswg_projectdescription != null ||
detailsObj.pinswg_projectlocation != null ? (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
{t("case:summary-project-details-label")}
</h2>
<p className="govuk-body">
{detailsObj.pinswg_projectdescription != null
? router.locale == "cy"
? detailsObj.pinswg_projectdescription.split(
";"
)[1]
: detailsObj.pinswg_projectdescription.split(
";"
)[0]
: ""}
</p>
<p className="govuk-body">
{" "}
{router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
: detailsObj.pinswg_projectlocation.split(
";"
)[0]}
</p>
<p className="govuk-body">
{detailsObj.pinswg_projectlocation != null
? router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
: detailsObj.pinswg_projectlocation.split(
";"
)[0]
: ""}
</p>
</div>
</div>
</div>
</div>
) : (
""
)}
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
components/case/summaryTypes/pinswg_electricityactid.js
+34 -26
View File
@@ -12,35 +12,43 @@ const Pinswg_electricityactid = (props) => {
const { locale } = router;
return (
<>
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
{t("case:summary-project-details-label")}
</h2>
<p className="govuk-body">
{router.locale == "cy"
? detailsObj.pinswg_projectdescription.split(
";"
)[1]
: detailsObj.pinswg_projectdescription.split(
";"
)[0]}
</p>
{detailsObj.pinswg_projectdescription != null ||
detailsObj.pinswg_projectlocation != null ? (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
{t("case:summary-project-details-label")}
</h2>
<p className="govuk-body">
{detailsObj.pinswg_projectdescription != null
? router.locale == "cy"
? detailsObj.pinswg_projectdescription.split(
";"
)[1]
: detailsObj.pinswg_projectdescription.split(
";"
)[0]
: ""}
</p>
<p className="govuk-body">
{" "}
{router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
: detailsObj.pinswg_projectlocation.split(
";"
)[0]}
</p>
<p className="govuk-body">
{detailsObj.pinswg_projectlocation != null
? router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
: detailsObj.pinswg_projectlocation.split(
";"
)[0]
: ""}
</p>
</div>
</div>
</div>
</div>
) : (
""
)}
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
components/case/summaryTypes/pinswg_harbourrevisionorderid.js
+34 -26
View File
@@ -12,35 +12,43 @@ const Pinswg_harbourrevisionorderid = (props) => {
const { locale } = router;
return (
<>
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
{t("case:summary-project-details-label")}
</h2>
<p className="govuk-body">
{router.locale == "cy"
? detailsObj.pinswg_projectdescription.split(
";"
)[1]
: detailsObj.pinswg_projectdescription.split(
";"
)[0]}
</p>
{detailsObj.pinswg_projectdescription != null ||
detailsObj.pinswg_projectlocation != null ? (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
{t("case:summary-project-details-label")}
</h2>
<p className="govuk-body">
{detailsObj.pinswg_projectdescription != null
? router.locale == "cy"
? detailsObj.pinswg_projectdescription.split(
";"
)[1]
: detailsObj.pinswg_projectdescription.split(
";"
)[0]
: ""}
</p>
<p className="govuk-body">
{" "}
{router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
: detailsObj.pinswg_projectlocation.split(
";"
)[0]}
</p>
<p className="govuk-body">
{detailsObj.pinswg_projectlocation != null
? router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
: detailsObj.pinswg_projectlocation.split(
";"
)[0]
: ""}
</p>
</div>
</div>
</div>
</div>
) : (
""
)}
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
components/case/summaryTypes/pinswg_transportandworkactid.js
+34 -26
View File
@@ -12,35 +12,43 @@ const Pinswg_transportandworkactid = (props) => {
const { locale } = router;
return (
<>
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
{t("case:summary-project-details-label")}
</h2>
<p className="govuk-body">
{router.locale == "cy"
? detailsObj.pinswg_projectdescription.split(
";"
)[1]
: detailsObj.pinswg_projectdescription.split(
";"
)[0]}
</p>
{detailsObj.pinswg_projectdescription != null ||
detailsObj.pinswg_projectlocation != null ? (
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m govuk-!-margin-bottom-7">
{t("case:summary-project-details-label")}
</h2>
<p className="govuk-body">
{detailsObj.pinswg_projectdescription != null
? router.locale == "cy"
? detailsObj.pinswg_projectdescription.split(
";"
)[1]
: detailsObj.pinswg_projectdescription.split(
";"
)[0]
: ""}
</p>
<p className="govuk-body">
{" "}
{router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
: detailsObj.pinswg_projectlocation.split(
";"
)[0]}
</p>
<p className="govuk-body">
{detailsObj.pinswg_projectlocation != null
? router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
: detailsObj.pinswg_projectlocation.split(
";"
)[0]
: ""}
</p>
</div>
</div>
</div>
</div>
) : (
""
)}
<div className="govuk-grid-row">
<div className="flex-container grid-row govuk-body case">
<div className="card" id="casescomment-card">
data/lookuptranslations.json
+5
View File
@@ -311,6 +311,11 @@
"value_cy": "Cyngor a Dinas Abertawe",
"pinswg_lpa": 0
},
{
"value": "City and County of Swansea Council",
"value_cy": "Dinas a Sir Abertawe",
"pinswg_lpa": 0
},
{
"value": "Torfaen County Borough Council",
"value_cy": "Cyngor Bwrdeistref Sirol Torfaen",
locales/cy/case.json
+2
View File
@@ -41,6 +41,8 @@
"documents-checking-label": "Gwirio am ddogfennau",
"documents-count-label-1": "Mae yna",
"documents-count-label-2": "dogfennau",
"documents-count-label-1a": "Mae yna",
"documents-count-label-2a": "dogfen",
"summary-application-accepted-as-valid": "Derbynnir cais fel un dilys",
"summary-application-rejected-as-invalid": "Gwrthodwyd y cais fel Ymfudwr",
"summary-confirm-request-to-vary-application": "Cadarnhewch y cais i amrywio cais",
locales/en/case.json
+2
View File
@@ -41,6 +41,8 @@
"documents-checking-label": "Checking for documents",
"documents-count-label-1": "There are",
"documents-count-label-2": "documents",
"documents-count-label-1a": "There is",
"documents-count-label-2a": "document",
"summary-application-accepted-as-valid": "Application Accepted as Valid",
"summary-application-rejected-as-invalid": "Application rejected as Invalid",
"summary-confirm-request-to-vary-application": "Confirm Request to Vary Application",