Merge from git

pages/searchresults.js

@@ -10,16 +10,19 @@ import Errorpage from "../components/errorpage";
 import styles from "../styles/Home.module.css";
 import { useSelector, shallowEqual, connect } from "react-redux";
 import { wrapper } from "../store/store";
-import Cookies from "cookies";
 import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
+import jsonpath from "jsonpath";
+import data from "../data/collections.json";
 
 import { setSearch, getSearchObj } from "../store/search/action";
 import {
     setSearchResults,
+    setSearchDetails,
     getSearchResultsObj,
 } from "../store/searchOutput/action";
-import { getToken, getBasicSearch } from "../actions";
+import { getBasicSearch, getBasicSearchDetails, getSASToken } from "../actions";
+import { getSearchDetails } from "../components/utils";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -35,12 +38,72 @@ const Home = (props) => {
                 <title>
                     {t("search:page-title")} - {t("common:service-name")}
                 </title>
+                <>
+                    <link
+                        rel="canonical"
+                        href={t("common:gov-wales-link") + router.asPath}
+                    />
+                    <meta
+                        key="og:locale"
+                        property="og:locale"
+                        content={router.locale}
+                    />
+                    {/* If they have a Twitter Handle, include the meta details below */}
+                    <meta
+                        key="og:site_name"
+                        property="og:site_name"
+                        content={t("common:service-name")}
+                    />
+                    <meta
+                        key="twitter:site"
+                        property="twitter:site"
+                        content="@UKGovWales"
+                    />
+
+                    <meta
+                        name="description"
+                        content={t("common:service-description")}
+                    />
+                    <meta
+                        property="og:site_name"
+                        content={t("common:gov-wales-label")}
+                    />
+                    <meta
+                        property="og:title"
+                        content={t("search:page-title")}
+                    />
+                    <meta
+                        property="og:description"
+                        content={t("common:service-description")}
+                    />
+                    <meta property="og:type" content="website" />
+                    <meta
+                        property="og:url"
+                        content={t("common:gov-wales-link")}
+                    />
+                    <meta
+                        property="og:image"
+                        content="https://gov.wales/themes/custom/govwales/images/content/og-global-1200.png"
+                    />
+                    <meta name="twitter:card" content="summary" />
+                    <meta
+                        name="twitter:title"
+                        content={t("common:gov-wales-label")}
+                    />
+                    <meta
+                        name="twitter:url"
+                        content={t("common:gov-wales-link") + router.asPath}
+                    />
+                    <meta
+                        name="twitter:image"
+                        content="https://gov.wales/themes/custom/govwales/images/content/og-global-120.png"
+                    />
+                </>
             </Head>
             <div id="page_wrapper">
                 <CookieBanner />
                 <Header courseName={t("common:service-name")} />
                 <div className="govuk-width-container">
-                    <Banner />
                     <Breadcrumbs slug={appealtypes} />
                     <SearchResults
                         searchString={props.search.searchString}
@@ -56,11 +119,30 @@ const Home = (props) => {
 export const getServerSideProps = wrapper.getServerSideProps(
     (store) =>
         async ({ query, req, res }) => {
-            const token = await getToken();
-            console.log(token);
             console.log("query-", query);
-            const searchResultsObj = (await getBasicSearch(query.q)) || null;
+
+            const token = await getSASToken();
+
+            let searchResultsObj = await getBasicSearch(token, query.q);
+
+            searchResultsObj =
+                searchResultsObj.status == 502
+                    ? {
+                          value: [],
+                          errorCode: searchResultsObj.status,
+                          errorMsg: searchResultsObj.statusText,
+                      }
+                    : searchResultsObj;
+
+            //console.log("sssss", searchResultsObj);
+
+            const searchDetailsObj = await getSearchDetails(
+                token,
+                searchResultsObj
+            );
+
             store.dispatch(setSearchResults(searchResultsObj));
+            store.dispatch(setSearchDetails(searchDetailsObj));
             store.dispatch(setSearch(query.q));
         }
 );