* Removed closed issues and closed merge request to slim down maximum number of blocks that can be displayed.

* Removed unused code from gitlab widget
This commit is contained in:
Urs Kröll 2024-11-22 01:14:05 +01:00
parent 6dddb1c031
commit defa1ded7f
No known key found for this signature in database
GPG Key ID: D93E3DE7D924C315
4 changed files with 6 additions and 50 deletions

View File

@ -7,14 +7,11 @@ Learn more about [Gitlab](https://gitlab.com).
API requires a personal access token with either `read_api` or `api` permission. See the [gitlab documentation](https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html#create-a-personal-access-token) for details on generating one. API requires a personal access token with either `read_api` or `api` permission. See the [gitlab documentation](https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html#create-a-personal-access-token) for details on generating one.
Allowed fields: `["events", "issues", "openIssues", "closedIssues", "mergeRequests", "openMergeRequests", Allowed fields: `["events", "openIssues", "openMergeRequests"]`.
"closedMergeRequests"]`.
```yaml ```yaml
widget: widget:
type: gitlab type: gitlab
url: http://gitlab.host.or.ip:port url: http://gitlab.host.or.ip:port
key: personal-access-token key: personal-access-token
issueState: all # supports "opened", "closed" and defaults to "all"
mergeRequestState: all # supports "opened", "closed", "locked" and defaults to "all"
``` ```

View File

@ -1005,10 +1005,6 @@
"gitlab": { "gitlab": {
"events": "Events", "events": "Events",
"issues": "Issues", "issues": "Issues",
"issuesOpen": "Open Issues", "merges": "Merge Requests"
"issuesClosed": "Closed Issues",
"merges": "Merge Requests",
"mergesOpen": "Open Merge Requests",
"mergesClosed": "Closed Merge Requests"
} }
} }

View File

@ -19,36 +19,19 @@ export default function Component({ service }) {
<Container service={service}> <Container service={service}>
<Block label="gitlab.events" /> <Block label="gitlab.events" />
<Block label="gitlab.issues" /> <Block label="gitlab.issues" />
<Block label="gitlab.issuesOpen" />
<Block label="gitlab.issuesClosed" />
<Block label="gitlab.merges" /> <Block label="gitlab.merges" />
<Block label="gitlab.mergesOpen" />
<Block label="gitlab.mergesClosed" />
</Container> </Container>
); );
} }
const issues = { const openIssues = gitlabEvents.issues.filter((event) => event.action_name.toLowerCase() === "opened").length;
open: gitlabEvents.issues.filter((event) => event.action_name.toLowerCase() === "opened").length, const openMerges = gitlabEvents.merges.filter((event) => event.action_name.toLowerCase() === "opened").length;
closed: gitlabEvents.issues.filter((event) => event.action_name.toLowerCase() === "closed").length,
count: gitlabEvents.issues.length,
};
const merges = {
open: gitlabEvents.merges.filter((event) => event.action_name.toLowerCase() === "opened").length,
closed: gitlabEvents.merges.filter((event) => event.action_name.toLowerCase() === "closed").length,
count: gitlabEvents.merges.length,
};
return ( return (
<Container service={service}> <Container service={service}>
<Block label="gitlab.events" value={t("common.number", { value: gitlabEvents.events })} /> <Block label="gitlab.events" value={t("common.number", { value: gitlabEvents.events })} />
<Block label="gitlab.issues" value={t("common.number", { value: issues.count })} /> <Block label="gitlab.issues" value={t("common.number", { value: openIssues })} />
<Block label="gitlab.issuesOpen" value={t("common.number", { value: issues.open })} /> <Block label="gitlab.merges" value={t("common.number", { value: openMerges })} />
<Block label="gitlab.issuesClosed" value={t("common.number", { value: issues.closed })} />
<Block label="gitlab.merges" value={t("common.number", { value: merges.count })} />
<Block label="gitlab.mergesOpen" value={t("common.number", { value: merges.open })} />
<Block label="gitlab.mergesClosed" value={t("common.number", { value: merges.closed })} />
</Container> </Container>
); );
} }

View File

@ -13,26 +13,6 @@ const widget = {
events: asJson(data).length, events: asJson(data).length,
}), }),
}, },
issues: {
endpoint: "issues",
params: ["state"],
},
openIssues: {
endpoint: "issues?state=opened",
},
closedIssues: {
endpoint: "issues?state=closed",
},
mergeRequests: {
endpoint: "merge_requests",
params: ["state"],
},
openMergeRequests: {
endpoint: "merge_requests?state=opened",
},
closedMergeRequests: {
endpoint: "merge_requests?state=closed",
},
}, },
}; };