Merged PR 1187: duplicate contacts catch and handle and welsh
duplicate contacts catch and handle and welsh Related work items: #11422
This commit is contained in:
Robert Bond
@@ -982,9 +982,22 @@ let MakeRepresentation = (props) => {
|
||||
<>
|
||||
<div>
|
||||
<p className="govuk-body">
|
||||
Some text in here to explain about
|
||||
raising a representation and why logging
|
||||
in
|
||||
{t(
|
||||
"myrepresentations:sign-in-to-raise-rep-label"
|
||||
)}{" "}
|
||||
<a
|
||||
href={
|
||||
"mailto:" +
|
||||
t(
|
||||
"myrepresentations:login-contact-email"
|
||||
)
|
||||
}
|
||||
className="govuk-link--no-underline"
|
||||
>
|
||||
{t(
|
||||
"myrepresentations:login-contact-email"
|
||||
)}
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
<button
|
||||
@@ -992,7 +1005,9 @@ let MakeRepresentation = (props) => {
|
||||
type="button"
|
||||
onClick={() => signIn()}
|
||||
>
|
||||
Sign in to raise representation
|
||||
{t(
|
||||
"myrepresentations:sign-in-to-raise-rep-button"
|
||||
)}
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
|
||||
@@ -537,8 +537,17 @@ const CaseSummary = (props) => {
|
||||
{t(
|
||||
"case:representation-date-passed-additional-label"
|
||||
)}{" "}
|
||||
<Link href="mailto:pedw.casework@gov.wales">
|
||||
pedw.casework@gov.wales
|
||||
<Link
|
||||
href={
|
||||
"mailto:" +
|
||||
t(
|
||||
"home:login-contact-email"
|
||||
)
|
||||
}
|
||||
>
|
||||
{t(
|
||||
"home:login-contact-email"
|
||||
)}
|
||||
</Link>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -129,15 +129,9 @@ let CompleteAppeal = (props) => {
|
||||
</p>
|
||||
<p className="govuk-body">
|
||||
{t("newappeal:new-appeal-complete-paragraph-3")}::
|
||||
{router.locale == "cy" ? (
|
||||
<Link href="mailto:PEDW.GwaithAchos@llyw.cymru">
|
||||
PEDW.GwaithAchos@llyw.cymru
|
||||
</Link>
|
||||
) : (
|
||||
<Link href="mailto:PEDW.Casework@gov.wales">
|
||||
PEDW.Casework@gov.wales
|
||||
</Link>
|
||||
)}
|
||||
<Link href={"mailto:" + t("home:login-contact-email")}>
|
||||
{t("home:login-contact-email")}
|
||||
</Link>
|
||||
</p>
|
||||
<p className="govuk-body">
|
||||
{t("newappeal:new-appeal-complete-paragraph-4")}:
|
||||
|
||||
@@ -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"],
|
||||
|
||||
@@ -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 "
|
||||
}
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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 "
|
||||
}
|
||||
@@ -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",
|
||||
|
||||
@@ -167,6 +167,10 @@ module.exports = {
|
||||
source: "/fymhorth/cynrychiolaeth",
|
||||
destination: "/myportal/representation",
|
||||
},
|
||||
{
|
||||
source: "/manylionpellach",
|
||||
destination: "/furtherdetails",
|
||||
},
|
||||
{
|
||||
source: "/allgofnodi",
|
||||
destination: "/logout",
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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 (
|
||||
<div>
|
||||
<Head>
|
||||
<title>
|
||||
{t("common:further-details-title")} -{" "}
|
||||
{t("common:service-name")}
|
||||
</title>
|
||||
</Head>
|
||||
<div id="page_wrapper">
|
||||
<CookieBanner />
|
||||
<Header courseName={t("common:service-name")} />
|
||||
<div className="govuk-width-container govuk-!-padding-bottom-9">
|
||||
<main className="govuk-main-wrapper govuk-!-padding-top-9 govuk-!-padding-bottom-9">
|
||||
<div className="govuk-grid-row">
|
||||
<div className="govuk-grid-column-full ">
|
||||
<h1>{t("common:further-details-header")}</h1>
|
||||
<p className="govuk-body">
|
||||
{t("common:further-details-para-one")}
|
||||
</p>
|
||||
|
||||
<p className="govuk-body">
|
||||
{t("common:further-details-para-two")}{" "}
|
||||
<Link
|
||||
href={
|
||||
"mailto:" +
|
||||
t("home:login-contact-email")
|
||||
}
|
||||
>
|
||||
{t("home:login-contact-email")}
|
||||
</Link>{" "}
|
||||
</p>
|
||||
<Link href="/" onClick={handleLogout}>
|
||||
{t("common:404-not-found-link")}
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
<Footer footerLinks={footerLinks} ticketnumber={props} />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default FourOhFour;
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user