Merged PR 2414: welsh version of contact us and heading for rep heading for IP rep type

welsh version of contact us and heading for rep heading for IP rep type

Related work items: #23484, #23910

actions/selectQueryTypes.js

@@ -82,7 +82,7 @@ export const getSelectQuery = (appealTypeName) => {
             return "&$select=pinswg_eiarequired,pinswg_anticipatedgridreferenceeastingtext,pinswg_anticipatedgridreferencenorthingtext,_pinswg_appellant_value,pinswg_name,pinswg_addressline1,pinswg_addressline2,pinswg_postcode,pinswg_addresstown,_pinswg_associatedlpa_value,pinswg_addresscounty,pinswg_applicationacceptedasvalid,pinswg_applicationrejectedasinvalid,pinswg_choiceofprocedure,pinswg_confirmrequesttovaryapplication,pinswg_dateeventrequested,pinswg_dateofdecision,pinswg_dateofrequesttovarytheapplication,pinswg_dateofsubmissionofapplication,pinswg_dateprojectpublishedonwebsite,pinswg_deadlineforsubmissionofapplication,pinswg_endofrepresentationperiod,pinswg_inspectorreportsubmittedtowelshgovernment,pinswg_procedureconfirmed,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_suspensionenddates,pinswg_suspensionstartdate,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode,pinswg_startdateofevent,pinswg_typeofevent";
         case "pinswg_sipses":
             // return "&$select=pinswg_anticipatedgridreferenceeastingtext,pinswg_anticipatedgridreferencenorthingtext,_pinswg_appellant_value,pinswg_name,pinswg_addressline1,pinswg_addressline2,pinswg_postcode,pinswg_addresstown,_pinswg_associatedlpa_value,pinswg_addresscounty,pinswg_applicationacceptedasvalid,pinswg_applicationrejectedasinvalid,pinswg_choiceofprocedure,pinswg_confirmrequesttovaryapplication,pinswg_dateeventrequested,pinswg_dateofdecision,pinswg_dateofrequesttovarytheapplication,pinswg_dateofsubmissionofapplication,pinswg_dateprojectpublishedonwebsite,pinswg_deadlineforsubmissionofapplication,pinswg_decision,pinswg_endofrepresentationperiod,pinswg_inspectorreportsubmittedtowelshgovernment,pinswg_procedureconfirmed,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_suspensionenddates,pinswg_suspensionstartdates,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode,_pinswg_dnsids_value,pinswg_startdateofevent,pinswg_typeofevent";
-            return "&$select=pinswg_casedeadline,_pinswg_projecttype_value,pinswg_eiarequired,pinswg_anticipatedgridrefeasting,pinswg_anticipatedgridrefnorthing,_pinswg_appellant_value,pinswg_name,_pinswg_associatedlpa_value,pinswg_choiceofprocedure,pinswg_decision,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,statuscode,_pinswg_sipscase_value,pinswg_writtenacceptanceofnotification,pinswg_validnoticeofintentiontosubmit,pinswg_deadlineforsubmissionofapplication,pinswg_screeningstartdate,pinswg_eiatargetdate,pinswg_targetextended,pinswg_directionissueddate,pinswg_eiarequired,pinswg_scopingstartdate,pinswg_scopingtargetdate,pinswg_scopingtargetextended,pinswg_scopingoutcomeissueddate,pinswg_essubmitted,pinswg_deemedmarinelicenseappliedfor,pinswg_validationdeadlineextension,pinswg_consultationopen,pinswg_consultationclose,pinswg_reportissuedtowelshministers,pinswg_decisionissuedtoapplicant,pinswg_decisionoutcome,pinswg_redetermination,pinswg_redeterminationconsultationdeadline";
+            return "&$select=pinswg_casedeadline,pinswg_eiarequired,pinswg_anticipatedgridrefeasting,pinswg_anticipatedgridrefnorthing,_pinswg_appellant_value,pinswg_name,_pinswg_associatedlpa_value,pinswg_choiceofprocedure,pinswg_decision,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,statuscode,_pinswg_sipscase_value,pinswg_writtenacceptanceofnotification,pinswg_validnoticeofintentiontosubmit,pinswg_deadlineforsubmissionofapplication,pinswg_screeningstartdate,pinswg_eiatargetdate,pinswg_targetextended,pinswg_directionissueddate,pinswg_eiarequired,pinswg_scopingstartdate,pinswg_scopingtargetdate,pinswg_scopingtargetextended,pinswg_scopingoutcomeissueddate,pinswg_essubmitted,pinswg_deemedmarinelicenseappliedfor,pinswg_validationdeadlineextension,pinswg_consultationopen,pinswg_consultationclose,pinswg_reportissuedtowelshministers,pinswg_decisionissuedtoapplicant,pinswg_decisionoutcome,pinswg_redetermination,pinswg_redeterminationconsultationdeadline";
             break;
         default:
             return "";

components/case/representation/representationInterestedPartyPerson.js

@@ -109,7 +109,7 @@ const RepInterestedPartyPerson = (props) => {
                 <RepresentationTypeSelectorBlock
                     t={t}
                     headingText={t(
-                        "myrepresentations:consultation-from-an-interested-person-heading"
+                        "myrepresentations:representation-from-an-interested-person-heading"
                     )}
                     kindLabelText={t("myrepresentations:kind-of-rep-label")}
                     isTypeSelected={isTypeConfirmed}

components/myportal/viewall.js

@@ -751,9 +751,7 @@ const ViewAllResults = (props) => {
                     {isWatchedCases && (
                         <dd className="govuk-summary-list__value govuk-!-font-size-14 govuk-summary-list__action">
                             <button
-                                title={t(
-                                    "case:do-you-want-to-delete-case-label"
-                                )}
+                                title={t("case:stop-watching-case-link")}
                                 className=" cardModuleRemoveCase govuk-summary-list__actionLink watched_link"
                                 onClick={() => {
                                     confirm(
@@ -774,12 +772,12 @@ const ViewAllResults = (props) => {
                             </button>
                             {item.pinswg_emailnotifications === true ? (
                                 <button
-                                    className="govuk-summary-list__actionLink mailLink"
+                                    className="govuk-summary-list__actionLink mailLink watched_link"
                                     title={t("common:unsubscribe-title-label")}
                                     onClick={() => {
                                         confirm(
                                             t(
-                                                "case:summary-unsubscribe-mail-label"
+                                                "case:summary-unsubscribe-mail-label "
                                             ) +
                                                 item.pinswg_title +
                                                 "?"
@@ -800,7 +798,7 @@ const ViewAllResults = (props) => {
                                 </button>
                             ) : (
                                 <button
-                                    className="govuk-summary-list__actionLink mailLink"
+                                    className="govuk-summary-list__actionLink mailLink "
                                     title={t("common:subscribe-title-label")}
                                     onClick={() => {
                                         confirm(

locales/cy/common.json

@@ -105,8 +105,8 @@
     "contact-us-clear-form-button": "Clirio'r ffurflen",
     "contact-us-thank-you-title": "Diolch am eich ymholiad",
     "contact-us-thank-you-sub": "Byddwn yn cysylltu â chi cyn gynted â phosibl.",
-    "contact-us-para-one": "Os hoffech gysylltu â ni, gwneud cwyn, neu godi ymholiad ynghylch cais neu apêl, gallwch ddefnyddio'r ffurflen isod i gyflwyno eich cwestiynau neu sylwadau, a byddwn yn ymateb i chi cyn gynted â phosibl.",
-    "contact-us-para-two": "Os ydych am gyflwyno sylwadau ar gyfer cais neu apêl sy'n cael ei wneud ar hyn o bryd gan PEDW, cofrestrwch neu fewngofnodwch i'r porth a chwiliwch am yr achos yr ydych am wneud sylwadau arno wrth gyflwyno eich sylwadau.",
+    "contact-us-para-one": "Os hoffech chi gysylltu â ni, neu wneud cwyn, neu os oes gennych ymholiad ynghylch cais neu apêl, gallwch ddefnyddio’r ffurflen isod i gyflwyno eich cwestiynau neu sylwadau, a byddwn yn ymateb cyn gynted â phosibl.",
+    "contact-us-para-two": "Os ydych chi’n dymuno cyflwyno sylwadau ar gyfer cais neu apêl sy’n cael ei phenderfynu gan PCAC ar hyn o bryd, cofrestrwch neu fewngofnodwch i’r porth a chwiliwch am yr achos dan sylw er mwyn cyflwyno eich sylwadau.",
     "contact-us-select-plq": "Ymholiad deddfwriaeth gynllunio",
     "contact-us-select-ipq": "Ymholiad gweithdrefn seilwaith",
     "contact-us-select-pcpq": "Ymholiad gweithdrefn gwaith achos cynllunio",

pages/api/endpoint/getadvancedsearch_api.js

@@ -114,7 +114,7 @@ export default async function ApiProxy(req, res) {
         transformData: async (data, accessToken) => {
             if (Object.prototype.hasOwnProperty.call(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];
             }
 
             if (searchString.projecttype != null) {
@@ -124,10 +124,11 @@ export default async function ApiProxy(req, res) {
                     try {
                         const projectTypeQuery =
                             "pinswg_sipses?$filter=_pinswg_sipscase_value eq " +
-                            item.incidentid +
-                            " and _pinswg_projecttype_value eq " +
-                            searchString.projecttype +
-                            "&$select=_pinswg_projecttype_value";
+                            item.incidentid;
+                        // +
+                        // " and _pinswg_projecttype_value eq " +
+                        // searchString.projecttype +
+                        // "&$select=_pinswg_projecttype_value";
 
                         const projectTypeResponse = await relayGetData({
                             queryUrl: projectTypeQuery,

pages/api/endpoint/getportalmoduledetails_api.js

@@ -61,6 +61,14 @@ export default async function ApiProxy(req, res) {
 
     queryUrl = queryUrl + getSelectQuery(appealType);
 
+    queryUrl =
+        appealType === "pinswg_sipses"
+            ? queryUrl +
+              "&$expand=" +
+              "pinswg_sipscase($select=incidentid,ticketnumber,title,statuscode,pinswg_appealcasetype,pinswg_caseaddress,pinswg_lpareference,pinswg_appellantagent,pinswg_appellantfirstname,pinswg_appellantlastname,_pinswg_associatedlpa_value)," +
+              "pinswg_sips_pinswg_sipsprojecttype($select=_pinswg_sector_value,pinswg_name,pinswg_sipsprojecttypeid)"
+            : queryUrl;
+
     const relayPolicy = RELAY_POLICY_BOUNDED_READ;
 
     return relayGet({