added watched cases and remove watched cases

pages/myportal/case.js

@@ -57,6 +57,9 @@ const Home = (props) => {
                             props.myRepresentations.myRepresentations
                         }
                         watchedCases={props.watchedCases.watchedCases}
+                        watchedCasesDetails={
+                            props.watchedCases.watchedCasesDetails
+                        }
                         awaitingSubmission={
                             props.awaitingSubmission.awaitingSubmission
                         }

pages/myportal/index.js

@@ -154,11 +154,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
 
         const token = await getSASToken();
 
-        console.log("does it have ", cookies.pinsUser);
         let loggedInUser = cookies.pinsUser;
 
-        console.log("qweqe ", loggedInUser);
-
         const [
             accountDetails,
             myCases,
@@ -174,30 +171,15 @@ export const getServerSideProps = wrapper.getServerSideProps(
         ]);
 
         //const cookiesMaker = nookies.get(ctx)
-
-        let now = new Date();
-        let expDate = new Date(now);
-        expDate.setDate(now.getDate() + 1);
-
-        console.log(
-            "Check: ",
-            cookies,
-            cookies.pinsUser,
-            loggedInUser,
-            nookies.get("pinsUser")
-        );
-
-        console.log(watchedCases);
-
         const [
             myCasesDetails,
             myRepresentationsDetails,
             watchedCasesDetails,
             // awaitingSubmissionDetails,
         ] = await Promise.all([
-            await getDetails(token, myCases),
-            await getDetails(token, myRepresentations),
-            await getDetails(token, watchedCases),
+            await getDetails(token, myCases, "myCases"),
+            await getDetails(token, myRepresentations, "myRepresentations"),
+            await getDetails(token, watchedCases, "myWatchedCases"),
             //  await getDetails(awaitingSubmission),
         ]);
 
@@ -216,20 +198,30 @@ export const getServerSideProps = wrapper.getServerSideProps(
     }
 );
 
-const getDetails = (token, resultsObj) => {
+const getDetails = (token, resultsObj, detailsType) => {
     //console.log(resultsObj);
     let detailsArr = [];
     resultsObj = resultsObj.value;
     const detailsObj = resultsObj.map((searchDetail, index) => {
         if (searchDetail.pinswg_appealcasetype == null) {
-            console.log(searchDetail.ticketnumber);
+            console.log(
+                detailsType != "myWatchedCases"
+                    ? searchDetail.ticketnumber
+                    : searchDetail[
+                          "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
+                      ]
+            );
         } else {
             detailsArr.push(
                 getPortalModuleDetails(
                     token,
                     getFormCollectionByID(searchDetail.pinswg_appealcasetype)
                         .LogicalCollectionName,
-                    searchDetail.ticketnumber
+                    detailsType != "myWatchedCases"
+                        ? searchDetail.ticketnumber
+                        : searchDetail[
+                              "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
+                          ]
                 )
             );
         }

pages/myportal/searchresults.js

@@ -16,7 +16,10 @@ import useTranslation from "next-translate/useTranslation";
 import jsonpath from "jsonpath";
 import data from "../../data/collections.json";
 
-import { getSearchDetails } from "../../components/utils";
+import {
+    getSearchDetails,
+    getFormCollectionByID,
+} from "../../components/utils";
 import { setSearch, getSearchObj } from "../../store/search/action";
 import {
     setSearchResults,
@@ -25,16 +28,22 @@ import {
     setDocumentHistory,
     getSearchResultsObj,
 } from "../../store/searchOutput/action";
+import {
+    setWatchedCases,
+    setWatchedCasesDetails,
+} from "../../store/watchedCases/action";
 import {
     getBasicSearch,
     getBasicSearchDetails,
     getSearchDocumentDetails,
     getSearchDocumentHistory,
+    getWatchedCases,
+    getPortalModuleDetails,
     getSASToken,
 } from "../../actions";
 
 const Home = (props) => {
-    const { footerLinks, pages } = props;
+    const { footerLinks, pages, watchedCases } = props;
     let { t, lang } = useTranslation();
 
     const router = useRouter();
@@ -57,6 +66,7 @@ const Home = (props) => {
                         searchString={props.search.searchString}
                         searchResultsObj={props.searchResultsObj}
                         myportal="true"
+                        watchedCases={watchedCases}
                     />
                 </div>
                 <Footer footerLinks={footerLinks} />
@@ -66,36 +76,77 @@ const Home = (props) => {
 };
 
 export const getServerSideProps = wrapper.getServerSideProps(
-    (store) =>
-        async ({ query, req, res }) => {
-            console.log("query-", query);
+    (store) => async (ctx) => {
+        const { query, req, res } = ctx;
+        console.log("query-", query);
 
-            const token = await getSASToken();
+        const { cookies } = req;
 
-            let searchResultsObj = await getBasicSearch(token, query.q);
+        const token = await getSASToken();
 
-            searchResultsObj =
-                searchResultsObj.status == 502
-                    ? {
-                          value: [],
-                          errorCode: searchResultsObj.status,
-                          errorMsg: searchResultsObj.statusText,
-                      }
-                    : searchResultsObj;
+        let loggedInUser = cookies.pinsUser;
 
-            //console.log("sssss", searchResultsObj);
+        let [searchResultsObj, watchedCases] = await Promise.all([
+            await getBasicSearch(token, query.q),
+            await getWatchedCases(token, loggedInUser),
+        ]);
 
-            const searchDetailsObj = await getSearchDetails(
-                token,
-                searchResultsObj
-            );
+        searchResultsObj =
+            searchResultsObj.status == 502
+                ? {
+                      value: [],
+                      errorCode: searchResultsObj.status,
+                      errorMsg: searchResultsObj.statusText,
+                  }
+                : searchResultsObj;
 
-            store.dispatch(setSearchResults(searchResultsObj));
-            store.dispatch(setSearchDetails(searchDetailsObj));
-            store.dispatch(setSearch(query.q));
-        }
+        //console.log("sssss", searchResultsObj);
+
+        const [searchDetailsObj, watchedCasesDetails] = await Promise.all([
+            await getSearchDetails(token, searchResultsObj),
+            await getDetails(token, watchedCases, "myWatchedCases"),
+        ]);
+
+        store.dispatch(setSearchResults(searchResultsObj));
+        store.dispatch(setSearchDetails(searchDetailsObj));
+        store.dispatch(setSearch(query.q));
+        store.dispatch(setWatchedCases(watchedCases));
+        store.dispatch(setWatchedCasesDetails(watchedCasesDetails));
+    }
 );
 
+const getDetails = (token, 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(
+                    token,
+                    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/viewall.js

@@ -52,6 +52,7 @@ const Home = (props) => {
                         watchedCases={props.watchedCases}
                         myRepresentations={props.myRepresentations}
                         awaitingSubmission={props.awaitingSubmission}
+                        myportal="true"
                     />
                 </div>
                 <Footer footerLinks={footerLinks} />