diff --git a/pages/case/[ticketnumber].js b/pages/case/[ticketnumber].js index e34f30f2..45bc2072 100644 --- a/pages/case/[ticketnumber].js +++ b/pages/case/[ticketnumber].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 { - getBasicSearch, - getCaseMessage, - getIP, getPersonalAccount, - getPortalLogin, + getPortalLogin +} from "../../actions/services/accountService"; +import { + getCaseMessage, getSIPSEvents, - getSIPSMedia, -} from "../../actions"; + getSIPSMedia +} from "../../actions/services/caseService"; +import { getBasicSearch } 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; @@ -164,14 +166,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)); } @@ -191,15 +193,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) { @@ -207,8 +209,8 @@ export const getServerSideProps = wrapper.getServerSideProps( redirect: { //destination: "/dns-not-found", destination: "/404", - permanent: false, - }, + permanent: false + } }; } else { store.dispatch(setSearchResults(searchResultsObj)); @@ -231,8 +233,8 @@ export const getServerSideProps = wrapper.getServerSideProps( .pinswg_speacialistcaseprocess || searchDetailsObj[0].value[0] .pinswg_specialistcaseprocess - : "", - }), + : "" + }) ); } } @@ -243,19 +245,19 @@ export const getServerSideProps = wrapper.getServerSideProps( searchResultsObj: searchResultsObj, searchDetailsObj: searchDetailsObj, eventsObj: eventsObj, - mediaObj: mediaObj, + mediaObj: mediaObj }, currentType: "directResultsObj", docsOffline: process.env.DOCAPI_OFFLINE || false, messagesObj: await getCaseMessage( - searchResultsObj.value[0].incidentid, + searchResultsObj.value[0].incidentid ), showFilteredDocs: process.env.SHOWFILTERDOCS || false, showMaps: process.env.SHOWMAPS, - showLoginCheck: process.env.SHOWLOGIN || false, - }, + showLoginCheck: process.env.SHOWLOGIN || false + } }; - }, + } ); const mapStateToProps = (state) => { @@ -271,7 +273,7 @@ const mapStateToProps = (state) => { myCases: state.myCases, watchedCases: state.watchedCases, myRepresentations: state.myRepresentations, - awaitingSubmission: state.awaitingSubmission, + awaitingSubmission: state.awaitingSubmission }; }; @@ -279,7 +281,7 @@ const mapDispatchToProps = (dispatch) => { return { setCurrentReference: (currentReference) => { dispatch(setCurrentReference(refno)); - }, + } // setSearchResults: (searchResults) => { // dispatch(setSearchResults(searchResults)); // }, diff --git a/pages/case/id/[incident].js b/pages/case/id/[incident].js index 95ba6d39..44deaf88 100644 --- a/pages/case/id/[incident].js +++ b/pages/case/id/[incident].js @@ -3,12 +3,12 @@ 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 { - getIP, - getIncidentbyID, getPersonalAccount, - getPortalLogin, -} from "../../../actions"; + getPortalLogin +} from "../../../actions/services/accountService"; +import { getIncidentbyID } from "../../../actions/services/caseService"; import Breadcrumbs from "../../../components/breadcrumbs"; import Case from "../../../components/case"; import CookieBanner from "../../../components/cookieBanner"; @@ -16,7 +16,7 @@ import Footer from "../../../components/footer"; import Header from "../../../components/header"; import { getFormCollectionByID, - getSearchDetails, + getSearchDetails } from "../../../components/utils"; import { setAccountDetails } from "../../../store/accountDetails/action"; import { setCurrentReference } from "../../../store/currentView/action"; @@ -113,7 +113,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; @@ -147,20 +147,20 @@ export const getServerSideProps = wrapper.getServerSideProps( whichAppeal == "pinswg_harbourrevisionorders" ? "pinswg_postcode" : whichAppeal == "pinswg_transportandworkacts" || - whichAppeal == "pinswg_electricityacts" || - whichAppeal == "pinswg_dnses" - ? "pinswg_postcode" - : "pinswg_siteaddresspostcode"; + whichAppeal == "pinswg_electricityacts" || + whichAppeal == "pinswg_dnses" + ? "pinswg_postcode" + : "pinswg_siteaddresspostcode"; var defaultFirstLineAddress = whichAppeal == "pinswg_ldps" || whichAppeal == "pinswg_harbourrevisionorders" ? "pinswg_postcode" : whichAppeal == "pinswg_transportandworkacts" || - whichAppeal == "pinswg_electricityacts" || - whichAppeal == "pinswg_dnses" - ? "pinswg_addressline1" - : "pinswg_siteaddressline1"; + whichAppeal == "pinswg_electricityacts" || + whichAppeal == "pinswg_dnses" + ? "pinswg_addressline1" + : "pinswg_siteaddressline1"; store.dispatch( req.headers.hasOwnProperty("referer") @@ -190,8 +190,8 @@ export const getServerSideProps = wrapper.getServerSideProps( return { redirect: { destination: "/404", - permanent: false, - }, + permanent: false + } }; } else { store.dispatch( @@ -201,7 +201,7 @@ export const getServerSideProps = wrapper.getServerSideProps( "currentType": "searchResultsObj", "incidentid": searchResultsObj.value[0].incidentid, "appealType": - searchResultsObj.value[0].pinswg_appealcasetype, + searchResultsObj.value[0].pinswg_appealcasetype }) ); } @@ -209,11 +209,11 @@ export const getServerSideProps = wrapper.getServerSideProps( props: { searchResultsObj: { searchResultsObj: searchResultsObj, - searchDetailsObj: searchDetailsObj, + searchDetailsObj: searchDetailsObj }, currentType: "directResultsObj", - docsOffline: process.env.DOCAPI_OFFLINE || false, - }, + docsOffline: process.env.DOCAPI_OFFLINE || false + } }; } ); @@ -231,7 +231,7 @@ const mapStateToProps = (state) => { myCases: state.myCases, watchedCases: state.watchedCases, myRepresentations: state.myRepresentations, - awaitingSubmission: state.awaitingSubmission, + awaitingSubmission: state.awaitingSubmission }; }; @@ -239,7 +239,7 @@ const mapDispatchToProps = (dispatch) => { return { setCurrentReference: (currentReference) => { dispatch(setCurrentReference(refno)); - }, + } }; }; diff --git a/pages/newappeal/index.js b/pages/newappeal/index.js index 834788d3..bd256ded 100644 --- a/pages/newappeal/index.js +++ b/pages/newappeal/index.js @@ -7,9 +7,9 @@ import { useRouter } from "next/router"; import { connect } from "react-redux"; import { getAppealsTypesForNewAppeal, - getLPA, - getPersonalAccount, -} from "../../actions"; + getLPA +} from "../../actions/services/referenceDataService"; +import { getPersonalAccount } from "../../actions/services/accountService"; import Breadcrumbs from "../../components/breadcrumbs"; import CookieBanner from "../../components/cookieBanner"; import Footer from "../../components/footer"; @@ -18,7 +18,7 @@ import CreateCase from "../../components/newappeal/createCase"; import { setAccountDetails, setContainerID, - setLoggedInUserId, + setLoggedInUserId } from "../../store/accountDetails/action"; import { setAppealType } from "../../store/appealType/action"; import { setLPA } from "../../store/lpa/action"; @@ -162,8 +162,8 @@ export const getServerSideProps = wrapper.getServerSideProps( return { redirect: { destination: "/auth/signin", - permanent: false, - }, + permanent: false + } }; } else { let loggedInUserIdent = thisSession.user.id; @@ -175,7 +175,7 @@ export const getServerSideProps = wrapper.getServerSideProps( [ await getAppealsTypesForNewAppeal(), await getLPA(), - await getPersonalAccount(loggedInUser), + await getPersonalAccount(loggedInUser) ] ); @@ -195,7 +195,7 @@ export const getServerSideProps = wrapper.getServerSideProps( store.dispatch(setContainerID(thisSession.user.id)); return { - props: { loggedInUserIdent: loggedInUserIdent }, + props: { loggedInUserIdent: loggedInUserIdent } }; } } @@ -209,7 +209,7 @@ const mapStateToProps = (state) => { appealType: state.appealType, LPAData: state.LPAData, form: state.form, - accountDetails: state.accountDetails, + accountDetails: state.accountDetails }; };