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

Better handle azuredevops PR call failures

Browse Source
This commit is contained in:
shamoon 2023-07-25 11:11:58 -07:00
parent 412ff5aa20
commit 017a8152df
2 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,7 +278,6 @@ export function cleanServiceGroups(groups) {
server, // docker widget server, // docker widget
container, container,
currency, // coinmarketcap widget currency, // coinmarketcap widget
userEmail, // azuredevops
symbols, symbols,
slugs, slugs,
defaultinterval, defaultinterval,
@ -294,6 +293,8 @@ export function cleanServiceGroups(groups) {
node, // Proxmox node, // Proxmox
snapshotHost, // kopia snapshotHost, // kopia
snapshotPath, snapshotPath,
userEmail, // azuredevops
branchName
} = cleanedService.widget; } = cleanedService.widget;
let fieldsList = fields; let fieldsList = fields;
@ -315,6 +316,7 @@ export function cleanServiceGroups(groups) {
if (type === "azuredevops") { if (type === "azuredevops") {
if (userEmail) cleanedService.widget.userEmail = userEmail; if (userEmail) cleanedService.widget.userEmail = userEmail;
if (branchName) cleanedService.widget.branchName = branchName;
} }
if (type === "coinmarketcap") { if (type === "coinmarketcap") {

20
src/widgets/azuredevops/component.jsx
View File

@ -7,16 +7,24 @@ import useWidgetAPI from "utils/proxy/use-widget-api";
export default function Component({ service }) { export default function Component({ service }) {
const { t } = useTranslation(); const { t } = useTranslation();
const { widget } = service; const { widget } = service;
const { userEmail } = widget; const { userEmail, branchName } = widget;
const includePR = userEmail !== undefined && branchName !== undefined;
const { data: prData, error: prError } = useWidgetAPI(widget, "pr"); const { data: prData, error: prError } = useWidgetAPI(widget, "pr");
const { data: pipelineData, error: pipelineError } = useWidgetAPI(widget, "pipeline"); const { data: pipelineData, error: pipelineError } = useWidgetAPI(widget, "pipeline");
if (pipelineError || prError) { if (
const finalError = pipelineError ?? prError; pipelineError ||
(includePR && (prError || prData?.errorCode !== null))
) {
let finalError = pipelineError ?? prError;
if (includePR && prData?.errorCode !== null) {
// pr call failed possibly with more specific message
finalError = { message: prData?.message ?? 'Error communicating with Azure API' }
}
return <Container service={service} error={finalError} />; return <Container service={service} error={finalError} />;
} }
if (!pipelineData || !Array.isArray(pipelineData.value)) { if (!pipelineData || !Array.isArray(pipelineData.value) || (includePR && !prData)) {
return ( return (
<Container service={service}> <Container service={service}>
<Block label="azuredevops.result" /> <Block label="azuredevops.result" />
@ -35,6 +43,8 @@ export default function Component({ service }) {
<Block label="azuredevops.status" value={t(`azuredevops.${pipelineData.value[0].status.toString()}`)} /> <Block label="azuredevops.status" value={t(`azuredevops.${pipelineData.value[0].status.toString()}`)} />
)} )}
{includePR &&
<>
<Block label="azuredevops.totalPrs" value={t("common.number", { value: prData.count })} /> <Block label="azuredevops.totalPrs" value={t("common.number", { value: prData.count })} />
<Block <Block
label="azuredevops.myPrs" label="azuredevops.myPrs"
@ -51,6 +61,8 @@ export default function Component({ service }) {
.filter((item) => item.reviewers.some((reviewer) => reviewer.vote === 10)).length, .filter((item) => item.reviewers.some((reviewer) => reviewer.vote === 10)).length,
})} })}
/> />
</>
}
</Container> </Container>
); );