added service account header removed duplicate sign in button

This commit is contained in:
2024-08-12 11:09:59 +01:00
parent 83d9df0219
commit c73cf2a013
33 changed files with 237 additions and 43 deletions
+15 -5
View File
@@ -8,6 +8,7 @@ import {
getIP,
getPortalModuleDetails,
getWatchedCases,
getPersonalAccount,
} from "../../actions";
import Breadcrumbs from "../../components/breadcrumbs";
@@ -19,7 +20,10 @@ import {
getFormCollectionByID,
getSearchDetails,
} from "../../components/utils";
import { setLoggedInUserId } from "../../store/accountDetails/action";
import {
setLoggedInUserId,
setAccountDetails,
} from "../../store/accountDetails/action";
import { setSearch } from "../../store/search/action";
import {
setDNSCoords,
@@ -33,6 +37,7 @@ import {
} from "../../store/watchedCases/action";
import { getSession } from "next-auth/react";
import ServiceBanner from "../../components/myportal/servicebanner";
const Home = (props) => {
const { footerLinks, pages, watchedCases, showMap } = props;
@@ -115,6 +120,7 @@ const Home = (props) => {
<Header />
<div className="govuk-width-container">
<Breadcrumbs slug={appealtypes} />
<ServiceBanner props={props} />
<DNSSearchResults
showMap={showMap}
searchString="DNS"
@@ -155,10 +161,12 @@ export const getServerSideProps = wrapper.getServerSideProps(
},
};
} else {
let [searchResultsObj, watchedCases] = await Promise.all([
await getBasicDNSSearch(),
await getWatchedCases(loggedInUser),
]);
let [accountDetails, searchResultsObj, watchedCases] =
await Promise.all([
await getPersonalAccount(loggedInUser),
await getBasicDNSSearch(),
await getWatchedCases(loggedInUser),
]);
searchResultsObj =
searchResultsObj.status == 502
@@ -183,6 +191,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
store.dispatch(setWatchedCases(watchedCases));
store.dispatch(setWatchedCasesDetails(watchedCasesDetails));
store.dispatch(setLoggedInUserId(loggedInUser));
store.dispatch(setAccountDetails(accountDetails));
return {
props: { showMap: showMapCheck },
@@ -232,6 +241,7 @@ const mapStateToProps = (state) => {
watchedCases: state.watchedCases,
myRepresentations: state.myRepresentations,
awaitingSubmission: state.awaitingSubmission,
accountDetails: state.accountDetails,
};
};