From dad800974bef7cc09179725a9b15d54cb3161bc2 Mon Sep 17 00:00:00 2001
From: Nitzan Miranda <Nizzan943@gmail.com>
Date: Fri, 21 Jul 2023 19:22:52 +0300
Subject: [PATCH] pass creatorId to FE

---
 src/utils/config/service-helpers.js         |  5 +++++
 src/widgets/azurePullrequests/component.jsx | 13 +++++------
 src/widgets/azurePullrequests/widget.js     | 24 ++++++---------------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index e99582b2..e59c4941 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -278,6 +278,7 @@ export function cleanServiceGroups(groups) {
           server, // docker widget
           container,
           currency, // coinmarketcap widget
+          creatorId, // azurePullRequests
           symbols,
           slugs,
           defaultinterval,
@@ -310,6 +311,10 @@ export function cleanServiceGroups(groups) {
           service_group: serviceGroup.name,
         };
 
+        if (type === "azurePullRequests") {
+          if (creatorId) cleanedService.widget.creatorId = creatorId;
+        }
+
         if (type === "coinmarketcap") {
           if (currency) cleanedService.widget.currency = currency;
           if (symbols) cleanedService.widget.symbols = symbols;
diff --git a/src/widgets/azurePullrequests/component.jsx b/src/widgets/azurePullrequests/component.jsx
index f17e37df..4f8277df 100644
--- a/src/widgets/azurePullrequests/component.jsx
+++ b/src/widgets/azurePullrequests/component.jsx
@@ -9,11 +9,12 @@ export default function Component({ service }) {
 
   const { widget } = service;
 
-  const { data: prData, error: prError } = useWidgetAPI(widget, "pr");
-  const { data: myPrData, error: myPrError } = useWidgetAPI(widget, "myPr");
+  const { data: prData, error: prError } = useWidgetAPI(widget);
 
-  if (prError || myPrError) {
-    const finalError = prError ?? myPrError ;
+  const { creatorId } = widget;
+
+  if (prError) {
+    const finalError = prError ;
     return <Container service={service} error={finalError} />;
   }
 
@@ -30,8 +31,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: myPrData.count })} />
-      <Block label="azurePullRequests.approvedNotCompleted" value={t("common.number", { value: myPrData.value.filter(item => item.reviewers.some(reviewer => reviewer.vote === 10)).length })} />
+      <Block label="azurePullRequests.myPrs" value={t("common.number", { value: prData.value.filter(item => item.creatorId===creatorId).length })} />
+      <Block label="azurePullRequests.approvedNotCompleted" value={t("common.number", { value: prData.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 205d2112..461f61cb 100644
--- a/src/widgets/azurePullrequests/widget.js
+++ b/src/widgets/azurePullrequests/widget.js
@@ -1,25 +1,15 @@
 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?{filter}",
+  api: "https://dev.azure.com/{organization}/{project}/_apis/git/repositories/{repositoryId}/pullrequests",
   proxyHandler: credentialedProxyHandler,
-
-  mappings: {
-    pr: {
-      filter: "",
-      map: (data) => ({
-        count: asJson(data).count,
-      }),
-    },
-    myPr: {
-      filter: "searchCriteria.creatorId={creatorId}&",
-      map: (data) => ({
-        count: asJson(data).count,
-      }),
-    },
-  },
 };
 
+// mappings: {
+//   "v1/cryptocurrency/quotes/latest": {
+//     endpoint: "v1/cryptocurrency/quotes/latest",
+//     params: ["convert"],
+//     optionalParams: ["symbol", "slug"],
+//   },
 
 export default widget;