added error handling for relay down

2021-09-30 10:19:41 +01:00
parent 7b741b656f
commit 066612adbd
4 changed files with 50 additions and 16 deletions
@@ -201,11 +201,6 @@ export const getAdvancedSearch = (token, searchString) => {
              searchString.apt
            : "";

-    // console.log(
-    //     "incidents?$select=_accountid_value,_customerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title&$filter=" +
-    //         queryString +
-    //         " &$count=true"
-    // );
    return axios
        .get(
            WEBAPI_URL +
@@ -217,7 +212,13 @@ export const getAdvancedSearch = (token, searchString) => {
        )
        .then((res) => res.data)
        .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)
        .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)
        .catch((error) => {
-            console.log("thi serror", error);
+            let ErrResponse = {
+                value: [],
+                errorCode: error.response.status,
+                errorMsg: error.response.statusText,
+            };
+
+            return ErrResponse;
        });
 };

@@ -6,10 +6,17 @@ import { DiagConsoleLogger } from "@opentelemetry/api";
 const CRMError = (props) => {
    let { t } = useTranslation();

+    const { whichError } = props;
+
    const router = useRouter();
    const { locale } = router;
-    const searchResultsObj = props.props.searchResultsObj.searchResultsObj;
-    console.log(searchResultsObj);
+
+    const errorSwitch = _.has(props, "whichError")
+        ? "LPAData"
+        : "searchResultsObj";
+
+    console.log(errorSwitch);
+
    return (
        <div className="govuk-grid-row">
            <div className="govuk-grid-column-full">
@@ -17,7 +24,8 @@ const CRMError = (props) => {
                    Something has happened....
                </h1>
                <p>
-                    {searchResultsObj.errorCode} - {searchResultsObj.errorMsg}
+                    {props.props[errorSwitch][errorSwitch].errorCode} -{" "}
+                    {props.props[errorSwitch][errorSwitch].errorMsg}
                </p>
            </div>
        </div>
@@ -14,6 +14,7 @@ import { wrapper } from "../store/store";
 import Cookies from "cookies";
 import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
+import CRMError from "../components/crmError";

 import {
    setAppealType,
@@ -39,6 +40,13 @@ const Home = (props) => {
    const { locale } = router;
    const { appealtypes } = router.query;

+    console.log(props, props.LPAData);
+    var hasError =
+        _.has(props.LPAData.LPAData, "errorCode") ||
+        _.has(props.appealType.appealType, "errorCode")
+            ? true
+            : false;
+
    return (
        <div>
            <Head>
@@ -52,10 +60,14 @@ const Home = (props) => {
                <div className="govuk-width-container">
                    <Banner />
                    <Breadcrumbs slug={appealtypes} />
-                    <Search
-                        lpadata={props.LPAData}
-                        appealType={props.appealType}
-                    />
+                    {hasError ? (
+                        <CRMError props={props} whichError="advancedSearch" />
+                    ) : (
+                        <Search
+                            lpadata={props.LPAData}
+                            appealType={props.appealType}
+                        />
+                    )}
                </div>
                <Footer footerLinks={footerLinks} />
            </div>
@@ -68,7 +80,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
        async ({ query, req, res }) => {
            const token = await getSASToken();

-            const [appealTypeData, lpaData, caseData] = await Promise.all([
+            const [appealTypeData, lpaData] = await Promise.all([
                await getAppealsTypes(token),
                await getLPA(token),
            ]);
@@ -77,6 +77,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
                searchResultsObj.status == 502
                    ? {
                          value: [],
+                          errorCode: searchResultsObj.status,
                          errorMsg: searchResultsObj.statusText,
                      }
                    : searchResultsObj;