From 86c8949d9cb7d48cce686afb039873f141c87e60 Mon Sep 17 00:00:00 2001 From: Beowulf Date: Sun, 19 Jan 2025 18:55:01 +0100 Subject: [PATCH] Remove DiffFileList component The benefit / functionality provided by DiffFileList is already (better) integrated in the header of the files. If you want an overview, you can collapse all files via the same overflow menu (where the stats were available). To reduce the maintenance effort, the DiffFileList component is therefore removed. --- options/locale/locale_en-US.ini | 1 - templates/repo/diff/box.tmpl | 1 - templates/repo/diff/options_dropdown.tmpl | 1 - web_src/css/repo.css | 24 ---------- web_src/js/components/DiffFileList.vue | 58 ----------------------- web_src/js/features/repo-diff-filetree.js | 9 ---- web_src/js/features/repo-diff.js | 5 +- 7 files changed, 2 insertions(+), 97 deletions(-) delete mode 100644 web_src/js/components/DiffFileList.vue diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 127e629e80..501e98131e 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2643,7 +2643,6 @@ diff.git-notes.remove-header = Remove note diff.git-notes.remove-body = This note will be removed. diff.data_not_available = Diff content is not available diff.options_button = Diff options -diff.show_diff_stats = Show stats diff.download_patch = Download patch file diff.download_diff = Download diff file diff.show_split_view = Split view diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 49483433f4..e24c880746 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -85,7 +85,6 @@ diffFileInfo.files.push(...diffDataFiles); window.config.pageData.diffFileInfo = diffFileInfo; -
{{end}}
{{if $showFileTree}} diff --git a/templates/repo/diff/options_dropdown.tmpl b/templates/repo/diff/options_dropdown.tmpl index 97dc3ba940..44b0743e09 100644 --- a/templates/repo/diff/options_dropdown.tmpl +++ b/templates/repo/diff/options_dropdown.tmpl @@ -1,7 +1,6 @@
{{svg "octicon-kebab-horizontal"}}
- {{ctx.Locale.Tr "repo.diff.show_diff_stats"}} {{if .Issue.Index}} {{ctx.Locale.Tr "repo.diff.download_patch"}} {{ctx.Locale.Tr "repo.diff.download_diff"}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index e9cfc1ddde..e960e9103b 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1709,26 +1709,6 @@ td .commit-summary { max-width: initial; /* remove fomantic over 100% width */ } -.repository .diff-stats { - clear: both; - margin-bottom: 5px; - max-height: 200px; - height: fit-content; - overflow: auto; - padding-left: 0; -} - -.repository .diff-stats li { - list-style: none; - padding-bottom: 4px; - margin-bottom: 4px; - padding-left: 6px; -} - -.repository .diff-stats li + li { - border-top: 1px solid var(--color-secondary); -} - .repository .repo-search-result { padding-top: 10px; padding-bottom: 10px; @@ -1839,10 +1819,6 @@ details.repo-search-result summary::marker { color: var(--color-success-text); } -.repository .ui.attached.isSigned.isVerified.message .pull-right { - color: var(--color-text); -} - .repository .ui.attached.isSigned.isVerified.message .ui.text { color: var(--color-success-text); } diff --git a/web_src/js/components/DiffFileList.vue b/web_src/js/components/DiffFileList.vue deleted file mode 100644 index 916780d913..0000000000 --- a/web_src/js/components/DiffFileList.vue +++ /dev/null @@ -1,58 +0,0 @@ - - diff --git a/web_src/js/features/repo-diff-filetree.js b/web_src/js/features/repo-diff-filetree.js index 52d7cf030d..5a52b9942d 100644 --- a/web_src/js/features/repo-diff-filetree.js +++ b/web_src/js/features/repo-diff-filetree.js @@ -1,6 +1,5 @@ import {createApp} from 'vue'; import DiffFileTree from '../components/DiffFileTree.vue'; -import DiffFileList from '../components/DiffFileList.vue'; export function initDiffFileTree() { const el = document.getElementById('diff-file-tree'); @@ -9,11 +8,3 @@ export function initDiffFileTree() { const fileTreeView = createApp(DiffFileTree); fileTreeView.mount(el); } - -export function initDiffFileList() { - const fileListElement = document.getElementById('diff-file-list'); - if (!fileListElement) return; - - const fileListView = createApp(DiffFileList); - fileListView.mount(fileListElement); -} diff --git a/web_src/js/features/repo-diff.js b/web_src/js/features/repo-diff.js index 1c06933e89..9b62b9f94f 100644 --- a/web_src/js/features/repo-diff.js +++ b/web_src/js/features/repo-diff.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import {initCompReactionSelector} from './comp/ReactionSelector.js'; import {initRepoIssueContentHistory} from './repo-issue-content.js'; -import {initDiffFileTree, initDiffFileList} from './repo-diff-filetree.js'; +import {initDiffFileTree} from './repo-diff-filetree.js'; import {initDiffCommitSelect} from './repo-diff-commitselect.js'; import {validateTextareaNonEmpty} from './comp/ComboMarkdownEditor.js'; import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles, initExpandAndCollapseFilesButton} from './pull-view-file.js'; @@ -221,9 +221,8 @@ function initRepoDiffShowMore() { export function initRepoDiffView() { initRepoDiffConversationForm(); - if (!$('#diff-file-list').length) return; + if (!$('#diff-file-boxes').length) return; initDiffFileTree(); - initDiffFileList(); initDiffCommitSelect(); initRepoDiffShowMore(); initRepoDiffReviewButton();