direct link to case page by ticketnumber
This commit is contained in:
@@ -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" ? (
|
||||
<>
|
||||
{" "}
|
||||
|
||||
@@ -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}
|
||||
|
||||
+51
-18
@@ -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}</>;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user