From a5f7acdd2e83f4e62369c71009483f9f71a0c564 Mon Sep 17 00:00:00 2001
From: Gusted <postmaster@gusted.xyz>
Date: Sat, 19 Jul 2025 16:34:21 +0200
Subject: [PATCH] fix: allow for tracked time to be removed again (#8575)

- `getElementById` requires a id to be passed and not a query selector, change it to `querySelector`.
- Regression of forgejo/forgejo#7408
- Resolves forgejo/forgejo#8571
- Add E2E tests for adding manual tracked time and removing it.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8575
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-committed-by: Gusted <postmaster@gusted.xyz>
---
 tests/e2e/issue-timetracking.test.e2e.ts | 48 ++++++++++++++++++++++++
 web_src/js/features/repo-issue.js        |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 tests/e2e/issue-timetracking.test.e2e.ts

diff --git a/tests/e2e/issue-timetracking.test.e2e.ts b/tests/e2e/issue-timetracking.test.e2e.ts
new file mode 100644
index 0000000000..901cbe793f
--- /dev/null
+++ b/tests/e2e/issue-timetracking.test.e2e.ts
@@ -0,0 +1,48 @@
+// @watch start
+// web_src/js/features/comp/**
+// web_src/js/features/repo-**
+// templates/repo/issue/view_content/*
+// @watch end
+
+import {expect} from '@playwright/test';
+import {test, save_visual} from './utils_e2e.ts';
+
+test.use({user: 'user2'});
+
+test('Issue timetracking', async ({page}) => {
+  await page.goto('/user2/repo1/issues/new');
+
+  // Create temporary issue.
+  await page.getByPlaceholder('Title').fill('Just a title');
+  await page.getByPlaceholder('Leave a comment').fill('Hi, have you considered using a rotating fish as logo?');
+  await page.getByRole('button', {name: 'Create issue'}).click();
+  await expect(page).toHaveURL(/\/user2\/repo1\/issues\/\d+$/);
+
+  // Manually add time to the time tracker.
+  await page.getByRole('button', {name: 'Add time'}).click();
+  await page.getByPlaceholder('Hours').fill('5');
+  await page.getByPlaceholder('Minutes').fill('32');
+  await page.getByRole('button', {name: 'Add time', exact: true}).click();
+
+  // Verify this was added in the timeline.
+  await expect(page.locator('.ui.timeline')).toContainText('added spent time');
+  await expect(page.locator('.ui.timeline')).toContainText('5 hours 32 minutes');
+
+  // Verify it is shown in the issue sidebar
+  await expect(page.locator('.issue-content-right .comments')).toContainText('Total time spent: 5 hours 32 minutes');
+
+  await save_visual(page);
+
+  // Delete the added time.
+  await page.getByRole('button', {name: 'Delete this time log'}).click();
+  await page.getByRole('button', {name: 'Yes'}).click();
+
+  // Verify this was removed in the timeline.
+  await expect(page.locator('.ui.timeline')).toContainText('deleted spent time');
+  await expect(page.locator('.ui.timeline')).toContainText('- 5 hours 32 minutes');
+
+  // Delete the issue.
+  await page.getByRole('button', {name: 'Delete'}).click();
+  await page.getByRole('button', {name: 'Yes'}).click();
+  await expect(page).toHaveURL('/user2/repo1/issues');
+});
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js
index d678d9195b..84b8e42a61 100644
--- a/web_src/js/features/repo-issue.js
+++ b/web_src/js/features/repo-issue.js
@@ -57,7 +57,7 @@ export function initRepoIssueTimeTracking() {
     $(sel).modal({
       duration: 200,
       onApprove() {
-        document.getElementById(`${sel} form`).requestSubmit();
+        document.querySelector(`${sel} form`).requestSubmit();
       },
     }).modal('show');
   });