Merge branch 'Development' into SIPS-Development
This commit is contained in:
+30
-29
@@ -497,20 +497,27 @@ const Breadcrumbs = (props) => {
|
||||
</Link>
|
||||
</li>
|
||||
<li className="govuk-breadcrumbs__list-item">
|
||||
{viewAllKey ==
|
||||
{(currentView.currentView.viewKey ||
|
||||
router.query.key) ==
|
||||
"awaitingSubmissionDetails" &&
|
||||
t(
|
||||
"myportal:awatitingsubmission-card-title"
|
||||
)}
|
||||
{viewAllKey == "watchedCases" &&
|
||||
{(currentView.currentView.viewKey ||
|
||||
router.query.key) == "watchedCases" &&
|
||||
t("myportal:watchedcases-card-title")}
|
||||
{viewAllKey == "myCases" &&
|
||||
{(currentView.currentView.viewKey ||
|
||||
router.query.key) == "myCases" &&
|
||||
t("myportal:mycases-card-title")}
|
||||
{viewAllKey == "myRepresentations" &&
|
||||
{(currentView.currentView.viewKey ||
|
||||
router.query.key) ==
|
||||
"myRepresentations" &&
|
||||
t(
|
||||
"myportal:myrepresentations-card-title"
|
||||
)}
|
||||
{viewAllKey == "mySubmittedReps" &&
|
||||
{(currentView.currentView.viewKey ||
|
||||
router.query.key) ==
|
||||
"mySubmittedReps" &&
|
||||
"Submitted representations"}
|
||||
</li>
|
||||
</>
|
||||
@@ -545,19 +552,13 @@ const Breadcrumbs = (props) => {
|
||||
<li className="govuk-breadcrumbs__list-item">
|
||||
<Link
|
||||
href={
|
||||
router.locale != "en"
|
||||
? router.locale +
|
||||
"/searchresults?q=" +
|
||||
props.props.search
|
||||
.searchString
|
||||
: "/searchresults?q=" +
|
||||
props.props.search
|
||||
.searchString
|
||||
"/searchresults?q=" +
|
||||
props.props.search.searchString
|
||||
}
|
||||
onClick={() => {
|
||||
// spinnerState();
|
||||
router.back();
|
||||
}}
|
||||
// onClick={() => {
|
||||
// // spinnerState();
|
||||
// router.back();
|
||||
// }}
|
||||
className="govuk-breadcrumbs__link"
|
||||
>
|
||||
{t("common:breadcrumb-search-results")}
|
||||
@@ -724,10 +725,10 @@ const Breadcrumbs = (props) => {
|
||||
</li>
|
||||
<li className="govuk-breadcrumbs__list-item">
|
||||
{t("common:breadcrumb-case-reference")}:{" "}
|
||||
{
|
||||
props.props.currentView.caseReference
|
||||
.currentReference
|
||||
}
|
||||
{props.props.currentView.caseReference
|
||||
.currentReference ||
|
||||
props.props.searchResultsObj
|
||||
.searchResultsObj.value[0].title}
|
||||
</li>
|
||||
</>
|
||||
)}
|
||||
@@ -811,10 +812,10 @@ const Breadcrumbs = (props) => {
|
||||
</li>
|
||||
<li className="govuk-breadcrumbs__list-item">
|
||||
{t("common:breadcrumb-case-reference")}:{" "}
|
||||
{
|
||||
props.props.currentView.caseReference
|
||||
.currentReference
|
||||
}
|
||||
{props.props.currentView.caseReference
|
||||
.currentReference ||
|
||||
props.props.searchResultsObj
|
||||
.searchResultsObj.value[0].title}
|
||||
</li>
|
||||
</>
|
||||
)}
|
||||
@@ -1075,10 +1076,10 @@ const Breadcrumbs = (props) => {
|
||||
</li>
|
||||
<li className="govuk-breadcrumbs__list-item">
|
||||
{t("common:breadcrumb-case-reference")}:{" "}
|
||||
{
|
||||
props.props.currentView.caseReference
|
||||
.currentReference
|
||||
}
|
||||
{props.props.currentView.caseReference
|
||||
.currentReference ||
|
||||
props.props.searchResultsObj
|
||||
.searchResultsObj.value[0].title}
|
||||
</li>
|
||||
</>
|
||||
)}
|
||||
|
||||
Reference in New Issue
Block a user