Better handle azuredevops PR call failures
This commit is contained in:
parent
412ff5aa20
commit
017a8152df
@ -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") {
|
||||||
|
|||||||
@ -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,22 +43,26 @@ 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()}`)} />
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Block label="azuredevops.totalPrs" value={t("common.number", { value: prData.count })} />
|
{includePR &&
|
||||||
<Block
|
<>
|
||||||
label="azuredevops.myPrs"
|
<Block label="azuredevops.totalPrs" value={t("common.number", { value: prData.count })} />
|
||||||
value={t("common.number", {
|
<Block
|
||||||
value: prData.value?.filter((item) => item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
|
label="azuredevops.myPrs"
|
||||||
.length,
|
value={t("common.number", {
|
||||||
})}
|
value: prData.value?.filter((item) => item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
|
||||||
/>
|
.length,
|
||||||
<Block
|
})}
|
||||||
label="azuredevops.approved"
|
/>
|
||||||
value={t("common.number", {
|
<Block
|
||||||
value: prData.value
|
label="azuredevops.approved"
|
||||||
?.filter((item) => item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
|
value={t("common.number", {
|
||||||
.filter((item) => item.reviewers.some((reviewer) => reviewer.vote === 10)).length,
|
value: prData.value
|
||||||
})}
|
?.filter((item) => item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
|
||||||
/>
|
.filter((item) => item.reviewers.some((reviewer) => reviewer.vote === 10)).length,
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
|
||||||
</Container>
|
</Container>
|
||||||
);
|
);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user