From 30f89072945ae5e31c3896c3cbfb0fb7bc59840a Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 26 Jul 2023 20:37:32 -0700
Subject: [PATCH] Fix field filtering, avoid PR call if not needed

---
 src/widgets/azuredevops/component.jsx | 28 ++++++++++++---------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/widgets/azuredevops/component.jsx b/src/widgets/azuredevops/component.jsx
index 67c3b7eb..a9db4403 100644
--- a/src/widgets/azuredevops/component.jsx
+++ b/src/widgets/azuredevops/component.jsx
@@ -9,7 +9,7 @@ export default function Component({ service }) {
   const { widget } = service;
   const { userEmail, repositoryId } = widget;
   const includePR = userEmail !== undefined && repositoryId !== undefined;
-  const { data: prData, error: prError } = useWidgetAPI(widget, "pr");
+  const { data: prData, error: prError } = useWidgetAPI(widget, includePR ? "pr" : null);
   const { data: pipelineData, error: pipelineError } = useWidgetAPI(widget, "pipeline");
 
   if (
@@ -43,26 +43,22 @@ export default function Component({ service }) {
         <Block label="azuredevops.status" value={t(`azuredevops.${pipelineData.value[0].status.toString()}`)} />
       )}
       
-      {includePR && 
-      <>
-        <Block label="azuredevops.totalPrs" value={t("common.number", { value: prData.count })} />
-        <Block
+      {includePR && <Block label="azuredevops.totalPrs" value={t("common.number", { value: prData.count })} />}
+      {includePR && <Block
           label="azuredevops.myPrs"
           value={t("common.number", {
             value: prData.value?.filter((item) => item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
               .length,
           })}
-        />
-        <Block
-          label="azuredevops.approved"
-          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,
-          })}
-        />
-      </>
-      }
+        />}
+      {includePR && <Block
+        label="azuredevops.approved"
+        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,
+        })}
+      />}
 
     </Container>
   );