diff options
author | Chai-Shi <changchaishi@gmail.com> | 2024-12-12 20:02:54 +0100 |
---|---|---|
committer | Antonin Delpeuch <antonin@delpeuch.eu> | 2024-12-15 13:21:02 +0100 |
commit | ad7df0f70a2e9cd7878312d02c67a374cc194a41 (patch) | |
tree | de608a882d681bea43f72df3dcdf177f073aa1d2 /web_src | |
parent | Merge pull request 'Replace actions/cascading-pr action with actions/cascadin... (diff) | |
download | forgejo-ad7df0f70a2e9cd7878312d02c67a374cc194a41.tar.xz forgejo-ad7df0f70a2e9cd7878312d02c67a374cc194a41.zip |
Add "n commits" link to contributors in contributors graph page (#32799)
Fixes Issue #29365 and inherit PR #29429
- I should extend the #29429 fork but the fork is not synced, so I
created another PR.
- Use `silenced` class for the link, as in #29847
---------
Co-authored-by: Ben Chang <ben_chang@htc.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'web_src')
-rw-r--r-- | web_src/js/components/RepoContributors.vue | 25 | ||||
-rw-r--r-- | web_src/js/features/contributors.js | 1 |
2 files changed, 23 insertions, 3 deletions
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue index dec2599c0d..07ad336cf7 100644 --- a/web_src/js/components/RepoContributors.vue +++ b/web_src/js/components/RepoContributors.vue @@ -1,5 +1,6 @@ <script> import {SvgIcon} from '../svg.js'; +import dayjs from 'dayjs'; import { Chart, Title, @@ -22,6 +23,7 @@ import {chartJsColors} from '../utils/color.js'; import {sleep} from '../utils.js'; import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm'; import $ from 'jquery'; +import {pathEscapeSegments} from '../utils/url.js'; const customEventListener = { id: 'customEventListener', @@ -61,6 +63,10 @@ export default { type: String, required: true, }, + repoDefaultBranchName: { + type: String, + required: true, + }, }, data: () => ({ isLoading: false, @@ -96,6 +102,15 @@ export default { .slice(0, 100); }, + getContributorSearchQuery(contributorEmail) { + const min = dayjs(this.xAxisMin).format('YYYY-MM-DD'); + const max = dayjs(this.xAxisMax).format('YYYY-MM-DD'); + const params = new URLSearchParams({ + 'q': `after:${min}, before:${max}, author:${contributorEmail}`, + }); + return `${this.repoLink}/commits/branch/${pathEscapeSegments(this.repoDefaultBranchName)}/search?${params.toString()}`; + }, + async fetchGraphData() { this.isLoading = true; try { @@ -163,7 +178,7 @@ export default { // for details. user.max_contribution_type += 1; - filteredData[key] = {...user, weeks: filteredWeeks}; + filteredData[key] = {...user, weeks: filteredWeeks, email: key}; } return filteredData; @@ -376,7 +391,7 @@ export default { <div class="ui top attached header tw-flex tw-flex-1"> <b class="ui right">#{{ index + 1 }}</b> <a :href="contributor.home_link"> - <img class="ui avatar tw-align-middle" height="40" width="40" :src="contributor.avatar_link"> + <img class="ui avatar tw-align-middle" height="40" width="40" :src="contributor.avatar_link" alt=""> </a> <div class="tw-ml-2"> <a v-if="contributor.home_link !== ''" :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a> @@ -384,7 +399,11 @@ export default { {{ contributor.name }} </h4> <p class="tw-text-12 tw-flex tw-gap-1"> - <strong v-if="contributor.total_commits">{{ contributor.total_commits.toLocaleString() }} {{ locale.contributionType.commits }}</strong> + <strong v-if="contributor.total_commits"> + <a class="silenced" :href="getContributorSearchQuery(contributor.email)"> + {{ contributor.total_commits.toLocaleString() }} {{ locale.contributionType.commits }} + </a> + </strong> <strong v-if="contributor.total_additions" class="text green">{{ contributor.total_additions.toLocaleString() }}++ </strong> <strong v-if="contributor.total_deletions" class="text red"> {{ contributor.total_deletions.toLocaleString() }}--</strong> diff --git a/web_src/js/features/contributors.js b/web_src/js/features/contributors.js index 79b3389fee..c0106b6350 100644 --- a/web_src/js/features/contributors.js +++ b/web_src/js/features/contributors.js @@ -8,6 +8,7 @@ export async function initRepoContributors() { try { const View = createApp(RepoContributors, { repoLink: el.getAttribute('data-repo-link'), + repoDefaultBranchName: el.getAttribute('data-repo-default-branch-name'), locale: { filterLabel: el.getAttribute('data-locale-filter-label'), contributionType: { |