diff --git a/components/case/summary.js b/components/case/summary.js index 5f404b8a..f6f99479 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -17,6 +17,7 @@ import { import { setCurrentLinkedCases, setCurrentReference, + setCurrentView, } from "../../store/currentView/action"; import { @@ -539,7 +540,38 @@ const CaseSummary = (props) => { .pinswg_watchlistid, "watchedCases" - ); + ), + setCurrentView({ + "viewName": + "Watched Cases", + "viewKey": + "watchedCases", + }); + setCurrentReference({ + "ticketnumber": + props + .currentView + .caseReference + .currentReference, + "currentReference": + props + .currentView + .caseReference + .currentReference, + "currentType": + "searchResultsObj", + "incidentid": + props + .currentView + .caseReference + .incidentid, + "appealType": + props + .currentView + .caseReference + .appealType, + "showMap": showMap, + }); }} title={t( "case:stop-watching-case-link" @@ -1131,6 +1163,9 @@ const mapDispatchToProps = (dispatch) => { setWatchedCasesDetails: (watchedCasesDetails) => { dispatch(setWatchedCasesDetails(watchedCasesDetails)); }, + setCurrentView: (currentView) => { + dispatch(setCurrentView(currentView)); + }, }; }; diff --git a/components/myportal/topthree.js b/components/myportal/topthree.js index a1b99716..bdff1c2c 100644 --- a/components/myportal/topthree.js +++ b/components/myportal/topthree.js @@ -23,6 +23,10 @@ import { setAwaitingSubmissionDetails, } from "../../store/awaitingSubmission/action"; import { getFormCollectionByID } from "../../components/utils"; +import { + setSearchDetails, + setSearchResults, +} from "../../store/searchOutput/action"; const TopThree = (props) => { let { t } = useTranslation(); @@ -36,6 +40,8 @@ const TopThree = (props) => { setWatchedCasesDetails, setAwaitingSubmission, setAwaitingSubmissionDetails, + setSearchResults, + setSearchDetails, showLoginCheck, } = props; @@ -198,6 +204,13 @@ const TopThree = (props) => { className="govuk-link--no-underline" data-id={index} onClick={() => { + setSearchResults( + props.props.watchedCases.watchedCases + ), + setSearchDetails( + props.props.watchedCases + .watchedCasesDetails + ); setCurrentReference({ "ticketnumber": showTopThreeArr[key].ticketnumber, @@ -453,6 +466,12 @@ const mapDispatchToProps = (dispatch) => { setAwaitingSubmissionDetails: (awaitingSubmissionDetails) => { dispatch(setAwaitingSubmissionDetails(awaitingSubmissionDetails)); }, + setSearchResults: (searchResults) => { + dispatch(setSearchResults(searchResults)); + }, + setSearchDetails: (searchDetails) => { + dispatch(setSearchDetails(searchDetails)); + }, }; }; diff --git a/components/myportal/watchedcases.js b/components/myportal/watchedcases.js index 605961b9..a1f79f14 100644 --- a/components/myportal/watchedcases.js +++ b/components/myportal/watchedcases.js @@ -36,6 +36,7 @@ const WatchedCases = (props) => { showLoginCheck={props.showLoginCheck} currentView={props.currentView} myReps={props.myReps} + props={props} /> diff --git a/data/formsxml/planningappeals78.xml b/data/formsxml/planningappeals78.xml index fdfc1d9a..63dc4dbf 100644 --- a/data/formsxml/planningappeals78.xml +++ b/data/formsxml/planningappeals78.xml @@ -148,7 +148,7 @@ - +