From 066612adbd99be695585a1b8e57bab80cb1a8336 Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Thu, 30 Sep 2021 10:19:41 +0100
Subject: [PATCH] added error handling for relay down

---
 actions/index.js        | 29 +++++++++++++++++++++--------
 components/crmError.js  | 14 +++++++++++---
 pages/advancedsearch.js | 22 +++++++++++++++++-----
 pages/searchresults.js  |  1 +
 4 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/actions/index.js b/actions/index.js
index 0fd38d3f..2c3dec21 100644
--- a/actions/index.js
+++ b/actions/index.js
@@ -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;
         });
 };
 
diff --git a/components/crmError.js b/components/crmError.js
index 49e40231..e067da63 100644
--- a/components/crmError.js
+++ b/components/crmError.js
@@ -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>
diff --git a/pages/advancedsearch.js b/pages/advancedsearch.js
index 5a2f1178..98bf0ea2 100644
--- a/pages/advancedsearch.js
+++ b/pages/advancedsearch.js
@@ -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),
             ]);
diff --git a/pages/searchresults.js b/pages/searchresults.js
index 09273076..e1a81731 100644
--- a/pages/searchresults.js
+++ b/pages/searchresults.js
@@ -77,6 +77,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
                 searchResultsObj.status == 502
                     ? {
                           value: [],
+                          errorCode: searchResultsObj.status,
                           errorMsg: searchResultsObj.statusText,
                       }
                     : searchResultsObj;