2022-01-28 21:00:11 +00:00
|
|
|
import $ from 'jquery';
|
2021-10-10 22:40:03 +00:00
|
|
|
import {svg} from '../svg.js';
|
2023-06-27 02:45:24 +00:00
|
|
|
import {showErrorToast} from '../modules/toast.js';
|
2024-03-10 19:26:41 +00:00
|
|
|
import {GET, POST} from '../modules/fetch.js';
|
2021-10-10 22:40:03 +00:00
|
|
|
|
2024-03-10 19:26:41 +00:00
|
|
|
const {appSubUrl} = window.config;
|
2021-10-10 22:40:03 +00:00
|
|
|
let i18nTextEdited;
|
|
|
|
let i18nTextOptions;
|
|
|
|
let i18nTextDeleteFromHistory;
|
|
|
|
let i18nTextDeleteFromHistoryConfirm;
|
|
|
|
|
|
|
|
function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleHtml) {
|
|
|
|
let $dialog = $('.content-history-detail-dialog');
|
|
|
|
if ($dialog.length) return;
|
|
|
|
|
|
|
|
$dialog = $(`
|
2021-10-23 14:47:38 +00:00
|
|
|
<div class="ui modal content-history-detail-dialog">
|
2022-12-02 09:42:34 +00:00
|
|
|
${svg('octicon-x', 16, 'close icon inside')}
|
2024-03-22 19:51:29 +00:00
|
|
|
<div class="header tw-flex tw-items-center tw-justify-between">
|
2022-12-02 09:42:34 +00:00
|
|
|
<div>${itemTitleHtml}</div>
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 16:42:49 +00:00
|
|
|
<div class="ui dropdown dialog-header-options tw-mr-8 gt-hidden">
|
2023-09-28 08:43:20 +00:00
|
|
|
${i18nTextOptions}
|
|
|
|
${svg('octicon-triangle-down', 14, 'dropdown icon')}
|
2021-10-10 22:40:03 +00:00
|
|
|
<div class="menu">
|
|
|
|
<div class="item red text" data-option-item="delete">${i18nTextDeleteFromHistory}</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
2023-09-28 08:43:20 +00:00
|
|
|
<div class="comment-diff-data is-loading"></div>
|
2021-10-10 22:40:03 +00:00
|
|
|
</div>`);
|
|
|
|
$dialog.appendTo($('body'));
|
|
|
|
$dialog.find('.dialog-header-options').dropdown({
|
|
|
|
showOnFocus: false,
|
|
|
|
allowReselection: true,
|
2024-03-10 19:26:41 +00:00
|
|
|
async onChange(_value, _text, $item) {
|
2021-10-10 22:40:03 +00:00
|
|
|
const optionItem = $item.data('option-item');
|
|
|
|
if (optionItem === 'delete') {
|
|
|
|
if (window.confirm(i18nTextDeleteFromHistoryConfirm)) {
|
2024-03-10 19:26:41 +00:00
|
|
|
try {
|
|
|
|
const params = new URLSearchParams();
|
|
|
|
params.append('comment_id', commentId);
|
|
|
|
params.append('history_id', historyId);
|
|
|
|
|
|
|
|
const response = await POST(`${issueBaseUrl}/content-history/soft-delete?${params.toString()}`);
|
|
|
|
const resp = await response.json();
|
|
|
|
|
2021-10-10 22:40:03 +00:00
|
|
|
if (resp.ok) {
|
|
|
|
$dialog.modal('hide');
|
|
|
|
} else {
|
2023-06-27 02:45:24 +00:00
|
|
|
showErrorToast(resp.message);
|
2021-10-10 22:40:03 +00:00
|
|
|
}
|
2024-03-10 19:26:41 +00:00
|
|
|
} catch (error) {
|
|
|
|
console.error('Error:', error);
|
|
|
|
showErrorToast('An error occurred while deleting the history.');
|
|
|
|
}
|
2021-10-10 22:40:03 +00:00
|
|
|
}
|
|
|
|
} else { // required by eslint
|
2023-06-27 02:45:24 +00:00
|
|
|
showErrorToast(`unknown option item: ${optionItem}`);
|
2021-10-10 22:40:03 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
onHide() {
|
|
|
|
$(this).dropdown('clear', true);
|
2024-03-22 14:06:53 +00:00
|
|
|
},
|
2021-10-10 22:40:03 +00:00
|
|
|
});
|
|
|
|
$dialog.modal({
|
2024-03-10 19:26:41 +00:00
|
|
|
async onShow() {
|
|
|
|
try {
|
|
|
|
const params = new URLSearchParams();
|
|
|
|
params.append('comment_id', commentId);
|
|
|
|
params.append('history_id', historyId);
|
|
|
|
|
|
|
|
const url = `${issueBaseUrl}/content-history/detail?${params.toString()}`;
|
|
|
|
const response = await GET(url);
|
|
|
|
const resp = await response.json();
|
|
|
|
|
2022-12-02 09:42:34 +00:00
|
|
|
$dialog.find('.comment-diff-data').removeClass('is-loading').html(resp.diffHtml);
|
2021-10-10 22:40:03 +00:00
|
|
|
// there is only one option "item[data-option-item=delete]", so the dropdown can be entirely shown/hidden.
|
|
|
|
if (resp.canSoftDelete) {
|
2023-02-19 04:06:14 +00:00
|
|
|
$dialog.find('.dialog-header-options').removeClass('gt-hidden');
|
2021-10-10 22:40:03 +00:00
|
|
|
}
|
2024-03-10 19:26:41 +00:00
|
|
|
} catch (error) {
|
|
|
|
console.error('Error:', error);
|
|
|
|
}
|
2021-10-10 22:40:03 +00:00
|
|
|
},
|
|
|
|
onHidden() {
|
|
|
|
$dialog.remove();
|
|
|
|
},
|
|
|
|
}).modal('show');
|
|
|
|
}
|
|
|
|
|
|
|
|
function showContentHistoryMenu(issueBaseUrl, $item, commentId) {
|
|
|
|
const $headerLeft = $item.find('.comment-header-left');
|
|
|
|
const menuHtml = `
|
2023-06-14 16:40:15 +00:00
|
|
|
<div class="ui dropdown interact-fg content-history-menu" data-comment-id="${commentId}">
|
|
|
|
• ${i18nTextEdited}${svg('octicon-triangle-down', 14, 'dropdown icon')}
|
2021-10-10 22:40:03 +00:00
|
|
|
<div class="menu">
|
|
|
|
</div>
|
|
|
|
</div>`;
|
|
|
|
|
|
|
|
$headerLeft.find(`.content-history-menu`).remove();
|
|
|
|
$headerLeft.append($(menuHtml));
|
|
|
|
$headerLeft.find('.dropdown').dropdown({
|
|
|
|
action: 'hide',
|
|
|
|
apiSettings: {
|
|
|
|
cache: false,
|
|
|
|
url: `${issueBaseUrl}/content-history/list?comment_id=${commentId}`,
|
|
|
|
},
|
|
|
|
saveRemoteData: false,
|
|
|
|
onHide() {
|
|
|
|
$(this).dropdown('change values', null);
|
|
|
|
},
|
|
|
|
onChange(value, itemHtml, $item) {
|
|
|
|
if (value && !$item.find('[data-history-is-deleted=1]').length) {
|
|
|
|
showContentHistoryDetail(issueBaseUrl, commentId, value, itemHtml);
|
|
|
|
}
|
|
|
|
},
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2024-03-10 19:26:41 +00:00
|
|
|
export async function initRepoIssueContentHistory() {
|
2021-10-10 22:40:03 +00:00
|
|
|
const issueIndex = $('#issueIndex').val();
|
2021-11-22 12:20:16 +00:00
|
|
|
if (!issueIndex) return;
|
|
|
|
|
|
|
|
const $itemIssue = $('.repository.issue .timeline-item.comment.first'); // issue(PR) main content
|
2022-01-18 17:28:38 +00:00
|
|
|
const $comments = $('.repository.issue .comment-list .comment'); // includes: issue(PR) comments, review comments, code comments
|
2021-11-22 12:20:16 +00:00
|
|
|
if (!$itemIssue.length && !$comments.length) return;
|
2021-10-10 22:40:03 +00:00
|
|
|
|
|
|
|
const repoLink = $('#repolink').val();
|
2021-10-21 07:37:43 +00:00
|
|
|
const issueBaseUrl = `${appSubUrl}/${repoLink}/issues/${issueIndex}`;
|
2021-10-10 22:40:03 +00:00
|
|
|
|
2024-03-10 19:26:41 +00:00
|
|
|
try {
|
|
|
|
const response = await GET(`${issueBaseUrl}/content-history/overview`);
|
|
|
|
const resp = await response.json();
|
|
|
|
|
2021-10-10 22:40:03 +00:00
|
|
|
i18nTextEdited = resp.i18n.textEdited;
|
|
|
|
i18nTextDeleteFromHistory = resp.i18n.textDeleteFromHistory;
|
|
|
|
i18nTextDeleteFromHistoryConfirm = resp.i18n.textDeleteFromHistoryConfirm;
|
|
|
|
i18nTextOptions = resp.i18n.textOptions;
|
|
|
|
|
2021-11-22 12:20:16 +00:00
|
|
|
if (resp.editedHistoryCountMap[0] && $itemIssue.length) {
|
2021-10-10 22:40:03 +00:00
|
|
|
showContentHistoryMenu(issueBaseUrl, $itemIssue, '0');
|
|
|
|
}
|
|
|
|
for (const [commentId, _editedCount] of Object.entries(resp.editedHistoryCountMap)) {
|
|
|
|
if (commentId === '0') continue;
|
|
|
|
const $itemComment = $(`#issuecomment-${commentId}`);
|
|
|
|
showContentHistoryMenu(issueBaseUrl, $itemComment, commentId);
|
|
|
|
}
|
2024-03-10 19:26:41 +00:00
|
|
|
} catch (error) {
|
|
|
|
console.error('Error:', error);
|
|
|
|
}
|
2021-10-10 22:40:03 +00:00
|
|
|
}
|