diff --git a/components/footer.js b/components/footer.js
index 7bd9a340..b5627591 100644
--- a/components/footer.js
+++ b/components/footer.js
@@ -45,7 +45,8 @@ export default function Footer(props) {
(router.route == "/case" ||
router.route == "/dnsdetails" ||
router.route == "/myportal/case"
- ? "/case/" + encodeURIComponent(props.ticketnumber)
+ ? (router.route == "/dnsdetails" ? "/dns/" : "/case/") +
+ encodeURIComponent(props.ticketnumber)
: router.asPath);
const shareSubjectStr =
t("common:social-shared-from") +
diff --git a/pages/dns/[developmentName].js b/pages/dns/[developmentName].js
index 9d356d65..93419f2b 100644
--- a/pages/dns/[developmentName].js
+++ b/pages/dns/[developmentName].js
@@ -16,6 +16,12 @@ import {
import { wrapper } from "../../store/store";
import Case from "../../components/case";
import Breadcrumbs from "../../components/breadcrumbs";
+import { getSession, useSession } from "next-auth/react";
+import {
+ setAccountDetails,
+ setContainerID,
+ setLoggedInUserId,
+} from "../../store/accountDetails/action";
const CaseHome = (props) => {
const { footerLinks, pages } = props;
@@ -44,15 +50,13 @@ const CaseHome = (props) => {
props={props}
myCases={props.myCases.myCases}
myCasesDetails={props.myCases.myCasesDetails}
- searchResultsObj={
+ directSearchResultsObj={
props.searchResultsObj.searchResultsObj
}
searchDetailsObj={
props.searchResultsObj.searchDetailsObj
}
- documentDetailsObj={
- props.searchResultsObj.documentDetailsObj
- }
+ documentDetailsObj={props.documentDetailsObj}
myRepresentations={
props.myRepresentations.myRepresentations
}
@@ -64,22 +68,32 @@ const CaseHome = (props) => {
props.awaitingSubmission.awaitingSubmission
}
caseReference={
- props.currentView.caseReference.currentReference
- }
- currentType={
- props.currentView.caseReference.currentType
+ props.searchResultsObj.searchResultsObj.value[0]
+ .ticketnumber
}
+ currentType={props.currentType}
appealTypeID={
- props.currentView.caseReference.appealType
+ props.searchResultsObj.searchResultsObj.value[0]
+ .pinswg_appealcasetype
+ }
+ incidentid={
+ props.searchResultsObj.searchResultsObj.value[0]
+ .incidentid
}
- incidentid={props.currentView.caseReference.incidentid}
representationsObj={
props.searchResultsObj.representationsObj
}
- showLoginCheck={props.currentView.showLogin}
+ showLoginCheck={true}
/>
-
+
);
@@ -93,7 +107,23 @@ export const getServerSideProps = wrapper.getServerSideProps(
console.log(cookies);
console.log("the query", query.developmentName);
- let loggedInUser = cookies.pinsUser;
+
+ let thisSession = await getSession(ctx);
+ let loggedInUser = {};
+
+ if (thisSession) {
+ console.log(" has sesssion.......");
+ [loggedInUser] = await Promise.all([
+ await getPortalLogin(thisSession.user.email),
+ ]);
+
+ loggedInUser = loggedInUser.value[0].contactid;
+
+ const accountDetails = await getPersonalAccount(loggedInUser);
+ store.dispatch(setAccountDetails(accountDetails));
+ } else {
+ console.log("not has sesssion.......");
+ }
let developmentQuery =
query.developmentName.indexOf("CAS-") == 0
@@ -104,8 +134,17 @@ export const getServerSideProps = wrapper.getServerSideProps(
const searchResultsObj = await getBasicDNSURLSearch(developmentQuery);
const searchDetailsObj = await getSearchDetails(searchResultsObj);
- store.dispatch(setSearchResults(searchResultsObj));
- store.dispatch(setSearchDetails(searchDetailsObj));
+ console.log(
+ "\n======================================\n",
+ searchResultsObj,
+ "\n======================================\n"
+ );
+ console.log(
+ "\n======================================\n",
+ searchDetailsObj[0],
+ "\n======================================\n"
+ );
+
store.dispatch(setSearch(developmentQuery));
// console.log({
@@ -149,14 +188,25 @@ export const getServerSideProps = wrapper.getServerSideProps(
}
}
// console.log(searchResultsObj);
+ return {
+ props: {
+ searchResultsObj: {
+ searchResultsObj: searchResultsObj,
+ searchDetailsObj: searchDetailsObj,
+ },
+ currentType: "directResultsObj",
+ },
+ };
}
);
const mapStateToProps = (state) => {
return {
+ accountDetails: state.accountDetails,
currentView: state.currentView,
search: state.search,
- searchResultsObj: state.searchResultsObj,
+ //searchResultsObj: state.searchResultsObj,
+ documentDetailsObj: state.searchResultsObj.documentDetailsObj,
formData: state.formData,
appealType: state.appealType,
form: state.form,