From fc1f63f3886d7131ffc575cbcd5c36a849270be2 Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Wed, 13 Aug 2025 09:58:39 +0100
Subject: [PATCH] updated weatched case for tickent number

---
 actions/index.js                              | 16 +++++-----
 components/myportal/topthree_reps.js          |  2 +-
 components/myportal/viewall.js                |  5 +++-
 .../api/endpoint/getwatchedcasesproxy_api.js  | 29 ++++++++++++++++++-
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/actions/index.js b/actions/index.js
index 335b7064..fdb2cc05 100644
--- a/actions/index.js
+++ b/actions/index.js
@@ -1431,7 +1431,7 @@ export const deleteMyRepresentationsFromBlob = (
         });
 };
 
-export const deleteWatchedCases = (watchedCaseID) => {
+export const deleteWatchedCases = async (watchedCaseID) => {
     var queryUrl =
         "/api/endpoint/deletewatchedcases_api?watchedCaseID=" + watchedCaseID;
     var config = {
@@ -1439,14 +1439,12 @@ export const deleteWatchedCases = (watchedCaseID) => {
         url: queryUrl,
     };
 
-    return axios(config)
-        .then((res) => {
-            //console.log("deleted ", res.data);
-            return res.data;
-        })
-        .catch((error) => {
-            consoleLogger(error);
-        });
+    try {
+        const res = await axios(config);
+        return res.data;
+    } catch (error) {
+        consoleLogger(error);
+    }
 };
 
 export const createAccount = (formValues) => {
diff --git a/components/myportal/topthree_reps.js b/components/myportal/topthree_reps.js
index 39ee1c83..5191c2aa 100644
--- a/components/myportal/topthree_reps.js
+++ b/components/myportal/topthree_reps.js
@@ -253,7 +253,7 @@ const TopThree = (props) => {
                                                 props.accountDetails
                                                     .containerID,
                                                 showTopThreeArr[key]
-                                                    .pinswg_name,
+                                                    .ticketnumber,
                                                 showTopThreeArr[key]
                                                     .repfile_name
                                             );
diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js
index f671884c..b7d26987 100644
--- a/components/myportal/viewall.js
+++ b/components/myportal/viewall.js
@@ -878,7 +878,10 @@ const ViewAllResults = (props) => {
             deleteWatchedCases(caseID)
                 .then((data) => data)
                 .then(() => {
-                    getWatchedCasesProxy(cookies.pinsUser).then((data) => {
+                    console.log("in heree");
+                    getWatchedCasesProxy(
+                        props.accountDetails.loggedinUserId
+                    ).then((data) => {
                         setWatchedCases(data),
                             getDetailsProxy(data, "myWatchedCases")
                                 .then((data) => {
diff --git a/pages/api/endpoint/getwatchedcasesproxy_api.js b/pages/api/endpoint/getwatchedcasesproxy_api.js
index 2c3f884f..e8adcf60 100644
--- a/pages/api/endpoint/getwatchedcasesproxy_api.js
+++ b/pages/api/endpoint/getwatchedcasesproxy_api.js
@@ -43,7 +43,7 @@ export default async function ApiProxy(req, res) {
     var queryUrl =
         "pinswg_watchlists?$filter= _pinswg_contact_value eq " +
         loggedInUserId +
-        "&$select=modifiedon,pinswg_appealcasetype,pinswg_watchlistid,_pinswg_watchedcase_value,statuscode&$count=true&$orderby=createdon desc&$expand=pinswg_WatchedCase($select=pinswg_AssociatedLPA)";
+        "&$select=modifiedon,pinswg_appealcasetype,pinswg_watchlistid,_pinswg_watchedcase_value,statuscode,pinswg_representationsubmitted,pinswg_representationtype&$count=true&$orderby=createdon desc&$expand=pinswg_WatchedCase($select=pinswg_AssociatedLPA)";
 
     return axios
         .get(
@@ -51,6 +51,33 @@ export default async function ApiProxy(req, res) {
             azureHeaders(token.access_token)
         )
         .then(({ data }) => {
+            data.value.forEach(function (element) {
+                element.ticketnumber = element.pinswg_WatchedCase.ticketnumber;
+                element.pinswg_title =
+                    element[
+                        "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
+                    ];
+
+                element[
+                    "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
+                ] =
+                    element.pinswg_WatchedCase[
+                        "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
+                    ];
+                element._pinswg_associatedlpa_value =
+                    element.pinswg_WatchedCase._pinswg_associatedlpa_value;
+                element[
+                    "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                ] =
+                    element.pinswg_WatchedCase[
+                        "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                    ];
+                element._ownerid_value =
+                    element.pinswg_WatchedCase._ownerid_value;
+
+                delete element.pinswg_WatchedCase;
+            });
+
             res.status(200).json(data);
         })
         .catch((error) => {