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

correctly go back to the previous page search results

Browse Source
This commit is contained in:
robbond
2026-03-10 10:31:16 +00:00
parent e6c25d7ef5
commit 3e48f8cd28
4 changed files with 407 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/breadcrumbs.js
+51 -39
View File
@@ -12,7 +12,7 @@ import { Field, change, reduxForm } from "redux-form";
import { setCurrentSection } from "../store/appealType/action";
import {
setRepresentationCapacity,
setRepresentationSubmit,
setRepresentationSubmit
} from "../store/currentView/action";
const Breadcrumbs = (props) => {
const {
@@ -20,7 +20,7 @@ const Breadcrumbs = (props) => {
setCurrentView,
setCurrentSection,
setRepresentationCapacity,
setRepresentationSubmit,
setRepresentationSubmit
} = props;
const router = useRouter();
let { t } = useTranslation();
@@ -38,10 +38,10 @@ const Breadcrumbs = (props) => {
currentView.caseReference.appealType == 846040008
? 7
: currentView.caseReference.appealType == 846040005 ||
currentView.caseReference.appealType == 846040006 ||
currentView.caseReference.appealType == 846040007
? 9
: "";
currentView.caseReference.appealType == 846040006 ||
currentView.caseReference.appealType == 846040007
? 9
: "";
var viewAllKey = currentView?.viewKey || router.query.viewKey;
return (
@@ -551,17 +551,25 @@ const Breadcrumbs = (props) => {
<>
<li className="govuk-breadcrumbs__list-item">
<Link
href={
"/searchresults?q=" +
props.props.search.searchString
}
// onClick={() => {
// // spinnerState();
// router.back();
// }}
href={{
pathname:
(session ? "/myportal" : "") +
(router.query.adv == "true"
? "/advancedsearchresults"
: router.query.ads == "true"
? "/addresssearchresults"
: "/searchresults"),
query: router.query
}}
className="govuk-breadcrumbs__link"
>
{t("common:breadcrumb-search-results")}
{router.query.ads == "true"
? t(
"common:breadcrumb-addresssearch-results"
)
: t(
"common:breadcrumb-search-results"
)}
</Link>
</li>
<li className="govuk-breadcrumbs__list-item">
@@ -602,10 +610,6 @@ const Breadcrumbs = (props) => {
props.props.search
.searchString
}
onClick={() => {
// spinnerState();
router.back();
}}
className="govuk-breadcrumbs__link"
>
{t(
@@ -704,23 +708,29 @@ const Breadcrumbs = (props) => {
</li>
<li className="govuk-breadcrumbs__list-item">
<Link
href={
router.locale != "en"
? router.locale +
"/fymhorth/searchresults?q=" +
props.props.search
.searchString
: "/myportal/searchresults?q=" +
props.props.search
.searchString
}
onClick={() => {
// spinnerState();
router.back();
href={{
pathname:
(session ? "/myportal" : "") +
(router.query.adv == "true"
? "/advancedsearchresults"
: router.query.ads == "true"
? "/addresssearchresults"
: "/searchresults"),
query: router.query
}}
className="govuk-breadcrumbs__link"
>
{t("common:breadcrumb-search-results")}
{router.query.adv == "true"
? t(
"common:breadcrumb-advanced-search-results"
)
: router.query.ads == "true"
? t(
"common:breadcrumb-address-search-results"
)
: t(
"common:breadcrumb-search-results"
)}
</Link>
</li>
<li className="govuk-breadcrumbs__list-item">
@@ -827,11 +837,13 @@ const Breadcrumbs = (props) => {
router.locale != "en"
? router.locale +
"/searchresults?q=" +
props.props.search
.searchString
router.query.q +
"&page=" +
router.query.page
: "/searchresults?q=" +
props.props.search
.searchString
router.query.q +
"&page=" +
router.query.page
}
onClick={() => {
// spinnerState();
@@ -1193,7 +1205,7 @@ const Breadcrumbs = (props) => {
const mapStateToProps = (state) => {
return {
...state,
...state
};
};
@@ -1214,7 +1226,7 @@ const mapDispatchToProps = (dispatch) => {
},
setCurrentSection: (currentSection) => {
dispatch(setCurrentSection(currentSection));
},
}
};
};