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

Merged PR 1071: updated watched cases with language and confirm

Browse Source 
updated watched cases with language and confirm

Related work items: #9442, #9443, #9446, #9447, #9448, #9449, #9450, #9451, #9452, #9453, #9454, #9455
This commit is contained in:
Robert Bond
2024-01-29 15:14:44 +00:00
parent 888ddf60bd 3e83332d28
commit c3a4b4bb10
13 changed files with 216 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.local
+11 -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,12 +30,12 @@ HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136
//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~
CLIENT_SECRET = tFk8Q~E.R-HFjROTu1sRKqwb_ONzy05uPYoF6awR //CLIENT_SECRET = tFk8Q~E.R-HFjROTu1sRKqwb_ONzy05uPYoF6awR
RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/ //RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/
RELAYURI = "prod-pedw-ns.servicebus.windows.net" //RELAYURI = "prod-pedw-ns.servicebus.windows.net"
RELAYPATH = "prod-pedw-hc" //RELAYPATH = "prod-pedw-hc"
GOOGLE_TAG_MANAGER = GTM-T78CBC3 GOOGLE_TAG_MANAGER = GTM-T78CBC3
components/case/summary.js
+44 -24
View File
@@ -411,8 +411,7 @@ const CaseSummary = (props) => {
</div> </div>
</div> </div>
*/} */}
{showLoginCheck == "true" && (
{showLoginCheck == true && (
<> <>
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
@@ -466,6 +465,16 @@ const CaseSummary = (props) => {
<span <span
className="govuk-link" className="govuk-link"
onClick={() => { onClick={() => {
confirm(
t(
"case:you-have-stopped-watching-label"
) +
props
.currentView
.caseReference
.currentReference +
"?"
) &&
deleteItem( deleteItem(
isWatchedCase( isWatchedCase(
props props
@@ -477,15 +486,6 @@ const CaseSummary = (props) => {
"watchedCases" "watchedCases"
); );
alert(
t(
"case:you-have-stopped-watching-label"
) +
props
.currentView
.caseReference
.currentReference
);
}} }}
title={t( title={t(
"case:stop-watching-case-link" "case:stop-watching-case-link"
@@ -499,17 +499,7 @@ const CaseSummary = (props) => {
<span <span
className=" govuk-link" className=" govuk-link"
onClick={() => { onClick={() => {
selectWatchedCase( confirm(
props.accountDetails
.loggedinUserId,
props.currentView
.caseReference
.incidentid,
props.currentView
.caseReference
.appealType
);
alert(
t( t(
"case:you-are-watching-label" "case:you-are-watching-label"
) + ) +
@@ -517,7 +507,21 @@ const CaseSummary = (props) => {
props props
.currentView .currentView
.caseReference .caseReference
.currentReference .currentReference +
"?"
) &&
selectWatchedCase(
props
.accountDetails
.loggedinUserId,
props
.currentView
.caseReference
.incidentid,
props
.currentView
.caseReference
.appealType
); );
}} }}
> >
@@ -532,7 +536,7 @@ const CaseSummary = (props) => {
className="govuk-link" className="govuk-link"
onClick={() => { onClick={() => {
// signIn("email"); // signIn("email");
signIn(); // signIn();
// selectWatchedCase( // selectWatchedCase(
// cookies.pinsUser, // cookies.pinsUser,
// item.incidentid, // item.incidentid,
@@ -542,6 +546,21 @@ const CaseSummary = (props) => {
// "Trying to watch case " + // "Trying to watch case " +
// item.title // item.title
// ); // );
confirm(
"Trying to watch case " +
props.currentView
.caseReference
.currentReference +
"\n\nYou will now be prompted to sign in"
) &&
signIn("email", {
callbackUrl:
"/myportal/searchresults?q=" +
props
.currentView
.caseReference
.currentReference,
});
}} }}
title={t( title={t(
"case:watch-this-case-link" "case:watch-this-case-link"
@@ -576,6 +595,7 @@ const CaseSummary = (props) => {
</div> </div>
</> </>
)} )}
{/* 1{" "} {/* 1{" "}
{_.has(detailsObj, "pinswg_startdatetimeiftheevent") && {_.has(detailsObj, "pinswg_startdatetimeiftheevent") &&
detailsObj.pinswg_startdatetimeiftheevent} detailsObj.pinswg_startdatetimeiftheevent}
components/myportal/awaitingsubmissionfromblob.js
+14 -13
View File
@@ -92,10 +92,9 @@ const AwaitingSubmissionFromBlob = (props) => {
showTopThreeArr[key] showTopThreeArr[key]
.pinswg_appealcasetype, .pinswg_appealcasetype,
}); });
}}> }}
>
{showTopThreeArr[index].pinswg_name} {showTopThreeArr[index].pinswg_name}
</Link> </Link>
</div> </div>
<div> <div>
@@ -174,23 +173,26 @@ const AwaitingSubmissionFromBlob = (props) => {
: showTopThreeArrDets[key]["pinswg_lpaname"] || ""} : showTopThreeArrDets[key]["pinswg_lpaname"] || ""}
</div> </div>
<div className=""> <div className="">
<a <span
href="#" href="#"
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse " className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
onClick={() => { onClick={() => {
event.preventDefault(); confirm(
t("case:do-you-want-to-delete-case-label") +
showTopThreeArr[key].pinswg_name +
"?\n" +
t(
"case:do-you-want-to-delete-case-disclaimer-label"
)
) &&
deleteCaseItem( deleteCaseItem(
props.containerID, props.containerID,
showTopThreeArr[key].pinswg_name showTopThreeArr[key].pinswg_name
); );
alert(
"You have deleted case " +
showTopThreeArr[key].pinswg_name
);
}} }}
> >
&mdash; &mdash;
</a> </span>
</div> </div>
</div> </div>
); );
@@ -226,10 +228,9 @@ const AwaitingSubmissionFromBlob = (props) => {
"viewName": "Awaiting Submission", "viewName": "Awaiting Submission",
"viewKey": "awaitingSubmissionDetails", "viewKey": "awaitingSubmissionDetails",
}); });
}}> }}
>
{t("myportal:viewall-link")} {t("myportal:viewall-link")}
</Link> </Link>
</div> </div>
)} )}
components/myportal/topthree.js
+20 -20
View File
@@ -194,8 +194,8 @@ const TopThree = (props) => {
showTopThreeArr[key] showTopThreeArr[key]
.pinswg_appealcasetype, .pinswg_appealcasetype,
}); });
}}> }}
>
{topThreeType != "watchedCases" {topThreeType != "watchedCases"
? topThreeType != "myRepresentations" ? topThreeType != "myRepresentations"
? showTopThreeArr[key].ticketnumber ? showTopThreeArr[key].ticketnumber
@@ -205,7 +205,6 @@ const TopThree = (props) => {
: showTopThreeArr[key][ : showTopThreeArr[key][
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
]}{" "} ]}{" "}
</Link> </Link>
</div> </div>
{/* {(topThreeType == "awaitingSubmission" || {/* {(topThreeType == "awaitingSubmission" ||
@@ -301,46 +300,47 @@ const TopThree = (props) => {
</div> </div>
{topThreeType == "watchedCases" && ( {topThreeType == "watchedCases" && (
<div className=""> <div className="">
<a <span
href="#" href="#"
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse " className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
onClick={() => { onClick={() => {
event.preventDefault(); confirm(
t("case:you-have-stopped-watching-label") +
showTopThreeArr[key][
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
]
) &&
deleteItem( deleteItem(
showTopThreeArr[key].pinswg_watchlistid, showTopThreeArr[key].pinswg_watchlistid,
"watchedCases" "watchedCases"
); );
alert(
"You have stopped watching case " +
showTopThreeArr[key][
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
]
);
}} }}
> >
&mdash; &mdash;
</a> </span>
</div> </div>
)} )}
{topThreeType == "awaitingSubmission" && ( {topThreeType == "awaitingSubmission" && (
<div className=""> <div className="">
<a <span
href="#"
className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse " className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
onClick={() => { onClick={() => {
event.preventDefault(); confirm(
t("case:do-you-want-to-delete-case-label") +
showTopThreeArr[key].ticketnumber +
"?\n" +
t(
"case:do-you-want-to-delete-case-disclaimer-label"
)
) &&
deleteItem( deleteItem(
showTopThreeArr[key].incidentid, showTopThreeArr[key].incidentid,
"awaitingSubmission" "awaitingSubmission"
); );
alert(
"You have deleted case " +
showTopThreeArr[key].ticketnumber
);
}} }}
> >
&mdash; &mdash;
</a> </span>
</div> </div>
)} )}
</div> </div>
components/myportal/watchedcases.js
+2 -3
View File
@@ -43,10 +43,9 @@ const WatchedCases = (props) => {
"viewName": "Watched Cases", "viewName": "Watched Cases",
"viewKey": "watchedCases", "viewKey": "watchedCases",
}); });
}}> }}
>
{t("myportal:viewall-link")} {t("myportal:viewall-link")}
</Link> </Link>
</div> </div>
)} )}
components/search/dnssearchresults.js
+16 -13
View File
@@ -369,8 +369,8 @@ const DNSSearchResults = (props) => {
item.pinswg_appealcasetype, item.pinswg_appealcasetype,
"showMap": showMap, "showMap": showMap,
}); });
}}> }}
>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"search:searchresults-case-reference-label" "search:searchresults-case-reference-label"
@@ -378,7 +378,6 @@ const DNSSearchResults = (props) => {
: :
</span> </span>
{item.title} {item.title}
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -531,6 +530,13 @@ const DNSSearchResults = (props) => {
<span <span
className="govuk-summary-list__actionLink watched_link" className="govuk-summary-list__actionLink watched_link"
onClick={() => { onClick={() => {
confirm(
t(
"case:you-have-stopped-watching-label"
) +
item.title +
"?"
) &&
deleteItem( deleteItem(
isWatchedCase( isWatchedCase(
item.incidentid item.incidentid
@@ -539,11 +545,6 @@ const DNSSearchResults = (props) => {
"watchedCases" "watchedCases"
); );
alert(
t(
"case:you-have-stopped-watching-label"
) + item.title
);
}} }}
title={t( title={t(
"case:stop-watching-case-link" "case:stop-watching-case-link"
@@ -555,16 +556,18 @@ const DNSSearchResults = (props) => {
<span <span
className="govuk-summary-list__actionLink watchLink" className="govuk-summary-list__actionLink watchLink"
onClick={() => { onClick={() => {
confirm(
t(
"case:you-are-watching-label"
) +
item.title +
"?"
) &&
selectWatchedCase( selectWatchedCase(
cookies.pinsUser, cookies.pinsUser,
item.incidentid, item.incidentid,
item.pinswg_appealcasetype item.pinswg_appealcasetype
); );
alert(
t(
"case:you-are-watching-label"
) + item.title
);
}} }}
title={t( title={t(
"case:watch-this-case-link" "case:watch-this-case-link"
components/search/searchresults.js
+38 -22
View File
@@ -309,6 +309,8 @@ const SearchResults = (props) => {
item.incidentid, item.incidentid,
"appealType": "appealType":
item.pinswg_appealcasetype, item.pinswg_appealcasetype,
"showLoginCheck":
props.showLoginCheck,
}); });
}} }}
> >
@@ -498,6 +500,13 @@ const SearchResults = (props) => {
<span <span
className="govuk-summary-list__actionLink watched_link" className="govuk-summary-list__actionLink watched_link"
onClick={() => { onClick={() => {
confirm(
t(
"case:you-have-stopped-watching-label"
) +
item.title +
"?"
) &&
deleteItem( deleteItem(
isWatchedCase( isWatchedCase(
item.incidentid item.incidentid
@@ -506,11 +515,6 @@ const SearchResults = (props) => {
"watchedCases" "watchedCases"
); );
alert(
t(
"case:you-have-stopped-watching-label"
) + item.title
);
}} }}
title={t( title={t(
"case:stop-watching-case-link" "case:stop-watching-case-link"
@@ -522,17 +526,20 @@ const SearchResults = (props) => {
<span <span
className="govuk-summary-list__actionLink watchLink" className="govuk-summary-list__actionLink watchLink"
onClick={() => { onClick={() => {
confirm(
t(
"case:you-are-watching-label"
) +
item.title +
"?"
) &&
selectWatchedCase( selectWatchedCase(
props.accountDetails props
.accountDetails
.loggedinUserId, .loggedinUserId,
item.incidentid, item.incidentid,
item.pinswg_appealcasetype item.pinswg_appealcasetype
); );
alert(
t(
"case:you-are-watching-label"
) + item.title
);
}} }}
title={t( title={t(
"case:watch-this-case-link" "case:watch-this-case-link"
@@ -543,11 +550,29 @@ const SearchResults = (props) => {
)} )}
</dd> </dd>
)} )}
{showLoginCheck == "true" && !session && (
<dd> {(showLoginCheck == "true" ||
showLoginCheck == true) &&
!session && (
<dd className="govuk-summary-list__value govuk-!-font-size-14 govuk-summary-list__action">
<span className="results-visually-hidden">
{t(
"case:watch-this-case-link"
)}
</span>
<span <span
className="govuk-summary-list__actionLink watchLink" className="govuk-summary-list__actionLink watchLink"
onClick={() => { onClick={() => {
confirm(
t(
"case:trying-to-watch-case-label"
) +
item.title +
"\n\n" +
t(
"case:trying-to-watch-case-redirect-label"
)
) &&
// signIn("email"); // signIn("email");
signIn(undefined, { signIn(undefined, {
callbackUrl: callbackUrl:
@@ -558,15 +583,6 @@ const SearchResults = (props) => {
"_" + "_" +
item.pinswg_appealcasetype, item.pinswg_appealcasetype,
}); });
// selectWatchedCase(
// props.accountDetails.loggedinUserId,
// item.incidentid,
// item.pinswg_appealcasetype
// );
alert(
"Trying to watch case " +
item.title
);
}} }}
title={t( title={t(
"case:watch-this-case-link" "case:watch-this-case-link"
i18n.js
+1 -1
View File
@@ -12,7 +12,7 @@ module.exports = {
"*": ["common", "newappeal", "search"], "*": ["common", "newappeal", "search"],
"/": ["common", "home", "case"], "/": ["common", "home", "case"],
"/error": ["common", "home", "myportal"], "/error": ["common", "home", "myportal"],
"/myportal": ["myportal", "common", "home"], "/myportal": ["myportal", "common", "home", "case"],
"/myportal/viewall": ["search", "myportal"], "/myportal/viewall": ["search", "myportal"],
"/myportal/advancedsearch": ["search", "myportal"], "/myportal/advancedsearch": ["search", "myportal"],
"/myportal/advancedsearchresults": ["search", "myportal"], "/myportal/advancedsearchresults": ["search", "myportal"],
locales/cy/case.json
+6 -2
View File
@@ -88,6 +88,10 @@
"representation-period-ended-on-label": "Daeth y Cyfnod Cynrychiolaeth i ben ar ", "representation-period-ended-on-label": "Daeth y Cyfnod Cynrychiolaeth i ben ar ",
"stop-watching-case-link": "Stopiwch wylio'r achos hwn", "stop-watching-case-link": "Stopiwch wylio'r achos hwn",
"watch-this-case-link": "Gwyliwch yr achos hwn", "watch-this-case-link": "Gwyliwch yr achos hwn",
"you-are-watching-label": "Rydych chi'n gwylio achos ", "you-are-watching-label": "Ydych chi eisiau gwylio achos ",
"you-have-stopped-watching-label": "Rydych chi wedi rhoi'r gorau i wylio'r achos " "trying-to-watch-case-label": "Ceisio gwylio achos ",
"trying-to-watch-case-redirect-label": "Fe'ch anogir nawr i fewngofnodi",
"you-have-stopped-watching-label": "Ydych chi am roi'r gorau i wylio achos ",
"do-you-want-to-delete-case-label": "Ydych chi am ddileu achos",
"do-you-want-to-delete-case-disclaimer-label": "Unwaith y caiff ei dileu, bydd yr holl wybodaeth a gyflwynwyd gennych yn cael ei cholli."
} }
locales/en/case.json
+6 -2
View File
@@ -88,6 +88,10 @@
"representation-period-ended-on-label": "Representation Period ended on ", "representation-period-ended-on-label": "Representation Period ended on ",
"stop-watching-case-link": "Stop watching this case", "stop-watching-case-link": "Stop watching this case",
"watch-this-case-link": "Watch this case", "watch-this-case-link": "Watch this case",
"you-are-watching-label": "You are watching case ", "you-are-watching-label": "Do you want to watch case ",
"you-have-stopped-watching-label": "You have stopped watching case " "trying-to-watch-case-label": "Trying to watch case ",
"trying-to-watch-case-redirect-label": "You will now be prompted to sign in",
"you-have-stopped-watching-label": "Do you want to stop watching case ",
"do-you-want-to-delete-case-label": "Do you want to delete case ",
"do-you-want-to-delete-case-disclaimer-label": "Once deleted all information you have submited, will be lost."
} }
pages/case/index.js
+1 -2
View File
@@ -66,7 +66,7 @@ const CaseHome = (props) => {
representationsObj={ representationsObj={
props.searchResultsObj.representationsObj props.searchResultsObj.representationsObj
} }
showLoginCheck={props.showLoginCheck} showLoginCheck={props.currentView.showLogin}
/> />
</div> </div>
<Footer footerLinks={footerLinks} /> <Footer footerLinks={footerLinks} />
@@ -89,7 +89,6 @@ const mapStateToProps = (state) => {
watchedCases: state.watchedCases, watchedCases: state.watchedCases,
myRepresentations: state.myRepresentations, myRepresentations: state.myRepresentations,
awaitingSubmission: state.awaitingSubmission, awaitingSubmission: state.awaitingSubmission,
showLoginCheck: process.env.SHOWLOGIN || false,
}; };
}; };
pages/dns/[developmentName].js
+1
View File
@@ -76,6 +76,7 @@ const CaseHome = (props) => {
representationsObj={ representationsObj={
props.searchResultsObj.representationsObj props.searchResultsObj.representationsObj
} }
showLoginCheck={props.currentView.showLogin}
/> />
</div> </div>
<Footer footerLinks={footerLinks} /> <Footer footerLinks={footerLinks} />
pages/myportal/case.js
+2
View File
@@ -81,6 +81,7 @@ const Home = (props) => {
props.searchResultsObj.representationsObj props.searchResultsObj.representationsObj
} }
showRepresentations={showRepresentations} showRepresentations={showRepresentations}
showLoginCheck={props.currentView.showLogin}
/> />
</div> </div>
<Footer footerLinks={footerLinks} /> <Footer footerLinks={footerLinks} />
@@ -105,6 +106,7 @@ const mapStateToProps = (state) => {
myRepresentations: state.myRepresentations, myRepresentations: state.myRepresentations,
awaitingSubmission: state.awaitingSubmission, awaitingSubmission: state.awaitingSubmission,
accountDetails: state.accountDetails, accountDetails: state.accountDetails,
showLoginCheck: process.env.SHOWLOGIN || false,
}; };
}; };