Merge from git

components/searchresults.js

@@ -4,45 +4,66 @@ import { useContext } from "react";
 import useTranslation from "next-translate/useTranslation";
 import SearchForCase from "./search/searchforcase";
 import SearchResults from "./search/searchresults";
+import CRMError from "./crmError";
 
 export default function Search(props) {
-    const { searchString, searchResultsObj } = props;
+    const { searchString, searchResultsObj, advancedSearch } = props;
     let { t } = useTranslation();
 
     const router = useRouter();
     const { locale } = router;
 
+    var hasError = _.has(searchResultsObj.searchResultsObj, "errorCode")
+        ? true
+        : false;
+
+    //console.log("has an error", hasError);
+
     return (
         <main
             className="govuk-main-wrapper govuk-main-wrapper--auto-spacing"
             id="main-content"
             role="main"
         >
-            <div className="govuk-grid-row">
-                <div className="govuk-grid-column-full">
-                    <SearchResults
-                        searchString={searchString}
-                        searchResultsObj={searchResultsObj.searchResultsObj}
-                    />
-                </div>
-            </div>
-            <div className="govuk-grid-row">
-                <div className="govuk-grid-column-full">
-                    <div className="govuk-button-group">
-                        <Link href="/advancedsearch">
-                            <a className="govuk-button">
-                                {t("search:searchresults-search-button-label")}
-                            </a>
-                        </Link>
-                        <a
+            {hasError ? (
+                <CRMError props={props} />
+            ) : (
+                <>
+                    <div className="govuk-grid-row">
+                        <div className="govuk-grid-column-full">
+                            <SearchResults
+                                advancedSearch={advancedSearch}
+                                searchString={searchString}
+                                searchResultsObj={
+                                    searchResultsObj.searchResultsObj
+                                }
+                                searchDetailsObj={
+                                    searchResultsObj.searchDetailsObj
+                                }
+                            />
+                        </div>
+                    </div>
+                    <div className="govuk-grid-row">
+                        <div className="govuk-grid-column-full">
+                            <div className="govuk-button-group">
+                                <Link href="/advancedsearch">
+                                    <a className="govuk-button">
+                                        {t(
+                                            "search:searchresults-search-button-label"
+                                        )}
+                                    </a>
+                                </Link>
+                                {/* <a
                             onClick={() => router.back()}
                             className="govuk-button govuk-button--secondary"
                         >
                             {t("search:searchresults-new-search-button-label")}
-                        </a>
+                        </a> */}
+                            </div>
+                        </div>
                     </div>
-                </div>
-            </div>
+                </>
+            )}
         </main>
     );
 }