robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged PR 488: added error handling for relay down

Browse Source 
added error handling for relay down

Related work items: #6240
This commit is contained in:
Robert Bond
2021-09-30 09:20:21 +00:00
parent 7b741b656f 066612adbd
commit 13833930fe
4 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
actions/index.js
+21 -8
View File
@@ -201,11 +201,6 @@ export const getAdvancedSearch = (token, searchString) => {
searchString.apt searchString.apt
: ""; : "";
// console.log(
// "incidents?$select=_accountid_value,_customerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title&$filter=" +
// queryString +
// " &$count=true"
// );
return axios return axios
.get( .get(
WEBAPI_URL + WEBAPI_URL +
@@ -217,7 +212,13 @@ export const getAdvancedSearch = (token, searchString) => {
) )
.then((res) => res.data) .then((res) => res.data)
.catch((error) => { .catch((error) => {
console.log("thiserror", error); let ErrResponse = {
value: [],
errorCode: error.response.status,
errorMsg: error.response.statusText,
};
return ErrResponse;
}); });
}; };
@@ -373,7 +374,13 @@ export const getAppealsTypes = (token) => {
) )
.then((res) => res.data) .then((res) => res.data)
.catch((error) => { .catch((error) => {
console.log("thiserror", error); let ErrResponse = {
value: [],
errorCode: error.response.status,
errorMsg: error.response.statusText,
};
return ErrResponse;
}); });
}; };
@@ -429,7 +436,13 @@ export const getLPA = (token) => {
) )
.then((res) => res.data) .then((res) => res.data)
.catch((error) => { .catch((error) => {
console.log("thi serror", error); let ErrResponse = {
value: [],
errorCode: error.response.status,
errorMsg: error.response.statusText,
};
return ErrResponse;
}); });
}; };
components/crmError.js
+11 -3
View File
@@ -6,10 +6,17 @@ import { DiagConsoleLogger } from "@opentelemetry/api";
const CRMError = (props) => { const CRMError = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
const { whichError } = props;
const router = useRouter(); const router = useRouter();
const { locale } = router; const { locale } = router;
const searchResultsObj = props.props.searchResultsObj.searchResultsObj;
console.log(searchResultsObj); const errorSwitch = _.has(props, "whichError")
? "LPAData"
: "searchResultsObj";
console.log(errorSwitch);
return ( return (
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
@@ -17,7 +24,8 @@ const CRMError = (props) => {
Something has happened.... Something has happened....
</h1> </h1>
<p> <p>
{searchResultsObj.errorCode} - {searchResultsObj.errorMsg} {props.props[errorSwitch][errorSwitch].errorCode} -{" "}
{props.props[errorSwitch][errorSwitch].errorMsg}
</p> </p>
</div> </div>
</div> </div>
pages/advancedsearch.js
+13 -1
View File
@@ -14,6 +14,7 @@ import { wrapper } from "../store/store";
import Cookies from "cookies"; import Cookies from "cookies";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import CRMError from "../components/crmError";
import { import {
setAppealType, setAppealType,
@@ -39,6 +40,13 @@ const Home = (props) => {
const { locale } = router; const { locale } = router;
const { appealtypes } = router.query; const { appealtypes } = router.query;
console.log(props, props.LPAData);
var hasError =
_.has(props.LPAData.LPAData, "errorCode") ||
_.has(props.appealType.appealType, "errorCode")
? true
: false;
return ( return (
<div> <div>
<Head> <Head>
@@ -52,10 +60,14 @@ const Home = (props) => {
<div className="govuk-width-container"> <div className="govuk-width-container">
<Banner /> <Banner />
<Breadcrumbs slug={appealtypes} /> <Breadcrumbs slug={appealtypes} />
{hasError ? (
<CRMError props={props} whichError="advancedSearch" />
) : (
<Search <Search
lpadata={props.LPAData} lpadata={props.LPAData}
appealType={props.appealType} appealType={props.appealType}
/> />
)}
</div> </div>
<Footer footerLinks={footerLinks} /> <Footer footerLinks={footerLinks} />
</div> </div>
@@ -68,7 +80,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
async ({ query, req, res }) => { async ({ query, req, res }) => {
const token = await getSASToken(); const token = await getSASToken();
const [appealTypeData, lpaData, caseData] = await Promise.all([ const [appealTypeData, lpaData] = await Promise.all([
await getAppealsTypes(token), await getAppealsTypes(token),
await getLPA(token), await getLPA(token),
]); ]);
pages/searchresults.js
+1
View File
@@ -77,6 +77,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
searchResultsObj.status == 502 searchResultsObj.status == 502
? { ? {
value: [], value: [],
errorCode: searchResultsObj.status,
errorMsg: searchResultsObj.statusText, errorMsg: searchResultsObj.statusText,
} }
: searchResultsObj; : searchResultsObj;