finalised copy changes as per gel review

.env.local

@@ -21,12 +21,12 @@ RELAYPATH = "ar-hc-lz-pedw-dev-uks-01"
 CRMURL = "devcrm2016.llcdt.gov.wales/DVPINS"
 
 //New Test  
-CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1
+# CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1
-CLIENT_SECRET = 6hT8Q~glL~jloWpGmvXw3UY37QFwjUE0r._jobEM
+# CLIENT_SECRET = 6hT8Q~glL~jloWpGmvXw3UY37QFwjUE0r._jobEM
-RELAY_ROOT = https://ar-ns-lz-pedw-test-uks-01.servicebus.windows.net/ar-hc-lz-pedw-test-uks-01/  
+# RELAY_ROOT = https://ar-ns-lz-pedw-test-uks-01.servicebus.windows.net/ar-hc-lz-pedw-test-uks-01/  
-RELAYURI = "ar-ns-lz-pedw-test-uks-01.servicebus.windows.net"
+# RELAYURI = "ar-ns-lz-pedw-test-uks-01.servicebus.windows.net"
-RELAYPATH = "ar-hc-lz-pedw-test-uks-01"
+# RELAYPATH = "ar-hc-lz-pedw-test-uks-01"
-CRMURL = "tscrm2016.llcdt.gov.wales/UATPINS"
+# CRMURL = "tscrm2016.llcdt.gov.wales/UATPINS"
 
 //Preprod Oauth WGO 
 //CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
@@ -103,9 +103,9 @@ AZURE_STORAGE_ACCOUNT_KEY = MmrsrCjBfop9pI2oImsP/+lJUWU2DrXsAB8nq5bOVROTmPovSGxj
 AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwdevuks.blob.core.windows.net
 
 // New test key
-AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwtestuks"
+# AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwtestuks"
-AZURE_STORAGE_ACCOUNT_KEY = bqJAz5pYQVGee8dnVhlsqW+xHwinNTjgY2AmojNyB+d4uAotMR20WcO4Op13yB+9dFaXAkkjtIA4+AStHT/IYg==
+# AZURE_STORAGE_ACCOUNT_KEY = bqJAz5pYQVGee8dnVhlsqW+xHwinNTjgY2AmojNyB+d4uAotMR20WcO4Op13yB+9dFaXAkkjtIA4+AStHT/IYg==
-AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwtestuks.blob.core.windows.net
+# AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwtestuks.blob.core.windows.net
 
 
 // preprod key
@@ -132,6 +132,10 @@ SHOW_DEBUG = true
 // DEV Connection string
 //NEXT_PUBLIC_APP_INSIGHT = InstrumentationKey=4b7568b3-70bd-4591-9dc2-267c0a6501d1;IngestionEndpoint=https://ukwest-0.in.applicationinsights.azure.com/;LiveEndpoint=https://ukwest.livediagnostics.monitor.azure.com/;ApplicationId=447d38b5-5d40-4238-8fb3-0ef4741b3db1
  
+
+APPLICATIONINSIGHTS_CONNECTIONSTRING = InstrumentationKey=7a06e24a-793c-47bc-8987-ce80f180e035;IngestionEndpoint=https://uksouth-1.in.applicationinsights.azure.com/;LiveEndpoint=https://uksouth.livediagnostics.monitor.azure.com/;ApplicationId=9906b6d0-b791-4add-8d53-c827a534e1d4
+
+
 // Test Connection string
 //NEXT_PUBLIC_APP_INSIGHT = InstrumentationKey=cc60e8e7-5b30-4c2b-a176-8b96b21b12df;IngestionEndpoint=https://ukwest-0.in.applicationinsights.azure.com/;LiveEndpoint=https://ukwest.livediagnostics.monitor.azure.com/;ApplicationId=2a4094be-6fd1-46ab-a67d-5f241692b129
  

components/azureappinsights.js

@@ -9,7 +9,9 @@ import {
 let reactPlugin = new ReactPlugin();
 let appInsights = new ApplicationInsights({
     config: {
-        connectionString: process.env.NEXT_PUBLIC_APP_INSIGHT,
+        connectionString:
+            process.env.APPLICATIONINSIGHTS_CONNECTIONSTRING ||
+            process.env.NEXT_PUBLIC_APP_INSIGHT,
         enableAutoRouteTracking: true,
         enableCorsCorrelation: true,
         enableRequestHeaderTracking: true,

components/breadcrumbs.js

@@ -504,6 +504,27 @@ const Breadcrumbs = (props) => {
                         )}
                         {router.pathname == "/case/[ticketnumber]" && (
                             <>
+                                <li className="govuk-breadcrumbs__list-item">
+                                    <Link
+                                        href={
+                                            router.locale != "en"
+                                                ? router.locale +
+                                                  "/searchresults?q=" +
+                                                  props.props.search
+                                                      .searchString
+                                                : "/searchresults?q=" +
+                                                  props.props.search
+                                                      .searchString
+                                        }
+                                        onClick={() => {
+                                            // spinnerState();
+                                            router.back();
+                                        }}
+                                        className="govuk-breadcrumbs__link"
+                                    >
+                                        {t("common:breadcrumb-search-results")}
+                                    </Link>
+                                </li>
                                 <li className="govuk-breadcrumbs__list-item">
                                     {t("common:breadcrumb-case-reference")}:{" "}
                                     {
@@ -628,7 +649,6 @@ const Breadcrumbs = (props) => {
                         )}
                         {router.pathname == "/myportal/case/[ticketnumber]" && (
                             <>
-                                {" "}
                                 <li className="govuk-breadcrumbs__list-item">
                                     <Link
                                         href={
@@ -643,6 +663,27 @@ const Breadcrumbs = (props) => {
                                         {t("common:breadcrumb-my-portal")}
                                     </Link>
                                 </li>
+                                <li className="govuk-breadcrumbs__list-item">
+                                    <Link
+                                        href={
+                                            router.locale != "en"
+                                                ? router.locale +
+                                                  "/searchresults?q=" +
+                                                  props.props.search
+                                                      .searchString
+                                                : "/searchresults?q=" +
+                                                  props.props.search
+                                                      .searchString
+                                        }
+                                        onClick={() => {
+                                            // spinnerState();
+                                            router.back();
+                                        }}
+                                        className="govuk-breadcrumbs__link"
+                                    >
+                                        {t("common:breadcrumb-search-results")}
+                                    </Link>
+                                </li>
                                 <li className="govuk-breadcrumbs__list-item">
                                     {t("common:breadcrumb-case-reference")}:{" "}
                                     {

components/case/summary.js

@@ -148,7 +148,7 @@ const CaseSummary = (props) => {
             : props[currentType];
     let setCaseDetailsObj =
         currentType == "directResultsObj"
-            ? props.searchResultsObj.searchDetailsObj
+            ? props.searchDetailsObj
             : props[currentType + "Details"];
 
     var casesObj = {};

components/elements/index.js

@@ -120,11 +120,39 @@ export function Textfield(props) {
                 </div>
                 <div className="govuk-body">
                     <p>{t("newappeal:new-appeal-introduction-paragraph")}</p>
+                    <ul>
+                        <li>
+                            {t(
+                                "newappeal:new-appeal-introduction-paragraph-bullet-one"
+                            )}
+                        </li>
+                        <li>
+                            {t(
+                                "newappeal:new-appeal-introduction-paragraph-bullet-two"
+                            )}
+                        </li>
+                    </ul>
+                    <p>
+                        {t("newappeal:new-appeal-introduction-paragraph-two")}
+                    </p>
+
                     <p>
                         {t(
                             "newappeal:new-appeal-introduction-warning-paragraph"
                         )}
                     </p>
+                    <ul>
+                        <li>
+                            {t(
+                                "newappeal:new-appeal-introduction-warning-bullet-one"
+                            )}
+                        </li>
+                        <li>
+                            {t(
+                                "newappeal:new-appeal-introduction-warning-bullet-two"
+                            )}
+                        </li>
+                    </ul>
                 </div>
             </>
         );

components/myportal/topthree.js

@@ -323,11 +323,13 @@ const TopThree = (props) => {
                     ) : (
                         ""
                     )}
-                    <div className="cardModuleReference">
+                    {topThreeType != "watchedCases" && (
-                        <b>{t("myportal:date-raised")}:</b>
+                        <div className="cardModuleReference">
-                        {"  "}
+                            <b>{t("myportal:date-raised")}:</b>
-                        {raisedDate(showTopThreeArr[key].createdon)}
+                            {"  "}
-                    </div>{" "}
+                            {raisedDate(showTopThreeArr[key].createdon)}
+                        </div>
+                    )}
                     {topThreeType == "watchedCases" &&
                         props.myReps &&
                         showTopThreeArr[key].pinswg_representationsubmitted !=

data/crmfieldlookuptranslations.json

@@ -2169,16 +2169,16 @@
                     "value_cy": "Tystysgrif perchnogaeth"
                 },
                 {
-                    "value": "We need to know who owns the appeal site. If you do not own the appeal site or if you own only part of it, we need to know the name(s) of the owner(s) or part owner(s). We also need to be sure that the other owner(s) know that you have made an appeal. Please refer to the guidance notes on completing this section.",
+                    "value": "We need to know who owns the appeal site or part of it, and that all owners know you have made an appeal. Use the guidance notes to complete this section.",
-                    "value_cy": "Mae angen i ni wybod pwy sy'n berchen ar safle'r apźl. Os nad ydych yn berchen ar safle'r apźl neu os mai dim ond rhan ohono rydych yn berchen arno, mae angen i ni wybod enw(au) y perchennog(perchnogion) neu'r rhan-berchennog/perchnogion. Mae angen i ni hefyd fod yn siŵr bod y perchennog/perchnogion eraill yn gwybod eich bod wedi gwneud apêl. Cyfeiriwch at y nodiadau canllaw ar lenwi'r adran hon."
+                    "value_cy": "Mae angen i ni wybod pwy sy'n berchen ar safle'r apźl neu ran ohono, a bod pob perchennog yn gwybod eich bod wedi gwneud apźl. Defnyddiwch y nodiadau canllaw i gwblhau'r adran hon."
                 },
                 {
                     "value": "Not applicable",
                     "value_cy": "Amherthnasol"
                 },
                 {
-                    "value": "Certificate A - (If you are the sole owner of the whole appeal site, certificate A applies). I certify that, on the day 21 days before the date of this appeal, nobody except the appellant, was the owner (see the guidance leaflet for a definition) of any part of the land to which the appeal relates",
+                    "value": "Certificate A - (for sole owners of the appeal site). I certify that, on the day 21 days before the date of this appeal, nobody except the appellant, was the owner (see the guidance leaflet for a definition) of any part of the land to which the appeal relates",
-                    "value_cy": "Tystysgrif A - (Os mai chi yw unig berchennog safle cyfan yr apźl, mae tystysgrif A yn gymwys). Tystiaf, ar y diwrnod 21 diwrnod cyn dyddiad yr apêl hon, nad oedd neb ac eithrio'r apelydd, yn berchennog (gweler y daflen arweiniad am ddiffiniad) unrhyw ran o'r tir y mae'r apêl yn ymwneud ag ef"
+                    "value_cy": "Tystysgrif A - (ar gyfer unig berchnogion safle'r apęl). Tystiaf, ar y diwrnod 21 diwrnod cyn dyddiad yr apêl hon, nad oedd neb heblaw’r apelydd yn berchennog (gweler y daflen arweiniad am ddiffiniad) unrhyw ran o’r tir y mae’r apêl yn ymwneud ag ef."
                 },
                 {
                     "value": "Certificate B - I certify that the appellant (or the agent) has given the requisite notice (see the guidance leaflet) to everyone else who, on the day 21 days before the date of this appeal, was the owner (see the guidance leaflet for a definition) of any part of the land to which the appeal relates, as listed below:",

locales/cy/newappeal.json

@@ -52,13 +52,18 @@
     "about-you-communication-disclaimer-label": "Bydd cyfathrebu trwy e-bost. Cysylltwch â ni os byddai'n well gennych gyfathrebu drwy'r post.",
     "new-appeal-progress-nav-label": "Cynnydd",
     "new-appeal-documentlist-nav": "Angen dogfen",
-    "new-appeal-introduction-paragraph": "Mae’r ffurflen hon ar gyfer apelio yn erbyn penderfyniad i wrthod cais cynllunio, yn erbyn penderfyniad i ganiatáu cais gydag amodau yr ydych yn eu gwrthwynebu, neu yn erbyn methiant yr Awdurdod Cynllunio Lleol i roi penderfyniad o fewn y cyfnod priodol, heb gynnwys Deiliad Tai. ceisiadau.",
+    "new-appeal-introduction-paragraph": "Mae'r ffurflen hon i apelio yn erbyn:",
-    "new-appeal-introduction-warning-paragraph": "RHYBUDD: Rhaid i’ch apêl gyrraedd Penderfyniadau Cynllunio ac Amgylchedd Cymru o fewn 6 mis i ddyddiad hysbysiad o benderfyniad yr awdurdod cynllunio lleol. (NODER: Os na fyddwn yn derbyn unrhyw rai o’r “Dogfennau ategol hanfodol” o fewn y cyfnod apelio, ni fydd yr apêl yn cael ei derbyn).",
+    "new-appeal-introduction-paragraph-bullet-one": "penderfyniad i wrthod cais cynllunio",
+    "new-appeal-introduction-paragraph-bullet-two": "methiant yr Awdurdod Cynllunio Lleol i roi penderfyniad o fewn 8 wythnos",
+    "new-appeal-introduction-paragraph-two": "Nid yw'n cynnwys ceisiadau gan Ddeiliaid Tai.",
+    "new-appeal-introduction-warning-paragraph": "Rhaid i chi:",
+    "new-appeal-introduction-warning-bullet-one": "cyflwynwch eich apêl o fewn 6 mis i ddyddiad hysbysiad penderfyniad yr Awdurdod Cynllunio Lleol",
+    "new-appeal-introduction-warning-bullet-two": "darparu'r holl ddogfennau ategol hanfodol o fewn y cyfnod apelio",
     "new-appeal-development-description-hint": "Nodwch fanylion y datblygiad arfaethedig o'r ffurflen gais cynllunio. Os cafodd y cais ei ddiwygio tra’r oedd gyda’r ACLl nodwch fanylion y cynllun diwygiedig ac amgaewch gopi o gytundeb yr ACLl i’r newid.",
-    "new-appeal-ownership-hint": "Mae angen i ni wybod pwy sy'n berchen ar safle'r apźl. Os nad ydych yn berchen ar safle'r apźl neu os mai dim ond rhan ohono rydych yn berchen arno, mae angen i ni wybod enw(au) y perchennog(perchnogion) neu'r rhan-berchennog/perchnogion. Mae angen i ni hefyd fod yn siŵr bod y perchennog/perchnogion eraill yn gwybod eich bod wedi gwneud apêl. Cyfeiriwch at y nodiadau canllaw ar lenwi'r adran hon.",
+    "new-appeal-ownership-hint": "Mae angen i ni wybod pwy sy'n berchen ar safle'r apźl neu ran ohono, a bod pob perchennog yn gwybod eich bod wedi gwneud apźl. Defnyddiwch y nodiadau canllaw i gwblhau'r adran hon.",
     "new-appeal-ownership-option-NA": "Amherthnasol",
-    "new-appeal-ownership-option-A": "Tystysgrif A - (Os mai chi yw unig berchennog safle cyfan yr apźl, mae tystysgrif A yn gymwys). Tystiaf, ar y diwrnod 21 diwrnod cyn dyddiad yr apêl hon, nad oedd neb ac eithrio’r apelydd, yn berchennog (gweler y daflen arweiniad am ddiffiniad) unrhyw ran o’r tir y mae’r apêl yn ymwneud ag ef",
+    "new-appeal-ownership-option-A": "Tystysgrif A - (ar gyfer unig berchnogion safle'r apęl). Tystiaf, ar y diwrnod 21 diwrnod cyn dyddiad yr apêl hon, nad oedd neb heblaw’r apelydd yn berchennog (gweler y daflen arweiniad am ddiffiniad) unrhyw ran o’r tir y mae’r apêl yn ymwneud ag ef.",
-    "new-appeal-ownership-option-B": "Tystysgrif B – Tystiaf fod y mae’r apelydd (neu’r asiant) wedi rhoi’r hysbysiad gofynnol (gweler y daflen arweiniad) i bawb arall a oedd, ar y diwrnod 21 diwrnod cyn dyddiad yr apêl hon, yn berchennog (gweler y daflen arweiniad am ddiffiniad) unrhyw ran o y tir y mae'r apźl yn ymwneud ag ef, fel y'i rhestrir isod:",
+    "new-appeal-ownership-option-B": "Tystysgrif B - Tystiaf fod y mae’r apelydd (neu’r asiant) wedi rhoi’r hysbysiad gofynnol (gweler y daflen arweiniad) i bawb arall a oedd, ar y diwrnod 21 diwrnod cyn dyddiad yr apêl hon, yn berchennog (gweler y daflen arweiniad am ddiffiniad) unrhyw ran o y tir y mae'r apźl yn ymwneud ag ef, fel y'i rhestrir isod:",
     "new-appeal-ownership-option-CD": "Tystysgrifau C a D - Os nad ydych yn gwybod pwy sy'n berchen ar safle'r apźl i gyd neu ran ohono, cwblhewch naill ai Tystysgrif C neu Dystysgrif D yn Atodiad 1 ein canllaw a'i hatodi i'r ffurflen apelio",
     "new-appeal-agricultural-hint": "Mae angen inni wybod hefyd a yw safle'r apźl yn rhan o ddaliad amaethyddol. Dewiswch naill ai (a), (b)(i) neu (b)(ii)",
     "new-appeal-agricultural-holding-option-yes": "(a) Nid oes unrhyw ran o’r tir y mae’r apêl yn ymwneud ag ef yn ddaliad amaethyddol, neu’n rhan o ddaliad amaethyddol",

locales/en/newappeal.json

@@ -51,12 +51,17 @@
     "about-you-communication-disclaimer-label": "Communication will be by email. Contact us if you would prefer postal communication.",
     "new-appeal-progress-nav-label": "Progress",
     "new-appeal-documentlist-nav": "Documents needed",
-    "new-appeal-introduction-paragraph": "This form is to appeal against a decision to refuse a planning application, against a decision to grant an application subject to conditions to which you object, or against the failure of the Local Planning Authority to give a decision within the appropriate period, not including Householder applications.",
+    "new-appeal-introduction-paragraph": "This form is to appeal against:",
-    "new-appeal-introduction-warning-paragraph": "WARNING: Your appeal must reach Planning and Environment Decisions Wales within 6 months of the date of the Local Planning authority’s decision notice. (NOTE: If any of the “Essential supporting documents” are not received by us within the appeal period, the appeal will not be accepted).",
+    "new-appeal-introduction-paragraph-bullet-one": "a decision to refuse a planning application",
+    "new-appeal-introduction-paragraph-bullet-two": "the failure of the Local Planning Authority to give a decision with 8 weeks",
+    "new-appeal-introduction-paragraph-two": "It does not include Householder applications.",
+    "new-appeal-introduction-warning-paragraph": "You must:",
+    "new-appeal-introduction-warning-bullet-one": "submit your appeal within 6 months of the date of the Local Planning Authority's decision notice",
+    "new-appeal-introduction-warning-bullet-two": "provide all essential supporting documents within the appeal period",
     "new-appeal-development-description-hint": "Enter details of the proposed development from the planning application form. If the application was revised while it was with the LPA enter details of the revised scheme and enclose a copy of the LPA’s agreement to the change.",
-    "new-appeal-ownership-hint": "We need to know who owns the appeal site. If you do not own the appeal site or if you own only part of it, we need to know the name(s) of the owner(s) or part owner(s). We also need to be sure that the other owner(s) know that you have made an appeal. Please refer to the guidance notes on completing this section.",
+    "new-appeal-ownership-hint": "We need to know who owns the appeal site or part of it, and that all owners know you have made an appeal. Use the guidance notes to complete this section.",
     "new-appeal-ownership-option-NA": "Not applicable",
-    "new-appeal-ownership-option-A": "Certificate A - (If you are the sole owner of the whole appeal site, certificate A applies). I certify that, on the day 21 days before the date of this appeal, nobody except the appellant, was the owner (see the guidance leaflet for a definition) of any part of the land to which the appeal relates",
+    "new-appeal-ownership-option-A": "Certificate A - (for sole owners of the appeal site). I certify that, on the day 21 days before the date of this appeal, nobody except the appellant, was the owner (see the guidance leaflet for a definition) of any part of the land to which the appeal relates",
     "new-appeal-ownership-option-B": "Certificate B - I certify that the appellant (or the agent) has given the requisite notice (see the guidance leaflet) to everyone else who, on the day 21 days before the date of this appeal, was the owner (see the guidance leaflet for a definition) of any part of the land to which the appeal relates, as listed below:",
     "new-appeal-ownership-option-CD": "Certificates C and D - If you do not know who owns all or part of the appeal site, complete either Certificate C or Certificate D at Annexe 1 of our guidance and attach it to the appeal form",
     "new-appeal-agricultural-hint": "We also need to know whether the appeal site forms part of an agricultural holding. Please select either (a), (b)(i) or (b)(ii)",

pages/api/endpoint/getwatchedcases_api.js

@@ -77,6 +77,15 @@ export default async function ApiProxy(req, res) {
 
                 delete element.pinswg_WatchedCase;
             });
+
+            // const uniqueItems = Array.from(
+            //     new Map(
+            //         data.value.map((item) => [item.ticketnumber, item])
+            //     ).values()
+            // );
+
+            // data = { "@odata.count": uniqueItems.length, "value": uniqueItems };
+
             res.status(200).json(data);
         })
         .catch((error) => {

pages/case/[ticketnumber].js

@@ -44,7 +44,9 @@ const CaseHome = (props) => {
             <Head>
                 <title>
                     Reference:{" "}
-                    {props.currentView.caseReference.currentReference}{" "}
+                    {props.searchResultsObj.searchResultsObj.value[0]
+                        .ticketnumber ||
+                        props.currentView.caseReference.currentReference}{" "}
                 </title>
             </Head>
             <div id="page_wrapper">
@@ -60,6 +62,9 @@ const CaseHome = (props) => {
                         // directSearchResultsObj={
                         //     props.searchResultsObj.searchResultsObj
                         // }
+                        searchResultsObj={
+                            props.searchResultsObj.searchResultsObj
+                        }
                         searchDetailsObj={
                             props.searchResultsObj.searchDetailsObj
                         }
@@ -204,10 +209,10 @@ export const getServerSideProps = wrapper.getServerSideProps(
         //console.log(searchResultsObj);
         return {
             props: {
-                // searchResultsObj: {
+                searchResultsObj: {
-                //     searchResultsObj: searchResultsObj,
+                    searchResultsObj: searchResultsObj,
-                //     searchDetailsObj: searchDetailsObj,
+                    searchDetailsObj: searchDetailsObj,
-                // },
+                },
                 currentType: "directResultsObj",
                 docsOffline: process.env.DOCAPI_OFFLINE || false,
                 messagesObj: await getCaseMessage(
@@ -240,12 +245,12 @@ const mapDispatchToProps = (dispatch) => {
         setCurrentReference: (currentReference) => {
             dispatch(setCurrentReference(refno));
         },
-        setSearchResults: (searchResults) => {
+        // setSearchResults: (searchResults) => {
-            dispatch(setSearchResults(searchResults));
+        //     dispatch(setSearchResults(searchResults));
-        },
+        // },
-        setSearchDetails: (searchDetails) => {
+        // setSearchDetails: (searchDetails) => {
-            dispatch(setSearchDetails(searchDetails));
+        //     dispatch(setSearchDetails(searchDetails));
-        },
+        // },
     };
 };
 

pages/myportal/case/[ticketnumber].js

@@ -50,7 +50,13 @@ import ServiceBanner from "../../../components/myportal/servicebanner";
 import TimeOut from "../../../components/timeout";
 
 const CaseHome = (props) => {
-    const { footerLinks, pages, setSearchResults, setSearchDetails } = props;
+    const {
+        footerLinks,
+        pages,
+        setSearchResults,
+        setSearchDetails,
+        searchResultsObj,
+    } = props;
     let { t, lang } = useTranslation();
 
     const router = useRouter();