From e988a25237bece5a1235d40f739900f633ce9dc4 Mon Sep 17 00:00:00 2001 From: TimedIn Date: Wed, 9 Oct 2024 14:12:46 +0200 Subject: [PATCH] Small fixes and rename for #5482 - New Issue Fixed assign me being hidden after assignees were cleared https://codeberg.org/forgejo/forgejo/pulls/5482/files#issuecomment-2365431 - Test for verifying the above - Removed wait for network idle from e2e test - Renamed templ key assigneeId to assigneeIds --- services/forms/repo_form.go | 2 +- templates/repo/issue/view_content/sidebar/assignees.tmpl | 6 +++--- tests/e2e/issue-sidebar.test.e2e.js | 6 ++---- web_src/js/features/repo-legacy.js | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 654106c47a..c3d9c3edc9 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -317,7 +317,7 @@ type WebhookForm struct { type CreateIssueForm struct { Title string `binding:"Required;MaxSize(255)"` LabelIDs string `form:"label_ids"` - AssigneeIDs string `form:"assignee_id"` + AssigneeIDs string `form:"assignee_ids"` Ref string `form:"ref"` MilestoneID int64 ProjectID int64 diff --git a/templates/repo/issue/view_content/sidebar/assignees.tmpl b/templates/repo/issue/view_content/sidebar/assignees.tmpl index 8e5043c076..7a928fae46 100644 --- a/templates/repo/issue/view_content/sidebar/assignees.tmpl +++ b/templates/repo/issue/view_content/sidebar/assignees.tmpl @@ -1,4 +1,4 @@ - +
{{ctx.Locale.Tr "repo.issues.new.assignees"}} @@ -6,7 +6,7 @@ {{svg "octicon-gear" 16 "tw-ml-1"}} {{end}} -
+
{{svg "octicon-search" 16}} @@ -36,7 +36,7 @@ {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} {{with index .Assignees 0}} – - + {{ctx.Locale.Tr "repo.issues.new.assign_to_me"}} {{end}} diff --git a/tests/e2e/issue-sidebar.test.e2e.js b/tests/e2e/issue-sidebar.test.e2e.js index 0409eab9e1..7fd60555be 100644 --- a/tests/e2e/issue-sidebar.test.e2e.js +++ b/tests/e2e/issue-sidebar.test.e2e.js @@ -119,10 +119,10 @@ test('Issue: Assignees', async ({browser}, workerInfo) => { // Clear all assignees await page.locator('.select-assignees-modify.dropdown').click(); await page.locator('.select-assignees-modify.dropdown .no-select.item').click(); - await page.waitForLoadState('networkidle'); 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(); @@ -131,20 +131,17 @@ test('Issue: Assignees', async ({browser}, workerInfo) => { 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 page.waitForLoadState('networkidle'); 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 page.waitForLoadState('networkidle'); 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 page.waitForLoadState('networkidle'); await expect(assigneesList.filter({hasText: 'user2'})).toBeVisible(); await expect(page.locator('.ui.assignees.list .item.no-select')).toBeHidden(); }); @@ -186,6 +183,7 @@ test('New Issue: Assignees', async ({browser}, workerInfo) => { 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) => { diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index cb92fcedb5..73aaa457f2 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -256,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 = `avatar`; } @@ -296,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) {