Removed proxy and added api calls, has gov gateway auth

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 data from "../../data/collections.json";
-
-import { getSearchDetails } from "../../components/utils";
-import { setSearch, getSearchObj } from "../../store/search/action";
+import Head from "next/head";
+import { useRouter } from "next/router";
+import { connect } from "react-redux";
+import {
+    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,21 +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;
 
-            let token = await getToken();
-            token = token.access_token;
+            let loggedInUser = cookies.pinsUser;
 
-            const searchResultsObj = await getAdvancedSearch(token, query);
-            const searchDetailsObj = await getSearchDetails(
-                token,
-                searchResultsObj
-            );
+            const [searchResultsObj, watchedCases] = await Promise.all([
+                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,