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

refactor phase 3a pages-dns targeted actions imports

Browse Source
This commit is contained in:
robbond
2026-03-12 09:53:17 +00:00
parent 1a8a28fe3a
commit cf99d8e466
2 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/dns/[developmentName].js
+27 -25
View File
@@ -3,15 +3,17 @@ import useTranslation from "next-translate/useTranslation";
import Head from "next/head"; import Head from "next/head";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { getIP } from "../../actions/core/logger";
import { import {
getBasicDNSURLSearch,
getCaseMessage,
getIP,
getPersonalAccount, getPersonalAccount,
getPortalLogin, getPortalLogin
} from "../../actions/services/accountService";
import {
getCaseMessage,
getSIPSEvents, getSIPSEvents,
getSIPSMedia, getSIPSMedia
} from "../../actions"; } from "../../actions/services/caseService";
import { getBasicDNSURLSearch } from "../../actions/services/searchService";
import Breadcrumbs from "../../components/breadcrumbs"; import Breadcrumbs from "../../components/breadcrumbs";
import Case from "../../components/case"; import Case from "../../components/case";
import CookieBanner from "../../components/cookieBanner"; import CookieBanner from "../../components/cookieBanner";
@@ -25,7 +27,7 @@ import {
setEventDetails, setEventDetails,
setSearchDetails, setSearchDetails,
setSearchResults, setSearchResults,
setMediaDetails, setMediaDetails
} from "../../store/searchOutput/action"; } from "../../store/searchOutput/action";
import { wrapper } from "../../store/store"; import { wrapper } from "../../store/store";
import ServiceBanner from "../../components/servicebanner"; import ServiceBanner from "../../components/servicebanner";
@@ -35,7 +37,7 @@ const CaseHome = (props) => {
pages, pages,
setSearchResults, setSearchResults,
setSearchDetails, setSearchDetails,
searchResultsObj, searchResultsObj
} = props; } = props;
let { t, lang } = useTranslation(); let { t, lang } = useTranslation();
@@ -143,7 +145,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
if (thisSession) { if (thisSession) {
console.log(" has sesssion......."); console.log(" has sesssion.......");
[loggedInUser] = await Promise.all([ [loggedInUser] = await Promise.all([
await getPortalLogin(thisSession.user.email), await getPortalLogin(thisSession.user.email)
]); ]);
loggedInUser = loggedInUser.value[0].contactid; loggedInUser = loggedInUser.value[0].contactid;
@@ -168,7 +170,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
if (searchResultsObj.value[0].pinswg_appealcasetype == 846040002) { if (searchResultsObj.value[0].pinswg_appealcasetype == 846040002) {
eventsObj = await getSIPSEvents( eventsObj = await getSIPSEvents(
searchDetailsObj[0].value[0].pinswg_sipsid, searchDetailsObj[0].value[0].pinswg_sipsid
); );
store.dispatch(setEventDetails(eventsObj)); store.dispatch(setEventDetails(eventsObj));
@@ -176,7 +178,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
if (searchResultsObj.value[0].pinswg_appealcasetype == 846040002) { if (searchResultsObj.value[0].pinswg_appealcasetype == 846040002) {
mediaObj = await getSIPSMedia( mediaObj = await getSIPSMedia(
searchDetailsObj[0].value[0].pinswg_sipsid, searchDetailsObj[0].value[0].pinswg_sipsid
); );
store.dispatch(setMediaDetails(mediaObj)); store.dispatch(setMediaDetails(mediaObj));
} }
@@ -202,15 +204,15 @@ export const getServerSideProps = wrapper.getServerSideProps(
// }); // });
console.log( console.log(
searchResultsObj["@odata.count"] > 1 || searchResultsObj["@odata.count"] > 1 ||
searchResultsObj["@odata.count"] < 1, searchResultsObj["@odata.count"] < 1
); );
if (searchResultsObj["@odata.count"] < 1) { if (searchResultsObj["@odata.count"] < 1) {
return { return {
redirect: { redirect: {
destination: "/404", destination: "/404",
permanent: false, permanent: false
}, }
}; };
} else { } else {
if (searchResultsObj["@odata.count"] > 1) { if (searchResultsObj["@odata.count"] > 1) {
@@ -218,8 +220,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
redirect: { redirect: {
//destination: "/dns-not-found", //destination: "/dns-not-found",
destination: "/404", destination: "/404",
permanent: false, permanent: false
}, }
}; };
} else { } else {
// store.dispatch(setSearchResults(searchResultsObj)); // store.dispatch(setSearchResults(searchResultsObj));
@@ -242,13 +244,13 @@ export const getServerSideProps = wrapper.getServerSideProps(
.pinswg_speacialistcaseprocess || .pinswg_speacialistcaseprocess ||
searchDetailsObj[0].value[0] searchDetailsObj[0].value[0]
.pinswg_specialistcaseprocess .pinswg_specialistcaseprocess
: "", : ""
}), })
); );
} }
} }
let messagesObj = await getCaseMessage( let messagesObj = await getCaseMessage(
searchResultsObj.value[0].incidentid, searchResultsObj.value[0].incidentid
); );
console.log(messagesObj); console.log(messagesObj);
@@ -259,16 +261,16 @@ export const getServerSideProps = wrapper.getServerSideProps(
searchResultsObj: searchResultsObj, searchResultsObj: searchResultsObj,
searchDetailsObj: searchDetailsObj, searchDetailsObj: searchDetailsObj,
eventsObj: eventsObj, eventsObj: eventsObj,
mediaObj: mediaObj, mediaObj: mediaObj
}, },
currentType: "directResultsObj", currentType: "directResultsObj",
docsOffline: process.env.DOCAPI_OFFLINE || false, docsOffline: process.env.DOCAPI_OFFLINE || false,
messagesObj: messagesObj, messagesObj: messagesObj,
showFilteredDocs: process.env.SHOWFILTERDOCS || false, showFilteredDocs: process.env.SHOWFILTERDOCS || false,
showMaps: process.env.SHOWMAPS, showMaps: process.env.SHOWMAPS
}, }
}; };
}, }
); );
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
@@ -284,7 +286,7 @@ const mapStateToProps = (state) => {
myCases: state.myCases, myCases: state.myCases,
watchedCases: state.watchedCases, watchedCases: state.watchedCases,
myRepresentations: state.myRepresentations, myRepresentations: state.myRepresentations,
awaitingSubmission: state.awaitingSubmission, awaitingSubmission: state.awaitingSubmission
}; };
}; };
@@ -298,7 +300,7 @@ const mapDispatchToProps = (dispatch) => {
}, },
setSearchDetails: (searchDetailsObj) => { setSearchDetails: (searchDetailsObj) => {
dispatch(setSearchDetails(searchDetailsObj)); dispatch(setSearchDetails(searchDetailsObj));
}, }
}; };
}; };
pages/dns/index.js
+13 -15
View File
@@ -2,7 +2,7 @@ import useTranslation from "next-translate/useTranslation";
import Head from "next/head"; import Head from "next/head";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { getDNSList } from "../../actions"; import { getDNSList } from "../../actions/services/searchService";
import CookieBanner from "../../components/cookieBanner"; import CookieBanner from "../../components/cookieBanner";
import Main from "../../components/dns//main"; import Main from "../../components/dns//main";
import Footer from "../../components/footer"; import Footer from "../../components/footer";
@@ -15,7 +15,7 @@ import { getSearchDetails } from "../../components/utils";
import { setSearch } from "../../store/search/action"; import { setSearch } from "../../store/search/action";
import { import {
setSearchDetails, setSearchDetails,
setSearchResults, setSearchResults
} from "../../store/searchOutput/action"; } from "../../store/searchOutput/action";
const Home = (props) => { const Home = (props) => {
@@ -64,8 +64,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
redirect: { redirect: {
//destination: "/dns-not-found", //destination: "/dns-not-found",
destination: "/error", destination: "/error",
permanent: false, permanent: false
}, }
}; };
} else { } else {
searchResultsObj = searchResultsObj =
@@ -73,21 +73,19 @@ export const getServerSideProps = wrapper.getServerSideProps(
? { ? {
value: [], value: [],
errorCode: searchResultsObj.status, errorCode: searchResultsObj.status,
errorMsg: searchResultsObj.statusText, errorMsg: searchResultsObj.statusText
} }
: searchResultsObj; : searchResultsObj;
const searchDetailsObj = await getSearchDetails( const searchDetailsObj =
searchResultsObj await getSearchDetails(searchResultsObj);
);
store.dispatch(setSearchResults(searchResultsObj)); store.dispatch(setSearchResults(searchResultsObj));
store.dispatch(setSearchDetails(searchDetailsObj)); store.dispatch(setSearchDetails(searchDetailsObj));
store.dispatch(setSearch("DNS")); store.dispatch(setSearch("DNS"));
} }
} else { } else {
const searchDetailsObj = await getSearchDetails( const searchDetailsObj =
searchResultsObj await getSearchDetails(searchResultsObj);
);
store.dispatch(setSearchResults(searchResultsObj)); store.dispatch(setSearchResults(searchResultsObj));
store.dispatch(setSearchDetails(searchDetailsObj)); store.dispatch(setSearchDetails(searchDetailsObj));
store.dispatch(setSearch("DNS")); store.dispatch(setSearch("DNS"));
@@ -95,9 +93,9 @@ export const getServerSideProps = wrapper.getServerSideProps(
return { return {
props: { props: {
searchResultsObj: { searchResultsObj: {
searchResultsObj: searchResultsObj, searchResultsObj: searchResultsObj
}, }
}, }
}; };
} }
); );
@@ -113,7 +111,7 @@ const mapStateToProps = (state) => {
myCases: state.myCases, myCases: state.myCases,
watchedCases: state.watchedCases, watchedCases: state.watchedCases,
myRepresentations: state.myRepresentations, myRepresentations: state.myRepresentations,
awaitingSubmission: state.awaitingSubmission, awaitingSubmission: state.awaitingSubmission
}; };
}; };