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

Merged PR 1811: use ticket number not title/reference/pinswg_name

Browse Source 
Related work items: #18356
This commit is contained in:
Robert Bond
2025-08-12 08:42:11 +00:00
parent f9524638a7 8d8ae89ae6
commit f6bfc4b5d0
27 changed files with 226 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/myportal/case/[ticketnumber].js
+9 -14
View File
@@ -124,9 +124,7 @@ const CaseHome = (props) => {
<Footer
footerLinks={footerLinks}
props={props}
ticketnumber={
props.currentView.caseReference.currentReference
}
ticketnumber={props.currentView.caseReference.ticketnumber}
/>
<TimeOut />
</div>
@@ -177,10 +175,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
store.dispatch(setAccountDetails(accountDetails));
store.dispatch(setLoggedInUserId(loggedInUser));
let developmentQuery =
query.ticketnumber.indexOf("CAS-") == 0
? query.ticketnumber
: query.ticketnumber.split("-").join(" ");
let developmentQuery = query.ticketnumber;
const searchResultsObj = await getBasicSearch(developmentQuery);
const searchDetailsObj = await getSearchDetails(searchResultsObj);
@@ -198,10 +193,10 @@ export const getServerSideProps = wrapper.getServerSideProps(
store.dispatch(setSearch(developmentQuery));
console.log(
searchResultsObj["@odata.count"] > 1 ||
searchResultsObj["@odata.count"] < 1
);
// console.log(
// searchResultsObj["@odata.count"] > 1 ||
// searchResultsObj["@odata.count"] < 1
// );
if (searchResultsObj["@odata.count"] < 1) {
return {
@@ -386,14 +381,14 @@ const getDetails = (resultsObj, detailsType) => {
case "myCases":
caseID = data.pinswg_title;
break;
case "myWatchedCases":
case "mySubmittedReps":
caseID =
data[
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
];
break;
case "mySubmittedReps":
case "awaitingSubmission":
case "myWatchedCases":
case "myRepresentations":
caseID = data.ticketnumber;
break;
@@ -418,12 +413,12 @@ const getDetails = (resultsObj, detailsType) => {
caseID = searchDetail.pinswg_title;
break;
case "myWatchedCases":
case "mySubmittedReps":
caseID =
searchDetail[
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
];
break;
case "mySubmittedReps":
case "awaitingSubmission":
caseID = searchDetail.ticketnumber;
break;
pages/myportal/dns/[developmentName].js
+4
View File
@@ -79,6 +79,10 @@ const CaseHome = (props) => {
props.awaitingSubmission.awaitingSubmission
}
caseReference={
props.searchResultsObj.searchResultsObj.value[0]
.caseReference
}
ticketnumber={
props.searchResultsObj.searchResultsObj.value[0]
.ticketnumber
}