robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged PR 1119: Direct links to details pages

Browse Source 
Related work items: #10822
This commit is contained in:
Robert Bond
2024-04-10 07:07:25 +00:00
parent 37d76d3dc9 44f067d2aa
commit ba06f14b4a
62 changed files with 487 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/breadcrumbs.js
+13
View File
@@ -420,6 +420,19 @@ const Breadcrumbs = (props) => {
""
)}
{router.pathname == "/case/[ticketnumber]" ? (
<>
<li className="govuk-breadcrumbs__list-item">
{t("common:breadcrumb-case-reference")}:{" "}
{
props.props.searchResultsObj
.searchResultsObj.value[0].title
}
</li>
</>
) : (
""
)}
{router.pathname == "/myportal/dnsapplications" ? (
<>
{" "}
components/case.js
+1
View File
@@ -32,6 +32,7 @@ const Case = (props) => {
currentType={props.currentType}
appealTypeID={props.appealTypeID}
searchResultsObj={props.searchResultsObj}
directSearchResultsObj={props.directSearchResultsObj}
searchDetailsObj={props.searchDetailsObj}
searchString={props.searchString}
incidentid={props.incidentid}
components/case/summary.js
+51 -18
View File
@@ -69,6 +69,7 @@ const CaseSummary = (props) => {
awaitingSubmission,
searchResultsObj,
searchDetailsObj,
directSearchResultsObj,
currentType,
setCurrentLinkedCases,
linkedCasesReference,
@@ -79,9 +80,9 @@ const CaseSummary = (props) => {
currentView,
} = props;
const showLoginCheck = currentView.showLogin;
const showLoginCheck =
currentType == "directResultsObj" ? "true" : currentView.showLogin;
const { data: session, status } = useSession();
//console.log("session status:", status, session);
const cookies = parseCookies();
@@ -182,6 +183,8 @@ const CaseSummary = (props) => {
'$..[?(@.pinswg_title=="' + caseReference + '")]',
setCaseQueryObj
))
: currentType == "directResultsObj"
? (casesObj = directSearchResultsObj.value)
: (casesObj = jsonpath(
'$..[?(@.reference=="' + caseReference + '")]',
setCaseQueryObj
@@ -196,6 +199,8 @@ const CaseSummary = (props) => {
'$..[?(@.pinswg_name=="' + caseReference + '")]',
searchDetailsObj
))
: currentType == "directResultsObj"
? (detailsObj = searchDetailsObj[0].value)
: (detailsObj = jsonpath(
'$..[?(@.pinswg_name=="' + caseReference + '")]',
setCaseDetailsObj
@@ -226,6 +231,10 @@ const CaseSummary = (props) => {
{t("case:summary-reference-label")}:{" "}
{currentType == "searchResultsObj"
? detailsObj.pinswg_name
: currentType == "directResultsObj"
? casesObj.title
: currentType == "watchedCases"
? casesObj.pinswg_title
: casesObj.reference}
</h1>
@@ -367,12 +376,12 @@ const CaseSummary = (props) => {
<dd className="govuk-summary-list__value">
{router.locale == "cy"
? jsonpath(
transLookup,
'$..[?(@.value=="' +
detailsObj[
"pinswg_casestage@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
'")].value_cy',
transLookup
)
: detailsObj[
"pinswg_casestage@OData.Community.Display.V1.FormattedValue"
@@ -531,14 +540,32 @@ const CaseSummary = (props) => {
.currentReference +
"\n\nYou will now be prompted to sign in"
) &&
signIn("email", {
callbackUrl:
"/myportal/searchresults?q=" +
props
.currentView
.caseReference
.currentReference,
});
// signIn("email", {
// callbackUrl:
// "/myportal/case/" +
// props
// .currentView
// .caseReference
// .ticketnumber,
// });
setCookie(
null,
"pedwWatchCase",
currentType ==
"searchResultsObj"
? detailsObj.pinswg_name
: currentType ==
"directResultsObj"
? casesObj.title
: casesObj.reference,
{
path: "/",
expires:
expDate,
}
),
signIn();
}}
title={t(
"case:watch-this-case-link"
@@ -921,13 +948,10 @@ const CaseSummary = (props) => {
const linkedCases = linkCaseObj();
}, [incidentid, setCurrentLinkedCases]);
// const [showSpinnerState, setShowSpinnerState] = useState(false);
let now = new Date();
let expDate = new Date(now);
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
expDate.setDate(now.getDate() + 365);
function formatDates(dateObj, showTime) {
var dateObj = new Date(dateObj);
@@ -998,6 +1022,15 @@ const CaseSummary = (props) => {
return date > start && date > end ? true : false;
}
if (status == "authenticated" && cookies.pedwWatchCase != null) {
selectWatchedCase(
props.accountDetails.accountDetails.contactid,
incidentid,
appealTypeID
);
destroyCookie({}, "pedwWatchCase", { path: "/" });
}
return <>{showDetailsBlock}</>;
};
components/footer.js
+33 -19
View File
@@ -23,15 +23,31 @@ export default function Footer(props) {
));
const [showShareState, setShowShareState] = useState(false);
const [copySuccess, setCopySuccess] = useState("");
let shareState = () => {
showShareState == true
? setShowShareState(false)
? (setShowShareState(false), setCopySuccess(""))
: setShowShareState(true);
};
//console.log(router.asPath);
const shareBodyStr = t("common:service-home-url") + router.asPath;
const copyToClipBoard = async (copyMe) => {
try {
await navigator.clipboard.writeText(copyMe);
setCopySuccess(" - done!");
} catch (err) {
setCopySuccess("Failed to copy!");
}
};
const shareBodyStr =
t("common:service-home-url") +
(router.route == "/case" ||
router.route == "/dnsdetails" ||
router.route == "/myportal/case"
? (router.route == "/dnsdetails" ? "/dns/" : "/case/") +
encodeURIComponent(props.ticketnumber)
: router.asPath);
const shareSubjectStr =
t("common:social-shared-from") +
" " +
@@ -110,7 +126,7 @@ export default function Footer(props) {
shareBodyStr +
"&subject=" +
shareSubjectStr
} //</li>https%3A//gov.wales/&amp;subject=Shared%20from%20gov.wales"
}
className="email"
>
<span className="vo_hidden">
@@ -119,6 +135,19 @@ export default function Footer(props) {
Email
</a>
</li>
<li>
<a
onClick={() => {
copyToClipBoard(shareBodyStr);
}}
className="link"
>
<span className="vo_hidden">
Share this page via{" "}
</span>
Copy Link {copySuccess}
</a>
</li>
</ul>
</div>
<div
@@ -244,21 +273,6 @@ export default function Footer(props) {
)}
</Link>
</li>
{/* <li className="govuk-footer__inline-list-item">
<a
href={t(
"common:footer-alternative-languages-link"
)}
id="aTermsConds"
className="govuk-footer__link"
target="_blank"
rel="noreferrer"
>
{t(
"common:footer-alternative-languages-link-label"
)}
</a>
</li> */}
</ul>
</nav>
<div
components/myportal/topthree.js
+2
View File
@@ -189,6 +189,8 @@ const TopThree = (props) => {
data-id={index}
onClick={() => {
setCurrentReference({
"ticketnumber":
showTopThreeArr[key].ticketnumber,
"currentReference":
topThreeType != "watchedCases"
? topThreeType !=
components/myportal/topthree_reps.js
+2
View File
@@ -169,6 +169,8 @@ const TopThree = (props) => {
data-id={index}
onClick={() => {
setCurrentReference({
"ticketnumber":
showTopThreeArr[key].ticketnumber,
"currentReference":
showTopThreeArr[key].caseRef,
"currentType": topThreeType,
components/myportal/viewall.js
+2
View File
@@ -119,6 +119,8 @@ const ViewAllResults = (props) => {
}
onClick={() => {
setCurrentReference({
"ticketnumber":
resultsArr[key].ticketnumber,
"currentReference":
currentView.viewKey != "watchedCases"
? currentView.viewKey ==
components/nosession.js
+1 -1
View File
@@ -46,7 +46,7 @@ const NoSessionWarning = (props) => {
</div>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
components/search/dnssearchresults.js
+2
View File
@@ -358,6 +358,8 @@ const DNSSearchResults = (props) => {
className="govuk-link--no-underline"
onClick={() => {
setCurrentReference({
"ticketnumber":
item.ticketnumber,
"currentReference":
item.title,
"currentType":
components/search/searchresults.js
+2
View File
@@ -300,6 +300,8 @@ const SearchResults = (props) => {
className="govuk-link--no-underline"
onClick={() => {
setCurrentReference({
"ticketnumber":
item.ticketnumber,
"currentReference":
item.title,
"currentType":
pages/404.js
+1 -1
View File
@@ -33,7 +33,7 @@ const FourOhFour = (props) => {
</div>
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/_error.js
+1 -1
View File
@@ -62,7 +62,7 @@ function Error({ statusCode }, props) {
</div>
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/accessibility.js
+1 -1
View File
@@ -72,7 +72,7 @@ const Accessibility = (props) => {
<ServiceBanner />
<AccessibilityStatement />
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/account/changepassword.js
+1 -1
View File
@@ -96,7 +96,7 @@ const Home = (props) => {
</div>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/account/forgottenpassword.js
+1 -1
View File
@@ -72,7 +72,7 @@ const Home = (props) => {
</div>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/account/forgottenuser.js
+1 -1
View File
@@ -71,7 +71,7 @@ const Home = (props) => {
</div>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/account/personaldetails.js
+1 -1
View File
@@ -94,7 +94,7 @@ const Home = (props) => {
</div>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/account/register.js
+1 -1
View File
@@ -150,7 +150,7 @@ const Home = (props) => {
</div>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/advancedsearch.js
+1 -1
View File
@@ -112,7 +112,7 @@ const Home = (props) => {
/>
)}
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/advancedsearchresults.js
+1 -1
View File
@@ -105,7 +105,7 @@ const Home = (props) => {
advancedSearch={true}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/api/endpoint/getwatchedcases_api.js
+2 -1
View File
@@ -48,7 +48,7 @@ export default async function ApiProxy(req, res) {
var queryUrl =
"pinswg_watchlists?$filter= _pinswg_contact_value eq " +
loggedInUserId +
"&$select=pinswg_appealcasetype,pinswg_watchlistid,_pinswg_watchedcase_value,statuscode&$count=true&$orderby=createdon desc&$expand=pinswg_WatchedCase($select=pinswg_AssociatedLPA)";
"&$select=modifiedon,pinswg_appealcasetype,pinswg_watchlistid,_pinswg_watchedcase_value,statuscode&$count=true&$orderby=createdon desc&$expand=pinswg_WatchedCase($select=pinswg_AssociatedLPA)";
return axios
.get(
@@ -57,6 +57,7 @@ export default async function ApiProxy(req, res) {
)
.then(({ data }) => {
data.value.forEach(function (element) {
element.ticketnumber = element.pinswg_WatchedCase.ticketnumber;
element.pinswg_title =
element[
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
pages/api/endpoint/getwatchedcasesproxy_api.js
+1 -1
View File
@@ -43,7 +43,7 @@ export default async function ApiProxy(req, res) {
var queryUrl =
"pinswg_watchlists?$filter= _pinswg_contact_value eq " +
loggedInUserId +
"&$select=pinswg_appealcasetype,pinswg_watchlistid,_pinswg_watchedcase_value,statuscode&$count=true&$orderby=createdon desc&$expand=pinswg_WatchedCase($select=pinswg_AssociatedLPA)";
"&$select=modifiedon,pinswg_appealcasetype,pinswg_watchlistid,_pinswg_watchedcase_value,statuscode&$count=true&$orderby=createdon desc&$expand=pinswg_WatchedCase($select=pinswg_AssociatedLPA)";
return axios
.get(
pages/auth/error.js
+1 -1
View File
@@ -69,7 +69,7 @@ const Error = (props) => {
</div>
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/auth/signin.js
+1 -1
View File
@@ -87,7 +87,7 @@ const SignIn = (props) => {
</div>
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/auth/verify-request.js
+1 -1
View File
@@ -51,7 +51,7 @@ const SignIn = (props) => {
</div>
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/case/[ticketnumber].js
+225
View File
@@ -0,0 +1,225 @@
import useTranslation from "next-translate/useTranslation";
import Head from "next/head";
import { useRouter } from "next/router";
import { connect } from "react-redux";
import {
getBasicSearch,
getIP,
getPortalLogin,
getPersonalAccount,
} from "../../actions";
import CookieBanner from "../../components/cookieBanner";
import Footer from "../../components/footer";
import Header from "../../components/header";
import { getSearchDetails } from "../../components/utils";
import { setCurrentReference } from "../../store/currentView/action";
import { setSearch } from "../../store/search/action";
import {
setSearchDetails,
setSearchResults,
} from "../../store/searchOutput/action";
import { wrapper } from "../../store/store";
import Case from "../../components/case";
import Breadcrumbs from "../../components/breadcrumbs";
import { getSession, useSession } from "next-auth/react";
import {
setAccountDetails,
setContainerID,
setLoggedInUserId,
} from "../../store/accountDetails/action";
const CaseHome = (props) => {
const { footerLinks, pages } = props;
let { t, lang } = useTranslation();
const router = useRouter();
const { locale } = router;
const { ticketnumber } = router.query;
return (
<div>
<Head>
<title>
Reference:{" "}
{props.currentView.caseReference.currentReference}{" "}
</title>
</Head>
<div id="page_wrapper">
<CookieBanner />
<Header serviceName="Developments of National Significance" />
<div className="govuk-width-container">
<Breadcrumbs slug={ticketnumber} props={props} />
<Case
props={props}
myCases={props.myCases.myCases}
myCasesDetails={props.myCases.myCasesDetails}
directSearchResultsObj={
props.searchResultsObj.searchResultsObj
}
searchDetailsObj={
props.searchResultsObj.searchDetailsObj
}
documentDetailsObj={props.documentDetailsObj}
myRepresentations={
props.myRepresentations.myRepresentations
}
watchedCases={props.watchedCases.watchedCases}
watchedCasesDetails={
props.watchedCases.watchedCasesDetails
}
awaitingSubmission={
props.awaitingSubmission.awaitingSubmission
}
caseReference={
props.searchResultsObj.searchResultsObj.value[0]
.ticketnumber
}
currentType={props.currentType}
appealTypeID={
props.searchResultsObj.searchResultsObj.value[0]
.pinswg_appealcasetype
}
incidentid={
props.searchResultsObj.searchResultsObj.value[0]
.incidentid
}
representationsObj={
props.searchResultsObj.representationsObj
}
showLoginCheck={true}
/>
</div>
<Footer
footerLinks={footerLinks}
props={props}
ticketnumber={
props.searchResultsObj.searchResultsObj.value[0]
.ticketnumber
}
/>
</div>
</div>
);
};
export const getServerSideProps = wrapper.getServerSideProps(
(store) => async (ctx) => {
const { query, req, res } = ctx;
getIP(req);
const { cookies } = req;
console.log(cookies);
console.log("the query :", query.ticketnumber);
let thisSession = await getSession(ctx);
let loggedInUser = {};
if (thisSession) {
console.log(" has sesssion.......");
[loggedInUser] = await Promise.all([
await getPortalLogin(thisSession.user.email),
]);
loggedInUser = loggedInUser.value[0].contactid;
const accountDetails = await getPersonalAccount(loggedInUser);
store.dispatch(setAccountDetails(accountDetails));
} else {
console.log("not has sesssion.......");
}
let developmentQuery =
query.ticketnumber.indexOf("CAS-") == 0
? query.ticketnumber
: query.ticketnumber.split("-").join(" ");
const searchResultsObj = await getBasicSearch(developmentQuery);
const searchDetailsObj = await getSearchDetails(searchResultsObj);
console.log(
"\n======================================\n",
searchResultsObj,
"\n======================================\n"
);
console.log(
"\n======================================\n",
searchDetailsObj[0],
"\n======================================\n"
);
store.dispatch(setSearch(developmentQuery));
console.log(
searchResultsObj["@odata.count"] > 1 ||
searchResultsObj["@odata.count"] < 1
);
if (searchResultsObj["@odata.count"] < 1) {
return {
redirect: {
destination: "/404",
permanent: false,
},
};
} else {
if (searchResultsObj["@odata.count"] > 1) {
return {
redirect: {
//destination: "/dns-not-found",
destination: "/404",
permanent: false,
},
};
} else {
store.dispatch(
setCurrentReference({
"ticketnumber": searchResultsObj.value[0].ticketnumber,
"currentReference": searchResultsObj.value[0].title,
"currentType": "searchResultsObj",
"incidentid": searchResultsObj.value[0].incidentid,
"appealType":
searchResultsObj.value[0].pinswg_appealcasetype,
})
);
}
}
// console.log(searchResultsObj);
return {
props: {
searchResultsObj: {
searchResultsObj: searchResultsObj,
searchDetailsObj: searchDetailsObj,
},
currentType: "directResultsObj",
},
};
}
);
const mapStateToProps = (state) => {
return {
accountDetails: state.accountDetails,
currentView: state.currentView,
search: state.search,
//searchResultsObj: state.searchResultsObj,
documentDetailsObj: state.searchResultsObj.documentDetailsObj,
formData: state.formData,
appealType: state.appealType,
form: state.form,
myCases: state.myCases,
watchedCases: state.watchedCases,
myRepresentations: state.myRepresentations,
awaitingSubmission: state.awaitingSubmission,
};
};
const mapDispatchToProps = (dispatch) => {
return {
setCurrentReference: (currentReference) => {
dispatch(setCurrentReference(refno));
},
};
};
export default connect(mapStateToProps, mapDispatchToProps)(CaseHome);
pages/case/index.js
+4 -1
View File
@@ -69,7 +69,10 @@ const CaseHome = (props) => {
showLoginCheck={props.currentView.showLogin}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer
footerLinks={footerLinks}
ticketnumber={props.currentView.caseReference.ticketnumber}
/>
</div>
</div>
);
pages/details-about-cookies.js
+1 -1
View File
@@ -73,7 +73,7 @@ const CookieDetails = (props) => {
<ServiceBanner />
<CookiePolicy />
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/dns-not-found.js
+1 -1
View File
@@ -36,7 +36,7 @@ const FourOhFour = (props) => {
</div>
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/dns/[developmentName].js
+67 -16
View File
@@ -16,6 +16,12 @@ import {
import { wrapper } from "../../store/store";
import Case from "../../components/case";
import Breadcrumbs from "../../components/breadcrumbs";
import { getSession, useSession } from "next-auth/react";
import {
setAccountDetails,
setContainerID,
setLoggedInUserId,
} from "../../store/accountDetails/action";
const CaseHome = (props) => {
const { footerLinks, pages } = props;
@@ -44,15 +50,13 @@ const CaseHome = (props) => {
props={props}
myCases={props.myCases.myCases}
myCasesDetails={props.myCases.myCasesDetails}
searchResultsObj={
directSearchResultsObj={
props.searchResultsObj.searchResultsObj
}
searchDetailsObj={
props.searchResultsObj.searchDetailsObj
}
documentDetailsObj={
props.searchResultsObj.documentDetailsObj
}
documentDetailsObj={props.documentDetailsObj}
myRepresentations={
props.myRepresentations.myRepresentations
}
@@ -64,22 +68,32 @@ const CaseHome = (props) => {
props.awaitingSubmission.awaitingSubmission
}
caseReference={
props.currentView.caseReference.currentReference
}
currentType={
props.currentView.caseReference.currentType
props.searchResultsObj.searchResultsObj.value[0]
.ticketnumber
}
currentType={props.currentType}
appealTypeID={
props.currentView.caseReference.appealType
props.searchResultsObj.searchResultsObj.value[0]
.pinswg_appealcasetype
}
incidentid={
props.searchResultsObj.searchResultsObj.value[0]
.incidentid
}
incidentid={props.currentView.caseReference.incidentid}
representationsObj={
props.searchResultsObj.representationsObj
}
showLoginCheck={props.currentView.showLogin}
showLoginCheck={true}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer
footerLinks={footerLinks}
props={props}
ticketnumber={
props.searchResultsObj.searchResultsObj.value[0]
.ticketnumber
}
/>
</div>
</div>
);
@@ -93,7 +107,23 @@ export const getServerSideProps = wrapper.getServerSideProps(
console.log(cookies);
console.log("the query", query.developmentName);
let loggedInUser = cookies.pinsUser;
let thisSession = await getSession(ctx);
let loggedInUser = {};
if (thisSession) {
console.log(" has sesssion.......");
[loggedInUser] = await Promise.all([
await getPortalLogin(thisSession.user.email),
]);
loggedInUser = loggedInUser.value[0].contactid;
const accountDetails = await getPersonalAccount(loggedInUser);
store.dispatch(setAccountDetails(accountDetails));
} else {
console.log("not has sesssion.......");
}
let developmentQuery =
query.developmentName.indexOf("CAS-") == 0
@@ -104,8 +134,17 @@ export const getServerSideProps = wrapper.getServerSideProps(
const searchResultsObj = await getBasicDNSURLSearch(developmentQuery);
const searchDetailsObj = await getSearchDetails(searchResultsObj);
store.dispatch(setSearchResults(searchResultsObj));
store.dispatch(setSearchDetails(searchDetailsObj));
console.log(
"\n======================================\n",
searchResultsObj,
"\n======================================\n"
);
console.log(
"\n======================================\n",
searchDetailsObj[0],
"\n======================================\n"
);
store.dispatch(setSearch(developmentQuery));
// console.log({
@@ -138,6 +177,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
} else {
store.dispatch(
setCurrentReference({
"ticketnumber": searchResultsObj.value[0].ticketnumber,
"currentReference": searchResultsObj.value[0].title,
"currentType": "searchResultsObj",
"incidentid": searchResultsObj.value[0].incidentid,
@@ -148,14 +188,25 @@ export const getServerSideProps = wrapper.getServerSideProps(
}
}
// console.log(searchResultsObj);
return {
props: {
searchResultsObj: {
searchResultsObj: searchResultsObj,
searchDetailsObj: searchDetailsObj,
},
currentType: "directResultsObj",
},
};
}
);
const mapStateToProps = (state) => {
return {
accountDetails: state.accountDetails,
currentView: state.currentView,
search: state.search,
searchResultsObj: state.searchResultsObj,
//searchResultsObj: state.searchResultsObj,
documentDetailsObj: state.searchResultsObj.documentDetailsObj,
formData: state.formData,
appealType: state.appealType,
form: state.form,
pages/dns/application-process.js
+1 -1
View File
@@ -142,7 +142,7 @@ const Home = (props) => {
</div>
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/dns/application-view.js
+1 -1
View File
@@ -46,7 +46,7 @@ const ApplicationView = (props) => {
</div>
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/dns/applications.js
+1 -1
View File
@@ -43,7 +43,7 @@ const Applications = (props) => {
<ApplicationList />
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/dns/contact-us.js
+1 -1
View File
@@ -146,7 +146,7 @@ const Home = (props) => {
</div>
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/dns/help.js
+2 -4
View File
@@ -52,9 +52,7 @@ const Home = (props) => {
</p>
<h2 className="govuk-heading-s">
<Link href="#" className="govuk-link">
Terms and conditions
Terms and conditions
</Link>
</h2>
<p>
@@ -115,7 +113,7 @@ const Home = (props) => {
</div>
</main>{" "}
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/dns/index.js
+1 -1
View File
@@ -37,7 +37,7 @@ const Home = (props) => {
<Breadcrumbs />
<Main props={props} />
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/dnsapplications.js
+1 -1
View File
@@ -105,7 +105,7 @@ const Home = (props) => {
searchResultsObj={props.searchResultsObj}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/dnsdetails.js
+5 -2
View File
@@ -22,7 +22,7 @@ const Home = (props) => {
<title>
{t("case:page-title")}:{" "}
{props.currentView.caseReference.currentReference}{" "}
{t("common:service-name")}
{t("common:service-name")} dd
</title>
</Head>
<div id="page_wrapper">
@@ -66,7 +66,10 @@ const Home = (props) => {
showMap={props.currentView.caseReference.showMap}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer
footerLinks={footerLinks}
ticketnumber={props.currentView.caseReference.ticketnumber}
/>
</div>
</div>
);
pages/error.js
+1 -1
View File
@@ -66,7 +66,7 @@ function Error({ statusCode }, props) {
</div>
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/help/cookies.js
+1 -1
View File
@@ -35,7 +35,7 @@ const CookieManagement = (props) => {
<ServiceBanner />
<CookieManagementMain />
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/index.js
+1 -1
View File
@@ -142,7 +142,7 @@ const Home = (props) => {
</>
)}
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/logout.js
+1 -1
View File
@@ -101,7 +101,7 @@ const LogOut = (props) => {
</div>
</div>
</main>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/myportal/[appealtypes].js
+1 -1
View File
@@ -203,7 +203,7 @@ let Home = (props) => {
)}
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
<TimeOut />
</div>
pages/myportal/advancedsearch.js
+1 -1
View File
@@ -62,7 +62,7 @@ const Home = (props) => {
/>
)}
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
<TimeOut />
</div>
pages/myportal/advancedsearchresults.js
+1 -1
View File
@@ -65,7 +65,7 @@ const Home = (props) => {
myportal={true}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
<TimeOut />
</div>
pages/myportal/case.js
+4 -1
View File
@@ -84,7 +84,10 @@ const Home = (props) => {
currentView={props.currentView}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer
footerLinks={footerLinks}
ticketnumber={props.currentView.caseReference.ticketnumber}
/>
</div>
<TimeOut />
</div>
pages/myportal/continuesubmission.js
+1 -1
View File
@@ -107,7 +107,7 @@ const Home = (props) => {
props={props}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/myportal/dnsapplications.js
+1 -1
View File
@@ -122,7 +122,7 @@ const Home = (props) => {
watchedCases={watchedCases}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/myportal/dnsdetails.js
+1 -1
View File
@@ -79,7 +79,7 @@ const Home = (props) => {
showMap={props.currentView.caseReference.showMap}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/myportal/error.js
+1 -1
View File
@@ -34,7 +34,7 @@ function Error({ statusCode }, props) {
</div>
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/myportal/index.js
+1 -1
View File
@@ -154,7 +154,7 @@ const Home = (props) => {
currentView={currentView}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/myportal/representation.js
+1 -1
View File
@@ -161,7 +161,7 @@ const Home = (props) => {
props={props}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/myportal/searchresults.js
+1 -1
View File
@@ -67,7 +67,7 @@ const Home = (props) => {
watchedCases={watchedCases}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
<TimeOut />
</div>
pages/myportal/viewall.js
+1 -1
View File
@@ -56,7 +56,7 @@ const Home = (props) => {
myportal={true}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
<TimeOut />
</div>
pages/newappeal/[appealtypes].js
+1 -1
View File
@@ -204,7 +204,7 @@ let Home = (props) => {
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
<TimeOut />
</div>
pages/newappeal/aboutyou.js
+1 -1
View File
@@ -105,7 +105,7 @@ const AboutYou = (props) => {
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/newappeal/index.js
+1 -1
View File
@@ -125,7 +125,7 @@ const Home = (props) => {
</main>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
<TimeOut />
</div>
pages/privacy.js
+1 -1
View File
@@ -73,7 +73,7 @@ const Privacy = (props) => {
<ServiceBanner />
<PrivacyStatement />
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/searchresults.js
+1 -1
View File
@@ -110,7 +110,7 @@ const Home = (props) => {
showLoginCheck={showLoginCheck}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/terms-and-conditions.js
+1 -1
View File
@@ -73,7 +73,7 @@ const TandC = (props) => {
<ServiceBanner />
<TermsAndConditionsStatement />
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
pages/viewall.js
+1 -1
View File
@@ -99,7 +99,7 @@ const Home = (props) => {
currentView={props.currentView.currentView}
/>
</div>
<Footer footerLinks={footerLinks} />
<Footer footerLinks={footerLinks} ticketnumber={props} />
</div>
</div>
);
styles/sass/welshgov/_application.scss
+25
View File
@@ -1496,6 +1496,31 @@ ul#sharePageLinks.active {
background-repeat: no-repeat;
}
.block-share ul li a.link,
.block-share-top ul li a.link,
.page-header__block-share__list ul li a.link,
.page-header__block-share ul li a.link {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg id=%22Layer_1%22 data-name=%22Layer 1%22 xmlns=%22http://www.w3.org/2000/svg%22 width=%2217.9%22 height=%2220%22 viewBox=%220 0 17.9 20%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill:%233b7dc5;%7D%3C/style%3E%3C/defs%3E%3Ctitle%3Eshare%3C/title%3E%3Cpath class=%22cls-1%22 d=%22M15.4,14.1a3,3,0,0,0-2,.8L6.2,10.7a1.7,1.7,0,0,0,.1-.7,1.7,1.7,0,0,0-.1-.7l7.1-4.1a3,3,0,0,0,5-2.2,3,3,0,0,0-6,0,1.7,1.7,0,0,0,.1.7l-7,4.1a2.79,2.79,0,0,0-2-.8,3,3,0,1,0,0,6,2.79,2.79,0,0,0,2-.8l7.1,4.2c0,.2-.1.4-.1.7a2.9,2.9,0,0,0,5.8,0,2.84,2.84,0,0,0-2.68-3Z%22 transform=%22translate%28-0.4 0%29%22/%3E%3C/svg%3E");
background-repeat: no-repeat;
}
.block-share ul li a.link:hover,
.block-share-top ul li a.link:hover,
.page-header__block-share__list ul li a.link:hover,
.page-header__block-share ul li a.link:hover {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg id=%22Layer_1%22 data-name=%22Layer 1%22 xmlns=%22http://www.w3.org/2000/svg%22 width=%2217.9%22 height=%2220%22 viewBox=%220 0 17.9 20%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill:%23111;%7D%3C/style%3E%3C/defs%3E%3Ctitle%3Eshare%3C/title%3E%3Cpath class=%22cls-1%22 d=%22M15.4,14.1a3,3,0,0,0-2,.8L6.2,10.7a1.7,1.7,0,0,0,.1-.7,1.7,1.7,0,0,0-.1-.7l7.1-4.1a3,3,0,0,0,5-2.2,3,3,0,0,0-6,0,1.7,1.7,0,0,0,.1.7l-7,4.1a2.79,2.79,0,0,0-2-.8,3,3,0,1,0,0,6,2.79,2.79,0,0,0,2-.8l7.1,4.2c0,.2-.1.4-.1.7a2.9,2.9,0,0,0,5.8,0,2.84,2.84,0,0,0-2.68-3Z%22 transform=%22translate%28-0.4 0%29%22/%3E%3C/svg%3E");
background-repeat: no-repeat;
}
.block-share ul li a.link:focus,
.block-share-top ul li a.link:focus,
.page-header__block-share__list ul li a.link:focus,
.page-header__block-share ul li a.link:focus {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg id=%22Layer_1%22 data-name=%22Layer 1%22 xmlns=%22http://www.w3.org/2000/svg%22 width=%2217.9%22 height=%2220%22 viewBox=%220 0 17.9 20%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill:%23111;%7D%3C/style%3E%3C/defs%3E%3Ctitle%3Eshare%3C/title%3E%3Cpath class=%22cls-1%22 d=%22M15.4,14.1a3,3,0,0,0-2,.8L6.2,10.7a1.7,1.7,0,0,0,.1-.7,1.7,1.7,0,0,0-.1-.7l7.1-4.1a3,3,0,0,0,5-2.2,3,3,0,0,0-6,0,1.7,1.7,0,0,0,.1.7l-7,4.1a2.79,2.79,0,0,0-2-.8,3,3,0,1,0,0,6,2.79,2.79,0,0,0,2-.8l7.1,4.2c0,.2-.1.4-.1.7a2.9,2.9,0,0,0,5.8,0,2.84,2.84,0,0,0-2.68-3Z%22 transform=%22translate%28-0.4 0%29%22/%3E%3C/svg%3E");
background-repeat: no-repeat;
}
//dropzone
.dropzone {