From 5c54220bf8b7386213b835287c53d2dac24b899c Mon Sep 17 00:00:00 2001
From: robbond <rob@rdbsolutions.co.uk>
Date: Thu, 12 Mar 2026 09:24:10 +0000
Subject: [PATCH] refactor phase 3a myportal case-by-incident imports

---
 pages/myportal/case/id/[incident].js | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pages/myportal/case/id/[incident].js b/pages/myportal/case/id/[incident].js
index 4511c288..231fa344 100644
--- a/pages/myportal/case/id/[incident].js
+++ b/pages/myportal/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";
@@ -112,7 +112,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;
@@ -143,8 +143,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
             return {
                 redirect: {
                     destination: "/404",
-                    permanent: false,
-                },
+                    permanent: false
+                }
             };
         } else {
             if (searchResultsObj["@odata.count"] > 1) {
@@ -152,8 +152,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
                     redirect: {
                         //destination: "/dns-not-found",
                         destination: "/404",
-                        permanent: false,
-                    },
+                        permanent: false
+                    }
                 };
             } else {
                 store.dispatch(
@@ -163,7 +163,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
                         "currentType": "searchResultsObj",
                         "incidentid": searchResultsObj.value[0].incidentid,
                         "appealType":
-                            searchResultsObj.value[0].pinswg_appealcasetype,
+                            searchResultsObj.value[0].pinswg_appealcasetype
                     })
                 );
             }
@@ -172,11 +172,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
+            }
         };
     }
 );
@@ -194,7 +194,7 @@ const mapStateToProps = (state) => {
         myCases: state.myCases,
         watchedCases: state.watchedCases,
         myRepresentations: state.myRepresentations,
-        awaitingSubmission: state.awaitingSubmission,
+        awaitingSubmission: state.awaitingSubmission
     };
 };
 
@@ -202,7 +202,7 @@ const mapDispatchToProps = (dispatch) => {
     return {
         setCurrentReference: (currentReference) => {
             dispatch(setCurrentReference(refno));
-        },
+        }
     };
 };