OpenSource/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pass creatorId to FE

Browse Source
This commit is contained in:
Nitzan Miranda 2023-07-21 19:22:52 +03:00 committed by shamoon
parent 31c4d53c2e
commit 6746665f43
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/utils/config/service-helpers.js
View File

@ -278,6 +278,7 @@ export function cleanServiceGroups(groups) {
server, // docker widget server, // docker widget
container, container,
currency, // coinmarketcap widget currency, // coinmarketcap widget
creatorId, // azurePullRequests
symbols, symbols,
slugs, slugs,
defaultinterval, defaultinterval,
@ -312,6 +313,10 @@ export function cleanServiceGroups(groups) {
service_group: serviceGroup.name, service_group: serviceGroup.name,
}; };
if (type === "azurePullRequests") {
if (creatorId) cleanedService.widget.creatorId = creatorId;
}
if (type === "coinmarketcap") { if (type === "coinmarketcap") {
if (currency) cleanedService.widget.currency = currency; if (currency) cleanedService.widget.currency = currency;
if (symbols) cleanedService.widget.symbols = symbols; if (symbols) cleanedService.widget.symbols = symbols;

13
src/widgets/azurePullrequests/component.jsx
View File

@ -9,11 +9,12 @@ export default function Component({ service }) {
const { widget } = service; const { widget } = service;
const { data: prData, error: prError } = useWidgetAPI(widget, "pr"); const { data: prData, error: prError } = useWidgetAPI(widget);
const { data: myPrData, error: myPrError } = useWidgetAPI(widget, "myPr");
if (prError || myPrError) { const { creatorId } = widget;
const finalError = prError ?? myPrError ;
if (prError) {
const finalError = prError ;
return <Container service={service} error={finalError} />; return <Container service={service} error={finalError} />;
} }
@ -30,8 +31,8 @@ export default function Component({ service }) {
return ( return (
<Container service={service}> <Container service={service}>
<Block label="azurePullRequests.totalPrs" value={t("common.number", { value: prData.count })} /> <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.myPrs" value={t("common.number", { value: prData.value.filter(item => item.creatorId===creatorId).length })} />
<Block label="azurePullRequests.approvedNotCompleted" value={t("common.number", { value: myPrData.value.filter(item => item.reviewers.some(reviewer => reviewer.vote === 10)).length })} /> <Block label="azurePullRequests.approvedNotCompleted" value={t("common.number", { value: prData.value.filter(item => item.reviewers.some(reviewer => reviewer.vote === 10)).length })} />
</Container> </Container>
); );
} }

24
src/widgets/azurePullrequests/widget.js
View File

@ -1,25 +1,15 @@
import credentialedProxyHandler from "utils/proxy/handlers/credentialed"; import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
import { asJson } from "utils/proxy/api-helpers";
const widget = { 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, 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; export default widget;