From 548c85e3399fc873f71a1a21a29e0e0e1c1dd85a Mon Sep 17 00:00:00 2001 From: robbond Date: Thu, 12 Mar 2026 09:22:17 +0000 Subject: [PATCH] refactor phase 3a myportal dns imports --- pages/myportal/dns/[developmentName].js | 52 +++++++++++++------------ pages/myportal/dnsapplications.js | 32 +++++++-------- 2 files changed, 43 insertions(+), 41 deletions(-) diff --git a/pages/myportal/dns/[developmentName].js b/pages/myportal/dns/[developmentName].js index fd47da22..8a673651 100644 --- a/pages/myportal/dns/[developmentName].js +++ b/pages/myportal/dns/[developmentName].js @@ -3,15 +3,17 @@ import useTranslation from "next-translate/useTranslation"; import Head from "next/head"; import { useRouter } from "next/router"; import { connect } from "react-redux"; +import { getIP } from "../../../actions/core/logger"; import { - getBasicDNSURLSearch, - getCaseMessage, - getIP, getPersonalAccount, - getPortalLogin, + getPortalLogin +} from "../../../actions/services/accountService"; +import { + getCaseMessage, getSIPSEvents, - getSIPSMedia, -} from "../../../actions"; + getSIPSMedia +} from "../../../actions/services/caseService"; +import { getBasicDNSURLSearch } from "../../../actions/services/searchService"; import Breadcrumbs from "../../../components/breadcrumbs"; import Case from "../../../components/case"; import CookieBanner from "../../../components/cookieBanner"; @@ -25,7 +27,7 @@ import { setEventDetails, setSearchDetails, setSearchResults, - setMediaDetails, + setMediaDetails } from "../../../store/searchOutput/action"; import { wrapper } from "../../../store/store"; import ServiceBanner from "../../../components/servicebanner"; @@ -35,7 +37,7 @@ const CaseHome = (props) => { pages, setSearchResults, setSearchDetails, - searchResultsObj, + searchResultsObj } = props; let { t, lang } = useTranslation(); @@ -140,7 +142,7 @@ export const getServerSideProps = wrapper.getServerSideProps( if (thisSession) { console.log(" has sesssion......."); [loggedInUser] = await Promise.all([ - await getPortalLogin(thisSession.user.email), + await getPortalLogin(thisSession.user.email) ]); loggedInUser = loggedInUser.value[0].contactid; @@ -165,14 +167,14 @@ export const getServerSideProps = wrapper.getServerSideProps( if (searchResultsObj.value[0].pinswg_appealcasetype == 846040002) { eventsObj = await getSIPSEvents( - searchDetailsObj[0].value[0].pinswg_sipsid, + searchDetailsObj[0].value[0].pinswg_sipsid ); store.dispatch(setEventDetails(eventsObj)); } if (searchResultsObj.value[0].pinswg_appealcasetype == 846040002) { mediaObj = await getSIPSMedia( - searchDetailsObj[0].value[0].pinswg_sipsid, + searchDetailsObj[0].value[0].pinswg_sipsid ); store.dispatch(setMediaDetails(mediaObj)); } @@ -197,15 +199,15 @@ export const getServerSideProps = wrapper.getServerSideProps( // }); console.log( searchResultsObj["@odata.count"] > 1 || - searchResultsObj["@odata.count"] < 1, + searchResultsObj["@odata.count"] < 1 ); if (searchResultsObj["@odata.count"] < 1) { return { redirect: { destination: "/404", - permanent: false, - }, + permanent: false + } }; } else { if (searchResultsObj["@odata.count"] > 1) { @@ -213,8 +215,8 @@ export const getServerSideProps = wrapper.getServerSideProps( redirect: { //destination: "/dns-not-found", destination: "/404", - permanent: false, - }, + permanent: false + } }; } else { // store.dispatch(setSearchResults(searchResultsObj)); @@ -237,13 +239,13 @@ export const getServerSideProps = wrapper.getServerSideProps( .pinswg_speacialistcaseprocess || searchDetailsObj[0].value[0] .pinswg_specialistcaseprocess - : "", - }), + : "" + }) ); } } let messagesObj = await getCaseMessage( - searchResultsObj.value[0].incidentid, + searchResultsObj.value[0].incidentid ); console.log(messagesObj); @@ -254,16 +256,16 @@ export const getServerSideProps = wrapper.getServerSideProps( searchResultsObj: searchResultsObj, searchDetailsObj: searchDetailsObj, eventsObj: eventsObj, - mediaObj: mediaObj, + mediaObj: mediaObj }, currentType: "directResultsObj", docsOffline: process.env.DOCAPI_OFFLINE || false, messagesObj: messagesObj, showFilteredDocs: process.env.SHOWFILTERDOCS || false, - showMaps: process.env.SHOWMAPS, - }, + showMaps: process.env.SHOWMAPS + } }; - }, + } ); const mapStateToProps = (state) => { @@ -279,7 +281,7 @@ const mapStateToProps = (state) => { myCases: state.myCases, watchedCases: state.watchedCases, myRepresentations: state.myRepresentations, - awaitingSubmission: state.awaitingSubmission, + awaitingSubmission: state.awaitingSubmission }; }; @@ -293,7 +295,7 @@ const mapDispatchToProps = (dispatch) => { }, setSearchDetails: (searchDetailsObj) => { dispatch(setSearchDetails(searchDetailsObj)); - }, + } }; }; diff --git a/pages/myportal/dnsapplications.js b/pages/myportal/dnsapplications.js index 8f0741ad..9903f7d4 100644 --- a/pages/myportal/dnsapplications.js +++ b/pages/myportal/dnsapplications.js @@ -2,14 +2,14 @@ import useTranslation from "next-translate/useTranslation"; import Head from "next/head"; import { useRouter } from "next/router"; import { connect } from "react-redux"; +import { getIP } from "../../actions/core/logger"; +import { getPersonalAccount } from "../../actions/services/accountService"; +import { getPortalModuleDetails } from "../../actions/services/caseService"; import { getBasicDNSSearch, - getDNSCoords, - getIP, - getPortalModuleDetails, - getWatchedCases, - getPersonalAccount, -} from "../../actions"; + getDNSCoords +} from "../../actions/services/searchService"; +import { getWatchedCases } from "../../actions/services/portalService"; import Breadcrumbs from "../../components/breadcrumbs"; import CookieBanner from "../../components/cookieBanner"; @@ -18,22 +18,22 @@ import Footer from "../../components/footer"; import Header from "../../components/header"; import { getFormCollectionByID, - getSearchDetails, + getSearchDetails } from "../../components/utils"; import { setLoggedInUserId, - setAccountDetails, + setAccountDetails } from "../../store/accountDetails/action"; import { setSearch } from "../../store/search/action"; import { setDNSCoords, setSearchDetails, - setSearchResults, + setSearchResults } from "../../store/searchOutput/action"; import { wrapper } from "../../store/store"; import { setWatchedCases, - setWatchedCasesDetails, + setWatchedCasesDetails } from "../../store/watchedCases/action"; import { getSession } from "next-auth/react"; @@ -158,13 +158,13 @@ export const getServerSideProps = wrapper.getServerSideProps( return { redirect: { destination: "/auth/signin", - permanent: false, - }, + permanent: false + } }; } else { let [accountDetails, watchedCases] = await Promise.all([ await getPersonalAccount(loggedInUser), - await getWatchedCases(loggedInUser), + await getWatchedCases(loggedInUser) ]); // searchResultsObj = @@ -179,7 +179,7 @@ export const getServerSideProps = wrapper.getServerSideProps( const showMapCheck = process.env.SHOWMAPS || false; const [watchedCasesDetails] = await Promise.all([ - await getDetails(watchedCases, "myWatchedCases"), + await getDetails(watchedCases, "myWatchedCases") ]); const dnsCoords = await getDNSCoords(); // store.dispatch(setSearchResults(searchResultsObj)); @@ -192,7 +192,7 @@ export const getServerSideProps = wrapper.getServerSideProps( store.dispatch(setAccountDetails(accountDetails)); return { - props: { showMap: showMapCheck }, + props: { showMap: showMapCheck } }; } } @@ -239,7 +239,7 @@ const mapStateToProps = (state) => { watchedCases: state.watchedCases, myRepresentations: state.myRepresentations, awaitingSubmission: state.awaitingSubmission, - accountDetails: state.accountDetails, + accountDetails: state.accountDetails }; };