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 ; } @@ -29,8 +30,8 @@ export default function Component({ service }) { return ( - item.createdBy.uniqueName === service.widget.userEmail).length })} /> - item.reviewers.some(reviewer => reviewer.vote === 10)).length })} /> + + item.reviewers.some(reviewer => reviewer.vote === 10)).length })} /> ); } 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;