+
+
{{ctx.Locale.Tr "repo.issues.new.assignees"}}
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
{{svg "octicon-gear" 16 "tw-ml-1"}}
{{end}}
-
+
- {{ctx.Locale.Tr "repo.issues.new.no_assignees"}}
- .data('avatar')})
`;
}
@@ -314,7 +296,7 @@ export function initRepoCommentForm() {
// Milestone, Assignee, Project
selectItem('.select-project', '#project_id');
selectItem('.select-milestone', '#milestone_id');
- selectItem('.select-assignee', '#assignee_id');
+ selectItem('.select-assignee', '#assignee_ids');
}
async function onEditContent(event) {
- {{range .Issue.Assignees}}
-
diff --git a/tests/e2e/issue-sidebar.test.e2e.js b/tests/e2e/issue-sidebar.test.e2e.js
index 0311910a34..61d3281809 100644
--- a/tests/e2e/issue-sidebar.test.e2e.js
+++ b/tests/e2e/issue-sidebar.test.e2e.js
@@ -96,6 +96,89 @@ test('Issue: Labels', async ({browser}, workerInfo) => {
await expect(labelList.filter({hasText: 'label1'})).toBeVisible();
});
+test('Issue: Assignees', async ({browser}, workerInfo) => {
+ test.skip(workerInfo.project.name === 'Mobile Safari', 'Unable to get tests working on Safari Mobile, see https://codeberg.org/forgejo/forgejo/pulls/3445#issuecomment-1789636');
+ const page = await login({browser}, workerInfo);
+ // select label list in sidebar only
+ const assigneesList = page.locator('.issue-content-right .assignees.list .selected .item a');
+
+ const response = await page.goto('/org3/repo3/issues/1');
+ await expect(response?.status()).toBe(200);
+ // preconditions
+ await expect(assigneesList.filter({hasText: 'user2'})).toBeVisible();
+ await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden();
+ await expect(page.locator('.ui.assignees.list .item.no-select')).toBeHidden();
+
+ // Clear all assignees
+ await page.locator('.select-assignees-modify.dropdown').click();
+ await page.locator('.select-assignees-modify.dropdown .no-select.item').click();
+ await expect(assigneesList.filter({hasText: 'user2'})).toBeHidden();
+ await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden();
+ await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible();
+ await expect(page.locator('.select-assign-me')).toBeVisible();
+
+ // Assign other user (with searchbox)
+ await page.locator('.select-assignees-modify.dropdown').click();
+ await page.type('.select-assignees-modify .menu .search input', 'user4');
+ await expect(page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user2'})).toBeHidden();
+ await expect(page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user4'})).toBeVisible();
+ await page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user4'}).click();
+ await page.locator('.select-assignees-modify.dropdown').click();
+ await expect(assigneesList.filter({hasText: 'user4'})).toBeVisible();
+
+ // remove user4
+ await page.locator('.select-assignees-modify.dropdown').click();
+ await page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user4'}).click();
+ await page.locator('.select-assignees-modify.dropdown').click();
+ await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible();
+ await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden();
+
+ // Test assign me
+ await page.locator('.ui.assignees .select-assign-me').click();
+ await expect(assigneesList.filter({hasText: 'user2'})).toBeVisible();
+ await expect(page.locator('.ui.assignees.list .item.no-select')).toBeHidden();
+});
+
+test('New Issue: Assignees', async ({browser}, workerInfo) => {
+ test.skip(workerInfo.project.name === 'Mobile Safari', 'Unable to get tests working on Safari Mobile, see https://codeberg.org/forgejo/forgejo/pulls/3445#issuecomment-1789636');
+ const page = await login({browser}, workerInfo);
+ // select label list in sidebar only
+ const assigneesList = page.locator('.issue-content-right .assignees.list .selected .item');
+
+ const response = await page.goto('/org3/repo3/issues/new');
+ await expect(response?.status()).toBe(200);
+ // preconditions
+ await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible();
+ await expect(assigneesList.filter({hasText: 'user2'})).toBeHidden();
+ await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden();
+
+ // Assign other user (with searchbox)
+ await page.locator('.select-assignees.dropdown').click();
+ await page.type('.select-assignees .menu .search input', 'user4');
+ await expect(page.locator('.select-assignees .menu .item').filter({hasText: 'user2'})).toBeHidden();
+ await expect(page.locator('.select-assignees .menu .item').filter({hasText: 'user4'})).toBeVisible();
+ await page.locator('.select-assignees .menu .item').filter({hasText: 'user4'}).click();
+ await page.locator('.select-assignees.dropdown').click();
+ await expect(assigneesList.filter({hasText: 'user4'})).toBeVisible();
+
+ // remove user4
+ await page.locator('.select-assignees.dropdown').click();
+ await page.locator('.select-assignees .menu .item').filter({hasText: 'user4'}).click();
+ await page.locator('.select-assignees.dropdown').click();
+ await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible();
+ await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden();
+
+ // Test assign me
+ await page.locator('.ui.assignees .select-assign-me').click();
+ await expect(assigneesList.filter({hasText: 'user2'})).toBeVisible();
+ await expect(page.locator('.ui.assignees.list .item.no-select')).toBeHidden();
+
+ await page.locator('.select-assignees.dropdown').click();
+ await page.fill('.select-assignees .menu .search input', '');
+ await page.locator('.select-assignees.dropdown .no-select.item').click();
+ await expect(page.locator('.select-assign-me')).toBeVisible();
+});
+
test('Issue: Milestone', async ({browser}, workerInfo) => {
test.skip(workerInfo.project.name === 'Mobile Safari', 'Unable to get tests working on Safari Mobile, see https://codeberg.org/forgejo/forgejo/pulls/3445#issuecomment-1789636');
const page = await login({browser}, workerInfo);
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js
index feba449c16..c4bd70b71d 100644
--- a/web_src/js/features/repo-issue.js
+++ b/web_src/js/features/repo-issue.js
@@ -12,6 +12,26 @@ import {emojiHTML} from './emoji.js';
const {appSubUrl} = window.config;
+// if there are draft comments, confirm before reloading, to avoid losing comments
+export function reloadConfirmDraftComment() {
+ const commentTextareas = [
+ document.querySelector('.edit-content-zone:not(.tw-hidden) textarea'),
+ document.querySelector('#comment-form textarea'),
+ ];
+ for (const textarea of commentTextareas) {
+ // Most users won't feel too sad if they lose a comment with 10 chars, they can re-type these in seconds.
+ // But if they have typed more (like 50) chars and the comment is lost, they will be very unhappy.
+ if (textarea && textarea.value.trim().length > 10) {
+ textarea.parentElement.scrollIntoView();
+ if (!window.confirm('Page will be reloaded, but there are draft comments. Continuing to reload will discard the comments. Continue?')) {
+ return;
+ }
+ break;
+ }
+ }
+ window.location.reload();
+}
+
export function initRepoIssueTimeTracking() {
$(document).on('click', '.issue-add-time', () => {
$('.issue-start-time-modal').modal({
@@ -668,6 +688,40 @@ export function initRepoIssueBranchSelect() {
});
}
+export function initRepoIssueAssignMe() {
+ // Assign to me button
+ document.querySelector('.ui.assignees.list .item.no-select .select-assign-me')
+ ?.addEventListener('click', (e) => {
+ e.preventDefault();
+ const selectMe = e.target;
+ const noSelect = selectMe.parentElement;
+ const selectorList = document.querySelector('.ui.select-assignees .menu');
+
+ if (selectMe.getAttribute('data-action') === 'update') {
+ (async () => {
+ await updateIssuesMeta(
+ selectMe.getAttribute('data-update-url'),
+ selectMe.getAttribute('data-action'),
+ selectMe.getAttribute('data-issue-id'),
+ selectMe.getAttribute('data-id'),
+ );
+ reloadConfirmDraftComment();
+ })();
+ } else {
+ for (const item of selectorList.querySelectorAll('.item')) {
+ if (item.getAttribute('data-id') === selectMe.getAttribute('data-id')) {
+ item.classList.add('checked');
+ item.querySelector('.octicon-check').classList.remove('tw-invisible');
+ }
+ }
+ document.querySelector(selectMe.getAttribute('data-id-selector')).classList.remove('tw-hidden');
+ noSelect.classList.add('tw-hidden');
+ document.querySelector(selectorList.getAttribute('data-id')).value = selectMe.getAttribute('data-id');
+ return false;
+ }
+ });
+}
+
export function initSingleCommentEditor($commentForm) {
// pages:
// * normal new issue/pr page, no status-button
diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js
index b25fc28dea..73aaa457f2 100644
--- a/web_src/js/features/repo-legacy.js
+++ b/web_src/js/features/repo-legacy.js
@@ -4,6 +4,7 @@ import {
initRepoIssueComments, initRepoIssueDependencyDelete, initRepoIssueReferenceIssue,
initRepoIssueTitleEdit, initRepoIssueWipToggle,
initRepoPullRequestUpdate, updateIssuesMeta, handleReply, initIssueTemplateCommentEditors, initSingleCommentEditor,
+ initRepoIssueAssignMe, reloadConfirmDraftComment,
} from './repo-issue.js';
import {initUnicodeEscapeButton} from './repo-unicode-escape.js';
import {svg} from '../svg.js';
@@ -29,26 +30,6 @@ import {POST, GET} from '../modules/fetch.js';
const {csrfToken} = window.config;
-// if there are draft comments, confirm before reloading, to avoid losing comments
-function reloadConfirmDraftComment() {
- const commentTextareas = [
- document.querySelector('.edit-content-zone:not(.tw-hidden) textarea'),
- document.querySelector('#comment-form textarea'),
- ];
- for (const textarea of commentTextareas) {
- // Most users won't feel too sad if they lose a comment with 10 chars, they can re-type these in seconds.
- // But if they have typed more (like 50) chars and the comment is lost, they will be very unhappy.
- if (textarea && textarea.value.trim().length > 10) {
- textarea.parentElement.scrollIntoView();
- if (!window.confirm('Page will be reloaded, but there are draft comments. Continuing to reload will discard the comments. Continue?')) {
- return;
- }
- break;
- }
- }
- window.location.reload();
-}
-
export function initRepoCommentForm() {
const $commentForm = $('.comment.form');
if (!$commentForm.length) return;
@@ -243,6 +224,7 @@ export function initRepoCommentForm() {
// Init labels and assignees
initListSubmits('select-label', 'labels');
initListSubmits('select-assignees', 'assignees');
+ initRepoIssueAssignMe();
initListSubmits('select-assignees-modify', 'assignees');
initListSubmits('select-reviewers-modify', 'assignees');
@@ -274,7 +256,7 @@ export function initRepoCommentForm() {
icon = svg('octicon-milestone', 18, 'tw-mr-2');
} else if (input_id === '#project_id') {
icon = svg('octicon-project', 18, 'tw-mr-2');
- } else if (input_id === '#assignee_id') {
+ } else if (input_id === '#assignee_ids') {
icon = `
-
- {{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}}
- {{.GetDisplayName}}
+
+ {{ctx.Locale.Tr "repo.issues.new.no_assignees"}}
+ {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
+ {{with index .Assignees 0}}
+ –
+
+ {{ctx.Locale.Tr "repo.issues.new.assign_to_me"}}
-
+ {{end}}
+ {{end}}
+
+
+ {{if .isExistingIssue}}
+ {{range .Issue.Assignees}}
+
+ {{end}}
+ {{else}}
+ {{range .Assignees}}
+
+ {{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}}{{.GetDisplayName}}
+
+ {{end}}
{{end}}