merge to AzureDevOps

This commit is contained in:
Nitzan Miranda 2023-07-23 15:22:25 +03:00 committed by shamoon
parent f1d8585921
commit 547baddee9
11 changed files with 106 additions and 103 deletions

View File

@ -665,7 +665,7 @@
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"azureDevOps": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
@ -673,9 +673,7 @@
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
},
"azurePullRequests": {
"inProgress": "In Progress",
"totalPrs": "Total PRs",
"myPrs": "My PRs",
"approvedNotCompleted": "My Approved Not Completed"

View File

@ -278,7 +278,8 @@ export function cleanServiceGroups(groups) {
server, // docker widget
container,
currency, // coinmarketcap widget
userEmail, // azurePullRequests
userEmail, // azureDevOps
azureType, // azureDevOps
symbols,
slugs,
defaultinterval,
@ -313,8 +314,9 @@ export function cleanServiceGroups(groups) {
service_group: serviceGroup.name,
};
if (type === "azurePullRequests") {
if (type === "azureDevOps") {
if (userEmail) cleanedService.widget.userEmail = userEmail;
if (azureType) cleanedService.widget.azureType = azureType;
}
if (type === "coinmarketcap") {

View File

@ -62,7 +62,7 @@ export default async function credentialedProxyHandler(req, res, map) {
headers.Authorization = `Basic ${Buffer.from(`${widget.username}:${widget.password}`).toString("base64")}`;
}
}
else if (widget.type === "azurePipelines" || widget.type === "azurePullRequests") {
else if (widget.type === "azureDevOps") {
headers.Authorization = `Basic ${Buffer.from(`$:${widget.key}`).toString("base64")}`;
} else {
headers["X-API-Key"] = `${widget.key}`;

View File

@ -0,0 +1,78 @@
import { useTranslation } from "next-i18next";
import Container from "components/services/widget/container";
import Block from "components/services/widget/block";
import useWidgetAPI from "utils/proxy/use-widget-api";
export default function Component({ service }) {
const { t } = useTranslation();
const { widget } = service;
const { azureType } = widget;
const { data: pipelineData, error: pipelineError } = useWidgetAPI(widget, "pipeline");
const { data: prData, error: prError } = useWidgetAPI(widget, "pr");
if (azureType === "Pipeline") {
if (pipelineError) {
return <Container service={service} error={pipelineError} />;
}
if (!pipelineData || !Array.isArray(pipelineData.value)) {
return (
<Container service={service}>
<Block label="azureDevOps.result" />
<Block label="azureDevOps.buildId" />
</Container>
);
}
return (
<Container service={service}>
{pipelineData.value[0].result ? (
<Block label="azureDevOps.result" value={t(`azureDevOps.${pipelineData.value[0].result.toString()}`)} />
) : (
<Block label="azureDevOps.status" value={t(`azureDevOps.${pipelineData.value[0].status.toString()}`)} />
)}
<Block label="azureDevOps.buildId" value={pipelineData.value[0].id} />
</Container>
);
}
else if (azureType === "PullRequest") {
const { userEmail } = widget;
if (prError) {
return <Container service={service} error={prError} />;
}
if (!prData) {
return (
<Container service={service}>
<Block label="azureDevOps.totalPrs" />
<Block label="azureDevOps.myPrs" />
<Block label="azureDevOps.approvedNotCompleted" />
</Container>
);
}
return (
<Container service={service}>
<Block label="azureDevOps.totalPrs" value={t("common.number", { value: prData.count })} />
<Block
label="azureDevOps.myPrs"
value={t("common.number", {
value: prData.value.filter((item) => item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
.length,
})}
/>
<Block
label="azureDevOps.approvedNotCompleted"
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>
);
}
}

View File

@ -0,0 +1,18 @@
import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
const widget = {
api: "https://dev.azure.com/{organization}/{project}/_apis/{endpoint}",
proxyHandler: credentialedProxyHandler,
mappings: {
pr: {
endpoint: "git/repositories/BackEnd/pullrequests",
},
pipeline: {
endpoint: "build/Builds?branchName=&definitions=141"
},
},
};
export default widget;

View File

@ -1,36 +0,0 @@
import { useTranslation } from "next-i18next";
import Container from "components/services/widget/container";
import Block from "components/services/widget/block";
import useWidgetAPI from "utils/proxy/use-widget-api";
export default function Component({ service }) {
const { t } = useTranslation();
const { widget } = service;
const { data: pipelineData, error: pipelineError } = useWidgetAPI(widget);
if (pipelineError) {
return <Container service={service} error={pipelineError} />;
}
if (!pipelineData || !Array.isArray(pipelineData.value)) {
return (
<Container service={service}>
<Block label="azurePipelines.result" />
<Block label="azurePipelines.buildId" />
</Container>
);
}
return (
<Container service={service}>
{pipelineData.value[0].result ?
<Block label="azurePipelines.result" value={t(`azurePipelines.${pipelineData.value[0].result.toString()}`)} /> :
<Block label="azurePipelines.status" value={t(`azurePipelines.${pipelineData.value[0].status.toString()}`)} />
}
<Block label="azurePipelines.buildId" value= { pipelineData.value[0].id } />
</Container>
);
}

View File

@ -1,8 +0,0 @@
import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
const widget = {
api: "https://dev.azure.com/{organization}/{project}/_apis/build/Builds?branchName={branchName}&definitions={definitionId}",
proxyHandler: credentialedProxyHandler,
};
export default widget;

View File

@ -1,38 +0,0 @@
import { useTranslation } from "next-i18next";
import Container from "components/services/widget/container";
import Block from "components/services/widget/block";
import useWidgetAPI from "utils/proxy/use-widget-api";
export default function Component({ service }) {
const { t } = useTranslation();
const { widget } = service;
const { data: prData, error: prError } = useWidgetAPI(widget);
const { userEmail } = widget;
if (prError) {
const finalError = prError ;
return <Container service={service} error={finalError} />;
}
if (!prData) {
return (
<Container service={service}>
<Block label="azurePullRequests.totalPrs" />
<Block label="azurePullRequests-pr.myPrs" />
<Block label="azurePullRequests.approvedNotCompleted" />
</Container>
);
}
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.toLowerCase()===userEmail.toLowerCase()).length })} />
<Block label="azurePullRequests.approvedNotCompleted" 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>
);
}

View File

@ -1,8 +0,0 @@
import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
const widget = {
api: "https://dev.azure.com/{organization}/{project}/_apis/git/repositories/{repositoryId}/pullrequests",
proxyHandler: credentialedProxyHandler,
};
export default widget;

View File

@ -5,8 +5,7 @@ const components = {
audiobookshelf: dynamic(() => import("./audiobookshelf/component")),
authentik: dynamic(() => import("./authentik/component")),
autobrr: dynamic(() => import("./autobrr/component")),
azurePipelines: dynamic(() => import("./azurePipelines/component")),
azurePullRequests: dynamic(() => import("./azurePullRequests/component")),
azureDevOps: dynamic(() => import("./azureDevOps/component")),
bazarr: dynamic(() => import("./bazarr/component")),
caddy: dynamic(() => import("./caddy/component")),
changedetectionio: dynamic(() => import("./changedetectionio/component")),

View File

@ -2,8 +2,7 @@ import adguard from "./adguard/widget";
import audiobookshelf from "./audiobookshelf/widget";
import authentik from "./authentik/widget";
import autobrr from "./autobrr/widget";
import azurePipelines from "./azurePipelines/widget";
import azurePullRequests from "./azurePullRequests/widget";
import azureDevOps from "./azureDevOps/widget";
import bazarr from "./bazarr/widget";
import caddy from "./caddy/widget";
import changedetectionio from "./changedetectionio/widget";
@ -93,8 +92,7 @@ const widgets = {
audiobookshelf,
authentik,
autobrr,
azurePipelines,
azurePullRequests,
azureDevOps,
bazarr,
caddy,
changedetectionio,