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

added switch for login check on watch case and reps

Browse Source
This commit is contained in:
robbond
2024-01-26 11:52:06 +00:00
parent c5f61da8ed
commit 79da26733c
3 changed files with 178 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.local
+12 -11
View File
@@ -5,11 +5,11 @@ GRANT_TYPE = "client_credentials"
HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c
//Dev oauth ESNR //Dev oauth ESNR
CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a //CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a
CLIENT_SECRET = AU88Q~NBOVOXqwb4mBx9y.NMIZ9s1o7boqZoKcSE //CLIENT_SECRET = AU88Q~NBOVOXqwb4mBx9y.NMIZ9s1o7boqZoKcSE
RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/ //RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
RELAYURI = "dev-pedw-ns.servicebus.windows.net" //RELAYURI = "dev-pedw-ns.servicebus.windows.net"
RELAYPATH = "dev-pedw-hc" //RELAYPATH = "dev-pedw-hc"
//Test Oauth ESNR //Test Oauth ESNR
@@ -30,16 +30,17 @@ RELAYPATH = "dev-pedw-hc"
//Prod Oauth WGO //Prod Oauth WGO
//CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc
//CLIENT_SECRET = mJN7Q~lFu.xFGa5KCc.zwIm_fJAWxajyQaFo~ //CLIENT_SECRET = mJN7Q~lFu.xFGa5KCc.zwIm_fJAWxajyQaFo~
//RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/ CLIENT_SECRET = tFk8Q~E.R-HFjROTu1sRKqwb_ONzy05uPYoF6awR
//RELAYURI = "prod-pedw-ns.servicebus.windows.net" RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/
//RELAYPATH = "prod-pedw-hc" RELAYURI = "prod-pedw-ns.servicebus.windows.net"
RELAYPATH = "prod-pedw-hc"
GOOGLE_TAG_MANAGER = GTM-T78CBC3 GOOGLE_TAG_MANAGER = GTM-T78CBC3
SHOWLOGIN = true SHOWLOGIN = false
SHOWREPRESENTATIONS = true SHOWREPRESENTATIONS = false
SHOWFILEUPLOAD = "false" SHOWFILEUPLOAD = "false"
SHOWMAPS = "false" SHOWMAPS = "false"
API_ROOT = "http://localhost:3000" API_ROOT = "http://localhost:3000"
components/case/summary.js
+157 -142
View File
@@ -411,156 +411,171 @@ const CaseSummary = (props) => {
</div> </div>
</div> </div>
*/} */}
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<div className="govuk-button-group">
{_.has(detailsObj, "pinswg_startdate") &&
showReps(
detailsObj.pinswg_startdate,
detailsObj.pinswg_finalcommentsduedate
) && (
<>
<Link
href={{
pathname:
"/myportal/representation",
query: {
case:
currentType ==
"searchResultsObj"
? detailsObj.pinswg_name
: casesObj.reference,
},
}}
className="govuk-button"
>
{t(
"case:summary-make-representation-label"
)}
</Link>
<a {showLoginCheck == true && (
onClick={() => { <>
//spinnerState(); <div className="govuk-grid-row">
router.back(); <div className="govuk-grid-column-full">
}} <div className="govuk-button-group">
className="govuk-button govuk-button--secondary" {_.has(detailsObj, "pinswg_startdate") &&
> showReps(
{t( detailsObj.pinswg_startdate,
"case:summary-back-button-label" detailsObj.pinswg_finalcommentsduedate
)} ) && (
</a> <>
</> <Link
)} href={{
<div className="govuk-body"> pathname:
{session && "/myportal/representation",
(isWatchedCase( query: {
props.currentView.caseReference case:
.incidentid currentType ==
).length > "searchResultsObj"
0 == ? detailsObj.pinswg_name
true ? ( : casesObj.reference,
<span },
className="govuk-link" }}
onClick={() => { className="govuk-button"
deleteItem( >
isWatchedCase( {t(
props.currentView "case:summary-make-representation-label"
.caseReference )}
.incidentid </Link>
)[0].pinswg_watchlistid,
"watchedCases" <a
); onClick={() => {
alert( //spinnerState();
t( router.back();
"case:you-have-stopped-watching-label" }}
) + className="govuk-button govuk-button--secondary"
props.currentView >
.caseReference {t(
.currentReference "case:summary-back-button-label"
); )}
}} </a>
title={t( </>
"case:stop-watching-case-link" )}
)} <div className="govuk-body">
> {session &&
{t("case:stop-watching-case-link")}{" "} (isWatchedCase(
</span> props.currentView.caseReference
) : ( .incidentid
<span ).length >
className=" govuk-link" 0 ==
onClick={() => { true ? (
selectWatchedCase( <span
props.accountDetails className="govuk-link"
.loggedinUserId, onClick={() => {
props.currentView deleteItem(
.caseReference isWatchedCase(
.incidentid, props
props.currentView .currentView
.caseReference .caseReference
.appealType .incidentid
); )[0]
alert( .pinswg_watchlistid,
t(
"case:you-are-watching-label"
) +
" " +
props.currentView
.caseReference
.currentReference
);
}}
>
{t("case:watch-this-case-link")}
</span>
))}
{!session && ( "watchedCases"
<span );
className="govuk-link" alert(
onClick={() => { t(
// signIn("email"); "case:you-have-stopped-watching-label"
signIn(); ) +
// selectWatchedCase( props
// cookies.pinsUser, .currentView
// item.incidentid, .caseReference
// item.pinswg_appealcasetype .currentReference
// ); );
// alert( }}
// "Trying to watch case " + title={t(
// item.title "case:stop-watching-case-link"
// ); )}
}} >
title={t("case:watch-this-case-link")} {t(
> "case:stop-watching-case-link"
{t("case:watch-this-case-link")} )}{" "}
</span> </span>
)} ) : (
<span
className=" govuk-link"
onClick={() => {
selectWatchedCase(
props.accountDetails
.loggedinUserId,
props.currentView
.caseReference
.incidentid,
props.currentView
.caseReference
.appealType
);
alert(
t(
"case:you-are-watching-label"
) +
" " +
props
.currentView
.caseReference
.currentReference
);
}}
>
{t(
"case:watch-this-case-link"
)}
</span>
))}
{!session && (
<span
className="govuk-link"
onClick={() => {
// signIn("email");
signIn();
// selectWatchedCase(
// cookies.pinsUser,
// item.incidentid,
// item.pinswg_appealcasetype
// );
// alert(
// "Trying to watch case " +
// item.title
// );
}}
title={t(
"case:watch-this-case-link"
)}
>
{t("case:watch-this-case-link")}
</span>
)}
</div>
</div>
</div> </div>
</div> </div>
</div>
</div>
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
{_.has(detailsObj, "pinswg_startdate") && {_.has(detailsObj, "pinswg_startdate") &&
showRepsEnded( showRepsEnded(
detailsObj.pinswg_startdate, detailsObj.pinswg_startdate,
detailsObj.pinswg_finalcommentsduedate
) && (
<div className="govuk-body">
{t(
"case:representation-period-ended-on-label"
)}
{formatDates(
detailsObj.pinswg_finalcommentsduedate detailsObj.pinswg_finalcommentsduedate
) && (
<div className="govuk-body">
{t(
"case:representation-period-ended-on-label"
)}
{formatDates(
detailsObj.pinswg_finalcommentsduedate
)}
</div>
)} )}
</div> </div>
)} </div>
</div> </>
</div> )}
{/* 1{" "} {/* 1{" "}
{_.has(detailsObj, "pinswg_startdatetimeiftheevent") && {_.has(detailsObj, "pinswg_startdatetimeiftheevent") &&
detailsObj.pinswg_startdatetimeiftheevent} detailsObj.pinswg_startdatetimeiftheevent}
pages/auth/signin.js
+9
View File
@@ -91,6 +91,15 @@ const SignIn = (props) => {
}; };
export async function getServerSideProps(context) { export async function getServerSideProps(context) {
if (process.env.SHOWLOGIN == false) {
return {
redirect: {
destination: "/404",
permanent: false,
},
};
}
const csrfToken = await getCsrfToken(context); const csrfToken = await getCsrfToken(context);
console.log( console.log(
"\n//////////////////////\n", "\n//////////////////////\n",