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

Merged PR 1274: mycase links failed... so fixed

Browse Source 
mycase links failed... so fixed

Related work items: #12613
This commit is contained in:
Robert Bond
2024-11-07 08:53:29 +00:00
parent c1180354e0 c869fdc6c4
commit 172acf0560
7 changed files with 70 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.local
+12 -12
View File
@@ -13,20 +13,20 @@ HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136
# CRMURL = "devcrm2016.llcdt.gov.wales/DVPINS"
# //New Dev oauth ESNR
# CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a
# CLIENT_SECRET = .Jf8Q~tKMObCJjhh_hy3J5AIctFrBalU4FS~tdxk
# RELAY_ROOT = https://ar-ns-lz-pedw-dev-uks-01.servicebus.windows.net/ar-hc-lz-pedw-dev-uks-01/
# RELAYURI = "ar-ns-lz-pedw-dev-uks-01.servicebus.windows.net"
# RELAYPATH = "ar-hc-lz-pedw-dev-uks-01"
# CRMURL = "devcrm2016.llcdt.gov.wales/DVPINS"
CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a
CLIENT_SECRET = .Jf8Q~tKMObCJjhh_hy3J5AIctFrBalU4FS~tdxk
RELAY_ROOT = https://ar-ns-lz-pedw-dev-uks-01.servicebus.windows.net/ar-hc-lz-pedw-dev-uks-01/
RELAYURI = "ar-ns-lz-pedw-dev-uks-01.servicebus.windows.net"
RELAYPATH = "ar-hc-lz-pedw-dev-uks-01"
CRMURL = "devcrm2016.llcdt.gov.wales/DVPINS"
# //New Test
CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1
CLIENT_SECRET = 6hT8Q~glL~jloWpGmvXw3UY37QFwjUE0r._jobEM
RELAY_ROOT = https://ar-ns-lz-pedw-test-uks-01.servicebus.windows.net/ar-hc-lz-pedw-test-uks-01/
RELAYURI = "ar-ns-lz-pedw-test-uks-01.servicebus.windows.net"
RELAYPATH = "ar-hc-lz-pedw-test-uks-01"
CRMURL = "tscrm2016.llcdt.gov.wales/UATPINS"
# CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1
# CLIENT_SECRET = 6hT8Q~glL~jloWpGmvXw3UY37QFwjUE0r._jobEM
# RELAY_ROOT = https://ar-ns-lz-pedw-test-uks-01.servicebus.windows.net/ar-hc-lz-pedw-test-uks-01/
# RELAYURI = "ar-ns-lz-pedw-test-uks-01.servicebus.windows.net"
# RELAYPATH = "ar-hc-lz-pedw-test-uks-01"
# CRMURL = "tscrm2016.llcdt.gov.wales/UATPINS"
# //New PreProd
# CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
components/breadcrumbs.js
+2 -2
View File
@@ -668,10 +668,10 @@ const Breadcrumbs = (props) => {
href={
router.locale != "en"
? router.locale +
"/searchresults?q=" +
"/fymhorth/searchresults?q=" +
props.props.search
.searchString
: "/searchresults?q=" +
: "/myportal/searchresults?q=" +
props.props.search
.searchString
}
components/case/representation/representationAgent.js
+10 -5
View File
@@ -34,11 +34,13 @@ const RepAgent = (props) => {
setRepFileName(formObj.representationForm.values);
let filterFilesList =
props.currentView.caseReference.repDetails.filesList.filter(function (
el
) {
return el != null;
});
props.currentView.caseReference.repDetails.hasOwnProperty("filesList")
? props.currentView.caseReference.repDetails.filesList.filter(
function (el) {
return el != null;
}
)
: [];
const files = acceptedFiles.map((file) => (
<li key={file.path}>
@@ -180,6 +182,9 @@ const RepAgent = (props) => {
{props.currentView.caseReference.hasOwnProperty(
"repDetails"
) &&
props.currentView.caseReference.repDetails.hasOwnProperty(
"filesList"
) &&
props.currentView.caseReference.repDetails
.filesList.length > 0 ? (
<div className="govuk-form-group govuk-!-margin-bottom-9">
components/case/representation/representationAppellant.js
+10 -5
View File
@@ -38,11 +38,13 @@ const RepAppellant = (props) => {
setRepFileName(formObj.representationForm.values);
let filterFilesList =
props.currentView.caseReference.repDetails.filesList.filter(function (
el
) {
return el != null;
});
props.currentView.caseReference.repDetails.hasOwnProperty("filesList")
? props.currentView.caseReference.repDetails.filesList.filter(
function (el) {
return el != null;
}
)
: [];
return (
<>
@@ -159,6 +161,9 @@ const RepAppellant = (props) => {
{props.currentView.caseReference.hasOwnProperty(
"repDetails"
) &&
props.currentView.caseReference.repDetails.hasOwnProperty(
"filesList"
) &&
props.currentView.caseReference.repDetails.filesList
.length > 0 ? (
<div className="govuk-form-group govuk-!-margin-bottom-9">
pages/dns/[developmentName].js
+10 -10
View File
@@ -148,16 +148,16 @@ export const getServerSideProps = wrapper.getServerSideProps(
const searchResultsObj = await getBasicDNSURLSearch(developmentQuery);
const searchDetailsObj = await getSearchDetails(searchResultsObj);
console.log(
"\n======================================\n",
searchResultsObj,
"\n======================================\n"
);
console.log(
"\n======================================\n",
searchDetailsObj[0],
"\n======================================\n"
);
// console.log(
// "\n======================================\n",
// searchResultsObj,
// "\n======================================\n"
// );
// console.log(
// "\n======================================\n",
// searchDetailsObj[0],
// "\n======================================\n"
// );
store.dispatch(setSearch(developmentQuery));
pages/myportal/case/[ticketnumber].js
+16 -11
View File
@@ -84,7 +84,12 @@ const CaseHome = (props) => {
// directSearchResultsObj={
// props.searchResultsObj.searchResultsObj
// }
searchDetailsObj={props.searchDetailsObj}
searchResultsObj={
props.searchResultsObj.searchResultsObj
}
searchDetailsObj={
props.searchResultsObj.searchDetailsObj
}
documentDetailsObj={props.documentDetailsObj}
myRepresentations={
props.myRepresentations.myRepresentations
@@ -344,10 +349,10 @@ export const getServerSideProps = wrapper.getServerSideProps(
//console.log(loggedInUser);
return {
props: {
// searchResultsObj: {
// searchResultsObj: searchResultsObj,
// searchDetailsObj: searchDetailsObj,
// },
searchResultsObj: {
searchResultsObj: searchResultsObj,
searchDetailsObj: searchDetailsObj,
},
currentType: "directResultsObj",
docsOffline: process.env.DOCAPI_OFFLINE || false,
messagesObj: await getCaseMessage(
@@ -466,12 +471,12 @@ const mapDispatchToProps = (dispatch) => {
setCurrentReference: (currentReference) => {
dispatch(setCurrentReference(refno));
},
setSearchResults: (searchResults) => {
dispatch(setSearchResults(searchResults));
},
setSearchDetails: (searchDetails) => {
dispatch(setSearchDetails(searchDetails));
},
// setSearchResults: (searchResults) => {
// dispatch(setSearchResults(searchResults));
// },
// setSearchDetails: (searchDetails) => {
// dispatch(setSearchDetails(searchDetails));
// },
setLoggedInUserId: (loggedInUser) => {
dispatch(setLoggedInUserId(loggedInUser));
},
pages/myportal/dns/[developmentName].js
+10 -10
View File
@@ -148,16 +148,16 @@ export const getServerSideProps = wrapper.getServerSideProps(
const searchResultsObj = await getBasicDNSURLSearch(developmentQuery);
const searchDetailsObj = await getSearchDetails(searchResultsObj);
console.log(
"\n======================================\n",
searchResultsObj,
"\n======================================\n"
);
console.log(
"\n======================================\n",
searchDetailsObj[0],
"\n======================================\n"
);
// console.log(
// "\n======================================\n",
// searchResultsObj,
// "\n======================================\n"
// );
// console.log(
// "\n======================================\n",
// searchDetailsObj[0],
// "\n======================================\n"
// );
store.dispatch(setSearch(developmentQuery));