Merged PR 462: Deployed debug stuff to test

Related work items: #6209

.env.local

@@ -0,0 +1,11 @@
+RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
+RELAYURI = "dev-pedw-ns.servicebus.windows.net"
+RELAYPATH = "dev-pedw-hc"
+SASKEY = "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y="
+SASKEYNAME = "devpedwnspolicy"
+
+//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
+//RELAYURI = "test-pedw-ns.servicebus.windows.net"
+//RELAYPATH = "test-pedw-hc"
+//SASKEY = "kTLrs9UHwuW9Msc9uNfjf+89qLYT6ly80lK0zdTYJW4="
+//SASKEYNAME = "testpedwhcpolicy"

actions/index.js

@@ -4,7 +4,7 @@ import CryptoJS from "crypto-js";
 
 //import {XMLHttpRequest} from 'xmlhttprequest';
 
-process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
+//process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
 
 let BASE_URL;
 const port = parseInt(process.env.PORT, 10) || 3000;
@@ -62,13 +62,24 @@ export const getSASToken = () => {
         "&skn=" +
         m_SasKeyName;
 
+    console.log("///////////////////////");
+    console.log(
+        "encodedURI:" + "https://" + m_ResourceURI + "/" + m_Path + "/"
+    );
+    console.log("WEBAPI_URL: " + WEBAPI_URL);
+    console.log("m_ResourceURI: " + m_ResourceURI);
+    console.log("m_Path: " + m_Path);
+    console.log("m_SasKey: " + m_SasKey);
+    console.log("m_SasKeyName: " + m_SasKeyName);
+    console.log("token: " + token);
+    console.log("///////////////////////");
     return token;
 };
 
 const accessToken =
     "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6IlVXelVaa0U3OEx0NVBGRkJ0LV9seVdoMjdjTSIsImtpZCI6IlVXelVaa0U3OEx0NVBGRkJ0LV9seVdoMjdjTSJ9.eyJhdWQiOiJodHRwczovL2RldmNybTIwMTYubGxjZHQuZ292LndhbGVzLyIsImlzcyI6Imh0dHA6Ly9mcy50ZXN0Lmdvdi53YWxlcy9hZGZzL3NlcnZpY2VzL3RydXN0IiwiaWF0IjoxNjMyMTIxMjkxLCJuYmYiOjE2MzIxMjEyOTEsImV4cCI6MTYzMjE1MDA5MSwidXBuIjpbIlJvYmVydC5Cb25kQHRlc3QuZ292LndhbGVzIiwicm9iZXJ0LmJvbmRAdGVzdC5nb3Yud2FsZXMiXSwicHJpbWFyeXNpZCI6IlMtMS01LTIxLTE4MDA4NDIwNzYtMjQ1NTYwNjU5LTQyMTU3NzU0NjktMTY2MjgiLCJ1bmlxdWVfbmFtZSI6IlhNXFxCb25kUiIsImFwcHR5cGUiOiJQdWJsaWMiLCJhcHBpZCI6IjQyN2ZhNzljLWI1ZmMtNDJhZC04M2Q0LTQxMGIwMzk0OGFiNiIsImF1dGhtZXRob2QiOiJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvYXV0aGVudGljYXRpb25tZXRob2Qvd2luZG93cyIsImF1dGhfdGltZSI6IjIwMjEtMDktMjBUMDc6MDE6MzEuNDYzWiIsInZlciI6IjEuMCJ9.W0ID2nCBYVxh8T1eQqWKk2Wh45kRbRzCICfzrZNAs-4u54yl0UJUcVihyI8EBmQeALCEc5eY99DjK0gaqzCdJqxbxol8yk5LrFvhV5UkCiZ7SO2Wq1cLReWHVsgz39qBtrZ8vlqqZsv7DsEaRJQbtj8Djnx26Wb_kcNu-tuXwUBF0uR5GLFFvJfM3PzkRCY-ZPOTbvPTb73oN_NKe6BrsVjyaR9xSXsRJjgHPmJgWgnvq-2X0Dj7LCwXSEygDDOGlF1yqqN0Lv6qplhQoH-heZlC1K6qe_92nHPswXag6uN5nxTmk1Qw6zJt_aHMnXdwa18ghh4hGx5R0Jz53X113Q";
 
-const SASToken = getSASToken();
+//const SASToken = getSASToken();
 
 const crmHeaders = {
     withCredentials: true,
@@ -93,7 +104,8 @@ const crmHeadersReturn = {
     },
 };
 
-const azureHeaders = {
+const azureHeaders = (SASToken) => {
+    console.log({
         headers: {
             "OData-MaxVersion": "4.0",
             "OData-Version": "4.0",
@@ -102,6 +114,17 @@ const azureHeaders = {
             "Content-Type": "application/json",
             "ServiceBusAuthorization": SASToken,
         },
+    });
+    return {
+        headers: {
+            "OData-MaxVersion": "4.0",
+            "OData-Version": "4.0",
+            "Accept": "application/json",
+            "Prefer": 'odata.include-annotations="*",return=representation',
+            "Content-Type": "application/json",
+            "ServiceBusAuthorization": SASToken,
+        },
+    };
 };
 
 // const azureHeaders = {
@@ -115,26 +138,80 @@ const azureHeaders = {
 //     },
 // };
 
-export const getBasicSearch = (searchString) => {
+export const getBasicSearch = (token, searchString) => {
+    console.log("\n\n", token, searchString);
     return axios
         .get(
             WEBAPI_URL +
                 "incidents?$select=_accountid_value,_customerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=contains(title, '" +
                 searchString +
                 "') and pinswg_appealcasetype ne null &$count=true",
-            azureHeaders
+            azureHeaders(token)
         )
-        .then((res) => res.data)
+        .then((res) => {
+            console.log(" ");
+            console.log("/////////////////////");
+            console.log("data:" + res.data.value);
+            console.log("/////////////////////");
+            console.log(" ");
+            return res.data;
+        })
         .catch((error) => {
             console.log("thiserror", error);
         });
 };
 
-export const getBasicDNSSearch = (searchString) => {
+export const getBasicDNSSearch = (token, searchString) => {
     return axios
         .get(
             WEBAPI_URL +
                 "incidents?$select=_accountid_value,_customerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=pinswg_appealcasetype eq 846040011&$count=true",
+            azureHeaders(token)
+        )
+        .then((res) => res.data)
+        .catch((error) => {
+            console.log("thiserror", error);
+        });
+};
+
+export const getAdvancedSearch = (searchString) => {
+    console.log(searchString.caseReference);
+
+    var queryString = "";
+
+    queryString +=
+        searchString.q != null
+            ? "contains(title, '" + searchString.q + "') "
+            : "";
+
+    queryString +=
+        searchString.lpa != null
+            ? (typeof searchString.q == "undefined" ? "" : " and ") +
+              "_customerid_value eq " +
+              searchString.lpa
+            : "";
+    queryString +=
+        searchString.apt != null
+            ? (typeof searchString.q == "undefined" &&
+              typeof searchString.lpa == "undefined"
+                  ? ""
+                  : " and ") +
+              "pinswg_appealcasetype eq " +
+              searchString.apt
+            : "";
+
+    console.log(
+        "incidents?$select=_accountid_value,_customerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title&$filter=" +
+            queryString +
+            " &$count=true"
+    );
+    return axios
+        .get(
+            WEBAPI_URL +
+                "incidents?$select=_accountid_value,_customerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title&$filter=" +
+                queryString +
+                " &$count=true",
+
             azureHeaders
         )
         .then((res) => res.data)
@@ -143,7 +220,7 @@ export const getBasicDNSSearch = (searchString) => {
         });
 };
 
-export const getBasicSearchDetails = (appealType, caseReference) => {
+export const getBasicSearchDetails = (token, appealType, caseReference) => {
     return axios
         .get(
             WEBAPI_URL +
@@ -151,7 +228,7 @@ export const getBasicSearchDetails = (appealType, caseReference) => {
                 "?$filter=pinswg_name eq '" +
                 caseReference +
                 "'&$count=true",
-            azureHeaders
+            azureHeaders(token)
         )
         .then((res) => res.data)
         .catch((error) => {
@@ -159,14 +236,14 @@ export const getBasicSearchDetails = (appealType, caseReference) => {
         });
 };
 
-export const getBasicDNSSearchDetails = (appealType, caseReference) => {
+export const getBasicDNSSearchDetails = (token, appealType, caseReference) => {
     return axios
         .get(
             WEBAPI_URL +
                 "pinswg_dnses?$filter=pinswg_name eq '" +
                 caseReference +
                 "'&$count=true",
-            azureHeaders
+            azureHeaders(token)
         )
         .then((res) => res.data)
         .catch((error) => {

components/breadcrumbs.js

@@ -102,6 +102,38 @@ const Breadcrumbs = (props) => {
                     ) : (
                         ""
                     )}
+                    {router.pathname == "/advancedsearch" ? (
+                        <>
+                            <li className="govuk-breadcrumbs__list-item">
+                                {t("common:breadcrumb-advanced-search")}
+                            </li>
+                        </>
+                    ) : (
+                        ""
+                    )}
+                    {router.pathname == "/advancedsearchresults" ? (
+                        <>
+                            {" "}
+                            <li className="govuk-breadcrumbs__list-item">
+                                <Link
+                                    href={
+                                        router.locale != "en"
+                                            ? router.locale + "/advancedsearch"
+                                            : "/advancedsearch"
+                                    }
+                                >
+                                    <a className="govuk-breadcrumbs__link">
+                                        {t("common:breadcrumb-advanced-search")}
+                                    </a>
+                                </Link>
+                            </li>
+                            <li className="govuk-breadcrumbs__list-item">
+                                {t("common:breadcrumb-advanced-search-results")}
+                            </li>
+                        </>
+                    ) : (
+                        ""
+                    )}
                     {router.pathname == "/newappeal" ? (
                         <>
                             <li className="govuk-breadcrumbs__list-item">
@@ -381,6 +413,32 @@ const Breadcrumbs = (props) => {
                     ) : (
                         ""
                     )}
+                    {router.pathname == "/dnsdetails" ? (
+                        <>
+                            <li className="govuk-breadcrumbs__list-item">
+                                <Link
+                                    href={
+                                        router.locale != "en"
+                                            ? router.locale + "/dnsapplications"
+                                            : "/dnsapplications"
+                                    }
+                                >
+                                    <a className="govuk-breadcrumbs__link">
+                                        {t("dnsCommon:service-name")}
+                                    </a>
+                                </Link>
+                            </li>
+                            <li className="govuk-breadcrumbs__list-item">
+                                {t("common:breadcrumb-case-reference")}:{" "}
+                                {
+                                    props.props.currentView.caseReference
+                                        .currentReference
+                                }
+                            </li>
+                        </>
+                    ) : (
+                        ""
+                    )}
                     {router.pathname == "/dns/application-process" ? (
                         <>
                             <li className="govuk-breadcrumbs__list-item">

components/header.js

@@ -20,7 +20,8 @@ const Header = (props) => {
         "/dns/application-view",
         "/searchresults",
         "/case",
-        "advancedsearch",
+        "/advancedsearch",
+        "/advancedsearchresults",
         "/dnsapplications",
         "/dnsdetails",
     ];

components/homepage/casesearch.js

@@ -118,7 +118,16 @@ let CaseSearch = (props) => {
 
 const mapStateToProps = (state) => {
     return {
-        ...state,
+        currentView: state.currentView,
+        search: state.search,
+        searchResultsObj: state.searchResultsObj,
+        formData: state.formData,
+        appealType: state.appealType,
+        //form: state.form,
+        myCases: state.myCases,
+        watchedCases: state.watchedCases,
+        myRepresentations: state.myRepresentations,
+        awaitingSubmission: state.awaitingSubmission,
     };
 };
 

components/search/dnssearchresults.js

@@ -19,28 +19,18 @@ const DNSSearchResults = (props) => {
     const router = useRouter();
     const { locale } = router;
 
-    var resultsArr = searchResultsObj.value || [{}];
+    _.isEmpty(searchResultsObj);
 
+    let newSearchResultsObj = _.isEmpty(searchResultsObj)
+        ? [{}]
+        : _.isEmpty(searchResultsObj.value)
+        ? [{}]
+        : searchResultsObj.value;
+
+    var resultsArr = newSearchResultsObj || [];
+
+    const ResultsView = (resultsArr) => {
         return (
-        <>
-            <div className="govuk-grid-row">
-                <div className="govuk-grid-column-two-thirds">
-                    <h1 className="govuk-heading-l">
-                        {t("dnsCommon:service-name")}{" "}
-                        {t("dnsApplications:page-title")}
-                    </h1>
-                    <p className="govuk-body">
-                        {t("dnsApplications:page-intro-paragraph-1")}
-                    </p>
-                    <ul className="govuk-list govuk-list--bullet">
-                        <li> {t("dnsApplications:page-intro-list-item-1")}</li>
-
-                        <li> {t("dnsApplications:page-intro-list-item-2")}</li>
-
-                        <li> {t("dnsApplications:page-intro-list-item-3")}</li>
-                    </ul>
-                </div>
-            </div>
             <div className="govuk-grid-row govuk-!-margin-top-9">
                 <div className="govuk-grid-column-full">
                     <dl className="govuk-summary-list govuk-!-margin-bottom-9 results">
@@ -62,6 +52,7 @@ const DNSSearchResults = (props) => {
                                 {t("search:searchresults-status-label")}
                             </dd>
                         </div>
+                        {console.log(newSearchResultsObj.length > 0)}
 
                         {resultsArr.map((item, key) => {
                             let detailsObj = jsonpath.query(
@@ -207,6 +198,38 @@ const DNSSearchResults = (props) => {
                     </dl>
                 </div>
             </div>
+        );
+    };
+
+    return (
+        <>
+            <div className="govuk-grid-row">
+                <div className="govuk-grid-column-two-thirds">
+                    <h1 className="govuk-heading-l">
+                        {t("dnsCommon:service-name")}{" "}
+                        {t("dnsApplications:page-title")}
+                    </h1>
+                    <p className="govuk-body">
+                        {t("dnsApplications:page-intro-paragraph-1")}
+                    </p>
+                    <ul className="govuk-list govuk-list--bullet">
+                        <li> {t("dnsApplications:page-intro-list-item-1")}</li>
+
+                        <li> {t("dnsApplications:page-intro-list-item-2")}</li>
+
+                        <li> {t("dnsApplications:page-intro-list-item-3")}</li>
+                    </ul>
+                </div>
+            </div>
+            {resultsArr.length > 0 ? (
+                ResultsView(resultsArr)
+            ) : (
+                <div className="govuk-grid-row">
+                    <div className="govuk-grid-column-two-thirds">
+                        <h3>There are no records</h3>
+                    </div>
+                </div>
+            )}
         </>
     );
 };

components/search/searchresults.js

@@ -19,21 +19,10 @@ const SearchResults = (props) => {
     const router = useRouter();
     const { locale } = router;
 
-    var resultsArr = searchResultsObj.value || [{}];
+    var resultsArr = searchResultsObj.value || [];
 
+    const ResultsView = (resultsArr) => {
         return (
-        <div className="govuk-grid-row">
-            <div className="govuk-grid-column-full">
-                <h1 className="govuk-heading-xl govuk-!-margin-bottom-7">
-                    {t("search:searchresults-title-label")}
-                </h1>
-                <p className="govuk-body">
-                    {t("search:searchresults-count-label", {
-                        count: searchResultsObj["@odata.count"].toString(),
-                    })}
-                    . {t("search:searchresults-case-count-label")}{" "}
-                    <em>&quot;{searchString}&quot;</em>
-                </p>
             <dl className="govuk-summary-list govuk-!-margin-bottom-9 results">
                 <div className="govuk-summary-list__row results-headings">
                     <dd className="govuk-summary-list__key govuk-!-font-size-14 results_wider  ">
@@ -70,8 +59,7 @@ const SearchResults = (props) => {
                                     <a
                                         onClick={() => {
                                             setCurrentReference({
-                                                    "currentReference":
+                                                "currentReference": item.title,
-                                                        item.title,
                                                 "currentType":
                                                     "searchResultsObj",
                                             });
@@ -94,47 +82,29 @@ const SearchResults = (props) => {
                                     )}
                                     :
                                 </span>
-                                    {_.has(
+                                {_.has(detailsObj, "pinswg_siteaddressline1")
-                                        detailsObj,
-                                        "pinswg_siteaddressline1"
-                                    )
                                     ? detailsObj.pinswg_siteaddressline1
                                     : ""}
                                 <br />
-                                    {_.has(
+                                {_.has(detailsObj, "pinswg_siteaddressline1")
-                                        detailsObj,
-                                        "pinswg_siteaddressline1"
-                                    )
                                     ? detailsObj.pinswg_siteaddressline2
                                     : ""}
                                 <br />
-                                    {_.has(
+                                {_.has(detailsObj, "pinswg_siteaddressline1")
-                                        detailsObj,
-                                        "pinswg_siteaddressline1"
-                                    )
                                     ? detailsObj.pinswg_siteaddresstown
                                     : ""}
                                 <br />
-                                    {_.has(
+                                {_.has(detailsObj, "pinswg_siteaddressline1")
-                                        detailsObj,
-                                        "pinswg_siteaddressline1"
-                                    )
                                     ? detailsObj.pinswg_siteaddresscounty
                                     : ""}
                                 <br />
-                                    {_.has(
+                                {_.has(detailsObj, "pinswg_siteaddressline1")
-                                        detailsObj,
-                                        "pinswg_siteaddressline1"
-                                    )
                                     ? detailsObj.pinswg_siteaddresspostcode
                                     : ""}
                             </dd>
                             <dd className="govuk-summary-list__value govuk-!-font-size-14">
                                 <span className="results-visually-hidden">
-                                        {t(
+                                    {t("search:searchresults-applicant-label")}:
-                                            "search:searchresults-applicant-label"
-                                        )}
-                                        :
                                 </span>
                                 {_.has(detailsObj, [
                                     "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue",
@@ -146,34 +116,28 @@ const SearchResults = (props) => {
                             </dd>
                             <dd className="govuk-summary-list__value govuk-!-font-size-14">
                                 <span className="results-visually-hidden">
-                                        {t(
+                                    {t("search:searchresults-authority-label")}:
-                                            "search:searchresults-authority-label"
-                                        )}
-                                        :
                                 </span>
-                                    {_.has(detailsObj, [
+                                {_.has(item, [
-                                        "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue",
+                                    "_customerid_value@OData.Community.Display.V1.FormattedValue",
                                 ])
                                     ? router.locale == "cy"
                                         ? jsonpath.query(
                                               transLookup,
                                               '$..[?(@.value=="' +
-                                                      detailsObj[
+                                                  item[
-                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
+                                                      "_customerid_value@OData.Community.Display.V1.FormattedValue"
                                                   ] +
                                                   '")].value_cy'
                                           )
-                                            : detailsObj[
+                                        : item[
-                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
+                                              "_customerid_value@OData.Community.Display.V1.FormattedValue"
                                           ] || "N/A"
                                     : ""}
                             </dd>
                             <dd className="govuk-summary-list__value govuk-!-font-size-14">
                                 <span className="results-visually-hidden">
-                                        {t(
+                                    {t("search:searchresults-case-type-label")}:
-                                            "search:searchresults-case-type-label"
-                                        )}
-                                        :
                                 </span>
                                 {router.locale == "cy"
                                     ? jsonpath.query(
@@ -190,8 +154,7 @@ const SearchResults = (props) => {
                             </dd>
                             <dd className="govuk-summary-list__value govuk-!-font-size-14">
                                 <span className="results-visually-hidden">
-                                        {t("search:searchresults-status-label")}
+                                    {t("search:searchresults-status-label")}:
-                                        :
                                 </span>
 
                                 {router.locale == "cy"
@@ -211,6 +174,41 @@ const SearchResults = (props) => {
                     );
                 })}
             </dl>
+        );
+    };
+    return (
+        <div className="govuk-grid-row">
+            <div className="govuk-grid-column-full">
+                <h1 className="govuk-heading-xl govuk-!-margin-bottom-7">
+                    {t("search:searchresults-title-label")}
+                </h1>
+                <p className="govuk-body">
+                    {t("search:searchresults-count-label", {
+                        count: resultsArr.length,
+                    })}
+                    .
+                    {typeof searchString != "undefined" ? (
+                        <>
+                            <span>
+                                {t("search:searchresults-case-count-label")}{" "}
+                                {"  "}
+                                <em>&quot;{searchString}&quot;</em>
+                            </span>
+                        </>
+                    ) : (
+                        ""
+                    )}
+                </p>
+
+                {resultsArr.length > 0 ? (
+                    ResultsView(resultsArr)
+                ) : (
+                    <div className="govuk-grid-row">
+                        <div className="govuk-grid-column-two-thirds">
+                            <h3>There are no records</h3>
+                        </div>
+                    </div>
+                )}
             </div>
         </div>
     );

components/searchresults.js

@@ -35,12 +35,12 @@ export default function Search(props) {
                                 {t("search:searchresults-search-button-label")}
                             </a>
                         </Link>
-                        <a
+                        {/* <a
                             onClick={() => router.back()}
                             className="govuk-button govuk-button--secondary"
                         >
                             {t("search:searchresults-new-search-button-label")}
-                        </a>
+                        </a> */}
                     </div>
                 </div>
             </div>

i18n.json

@@ -29,6 +29,9 @@
       "/advancedsearch": [
          "search"
       ],
+      "/advancedsearchresults": [
+         "search"
+      ],
       "/searchresults": [
          "search"
       ],
@@ -71,7 +74,10 @@
          "dnsApplications"
       ],
       "/dnsdetails": [
-         "case"
+         "case",
+         "search",
+         "dnsCommon",
+         "dnsApplications"
       ]
    }
 }

locales/cy/common.json

@@ -20,6 +20,8 @@
   "social-bar-share-link": "Rhannu’r dudalen hon",
   "social-bar-share-via-link": "Rhannu’r dudalen hon ar",
   "breadcrumb-search-results": "Canlyniadau chwilio",
+  "breadcrumb-advanced-search": "Advanced search",
+  "breadcrumb-advanced-search-results": "Advanced search results",
   "breadcrumb-my-portal": "Fy mhorth",
   "breadcrumb-case-reference": "Cyfeirnod Achos"
 }

locales/en/common.json

@@ -20,6 +20,8 @@
   "social-bar-share-link": "Share this page",
   "social-bar-share-via-link": "Share this page via",
   "breadcrumb-search-results": "Search results",
+  "breadcrumb-advanced-search": "Advanced search",
+  "breadcrumb-advanced-search-results": "Advanced search results",
   "breadcrumb-my-portal": "My portal",
   "breadcrumb-case-reference": "Case Reference"
 }

pages/advancedsearch.js

@@ -14,12 +14,23 @@ import Cookies from "cookies";
 import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
 
+import {
+    setAppealType,
+    setAppealTypeTitle,
+    setAppealTypeID,
+    setAppealLPA,
+    getAppealTypeObj,
+} from "../store/appealType/action";
+import { getAppealsTypes, getLPA, updateCase, createCase } from "../actions";
+import { setLPA } from "../store/lpa/action";
+
 const Home = (props) => {
     const { footerLinks, pages } = props;
     let { t, lang } = useTranslation();
 
     const router = useRouter();
     const { locale } = router;
+    const { appealtypes } = router.query;
 
     return (
         <div>
@@ -33,7 +44,11 @@ const Home = (props) => {
                 <Header courseName={t("common:service-name")} />
                 <div className="govuk-width-container">
                     <Banner />
-                    <Search />
+                    <Breadcrumbs slug={appealtypes} />
+                    <Search
+                        lpadata={props.LPAData}
+                        appealType={props.appealType}
+                    />
                 </div>
                 <Footer footerLinks={footerLinks} />
             </div>
@@ -41,9 +56,28 @@ const Home = (props) => {
     );
 };
 
+export const getServerSideProps = wrapper.getServerSideProps(
+    (store) =>
+        async ({ query, req, res }) => {
+            const [appealTypeData, lpaData, caseData] = await Promise.all([
+                await getAppealsTypes(),
+                await getLPA(),
+            ]);
+
+            store.dispatch(setAppealType(appealTypeData));
+            store.dispatch(setLPA(lpaData));
+        }
+);
+
 const mapStateToProps = (state) => {
     return {
         search: state.search,
+        searchResultsObj: state.searchResultsObj,
+        formData: state.formData,
+        appealType: state.appealType,
+        LPAData: state.LPAData,
+        //form: state.form,
+        accountDetails: state.accountDetails,
     };
 };
 

pages/advancedsearchresults.js

@@ -0,0 +1,131 @@
+import _ from "lodash";
+import Head from "next/head";
+import Header from "../components/header";
+import Banner from "../components/banner";
+import CookieBanner from "../components/cookieBanner";
+import Breadcrumbs from "../components/breadcrumbs";
+import SearchResults from "../components/searchresults";
+import Footer from "../components/footer";
+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 { getAdvancedSearch, getBasicSearchDetails } from "../actions";
+
+const Home = (props) => {
+    const { footerLinks, pages } = props;
+    let { t, lang } = useTranslation();
+
+    const router = useRouter();
+    const { locale } = router;
+    const { appealtypes } = router.query;
+
+    return (
+        <div>
+            <Head>
+                <title>
+                    {t("search:page-title")} - {t("common:service-name")}
+                </title>
+            </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}
+                        searchResultsObj={props.searchResultsObj}
+                        advancedSearch={true}
+                    />
+                </div>
+                <Footer footerLinks={footerLinks} />
+            </div>
+        </div>
+    );
+};
+
+export const getServerSideProps = wrapper.getServerSideProps(
+    (store) =>
+        async ({ query, req, res }) => {
+            console.log("query-", query);
+            //console.log("search array:", Object.entries(query));
+
+            let querystring;
+
+            const searchResultsObj = await getAdvancedSearch(query);
+            const searchDetailsObj = await getSearchDetails(searchResultsObj);
+            // console.log(searchDetailsObj);
+            store.dispatch(setSearchResults(searchResultsObj));
+            store.dispatch(setSearchDetails(searchDetailsObj));
+            //store.dispatch(setSearch(query.q));
+        }
+);
+
+const getFormCollection = (formtype) => {
+    const collectionName = jsonpath.query(
+        data,
+        "$..[?(@.LogicalName=='" + formtype + "')].LogicalCollectionName"
+    );
+    //console.log(collectionName[0]);
+    return collectionName[0];
+};
+
+const getSearchDetails = (searchResultsObj) => {
+    //console.log(searchResultsObj);
+
+    let detailsArr = [];
+    //console.log("searcg results", searchResultsObj);
+    searchResultsObj = searchResultsObj.value;
+    const detailsObj = searchResultsObj.map((searchDetail, index) => {
+        if (searchDetail.pinswg_appealcasetype == null) {
+            console.log(searchDetail.ticketnumber);
+        } else {
+            detailsArr.push(
+                getBasicSearchDetails(
+                    getFormCollection(
+                        "pinswg_" +
+                            searchDetail[
+                                "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
+                            ]
+                                .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
+                                .toLowerCase()
+                                .slice(0, 39)
+                    ),
+                    searchDetail.ticketnumber
+                )
+            );
+        }
+    });
+    //console.log(detailsArr);
+    return Promise.all(detailsArr);
+};
+
+const mapStateToProps = (state) => {
+    return {
+        currentView: state.currentView,
+        search: state.search,
+        searchResultsObj: state.searchResultsObj,
+        formData: state.formData,
+        appealType: state.appealType,
+        form: state.form,
+        myCases: state.myCases,
+        watchedCases: state.watchedCases,
+        myRepresentations: state.myRepresentations,
+        awaitingSubmission: state.awaitingSubmission,
+    };
+};
+
+export default connect(mapStateToProps)(Home);

pages/dnsapplications.js

@@ -22,7 +22,11 @@ import {
     setSearchDetails,
     getSearchResultsObj,
 } from "../store/searchOutput/action";
-import { getBasicDNSSearch, getBasicSearchDetails } from "../actions";
+import {
+    getBasicDNSSearch,
+    getBasicSearchDetails,
+    getSASToken,
+} from "../actions";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -61,10 +65,15 @@ export const getServerSideProps = wrapper.getServerSideProps(
         async ({ query, req, res }) => {
             console.log("query-", query);
 
-            const searchResultsObj = await getBasicDNSSearch();
+            const token = await getSASToken();
+
+            const searchResultsObj = await getBasicDNSSearch(token);
             //console.log(searchResultsObj);
 
-            const searchDetailsObj = await getSearchDetails(searchResultsObj);
+            const searchDetailsObj = await getSearchDetails(
+                token,
+                searchResultsObj
+            );
             //console.log(searchDetailsObj);
             store.dispatch(setSearchResults(searchResultsObj));
             store.dispatch(setSearchDetails(searchDetailsObj));
@@ -81,7 +90,7 @@ const getFormCollection = (formtype) => {
     return collectionName[0];
 };
 
-const getSearchDetails = (searchResultsObj) => {
+const getSearchDetails = (token, searchResultsObj) => {
     //console.log(searchResultsObj);
 
     let detailsArr = [];
@@ -92,6 +101,7 @@ const getSearchDetails = (searchResultsObj) => {
         } else {
             detailsArr.push(
                 getBasicSearchDetails(
+                    token,
                     getFormCollection(
                         "pinswg_" +
                             searchDetail[

pages/searchresults.js

@@ -22,7 +22,7 @@ import {
     setSearchDetails,
     getSearchResultsObj,
 } from "../store/searchOutput/action";
-import { getBasicSearch, getBasicSearchDetails } from "../actions";
+import { getBasicSearch, getBasicSearchDetails, getSASToken } from "../actions";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -60,14 +60,18 @@ export const getServerSideProps = wrapper.getServerSideProps(
     (store) =>
         async ({ query, req, res }) => {
             console.log("query-", query);
-            // const [searchResultsObj, searchDetailsObj] = await Promise.all(
-            //     await getBasicSearch(query.q),
-            //     await getBasicSearchDetails(query.d)
-            // );
 
-            const searchResultsObj = await getBasicSearch(query.q);
+            const token = await getSASToken();
-            const searchDetailsObj = await getSearchDetails(searchResultsObj);
+
-            // console.log(searchDetailsObj);
+            const searchResultsObj = await getBasicSearch(token, query.q);
+
+            console.log("sssss", searchResultsObj);
+
+            const searchDetailsObj = await getSearchDetails(
+                token,
+                searchResultsObj
+            );
+            console.log(searchDetailsObj);
             store.dispatch(setSearchResults(searchResultsObj));
             store.dispatch(setSearchDetails(searchDetailsObj));
             store.dispatch(setSearch(query.q));
@@ -83,10 +87,11 @@ const getFormCollection = (formtype) => {
     return collectionName[0];
 };
 
-const getSearchDetails = (searchResultsObj) => {
+const getSearchDetails = (token, searchResultsObj) => {
-    //console.log(searchResultsObj);
+    console.log(searchResultsObj);
 
     let detailsArr = [];
+    console.log("search results", searchResultsObj);
     searchResultsObj = searchResultsObj.value;
     const detailsObj = searchResultsObj.map((searchDetail, index) => {
         if (searchDetail.pinswg_appealcasetype == null) {
@@ -94,6 +99,7 @@ const getSearchDetails = (searchResultsObj) => {
         } else {
             detailsArr.push(
                 getBasicSearchDetails(
+                    token,
                     getFormCollection(
                         "pinswg_" +
                             searchDetail[