From 2b9c160aee1e3052e2a61e011abefb91a7d549c3 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Tue, 11 Jun 2024 16:45:41 +0100 Subject: [PATCH] duplicate contacts catch and handle and welsh --- components/case/representation/index.js | 23 ++++++-- components/case/summary.js | 13 ++++- components/newappeal/complete.js | 12 ++--- i18n.js | 17 +++--- locales/cy/common.json | 6 ++- locales/cy/home.json | 2 +- locales/cy/myrepresentations.json | 3 ++ locales/en/common.json | 6 ++- locales/en/myrepresentations.json | 3 ++ next.config.js | 4 ++ pages/api/endpoint/getportallogin_api.js | 4 +- pages/furtherdetails.js | 69 ++++++++++++++++++++++++ pages/myportal/index.js | 19 +++++++ 13 files changed, 153 insertions(+), 28 deletions(-) create mode 100644 pages/furtherdetails.js diff --git a/components/case/representation/index.js b/components/case/representation/index.js index c6960ea0..bf9e8d11 100644 --- a/components/case/representation/index.js +++ b/components/case/representation/index.js @@ -982,9 +982,22 @@ let MakeRepresentation = (props) => { <>

- Some text in here to explain about - raising a representation and why logging - in + {t( + "myrepresentations:sign-in-to-raise-rep-label" + )}{" "} + + {t( + "myrepresentations:login-contact-email" + )} +

) : ( diff --git a/components/case/summary.js b/components/case/summary.js index 717c6dc1..a4d2ea43 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -537,8 +537,17 @@ const CaseSummary = (props) => { {t( "case:representation-date-passed-additional-label" )}{" "} - - pedw.casework@gov.wales + + {t( + "home:login-contact-email" + )}

diff --git a/components/newappeal/complete.js b/components/newappeal/complete.js index 16f6c8c8..f4ac2946 100644 --- a/components/newappeal/complete.js +++ b/components/newappeal/complete.js @@ -129,15 +129,9 @@ let CompleteAppeal = (props) => {

{t("newappeal:new-appeal-complete-paragraph-3")}:: - {router.locale == "cy" ? ( - - PEDW.GwaithAchos@llyw.cymru - - ) : ( - - PEDW.Casework@gov.wales - - )} + + {t("home:login-contact-email")} +

{t("newappeal:new-appeal-complete-paragraph-4")}: diff --git a/i18n.js b/i18n.js index 91823d74..ee4c269f 100644 --- a/i18n.js +++ b/i18n.js @@ -12,6 +12,7 @@ module.exports = { "*": ["common", "newappeal", "search"], "/": ["common", "home", "case"], "/error": ["common", "home", "myportal"], + "/furtherdetails": ["common", "home", "myportal"], "/myportal": ["myportal", "common", "home", "case"], "/myportal/viewall": ["search", "myportal", "case"], "/myportal/advancedsearch": ["search", "myportal"], @@ -32,18 +33,18 @@ module.exports = { "/addresssearch": ["search", "case", "myportal"], "/addresssearchresults": ["search", "case", "myportal"], "/viewall": ["search"], - "/case": ["case"], - "/case/*": ["case"], - "/case/[ticketnumber]": ["case"], - "/case/id/[incident]": ["case"], + "/case": ["case", "home"], + "/case/*": ["case", "home"], + "/case/[ticketnumber]": ["case", "home"], + "/case/id/[incident]": ["case", "home"], "/myportal/representation": ["case", "myrepresentations", "common"], "/myportal/error": ["myportal", "common"], - "/myportal/case/id/[incident]": ["case"], + "/myportal/case/id/[incident]": ["case","home"], "/myportal/addresssearch": ["search", "case", "myportal"], "/myportal/addresssearchresults": ["search", "case", "myportal"], - "/newappeal": ["newappeal"], - "/newappeal/*": ["newappeal"], - "/newappeal/selectappeal": ["newappeal"], + "/newappeal": ["newappeal", "home"], + "/newappeal/*": ["newappeal", "home"], + "/newappeal/selectappeal": ["newappeal", "home"], "/dns/*": ["dnsCommon", "case", "common"], "/dns/[developmentName]": ["dnsCommon", "case", "common"], "/dns": ["dnsCommon", "dnsHome"], diff --git a/locales/cy/common.json b/locales/cy/common.json index 8160859c..0616a3ff 100644 --- a/locales/cy/common.json +++ b/locales/cy/common.json @@ -77,5 +77,9 @@ "of-label": "o", "change-link-label": "Newid", "hide-banner-label": "Cuddio", - "error-instruction-label": "Os nad ydych yn gallu gweld eich gweithgarwch diweddar, pwyswch Ctrl, Shift ac R i adnewyddu eich porwr (neu Cmd ac R os ydych yn defnyddio Mac)." + "error-instruction-label": "Os nad ydych yn gallu gweld eich gweithgarwch diweddar, pwyswch Ctrl, Shift ac R i adnewyddu eich porwr (neu Cmd ac R os ydych yn defnyddio Mac).", + "further-details-title": "Mae angen rhagor o fanylion", + "further-details-header": "Ni allwch fewngofnodi ar hyn o bryd", + "further-details-para-one": "Mae angen i PEDW gadarnhau ychydig mwy o wybodaeth amdanoch cyn y gallwch barhau.", + "further-details-para-two": "Ffoniwch 01234 567890 neu cysylltwch â ni ar " } \ No newline at end of file diff --git a/locales/cy/home.json b/locales/cy/home.json index 2188c035..81ff2298 100644 --- a/locales/cy/home.json +++ b/locales/cy/home.json @@ -33,7 +33,7 @@ "casesearch-search-validation-required": "Angenrheidiol", "casesearch-search-validation-minlength": "Rhaid bod yn 4 nod neu fwy", "casescomment-card-title": "Rhowch sylwadau ar apêl", - "casescomment-card-paragraph-one": "Rhowch sylwadau ar apêl (gan eithrio deiliad tai a masnachol) drwy ebostio", + "casescomment-card-paragraph-one": "Rhowch sylwadau ar apêl (gan eithrio deiliad tai a masnachol) drwy ebostio ", "casescomment-card-paragraph-two": "Ar gyfer apeliadau deiliaid tai a masnachol, ni all partïon â buddiant wneud sylwadau yn ystod y cam apelio. Bydd unrhyw sylwadau a wneir yn ystod y cam ymgeisio yn cael eu darparu gan yr awdurdod cynllunio lleol a'u hystyried gan yr arolygydd.", "inspectorate-card-visit-label": "Ymweld Yr Arolygiaeth Gynllunio", "inspectorate-card-visit-link": "Hafan", diff --git a/locales/cy/myrepresentations.json b/locales/cy/myrepresentations.json index 7cccf5cb..368b8a66 100644 --- a/locales/cy/myrepresentations.json +++ b/locales/cy/myrepresentations.json @@ -1,4 +1,7 @@ { + "login-contact-email": "pedw.gwaithachos@llyw.cymru", + "sign-in-to-raise-rep-label": "I godi cynrychiolaeth ar gyfer yr apêl hon bydd angen i chi fewngofnodi gyda'ch cyfeiriad e-bost. Os nad ydych am fewngofnodi i godi sylw cysylltwch", + "sign-in-to-raise-rep-button": "Mewngofnodwch i godi cynrychiolaeth", "make-a-representation-on-label": "Gwnewch gynrychioliad ar", "make-a-representation-for-label": "Gwnewch gynrychiolaeth ar gyfer", "timetable-title": "Amserlen", diff --git a/locales/en/common.json b/locales/en/common.json index 78c05b5b..b6d5ce69 100644 --- a/locales/en/common.json +++ b/locales/en/common.json @@ -77,5 +77,9 @@ "of-label": "of", "change-link-label": "Change", "hide-banner-label": "Hide", - "error-instruction-label": "If you are unable to view your recent activity, press Ctrl, Shift and R to refresh your browser (or Cmd and R if you are using a Mac)." + "error-instruction-label": "If you are unable to view your recent activity, press Ctrl, Shift and R to refresh your browser (or Cmd and R if you are using a Mac).", + "further-details-title": "Further details required", + "further-details-header": "You can not be logged in at this time", + "further-details-para-one": "PEDW needs to confirm a bit more informtion about you before you can continue.", + "further-details-para-two": "Please call 01234 567890 or contact us on " } \ No newline at end of file diff --git a/locales/en/myrepresentations.json b/locales/en/myrepresentations.json index d11f4189..fb4a88f2 100644 --- a/locales/en/myrepresentations.json +++ b/locales/en/myrepresentations.json @@ -1,4 +1,7 @@ { + "login-contact-email": "pedw.casework@gov.wales", + "sign-in-to-raise-rep-label": "To raise a representation for this appeal you will need to login with your email address. If you do not wish to login to raise a representation contact", + "sign-in-to-raise-rep-button": "Sign in to raise representation", "make-a-representation-on-label": "Make a representation on", "make-a-representation-for-label": "Make a representation for", "timetable-title": "Timetable", diff --git a/next.config.js b/next.config.js index a0c9e3fb..66c789f6 100644 --- a/next.config.js +++ b/next.config.js @@ -167,6 +167,10 @@ module.exports = { source: "/fymhorth/cynrychiolaeth", destination: "/myportal/representation", }, + { + source: "/manylionpellach", + destination: "/furtherdetails", + }, { source: "/allgofnodi", destination: "/logout", diff --git a/pages/api/endpoint/getportallogin_api.js b/pages/api/endpoint/getportallogin_api.js index c9253574..02069480 100644 --- a/pages/api/endpoint/getportallogin_api.js +++ b/pages/api/endpoint/getportallogin_api.js @@ -43,9 +43,9 @@ export default async function ApiProxy(req, res) { var queryUrl = "contacts?$filter=emailaddress1 eq '" + emailAddress + - "'&$count=true&$select=emailaddress1,contactid,yomifullname,firstname,lastname"; + "' and statuscode eq 1&$count=true&$select=emailaddress1,contactid,yomifullname,firstname,lastname"; - //console.log(req.query); + console.log(req.query, queryUrl); var apiResponse = _.isEmpty(req.query) ? res.status(400).json() diff --git a/pages/furtherdetails.js b/pages/furtherdetails.js new file mode 100644 index 00000000..75d7936f --- /dev/null +++ b/pages/furtherdetails.js @@ -0,0 +1,69 @@ +// 404.js +import useTranslation from "next-translate/useTranslation"; +import Head from "next/head"; +import Link from "next/link"; +import CookieBanner from "../components/cookieBanner"; +import Footer from "../components/footer"; +import Header from "../components/header"; +import { parseCookies, setCookie, destroyCookie } from "nookies"; +import { useSession, signIn, signOut } from "next-auth/react"; + +const FourOhFour = (props) => { + let { t, lang } = useTranslation(); + const { footerLinks, pages } = props; + + const handleLogout = () => { + console.info("////////////\n" + "logout" + "\n////////////"); + window.localStorage.clear(), + destroyCookie(null, "next-auth.csrf-token"), + destroyCookie(null, "next-auth.callback-url"), + destroyCookie(null, "pedw_locale"), + destroyCookie(null, "pinsUser"), + signOut({ callbackUrl: "/" }); + }; + + return ( +

+ + + {t("common:further-details-title")} -{" "} + {t("common:service-name")} + + +
+ +
+
+
+
+
+

{t("common:further-details-header")}

+

+ {t("common:further-details-para-one")} +

+ +

+ {t("common:further-details-para-two")}{" "} + + {t("home:login-contact-email")} + {" "} +

+ + {t("common:404-not-found-link")} + +
+
+
+
+
+
+ ); +}; + +export default FourOhFour; diff --git a/pages/myportal/index.js b/pages/myportal/index.js index 723b833a..38050cee 100644 --- a/pages/myportal/index.js +++ b/pages/myportal/index.js @@ -191,6 +191,25 @@ export const getServerSideProps = wrapper.getServerSideProps( await getPortalLogin(thisSession.user.email), ]); + //grabs first contact on this list + + //jump out page for duplicates.... + + console.log( + "Number of contacts with this email:", + loggedInUser.value.length + ); + if (loggedInUser.value.length > 1) { + return { + redirect: { + destination: + ctx.locale == "cy" + ? "/cy/manylionpellach" + : "/furtherdetails", + permanent: false, + }, + }; + } loggedInUser = loggedInUser.value[0].contactid; //console.log("nextAuth Session:", thisSession); }