From 84d7341e2bd52302558efc37b70bfb99d5b9c584 Mon Sep 17 00:00:00 2001
From: Nitzan Miranda <Nizzan943@gmail.com>
Date: Fri, 21 Jul 2023 04:07:10 +0300
Subject: [PATCH] add creatorId

---
 src/widgets/azurePullrequests/component.jsx |  9 +++++----
 src/widgets/azurePullrequests/widget.js     | 19 +++++++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/widgets/azurePullrequests/component.jsx b/src/widgets/azurePullrequests/component.jsx
index bcc21dec..02babd90 100644
--- a/src/widgets/azurePullrequests/component.jsx
+++ b/src/widgets/azurePullrequests/component.jsx
@@ -10,9 +10,10 @@ export default function Component({ service }) {
   const { widget } = service;
 
   const { data: prData, error: prError } = useWidgetAPI(widget, "pr");
+  const { data: myPrData, error: myPrError } = useWidgetAPI(widget, "myPr");
 
-  if (prError) {
-    const finalError = prError ;
+  if (prError || myPrError) {
+    const finalError = prError ?? myPrError ;
     return <Container service={service} error={finalError} />;
   }
 
@@ -29,8 +30,8 @@ export default function Component({ service }) {
   return ( 
     <Container service={service}>
       <Block label="azurePullrequests.totalPrs" value={t("common.number", { value: prData.count })} />
-      <Block label="azurePullrequests.myPrs" value={t("common.number", { value: prData.value.filter(item => item.createdBy.uniqueName === service.widget.userEmail).length })} />
-      <Block label="azurePullrequests.approvedNotCompleted" value={t("common.number", { value: prData.value.filter(item => item.reviewers.some(reviewer => reviewer.vote === 10)).length })} />
+      <Block label="azurePullrequests.myPrs" value={t("common.number", { value: myPrData.count })} />
+      <Block label="azurePullrequests.approvedNotCompleted" value={t("common.number", { value: myPrData.value.filter(item => item.reviewers.some(reviewer => reviewer.vote === 10)).length })} />
     </Container>
   );
 }
diff --git a/src/widgets/azurePullrequests/widget.js b/src/widgets/azurePullrequests/widget.js
index a6459e95..205d2112 100644
--- a/src/widgets/azurePullrequests/widget.js
+++ b/src/widgets/azurePullrequests/widget.js
@@ -1,14 +1,25 @@
 import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
+import { asJson } from "utils/proxy/api-helpers";
 
 const widget = {
-  api: "https://dev.azure.com/{organization}/{project}/_apis/git/repositories/{repositoryId}/pullrequests",
+  api: "https://dev.azure.com/{organization}/{project}/_apis/git/repositories/{repositoryId}/pullrequests?{filter}",
   proxyHandler: credentialedProxyHandler,
 
-  active: {
+  mappings: {
     pr: {
-      endpoint: "pr",
-    }
+      filter: "",
+      map: (data) => ({
+        count: asJson(data).count,
+      }),
+    },
+    myPr: {
+      filter: "searchCriteria.creatorId={creatorId}&",
+      map: (data) => ({
+        count: asJson(data).count,
+      }),
+    },
   },
 };
 
+
 export default widget;