Merged PR 747: removed unused imports & watch case on adv search

removed unused imports & watch case on adv search

Related work items: #7232

.env.local

@@ -10,19 +10,19 @@ NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459
 
 
 //Dev oauth 
-CLIENT_ID = e082def0-3453-461f-9a5e-f4ab127dc015
+//CLIENT_ID = e082def0-3453-461f-9a5e-f4ab127dc015
-CLIENT_SECRET = qW.7Q~TSr3sZmLEnJQJPXEdOckb_yo2t1yJmY
+//CLIENT_SECRET = qW.7Q~TSr3sZmLEnJQJPXEdOckb_yo2t1yJmY
-RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
+//RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
-RELAYURI = "dev-pedw-ns.servicebus.windows.net"
+//RELAYURI = "dev-pedw-ns.servicebus.windows.net"
-RELAYPATH = "dev-pedw-hc"
+//RELAYPATH = "dev-pedw-hc"
 
 
 //Test Oauth
-//CLIENT_ID = 6619ad85-c908-490d-811b-de8c93c0f2aa
+CLIENT_ID = 6619ad85-c908-490d-811b-de8c93c0f2aa
-//CLIENT_SECRET = qKo7Q~5QvLEplbwnBbint_I5lXqx_-kDm8Vj-
+CLIENT_SECRET = qKo7Q~5QvLEplbwnBbint_I5lXqx_-kDm8Vj-
-//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
+RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
-//RELAYURI = "test-pedw-ns.servicebus.windows.net"
+RELAYURI = "test-pedw-ns.servicebus.windows.net"
-//RELAYPATH = "test-pedw-hc"
+RELAYPATH = "test-pedw-hc"
 
 
 //Preprod Oauth
@@ -35,11 +35,11 @@ RELAYPATH = "dev-pedw-hc"
 
 
 //Prod Oauth
-CLIENT_ID = 01904c07-9035-4cf9-a535-3945f6e470d2
+//CLIENT_ID = 01904c07-9035-4cf9-a535-3945f6e470d2
-CLIENT_SECRET = PRo7Q~GQoKSdARRqF-NOXQDx2Ka8UCINyvagk
+//CLIENT_SECRET = PRo7Q~GQoKSdARRqF-NOXQDx2Ka8UCINyvagk
-RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/
+//RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/
-RELAYURI = "prod-pedw-ns.servicebus.windows.net"
+//RELAYURI = "prod-pedw-ns.servicebus.windows.net"
-RELAYPATH = "prod-pedw-hc"
+//RELAYPATH = "prod-pedw-hc"
 
 
 GOOGLE_TAG_MANAGER = GTM-T78CBC3

actions/index.js

@@ -260,7 +260,7 @@ export const getSearchDocumentDetails = (incidentID) => {
         )
         .then((res) => res.data)
         .catch((error) => {
-            console.log("thiserror", error);
+            console.log("API call error", error);
         });
 };
 
@@ -274,7 +274,7 @@ export const getSearchDocumentDetailsPaged = (incidentID, pageNumber) => {
         )
         .then((res) => res.data)
         .catch((error) => {
-            console.log("thiserror", error);
+            console.log("API call error", error);
         });
 };
 
@@ -288,7 +288,7 @@ export const getSearchDocumentHistory = (documentID) => {
             return res.data;
         })
         .catch((error) => {
-            console.log("thiserror", error);
+            console.log("API call error", error);
         });
 };
 
@@ -304,14 +304,15 @@ export const getSearchDocumentHistoryPaged = (documentID, pageNumber) => {
             return res.data;
         })
         .catch((error) => {
-            console.log("thiserror", error);
+            console.log("API call error", error);
         });
 };
 
 export const getLinkedCases = (parentIncidentid) => {
     return axios
         .get(
-            "/api/endpoint/getlinkedcases_api?parentincidentid=" +
+            BASE_URL +
+                "/api/endpoint/getlinkedcases_api?parentincidentid=" +
                 parentIncidentid
         )
         .then((res) => {
@@ -319,7 +320,7 @@ export const getLinkedCases = (parentIncidentid) => {
             return res.data;
         })
         .catch((error) => {
-            console.log("thiserror", error);
+            console.log("API call error", error);
         });
 };
 
@@ -361,46 +362,56 @@ export const getLPA = () => {
 
 export const getFormData = (whichForm) => {
     return axios
-        .get("/api/endpoint/getformdata_api?whichForm=" + whichForm)
+        .get(BASE_URL + "/api/endpoint/getformdata_api?whichForm=" + whichForm)
         .then((res) => res.data)
         .catch((error) => {
-            console.log("thiserror", error);
+            console.log("API call error", error);
         });
 };
 
 export const getMandatoryFields = (whichForm) => {
     return axios
-        .get("/api/endpoint/getmandatoryfields_api?whichForm=" + whichForm)
+        .get(
+            BASE_URL +
+                "/api/endpoint/getmandatoryfields_api?whichForm=" +
+                whichForm
+        )
         .then((res) => res.data)
         .catch((error) => {
-            console.log("thiserror", error);
+            console.log("API call error", error);
         });
 };
 
 export const getPickLists = (whichForm) => {
     return axios
-        .get("/api/endpoint/getpicklists_api?whichForm=" + whichForm)
+        .get(BASE_URL + "/api/endpoint/getpicklists_api?whichForm=" + whichForm)
         .then((res) => res.data)
         .catch((error) => {
-            console.log("thiserror", error);
+            console.log("API call error", error);
         });
 };
 
 export const getPersonalAccount = (contactid) => {
+    console.log(contactid);
     return axios
-        .get("/api/endpoint/getpersonalaccount_api?contactid=" + contactid)
+        .get(
+            BASE_URL +
+                "/api/endpoint/getpersonalaccount_api?contactid=" +
+                contactid
+        )
         .then((res) => {
             console.log(res.data);
             return res.data;
         })
         .catch((error) => {
-            let ErrResponse = {
+            console.log("returned:", error);
-                value: [],
+            // let ErrResponse = {
-                errorCode: error.response.status,
+            //     value: [],
-                errorMsg: error.response.statusText,
+            //     errorCode: error.response.status,
-            };
+            //     errorMsg: error.response.statusText,
+            // };
 
-            return ErrResponse;
+            // return ErrResponse;
         });
 };
 
@@ -423,7 +434,7 @@ export const getAppealID = (
             return appealID;
         })
         .catch((error) => {
-            console.log("thi serror", error);
+            console.log("API call error", error);
         });
 };
 
@@ -437,7 +448,7 @@ export const getLogin = (emailAddress, pwd) => {
         )
         .then((res) => res.data)
         .catch((error) => {
-            console.log("thiserror", error);
+            console.log("API call error", error);
         });
 };
 
@@ -454,7 +465,7 @@ export const createCase = (appealTypeId, lpaID, contactid) => {
 
     var config = {
         method: "post",
-        url: queryUrl,
+        url: BASE_URL + queryUrl,
     };
 
     return axios(config)
@@ -477,7 +488,7 @@ export const getMyCases = (loggedInUserId) => {
             return res.data;
         })
         .catch((error) => {
-            console.log("thi serror", error);
+            console.log("API call error", error);
         });
 };
 
@@ -562,7 +573,7 @@ export const getAwaitingSubmission = () => {
         })
         .then((res) => res.data)
         .catch((error) => {
-            console.log("thi serror", error);
+            console.log("API call error", error);
         });
 };
 
@@ -577,7 +588,7 @@ export const getPortalModuleDetails = (appealType, caseReference) => {
         )
         .then((res) => res.data)
         .catch((error) => {
-            console.log("thiserror", error);
+            console.log("API call error", error);
         });
 };
 
@@ -592,7 +603,7 @@ export const getPortalModuleDetailsProxy = (appealType, caseReference) => {
         )
         .then((res) => res.data)
         .catch((error) => {
-            console.log("thiserror", error);
+            console.log("API call error", error);
         });
 };
 
@@ -605,7 +616,7 @@ export const getEmailAccountCheck = (emailAddress) => {
         )
         .then((res) => res.data)
         .catch((error) => {
-            console.log("thiserror", error);
+            console.log("API call error", error);
         });
 };
 
@@ -650,7 +661,6 @@ export const createWatchedCases = (formValues) => {
     var data = formValues;
     var queryUrl = window.apiRoot + "/api/endpoint/createwatchedcases_api";
 
-    console.log(queryUrl);
     var config = {
         method: "post",
         url: queryUrl,
@@ -698,7 +708,7 @@ export const updateCase = async (
             return res.data;
         })
         .catch((error) => {
-            console.log("thi serror", error);
+            console.log("API call error", error);
         });
 };
 

components/breadcrumbs.js

@@ -125,6 +125,28 @@ const Breadcrumbs = (props) => {
                         ) : (
                             ""
                         )}
+                        {router.pathname == "/myportal/advancedsearch" ? (
+                            <>
+                                <li className="govuk-breadcrumbs__list-item">
+                                    <Link
+                                        href={
+                                            router.locale != "en"
+                                                ? router.locale + "/myportal"
+                                                : "/myportal"
+                                        }
+                                    >
+                                        <a className="govuk-breadcrumbs__link">
+                                            {t("common:breadcrumb-my-portal")}
+                                        </a>
+                                    </Link>
+                                </li>
+                                <li className="govuk-breadcrumbs__list-item">
+                                    {t("common:breadcrumb-advanced-search")}
+                                </li>
+                            </>
+                        ) : (
+                            ""
+                        )}
                         {router.pathname == "/advancedsearchresults" ? (
                             <>
                                 {" "}
@@ -153,6 +175,47 @@ const Breadcrumbs = (props) => {
                         ) : (
                             ""
                         )}
+                        {router.pathname ==
+                        "/myportal/advancedsearchresults" ? (
+                            <>
+                                <li className="govuk-breadcrumbs__list-item">
+                                    <Link
+                                        href={
+                                            router.locale != "en"
+                                                ? router.locale + "/myportal"
+                                                : "/myportal"
+                                        }
+                                    >
+                                        <a className="govuk-breadcrumbs__link">
+                                            {t("common:breadcrumb-my-portal")}
+                                        </a>
+                                    </Link>
+                                </li>
+                                <li className="govuk-breadcrumbs__list-item">
+                                    <Link
+                                        href={
+                                            router.locale != "en"
+                                                ? router.locale +
+                                                  "/myportal/advancedsearch"
+                                                : "/myportal/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">

components/myportal.js

@@ -22,8 +22,8 @@ const MyPortal = (props) => {
     const { locale } = router;
 
     const [showModal, setShowModal] = useState(false);
-    const inactiveTimeOut = 120; // in seconds
+    const inactiveTimeOut = 12000; // in seconds
-    const reminderTimeout = 30; // in seconds
+    const reminderTimeout = 60; // in seconds
 
     let idleTimer = null;
     let logoutTimer = null;

components/myportal/viewall.js

@@ -29,10 +29,10 @@ const ViewAllResults = (props) => {
                     <Link
                         href={
                             router.locale == "cy"
-                                ? myportal == "true"
+                                ? myportal == true
                                     ? "/fymhorth/achos"
                                     : "/achos"
-                                : myportal == "true"
+                                : myportal == true
                                 ? "/myportal/case"
                                 : "/case"
                         }

components/search/advancedsearch.js

@@ -305,8 +305,8 @@ let AdvancedSearch = (props) => {
 
         router.replace(
             (router.locale == "cy"
-                ? "/canlyniadauchwiliouwch"
+                ? "/fymhorth/canlyniadauchwiliouwch"
-                : "/advancedsearchresults") + searchString,
+                : "/myportal/advancedsearchresults") + searchString,
             null,
             {
                 shallow: true,

components/search/searchresults.js

@@ -174,7 +174,7 @@ const SearchResults = (props) => {
                         <dd className="govuk-summary-list__key govuk-!-font-size-16">
                             {t("search:searchresults-status-label")}
                         </dd>
-                        {myportal == "true" && (
+                        {myportal == true && (
                             <dd className="govuk-summary-list__key govuk-!-font-size-16 govuk-summary-list__action"></dd>
                         )}
                     </div>
@@ -191,10 +191,10 @@ const SearchResults = (props) => {
                                     <Link
                                         href={
                                             router.locale == "cy"
-                                                ? myportal == "true"
+                                                ? myportal == true
                                                     ? "/fymhorth/achos"
                                                     : "/achos"
-                                                : myportal == "true"
+                                                : myportal == true
                                                 ? "/myportal/case"
                                                 : "/case"
                                         }
@@ -368,7 +368,7 @@ const SearchResults = (props) => {
                                               "statuscode@OData.Community.Display.V1.FormattedValue"
                                           ] || "N/A"}
                                 </dd>
-                                {myportal == "true" && (
+                                {myportal == true && (
                                     <dd className="govuk-summary-list__value govuk-!-font-size-14 govuk-summary-list__action">
                                         {isWatchedCase(item.incidentid).length >
                                             0 ==

pages/404.js

@@ -1,11 +1,10 @@
 // 404.js
-import Link from "next/link";
-import Head from "next/head";
-import Header from "../components/header";
-import Banner from "../components/banner";
-import CookieBanner from "../components/cookieBanner";
 import useTranslation from "next-translate/useTranslation";
+import Head from "next/head";
+import Link from "next/link";
+import CookieBanner from "../components/cookieBanner";
 import Footer from "../components/footer";
+import Header from "../components/header";
 
 const FourOhFour = (props) => {
     let { t, lang } = useTranslation();

pages/_document.js

@@ -45,7 +45,7 @@ class MyDocument extends Document {
         let csp = ``;
         csp += `base-uri 'self';`;
         csp += `form-action 'self';`;
-        csp += `object-src 'none';`;
+        csp += `object-src 'self' data:;`;
         csp += `script-src 'self'  https://www.googletagmanager.com  'nonce-${generatedNonce}' ${
             process.env.NODE_ENV != "production" ? " 'unsafe-eval';" : " ;"
         }`;

pages/_error.js

@@ -1,10 +1,9 @@
-import Link from "next/link";
-import Head from "next/head";
-import Header from "../components/header";
-import Banner from "../components/banner";
-import CookieBanner from "../components/cookieBanner";
 import useTranslation from "next-translate/useTranslation";
+import Head from "next/head";
+import Link from "next/link";
+import CookieBanner from "../components/cookieBanner";
 import Footer from "../components/footer";
+import Header from "../components/header";
 
 function Error({ statusCode }, props) {
     let { t, lang } = useTranslation();

pages/accessibility.js

@@ -1,26 +1,17 @@
-import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
-import { useState, useEffect, useRef } from "react";
 import Head from "next/head";
+import { useRouter } from "next/router";
+import AccessibilityStatement from "../components/accessibility";
+import Breadcrumbs from "../components/breadcrumbs";
+import CookieBanner from "../components/cookieBanner";
+import Footer from "../components/footer";
 import Header from "../components/header";
 import ServiceBanner from "../components/servicebanner";
-import CookieBanner from "../components/cookieBanner";
-import Breadcrumbs from "../components/breadcrumbs";
-import Main from "../components/main";
-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 { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import { getIncidents } from "../actions";
-import { parseCookies } from "nookies";
-import AccessibilityStatement from "../components/accessibility";
 
 const Accessibility = (props) => {
     const { footerLinks, pages, showLogin } = props;
     let { t, lang } = useTranslation();
-
+    ß;
     const router = useRouter();
     const { locale } = router;
 

pages/advancedsearch.js

@@ -1,36 +1,18 @@
 import _ from "lodash";
-import { useState } from "react";
-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 Search from "../components/search";
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
+import Head from "next/head";
+import { useRouter } from "next/router";
+import { connect } from "react-redux";
+import { getAppealsTypes, getLPA } from "../actions";
+import Breadcrumbs from "../components/breadcrumbs";
+import CookieBanner from "../components/cookieBanner";
 import CRMError from "../components/crmError";
-
+import Footer from "../components/footer";
-import {
+import Header from "../components/header";
-    setAppealType,
+import Search from "../components/search";
-    setAppealTypeTitle,
+import { setAppealType } from "../store/appealType/action";
-    setAppealTypeID,
-    setAppealLPA,
-    getAppealTypeObj,
-} from "../store/appealType/action";
-import {
-    getAppealsTypes,
-    getLPA,
-    updateCase,
-    createCase,
-    getToken,
-} from "../actions";
 import { setLPA } from "../store/lpa/action";
+import { wrapper } from "../store/store";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -40,7 +22,6 @@ 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")

pages/advancedsearchresults.js

@@ -1,28 +1,20 @@
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import Head from "next/head";
-import data from "../data/collections.json";
+import { useRouter } from "next/router";
+import { connect } from "react-redux";
+import { getAdvancedSearch } from "../actions";
+import Breadcrumbs from "../components/breadcrumbs";
+import CookieBanner from "../components/cookieBanner";
+import Footer from "../components/footer";
+import Header from "../components/header";
+import SearchResults from "../components/searchresults";
 import { getSearchDetails } from "../components/utils";
-import { setSearch, getSearchObj } from "../store/search/action";
+import { setSearch } from "../store/search/action";
 import {
-    setSearchResults,
     setSearchDetails,
-    getSearchResultsObj,
+    setSearchResults,
 } from "../store/searchOutput/action";
-import { getAdvancedSearch, getBasicSearchDetails, getToken } from "../actions";
+import { wrapper } from "../store/store";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;

pages/api/endpoint/createaccount_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeadersPaged } from "../../../actions";
 

pages/api/endpoint/createcase_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";
@@ -55,9 +54,12 @@ export default async function ApiProxy(req, res) {
         ? res.status(400).json()
         : axios(config)
               .then(({ data }) => {
+                  console.log(data);
                   res.status(200).json(data);
               })
               .catch(({ err }) => {
                   res.status(400).json(err);
               });
+
+    return apiResponse;
 }

pages/api/endpoint/createwatchedcases_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeadersPaged } from "../../../actions";
 
@@ -26,11 +25,9 @@ export default async function ApiProxy(req, res) {
     var data = JSON.stringify(req.body);
     var queryUrl = "pinswg_watchlists";
 
-    console.log("create case");
-
     var config = {
         method: "post",
-        url: queryUrl + hashAPIPath(queryUrl),
+        url: WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
         headers: {
             "OData-MaxVersion": "4.0",
             "OData-Version": "4.0",

pages/api/endpoint/deletemyrepresentations_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeadersPaged } from "../../../actions";
 

pages/api/endpoint/deletewatchedcases_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeadersPaged } from "../../../actions";
 
@@ -41,7 +40,7 @@ export default async function ApiProxy(req, res) {
 
     return axios(config)
         .then(({ data }) => {
-            console.log("deleted ");
+            //console.log("deleted watched case - " + watchedCaseID);
             res.status(200).json(data);
         })
         .catch(({ err }) => {

pages/api/endpoint/getadvancedsearch_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";

pages/api/endpoint/getadvancedsearchpaged_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";

pages/api/endpoint/getappealid_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getappealtypes_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeadersPaged, azureHeaders } from "../../../actions";
 /**

pages/api/endpoint/getbasicdnssearch_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeaders, azureHeadersPaged } from "../../../actions";

pages/api/endpoint/getbasicdnssearchdetails_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";

pages/api/endpoint/getbasicdnssearchdetailspaged_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";

pages/api/endpoint/getbasicdnssearchpaged_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";

pages/api/endpoint/getbasicsearch_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";

pages/api/endpoint/getbasicsearchdetails_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
 import { getSelectQuery } from "../../../actions/selectQueryTypes";

pages/api/endpoint/getbasicsearchdetailspaged_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";

pages/api/endpoint/getbasicsearchpaged_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";

pages/api/endpoint/getemailaccountcheck_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeaders } from "../../../actions";

pages/api/endpoint/getformdata_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeadersPaged, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getlinkedcases_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeadersPaged } from "../../../actions";
 

pages/api/endpoint/getlogin_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";

pages/api/endpoint/getlpa_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeadersPaged, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getmandatoryfields_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeadersPaged, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getmycases_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getmyrepresentations_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getmyrepresentationsproxy_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getpersonalaccount_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
 
@@ -21,7 +20,6 @@ const hashAPIPath = (queryPath) => {
 export default async function ApiProxy(req, res) {
     var contactid = req.query.contactid;
     var token = await getToken();
-    console.log(" eeee", contactid.length);
 
     var queryUrl =
         "contacts(" +

pages/api/endpoint/getpicklists_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getportalmoduledetails_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getportalmoduledetailsproxy_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getrepresentations_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getrepresentationsproxy_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getsearchdocumentdetails_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";

pages/api/endpoint/getsearchdocumentdetailspaged_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";

pages/api/endpoint/getsearchdocumenthistory_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeadersPaged } from "../../../actions";
 

pages/api/endpoint/getsearchdocumenthistorypaged_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeadersPaged } from "../../../actions";
 

pages/api/endpoint/getwatchedcases_api copy 2.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getwatchedcases_api.js

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
 import { getToken, azureHeaders } from "../../../actions";
 

pages/api/endpoint/getwatchedcasesproxy_api.js

@@ -1,7 +1,6 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
-import { getToken, azureHeaders } from "../../../actions";
+import { azureHeaders, getToken } from "../../../actions";
 
 const WORDKEY = process.env.HASHKEY;
 

pages/api/endpoint/updateaccount_api.js

@@ -1,7 +1,6 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
-import { getToken, azureHeadersPaged } from "../../../actions";
+import { getToken } from "../../../actions";
 
 const WORDKEY = process.env.HASHKEY;
 

pages/api/endpoint/updatecase_api.js

@@ -1,7 +1,6 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
-import { getToken, azureHeadersPaged } from "../../../actions";
+import { getToken } from "../../../actions";
 
 const WORDKEY = process.env.HASHKEY;
 

pages/api/endpoint/updatepassword_api.js

@@ -1,7 +1,6 @@
 import axios from "axios";
-import https from "https";
 import CryptoJS from "crypto-js";
-import { getToken, azureHeadersPaged } from "../../../actions";
+import { getToken } from "../../../actions";
 
 const WORDKEY = process.env.HASHKEY;
 

pages/details-about-cookies.js

@@ -1,21 +1,12 @@
-import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
-import { useState, useEffect, useRef } from "react";
 import Head from "next/head";
+import { useRouter } from "next/router";
+import Breadcrumbs from "../components/breadcrumbs";
+import CookieBanner from "../components/cookieBanner";
+import CookiePolicy from "../components/cookiePolicy";
+import Footer from "../components/footer";
 import Header from "../components/header";
 import ServiceBanner from "../components/servicebanner";
-import CookieBanner from "../components/cookieBanner";
-import Breadcrumbs from "../components/breadcrumbs";
-import Main from "../components/main";
-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 { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import { getIncidents } from "../actions";
-import { parseCookies } from "nookies";
-import CookiePolicy from "../components/cookiePolicy";
 
 const CookieDetails = (props) => {
     const { footerLinks, pages, showLogin } = props;

pages/dnsapplications.js

@@ -1,30 +1,20 @@
-import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
 import Head from "next/head";
-import Header from "../components/header";
+import { useRouter } from "next/router";
-import Banner from "../components/banner";
+import { connect } from "react-redux";
-import CookieBanner from "../components/cookieBanner";
+import { getBasicDNSSearch } from "../actions";
 import Breadcrumbs from "../components/breadcrumbs";
+import CookieBanner from "../components/cookieBanner";
 import DNSSearchResults from "../components/dnssearchresults";
 import Footer from "../components/footer";
-import Errorpage from "../components/errorpage";
+import Header from "../components/header";
-import styles from "../styles/Home.module.css";
-import { useSelector, shallowEqual, connect } from "react-redux";
-import { wrapper } from "../store/store";
-
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
-import data from "../data/collections.json";
-
 import { getSearchDetails } from "../components/utils";
-
+import { setSearch } from "../store/search/action";
-import { setSearch, getSearchObj } from "../store/search/action";
 import {
-    setSearchResults,
     setSearchDetails,
-    getSearchResultsObj,
+    setSearchResults,
 } from "../store/searchOutput/action";
-import { getBasicDNSSearch, getBasicSearchDetails } from "../actions";
+import { wrapper } from "../store/store";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;

pages/dnsdetails.js

@@ -1,19 +1,12 @@
-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 CaseSummary from "../components/case";
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
+import Head from "next/head";
+import { useRouter } from "next/router";
+import { connect } from "react-redux";
+import Breadcrumbs from "../components/breadcrumbs";
 import Case from "../components/case";
+import CookieBanner from "../components/cookieBanner";
+import Footer from "../components/footer";
+import Header from "../components/header";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;

pages/index.js

@@ -1,35 +1,24 @@
 import _ from "lodash";
-import { useState, useEffect, useRef } from "react";
-import Head from "next/head";
-import Header from "../components/header";
-import ServiceBanner from "../components/servicebanner";
-import CookieBanner from "../components/cookieBanner";
-import Breadcrumbs from "../components/breadcrumbs";
-import Main from "../components/main";
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import { getIncidents, hashString } from "../actions";
+import Head from "next/head";
-import CryptoJS from "crypto-js";
+import { useRouter } from "next/router";
-import HmacSHA256 from "crypto-js/hmac-sha256";
+import { setCookie } from "nookies";
-
+import { connect } from "react-redux";
+import { getToken, hashString } from "../actions";
 import {
-    getProviderConfig,
     getGGToken,
-    getUserInfo,
     getPortalLogin,
+    getProviderConfig,
+    getUserInfo,
 } from "../actions/govgateway";
-import { getToken } from "../actions";
+import CookieBanner from "../components/cookieBanner";
+import Footer from "../components/footer";
+import Header from "../components/header";
+import Main from "../components/main";
+import ServiceBanner from "../components/servicebanner";
+import { setAccountDetails } from "../store/accountDetails/action";
 import { getGovGatewayConfig } from "../store/govgateway/action";
-import {
+import { wrapper } from "../store/store";
-    setLoggedInUserId,
-    setAccountDetails,
-} from "../store/accountDetails/action";
-import { parseCookies, setCookie, destroyCookie } from "nookies";
 
 const Home = (props) => {
     const {

pages/logout.js

@@ -1,16 +1,13 @@
-import _ from "lodash";
-import Link from "next/link";
-import Head from "next/head";
-import Header from "../components/header";
-import Banner from "../components/banner";
-import CookieBanner from "../components/cookieBanner";
-
-import Footer from "../components/footer";
-import { useSelector, shallowEqual, connect } from "react-redux";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import { setLogout } from "../store/accountDetails/action";
+import Head from "next/head";
+import Link from "next/link";
+import { useRouter } from "next/router";
 import { useEffect } from "react";
+import { connect } from "react-redux";
+import CookieBanner from "../components/cookieBanner";
+import Footer from "../components/footer";
+import Header from "../components/header";
+import { setLogout } from "../store/accountDetails/action";
 
 const LogOut = (props) => {
     const { footerLinks, pages, setLogout } = props;

pages/myportal/advancedsearch.js

@@ -1,36 +1,18 @@
 import _ from "lodash";
-import { useState } from "react";
-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 Search from "../../components/search";
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
+import Head from "next/head";
+import { useRouter } from "next/router";
+import { connect } from "react-redux";
+import { getAppealsTypes, getLPA } from "../../actions";
+import Breadcrumbs from "../../components/breadcrumbs";
+import CookieBanner from "../../components/cookieBanner";
 import CRMError from "../../components/crmError";
-
+import Footer from "../../components/footer";
-import {
+import Header from "../../components/header";
-    setAppealType,
+import Search from "../../components/search";
-    setAppealTypeTitle,
+import { setAppealType } from "../../store/appealType/action";
-    setAppealTypeID,
-    setAppealLPA,
-    getAppealTypeObj,
-} from "../../store/appealType/action";
-import {
-    getAppealsTypes,
-    getLPA,
-    updateCase,
-    createCase,
-    getToken,
-} from "../../actions";
 import { setLPA } from "../../store/lpa/action";
+import { wrapper } from "../../store/store";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -40,7 +22,6 @@ 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")

pages/myportal/advancedsearchresults.js

@@ -1,31 +1,33 @@
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import Head from "next/head";
-import data from "../../data/collections.json";
+import { useRouter } from "next/router";
-
+import { connect } from "react-redux";
-import { getSearchDetails } from "../../components/utils";
+import {
-import { setSearch, getSearchObj } from "../../store/search/action";
+    getAdvancedSearch,
+    getPortalModuleDetails,
+    getWatchedCases,
+} from "../../actions";
+import Breadcrumbs from "../../components/breadcrumbs";
+import CookieBanner from "../../components/cookieBanner";
+import Footer from "../../components/footer";
+import Header from "../../components/header";
+import SearchResults from "../../components/searchresults";
+import {
+    getFormCollectionByID,
+    getSearchDetails,
+} from "../../components/utils";
 import {
-    setSearchResults,
     setSearchDetails,
+    setSearchResults,
 } from "../../store/searchOutput/action";
-import { getAdvancedSearch, getToken } from "../../actions";
+import { wrapper } from "../../store/store";
+import {
+    setWatchedCases,
+    setWatchedCasesDetails,
+} from "../../store/watchedCases/action";
 
 const Home = (props) => {
-    const { footerLinks, pages } = props;
+    const { footerLinks, pages, watchedCases } = props;
     let { t, lang } = useTranslation();
 
     const router = useRouter();
@@ -48,6 +50,8 @@ const Home = (props) => {
                         searchString={props.search.searchString}
                         searchResultsObj={props.searchResultsObj}
                         advancedSearch={true}
+                        watchedCases={watchedCases}
+                        myportal={true}
                     />
                 </div>
                 <Footer footerLinks={footerLinks} />
@@ -61,18 +65,58 @@ export const getServerSideProps = wrapper.getServerSideProps(
         async ({ query, req, res }) => {
             console.log("query-", query);
             //console.log("search array:", Object.entries(query));
+            const { cookies } = req;
 
-            const searchResultsObj = await getAdvancedSearch(query);
+            let loggedInUser = cookies.pinsUser;
-            const searchDetailsObj = await getSearchDetails(
+
-                token,
+            const [searchResultsObj, watchedCases] = await Promise.all([
-                searchResultsObj
+                await getAdvancedSearch(query),
-            );
+                await getWatchedCases(loggedInUser),
+            ]);
+
+            const [searchDetailsObj, watchedCasesDetails] = await Promise.all([
+                await getSearchDetails(searchResultsObj),
+                await getDetails(watchedCases, "myWatchedCases"),
+            ]);
 
             store.dispatch(setSearchResults(searchResultsObj));
             store.dispatch(setSearchDetails(searchDetailsObj));
+            store.dispatch(setWatchedCases(watchedCases));
+            store.dispatch(setWatchedCasesDetails(watchedCasesDetails));
         }
 );
 
+const getDetails = (resultsObj, detailsType) => {
+    //console.log(resultsObj);
+    let detailsArr = [];
+    resultsObj = resultsObj.value;
+    const detailsObj = resultsObj.map((searchDetail, index) => {
+        if (searchDetail.pinswg_appealcasetype == null) {
+            console.log(
+                detailsType != "myWatchedCases"
+                    ? searchDetail.ticketnumber
+                    : searchDetail[
+                          "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
+                      ]
+            );
+        } else {
+            detailsArr.push(
+                getPortalModuleDetails(
+                    getFormCollectionByID(searchDetail.pinswg_appealcasetype)
+                        .LogicalCollectionName,
+                    detailsType != "myWatchedCases"
+                        ? searchDetail.ticketnumber
+                        : searchDetail[
+                              "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
+                          ]
+                )
+            );
+        }
+    });
+    //console.log(detailsArr);
+    return Promise.all(detailsArr);
+};
+
 const mapStateToProps = (state) => {
     return {
         currentView: state.currentView,

pages/myportal/case.js

@@ -1,19 +1,12 @@
-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 CaseSummary from "../../components/case";
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
+import Head from "next/head";
+import { useRouter } from "next/router";
+import { connect } from "react-redux";
+import Breadcrumbs from "../../components/breadcrumbs";
 import Case from "../../components/case";
+import CookieBanner from "../../components/cookieBanner";
+import Footer from "../../components/footer";
+import Header from "../../components/header";
 
 const Home = (props) => {
     const { footerLinks, pages, showRepresentations } = props;

pages/myportal/error.js

@@ -1,10 +1,9 @@
-import Link from "next/link";
-import Head from "next/head";
-import Header from "../../components/header";
-import Banner from "../../components/banner";
-import CookieBanner from "../../components/cookieBanner";
 import useTranslation from "next-translate/useTranslation";
+import Head from "next/head";
+import Link from "next/link";
+import CookieBanner from "../../components/cookieBanner";
 import Footer from "../../components/footer";
+import Header from "../../components/header";
 
 function Error({ statusCode }, props) {
     let { t, lang } = useTranslation();

pages/myportal/index.js

@@ -1,57 +1,39 @@
 import _ from "lodash";
-
-import jsonpath from "jsonpath";
-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 MyPortal from "../../components/myportal";
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import data from "../../data/collections.json";
+import Head from "next/head";
-import nookies from "nookies";
+import { useRouter } from "next/router";
+import { connect } from "react-redux";
+import {
+    getAwaitingSubmission,
+    getMyCases,
+    getMyRepresentations,
+    getPersonalAccount,
+    getPortalModuleDetails,
+    getWatchedCases,
+} from "../../actions";
+import { getProviderConfig } from "../../actions/govgateway";
+import Breadcrumbs from "../../components/breadcrumbs";
+import CookieBanner from "../../components/cookieBanner";
+import Footer from "../../components/footer";
+import Header from "../../components/header";
+import MyPortal from "../../components/myportal";
 import { getFormCollectionByID } from "../../components/utils";
 import {
-    setLoggedInUserId,
     setAccountDetails,
+    setLoggedInUserId,
 } from "../../store/accountDetails/action";
+import { setAwaitingSubmission } from "../../store/awaitingSubmission/action";
+import { getGovGatewayConfig } from "../../store/govgateway/action";
 import { setMyCases, setMyCasesDetails } from "../../store/myCases/action";
 import {
     setMyRepresentations,
     setMyRepresentationsDetails,
 } from "../../store/myRepresentations/action";
+import { wrapper } from "../../store/store";
 import {
     setWatchedCases,
     setWatchedCasesDetails,
 } from "../../store/watchedCases/action";
-import {
-    setAwaitingSubmission,
-    setAwaitingSubmissionDetails,
-} from "../../store/awaitingSubmission/action";
-import { getGovGatewayConfig } from "../../store/govgateway/action";
-
-import {
-    getToken,
-    getPersonalAccount,
-    getMyCases,
-    getMyRepresentations,
-    getWatchedCases,
-    getAwaitingSubmission,
-    getPortalModuleDetails,
-} from "../../actions";
-
-import {
-    getProviderConfig,
-    getGGToken,
-    getUserInfo,
-    getPortalLogin,
-} from "../../actions/govgateway";
 
 const Home = (props) => {
     const {
@@ -161,12 +143,10 @@ const Home = (props) => {
 export const getServerSideProps = wrapper.getServerSideProps(
     (store) => async (ctx) => {
         const { query, req, res } = ctx;
-        console.log("the query", query);
+        console.log("The query", query);
 
         const { cookies } = req;
 
-        // console.log("the cookoies", cookies);
-
         let loggedInUser = cookies.pinsUser;
 
         let providerConfig = await getProviderConfig();
@@ -256,7 +236,6 @@ const getDetails = (resultsObj, detailsType) => {
         } else {
             detailsArr.push(
                 getPortalModuleDetails(
-                    token,
                     getFormCollectionByID(searchDetail.pinswg_appealcasetype)
                         .LogicalCollectionName,
                     detailsType != "myWatchedCases"

pages/myportal/representation.js

@@ -1,18 +1,11 @@
-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 CaseSummary from "../../components/case";
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
+import Head from "next/head";
+import { useRouter } from "next/router";
+import { connect } from "react-redux";
+import Breadcrumbs from "../../components/breadcrumbs";
+import CookieBanner from "../../components/cookieBanner";
+import Footer from "../../components/footer";
+import Header from "../../components/header";
 import Case from "../../components/representation";
 
 const Home = (props) => {

pages/myportal/searchresults.js

@@ -1,46 +1,31 @@
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import Head from "next/head";
-import data from "../../data/collections.json";
+import { useRouter } from "next/router";
-
+import { connect } from "react-redux";
+import {
+    getBasicSearch,
+    getPortalModuleDetails,
+    getWatchedCases,
+} from "../../actions";
+import Breadcrumbs from "../../components/breadcrumbs";
+import CookieBanner from "../../components/cookieBanner";
+import Footer from "../../components/footer";
+import Header from "../../components/header";
+import SearchResults from "../../components/searchresults";
 import {
-    getSearchDetails,
     getFormCollectionByID,
+    getSearchDetails,
 } from "../../components/utils";
-import { setSearch, getSearchObj } from "../../store/search/action";
+import { setSearch } from "../../store/search/action";
 import {
-    setSearchResults,
     setSearchDetails,
-    setDocumentDetails,
+    setSearchResults,
-    setDocumentHistory,
-    getSearchResultsObj,
 } from "../../store/searchOutput/action";
+import { wrapper } from "../../store/store";
 import {
     setWatchedCases,
     setWatchedCasesDetails,
 } from "../../store/watchedCases/action";
-import {
-    getBasicSearch,
-    getBasicSearchDetails,
-    getSearchDocumentDetails,
-    getSearchDocumentHistory,
-    getWatchedCases,
-    getPortalModuleDetails,
-    getToken,
-} from "../../actions";
 
 const Home = (props) => {
     const { footerLinks, pages, watchedCases } = props;
@@ -65,7 +50,7 @@ const Home = (props) => {
                     <SearchResults
                         searchString={props.search.searchString}
                         searchResultsObj={props.searchResultsObj}
-                        myportal="true"
+                        myportal={true}
                         watchedCases={watchedCases}
                     />
                 </div>
@@ -129,7 +114,6 @@ const getDetails = (resultsObj, detailsType) => {
         } else {
             detailsArr.push(
                 getPortalModuleDetails(
-                    token,
                     getFormCollectionByID(searchDetail.pinswg_appealcasetype)
                         .LogicalCollectionName,
                     detailsType != "myWatchedCases"

pages/myportal/viewall.js

@@ -1,25 +1,12 @@
-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 ViewAll from "../../components/myportal/viewall";
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-
+import Head from "next/head";
-import { setSearch, getSearchObj } from "../../store/search/action";
+import { useRouter } from "next/router";
-import {
+import { connect } from "react-redux";
-    setSearchResults,
+import Breadcrumbs from "../../components/breadcrumbs";
-    getSearchResultsObj,
+import CookieBanner from "../../components/cookieBanner";
-} from "../../store/searchOutput/action";
+import Footer from "../../components/footer";
-import { getBasicSearch } from "../../actions";
+import Header from "../../components/header";
+import ViewAll from "../../components/myportal/viewall";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -52,7 +39,7 @@ const Home = (props) => {
                         watchedCases={props.watchedCases}
                         myRepresentations={props.myRepresentations}
                         awaitingSubmission={props.awaitingSubmission}
-                        myportal="true"
+                        myportal={true}
                     />
                 </div>
                 <Footer footerLinks={footerLinks} />

pages/newappeal/[appealtypes].js

@@ -1,49 +1,24 @@
-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 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 { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
 import jsonpath from "jsonpath";
+import useTranslation from "next-translate/useTranslation";
+import Head from "next/head";
+import { useRouter } from "next/router";
 import { useEffect } from "react";
-import {
+import { connect } from "react-redux";
-    setLoggedInUserId,
-    setAccountDetails,
-} from "../../store/accountDetails/action";
-import {
-    setAppealType,
-    setAppealTypeTitle,
-    setAppealTypeID,
-    getAppealTypeObj,
-    setAppealLPA,
-    setCaseReference,
-} from "../../store/appealType/action";
-import { setForm, getFormObj } from "../../store/formData/action";
-import {
-    getToken,
-    getFormData,
-    getAppealsTypes,
-    getMandatoryFields,
-    createCase,
-    getPickLists,
-    updateCase,
-} from "../../actions";
-
 import xpath from "xpath";
-import { reduxForm, FormName } from "redux-form";
+import {
-
+    createCase,
-import BuildSection from "../../components/newappeal/buildsection";
+    getAppealsTypes,
+    getFormData,
+    getMandatoryFields,
+    getPickLists,
+} from "../../actions";
+import Breadcrumbs from "../../components/breadcrumbs";
+import CookieBanner from "../../components/cookieBanner";
+import Footer from "../../components/footer";
+import Header from "../../components/header";
 import BuildCheckSection from "../../components/newappeal/buildchecksection";
+import BuildSection from "../../components/newappeal/buildsection";
 import CompleteAppeal from "../../components/newappeal/complete";
-
 import AdvertsForm from "../../data/forms/adverts";
 import Callinss77Form from "../../data/forms/callinss77";
 import CommonLandForm from "../../data/forms/commonland";
@@ -69,6 +44,16 @@ import PlanningObligationAppeals106Form from "../../data/forms/planningobligatio
 import RowForm from "../../data/forms/row";
 import TransportAndWorkActForm from "../../data/forms/transportandworkact";
 import WayleaveForm from "../../data/forms/wayleave";
+import { setLoggedInUserId } from "../../store/accountDetails/action";
+import {
+    setAppealLPA,
+    setAppealType,
+    setAppealTypeID,
+    setAppealTypeTitle,
+    setCaseReference,
+} from "../../store/appealType/action";
+import { setForm } from "../../store/formData/action";
+import { wrapper } from "../../store/store";
 
 let Home = (props) => {
     const { footerLinks, pages, formData } = props;

pages/newappeal/index.js

@@ -1,42 +1,17 @@
-import Link from "next/link";
-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 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 { useRouter } from "next/router";
-import { useEffect, useState } from "react";
 import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import Head from "next/head";
-import { reduxForm, formValueSelector } from "redux-form";
+import { useRouter } from "next/router";
-
+import { connect } from "react-redux";
+import { getAppealsTypes, getLPA } from "../../actions";
+import Breadcrumbs from "../../components/breadcrumbs";
+import CookieBanner from "../../components/cookieBanner";
+import Footer from "../../components/footer";
+import Header from "../../components/header";
 import CreateCase from "../../components/newappeal/createCase";
-import xpath from "xpath";
+import { setLoggedInUserId } from "../../store/accountDetails/action";
-import {
+import { setAppealType } from "../../store/appealType/action";
-    setLoggedInUserId,
-    setAccountDetails,
-} from "../../store/accountDetails/action";
-import {
-    setAppealType,
-    setAppealTypeTitle,
-    setAppealTypeID,
-    setAppealLPA,
-    getAppealTypeObj,
-} from "../../store/appealType/action";
-import {
-    getAppealsTypes,
-    getLPA,
-    updateCase,
-    createCase,
-    getToken,
-} from "../../actions";
 import { setLPA } from "../../store/lpa/action";
+import { wrapper } from "../../store/store";
 
 const Home = (props) => {
     const { footerLinks, pages, formData } = props;

pages/newappeal/planningappeal.js

@@ -1,18 +1,10 @@
-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 NewAppeal from "../../components/newappeal";
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
+import Head from "next/head";
+import { useRouter } from "next/router";
+import CookieBanner from "../../components/cookieBanner";
+import Footer from "../../components/footer";
+import Header from "../../components/header";
+import NewAppeal from "../../components/newappeal";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;

pages/newappeal/selectappeal.js

@@ -1,27 +1,19 @@
-import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
 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 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 { useRouter } from "next/router";
 import { useState } from "react";
-import useTranslation from "next-translate/useTranslation";
+import { connect } from "react-redux";
-
+import { getAppealsTypes } from "../../actions";
+import Breadcrumbs from "../../components/breadcrumbs";
+import CookieBanner from "../../components/cookieBanner";
+import Footer from "../../components/footer";
+import Header from "../../components/header";
 import {
     setAppealType,
-    setAppealTypeTitle,
     setAppealTypeID,
-    getAppealTypeObj,
+    setAppealTypeTitle,
 } from "../../store/appealType/action";
-import { getAppealsTypes } from "../../actions";
+import { wrapper } from "../../store/store";
-import xpath from "xpath";
 
 const Home = (props) => {
     const { footerLinks, pages, formData } = props;

pages/privacy.js

@@ -1,21 +1,12 @@
-import _ from "lodash";
-import { useState, useEffect, useRef } from "react";
-import Head from "next/head";
-import Header from "../components/header";
-import ServiceBanner from "../components/servicebanner";
-import CookieBanner from "../components/cookieBanner";
-import Breadcrumbs from "../components/breadcrumbs";
-import Main from "../components/main";
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import { getIncidents } from "../actions";
+import Head from "next/head";
-import { parseCookies } from "nookies";
+import { useRouter } from "next/router";
+import Breadcrumbs from "../components/breadcrumbs";
+import CookieBanner from "../components/cookieBanner";
+import Footer from "../components/footer";
+import Header from "../components/header";
 import PrivacyStatement from "../components/privacy";
+import ServiceBanner from "../components/servicebanner";
 
 const Privacy = (props) => {
     const { footerLinks, pages, showLogin } = props;

pages/searchresults.js

@@ -1,28 +1,20 @@
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import Head from "next/head";
-import data from "../data/collections.json";
+import { useRouter } from "next/router";
-
+import { connect } from "react-redux";
-import { setSearch, getSearchObj } from "../store/search/action";
+import { getBasicSearch } from "../actions";
-import {
+import Breadcrumbs from "../components/breadcrumbs";
-    setSearchResults,
+import CookieBanner from "../components/cookieBanner";
-    setSearchDetails,
+import Footer from "../components/footer";
-    getSearchResultsObj,
+import Header from "../components/header";
-} from "../store/searchOutput/action";
+import SearchResults from "../components/searchresults";
-import { getBasicSearch, getBasicSearchDetails, getToken } from "../actions";
 import { getSearchDetails } from "../components/utils";
+import { setSearch } from "../store/search/action";
+import {
+    setSearchDetails,
+    setSearchResults,
+} from "../store/searchOutput/action";
+import { wrapper } from "../store/store";
 
 const Home = (props) => {
     const { footerLinks, pages, isLinkedCase } = props;

pages/terms-and-conditions.js

@@ -1,20 +1,11 @@
-import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
-import { useState, useEffect, useRef } from "react";
 import Head from "next/head";
+import { useRouter } from "next/router";
+import Breadcrumbs from "../components/breadcrumbs";
+import CookieBanner from "../components/cookieBanner";
+import Footer from "../components/footer";
 import Header from "../components/header";
 import ServiceBanner from "../components/servicebanner";
-import CookieBanner from "../components/cookieBanner";
-import Breadcrumbs from "../components/breadcrumbs";
-import Main from "../components/main";
-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 { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import { getIncidents } from "../actions";
-import { parseCookies } from "nookies";
 import TermsAndConditionsStatement from "../components/tandc";
 
 const TandC = (props) => {

pages/viewall.js

@@ -1,25 +1,16 @@
-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 ViewAll from "../components/viewall";
-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 { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-
+import Head from "next/head";
-import { setSearch, getSearchObj } from "../store/search/action";
+import { useRouter } from "next/router";
-import {
+import { connect } from "react-redux";
-    setSearchResults,
-    getSearchResultsObj,
-} from "../store/searchOutput/action";
 import { getBasicSearch } from "../actions";
+import Breadcrumbs from "../components/breadcrumbs";
+import CookieBanner from "../components/cookieBanner";
+import Footer from "../components/footer";
+import Header from "../components/header";
+import ViewAll from "../components/viewall";
+import { setSearch } from "../store/search/action";
+import { setSearchResults } from "../store/searchOutput/action";
+import { wrapper } from "../store/store";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;