From 1f4f7f5ecd27faf727759d0bb29242a66f600c96 Mon Sep 17 00:00:00 2001
From: Nitzan Miranda <Nitzan.Miranda@bagirasys.com>
Date: Sun, 23 Jul 2023 20:07:53 +0300
Subject: [PATCH] use widget params in endpoint

---
 src/utils/proxy/api-helpers.js        |  2 +-
 src/widgets/azureDevOps/component.jsx | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/utils/proxy/api-helpers.js b/src/utils/proxy/api-helpers.js
index ca2721ec..be73a5b7 100644
--- a/src/utils/proxy/api-helpers.js
+++ b/src/utils/proxy/api-helpers.js
@@ -5,7 +5,7 @@ export function formatApiCall(url, args) {
     return args[key] || "";
   };
 
-  return url.replace(/\/+$/, "").replace(find, replace);
+  return url.replace(/\/+$/, "").replace(find, replace).replace(find,replace);
 }
 
 function getURLSearchParams(widget, endpoint) {
diff --git a/src/widgets/azureDevOps/component.jsx b/src/widgets/azureDevOps/component.jsx
index 79b478c0..ee393302 100644
--- a/src/widgets/azureDevOps/component.jsx
+++ b/src/widgets/azureDevOps/component.jsx
@@ -37,9 +37,7 @@ export default function Component({ service }) {
       </Container>
     );
   }
-  else if (azureType === "PullRequest") {
-
-
+  if (azureType === "PullRequest") {
     if (prError) {
       return <Container service={service} error={prError} />;
     }
@@ -60,16 +58,14 @@ export default function Component({ service }) {
         <Block
           label="azureDevOps.myPrs"
           value={t("common.number", {
-            value: prData.value.filter((item) => item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
+            value: prData.value?.filter((item) => item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
               .length,
           })}
         />
         <Block
           label="azureDevOps.approvedNotCompleted"
           value={t("common.number", {
-            value: prData.value
-              .filter((item) => item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
-              .filter((item) => item.reviewers.some((reviewer) => reviewer.vote === 10)).length,
+            value: prData.value?.filter((item) => item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase()).filter((item) => item.reviewers.some((reviewer) => reviewer.vote === 10)).length
           })}
         />
       </Container>