@@ -94,7 +103,6 @@ const Home = (props) => {
property="twitter:site"
content="@UKGovWales"
/>
-
{
/>
+
@@ -162,7 +171,7 @@ const Home = (props) => {
export const getServerSideProps = wrapper.getServerSideProps(
(store) => async (ctx) => {
- const { query, req, locale } = ctx;
+ const { req, locale } = ctx;
getIP(req);
const cookies = req.cookies || {};
@@ -170,10 +179,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
if (!thisSession) {
return {
- redirect: {
- destination: "/auth/signin",
- permanent: false,
- },
+ redirect: { destination: "/auth/signin", permanent: false },
};
}
@@ -199,6 +205,12 @@ export const getServerSideProps = wrapper.getServerSideProps(
await createContainerProxy(thisSession.user.id);
const accountDetails = await getPersonalAccount(loggedInUser);
+ if (accountDetails?.errorCode) {
+ return {
+ redirect: { destination: "/myportal/error", permanent: false },
+ };
+ }
+
const lpaId =
accountDetails[
"pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue"
@@ -206,7 +218,6 @@ export const getServerSideProps = wrapper.getServerSideProps(
const isLPA = accountDetails.pinswg_typeofinvolvement === 846040012;
- // Fetch cases, reps, watched cases, awaiting submission concurrently
const [
myCases,
myRepresentations,
@@ -219,20 +230,16 @@ export const getServerSideProps = wrapper.getServerSideProps(
getAwaitingSubmissionFromBlob(thisSession.user.id),
]);
- // Set locale to store
+ // put current locale into store (this is the URL locale)
store.dispatch(setLocale(locale));
- // Determine preferred locale (cookie overrides)
+ // Determine preferred locale (cookie overrides account preference)
let preferredLocale =
accountDetails.pinswg_preferredlanguage === 846040000 ? "cy" : "en";
- if (cookies.pedw_locale) {
- preferredLocale = cookies.pedw_locale;
- }
-
- // Strip the current locale from the URL path
- const pathWithoutLocale = ctx.resolvedUrl.replace(/^\/(cy|en)/, "");
- //console.log("==============================", pathWithoutLocale);
+ if (cookies.pedw_locale) preferredLocale = cookies.pedw_locale;
+ // (Optional) redirect logic (kept commented as in your newer file)
+ // const pathWithoutLocale = ctx.resolvedUrl.replace(/^\/(cy|en)/, "");
// if (preferredLocale !== locale) {
// return {
// redirect: {
@@ -246,7 +253,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
const showReps = Boolean(process.env.SHOWREPRESENTATIONS);
store.dispatch(setShowReps(showReps, showLoginCheck));
- // Filter watched cases where reps not submitted
+ // watched cases that are NOT submitted
const filteredWatchedCases = {
"@odata.count": watchedCases.value.filter(
(c) => c.pinswg_representationsubmitted == null
@@ -256,37 +263,31 @@ export const getServerSideProps = wrapper.getServerSideProps(
),
};
- // Get submitted reps from watched cases
- const mySubmittedReps = watchedCases.value.filter((el) => {
- return el.pinswg_representationsubmitted != null;
- });
+ // submitted reps derived from watched cases
+ const mySubmittedReps = watchedCases.value.filter(
+ (el) => el.pinswg_representationsubmitted != null
+ );
- if (accountDetails.errorCode) {
- return {
- redirect: {
- destination: "/myportal/error",
- permanent: false,
- },
- };
- }
-
- // Helper function for fetching details with concurrency limit
+ // Newer getDetails implementation (bounded concurrency, fewer edge-case bugs)
const getDetails = async (resultsObj, detailsType) => {
const limitRequests = pLimit(5);
const arr = [];
- resultsObj =
+
+ const list =
detailsType === "mySubmittedReps"
? resultsObj
: resultsObj.value;
- const tasks = resultsObj.map((item) =>
+ const tasks = list.map((item) =>
limitRequests(async () => {
try {
let caseID = "";
+
switch (detailsType) {
case "myCases":
caseID = item.pinswg_title;
break;
+
case "myWatchedCases":
case "mySubmittedReps":
caseID =
@@ -294,12 +295,15 @@ export const getServerSideProps = wrapper.getServerSideProps(
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
];
break;
+
case "awaitingSubmission":
caseID = item.ticketnumber;
break;
+
case "myRepresentations":
caseID = item.casereference;
break;
+
default:
caseID = item.pinswg_title;
}
@@ -309,10 +313,12 @@ export const getServerSideProps = wrapper.getServerSideProps(
const collectionName = getFormCollectionByID(
item.pinswg_appealcasetype
).LogicalCollectionName;
+
const details = await getPortalModuleDetails(
collectionName,
caseID
);
+
arr.push(details);
} catch (err) {
console.error("Error fetching details:", err);
diff --git a/pages/myportal/representation.js b/pages/myportal/representation.js
index 0ac8a33a..de7bce6e 100644
--- a/pages/myportal/representation.js
+++ b/pages/myportal/representation.js
@@ -317,7 +317,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
const repsFileListObj = await getRepsFilesBlobs(
result.containerID,
- result.caseRef,
+ result.ticketnumber,
result.repfile_name
);
diff --git a/pages/myportal/searchresults.js b/pages/myportal/searchresults.js
index 839d2bbf..f263d7dd 100644
--- a/pages/myportal/searchresults.js
+++ b/pages/myportal/searchresults.js
@@ -100,20 +100,10 @@ export const getServerSideProps = wrapper.getServerSideProps(
},
};
} else {
- let [searchResultsObj, loggedInUser] = await Promise.all([
- await getBasicSearch(query.q),
+ let [loggedInUser] = await Promise.all([
await getPortalLogin(thisSession.user.email),
]);
- searchResultsObj =
- searchResultsObj.status == 502
- ? {
- value: [],
- errorCode: searchResultsObj.status,
- errorMsg: searchResultsObj.statusText,
- }
- : searchResultsObj;
-
//console.log("sssss", searchResultsObj);
loggedInUser = loggedInUser.value[0].contactid;
@@ -122,15 +112,11 @@ export const getServerSideProps = wrapper.getServerSideProps(
//console.log("sssss", loggedInUser);
- const [accountDetails, searchDetailsObj, watchedCasesDetails] =
- await Promise.all([
- await getPersonalAccount(loggedInUser),
- await getSearchDetails(searchResultsObj),
- await getDetails(watchedCases, "myWatchedCases"),
- ]);
+ const [accountDetails, watchedCasesDetails] = await Promise.all([
+ await getPersonalAccount(loggedInUser),
+ await getDetails(watchedCases, "myWatchedCases"),
+ ]);
store.dispatch(setAccountDetails(accountDetails));
- store.dispatch(setSearchResults(searchResultsObj));
- store.dispatch(setSearchDetails(searchDetailsObj));
store.dispatch(setSearch(query.q));
store.dispatch(setWatchedCases(watchedCases));
store.dispatch(setWatchedCasesDetails(watchedCasesDetails));