diff --git a/actions/services/documentDirectService.js b/actions/services/documentDirectService.js index d0afabb8..4934576a 100644 --- a/actions/services/documentDirectService.js +++ b/actions/services/documentDirectService.js @@ -92,11 +92,13 @@ export const deleteAwaitingSubmissionsFromBlob = ( "&casefolderID=" + casefolderID; - var config = { - method: "get", - url: queryUrl + hashAPIPath(queryUrl) - }; - return axios(config) + return buildHashedQueryUrl(queryUrl) + .then((signedUrl) => + axios({ + method: "get", + url: signedUrl + }) + ) .then((res) => { return res.data; }) @@ -118,11 +120,13 @@ export const deleteMyRepresentationsFromBlob = ( "&repfile=" + repfile; - var config = { - method: "get", - url: queryUrl + hashAPIPath(queryUrl) - }; - return axios(config) + return buildHashedQueryUrl(queryUrl) + .then((signedUrl) => + axios({ + method: "get", + url: signedUrl + }) + ) .then((res) => { return res.data; }) diff --git a/actions/services/portalDirectService.js b/actions/services/portalDirectService.js index 9bf17190..1e112810 100644 --- a/actions/services/portalDirectService.js +++ b/actions/services/portalDirectService.js @@ -182,19 +182,21 @@ export const deleteMyRepresentations = (myRepresentationsID) => { "/api/endpoint/deletemyrepresentations_api?myRepresentationsID=" + myRepresentationsID; - var config = { - method: "delete", - url: queryUrl + hashAPIPath(queryUrl), - headers: { - "OData-MaxVersion": "4.0", - "OData-Version": "4.0", - "Accept": "application/json;odata.metadata=none", - "Prefer": 'odata.include-annotations="*",return=representation', - "Content-Type": "application/json" - } - }; - - return axios(config) + return buildHashedQueryUrl(queryUrl) + .then((signedUrl) => + axios({ + method: "delete", + url: signedUrl, + headers: { + "OData-MaxVersion": "4.0", + "OData-Version": "4.0", + "Accept": "application/json;odata.metadata=none", + "Prefer": + 'odata.include-annotations="*",return=representation', + "Content-Type": "application/json" + } + }) + ) .then((res) => { return res.data; }) @@ -224,17 +226,20 @@ export const deleteAwaitingSubmissions = (incidentID) => { export const deleteWatchedCases = async (watchedCaseID) => { var queryUrl = "/api/endpoint/deletewatchedcases_api?watchedCaseID=" + watchedCaseID; - var config = { - method: "delete", - url: queryUrl - }; - try { - const res = await axios(config); - return res.data; - } catch (error) { - consoleLogger(error); - } + return buildHashedQueryUrl(queryUrl) + .then((signedUrl) => + axios({ + method: "delete", + url: signedUrl + }) + ) + .then((res) => { + return res.data; + }) + .catch((error) => { + consoleLogger(error); + }); }; export const sendCaseCompleteMessage = async ( diff --git a/components/myportal/topthree_reps.js b/components/myportal/topthree_reps.js index ea1a2169..0a52ac96 100644 --- a/components/myportal/topthree_reps.js +++ b/components/myportal/topthree_reps.js @@ -273,8 +273,7 @@ const TopThree = (props) => { deleteRepItem( props.accountDetails .containerID, - showTopThreeArr[key] - .ticketnumber, + showTopThreeArr[key].caseRef, showTopThreeArr[key] .repfile_name ); diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js index 1885c7ea..6532be5a 100644 --- a/components/myportal/viewall.js +++ b/components/myportal/viewall.js @@ -686,7 +686,7 @@ const ViewAllResults = (props) => { ] || "N/A"} {isAwaitingSubmissionDetails && ( -
+
)} {isMyRepresentations && ( -
+
{item.pinswg_emailnotifications === true ? (