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

merge widgets together

Browse Source
This commit is contained in:
Nitzan Miranda 2023-07-25 10:29:01 +03:00 committed by shamoon
parent 7670e86e6a
commit e02caa78ca
4 changed files with 40 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/locales/en/common.json
View File

@ -665,7 +665,7 @@
"seriesCount": "Series", "seriesCount": "Series",
"totalFiles": "Files" "totalFiles": "Files"
}, },
"azureDevOps": { "azuredevops": {
"result": "Result", "result": "Result",
"status": "Status", "status": "Status",
"buildId": "Build ID", "buildId": "Build ID",

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

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

2
src/utils/proxy/handlers/credentialed.js
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")}`; 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")}`; headers.Authorization = `Basic ${Buffer.from(`$:${widget.key}`).toString("base64")}`;
} else { } else {
headers["X-API-Key"] = `${widget.key}`; headers["X-API-Key"] = `${widget.key}`;

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

@ -7,21 +7,22 @@ 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 { azureType } = widget;
const { userEmail } = widget; const { userEmail } = widget;
const { data: pipelineData, error: pipelineError } = useWidgetAPI(widget, "pipeline");
const { data: prData, error: prError } = useWidgetAPI(widget, "pr"); const { data: prData, error: prError } = useWidgetAPI(widget, "pr");
const { data: pipelineData, error: pipelineError } = useWidgetAPI(widget, "pipeline");
if (azureType === "Pipeline") { if (pipelineError || prError) {
if (pipelineError) { const finalError = pipelineError ?? prError;
return <Container service={service} error={pipelineError} />; return <Container service={service} error={finalError} />;
} }
if (!pipelineData || !Array.isArray(pipelineData.value)) { if (!pipelineData || !Array.isArray(pipelineData.value)) {
return ( return (
<Container service={service}> <Container service={service}>
<Block label="azureDevOps.result" /> <Block label="azuredevops.result" />
<Block label="azureDevOps.buildId" /> <Block label="azuredevops.totalPrs" />
<Block label="azuredevops.myPrs" />
<Block label="azuredevops.approved" />
</Container> </Container>
); );
} }
@ -29,46 +30,28 @@ export default function Component({ service }) {
return ( return (
<Container service={service}> <Container service={service}>
{pipelineData.value[0].result ? ( {pipelineData.value[0].result ? (
<Block label="azureDevOps.result" value={t(`azureDevOps.${pipelineData.value[0].result.toString()}`)} /> <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.status" value={t(`azuredevops.${pipelineData.value[0].status.toString()}`)} />
)} )}
<Block label="azureDevOps.buildId" value={pipelineData.value[0].id} />
</Container>
);
}
if (azureType === "PullRequest") {
if (prError) {
return <Container service={service} error={prError} />;
}
if (!prData) { <Block label="azuredevops.totalPrs" value={t("common.number", { value: prData.count })} />
return (
<Container service={service}>
<Block label="azureDevOps.totalPrs" />
<Block label="azureDevOps.myPrs" />
<Block label="azureDevOps.approved" />
</Container>
);
}
return (
<Container service={service}>
<Block label="azureDevOps.totalPrs" value={t("common.number", { value: prData.count })} />
<Block <Block
label="azureDevOps.myPrs" label="azuredevops.myPrs"
value={t("common.number", { value={t("common.number", {
value: prData.value?.filter((item) => item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase()) value: prData.value?.filter((item) => item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
.length, .length,
})} })}
/> />
<Block <Block
label="azureDevOps.approved" label="azuredevops.approved"
value={t("common.number", { 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 value: prData.value
?.filter((item) => item.createdBy.uniqueName.toLowerCase() === userEmail.toLowerCase())
.filter((item) => item.reviewers.some((reviewer) => reviewer.vote === 10)).length,
})} })}
/> />
</Container> </Container>
); );
}
} }