diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index eee9fcec..ebab61ec 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -665,7 +665,7 @@
"seriesCount": "Series",
"totalFiles": "Files"
},
- "azureDevOps": {
+ "azuredevops": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index 856b0e38..94fee9e2 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -278,8 +278,7 @@ export function cleanServiceGroups(groups) {
server, // docker widget
container,
currency, // coinmarketcap widget
- userEmail, // azureDevOps
- azureType, // azureDevOps
+ userEmail, // azuredevops
symbols,
slugs,
defaultinterval,
@@ -314,9 +313,8 @@ export function cleanServiceGroups(groups) {
service_group: serviceGroup.name,
};
- if (type === "azureDevOps") {
+ 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 897528c6..498c0d6d 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 === "azureDevOps") {
+ 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
index 6755d135..7838a7a2 100644
--- a/src/widgets/azuredevops/component.jsx
+++ b/src/widgets/azuredevops/component.jsx
@@ -7,68 +7,51 @@ import useWidgetAPI from "utils/proxy/use-widget-api";
export default function Component({ service }) {
const { t } = useTranslation();
const { widget } = service;
- const { azureType } = widget;
const { userEmail } = widget;
- const { data: pipelineData, error: pipelineError } = useWidgetAPI(widget, "pipeline");
const { data: prData, error: prError } = useWidgetAPI(widget, "pr");
-
- if (azureType === "Pipeline") {
- if (pipelineError) {
- return ;
- }
+ const { data: pipelineData, error: pipelineError } = useWidgetAPI(widget, "pipeline");
- if (!pipelineData || !Array.isArray(pipelineData.value)) {
- return (
-
-
-
-
- );
- }
+ if (pipelineError || prError) {
+ const finalError = pipelineError ?? prError;
+ return ;
+ }
+ if (!pipelineData || !Array.isArray(pipelineData.value)) {
return (
- {pipelineData.value[0].result ? (
-
- ) : (
-
- )}
-
+
+
+
+
);
}
- if (azureType === "PullRequest") {
- if (prError) {
- return ;
- }
- if (!prData) {
- return (
-
-
-
-
-
- );
- }
+ return (
+
+ {pipelineData.value[0].result ? (
+
+ ) : (
+
+ )}
+
+
+ item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
+ .length,
+ })}
+ />
+ item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
+ .filter((item) => item.reviewers.some((reviewer) => reviewer.vote === 10)).length,
+ })}
+ />
- return (
-
-
- item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
- .length,
- })}
- />
- item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase()).filter((item) => item.reviewers.some((reviewer) => reviewer.vote === 10)).length
- })}
- />
-
- );
- }
+
+ );
}