Merged PR 1436: SIPs Sprint 1 200225

Related work items: #14086, #14244

actions/index.js

@@ -301,7 +301,7 @@ export const getBasicDNSURLSearch = (searchString) => {
         });
 };
 
-export const getSIPSEvents = (caseid) => {
+export const getSIPSEvents = async (caseid) => {
     return axios
         .get(BASE_URL + "/api/endpoint/getsipsevents_api?caseid=" + caseid)
         .then((res) => {
@@ -389,7 +389,7 @@ export const getDNSCoords = () => {
         });
 };
 
-export const getDNSList = (searchString) => {
+export const getDNSList = async (searchString) => {
     return axios
         .get(BASE_URL + "/api/endpoint/getdnslist_api")
         .then((res) => res.data)

components/account/personaldetails.js

@@ -246,6 +246,7 @@ let PersonalDetails = (props) => {
 
     return (
         <>
+            <div className="govuk-form-group">
                 {props.accountUpdatedComplete == false ? (
                     props.personalDetailsComplete == false ? (
                         <form onSubmit={handleSubmit(onHandleSubmit)}>
@@ -286,7 +287,9 @@ let PersonalDetails = (props) => {
                                     type="text"
                                     className="govuk-input govuk-input--width-20"
                                     validate={[required]}
-                                label={t("account:account-first-name-label")}
+                                    label={t(
+                                        "account:account-first-name-label"
+                                    )}
                                     errorMsg={t("account:is-required-label")}
                                 />
                                 <Field
@@ -306,7 +309,9 @@ let PersonalDetails = (props) => {
                                     type="email"
                                     className="govuk-input govuk-input--width-20"
                                     validate={[required, email]}
-                                label={t("account:account-email-address-label")}
+                                    label={t(
+                                        "account:account-email-address-label"
+                                    )}
                                     disabled
                                 />
                                 <Field
@@ -324,14 +329,18 @@ let PersonalDetails = (props) => {
                                     component={RenderTextfield}
                                     type="text"
                                     className="govuk-input govuk-input--width-20"
-                                label={t("account:account-company-group-label")}
+                                    label={t(
+                                        "account:account-company-group-label"
+                                    )}
                                     errorMsg={t("account:is-required-label")}
                                 />
                             </fieldset>
                             <fieldset className="govuk-fieldset">
                                 <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
                                     <h2 className="govuk-fieldset__heading">
-                                    {t("account:account-your-address-label")}
+                                        {t(
+                                            "account:account-your-address-label"
+                                        )}
                                     </h2>
                                 </legend>
 
@@ -399,7 +408,8 @@ let PersonalDetails = (props) => {
                                 <Link
                                     href={
                                         "/myportal?q=" +
-                                    props.props.accountDetails.loggedinUserId
+                                        props.props.accountDetails
+                                            .loggedinUserId
                                     }
                                     className="govuk-link"
                                 >
@@ -423,6 +433,7 @@ let PersonalDetails = (props) => {
                 ) : (
                     <PersonalDetailsComplete props={props} />
                 )}
+            </div>
         </>
     );
 };

components/account/registerform.js

@@ -137,6 +137,8 @@ const RegisterForm = (props) => {
             {props.accountCreatedComplete != true ? (
                 props.registerFormComplete == false ? (
                     <form onSubmit={handleSubmit(onHandleSubmit)}>
+                        <div className="card" id="personalDetailsCard">
+                            <div className="card-body">
                                 <fieldset className="govuk-fieldset">
                                     <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
                                         <h2 className="govuk-fieldset__heading">
@@ -281,6 +283,8 @@ const RegisterForm = (props) => {
                                         {t("common:continue-button")}
                                     </button>
                                 </div>
+                            </div>
+                        </div>
                     </form>
                 ) : (
                     <RegisterFormCheck

components/header.js

@@ -53,6 +53,9 @@ const Header = (props) => {
         "/myportal/advancedsearch",
         "/myportal/advancedsearchresults",
         "/myportal/case/[ticketnumber]",
+        "/account/personaldetails",
+        "/register",
+        "/myportal/searchresults",
     ];
 
     const hasContactLink = [

components/myportal/servicebanner.js

@@ -73,7 +73,7 @@ const ServiceBanner = (props) => {
                 <div className="serviceBanner_userDetails_name">
                     <Link
                         href="/account/personaldetails"
-                        className="govuk-button-secondary govuk-link"
+                        className="govuk-button-secondary govuk-link--no-underline"
                     >
                         {props.accountDetails.accountDetails.firstname}{" "}
                         {props.accountDetails.accountDetails.lastname}

components/search/dnssearchresults.js

@@ -686,22 +686,35 @@ const DNSSearchResults = (props) => {
                         <p className="govuk-body">
                             {t("dnsApplications:page-intro-paragraph-1")}
                         </p>
-                        <ul className="govuk-list govuk-list--bullet">
+                        <p className="govuk-body">
-                            <li>
+                            {t("dnsApplications:page-intro-list-item-1")}{" "}
-                                {" "}
+                            <a
-                                {t("dnsApplications:page-intro-list-item-1")}
+                                href={t(
-                            </li>
+                                    "dnsApplications:page-intro-list-item-1-link"
+                                )}
+                                rel="noreferrer noopener"
+                                target="_blank"
+                            >
+                                {t(
+                                    "dnsApplications:page-intro-list-item-1-link"
+                                )}
+                            </a>
+                        </p>
 
-                            <li>
+                        <p className="govuk-body">
-                                {" "}
                             {t("dnsApplications:page-intro-list-item-2")}
-                            </li>
+                            <a
-
+                                href={t(
-                            <li>
+                                    "dnsApplications:page-intro-list-item-2-link"
-                                {" "}
+                                )}
-                                {t("dnsApplications:page-intro-list-item-3")}
+                                rel="noreferrer noopener"
-                            </li>
+                                target="_blank"
-                        </ul>
+                            >
+                                {t(
+                                    "dnsApplications:page-intro-list-item-2-link"
+                                )}
+                            </a>
+                        </p>
                     </div>
 
                     {showMap == "true" && (

locales/cy/dnsApplications.json

@@ -1,8 +1,10 @@
 {
-    "page-title": "Ceisiadau Datblygiadau o Arwyddocâd Cenedlaethol",
+    "page-title": "Prosiectau Isadeiledd",
-    "page-intro-paragraph-1": "Y ceisiadau a restrir yw’r rhai:",
+    "page-intro-paragraph-1": "Mae dau fath gwahanol o gais ar gyfer prosiectau seilwaith, sef Datblygiadau o Arwyddocâd Cenedlaethol a Phrosiectau Seilwaith Arwyddocaol.",
-    "page-intro-list-item-1": "Lle mae’r datblygwr wedi hysbysu Penderfyniadau Cynllunio ac Amgylchedd Cymru yn ysgrifenedig ei fod yn bwriadu cyflwyno cais i ni yn y dyfodol",
+    "page-intro-list-item-1 ": " Datblygiadau o Arwyddocâd Cenedlaethol yw datblygiadau a ddiffinnir yn ",
-    "page-intro-list-item-2": "Lle mae cais eisoes wedi cael ei wneud i Benderfyniadau Cynllunio ac Amgylchedd Cymru ac mae’n mynd drwy’r broses archwilio",
+    "page-intro-list-item-1-link": "https://www.llyw.cymru/datblygiadau-o-arwyddocad-cenedlaethol-dns-ceisiadau",
+    "page-intro-list-item-2 ": "Mae Prosiectau Seilwaith Arwyddocaol yn ddatblygiadau sydd wedi'u diffinio (YMA)",
+    "page-intro-list-item-2-link": "https://www.llyw.cymru/datblygiadau-o-arwyddocad-cenedlaethol-dns-ceisiadau",
     "page-intro-list-item-3": "Lle penderfynwyd ar gynnig.",
     "page-intro-paragraph-2": "Defnyddiwch y tabl isod i ddod o hyd i geisiadau fesul cam neu fath. Fel arall, defnyddiwch y map trwy glicio ar y marcwyr i fynd i’r dudalen geisiadau. Mae rhestr o ddigwyddiadau a therfynau amser allweddol ar gyfer pob cais ar gael ar ein ",
     "page-intro-paragraph-2-link": "tudalen galendr",

locales/cy/home.json

@@ -24,8 +24,8 @@
     "login-card-forgotten-link": "Cliciwch yma",
     "login-via-gov-gateway-label": "Mewngofnodwch drwy Borth y Llywodraeth",
     "login-via-nextuth-label": "Mewngofnodwch gyda'ch cyfeiriad e-bost",
-    "casesearch-card-title": "Chwilio apeliadau a Datblygiadau o Arwyddocâd Cenedlaethol",
+    "casesearch-card-title ": "Chwilio am achos",
-    "casesearch-card-search-hint": "Defnyddiwch gyfeirnod yr achos neu deitl y Datblygiad o Arwyddocâd Cenedlaethol i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:",
+    "casesearch-card-search-hint ": "Defnyddiwch gyfeirnod yr achos neu deitl y prosiect Infrastructure i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:",
     "casesearch-card-search-example-label-1": "APP-A12345-A-21-1234567",
     "casesearch-card-search-example-label-2": "CAS-12345-A1B2C3",
     "casesearch-card-button": "Cyflwyno chwiliad",

locales/cy/myportal.json

@@ -15,8 +15,8 @@
     "makenewappeal-card-guidance-link": "https://www.llyw.cymru/arweiniad-ar-apeliadau-cheisiadau",
     "makenewappeal-card-button-label": "Gwneud apêl newydd",
     "mycases-card-title": "Fy achosion",
-    "searchcases-card-title": "Chwilio apeliadau a Datblygiadau o Arwyddocâd Cenedlaethol",
+    "searchcases-card-title ": "Chwilio am achos",
-    "searchcases-card-search-hint": "Defnyddiwch gyfeirnod yr achos neu deitl y Datblygiad o Arwyddocâd Cenedlaethol i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:",
+    "searchcases-card-search-hint ": "Defnyddiwch gyfeirnod yr achos neu deitl y prosiect Infrastructure i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:",
     "searchcases-card-search-example-label-1": "APP-A12345-A-21-1234567",
     "searchcases-card-search-example-label-2": "CAS-12345-A1B2C3",
     "searchcases-card-button": "Cyflwyno Chwiliad",

locales/en/account.json

@@ -1,6 +1,6 @@
 {
     "register-new-account-heading": "Create a new account",
-    "register-new-account-status-created-label": "Your account has  created",
+    "register-new-account-status-created-label": "Your account has been created",
     "register-new-account-status-not-created-label": "Your account has not been created",
     "register-new-account-checking-label": "Checking for account...",
     "help-heading": "Help",

locales/en/dnsApplications.json

@@ -1,8 +1,10 @@
 {
-    "page-title": "Developments of National Significance Applications",
+    "page-title": "Infrastructure Projects",
-    "page-intro-paragraph-1": "The applications listed are those:",
+    "page-intro-paragraph-1": "There are two different types of application for infrastructure projects, Developments of National Significance and Significant Infrastructure Projects.",
-    "page-intro-list-item-1": "Where the developer has advised Planning and Environment Decisions Wales in writing that they intend to submit an application to us in the future",
+    "page-intro-list-item-1": "Developments of National Significance are developments that are defined at",
-    "page-intro-list-item-2": "Where an application has already been made to Planning and Environment Decisions Wales and is undergoing the examination process",
+    "page-intro-list-item-1-link": "https://www.gov.wales/developments-national-significance-dns-applications",
+    "page-intro-list-item-2": "Significant Infrastructure Projects are developments that are defined at ",
+    "page-intro-list-item-2-link": "https://www.gov.wales/significant-infrastructure-projects-applications",
     "page-intro-list-item-3": "Where a proposal has been decided.",
     "page-intro-paragraph-2": "Use the table below to find applications by stage or type. Alternatively, use the map by clicking on the markers to go to the applications page. A list of key events and deadlines for all applications is available on our ",
     "page-intro-paragraph-2-link": "calendar page",

locales/en/dnsCommon.json

@@ -1,5 +1,5 @@
 {
-  "service-name": "Developments of National Significance",
+  "service-name": "Infrastructure Projects",
   "result-list-show-label": "Show",
   "result-list-entries-label": "entries",
   "result-list-showing-label": "Showing {{recordIndex}} to {{pagingIndex}} of {{totalRecords}} entries",

locales/en/home.json

@@ -24,8 +24,8 @@
     "login-card-forgotten-link": "Click here",
     "login-via-gov-gateway-label": "Log in via Government Gateway",
     "login-via-nextuth-label": "Sign in with your email address",
-    "casesearch-card-title": "Search appeals and Developments of National Significance",
+    "casesearch-card-title": "Search for a case",
-    "casesearch-card-search-hint": "Use the case reference or DNS title to search. Case reference will be similar to one of the following:",
+    "casesearch-card-search-hint": "Use the case reference or Infrastructure project title to search. Case reference will be similar to one of the following:",
     "casesearch-card-search-example-label-1": "APP-A12345-A-21-1234567",
     "casesearch-card-search-example-label-2": "CAS-12345-A1B2C3",
     "casesearch-card-button": "Submit search",

locales/en/myportal.json

@@ -15,8 +15,8 @@
     "makenewappeal-card-guidance-link": "https://www.gov.wales/planning-appeals-guidance",
     "makenewappeal-card-button-label": "Make a new appeal",
     "mycases-card-title": "My cases",
-    "searchcases-card-title": "Search appeals and Developments of National Significance",
+    "searchcases-card-title": "Search for a case",
-    "searchcases-card-search-hint": "Use the case reference or DNS title to search. Case reference will be similar to one of the following:",
+    "searchcases-card-search-hint": "Use the case reference or Infrastructure project title to search. Case reference will be similar to one of the following:",
     "searchcases-card-search-example-label-1": "APP-A12345-A-21-1234567",
     "searchcases-card-search-example-label-2": "CAS-12345-A1B2C3",
     "searchcases-card-button": "Submit Search",

pages/account/personaldetails.js

@@ -6,6 +6,7 @@ import Banner from "../../components/banner";
 import CookieBanner from "../../components/cookieBanner";
 import Breadcrumbs from "../../components/breadcrumbs";
 import Footer from "../../components/footer";
+import ServiceBanner from "../../components/myportal/servicebanner";
 
 import { useSelector, shallowEqual, connect } from "react-redux";
 import { wrapper } from "../../store/store";
@@ -64,6 +65,8 @@ const Home = (props) => {
                     <div className="govuk-grid-column-full">
                         <div className="govuk-width-container">
                             <Breadcrumbs slug={appealtypes} props={props} />
+                            <ServiceBanner props={props} />
+
                             <main
                                 className="govuk-main-wrapper--auto-spacing"
                                 id="main-content"
@@ -71,7 +74,17 @@ const Home = (props) => {
                             >
                                 <div className="govuk-grid-row">
                                     <div className="govuk-grid-column-two-thirds">
-                                        <h1>{t("account:account-title")}</h1>
+                                        <div className="govuk-form-group">
+                                            <div
+                                                className="card"
+                                                id="personalDetailsCard"
+                                            >
+                                                <div className="card-body">
+                                                    <h1>
+                                                        {t(
+                                                            "account:account-title"
+                                                        )}
+                                                    </h1>{" "}
                                                     <PersonalDetails
                                                         props={props}
                                                         accountUpdatedComplete={
@@ -89,6 +102,9 @@ const Home = (props) => {
                                                     />
                                                 </div>
                                             </div>
+                                        </div>
+                                    </div>
+                                </div>
                             </main>
                         </div>
                     </div>

pages/account/register.js

@@ -6,7 +6,7 @@ import Banner from "../../components/banner";
 import CookieBanner from "../../components/cookieBanner";
 import Breadcrumbs from "../../components/breadcrumbs";
 import Footer from "../../components/footer";
-
+import ServiceBanner from "../../components/servicebanner";
 import { useSelector, shallowEqual, connect } from "react-redux";
 import { wrapper } from "../../store/store";
 
@@ -47,6 +47,7 @@ const Home = (props) => {
                     <div className="govuk-grid-column-full">
                         <div className="govuk-width-container">
                             <Breadcrumbs slug={appealtypes} />
+                            <ServiceBanner props={props} noSignin={true} />
                             <main
                                 className="govuk-main-wrapper--auto-spacing"
                                 id="main-content"
@@ -107,7 +108,7 @@ const Home = (props) => {
                                     {registerFormComplete != true ||
                                     accountCreatedComplete != true ? (
                                         <div className="govuk-grid-column-one-third">
-                                            <h2 className="govuk-heading-m">
+                                            <h2 className="">
                                                 {t("account:help-heading")}
                                             </h2>
 

pages/dns/index.js

@@ -92,6 +92,13 @@ export const getServerSideProps = wrapper.getServerSideProps(
                 store.dispatch(setSearchDetails(searchDetailsObj));
                 store.dispatch(setSearch("DNS"));
             }
+            return {
+                props: {
+                    searchResultsObj: {
+                        searchResultsObj: searchResultsObj,
+                    },
+                },
+            };
         }
 );
 
@@ -99,7 +106,7 @@ const mapStateToProps = (state) => {
     return {
         currentView: state.currentView,
         search: state.search,
-        searchResultsObj: state.searchResultsObj,
+        //searchResultsObj: state.searchResultsObj,
         formData: state.formData,
         appealType: state.appealType,
         form: state.form,

styles/sass/welshgov/_application.scss

@@ -102,6 +102,7 @@ body {
         &:hover {
             background-color: $blue;
             color: #eeeeee;
+            text-decoration: none;
         }
     }
 
@@ -533,7 +534,7 @@ a.longLinkBreak {
         label {
             margin-top: 0px;
             background-color: $lightgrey_semi;
-            padding: 20px 20px 20px 50px;
+            padding: 20px 20px 20px 20px;
 
             &:before {
                 top: 18px;
@@ -2957,3 +2958,9 @@ ul.subFieldList {
 
 
 }
+
+#personalDetailsCard {
+    .govuk-fieldset {
+        margin-bottom: 20px;
+    }
+}