From 547baddee962c7d1ef1f27d264e7c9322b55af58 Mon Sep 17 00:00:00 2001 From: Nitzan Miranda Date: Sun, 23 Jul 2023 15:22:25 +0300 Subject: [PATCH] merge to AzureDevOps --- public/locales/en/common.json | 6 +- src/utils/config/service-helpers.js | 6 +- src/utils/proxy/handlers/credentialed.js | 2 +- src/widgets/azureDevOps/component.jsx | 78 +++++++++++++++++++++ src/widgets/azureDevOps/widget.js | 18 +++++ src/widgets/azurePipelines/component.jsx | 36 ---------- src/widgets/azurePipelines/widget.js | 8 --- src/widgets/azurePullrequests/component.jsx | 38 ---------- src/widgets/azurePullrequests/widget.js | 8 --- src/widgets/components.js | 3 +- src/widgets/widgets.js | 6 +- 11 files changed, 106 insertions(+), 103 deletions(-) create mode 100644 src/widgets/azureDevOps/component.jsx create mode 100644 src/widgets/azureDevOps/widget.js delete mode 100644 src/widgets/azurePipelines/component.jsx delete mode 100644 src/widgets/azurePipelines/widget.js delete mode 100644 src/widgets/azurePullrequests/component.jsx delete mode 100644 src/widgets/azurePullrequests/widget.js diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 2cb009bd..17ea805e 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -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" diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js index 997fbf2f..856b0e38 100644 --- a/src/utils/config/service-helpers.js +++ b/src/utils/config/service-helpers.js @@ -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") { diff --git a/src/utils/proxy/handlers/credentialed.js b/src/utils/proxy/handlers/credentialed.js index cb9322b6..897528c6 100644 --- a/src/utils/proxy/handlers/credentialed.js +++ b/src/utils/proxy/handlers/credentialed.js @@ -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}`; diff --git a/src/widgets/azureDevOps/component.jsx b/src/widgets/azureDevOps/component.jsx new file mode 100644 index 00000000..ea9dc2b3 --- /dev/null +++ b/src/widgets/azureDevOps/component.jsx @@ -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 ; + } + + if (!pipelineData || !Array.isArray(pipelineData.value)) { + return ( + + + + + ); + } + + return ( + + {pipelineData.value[0].result ? ( + + ) : ( + + )} + + + ); + } + else if (azureType === "PullRequest") { + const { userEmail } = widget; + + if (prError) { + return ; + } + + if (!prData) { + return ( + + + + + + ); + } + + return ( + + + item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase()) + .length, + })} + /> + item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase()) + .filter((item) => item.reviewers.some((reviewer) => reviewer.vote === 10)).length, + })} + /> + + ); + } +} diff --git a/src/widgets/azureDevOps/widget.js b/src/widgets/azureDevOps/widget.js new file mode 100644 index 00000000..43e0da0d --- /dev/null +++ b/src/widgets/azureDevOps/widget.js @@ -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; diff --git a/src/widgets/azurePipelines/component.jsx b/src/widgets/azurePipelines/component.jsx deleted file mode 100644 index a47296f3..00000000 --- a/src/widgets/azurePipelines/component.jsx +++ /dev/null @@ -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 ; - } - - if (!pipelineData || !Array.isArray(pipelineData.value)) { - return ( - - - - - ); - } - - return ( - - {pipelineData.value[0].result ? - : - - } - - - ); -} diff --git a/src/widgets/azurePipelines/widget.js b/src/widgets/azurePipelines/widget.js deleted file mode 100644 index 708266d2..00000000 --- a/src/widgets/azurePipelines/widget.js +++ /dev/null @@ -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; \ No newline at end of file diff --git a/src/widgets/azurePullrequests/component.jsx b/src/widgets/azurePullrequests/component.jsx deleted file mode 100644 index aa2fdd19..00000000 --- a/src/widgets/azurePullrequests/component.jsx +++ /dev/null @@ -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 ; - } - - if (!prData) { - return ( - - - - - - ); - } - - return ( - - - item.createdBy.uniqueName.toLowerCase()===userEmail.toLowerCase()).length })} /> - item.createdBy.uniqueName.toLowerCase()===userEmail.toLowerCase()).filter(item => item.reviewers.some(reviewer => reviewer.vote === 10)).length })} /> - - ); -} diff --git a/src/widgets/azurePullrequests/widget.js b/src/widgets/azurePullrequests/widget.js deleted file mode 100644 index 29604c3d..00000000 --- a/src/widgets/azurePullrequests/widget.js +++ /dev/null @@ -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; diff --git a/src/widgets/components.js b/src/widgets/components.js index 86f8aea1..11e7b1af 100644 --- a/src/widgets/components.js +++ b/src/widgets/components.js @@ -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")), diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js index 7a49ca06..d405e9fd 100644 --- a/src/widgets/widgets.js +++ b/src/widgets/widgets.js @@ -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,