From 7c43dca9bbdb42e74e42d179fd3f3bf15f5a748e Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Tue, 28 Apr 2020 16:32:12 +0200 Subject: [PATCH] Fix pagination of issues/PR's in changelog generator (#23997) Fix pagination of issues/PR's in changelog generator --- .../src/cli/tasks/changelog.ts | 46 ++++++++++++++++--- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/packages/grafana-toolkit/src/cli/tasks/changelog.ts b/packages/grafana-toolkit/src/cli/tasks/changelog.ts index ec66878a59f..4b1c879f79b 100644 --- a/packages/grafana-toolkit/src/cli/tasks/changelog.ts +++ b/packages/grafana-toolkit/src/cli/tasks/changelog.ts @@ -57,7 +57,7 @@ const changelogTaskRunner: TaskRunner = useSpinner = useSpinner = useSpinner { + let title: string = item.title.replace(/^([^:]*)/, (_match: any, g1: any) => { return `**${g1}**`; }); + title = title.trim(); + if (title[title.length - 1] === '.') { + title = title.slice(0, -1); + } - markdown += '* ' + title + '.'; - markdown += ` [#${item.number}](${githubGrafanaUrl}/pull/${item.number})`; - markdown += `, [@${item.user.login}](${item.user.html_url})`; + if (!item.pull_request) { + markdown += '* ' + title + '.'; + markdown += ` [#${item.number}](${githubGrafanaUrl}/issues/${item.number})`; + } else { + markdown += '* ' + title + '.'; + markdown += ` [#${item.number}](${githubGrafanaUrl}/pull/${item.number})`; + markdown += `, [@${item.user.login}](${item.user.html_url})`; + } markdown += '\n'; return markdown; } +function parseLink(s: any) { + const output: any = {}; + const regex = /<([^>]+)>; rel="([^"]+)"/g; + + let m; + while ((m = regex.exec(s))) { + const [, v, k] = m; + output[k] = v; + } + + return output; +} + export const changelogTask = new Task('Changelog generator task', changelogTaskRunner);