diff --git a/docs/widgets/services/gitlab.md b/docs/widgets/services/gitlab.md index 32712963..155fd0f6 100644 --- a/docs/widgets/services/gitlab.md +++ b/docs/widgets/services/gitlab.md @@ -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. -Allowed fields: `["events", "issues", "openIssues", "closedIssues", "mergeRequests", "openMergeRequests", -"closedMergeRequests"]`. +Allowed fields: `["events", "openIssues", "openMergeRequests"]`. ```yaml widget: type: gitlab url: http://gitlab.host.or.ip:port key: personal-access-token - issueState: all # supports "opened", "closed" and defaults to "all" - mergeRequestState: all # supports "opened", "closed", "locked" and defaults to "all" ``` diff --git a/public/locales/en/common.json b/public/locales/en/common.json index a48a20c4..3cf42b80 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -1005,10 +1005,6 @@ "gitlab": { "events": "Events", "issues": "Issues", - "issuesOpen": "Open Issues", - "issuesClosed": "Closed Issues", - "merges": "Merge Requests", - "mergesOpen": "Open Merge Requests", - "mergesClosed": "Closed Merge Requests" + "merges": "Merge Requests" } } diff --git a/src/widgets/gitlab/component.jsx b/src/widgets/gitlab/component.jsx index a977d3af..6c3ac9e0 100644 --- a/src/widgets/gitlab/component.jsx +++ b/src/widgets/gitlab/component.jsx @@ -19,36 +19,19 @@ export default function Component({ service }) { - - - - ); } - const issues = { - open: gitlabEvents.issues.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, - }; + const openIssues = gitlabEvents.issues.filter((event) => event.action_name.toLowerCase() === "opened").length; + const openMerges = gitlabEvents.merges.filter((event) => event.action_name.toLowerCase() === "opened").length; return ( - - - - - - + + ); } diff --git a/src/widgets/gitlab/widget.js b/src/widgets/gitlab/widget.js index 44de4539..c308e954 100644 --- a/src/widgets/gitlab/widget.js +++ b/src/widgets/gitlab/widget.js @@ -13,26 +13,6 @@ const widget = { 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", - }, }, };