From f4e38e6367326276c9493d950cdb85718d244fdf Mon Sep 17 00:00:00 2001
From: Zettat123 <zettat123@gmail.com>
Date: Fri, 28 Nov 2025 12:33:52 -0700
Subject: [PATCH 01/15] Fix Actions `pull_request.paths` being triggered
 incorrectly by rebase (#36045)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Partially fix #34710

The bug described in #34710 can be divided into two parts: `push.paths`
and `pull_request.paths`. This PR fixes the issue related to
`pull_request.paths`. The root cause is that the check for whether the
workflow can be triggered happens **before** updating the PR’s merge
base. This causes the file-change detection to use the old merge base.
Therefore, we need to update the merge base first and then check whether
the workflow can be triggered.
---
 services/pull/pull.go                     | 30 ++++++++-----
 services/pull/review.go                   |  2 +-
 tests/integration/actions_trigger_test.go | 54 +++++++++++++++++++++++
 3 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/services/pull/pull.go b/services/pull/pull.go
index 6f0318ea49..04f48f0565 100644
--- a/services/pull/pull.go
+++ b/services/pull/pull.go
@@ -427,10 +427,16 @@ func AddTestPullRequestTask(opts TestPullRequestOptions) {
 				for _, pr := range headBranchPRs {
 					objectFormat := git.ObjectFormatFromName(pr.BaseRepo.ObjectFormatName)
 					if opts.NewCommitID != "" && opts.NewCommitID != objectFormat.EmptyObjectID().String() {
-						changed, err := checkIfPRContentChanged(ctx, pr, opts.OldCommitID, opts.NewCommitID)
+						changed, newMergeBase, err := checkIfPRContentChanged(ctx, pr, opts.OldCommitID, opts.NewCommitID)
 						if err != nil {
 							log.Error("checkIfPRContentChanged: %v", err)
 						}
+						if newMergeBase != "" && pr.MergeBase != newMergeBase {
+							pr.MergeBase = newMergeBase
+							if _, err := pr.UpdateColsIfNotMerged(ctx, "merge_base"); err != nil {
+								log.Error("Update merge base for %-v: %v", pr, err)
+							}
+						}
 						if changed {
 							// Mark old reviews as stale if diff to mergebase has changed
 							if err := issues_model.MarkReviewsAsStale(ctx, pr.IssueID); err != nil {
@@ -496,30 +502,30 @@ func AddTestPullRequestTask(opts TestPullRequestOptions) {
 
 // checkIfPRContentChanged checks if diff to target branch has changed by push
 // A commit can be considered to leave the PR untouched if the patch/diff with its merge base is unchanged
-func checkIfPRContentChanged(ctx context.Context, pr *issues_model.PullRequest, oldCommitID, newCommitID string) (hasChanged bool, err error) {
+func checkIfPRContentChanged(ctx context.Context, pr *issues_model.PullRequest, oldCommitID, newCommitID string) (hasChanged bool, mergeBase string, err error) {
 	prCtx, cancel, err := createTemporaryRepoForPR(ctx, pr) // FIXME: why it still needs to create a temp repo, since the alongside calls like GetDiverging doesn't do so anymore
 	if err != nil {
 		log.Error("CreateTemporaryRepoForPR %-v: %v", pr, err)
-		return false, err
+		return false, "", err
 	}
 	defer cancel()
 
 	tmpRepo, err := git.OpenRepository(ctx, prCtx.tmpBasePath)
 	if err != nil {
-		return false, fmt.Errorf("OpenRepository: %w", err)
+		return false, "", fmt.Errorf("OpenRepository: %w", err)
 	}
 	defer tmpRepo.Close()
 
 	// Find the merge-base
-	_, base, err := tmpRepo.GetMergeBase("", "base", "tracking")
+	mergeBase, _, err = tmpRepo.GetMergeBase("", "base", "tracking")
 	if err != nil {
-		return false, fmt.Errorf("GetMergeBase: %w", err)
+		return false, "", fmt.Errorf("GetMergeBase: %w", err)
 	}
 
-	cmd := gitcmd.NewCommand("diff", "--name-only", "-z").AddDynamicArguments(newCommitID, oldCommitID, base)
+	cmd := gitcmd.NewCommand("diff", "--name-only", "-z").AddDynamicArguments(newCommitID, oldCommitID, mergeBase)
 	stdoutReader, stdoutWriter, err := os.Pipe()
 	if err != nil {
-		return false, fmt.Errorf("unable to open pipe for to run diff: %w", err)
+		return false, mergeBase, fmt.Errorf("unable to open pipe for to run diff: %w", err)
 	}
 
 	stderr := new(bytes.Buffer)
@@ -535,19 +541,19 @@ func checkIfPRContentChanged(ctx context.Context, pr *issues_model.PullRequest,
 		}).
 		Run(ctx); err != nil {
 		if err == util.ErrNotEmpty {
-			return true, nil
+			return true, mergeBase, nil
 		}
 		err = gitcmd.ConcatenateError(err, stderr.String())
 
 		log.Error("Unable to run diff on %s %s %s in tempRepo for PR[%d]%s/%s...%s/%s: Error: %v",
-			newCommitID, oldCommitID, base,
+			newCommitID, oldCommitID, mergeBase,
 			pr.ID, pr.BaseRepo.FullName(), pr.BaseBranch, pr.HeadRepo.FullName(), pr.HeadBranch,
 			err)
 
-		return false, fmt.Errorf("Unable to run git diff --name-only -z %s %s %s: %w", newCommitID, oldCommitID, base, err)
+		return false, mergeBase, fmt.Errorf("Unable to run git diff --name-only -z %s %s %s: %w", newCommitID, oldCommitID, mergeBase, err)
 	}
 
-	return false, nil
+	return false, mergeBase, nil
 }
 
 // PushToBaseRepo pushes commits from branches of head repository to
diff --git a/services/pull/review.go b/services/pull/review.go
index 3977e351ca..9aeeb4c31d 100644
--- a/services/pull/review.go
+++ b/services/pull/review.go
@@ -333,7 +333,7 @@ func SubmitReview(ctx context.Context, doer *user_model.User, gitRepo *git.Repos
 		if headCommitID == commitID {
 			stale = false
 		} else {
-			stale, err = checkIfPRContentChanged(ctx, pr, commitID, headCommitID)
+			stale, _, err = checkIfPRContentChanged(ctx, pr, commitID, headCommitID)
 			if err != nil {
 				return nil, nil, err
 			}
diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go
index d5486b6a39..9dc0ddb9df 100644
--- a/tests/integration/actions_trigger_test.go
+++ b/tests/integration/actions_trigger_test.go
@@ -30,6 +30,7 @@ import (
 	"code.gitea.io/gitea/modules/test"
 	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/util"
+	webhook_module "code.gitea.io/gitea/modules/webhook"
 	issue_service "code.gitea.io/gitea/services/issue"
 	pull_service "code.gitea.io/gitea/services/pull"
 	release_service "code.gitea.io/gitea/services/release"
@@ -1595,3 +1596,56 @@ jobs:
 		assert.NotNil(t, run)
 	})
 }
+
+func TestPullRequestWithPathsRebase(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		session := loginUser(t, user2.Name)
+		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+
+		repoName := "actions-pr-paths-rebase"
+		apiRepo := createActionsTestRepo(t, token, repoName, false)
+		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiRepo.ID})
+		apiCtx := NewAPITestContext(t, "user2", repoName, auth_model.AccessTokenScopeWriteRepository)
+		runner := newMockRunner()
+		runner.registerAsRepoRunner(t, "user2", repoName, "mock-runner", []string{"ubuntu-latest"}, false)
+
+		// init files and dirs
+		testCreateFile(t, session, "user2", repoName, repo.DefaultBranch, "", "dir1/dir1.txt", "1")
+		testCreateFile(t, session, "user2", repoName, repo.DefaultBranch, "", "dir2/dir2.txt", "2")
+		wfFileContent := `name: ci
+on: 
+  pull_request:
+    paths:
+      - 'dir1/**'
+jobs:
+  ci-job:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo 'ci'
+`
+		testCreateFile(t, session, "user2", repoName, repo.DefaultBranch, "", ".gitea/workflows/ci.yml", wfFileContent)
+
+		// create a PR to modify "dir1/dir1.txt", the workflow will be triggered
+		testEditFileToNewBranch(t, session, "user2", repoName, repo.DefaultBranch, "update-dir1", "dir1/dir1.txt", "11")
+		_, err := doAPICreatePullRequest(apiCtx, "user2", repoName, repo.DefaultBranch, "update-dir1")(t)
+		assert.NoError(t, err)
+		pr1Task := runner.fetchTask(t)
+		_, _, pr1Run := getTaskAndJobAndRunByTaskID(t, pr1Task.Id)
+		assert.Equal(t, webhook_module.HookEventPullRequest, pr1Run.Event)
+
+		// create a PR to modify "dir2/dir2.txt" then update main branch and rebase, the workflow will not be triggered
+		testEditFileToNewBranch(t, session, "user2", repoName, repo.DefaultBranch, "update-dir2", "dir2/dir2.txt", "22")
+		apiPull, err := doAPICreatePullRequest(apiCtx, "user2", repoName, repo.DefaultBranch, "update-dir2")(t)
+		runner.fetchNoTask(t)
+		assert.NoError(t, err)
+		testEditFile(t, session, "user2", repoName, repo.DefaultBranch, "dir1/dir1.txt", "11") // change the file in "dir1"
+		req := NewRequestWithValues(t, "POST",
+			fmt.Sprintf("/%s/%s/pulls/%d/update?style=rebase", "user2", repoName, apiPull.Index), // update by rebase
+			map[string]string{
+				"_csrf": GetUserCSRFToken(t, session),
+			})
+		session.MakeRequest(t, req, http.StatusSeeOther)
+		runner.fetchNoTask(t)
+	})
+}

From b54af8811efb8e37b9c2e2d56dbc67f689132f83 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sat, 29 Nov 2025 15:13:22 +0100
Subject: [PATCH 02/15] Replace `lint-go-gopls` with additional `govet` linters
 (#36028)

Many (but not all) analyzers ran by `gopls check` are available in
`golangci-lint` as part of default-disabled `govet` linters, so I think
it's best we remove this manual linting step and let `golangci-lint`
handle it. I hand-picked two available linters that were previously
linted using gopls and this list is not exhaustive.

This will reduce CI time by about 3 minutes.
---
 .golangci.yml          |  4 ++++
 Makefile               |  9 +--------
 tools/lint-go-gopls.sh | 23 -----------------------
 3 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100755 tools/lint-go-gopls.sh

diff --git a/.golangci.yml b/.golangci.yml
index 60482c415f..2f1587a1e6 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -114,6 +114,10 @@ linters:
         - stringsbuilder
     perfsprint:
       concat-loop: false
+    govet:
+      enable:
+        - nilness
+        - unusedwrite
   exclusions:
     generated: lax
     presets:
diff --git a/Makefile b/Makefile
index 4a7e73e582..647ab38e14 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@ XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
 GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1
 GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1
 ACTIONLINT_PACKAGE ?= github.com/rhysd/actionlint/cmd/actionlint@v1.7.9
-GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.20.0
 
 DOCKER_IMAGE ?= gitea/gitea
 DOCKER_TAG ?= latest
@@ -333,7 +332,7 @@ lint-frontend: lint-js lint-css ## lint frontend files
 lint-frontend-fix: lint-js-fix lint-css-fix ## lint frontend files and fix issues
 
 .PHONY: lint-backend
-lint-backend: lint-go lint-go-gitea-vet lint-go-gopls lint-editorconfig ## lint backend files
+lint-backend: lint-go lint-go-gitea-vet lint-editorconfig ## lint backend files
 
 .PHONY: lint-backend-fix
 lint-backend-fix: lint-go-fix lint-go-gitea-vet lint-editorconfig ## lint backend files and fix issues
@@ -396,11 +395,6 @@ lint-go-gitea-vet: ## lint go files with gitea-vet
 	@echo "Running gitea-vet..."
 	@$(GO) vet -vettool="$(shell GOOS= GOARCH= go tool -n gitea-vet)" ./...
 
-.PHONY: lint-go-gopls
-lint-go-gopls: ## lint go files with gopls
-	@echo "Running gopls check..."
-	@GO=$(GO) GOPLS_PACKAGE=$(GOPLS_PACKAGE) tools/lint-go-gopls.sh $(GO_SOURCES)
-
 .PHONY: lint-editorconfig
 lint-editorconfig:
 	@echo "Running editorconfig check..."
@@ -844,7 +838,6 @@ deps-tools: ## install tool dependencies
 	$(GO) install $(GO_LICENSES_PACKAGE) & \
 	$(GO) install $(GOVULNCHECK_PACKAGE) & \
 	$(GO) install $(ACTIONLINT_PACKAGE) & \
-	$(GO) install $(GOPLS_PACKAGE) & \
 	wait
 
 node_modules: pnpm-lock.yaml
diff --git a/tools/lint-go-gopls.sh b/tools/lint-go-gopls.sh
deleted file mode 100755
index 2cd26ca6fe..0000000000
--- a/tools/lint-go-gopls.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-set -uo pipefail
-
-cd "$(dirname -- "${BASH_SOURCE[0]}")" && cd ..
-
-IGNORE_PATTERNS=(
-  "is deprecated" # TODO: fix these
-)
-
-# lint all go files with 'gopls check' and look for lines starting with the
-# current absolute path, indicating a error was found. This is necessary
-# because the tool does not set non-zero exit code when errors are found.
-# ref: https://github.com/golang/go/issues/67078
-ERROR_LINES=$("$GO" run "$GOPLS_PACKAGE" check -severity=warning "$@" 2>/dev/null | grep -E "^$PWD" | grep -vFf <(printf '%s\n' "${IGNORE_PATTERNS[@]}"));
-NUM_ERRORS=$(echo -n "$ERROR_LINES" | wc -l)
-
-if [ "$NUM_ERRORS" -eq "0" ]; then
-  exit 0;
-else
-  echo "$ERROR_LINES"
-  echo "Found $NUM_ERRORS 'gopls check' errors"
-  exit 1;
-fi

From 7d6861ac54f6040b73ae3c929be6fb523a392660 Mon Sep 17 00:00:00 2001
From: Bryan Mutai <mutaiwork@gmail.com>
Date: Sun, 30 Nov 2025 06:58:15 +0300
Subject: [PATCH 03/15] Add "Go to file", "Delete Directory" to repo file list
 page (#35911)

/claim #35898
Resolves #35898

### Summary of key changes:

1. Add file name search/Go to file functionality to repo button row.
2. Add backend functionality to delete directory
3. Add context menu for directories with functionality to copy path & delete a directory
4. Move Add/Upload file dropdown to right for parity with Github UI
5. Add tree view to the edit/upload UI

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
---
 options/locale/locale_en-US.ini               |   3 +
 routers/api/v1/repo/file.go                   |   4 -
 routers/web/repo/blame.go                     |  14 +-
 routers/web/repo/editor.go                    |  50 +++-
 routers/web/repo/editor_apply_patch.go        |   2 +-
 routers/web/repo/editor_cherry_pick.go        |   2 +-
 routers/web/repo/find.go                      |  24 --
 routers/web/repo/view.go                      |  51 ++--
 routers/web/repo/view_home.go                 |  51 ++--
 routers/web/web.go                            |   1 -
 services/repository/files/temp_repo.go        |   8 +
 services/repository/files/update.go           |  53 +---
 templates/repo/editor/delete.tmpl             |  29 ++-
 templates/repo/editor/edit.tmpl               |  92 +++----
 templates/repo/editor/upload.tmpl             |  28 ++-
 templates/repo/find/files.tmpl                |  21 --
 templates/repo/view.tmpl                      |   4 +-
 templates/repo/view_content.tmpl              |  86 ++++---
 templates/repo/view_file_tree.tmpl            |  30 +--
 .../repo/view_file_tree_toggle_button.tmpl    |   6 +
 templates/repo/view_list.tmpl                 |   2 +-
 tests/integration/api_repo_file_helpers.go    |   3 +-
 tests/integration/repofiles_change_test.go    | 197 ++++++---------
 web_src/css/editor/fileeditor.css             |  20 --
 web_src/css/modules/animations.css            |   2 +-
 web_src/css/repo.css                          |  58 +++--
 web_src/css/repo/home.css                     |  10 +-
 web_src/css/themes/theme-gitea-dark.css       |   1 +
 web_src/css/themes/theme-gitea-light.css      |   1 +
 web_src/js/components/RepoFileSearch.vue      | 230 ++++++++++++++++++
 web_src/js/features/repo-findfile.ts          |  65 +----
 web_src/js/features/repo-view-file-tree.ts    |   8 +-
 web_src/js/index-domready.ts                  |   4 +-
 33 files changed, 671 insertions(+), 489 deletions(-)
 delete mode 100644 routers/web/repo/find.go
 delete mode 100644 templates/repo/find/files.tmpl
 create mode 100644 templates/repo/view_file_tree_toggle_button.tmpl
 create mode 100644 web_src/js/components/RepoFileSearch.vue

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index b5b90b31a5..6712250924 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1354,8 +1354,11 @@ editor.this_file_locked = File is locked
 editor.must_be_on_a_branch = You must be on a branch to make or propose changes to this file.
 editor.fork_before_edit = You must fork this repository to make or propose changes to this file.
 editor.delete_this_file = Delete File
+editor.delete_this_directory = Delete Directory
 editor.must_have_write_access = You must have write access to make or propose changes to this file.
 editor.file_delete_success = File "%s" has been deleted.
+editor.directory_delete_success = Directory "%s" has been deleted.
+editor.delete_directory = Delete directory '%s'
 editor.name_your_file = Name your file…
 editor.filename_help = Add a directory by typing its name followed by a slash ('/'). Remove a directory by typing backspace at the beginning of the input field.
 editor.or = or
diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go
index ec34d54d22..27a0827a10 100644
--- a/routers/api/v1/repo/file.go
+++ b/routers/api/v1/repo/file.go
@@ -610,10 +610,6 @@ func handleChangeRepoFilesError(ctx *context.APIContext, err error) {
 		ctx.APIError(http.StatusUnprocessableEntity, err)
 		return
 	}
-	if git.IsErrBranchNotExist(err) || files_service.IsErrRepoFileDoesNotExist(err) || git.IsErrNotExist(err) {
-		ctx.APIError(http.StatusNotFound, err)
-		return
-	}
 	if errors.Is(err, util.ErrNotExist) {
 		ctx.APIError(http.StatusNotFound, err)
 		return
diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go
index e304633f95..0eebff6aa8 100644
--- a/routers/web/repo/blame.go
+++ b/routers/web/repo/blame.go
@@ -10,7 +10,6 @@ import (
 	"net/url"
 	"path"
 	"strconv"
-	"strings"
 
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
@@ -42,8 +41,8 @@ type blameRow struct {
 
 // RefBlame render blame page
 func RefBlame(ctx *context.Context) {
-	ctx.Data["PageIsViewCode"] = true
 	ctx.Data["IsBlame"] = true
+	prepareRepoViewContent(ctx, ctx.Repo.RefTypeNameSubURL())
 
 	// Get current entry user currently looking at.
 	if ctx.Repo.TreePath == "" {
@@ -56,17 +55,6 @@ func RefBlame(ctx *context.Context) {
 		return
 	}
 
-	treeNames := strings.Split(ctx.Repo.TreePath, "/")
-	var paths []string
-	for i := range treeNames {
-		paths = append(paths, strings.Join(treeNames[:i+1], "/"))
-	}
-
-	ctx.Data["Paths"] = paths
-	ctx.Data["TreeNames"] = treeNames
-	ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.RefTypeNameSubURL()
-	ctx.Data["RawFileLink"] = ctx.Repo.RepoLink + "/raw/" + ctx.Repo.RefTypeNameSubURL() + "/" + util.PathEscapeSegments(ctx.Repo.TreePath)
-
 	blob := entry.Blob()
 	fileSize := blob.Size()
 	ctx.Data["FileSize"] = fileSize
diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go
index 8c630cb35f..983249a6d2 100644
--- a/routers/web/repo/editor.go
+++ b/routers/web/repo/editor.go
@@ -41,7 +41,12 @@ const (
 	editorCommitChoiceNewBranch string = "commit-to-new-branch"
 )
 
-func prepareEditorCommitFormOptions(ctx *context.Context, editorAction string) *context.CommitFormOptions {
+func prepareEditorPage(ctx *context.Context, editorAction string) *context.CommitFormOptions {
+	prepareHomeTreeSideBarSwitch(ctx)
+	return prepareEditorPageFormOptions(ctx, editorAction)
+}
+
+func prepareEditorPageFormOptions(ctx *context.Context, editorAction string) *context.CommitFormOptions {
 	cleanedTreePath := files_service.CleanGitTreePath(ctx.Repo.TreePath)
 	if cleanedTreePath != ctx.Repo.TreePath {
 		redirectTo := fmt.Sprintf("%s/%s/%s/%s", ctx.Repo.RepoLink, editorAction, util.PathEscapeSegments(ctx.Repo.BranchName), util.PathEscapeSegments(cleanedTreePath))
@@ -283,7 +288,7 @@ func EditFile(ctx *context.Context) {
 	// on the "New File" page, we should add an empty path field to make end users could input a new name
 	prepareTreePathFieldsAndPaths(ctx, util.Iif(isNewFile, ctx.Repo.TreePath+"/", ctx.Repo.TreePath))
 
-	prepareEditorCommitFormOptions(ctx, editorAction)
+	prepareEditorPage(ctx, editorAction)
 	if ctx.Written() {
 		return
 	}
@@ -376,15 +381,16 @@ func EditFilePost(ctx *context.Context) {
 
 // DeleteFile render delete file page
 func DeleteFile(ctx *context.Context) {
-	prepareEditorCommitFormOptions(ctx, "_delete")
+	prepareEditorPage(ctx, "_delete")
 	if ctx.Written() {
 		return
 	}
 	ctx.Data["PageIsDelete"] = true
+	prepareTreePathFieldsAndPaths(ctx, ctx.Repo.TreePath)
 	ctx.HTML(http.StatusOK, tplDeleteFile)
 }
 
-// DeleteFilePost response for deleting file
+// DeleteFilePost response for deleting file or directory
 func DeleteFilePost(ctx *context.Context) {
 	parsed := prepareEditorCommitSubmittedForm[*forms.DeleteRepoFileForm](ctx)
 	if ctx.Written() {
@@ -392,17 +398,37 @@ func DeleteFilePost(ctx *context.Context) {
 	}
 
 	treePath := ctx.Repo.TreePath
-	_, err := files_service.ChangeRepoFiles(ctx, ctx.Repo.Repository, ctx.Doer, &files_service.ChangeRepoFilesOptions{
+	if treePath == "" {
+		ctx.JSONError("cannot delete root directory") // it should not happen unless someone is trying to be malicious
+		return
+	}
+
+	// Check if the path is a directory
+	entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treePath)
+	if err != nil {
+		ctx.NotFoundOrServerError("GetTreeEntryByPath", git.IsErrNotExist, err)
+		return
+	}
+
+	var commitMessage string
+	if entry.IsDir() {
+		commitMessage = parsed.GetCommitMessage(ctx.Locale.TrString("repo.editor.delete_directory", treePath))
+	} else {
+		commitMessage = parsed.GetCommitMessage(ctx.Locale.TrString("repo.editor.delete", treePath))
+	}
+
+	_, err = files_service.ChangeRepoFiles(ctx, ctx.Repo.Repository, ctx.Doer, &files_service.ChangeRepoFilesOptions{
 		LastCommitID: parsed.form.LastCommit,
 		OldBranch:    parsed.OldBranchName,
 		NewBranch:    parsed.NewBranchName,
 		Files: []*files_service.ChangeRepoFile{
 			{
-				Operation: "delete",
-				TreePath:  treePath,
+				Operation:         "delete",
+				TreePath:          treePath,
+				DeleteRecursively: true,
 			},
 		},
-		Message:   parsed.GetCommitMessage(ctx.Locale.TrString("repo.editor.delete", treePath)),
+		Message:   commitMessage,
 		Signoff:   parsed.form.Signoff,
 		Author:    parsed.GitCommitter,
 		Committer: parsed.GitCommitter,
@@ -412,7 +438,11 @@ func DeleteFilePost(ctx *context.Context) {
 		return
 	}
 
-	ctx.Flash.Success(ctx.Tr("repo.editor.file_delete_success", treePath))
+	if entry.IsDir() {
+		ctx.Flash.Success(ctx.Tr("repo.editor.directory_delete_success", treePath))
+	} else {
+		ctx.Flash.Success(ctx.Tr("repo.editor.file_delete_success", treePath))
+	}
 	redirectTreePath := getClosestParentWithFiles(ctx.Repo.GitRepo, parsed.NewBranchName, treePath)
 	redirectForCommitChoice(ctx, parsed, redirectTreePath)
 }
@@ -420,7 +450,7 @@ func DeleteFilePost(ctx *context.Context) {
 func UploadFile(ctx *context.Context) {
 	ctx.Data["PageIsUpload"] = true
 	prepareTreePathFieldsAndPaths(ctx, ctx.Repo.TreePath)
-	opts := prepareEditorCommitFormOptions(ctx, "_upload")
+	opts := prepareEditorPage(ctx, "_upload")
 	if ctx.Written() {
 		return
 	}
diff --git a/routers/web/repo/editor_apply_patch.go b/routers/web/repo/editor_apply_patch.go
index aad7b4129c..357c6f3a21 100644
--- a/routers/web/repo/editor_apply_patch.go
+++ b/routers/web/repo/editor_apply_patch.go
@@ -14,7 +14,7 @@ import (
 )
 
 func NewDiffPatch(ctx *context.Context) {
-	prepareEditorCommitFormOptions(ctx, "_diffpatch")
+	prepareEditorPage(ctx, "_diffpatch")
 	if ctx.Written() {
 		return
 	}
diff --git a/routers/web/repo/editor_cherry_pick.go b/routers/web/repo/editor_cherry_pick.go
index 099814a9fa..32e3c58e87 100644
--- a/routers/web/repo/editor_cherry_pick.go
+++ b/routers/web/repo/editor_cherry_pick.go
@@ -16,7 +16,7 @@ import (
 )
 
 func CherryPick(ctx *context.Context) {
-	prepareEditorCommitFormOptions(ctx, "_cherrypick")
+	prepareEditorPage(ctx, "_cherrypick")
 	if ctx.Written() {
 		return
 	}
diff --git a/routers/web/repo/find.go b/routers/web/repo/find.go
deleted file mode 100644
index 3a3a7610e7..0000000000
--- a/routers/web/repo/find.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2022 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package repo
-
-import (
-	"net/http"
-
-	"code.gitea.io/gitea/modules/templates"
-	"code.gitea.io/gitea/modules/util"
-	"code.gitea.io/gitea/services/context"
-)
-
-const (
-	tplFindFiles templates.TplName = "repo/find/files"
-)
-
-// FindFiles render the page to find repository files
-func FindFiles(ctx *context.Context) {
-	path := ctx.PathParam("*")
-	ctx.Data["TreeLink"] = ctx.Repo.RepoLink + "/src/" + util.PathEscapeSegments(path)
-	ctx.Data["DataLink"] = ctx.Repo.RepoLink + "/tree-list/" + util.PathEscapeSegments(path)
-	ctx.HTML(http.StatusOK, tplFindFiles)
-}
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index 09ac33cff4..8e85cc3278 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -245,27 +245,17 @@ func LastCommit(ctx *context.Context) {
 		return
 	}
 
+	// The "/lastcommit/" endpoint is used to render the embedded HTML content for the directory file listing with latest commit info
+	// It needs to construct correct links to the file items, but the route only accepts a commit ID, not a full ref name (branch or tag).
+	// So we need to get the ref name from the query parameter "refSubUrl".
+	// TODO: LAST-COMMIT-ASYNC-LOADING: it needs more tests to cover this
+	refSubURL := path.Clean(ctx.FormString("refSubUrl"))
+	prepareRepoViewContent(ctx, util.IfZero(refSubURL, ctx.Repo.RefTypeNameSubURL()))
 	renderDirectoryFiles(ctx, 0)
 	if ctx.Written() {
 		return
 	}
 
-	var treeNames []string
-	paths := make([]string, 0, 5)
-	if len(ctx.Repo.TreePath) > 0 {
-		treeNames = strings.Split(ctx.Repo.TreePath, "/")
-		for i := range treeNames {
-			paths = append(paths, strings.Join(treeNames[:i+1], "/"))
-		}
-
-		ctx.Data["HasParentPath"] = true
-		if len(paths)-2 >= 0 {
-			ctx.Data["ParentPath"] = "/" + paths[len(paths)-2]
-		}
-	}
-	branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.RefTypeNameSubURL()
-	ctx.Data["BranchLink"] = branchLink
-
 	ctx.HTML(http.StatusOK, tplRepoViewList)
 }
 
@@ -289,7 +279,9 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entri
 		return nil
 	}
 
-	ctx.Data["LastCommitLoaderURL"] = ctx.Repo.RepoLink + "/lastcommit/" + url.PathEscape(ctx.Repo.CommitID) + "/" + util.PathEscapeSegments(ctx.Repo.TreePath)
+	// TODO: LAST-COMMIT-ASYNC-LOADING: search this keyword to see more details
+	lastCommitLoaderURL := ctx.Repo.RepoLink + "/lastcommit/" + url.PathEscape(ctx.Repo.CommitID) + "/" + util.PathEscapeSegments(ctx.Repo.TreePath)
+	ctx.Data["LastCommitLoaderURL"] = lastCommitLoaderURL + "?refSubUrl=" + url.QueryEscape(ctx.Repo.RefTypeNameSubURL())
 
 	// Get current entry user currently looking at.
 	entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx.Repo.TreePath)
@@ -322,6 +314,21 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entri
 		ctx.ServerError("GetCommitsInfo", err)
 		return nil
 	}
+
+	{
+		if timeout != 0 && !setting.IsProd && !setting.IsInTesting {
+			log.Debug("first call to get directory file commit info")
+			clearFilesCommitInfo := func() {
+				log.Warn("clear directory file commit info to force async loading on frontend")
+				for i := range files {
+					files[i].Commit = nil
+				}
+			}
+			_ = clearFilesCommitInfo
+			// clearFilesCommitInfo() // TODO: LAST-COMMIT-ASYNC-LOADING: debug the frontend async latest commit info loading, uncomment this line, and it needs more tests
+		}
+	}
+
 	ctx.Data["Files"] = files
 	prepareDirectoryFileIcons(ctx, files)
 	for _, f := range files {
@@ -334,16 +341,6 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entri
 	if !loadLatestCommitData(ctx, latestCommit) {
 		return nil
 	}
-
-	branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.RefTypeNameSubURL()
-	treeLink := branchLink
-
-	if len(ctx.Repo.TreePath) > 0 {
-		treeLink += "/" + util.PathEscapeSegments(ctx.Repo.TreePath)
-	}
-
-	ctx.Data["TreeLink"] = treeLink
-
 	return allEntries
 }
 
diff --git a/routers/web/repo/view_home.go b/routers/web/repo/view_home.go
index 17043055e5..00d30bedef 100644
--- a/routers/web/repo/view_home.go
+++ b/routers/web/repo/view_home.go
@@ -362,6 +362,32 @@ func redirectFollowSymlink(ctx *context.Context, treePathEntry *git.TreeEntry) b
 	return false
 }
 
+func prepareRepoViewContent(ctx *context.Context, refTypeNameSubURL string) {
+	// for: home, file list, file view, blame
+	ctx.Data["PageIsViewCode"] = true
+	ctx.Data["RepositoryUploadEnabled"] = setting.Repository.Upload.Enabled // show Upload File button or menu item
+
+	// prepare the tree path navigation
+	var treeNames, paths []string
+	branchLink := ctx.Repo.RepoLink + "/src/" + refTypeNameSubURL
+	treeLink := branchLink
+	if ctx.Repo.TreePath != "" {
+		treeLink += "/" + util.PathEscapeSegments(ctx.Repo.TreePath)
+		treeNames = strings.Split(ctx.Repo.TreePath, "/")
+		for i := range treeNames {
+			paths = append(paths, strings.Join(treeNames[:i+1], "/"))
+		}
+		ctx.Data["HasParentPath"] = true
+		if len(paths)-2 >= 0 {
+			ctx.Data["ParentPath"] = "/" + paths[len(paths)-2]
+		}
+	}
+	ctx.Data["Paths"] = paths
+	ctx.Data["TreeLink"] = treeLink
+	ctx.Data["TreeNames"] = treeNames
+	ctx.Data["BranchLink"] = branchLink
+}
+
 // Home render repository home page
 func Home(ctx *context.Context) {
 	if handleRepoHomeFeed(ctx) {
@@ -383,8 +409,7 @@ func Home(ctx *context.Context) {
 		title += ": " + ctx.Repo.Repository.Description
 	}
 	ctx.Data["Title"] = title
-	ctx.Data["PageIsViewCode"] = true
-	ctx.Data["RepositoryUploadEnabled"] = setting.Repository.Upload.Enabled // show New File / Upload File buttons
+	prepareRepoViewContent(ctx, ctx.Repo.RefTypeNameSubURL())
 
 	if ctx.Repo.Commit == nil || ctx.Repo.Repository.IsEmpty || ctx.Repo.Repository.IsBroken() {
 		// empty or broken repositories need to be handled differently
@@ -405,26 +430,6 @@ func Home(ctx *context.Context) {
 		return
 	}
 
-	// prepare the tree path
-	var treeNames, paths []string
-	branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.RefTypeNameSubURL()
-	treeLink := branchLink
-	if ctx.Repo.TreePath != "" {
-		treeLink += "/" + util.PathEscapeSegments(ctx.Repo.TreePath)
-		treeNames = strings.Split(ctx.Repo.TreePath, "/")
-		for i := range treeNames {
-			paths = append(paths, strings.Join(treeNames[:i+1], "/"))
-		}
-		ctx.Data["HasParentPath"] = true
-		if len(paths)-2 >= 0 {
-			ctx.Data["ParentPath"] = "/" + paths[len(paths)-2]
-		}
-	}
-	ctx.Data["Paths"] = paths
-	ctx.Data["TreeLink"] = treeLink
-	ctx.Data["TreeNames"] = treeNames
-	ctx.Data["BranchLink"] = branchLink
-
 	// some UI components are only shown when the tree path is root
 	isTreePathRoot := ctx.Repo.TreePath == ""
 
@@ -455,7 +460,7 @@ func Home(ctx *context.Context) {
 
 	if isViewHomeOnlyContent(ctx) {
 		ctx.HTML(http.StatusOK, tplRepoViewContent)
-	} else if len(treeNames) != 0 {
+	} else if ctx.Repo.TreePath != "" {
 		ctx.HTML(http.StatusOK, tplRepoView)
 	} else {
 		ctx.HTML(http.StatusOK, tplRepoHome)
diff --git a/routers/web/web.go b/routers/web/web.go
index dd1b391c68..89a570dce0 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1184,7 +1184,6 @@ func registerWebRoutes(m *web.Router) {
 	m.Post("/{username}/{reponame}/markup", optSignIn, context.RepoAssignment, reqUnitsWithMarkdown, web.Bind(structs.MarkupOption{}), misc.Markup)
 
 	m.Group("/{username}/{reponame}", func() {
-		m.Get("/find/*", repo.FindFiles)
 		m.Group("/tree-list", func() {
 			m.Get("/branch/*", context.RepoRefByType(git.RefTypeBranch), repo.TreeList)
 			m.Get("/tag/*", context.RepoRefByType(git.RefTypeTag), repo.TreeList)
diff --git a/services/repository/files/temp_repo.go b/services/repository/files/temp_repo.go
index feb4811bb0..731f23855d 100644
--- a/services/repository/files/temp_repo.go
+++ b/services/repository/files/temp_repo.go
@@ -135,6 +135,14 @@ func (t *TemporaryUploadRepository) LsFiles(ctx context.Context, filenames ...st
 	return fileList, nil
 }
 
+func (t *TemporaryUploadRepository) RemoveRecursivelyFromIndex(ctx context.Context, path string) error {
+	_, _, err := gitcmd.NewCommand("rm", "--cached", "-r").
+		AddDynamicArguments(path).
+		WithDir(t.basePath).
+		RunStdBytes(ctx)
+	return err
+}
+
 // RemoveFilesFromIndex removes the given files from the index
 func (t *TemporaryUploadRepository) RemoveFilesFromIndex(ctx context.Context, filenames ...string) error {
 	objFmt, err := t.gitRepo.GetObjectFormat()
diff --git a/services/repository/files/update.go b/services/repository/files/update.go
index b07055d57a..4830f711fc 100644
--- a/services/repository/files/update.go
+++ b/services/repository/files/update.go
@@ -46,7 +46,10 @@ type ChangeRepoFile struct {
 	FromTreePath  string
 	ContentReader io.ReadSeeker
 	SHA           string
-	Options       *RepoFileOptions
+
+	DeleteRecursively bool // when deleting, work as `git rm -r ...`
+
+	Options *RepoFileOptions // FIXME: need to refactor, internal usage only
 }
 
 // ChangeRepoFilesOptions holds the repository files update options
@@ -69,26 +72,6 @@ type RepoFileOptions struct {
 	executable   bool
 }
 
-// ErrRepoFileDoesNotExist represents a "RepoFileDoesNotExist" kind of error.
-type ErrRepoFileDoesNotExist struct {
-	Path string
-	Name string
-}
-
-// IsErrRepoFileDoesNotExist checks if an error is a ErrRepoDoesNotExist.
-func IsErrRepoFileDoesNotExist(err error) bool {
-	_, ok := err.(ErrRepoFileDoesNotExist)
-	return ok
-}
-
-func (err ErrRepoFileDoesNotExist) Error() string {
-	return fmt.Sprintf("repository file does not exist [path: %s]", err.Path)
-}
-
-func (err ErrRepoFileDoesNotExist) Unwrap() error {
-	return util.ErrNotExist
-}
-
 type LazyReadSeeker interface {
 	io.ReadSeeker
 	io.Closer
@@ -217,24 +200,6 @@ func ChangeRepoFiles(ctx context.Context, repo *repo_model.Repository, doer *use
 		}
 	}
 
-	for _, file := range opts.Files {
-		if file.Operation == "delete" {
-			// Get the files in the index
-			filesInIndex, err := t.LsFiles(ctx, file.TreePath)
-			if err != nil {
-				return nil, fmt.Errorf("DeleteRepoFile: %w", err)
-			}
-
-			// Find the file we want to delete in the index
-			inFilelist := slices.Contains(filesInIndex, file.TreePath)
-			if !inFilelist {
-				return nil, ErrRepoFileDoesNotExist{
-					Path: file.TreePath,
-				}
-			}
-		}
-	}
-
 	if hasOldBranch {
 		// Get the commit of the original branch
 		commit, err := t.GetBranchCommit(opts.OldBranch)
@@ -272,8 +237,14 @@ func ChangeRepoFiles(ctx context.Context, repo *repo_model.Repository, doer *use
 				addedLfsPointers = append(addedLfsPointers, *addedLfsPointer)
 			}
 		case "delete":
-			if err = t.RemoveFilesFromIndex(ctx, file.TreePath); err != nil {
-				return nil, err
+			if file.DeleteRecursively {
+				if err = t.RemoveRecursivelyFromIndex(ctx, file.TreePath); err != nil {
+					return nil, err
+				}
+			} else {
+				if err = t.RemoveFilesFromIndex(ctx, file.TreePath); err != nil {
+					return nil, err
+				}
 			}
 		default:
 			return nil, fmt.Errorf("invalid file operation: %s %s, supported operations are create, update, delete", file.Operation, file.Options.treePath)
diff --git a/templates/repo/editor/delete.tmpl b/templates/repo/editor/delete.tmpl
index bf6143f1cb..70769326a7 100644
--- a/templates/repo/editor/delete.tmpl
+++ b/templates/repo/editor/delete.tmpl
@@ -1,13 +1,30 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository file editor delete">
 	{{template "repo/header" .}}
-	<div class="ui container">
+	<div class="ui container fluid padded">
 		{{template "base/alert" .}}
-		<form class="ui form form-fetch-action" method="post" action="{{.CommitFormOptions.TargetFormAction}}">
-			{{.CsrfTokenHtml}}
-			{{template "repo/editor/common_top" .}}
-			{{template "repo/editor/commit_form" .}}
-		</form>
+		<div class="repo-view-container">
+			{{template "repo/view_file_tree" .}}
+			<div class="repo-view-content">
+				<form class="ui form form-fetch-action" method="post" action="{{.CommitFormOptions.TargetFormAction}}">
+					{{.CsrfTokenHtml}}
+					{{template "repo/editor/common_top" .}}
+					<div class="repo-editor-header">
+						{{/* although the UI isn't good enough, this header is necessary for the "left file tree view" toggle button, this button must exist */}}
+						{{template "repo/view_file_tree_toggle_button" .}}
+						{{/* then, to make the page looks overall good, add the breadcrumb here to make the toggle button can be shown in a text row, but not a single button*/}}
+						<div class="breadcrumb">
+							<a class="section" href="{{$.BranchLink}}">{{.Repository.Name}}</a>
+							{{range $i, $v := .TreeNames}}
+								<div class="breadcrumb-divider">/</div>
+								<span class="section"><a href="{{$.BranchLink}}/{{index $.TreePaths $i | PathEscapeSegments}}">{{$v}}</a></span>
+							{{end}}
+						</div>
+					</div>
+					{{template "repo/editor/commit_form" .}}
+				</form>
+			</div>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
index 0911d02e1f..e6b9c55770 100644
--- a/templates/repo/editor/edit.tmpl
+++ b/templates/repo/editor/edit.tmpl
@@ -1,53 +1,59 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository file editor edit">
 	{{template "repo/header" .}}
-	<div class="ui container">
+	<div class="ui container fluid padded">
 		{{template "base/alert" .}}
-		<form class="ui edit form form-fetch-action" method="post" action="{{.CommitFormOptions.TargetFormAction}}"
+		<div class="repo-view-container">
+			{{template "repo/view_file_tree" .}}
+			<div class="repo-view-content">
+				<form class="ui edit form form-fetch-action" method="post" action="{{.CommitFormOptions.TargetFormAction}}"
 					data-text-empty-confirm-header="{{ctx.Locale.Tr "repo.editor.commit_empty_file_header"}}"
 					data-text-empty-confirm-content="{{ctx.Locale.Tr "repo.editor.commit_empty_file_text"}}"
-		>
-			{{.CsrfTokenHtml}}
-			{{template "repo/editor/common_top" .}}
-			<div class="repo-editor-header">
-				{{template "repo/editor/common_breadcrumb" .}}
+				>
+					{{.CsrfTokenHtml}}
+					{{template "repo/editor/common_top" .}}
+					<div class="repo-editor-header">
+						{{template "repo/view_file_tree_toggle_button" .}}
+						{{template "repo/editor/common_breadcrumb" .}}
+					</div>
+					{{if not .NotEditableReason}}
+						<div class="field">
+							<div class="ui top attached header">
+								<div class="ui compact small menu small-menu-items repo-editor-menu">
+									<a class="active item" data-tab="write">{{svg "octicon-code"}} {{if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.new_file"}}{{else}}{{ctx.Locale.Tr "repo.editor.edit_file"}}{{end}}</a>
+									<a class="item" data-tab="preview" data-preview-url="{{.Repository.Link}}/markup" data-preview-context-ref="{{.RepoLink}}/src/{{.RefTypeNameSubURL}}">{{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}}</a>
+									{{if not .IsNewFile}}
+									<a class="item" data-tab="diff" hx-params="context,content" hx-vals='{"context":"{{.BranchLink}}"}' hx-include="#edit_area" hx-swap="innerHTML" hx-target=".tab[data-tab='diff']" hx-indicator=".tab[data-tab='diff']" hx-post="{{.RepoLink}}/_preview/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">{{svg "octicon-diff"}} {{ctx.Locale.Tr "repo.editor.preview_changes"}}</a>
+									{{end}}
+								</div>
+							</div>
+							<div class="ui bottom attached segment tw-p-0">
+								<div class="ui active tab tw-rounded-b" data-tab="write">
+									<textarea id="edit_area" name="content" class="tw-hidden" data-id="repo-{{.Repository.Name}}-{{.TreePath}}"
+										data-previewable-extensions="{{.PreviewableExtensions}}"
+										data-line-wrap-extensions="{{.LineWrapExtensions}}">{{.FileContent}}</textarea>
+									<div class="editor-loading is-loading"></div>
+								</div>
+								<div class="ui tab tw-px-4 tw-py-3" data-tab="preview">
+									{{ctx.Locale.Tr "loading"}}
+								</div>
+								<div class="ui tab" data-tab="diff">
+									<div class="tw-p-16"></div>
+								</div>
+							</div>
+						</div>
+					{{else}}
+						<div class="field">
+							<div class="ui segment tw-text-center">
+								<h4 class="tw-font-semibold tw-mb-2">{{.NotEditableReason}}</h4>
+								<p>{{ctx.Locale.Tr "repo.editor.file_not_editable_hint"}}</p>
+							</div>
+						</div>
+					{{end}}
+					{{template "repo/editor/commit_form" .}}
+				</form>
 			</div>
-			{{if not .NotEditableReason}}
-				<div class="field">
-					<div class="ui top attached header">
-						<div class="ui compact small menu small-menu-items repo-editor-menu">
-							<a class="active item" data-tab="write">{{svg "octicon-code"}} {{if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.new_file"}}{{else}}{{ctx.Locale.Tr "repo.editor.edit_file"}}{{end}}</a>
-							<a class="item" data-tab="preview" data-preview-url="{{.Repository.Link}}/markup" data-preview-context-ref="{{.RepoLink}}/src/{{.RefTypeNameSubURL}}">{{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}}</a>
-							{{if not .IsNewFile}}
-							<a class="item" data-tab="diff" hx-params="context,content" hx-vals='{"context":"{{.BranchLink}}"}' hx-include="#edit_area" hx-swap="innerHTML" hx-target=".tab[data-tab='diff']" hx-indicator=".tab[data-tab='diff']" hx-post="{{.RepoLink}}/_preview/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">{{svg "octicon-diff"}} {{ctx.Locale.Tr "repo.editor.preview_changes"}}</a>
-							{{end}}
-						</div>
-					</div>
-					<div class="ui bottom attached segment tw-p-0">
-						<div class="ui active tab tw-rounded-b" data-tab="write">
-							<textarea id="edit_area" name="content" class="tw-hidden" data-id="repo-{{.Repository.Name}}-{{.TreePath}}"
-								data-previewable-extensions="{{.PreviewableExtensions}}"
-								data-line-wrap-extensions="{{.LineWrapExtensions}}">{{.FileContent}}</textarea>
-							<div class="editor-loading is-loading"></div>
-						</div>
-						<div class="ui tab tw-px-4 tw-py-3" data-tab="preview">
-							{{ctx.Locale.Tr "loading"}}
-						</div>
-						<div class="ui tab" data-tab="diff">
-							<div class="tw-p-16"></div>
-						</div>
-					</div>
-				</div>
-			{{else}}
-				<div class="field">
-					<div class="ui segment tw-text-center">
-						<h4 class="tw-font-semibold tw-mb-2">{{.NotEditableReason}}</h4>
-						<p>{{ctx.Locale.Tr "repo.editor.file_not_editable_hint"}}</p>
-					</div>
-				</div>
-			{{end}}
-			{{template "repo/editor/commit_form" .}}
-		</form>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl
index 3e36c77b3b..847d6df88d 100644
--- a/templates/repo/editor/upload.tmpl
+++ b/templates/repo/editor/upload.tmpl
@@ -1,19 +1,25 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository file editor upload">
 	{{template "repo/header" .}}
-	<div class="ui container">
+	<div class="ui container fluid padded">
 		{{template "base/alert" .}}
-		<form class="ui comment form form-fetch-action" method="post" action="{{.CommitFormOptions.TargetFormAction}}">
-			{{.CsrfTokenHtml}}
-			{{template "repo/editor/common_top" .}}
-			<div class="repo-editor-header">
-				{{template "repo/editor/common_breadcrumb" .}}
+		<div class="repo-view-container">
+			{{template "repo/view_file_tree" .}}
+			<div class="repo-view-content">
+				<form class="ui comment form form-fetch-action" method="post" action="{{.CommitFormOptions.TargetFormAction}}">
+					{{.CsrfTokenHtml}}
+					{{template "repo/editor/common_top" .}}
+					<div class="repo-editor-header">
+						{{template "repo/view_file_tree_toggle_button" .}}
+						{{template "repo/editor/common_breadcrumb" .}}
+					</div>
+					<div class="field">
+						{{template "repo/upload" .}}
+					</div>
+					{{template "repo/editor/commit_form" .}}
+				</form>
 			</div>
-			<div class="field">
-				{{template "repo/upload" .}}
-			</div>
-			{{template "repo/editor/commit_form" .}}
-		</form>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/find/files.tmpl b/templates/repo/find/files.tmpl
deleted file mode 100644
index ce242796be..0000000000
--- a/templates/repo/find/files.tmpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="tw-flex tw-items-center">
-			<a href="{{$.RepoLink}}">{{.RepoName}}</a>
-			<span class="tw-mx-2">/</span>
-			<div class="ui input tw-flex-1">
-				<input id="repo-file-find-input" type="text" autofocus data-url-data-link="{{.DataLink}}" data-url-tree-link="{{.TreeLink}}">
-			</div>
-		</div>
-		<table id="repo-find-file-table" class="ui single line fixed table">
-			<tbody>
-			</tbody>
-		</table>
-		<div id="repo-find-file-no-result" class="ui row center tw-mt-8 tw-hidden">
-			<h3>{{ctx.Locale.Tr "repo.find_file.no_matching"}}</h3>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
diff --git a/templates/repo/view.tmpl b/templates/repo/view.tmpl
index f99fe2f57a..99f2a7da7e 100644
--- a/templates/repo/view.tmpl
+++ b/templates/repo/view.tmpl
@@ -17,9 +17,7 @@
 		{{template "repo/code/recently_pushed_new_branches" dict "RecentBranchesPromptData" .RecentBranchesPromptData}}
 
 		<div class="repo-view-container">
-			<div class="tw-flex tw-flex-col repo-view-file-tree-container not-mobile {{if not .UserSettingCodeViewShowFileTree}}tw-hidden{{end}}" {{if .IsSigned}}data-user-is-signed-in{{end}}>
-				{{template "repo/view_file_tree" .}}
-			</div>
+			{{template "repo/view_file_tree" .}}
 			<div class="repo-view-content">
 				{{template "repo/view_content" .}}
 			</div>
diff --git a/templates/repo/view_content.tmpl b/templates/repo/view_content.tmpl
index 66e4fffcb9..b31648fbbe 100644
--- a/templates/repo/view_content.tmpl
+++ b/templates/repo/view_content.tmpl
@@ -5,11 +5,7 @@
 <div class="repo-button-row">
 	<div class="repo-button-row-left">
 	{{if not $isTreePathRoot}}
-		<button class="repo-view-file-tree-toggle-show ui compact basic button icon not-mobile {{if .UserSettingCodeViewShowFileTree}}tw-hidden{{end}}"
-			data-global-click="onRepoViewFileTreeToggle" data-toggle-action="show"
-			data-tooltip-content="{{ctx.Locale.Tr "repo.diff.show_file_tree"}}">
-			{{svg "octicon-sidebar-collapse"}}
-		</button>
+		{{template "repo/view_file_tree_toggle_button" .}}
 	{{end}}
 
 	{{template "repo/branch_dropdown" dict
@@ -37,31 +33,6 @@
 		</a>
 	{{end}}
 
-	<!-- Show go to file if on home page -->
-	{{if $isTreePathRoot}}
-		<a href="{{.Repository.Link}}/find/{{.RefTypeNameSubURL}}" class="ui compact basic button">{{ctx.Locale.Tr "repo.find_file.go_to_file"}}</a>
-	{{end}}
-
-	{{if and .RefFullName.IsBranch (not .IsViewFile)}}
-		<button class="ui dropdown basic compact jump button repo-add-file" {{if not .Repository.CanEnableEditor}}disabled{{end}}>
-			{{ctx.Locale.Tr "repo.editor.add_file"}}
-			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-			<div class="menu">
-				<a class="item" href="{{.RepoLink}}/_new/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">
-					{{ctx.Locale.Tr "repo.editor.new_file"}}
-				</a>
-				{{if .RepositoryUploadEnabled}}
-				<a class="item" href="{{.RepoLink}}/_upload/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">
-					{{ctx.Locale.Tr "repo.editor.upload_file"}}
-				</a>
-				{{end}}
-				<a class="item" href="{{.RepoLink}}/_diffpatch/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">
-					{{ctx.Locale.Tr "repo.editor.patch"}}
-				</a>
-			</div>
-		</button>
-	{{end}}
-
 	{{if and $isTreePathRoot .Repository.IsTemplate}}
 		<a role="button" class="ui primary compact button" href="{{AppSubUrl}}/repo/create?template_id={{.Repository.ID}}">
 			{{ctx.Locale.Tr "repo.use_template"}}
@@ -86,12 +57,65 @@
 	</div>
 
 	<div class="repo-button-row-right">
+		<div class="repo-file-search-container"
+				data-global-init="initRepoFileSearch"
+				data-repo-link="{{.RepoLink}}"
+				data-current-ref-name-sub-url="{{.RefTypeNameSubURL}}"
+				data-tree-list-url="{{.RepoLink}}/tree-list/{{.RefTypeNameSubURL}}"
+				data-no-results-text="{{ctx.Locale.Tr "repo.find_file.no_matching"}}"
+				data-placeholder="{{ctx.Locale.Tr "repo.find_file.go_to_file"}}"
+		></div>
+
+		{{if .RefFullName.IsBranch}}
+			{{$addFilePath := .TreePath}}
+			{{if .IsViewFile}}
+				{{if gt (len .TreeNames) 1}}
+					{{$addFilePath = StringUtils.Join (slice .TreeNames 0 (Eval (len .TreeNames) "-" 1)) "/"}}
+				{{else}}
+					{{$addFilePath = ""}}
+				{{end}}
+			{{end}}
+			<button class="ui dropdown basic compact jump button repo-add-file" {{if not .Repository.CanEnableEditor}}disabled{{end}}>
+				{{ctx.Locale.Tr "repo.editor.add_file"}}
+				{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+				<div class="menu">
+					<a class="item" href="{{.RepoLink}}/_new/{{.BranchName | PathEscapeSegments}}/{{$addFilePath | PathEscapeSegments}}">
+						{{svg "octicon-file-added" 16 "tw-mr-2"}}{{ctx.Locale.Tr "repo.editor.new_file"}}
+					</a>
+					{{if .RepositoryUploadEnabled}}
+					<a class="item" href="{{.RepoLink}}/_upload/{{.BranchName | PathEscapeSegments}}/{{$addFilePath | PathEscapeSegments}}">
+						{{svg "octicon-upload" 16 "tw-mr-2"}}{{ctx.Locale.Tr "repo.editor.upload_file"}}
+					</a>
+					{{end}}
+					<a class="item" href="{{.RepoLink}}/_diffpatch/{{.BranchName | PathEscapeSegments}}/{{$addFilePath | PathEscapeSegments}}">
+						{{svg "octicon-diff" 16 "tw-mr-2"}}{{ctx.Locale.Tr "repo.editor.patch"}}
+					</a>
+				</div>
+			</button>
+
+			{{if and (not .IsViewFile) (not $isTreePathRoot)}}
+			<button class="ui dropdown basic compact jump button tw-px-3" data-tooltip-content="{{ctx.Locale.Tr "repo.more_operations"}}">
+				{{svg "octicon-kebab-horizontal"}}
+				<div class="menu">
+					<a class="item" data-clipboard-text="{{.Repository.Link}}/src/commit/{{.CommitID}}/{{PathEscapeSegments .TreePath}}" data-clipboard-text-type="url">
+						{{svg "octicon-link" 16}}{{ctx.Locale.Tr "repo.file_copy_permalink"}}
+					</a>
+					{{if and (.Permission.CanWrite ctx.Consts.RepoUnitTypeCode) (not .Repository.IsArchived) (not $isTreePathRoot)}}
+						<div class="divider"></div>
+						<a class="item tw-text-danger" href="{{.RepoLink}}/_delete/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">
+							{{svg "octicon-trash" 16}}{{ctx.Locale.Tr "repo.editor.delete_this_directory"}}
+						</a>
+					{{end}}
+				</div>
+			</button>
+			{{end}}
+		{{end}}
 		<!-- Only show clone panel in repository home page -->
 		{{if $isTreePathRoot}}
 			{{template "repo/clone_panel" .}}
 		{{end}}
 		{{if and (not $isTreePathRoot) (not .IsViewFile) (not .IsBlame)}}{{/* IsViewDirectory (not home), TODO: split the templates, avoid using "if" tricks */}}
-			<a class="ui button" href="{{.RepoLink}}/commits/{{.RefTypeNameSubURL}}/{{.TreePath | PathEscapeSegments}}">
+			<a class="ui compact button" href="{{.RepoLink}}/commits/{{.RefTypeNameSubURL}}/{{.TreePath | PathEscapeSegments}}">
 				{{svg "octicon-history" 16 "tw-mr-2"}}{{ctx.Locale.Tr "repo.file_history"}}
 			</a>
 		{{end}}
diff --git a/templates/repo/view_file_tree.tmpl b/templates/repo/view_file_tree.tmpl
index 8aed05f346..f79fcc22aa 100644
--- a/templates/repo/view_file_tree.tmpl
+++ b/templates/repo/view_file_tree.tmpl
@@ -1,15 +1,17 @@
-<div class="flex-text-block repo-button-row">
-	<button class="ui compact basic icon button"
-		data-global-click="onRepoViewFileTreeToggle" data-toggle-action="hide"
-		data-tooltip-content="{{ctx.Locale.Tr "repo.diff.hide_file_tree"}}">
-		{{svg "octicon-sidebar-expand"}}
-	</button>
-	<b>{{ctx.Locale.Tr "files"}}</b>
-</div>
+<div class="repo-view-file-tree-container {{if not .UserSettingCodeViewShowFileTree}}tw-hidden{{end}}">
+	<div class="flex-text-block repo-button-row">
+		<button class="repo-view-file-tree-toggle ui button"
+			data-global-click="onRepoViewFileTreeToggle" data-toggle-action="hide"
+			data-tooltip-content="{{ctx.Locale.Tr "repo.diff.hide_file_tree"}}">
+			{{svg "octicon-sidebar-expand"}}
+		</button>
+		<b>{{ctx.Locale.Tr "files"}}</b>
+	</div>
 
-{{/* TODO: Dynamically move components such as refSelector and createPR here */}}
-<div id="view-file-tree" class="tw-overflow-auto tw-h-full is-loading"
-	data-repo-link="{{.RepoLink}}"
-	data-tree-path="{{$.TreePath}}"
-	data-current-ref-name-sub-url="{{.RefTypeNameSubURL}}"
-></div>
+	{{/* TODO: Dynamically move components such as refSelector and createPR here */}}
+	<div id="view-file-tree" class="tw-overflow-auto tw-h-full is-loading"
+		data-repo-link="{{.RepoLink}}"
+		data-tree-path="{{$.TreePath}}"
+		data-current-ref-name-sub-url="{{.RefTypeNameSubURL}}"
+	></div>
+</div>
diff --git a/templates/repo/view_file_tree_toggle_button.tmpl b/templates/repo/view_file_tree_toggle_button.tmpl
new file mode 100644
index 0000000000..3d6ea928ed
--- /dev/null
+++ b/templates/repo/view_file_tree_toggle_button.tmpl
@@ -0,0 +1,6 @@
+<button type="button"
+	class="repo-view-file-tree-toggle ui button not-mobile {{if .UserSettingCodeViewShowFileTree}}tw-hidden{{end}}"
+	data-global-click="onRepoViewFileTreeToggle" data-toggle-action="show" data-tooltip-content="{{ctx.Locale.Tr "repo.diff.show_file_tree"}}"
+>
+	{{svg "octicon-sidebar-collapse"}}
+</button>
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index 145494aa1a..61443ac465 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -47,7 +47,7 @@
 					{{end}}
 				{{end}}
 			</div>
-			<div class="repo-file-cell message loading-icon-2px">
+			<div class="repo-file-cell message commit-summary loading-icon-2px">
 				{{if $commit}}
 					{{$commitLink := printf "%s/commit/%s" $.RepoLink (PathEscape $commit.ID.String)}}
 					{{ctx.RenderUtils.RenderCommitMessageLinkSubject $commit.Message $commitLink $.Repository}}
diff --git a/tests/integration/api_repo_file_helpers.go b/tests/integration/api_repo_file_helpers.go
index f8d6fc803f..9a4c448664 100644
--- a/tests/integration/api_repo_file_helpers.go
+++ b/tests/integration/api_repo_file_helpers.go
@@ -5,6 +5,7 @@ package integration
 
 import (
 	"context"
+	"errors"
 	"strings"
 	"testing"
 
@@ -72,7 +73,7 @@ func deleteFileInBranch(user *user_model.User, repo *repo_model.Repository, tree
 func createOrReplaceFileInBranch(user *user_model.User, repo *repo_model.Repository, treePath, branchName, content string) error {
 	_, err := deleteFileInBranch(user, repo, treePath, branchName)
 
-	if err != nil && !files_service.IsErrRepoFileDoesNotExist(err) {
+	if err != nil && !errors.Is(err, util.ErrNotExist) {
 		return err
 	}
 
diff --git a/tests/integration/repofiles_change_test.go b/tests/integration/repofiles_change_test.go
index 6821f8bf61..6fd42401c5 100644
--- a/tests/integration/repofiles_change_test.go
+++ b/tests/integration/repofiles_change_test.go
@@ -5,6 +5,7 @@ package integration
 
 import (
 	"fmt"
+	"net/http"
 	"net/url"
 	"path"
 	"strings"
@@ -12,7 +13,6 @@ import (
 	"time"
 
 	repo_model "code.gitea.io/gitea/models/repo"
-	"code.gitea.io/gitea/models/unittest"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/setting"
@@ -22,6 +22,7 @@ import (
 	files_service "code.gitea.io/gitea/services/repository/files"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func getCreateRepoFilesOptions(repo *repo_model.Repository) *files_service.ChangeRepoFilesOptions {
@@ -93,55 +94,6 @@ func getUpdateRepoFilesRenameOptions(repo *repo_model.Repository) *files_service
 	}
 }
 
-func getDeleteRepoFilesOptions(repo *repo_model.Repository) *files_service.ChangeRepoFilesOptions {
-	return &files_service.ChangeRepoFilesOptions{
-		Files: []*files_service.ChangeRepoFile{
-			{
-				Operation: "delete",
-				TreePath:  "README.md",
-				SHA:       "4b4851ad51df6a7d9f25c979345979eaeb5b349f",
-			},
-		},
-		LastCommitID: "",
-		OldBranch:    repo.DefaultBranch,
-		NewBranch:    repo.DefaultBranch,
-		Message:      "Deletes README.md",
-		Author: &files_service.IdentityOptions{
-			GitUserName:  "Bob Smith",
-			GitUserEmail: "bob@smith.com",
-		},
-		Committer: nil,
-	}
-}
-
-func getExpectedFileResponseForRepoFilesDelete() *api.FileResponse {
-	// Just returns fields that don't change, i.e. fields with commit SHAs and dates can't be determined
-	return &api.FileResponse{
-		Content: nil,
-		Commit: &api.FileCommitResponse{
-			Author: &api.CommitUser{
-				Identity: api.Identity{
-					Name:  "Bob Smith",
-					Email: "bob@smith.com",
-				},
-			},
-			Committer: &api.CommitUser{
-				Identity: api.Identity{
-					Name:  "Bob Smith",
-					Email: "bob@smith.com",
-				},
-			},
-			Message: "Deletes README.md\n",
-		},
-		Verification: &api.PayloadCommitVerification{
-			Verified:  false,
-			Reason:    "gpg.error.not_signed_commit",
-			Signature: "",
-			Payload:   "",
-		},
-	}
-}
-
 func getExpectedFileResponseForRepoFilesCreate(commitID string, lastCommit *git.Commit) *api.FileResponse {
 	treePath := "new/file.txt"
 	encoding := "base64"
@@ -578,75 +530,88 @@ func TestChangeRepoFilesWithoutBranchNames(t *testing.T) {
 }
 
 func TestChangeRepoFilesForDelete(t *testing.T) {
-	onGiteaRun(t, testDeleteRepoFiles)
-}
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		ctx, _ := contexttest.MockContext(t, "user2/repo1")
+		ctx.SetPathParam("id", "1")
+		contexttest.LoadRepo(t, ctx, 1)
+		contexttest.LoadRepoCommit(t, ctx)
+		contexttest.LoadUser(t, ctx, 2)
+		contexttest.LoadGitRepo(t, ctx)
+		defer ctx.Repo.GitRepo.Close()
+		repo := ctx.Repo.Repository
+		doer := ctx.Doer
 
-func testDeleteRepoFiles(t *testing.T, u *url.URL) {
-	// setup
-	unittest.PrepareTestEnv(t)
-	ctx, _ := contexttest.MockContext(t, "user2/repo1")
-	ctx.SetPathParam("id", "1")
-	contexttest.LoadRepo(t, ctx, 1)
-	contexttest.LoadRepoCommit(t, ctx)
-	contexttest.LoadUser(t, ctx, 2)
-	contexttest.LoadGitRepo(t, ctx)
-	defer ctx.Repo.GitRepo.Close()
-	repo := ctx.Repo.Repository
-	doer := ctx.Doer
-	opts := getDeleteRepoFilesOptions(repo)
+		t.Run("Delete README.md by commit", func(t *testing.T) {
+			urlRaw := "/user2/repo1/raw/branch/branch2/README.md"
+			MakeRequest(t, NewRequest(t, "GET", urlRaw), http.StatusOK)
+			opts := &files_service.ChangeRepoFilesOptions{
+				OldBranch:    "branch2",
+				LastCommitID: "985f0301dba5e7b34be866819cd15ad3d8f508ee",
+				Files: []*files_service.ChangeRepoFile{
+					{
+						Operation: "delete",
+						TreePath:  "README.md",
+					},
+				},
+				Message: "test message",
+			}
+			filesResponse, err := files_service.ChangeRepoFiles(t.Context(), repo, doer, opts)
+			require.NoError(t, err)
+			assert.NotNil(t, filesResponse)
+			assert.Nil(t, filesResponse.Files[0])
+			assert.Equal(t, "test message\n", filesResponse.Commit.Message)
+			MakeRequest(t, NewRequest(t, "GET", urlRaw), http.StatusNotFound)
+		})
 
-	t.Run("Delete README.md file", func(t *testing.T) {
-		filesResponse, err := files_service.ChangeRepoFiles(t.Context(), repo, doer, opts)
-		assert.NoError(t, err)
-		expectedFileResponse := getExpectedFileResponseForRepoFilesDelete()
-		assert.NotNil(t, filesResponse)
-		assert.Nil(t, filesResponse.Files[0])
-		assert.Equal(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message)
-		assert.Equal(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity)
-		assert.Equal(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity)
-		assert.Equal(t, expectedFileResponse.Verification, filesResponse.Verification)
-	})
+		t.Run("Delete README.md with options", func(t *testing.T) {
+			urlRaw := "/user2/repo1/raw/branch/master/README.md"
+			MakeRequest(t, NewRequest(t, "GET", urlRaw), http.StatusOK)
+			opts := &files_service.ChangeRepoFilesOptions{
+				Files: []*files_service.ChangeRepoFile{
+					{
+						Operation: "delete",
+						TreePath:  "README.md",
+						SHA:       "4b4851ad51df6a7d9f25c979345979eaeb5b349f",
+					},
+				},
+				OldBranch: repo.DefaultBranch,
+				NewBranch: repo.DefaultBranch,
+				Message:   "Message for deleting README.md",
+				Author:    &files_service.IdentityOptions{GitUserName: "Bob Smith", GitUserEmail: "bob@smith.com"},
+			}
+			filesResponse, err := files_service.ChangeRepoFiles(t.Context(), repo, doer, opts)
+			require.NoError(t, err)
+			require.NotNil(t, filesResponse)
+			assert.Nil(t, filesResponse.Files[0])
+			assert.Equal(t, "Message for deleting README.md\n", filesResponse.Commit.Message)
+			assert.Equal(t, api.Identity{Name: "Bob Smith", Email: "bob@smith.com"}, filesResponse.Commit.Author.Identity)
+			assert.Equal(t, api.Identity{Name: "Bob Smith", Email: "bob@smith.com"}, filesResponse.Commit.Committer.Identity)
+			assert.Equal(t, &api.PayloadCommitVerification{Reason: "gpg.error.not_signed_commit"}, filesResponse.Verification)
+			MakeRequest(t, NewRequest(t, "GET", urlRaw), http.StatusNotFound)
+		})
 
-	t.Run("Verify README.md has been deleted", func(t *testing.T) {
-		filesResponse, err := files_service.ChangeRepoFiles(t.Context(), repo, doer, opts)
-		assert.Nil(t, filesResponse)
-		expectedError := "repository file does not exist [path: " + opts.Files[0].TreePath + "]"
-		assert.EqualError(t, err, expectedError)
-	})
-}
-
-// Test opts with branch names removed, same results
-func TestChangeRepoFilesForDeleteWithoutBranchNames(t *testing.T) {
-	onGiteaRun(t, testDeleteRepoFilesWithoutBranchNames)
-}
-
-func testDeleteRepoFilesWithoutBranchNames(t *testing.T, u *url.URL) {
-	// setup
-	unittest.PrepareTestEnv(t)
-	ctx, _ := contexttest.MockContext(t, "user2/repo1")
-	ctx.SetPathParam("id", "1")
-	contexttest.LoadRepo(t, ctx, 1)
-	contexttest.LoadRepoCommit(t, ctx)
-	contexttest.LoadUser(t, ctx, 2)
-	contexttest.LoadGitRepo(t, ctx)
-	defer ctx.Repo.GitRepo.Close()
-
-	repo := ctx.Repo.Repository
-	doer := ctx.Doer
-	opts := getDeleteRepoFilesOptions(repo)
-	opts.OldBranch = ""
-	opts.NewBranch = ""
-
-	t.Run("Delete README.md without Branch Name", func(t *testing.T) {
-		filesResponse, err := files_service.ChangeRepoFiles(t.Context(), repo, doer, opts)
-		assert.NoError(t, err)
-		expectedFileResponse := getExpectedFileResponseForRepoFilesDelete()
-		assert.NotNil(t, filesResponse)
-		assert.Nil(t, filesResponse.Files[0])
-		assert.Equal(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message)
-		assert.Equal(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity)
-		assert.Equal(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity)
-		assert.Equal(t, expectedFileResponse.Verification, filesResponse.Verification)
+		t.Run("Delete directory", func(t *testing.T) {
+			urlRaw := "/user2/repo1/raw/branch/sub-home-md-img-check/docs/README.md"
+			MakeRequest(t, NewRequest(t, "GET", urlRaw), http.StatusOK)
+			opts := &files_service.ChangeRepoFilesOptions{
+				OldBranch:    "sub-home-md-img-check",
+				LastCommitID: "4649299398e4d39a5c09eb4f534df6f1e1eb87cc",
+				Files: []*files_service.ChangeRepoFile{
+					{
+						Operation:         "delete",
+						TreePath:          "docs",
+						DeleteRecursively: true,
+					},
+				},
+				Message: "test message",
+			}
+			filesResponse, err := files_service.ChangeRepoFiles(t.Context(), repo, doer, opts)
+			require.NoError(t, err)
+			assert.NotNil(t, filesResponse)
+			assert.Nil(t, filesResponse.Files[0])
+			assert.Equal(t, "test message\n", filesResponse.Commit.Message)
+			MakeRequest(t, NewRequest(t, "GET", urlRaw), http.StatusNotFound)
+		})
 	})
 }
 
diff --git a/web_src/css/editor/fileeditor.css b/web_src/css/editor/fileeditor.css
index 698efffc99..12ae97a109 100644
--- a/web_src/css/editor/fileeditor.css
+++ b/web_src/css/editor/fileeditor.css
@@ -1,23 +1,3 @@
-.repository.file.editor .tab[data-tab="write"] {
-  padding: 0 !important;
-}
-
-.repository.file.editor .tab[data-tab="write"] .editor-toolbar {
-  border: 0 !important;
-}
-
-.repository.file.editor .tab[data-tab="write"] .CodeMirror {
-  border-left: 0;
-  border-right: 0;
-  border-bottom: 0;
-}
-
-.repo-editor-header {
-  display: flex;
-  margin: 1rem 0;
-  padding: 3px 0;
-}
-
 .editor-toolbar {
   border-color: var(--color-secondary);
 }
diff --git a/web_src/css/modules/animations.css b/web_src/css/modules/animations.css
index 779339c46b..aedf53569a 100644
--- a/web_src/css/modules/animations.css
+++ b/web_src/css/modules/animations.css
@@ -28,7 +28,7 @@
   aspect-ratio: 1;
   transform: translate(-50%, -50%);
   animation: isloadingspin 1000ms infinite linear;
-  border-width: 4px;
+  border-width: 3px;
   border-style: solid;
   border-color: var(--color-secondary) var(--color-secondary) var(--color-secondary-dark-8) var(--color-secondary-dark-8);
   border-radius: var(--border-radius-full);
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index 9b70e0e6db..0bf37ca083 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -150,63 +150,68 @@ td .commit-summary {
   }
 }
 
-.repository.file.list .non-diff-file-content .header .icon {
+.non-diff-file-content .header .icon {
   font-size: 1em;
 }
 
-.repository.file.list .non-diff-file-content .header .small.icon {
+.non-diff-file-content .header .small.icon {
   font-size: 0.75em;
 }
 
-.repository.file.list .non-diff-file-content .header .tiny.icon {
+.non-diff-file-content .header .tiny.icon {
   font-size: 0.5em;
 }
 
-.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon {
+.non-diff-file-content .header .file-actions .btn-octicon {
   line-height: var(--line-height-default);
   padding: 8px;
   vertical-align: middle;
   color: var(--color-text);
 }
 
-.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon:hover {
+.non-diff-file-content .header .file-actions .btn-octicon:hover {
   color: var(--color-primary);
 }
 
-.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon-danger:hover {
+.non-diff-file-content .header .file-actions .btn-octicon-danger:hover {
   color: var(--color-red);
 }
 
-.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon.disabled {
+.non-diff-file-content .header .file-actions .btn-octicon.disabled {
   color: inherit;
   opacity: var(--opacity-disabled);
   cursor: default;
 }
 
-.repository.file.list .non-diff-file-content .plain-text {
+.non-diff-file-content .plain-text {
   padding: 1em 2em;
 }
 
-.repository.file.list .non-diff-file-content .plain-text pre {
+.non-diff-file-content .plain-text pre {
   overflow-wrap: anywhere;
   white-space: pre-wrap;
 }
 
-.repository.file.list .non-diff-file-content .csv {
+.non-diff-file-content .csv {
   overflow-x: auto;
   padding: 0 !important;
 }
 
-.repository.file.list .non-diff-file-content pre {
+.non-diff-file-content pre {
   overflow: auto;
 }
 
-.repository.file.list .non-diff-file-content .asciicast {
+.non-diff-file-content .asciicast {
   padding: 0 !important;
 }
 
 .repo-editor-header {
+  display: flex;
+  margin: 1rem 0;
+  padding: 3px 0;
   width: 100%;
+  gap: 0.5em;
+  align-items: center;
 }
 
 .repo-editor-header input {
@@ -216,17 +221,13 @@ td .commit-summary {
   margin-right: 5px !important;
 }
 
-.repository.file.editor .tabular.menu .svg {
-  margin-right: 5px;
-}
-
 .repository.file.editor .commit-form-wrapper {
-  padding-left: 48px;
+  padding-left: 58px;
 }
 
 .repository.file.editor .commit-form-wrapper .commit-avatar {
   float: left;
-  margin-left: -48px;
+  margin-left: -58px;
 }
 
 .repository.file.editor .commit-form-wrapper .commit-form {
@@ -1409,12 +1410,25 @@ td .commit-summary {
   flex-grow: 1;
 }
 
-.repo-button-row .ui.button {
+.repo-button-row .ui.button,
+.repo-view-container .ui.button.repo-view-file-tree-toggle {
   flex-shrink: 0;
   margin: 0;
   min-height: 30px;
 }
 
+.repo-view-container .ui.button.repo-view-file-tree-toggle {
+  padding: 0 6px;
+}
+
+.repo-button-row .repo-file-search-container .ui.input {
+  height: 30px;
+}
+
+.repo-button-row .ui.dropdown > .menu {
+  margin-top: 4px;
+}
+
 tbody.commit-list {
   vertical-align: baseline;
 }
@@ -1483,6 +1497,12 @@ tbody.commit-list {
   line-height: initial;
 }
 
+.commit-body a.commit code,
+.commit-summary a.commit code {
+  /* these links are generated by the render: <a class="commit" href="...">...</a> */
+  background: inherit;
+}
+
 .git-notes.top {
   text-align: left;
 }
diff --git a/web_src/css/repo/home.css b/web_src/css/repo/home.css
index ee371f1b1c..60bf1f17f9 100644
--- a/web_src/css/repo/home.css
+++ b/web_src/css/repo/home.css
@@ -54,7 +54,9 @@
   gap: var(--page-spacing);
 }
 
-.repo-view-container .repo-view-file-tree-container {
+.repo-view-file-tree-container {
+  display: flex;
+  flex-direction: column;
   flex: 0 0 15%;
   min-width: 0;
   max-height: 100vh;
@@ -65,6 +67,12 @@
   overflow-y: hidden;
 }
 
+@media (max-width: 767.98px) {
+  .repo-view-file-tree-container {
+    display: none;
+  }
+}
+
 .repo-view-content {
   flex: 1;
   min-width: 0;
diff --git a/web_src/css/themes/theme-gitea-dark.css b/web_src/css/themes/theme-gitea-dark.css
index 1718a1f06b..f89752dc79 100644
--- a/web_src/css/themes/theme-gitea-dark.css
+++ b/web_src/css/themes/theme-gitea-dark.css
@@ -244,6 +244,7 @@ gitea-theme-meta-info {
   --color-highlight-fg: #87651e;
   --color-highlight-bg: #352c1c;
   --color-overlay-backdrop: #080808c0;
+  --color-danger: var(--color-red);
   accent-color: var(--color-accent);
   color-scheme: dark;
 }
diff --git a/web_src/css/themes/theme-gitea-light.css b/web_src/css/themes/theme-gitea-light.css
index db54f5e5fb..1261ef8be0 100644
--- a/web_src/css/themes/theme-gitea-light.css
+++ b/web_src/css/themes/theme-gitea-light.css
@@ -244,6 +244,7 @@ gitea-theme-meta-info {
   --color-highlight-fg: #eed200;
   --color-highlight-bg: #fffbdd;
   --color-overlay-backdrop: #080808c0;
+  --color-danger: var(--color-red);
   accent-color: var(--color-accent);
   color-scheme: light;
 }
diff --git a/web_src/js/components/RepoFileSearch.vue b/web_src/js/components/RepoFileSearch.vue
new file mode 100644
index 0000000000..cbc1d50656
--- /dev/null
+++ b/web_src/js/components/RepoFileSearch.vue
@@ -0,0 +1,230 @@
+<script lang="ts" setup>
+import { ref, computed, watch, nextTick, useTemplateRef, onMounted, onUnmounted } from 'vue';
+import {generateElemId} from '../utils/dom.ts';
+import { GET } from '../modules/fetch.ts';
+import { filterRepoFilesWeighted } from '../features/repo-findfile.ts';
+import { pathEscapeSegments } from '../utils/url.ts';
+import { SvgIcon } from '../svg.ts';
+import {throttle} from 'throttle-debounce';
+
+const props = defineProps({
+  repoLink: { type: String, required: true },
+  currentRefNameSubURL: { type: String, required: true },
+  treeListUrl: { type: String, required: true },
+  noResultsText: { type: String, required: true },
+  placeholder: { type: String, required: true },
+});
+
+const refElemInput = useTemplateRef<HTMLInputElement>('searchInput');
+const refElemPopup = useTemplateRef<HTMLElement>('searchPopup');
+
+const searchQuery = ref('');
+const allFiles = ref<string[]>([]);
+const selectedIndex = ref(0);
+const isLoadingFileList = ref(false);
+const hasLoadedFileList = ref(false);
+
+const showPopup = computed(() => searchQuery.value.length > 0);
+
+const filteredFiles = computed(() => {
+  if (!searchQuery.value) return [];
+  return filterRepoFilesWeighted(allFiles.value, searchQuery.value);
+});
+
+const applySearchQuery = throttle(300, () => {
+  searchQuery.value = refElemInput.value.value;
+  selectedIndex.value = 0;
+});
+
+const handleSearchInput = () => {
+  loadFileListForSearch();
+  applySearchQuery();
+};
+
+const handleKeyDown = (e: KeyboardEvent) => {
+  if (e.key === 'Escape') {
+    e.preventDefault();
+    clearSearch();
+    return;
+  }
+  if (!searchQuery.value || filteredFiles.value.length === 0) return;
+
+  const handleSelectedItem = (idx: number) => {
+    e.preventDefault();
+    selectedIndex.value = idx;
+    const el = refElemPopup.value.querySelector(`.file-search-results > :nth-child(${idx+1} of .item)`);
+    el?.scrollIntoView({ block: 'nearest', behavior: 'instant' });
+  };
+
+  if (e.key === 'ArrowDown') {
+    handleSelectedItem(Math.min(selectedIndex.value + 1, filteredFiles.value.length - 1));
+  } else if (e.key === 'ArrowUp') {
+    handleSelectedItem(Math.max(selectedIndex.value - 1, 0))
+  } else if (e.key === 'Enter') {
+    e.preventDefault();
+    const selectedFile = filteredFiles.value[selectedIndex.value];
+    if (selectedFile) {
+      handleSearchResultClick(selectedFile.matchResult.join(''));
+    }
+  }
+};
+
+const clearSearch = () => {
+  searchQuery.value = '';
+  refElemInput.value.value = '';
+};
+
+
+const handleClickOutside = (e: MouseEvent) => {
+  if (!searchQuery.value) return;
+
+  const target = e.target as HTMLElement;
+  const clickInside = refElemInput.value.contains(target) || refElemPopup.value.contains(target);
+  if (!clickInside) clearSearch();
+};
+
+const loadFileListForSearch = async () => {
+  if (hasLoadedFileList.value || isLoadingFileList.value) return;
+
+  isLoadingFileList.value = true;
+  try {
+    const response = await GET(props.treeListUrl);
+    allFiles.value = await response.json();
+    hasLoadedFileList.value = true;
+  } finally {
+    isLoadingFileList.value = false;
+  }
+};
+
+function handleSearchResultClick(filePath: string) {
+  clearSearch();
+  window.location.href = `${props.repoLink}/src/${pathEscapeSegments(props.currentRefNameSubURL)}/${pathEscapeSegments(filePath)}`;
+}
+
+const updatePosition = () => {
+  if (!showPopup.value) return;
+
+  const rectInput = refElemInput.value.getBoundingClientRect();
+  const rectPopup = refElemPopup.value.getBoundingClientRect();
+  const docElem = document.documentElement;
+  const style = refElemPopup.value.style;
+  style.top = `${docElem.scrollTop + rectInput.bottom + 4}px`;
+  if (rectInput.x + rectPopup.width < docElem.clientWidth) {
+    // enough space to align left with the input
+    style.left = `${docElem.scrollLeft + rectInput.x}px`;
+  } else {
+    // no enough space, align right from the viewport right edge minus page margin
+    const leftPos = docElem.scrollLeft + docElem.getBoundingClientRect().width - rectPopup.width;
+    style.left = `calc(${leftPos}px - var(--page-margin-x))`;
+  }
+};
+
+onMounted(() => {
+  const searchPopupId = generateElemId('file-search-popup-');
+  refElemPopup.value.setAttribute('id', searchPopupId);
+  refElemInput.value.setAttribute('aria-controls', searchPopupId);
+  document.addEventListener('click', handleClickOutside);
+  window.addEventListener('resize', updatePosition);
+});
+
+onUnmounted(() => {
+  document.removeEventListener('click', handleClickOutside);
+  window.removeEventListener('resize', updatePosition);
+});
+
+// Position search results below the input
+watch([searchQuery, filteredFiles], async () => {
+  if (searchQuery.value) {
+    await nextTick();
+    updatePosition();
+  }
+});
+</script>
+
+<template>
+  <div>
+    <div class="ui small input">
+      <input
+        ref="searchInput" :placeholder="placeholder" autocomplete="off"
+        role="combobox" aria-autocomplete="list" :aria-expanded="searchQuery ? 'true' : 'false'"
+        @input="handleSearchInput" @keydown="handleKeyDown"
+      >
+    </div>
+
+    <Teleport to="body">
+      <div v-show="showPopup" ref="searchPopup" class="file-search-popup">
+        <!-- always create the popup by v-show above to avoid null ref, only create the popup content if the popup should be displayed to save memory -->
+        <template v-if="showPopup">
+          <div v-if="filteredFiles.length" role="listbox" class="file-search-results flex-items-block">
+            <div
+              v-for="(result, idx) in filteredFiles" :key="result.matchResult.join('')"
+              :class="['item', { 'selected': idx === selectedIndex }]"
+              role="option" :aria-selected="idx === selectedIndex" @click="handleSearchResultClick(result.matchResult.join(''))"
+              @mouseenter="selectedIndex = idx" :title="result.matchResult.join('')"
+            >
+              <SvgIcon name="octicon-file" class="file-icon"/>
+              <span class="full-path">
+                <span v-for="(part, index) in result.matchResult" :key="index">{{ part }}</span>
+              </span>
+            </div>
+          </div>
+          <div v-else-if="isLoadingFileList">
+            <div class="is-loading"/>
+          </div>
+          <div v-else class="tw-p-4">
+            {{ props.noResultsText }}
+          </div>
+        </template>
+      </div>
+    </Teleport>
+  </div>
+</template>
+
+<style scoped>
+.file-search-popup {
+  position: absolute;
+  background: var(--color-box-body);
+  border: 1px solid var(--color-secondary);
+  border-radius: var(--border-radius);
+  width: max-content;
+  max-height: min(calc(100vw - 20px), 300px);
+  max-width: min(calc(100vw - 40px), 600px);
+  overflow-y: auto;
+}
+
+.file-search-popup .is-loading {
+  width: 200px;
+  height: 200px;
+}
+
+.file-search-results .item {
+  align-items: flex-start;
+  padding: 0.5rem 0.75rem;
+  cursor: pointer;
+  border-bottom: 1px solid var(--color-secondary);
+}
+
+.file-search-results .item:last-child {
+  border-bottom: none;
+}
+
+.file-search-results .item:hover,
+.file-search-results .item.selected {
+  background-color: var(--color-hover);
+}
+
+.file-search-results .item .file-icon {
+  flex-shrink: 0;
+  margin-top: 0.125rem;
+}
+
+.file-search-results .item .full-path {
+  flex: 1;
+  overflow-wrap: anywhere;
+}
+
+.file-search-results .item .full-path :nth-child(even) {
+  color: var(--color-red);
+  font-weight: var(--font-weight-semibold);
+}
+</style>
diff --git a/web_src/js/features/repo-findfile.ts b/web_src/js/features/repo-findfile.ts
index 59c827126f..7a35a3c7ff 100644
--- a/web_src/js/features/repo-findfile.ts
+++ b/web_src/js/features/repo-findfile.ts
@@ -1,13 +1,8 @@
-import {svg} from '../svg.ts';
-import {toggleElem} from '../utils/dom.ts';
-import {pathEscapeSegments} from '../utils/url.ts';
-import {GET} from '../modules/fetch.ts';
+import {createApp} from 'vue';
+import RepoFileSearch from '../components/RepoFileSearch.vue';
+import {registerGlobalInitFunc} from '../modules/observer.ts';
 
 const threshold = 50;
-let files: Array<string> = [];
-let repoFindFileInput: HTMLInputElement;
-let repoFindFileTableBody: HTMLElement;
-let repoFindFileNoResult: HTMLElement;
 
 // return the case-insensitive sub-match result as an array:  [unmatched, matched, unmatched, matched, ...]
 // res[even] is unmatched, res[odd] is matched, see unit tests for examples
@@ -73,48 +68,14 @@ export function filterRepoFilesWeighted(files: Array<string>, filter: string) {
   return filterResult;
 }
 
-function filterRepoFiles(filter: string) {
-  const treeLink = repoFindFileInput.getAttribute('data-url-tree-link');
-  repoFindFileTableBody.innerHTML = '';
-
-  const filterResult = filterRepoFilesWeighted(files, filter);
-
-  toggleElem(repoFindFileNoResult, !filterResult.length);
-  for (const r of filterResult) {
-    const row = document.createElement('tr');
-    const cell = document.createElement('td');
-    const a = document.createElement('a');
-    a.setAttribute('href', `${treeLink}/${pathEscapeSegments(r.matchResult.join(''))}`);
-    a.innerHTML = svg('octicon-file', 16, 'tw-mr-2');
-    row.append(cell);
-    cell.append(a);
-    for (const [index, part] of r.matchResult.entries()) {
-      const span = document.createElement('span');
-      // safely escape by using textContent
-      span.textContent = part;
-      span.title = span.textContent;
-      // if the target file path is "abc/xyz", to search "bx", then the matchResult is ['a', 'b', 'c/', 'x', 'yz']
-      // the matchResult[odd] is matched and highlighted to red.
-      if (index % 2 === 1) span.classList.add('ui', 'text', 'red');
-      a.append(span);
-    }
-    repoFindFileTableBody.append(row);
-  }
-}
-
-async function loadRepoFiles() {
-  const response = await GET(repoFindFileInput.getAttribute('data-url-data-link'));
-  files = await response.json();
-  filterRepoFiles(repoFindFileInput.value);
-}
-
-export function initFindFileInRepo() {
-  repoFindFileInput = document.querySelector('#repo-file-find-input');
-  if (!repoFindFileInput) return;
-
-  repoFindFileTableBody = document.querySelector('#repo-find-file-table tbody');
-  repoFindFileNoResult = document.querySelector('#repo-find-file-no-result');
-  repoFindFileInput.addEventListener('input', () => filterRepoFiles(repoFindFileInput.value));
-
-  loadRepoFiles();
+export function initRepoFileSearch() {
+  registerGlobalInitFunc('initRepoFileSearch', (el) => {
+    createApp(RepoFileSearch, {
+      repoLink: el.getAttribute('data-repo-link'),
+      currentRefNameSubURL: el.getAttribute('data-current-ref-name-sub-url'),
+      treeListUrl: el.getAttribute('data-tree-list-url'),
+      noResultsText: el.getAttribute('data-no-results-text'),
+      placeholder: el.getAttribute('data-placeholder'),
+    }).mount(el);
+  });
 }
diff --git a/web_src/js/features/repo-view-file-tree.ts b/web_src/js/features/repo-view-file-tree.ts
index f52b64cc51..98ffdb8a86 100644
--- a/web_src/js/features/repo-view-file-tree.ts
+++ b/web_src/js/features/repo-view-file-tree.ts
@@ -6,8 +6,12 @@ import {registerGlobalEventFunc} from '../modules/observer.ts';
 
 const {appSubUrl} = window.config;
 
+function isUserSignedIn() {
+  return Boolean(document.querySelector('#navbar .user-menu'));
+}
+
 async function toggleSidebar(btn: HTMLElement) {
-  const elToggleShow = document.querySelector('.repo-view-file-tree-toggle-show');
+  const elToggleShow = document.querySelector('.repo-view-file-tree-toggle[data-toggle-action="show"]');
   const elFileTreeContainer = document.querySelector('.repo-view-file-tree-container');
   const shouldShow = btn.getAttribute('data-toggle-action') === 'show';
   toggleElem(elFileTreeContainer, shouldShow);
@@ -15,7 +19,7 @@ async function toggleSidebar(btn: HTMLElement) {
 
   // FIXME: need to remove "full height" style from parent element
 
-  if (!elFileTreeContainer.hasAttribute('data-user-is-signed-in')) return;
+  if (!isUserSignedIn()) return;
   await POST(`${appSubUrl}/user/settings/update_preferences`, {
     data: {codeViewShowFileTree: shouldShow},
   });
diff --git a/web_src/js/index-domready.ts b/web_src/js/index-domready.ts
index df56c85c86..8f5d4ecb15 100644
--- a/web_src/js/index-domready.ts
+++ b/web_src/js/index-domready.ts
@@ -16,7 +16,7 @@ import {initMarkupAnchors} from './markup/anchors.ts';
 import {initNotificationCount} from './features/notification.ts';
 import {initRepoIssueContentHistory} from './features/repo-issue-content.ts';
 import {initStopwatch} from './features/stopwatch.ts';
-import {initFindFileInRepo} from './features/repo-findfile.ts';
+import {initRepoFileSearch} from './features/repo-findfile.ts';
 import {initMarkupContent} from './markup/content.ts';
 import {initRepoFileView} from './features/file-view.ts';
 import {initUserAuthOauth2, initUserCheckAppUrl} from './features/user-auth.ts';
@@ -101,7 +101,7 @@ const initPerformanceTracer = callInitFunctions([
   initSshKeyFormParser,
   initStopwatch,
   initTableSort,
-  initFindFileInRepo,
+  initRepoFileSearch,
   initCopyContent,
 
   initAdminCommon,

From 5340db4dbe400c7d03bddbe0bcfc7eddc4a768b5 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Mon, 1 Dec 2025 15:50:10 -0800
Subject: [PATCH 04/15] Fix bug when updating user email (#36058)

Fix #20390

We should use `ReplacePrimaryEmailAddress` instead of
`AdminAddOrSetPrimaryEmailAddress` when modify user's email from admin
panel. And also we need a database transaction to keep deletion and
insertion succeed at the same time.
---
 routers/web/admin/users.go |  2 +-
 services/user/email.go     | 67 +++++++++++++++++++-------------------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go
index a338936151..ed0eecf90a 100644
--- a/routers/web/admin/users.go
+++ b/routers/web/admin/users.go
@@ -409,7 +409,7 @@ func EditUserPost(ctx *context.Context) {
 	}
 
 	if form.Email != "" {
-		if err := user_service.AdminAddOrSetPrimaryEmailAddress(ctx, u, form.Email); err != nil {
+		if err := user_service.ReplacePrimaryEmailAddress(ctx, u, form.Email); err != nil {
 			switch {
 			case user_model.IsErrEmailCharIsNotSupported(err), user_model.IsErrEmailInvalid(err):
 				ctx.Data["Err_Email"] = true
diff --git a/services/user/email.go b/services/user/email.go
index 5c0de708e9..de1e024bd1 100644
--- a/services/user/email.go
+++ b/services/user/email.go
@@ -77,43 +77,44 @@ func ReplacePrimaryEmailAddress(ctx context.Context, u *user_model.User, emailSt
 		return err
 	}
 
-	if !u.IsOrganization() {
-		// Check if address exists already
-		email, err := user_model.GetEmailAddressByEmail(ctx, emailStr)
-		if err != nil && !errors.Is(err, util.ErrNotExist) {
-			return err
-		}
-		if email != nil {
-			if email.IsPrimary && email.UID == u.ID {
-				return nil
+	return db.WithTx(ctx, func(ctx context.Context) error {
+		if !u.IsOrganization() {
+			// Check if address exists already
+			email, err := user_model.GetEmailAddressByEmail(ctx, emailStr)
+			if err != nil && !errors.Is(err, util.ErrNotExist) {
+				return err
+			}
+			if email != nil {
+				if email.IsPrimary && email.UID == u.ID {
+					return nil
+				}
+				return user_model.ErrEmailAlreadyUsed{Email: emailStr}
+			}
+
+			// Remove old primary address
+			primary, err := user_model.GetPrimaryEmailAddressOfUser(ctx, u.ID)
+			if err != nil {
+				return err
+			}
+			if _, err := db.DeleteByID[user_model.EmailAddress](ctx, primary.ID); err != nil {
+				return err
+			}
+
+			// Insert new primary address
+			if _, err := user_model.InsertEmailAddress(ctx, &user_model.EmailAddress{
+				UID:         u.ID,
+				Email:       emailStr,
+				IsActivated: true,
+				IsPrimary:   true,
+			}); err != nil {
+				return err
 			}
-			return user_model.ErrEmailAlreadyUsed{Email: emailStr}
 		}
 
-		// Remove old primary address
-		primary, err := user_model.GetPrimaryEmailAddressOfUser(ctx, u.ID)
-		if err != nil {
-			return err
-		}
-		if _, err := db.DeleteByID[user_model.EmailAddress](ctx, primary.ID); err != nil {
-			return err
-		}
+		u.Email = emailStr
 
-		// Insert new primary address
-		email = &user_model.EmailAddress{
-			UID:         u.ID,
-			Email:       emailStr,
-			IsActivated: true,
-			IsPrimary:   true,
-		}
-		if _, err := user_model.InsertEmailAddress(ctx, email); err != nil {
-			return err
-		}
-	}
-
-	u.Email = emailStr
-
-	return user_model.UpdateUserCols(ctx, u, "email")
+		return user_model.UpdateUserCols(ctx, u, "email")
+	})
 }
 
 func AddEmailAddresses(ctx context.Context, u *user_model.User, emails []string) error {

From 1e777f92c79d4a5c96aa0183b0bdd62bf6150b80 Mon Sep 17 00:00:00 2001
From: GiteaBot <teabot@gitea.io>
Date: Tue, 2 Dec 2025 00:38:36 +0000
Subject: [PATCH 05/15] [skip ci] Updated translations via Crowdin

---
 options/locale/locale_ga-IE.ini | 5 +++++
 options/locale/locale_pt-PT.ini | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/options/locale/locale_ga-IE.ini b/options/locale/locale_ga-IE.ini
index abda334ff5..6b9ae41e9b 100644
--- a/options/locale/locale_ga-IE.ini
+++ b/options/locale/locale_ga-IE.ini
@@ -1354,8 +1354,11 @@ editor.this_file_locked=Tá an comhad faoi ghlas
 editor.must_be_on_a_branch=Caithfidh tú a bheith ar bhrainse chun athruithe a dhéanamh nó a mholadh ar an gcomhad seo.
 editor.fork_before_edit=Ní mór duit an stór seo a fhorcáil chun athruithe a dhéanamh nó a mholadh ar an gcomhad seo.
 editor.delete_this_file=Scrios Comhad
+editor.delete_this_directory=Scrios Eolaire
 editor.must_have_write_access=Caithfidh rochtain scríofa a bheith agat chun athruithe a dhéanamh nó a mholadh ar an gcomhad seo.
 editor.file_delete_success=Tá an comhad "%s" scriosta.
+editor.directory_delete_success=Scriosadh an eolaire "%s".
+editor.delete_directory=Scrios an eolaire '%s'
 editor.name_your_file=Ainmnigh do chomhad…
 editor.filename_help=Cuir eolaire leis trína ainm a chlóscríobh ina dhiaidh sin le slash ('/'). Bain eolaire trí backspace a chlóscríobh ag tús an réimse ionchuir.
 editor.or=nó
@@ -1482,6 +1485,7 @@ projects.column.new_submit=Cruthaigh Colún
 projects.column.new=Colún Nua
 projects.column.set_default=Socraigh Réamhshocrú
 projects.column.set_default_desc=Socraigh an colún seo mar réamhshocrú le haghaidh saincheisteanna agus tarraingtí gan chatagóir
+projects.column.default_column_hint=Cuirfear saincheisteanna nua a chuirtear leis an tionscadal seo leis an gcolún seo
 projects.column.delete=Scrios Colún
 projects.column.deletion_desc=Ag scriosadh colún tionscadail aistríonn gach saincheist ghaolmhar chuig an gcolún. Lean ar aghaidh?
 projects.column.color=Dath
@@ -3038,6 +3042,7 @@ dashboard.update_migration_poster_id=Nuashonraigh ID póstaer imir
 dashboard.git_gc_repos=Bailitheoir bruscair gach stórais
 dashboard.resync_all_sshkeys=Nuashonraigh an comhad '.ssh/authorized_keys' le heochracha SSH Gitea
 dashboard.resync_all_sshprincipals=Nuashonraigh an comhad '.ssh/authorized_principals' le príomhoidí SSH Gitea
+dashboard.resync_all_hooks=Athshioncrónaigh crúcaí git na stórtha uile (réamhghlacadh, nuashonrú, iarghlacadh, próiseasghlacadh, ...)
 dashboard.reinit_missing_repos=Aththosaigh gach stórais Git atá in easnamh a bhfuil taifid ann dóibh
 dashboard.sync_external_users=Sioncrónaigh sonraí úsáideoirí seachtracha
 dashboard.cleanup_hook_task_table=Glan suas an tábla hook_task
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
index 22e16de93f..0b2e57ea00 100644
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@@ -1354,8 +1354,11 @@ editor.this_file_locked=Ficheiro bloqueado
 editor.must_be_on_a_branch=Tem que estar num ramo para fazer ou propor modificações neste ficheiro.
 editor.fork_before_edit=Tem que fazer uma derivação deste repositório para fazer ou propor modificações neste ficheiro.
 editor.delete_this_file=Eliminar ficheiro
+editor.delete_this_directory=Eliminar pasta
 editor.must_have_write_access=Tem que ter permissões de escrita para fazer ou propor modificações neste ficheiro.
 editor.file_delete_success=O ficheiro "%s" foi eliminado.
+editor.directory_delete_success=A pasta "%s" foi eliminada.
+editor.delete_directory=Eliminar a pasta '%s'
 editor.name_your_file=Nomeie o seu ficheiro…
 editor.filename_help=Adicione uma pasta escrevendo o nome dessa pasta seguido de uma barra('/'). Remova uma pasta carregando na tecla de apagar ('←') no início do campo.
 editor.or=ou

From a04a16dc2b3d4ebc7c56fa3cf40c6321516c22b4 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 2 Dec 2025 21:37:14 +0100
Subject: [PATCH 06/15] adopt changes

---
 models/issues/review_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/issues/review_test.go b/models/issues/review_test.go
index 6795ea8e66..54adbef8c5 100644
--- a/models/issues/review_test.go
+++ b/models/issues/review_test.go
@@ -161,7 +161,7 @@ func TestGetReviewersByIssueID(t *testing.T) {
 			UpdatedUnix: 946684815,
 		},
 		&issues_model.Review{
-			ID:          22,
+			ID:          23,
 			Reviewer:    user5,
 			Type:        issues_model.ReviewTypeRequest,
 			UpdatedUnix: 946684817,

From ca4b21c3054d9e510f2b07d8f224a999d188b9d3 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 2 Dec 2025 21:51:00 +0100
Subject: [PATCH 07/15] Revert "adopt changes" (was intendet for #33356)

This reverts commit a04a16dc2b3d4ebc7c56fa3cf40c6321516c22b4.
---
 models/issues/review_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/issues/review_test.go b/models/issues/review_test.go
index 54adbef8c5..6795ea8e66 100644
--- a/models/issues/review_test.go
+++ b/models/issues/review_test.go
@@ -161,7 +161,7 @@ func TestGetReviewersByIssueID(t *testing.T) {
 			UpdatedUnix: 946684815,
 		},
 		&issues_model.Review{
-			ID:          23,
+			ID:          22,
 			Reviewer:    user5,
 			Type:        issues_model.ReviewTypeRequest,
 			UpdatedUnix: 946684817,

From 9f268edd2fbe43c8f97cdac607383dc86d05f9af Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Wed, 3 Dec 2025 00:26:07 +0100
Subject: [PATCH 08/15] Update go toolchain to 1.25.5 (#36074)

Fixes: https://pkg.go.dev/vuln/GO-2025-4155
---
 go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 51cf47b2d3..6806e76ffc 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module code.gitea.io/gitea
 
 go 1.25.0
 
-toolchain go1.25.4
+toolchain go1.25.5
 
 // rfc5280 said: "The serial number is an integer assigned by the CA to each certificate."
 // But some CAs use negative serial number, just relax the check. related:

From 46d7adefe08e5fde1400261278449dccd082d0f4 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Wed, 3 Dec 2025 03:13:16 +0100
Subject: [PATCH 09/15] Enable TypeScript `strictNullChecks` (#35843)

A big step towards enabling strict mode in Typescript.

There was definitely a good share of potential bugs while refactoring
this. When in doubt, I opted to keep the potentially broken behaviour.
Notably, the `DOMEvent` type is gone, it was broken and we're better of
with type assertions on `e.target`.

---------

Signed-off-by: silverwind <me@silverwind.io>
Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
---
 eslint.config.ts                              |   2 +-
 tsconfig.json                                 |   2 +-
 web_src/js/bootstrap.ts                       |   2 +-
 web_src/js/components/ActivityHeatmap.vue     |   4 +-
 web_src/js/components/ContextPopup.vue        |   4 +-
 web_src/js/components/DashboardRepoList.vue   |   4 +-
 web_src/js/components/DiffCommitSelector.vue  |  10 +-
 web_src/js/components/DiffFileTree.vue        |  12 +-
 web_src/js/components/RepoActionView.vue      |   4 +-
 .../js/components/RepoActivityTopAuthors.vue  |   6 +-
 .../js/components/RepoBranchTagSelector.vue   |  45 +++---
 web_src/js/components/RepoContributors.vue    |  14 +-
 web_src/js/components/RepoFileSearch.vue      |  14 +-
 web_src/js/components/ViewFileTree.vue        |   6 +-
 web_src/js/components/ViewFileTreeItem.vue    |   2 +-
 web_src/js/components/ViewFileTreeStore.ts    |   7 +-
 web_src/js/features/admin/common.ts           |  38 ++---
 web_src/js/features/admin/config.ts           |   2 +-
 web_src/js/features/admin/selfcheck.ts        |   4 +-
 web_src/js/features/captcha.ts                |   4 +-
 web_src/js/features/citation.ts               |   6 +-
 web_src/js/features/clipboard.ts              |   7 +-
 web_src/js/features/colorpicker.ts            |  15 +-
 web_src/js/features/common-button.ts          |  18 +--
 web_src/js/features/common-fetch-action.ts    |   2 +-
 web_src/js/features/common-form.ts            |   8 +-
 web_src/js/features/common-issue-list.ts      |  11 +-
 web_src/js/features/common-organization.ts    |   2 +-
 web_src/js/features/common-page.ts            |   4 +-
 .../js/features/comp/ComboMarkdownEditor.ts   |  53 +++----
 web_src/js/features/comp/Cropper.ts           |  11 +-
 .../js/features/comp/EditorMarkdown.test.ts   |   2 +-
 web_src/js/features/comp/EditorMarkdown.ts    |   7 +-
 web_src/js/features/comp/EditorUpload.ts      |  11 +-
 web_src/js/features/comp/LabelEdit.ts         |  28 ++--
 web_src/js/features/comp/ReactionSelector.ts  |   9 +-
 web_src/js/features/comp/SearchUserBox.ts     |   2 +-
 web_src/js/features/comp/TextExpander.ts      |   3 +-
 web_src/js/features/comp/WebHookEditor.ts     |   9 +-
 web_src/js/features/copycontent.ts            |   2 +-
 web_src/js/features/dropzone.ts               |  17 +--
 .../js/features/eventsource.sharedworker.ts   |  15 +-
 web_src/js/features/file-view.ts              |   6 +-
 web_src/js/features/heatmap.ts                |   2 +-
 web_src/js/features/imagediff.ts              |  16 +--
 web_src/js/features/install.ts                |  56 ++++----
 web_src/js/features/notification.ts           |   6 +-
 web_src/js/features/oauth2-settings.ts        |   8 +-
 web_src/js/features/pull-view-file.ts         |  20 +--
 web_src/js/features/repo-branch.ts            |  18 +--
 web_src/js/features/repo-code.ts              |  22 +--
 web_src/js/features/repo-commit.ts            |   4 +-
 web_src/js/features/repo-common.ts            |  18 +--
 web_src/js/features/repo-diff-commit.ts       |  14 +-
 web_src/js/features/repo-diff.ts              |  41 +++---
 web_src/js/features/repo-editor.ts            |  36 ++---
 web_src/js/features/repo-graph.ts             |   6 +-
 web_src/js/features/repo-home.ts              |  20 +--
 web_src/js/features/repo-issue-content.ts     |   8 +-
 web_src/js/features/repo-issue-edit.ts        |  42 +++---
 web_src/js/features/repo-issue-list.ts        |  30 ++--
 web_src/js/features/repo-issue-pull.ts        |  16 +--
 .../features/repo-issue-sidebar-combolist.ts  |  18 +--
 web_src/js/features/repo-issue-sidebar.ts     |  12 +-
 web_src/js/features/repo-issue.ts             | 133 +++++++++---------
 web_src/js/features/repo-legacy.ts            |   4 +-
 web_src/js/features/repo-migrate.ts           |  10 +-
 web_src/js/features/repo-migration.ts         |   4 +-
 web_src/js/features/repo-milestone.ts         |   4 +-
 web_src/js/features/repo-new.ts               |  28 ++--
 web_src/js/features/repo-projects.ts          |  40 +++---
 web_src/js/features/repo-release.ts           |  18 +--
 web_src/js/features/repo-search.ts            |   6 +-
 .../features/repo-settings-branches.test.ts   |   6 +-
 web_src/js/features/repo-settings-branches.ts |   4 +-
 web_src/js/features/repo-settings.ts          |  32 ++---
 web_src/js/features/repo-unicode-escape.ts    |   4 +-
 web_src/js/features/repo-view-file-tree.ts    |   6 +-
 web_src/js/features/repo-wiki.ts              |   4 +-
 web_src/js/features/sshkey-helper.ts          |   2 +-
 web_src/js/features/tablesort.ts              |   6 +-
 web_src/js/features/user-auth-webauthn.ts     |  10 +-
 web_src/js/features/user-auth.ts              |   2 +-
 web_src/js/features/user-settings.ts          |   6 +-
 web_src/js/htmx.ts                            |   4 +-
 web_src/js/markup/anchors.ts                  |   4 +-
 web_src/js/markup/codecopy.ts                 |   2 +-
 web_src/js/markup/mermaid.ts                  |   2 +-
 web_src/js/markup/refissue.ts                 |   2 +-
 web_src/js/markup/render-iframe.ts            |   2 +-
 web_src/js/markup/tasklist.ts                 |  14 +-
 web_src/js/modules/diff-file.ts               |   4 +-
 web_src/js/modules/fetch.ts                   |   4 +-
 web_src/js/modules/fomantic/tab.ts            |   2 +-
 web_src/js/modules/observer.ts                |   4 +-
 web_src/js/modules/sortable.ts                |   4 +-
 web_src/js/modules/tippy.ts                   |   6 +-
 web_src/js/modules/toast.ts                   |   9 +-
 web_src/js/standalone/devtest.ts              |  10 +-
 .../js/standalone/external-render-iframe.ts   |   2 +-
 web_src/js/standalone/swagger.ts              |   2 +-
 web_src/js/types.ts                           |   2 +-
 web_src/js/utils.ts                           |  36 ++---
 web_src/js/utils/dom.test.ts                  |   6 +-
 web_src/js/utils/dom.ts                       |  25 ++--
 web_src/js/webcomponents/absolute-date.ts     |   8 +-
 web_src/js/webcomponents/origin-url.ts        |   2 +-
 web_src/js/webcomponents/overflow-menu.ts     |  12 +-
 108 files changed, 686 insertions(+), 658 deletions(-)

diff --git a/eslint.config.ts b/eslint.config.ts
index c849cdbc62..c2fddc856c 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -205,7 +205,7 @@ export default defineConfig([
       '@typescript-eslint/no-non-null-asserted-optional-chain': [2],
       '@typescript-eslint/no-non-null-assertion': [0],
       '@typescript-eslint/no-redeclare': [0],
-      '@typescript-eslint/no-redundant-type-constituents': [0], // rule does not properly work without strickNullChecks
+      '@typescript-eslint/no-redundant-type-constituents': [2],
       '@typescript-eslint/no-require-imports': [2],
       '@typescript-eslint/no-restricted-imports': [0],
       '@typescript-eslint/no-restricted-types': [0],
diff --git a/tsconfig.json b/tsconfig.json
index 1daf4b7233..2466faf592 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -40,7 +40,7 @@
     "strictBindCallApply": true,
     "strictBuiltinIteratorReturn": true,
     "strictFunctionTypes": true,
-    "strictNullChecks": false,
+    "strictNullChecks": true,
     "stripInternal": true,
     "verbatimModuleSyntax": true,
     "types": [
diff --git a/web_src/js/bootstrap.ts b/web_src/js/bootstrap.ts
index 4d3f39f5bf..a94e1d66b0 100644
--- a/web_src/js/bootstrap.ts
+++ b/web_src/js/bootstrap.ts
@@ -35,7 +35,7 @@ export function showGlobalErrorMessage(msg: string, msgType: Intent = 'error') {
   const msgCount = Number(msgDiv.getAttribute(`data-global-error-msg-count`)) + 1;
   msgDiv.setAttribute(`data-global-error-msg-compact`, msgCompact);
   msgDiv.setAttribute(`data-global-error-msg-count`, msgCount.toString());
-  msgDiv.querySelector('.ui.message').textContent = msg + (msgCount > 1 ? ` (${msgCount})` : '');
+  msgDiv.querySelector('.ui.message')!.textContent = msg + (msgCount > 1 ? ` (${msgCount})` : '');
   msgContainer.prepend(msgDiv);
 }
 
diff --git a/web_src/js/components/ActivityHeatmap.vue b/web_src/js/components/ActivityHeatmap.vue
index d805817630..7c7e0cd94c 100644
--- a/web_src/js/components/ActivityHeatmap.vue
+++ b/web_src/js/components/ActivityHeatmap.vue
@@ -5,7 +5,7 @@ import {onMounted, shallowRef} from 'vue';
 import type {Value as HeatmapValue, Locale as HeatmapLocale} from '@silverwind/vue3-calendar-heatmap';
 
 defineProps<{
-  values?: HeatmapValue[];
+  values: HeatmapValue[];
   locale: {
     textTotalContributions: string;
     heatMapLocale: Partial<HeatmapLocale>;
@@ -28,7 +28,7 @@ const endDate = shallowRef(new Date());
 
 onMounted(() => {
   // work around issue with first legend color being rendered twice and legend cut off
-  const legend = document.querySelector<HTMLElement>('.vch__external-legend-wrapper');
+  const legend = document.querySelector<HTMLElement>('.vch__external-legend-wrapper')!;
   legend.setAttribute('viewBox', '12 0 80 10');
   legend.style.marginRight = '-12px';
 });
diff --git a/web_src/js/components/ContextPopup.vue b/web_src/js/components/ContextPopup.vue
index 31db902adc..733144aae1 100644
--- a/web_src/js/components/ContextPopup.vue
+++ b/web_src/js/components/ContextPopup.vue
@@ -11,15 +11,17 @@ const props = defineProps<{
 }>();
 
 const loading = shallowRef(false);
-const issue = shallowRef<Issue>(null);
+const issue = shallowRef<Issue | null>(null);
 const renderedLabels = shallowRef('');
 const errorMessage = shallowRef('');
 
 const createdAt = computed(() => {
+  if (!issue?.value) return '';
   return new Date(issue.value.created_at).toLocaleDateString(undefined, {year: 'numeric', month: 'short', day: 'numeric'});
 });
 
 const body = computed(() => {
+  if (!issue?.value) return '';
   const body = issue.value.body.replace(/\n+/g, ' ');
   return body.length > 85 ? `${body.substring(0, 85)}…` : body;
 });
diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue
index e938814ec6..e1f8475ea8 100644
--- a/web_src/js/components/DashboardRepoList.vue
+++ b/web_src/js/components/DashboardRepoList.vue
@@ -110,9 +110,9 @@ export default defineComponent({
   },
 
   mounted() {
-    const el = document.querySelector('#dashboard-repo-list');
+    const el = document.querySelector('#dashboard-repo-list')!;
     this.changeReposFilter(this.reposFilter);
-    fomanticQuery(el.querySelector('.ui.dropdown')).dropdown();
+    fomanticQuery(el.querySelector('.ui.dropdown')!).dropdown();
 
     this.textArchivedFilterTitles = {
       'archived': this.textShowOnlyArchived,
diff --git a/web_src/js/components/DiffCommitSelector.vue b/web_src/js/components/DiffCommitSelector.vue
index e9aa3c6744..fcc7af1fa0 100644
--- a/web_src/js/components/DiffCommitSelector.vue
+++ b/web_src/js/components/DiffCommitSelector.vue
@@ -23,7 +23,7 @@ type CommitListResult = {
 export default defineComponent({
   components: {SvgIcon},
   data: () => {
-    const el = document.querySelector('#diff-commit-select');
+    const el = document.querySelector('#diff-commit-select')!;
     return {
       menuVisible: false,
       isLoading: false,
@@ -35,7 +35,7 @@ export default defineComponent({
       mergeBase: el.getAttribute('data-merge-base'),
       commits: [] as Array<Commit>,
       hoverActivated: false,
-      lastReviewCommitSha: '',
+      lastReviewCommitSha: '' as string | null,
       uniqueIdMenu: generateElemId('diff-commit-selector-menu-'),
       uniqueIdShowAll: generateElemId('diff-commit-selector-show-all-'),
     };
@@ -165,7 +165,7 @@ export default defineComponent({
     },
     /** Called when user clicks on since last review */
     changesSinceLastReviewClick() {
-      window.location.assign(`${this.issueLink}/files/${this.lastReviewCommitSha}..${this.commits.at(-1).id}${this.queryParams}`);
+      window.location.assign(`${this.issueLink}/files/${this.lastReviewCommitSha}..${this.commits.at(-1)!.id}${this.queryParams}`);
     },
     /** Clicking on a single commit opens this specific commit */
     commitClicked(commitId: string, newWindow = false) {
@@ -193,7 +193,7 @@ export default defineComponent({
         // find all selected commits and generate a link
         const firstSelected = this.commits.findIndex((x) => x.selected);
         const lastSelected = this.commits.findLastIndex((x) => x.selected);
-        let beforeCommitID: string;
+        let beforeCommitID: string | null = null;
         if (firstSelected === 0) {
           beforeCommitID = this.mergeBase;
         } else {
@@ -204,7 +204,7 @@ export default defineComponent({
         if (firstSelected === lastSelected) {
           // if the start and end are the same, we show this single commit
           window.location.assign(`${this.issueLink}/commits/${afterCommitID}${this.queryParams}`);
-        } else if (beforeCommitID === this.mergeBase && afterCommitID === this.commits.at(-1).id) {
+        } else if (beforeCommitID === this.mergeBase && afterCommitID === this.commits.at(-1)!.id) {
           // if the first commit is selected and the last commit is selected, we show all commits
           window.location.assign(`${this.issueLink}/files${this.queryParams}`);
         } else {
diff --git a/web_src/js/components/DiffFileTree.vue b/web_src/js/components/DiffFileTree.vue
index 981d10c1c1..e2934b967e 100644
--- a/web_src/js/components/DiffFileTree.vue
+++ b/web_src/js/components/DiffFileTree.vue
@@ -12,14 +12,14 @@ const store = diffTreeStore();
 onMounted(() => {
   // Default to true if unset
   store.fileTreeIsVisible = localStorage.getItem(LOCAL_STORAGE_KEY) !== 'false';
-  document.querySelector('.diff-toggle-file-tree-button').addEventListener('click', toggleVisibility);
+  document.querySelector('.diff-toggle-file-tree-button')!.addEventListener('click', toggleVisibility);
 
   hashChangeListener();
   window.addEventListener('hashchange', hashChangeListener);
 });
 
 onUnmounted(() => {
-  document.querySelector('.diff-toggle-file-tree-button').removeEventListener('click', toggleVisibility);
+  document.querySelector('.diff-toggle-file-tree-button')!.removeEventListener('click', toggleVisibility);
   window.removeEventListener('hashchange', hashChangeListener);
 });
 
@@ -33,7 +33,7 @@ function expandSelectedFile() {
   if (store.selectedItem) {
     const box = document.querySelector(store.selectedItem);
     const folded = box?.getAttribute('data-folded') === 'true';
-    if (folded) setFileFolding(box, box.querySelector('.fold-file'), false);
+    if (folded) setFileFolding(box, box.querySelector('.fold-file')!, false);
   }
 }
 
@@ -48,10 +48,10 @@ function updateVisibility(visible: boolean) {
 }
 
 function updateState(visible: boolean) {
-  const btn = document.querySelector('.diff-toggle-file-tree-button');
+  const btn = document.querySelector('.diff-toggle-file-tree-button')!;
   const [toShow, toHide] = btn.querySelectorAll('.icon');
-  const tree = document.querySelector('#diff-file-tree');
-  const newTooltip = btn.getAttribute(visible ? 'data-hide-text' : 'data-show-text');
+  const tree = document.querySelector('#diff-file-tree')!;
+  const newTooltip = btn.getAttribute(visible ? 'data-hide-text' : 'data-show-text')!;
   btn.setAttribute('data-tooltip-content', newTooltip);
   toggleElem(tree, visible);
   toggleElem(toShow, !visible);
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index 00748ee9bb..357a2ba10e 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -402,7 +402,7 @@ export default defineComponent({
         }
 
         // auto-scroll to the last log line of the last step
-        let autoScrollJobStepElement: HTMLElement;
+        let autoScrollJobStepElement: HTMLElement | undefined;
         for (let stepIndex = 0; stepIndex < this.currentJob.steps.length; stepIndex++) {
           if (!autoScrollStepIndexes.get(stepIndex)) continue;
           autoScrollJobStepElement = this.getJobStepLogsContainer(stepIndex);
@@ -468,7 +468,7 @@ export default defineComponent({
       }
       const logLine = this.elStepsContainer().querySelector(selectedLogStep);
       if (!logLine) return;
-      logLine.querySelector<HTMLAnchorElement>('.line-num').click();
+      logLine.querySelector<HTMLAnchorElement>('.line-num')!.click();
     },
   },
 });
diff --git a/web_src/js/components/RepoActivityTopAuthors.vue b/web_src/js/components/RepoActivityTopAuthors.vue
index 5a925f9943..1d04fa5239 100644
--- a/web_src/js/components/RepoActivityTopAuthors.vue
+++ b/web_src/js/components/RepoActivityTopAuthors.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 // @ts-expect-error - module exports no types
 import {VueBarGraph} from 'vue-bar-graph';
-import {computed, onMounted, shallowRef, useTemplateRef} from 'vue';
+import {computed, onMounted, shallowRef, useTemplateRef, type ShallowRef} from 'vue';
 
 const colors = shallowRef({
   barColor: 'green',
@@ -41,8 +41,8 @@ const graphWidth = computed(() => {
   return activityTopAuthors.length * 40;
 });
 
-const styleElement = useTemplateRef('styleElement');
-const altStyleElement = useTemplateRef('altStyleElement');
+const styleElement = useTemplateRef('styleElement') as Readonly<ShallowRef<HTMLDivElement>>;
+const altStyleElement = useTemplateRef('altStyleElement') as Readonly<ShallowRef<HTMLDivElement>>;
 
 onMounted(() => {
   const refStyle = window.getComputedStyle(styleElement.value);
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index a0bd975f57..cf530f99b9 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -20,7 +20,10 @@ type TabLoadingStates = Record<SelectedTab, '' | 'loading' | 'done'>
 export default defineComponent({
   components: {SvgIcon},
   props: {
-    elRoot: HTMLElement,
+    elRoot: {
+      type: HTMLElement,
+      required: true,
+    },
   },
   data() {
     const shouldShowTabBranches = this.elRoot.getAttribute('data-show-tab-branches') === 'true';
@@ -33,28 +36,28 @@ export default defineComponent({
       activeItemIndex: 0,
       tabLoadingStates: {} as TabLoadingStates,
 
-      textReleaseCompare: this.elRoot.getAttribute('data-text-release-compare'),
-      textBranches: this.elRoot.getAttribute('data-text-branches'),
-      textTags: this.elRoot.getAttribute('data-text-tags'),
-      textFilterBranch: this.elRoot.getAttribute('data-text-filter-branch'),
-      textFilterTag: this.elRoot.getAttribute('data-text-filter-tag'),
-      textDefaultBranchLabel: this.elRoot.getAttribute('data-text-default-branch-label'),
-      textCreateTag: this.elRoot.getAttribute('data-text-create-tag'),
-      textCreateBranch: this.elRoot.getAttribute('data-text-create-branch'),
-      textCreateRefFrom: this.elRoot.getAttribute('data-text-create-ref-from'),
-      textNoResults: this.elRoot.getAttribute('data-text-no-results'),
-      textViewAllBranches: this.elRoot.getAttribute('data-text-view-all-branches'),
-      textViewAllTags: this.elRoot.getAttribute('data-text-view-all-tags'),
+      textReleaseCompare: this.elRoot.getAttribute('data-text-release-compare')!,
+      textBranches: this.elRoot.getAttribute('data-text-branches')!,
+      textTags: this.elRoot.getAttribute('data-text-tags')!,
+      textFilterBranch: this.elRoot.getAttribute('data-text-filter-branch')!,
+      textFilterTag: this.elRoot.getAttribute('data-text-filter-tag')!,
+      textDefaultBranchLabel: this.elRoot.getAttribute('data-text-default-branch-label')!,
+      textCreateTag: this.elRoot.getAttribute('data-text-create-tag')!,
+      textCreateBranch: this.elRoot.getAttribute('data-text-create-branch')!,
+      textCreateRefFrom: this.elRoot.getAttribute('data-text-create-ref-from')!,
+      textNoResults: this.elRoot.getAttribute('data-text-no-results')!,
+      textViewAllBranches: this.elRoot.getAttribute('data-text-view-all-branches')!,
+      textViewAllTags: this.elRoot.getAttribute('data-text-view-all-tags')!,
 
-      currentRepoDefaultBranch: this.elRoot.getAttribute('data-current-repo-default-branch'),
-      currentRepoLink: this.elRoot.getAttribute('data-current-repo-link'),
-      currentTreePath: this.elRoot.getAttribute('data-current-tree-path'),
+      currentRepoDefaultBranch: this.elRoot.getAttribute('data-current-repo-default-branch')!,
+      currentRepoLink: this.elRoot.getAttribute('data-current-repo-link')!,
+      currentTreePath: this.elRoot.getAttribute('data-current-tree-path')!,
       currentRefType: this.elRoot.getAttribute('data-current-ref-type') as GitRefType,
-      currentRefShortName: this.elRoot.getAttribute('data-current-ref-short-name'),
+      currentRefShortName: this.elRoot.getAttribute('data-current-ref-short-name')!,
 
-      refLinkTemplate: this.elRoot.getAttribute('data-ref-link-template'),
-      refFormActionTemplate: this.elRoot.getAttribute('data-ref-form-action-template'),
-      dropdownFixedText: this.elRoot.getAttribute('data-dropdown-fixed-text'),
+      refLinkTemplate: this.elRoot.getAttribute('data-ref-link-template')!,
+      refFormActionTemplate: this.elRoot.getAttribute('data-ref-form-action-template')!,
+      dropdownFixedText: this.elRoot.getAttribute('data-dropdown-fixed-text')!,
       showTabBranches: shouldShowTabBranches,
       showTabTags: this.elRoot.getAttribute('data-show-tab-tags') === 'true',
       allowCreateNewRef: this.elRoot.getAttribute('data-allow-create-new-ref') === 'true',
@@ -92,7 +95,7 @@ export default defineComponent({
       }).length;
     },
     createNewRefFormActionUrl() {
-      return `${this.currentRepoLink}/branches/_new/${this.currentRefType}/${pathEscapeSegments(this.currentRefShortName)}`;
+      return `${this.currentRepoLink}/branches/_new/${this.currentRefType}/${pathEscapeSegments(this.currentRefShortName!)}`;
     },
   },
   watch: {
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 08d63540e2..3122aa12d2 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -174,7 +174,7 @@ export default defineComponent({
         user.max_contribution_type = 0;
         const filteredWeeks = user.weeks.filter((week: Record<string, number>) => {
           const oneWeek = 7 * 24 * 60 * 60 * 1000;
-          if (week.week >= this.xAxisMin - oneWeek && week.week <= this.xAxisMax + oneWeek) {
+          if (week.week >= this.xAxisMin! - oneWeek && week.week <= this.xAxisMax! + oneWeek) {
             user.total_commits += week.commits;
             user.total_additions += week.additions;
             user.total_deletions += week.deletions;
@@ -238,8 +238,8 @@ export default defineComponent({
     },
 
     updateOtherCharts({chart}: {chart: Chart}, reset: boolean = false) {
-      const minVal = Number(chart.options.scales.x.min);
-      const maxVal = Number(chart.options.scales.x.max);
+      const minVal = Number(chart.options.scales?.x?.min);
+      const maxVal = Number(chart.options.scales?.x?.max);
       if (reset) {
         this.xAxisMin = this.xAxisStart;
         this.xAxisMax = this.xAxisEnd;
@@ -302,8 +302,8 @@ export default defineComponent({
         },
         scales: {
           x: {
-            min: this.xAxisMin,
-            max: this.xAxisMax,
+            min: this.xAxisMin ?? undefined,
+            max: this.xAxisMax ?? undefined,
             type: 'time',
             grid: {
               display: false,
@@ -334,7 +334,7 @@ export default defineComponent({
     <div class="ui header tw-flex tw-items-center tw-justify-between">
       <div>
         <relative-time
-          v-if="xAxisMin > 0"
+          v-if="xAxisMin && xAxisMin > 0"
           format="datetime"
           year="numeric"
           month="short"
@@ -346,7 +346,7 @@ export default defineComponent({
         </relative-time>
         {{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: "-" }}
         <relative-time
-          v-if="xAxisMax > 0"
+          v-if="xAxisMax && xAxisMax > 0"
           format="datetime"
           year="numeric"
           month="short"
diff --git a/web_src/js/components/RepoFileSearch.vue b/web_src/js/components/RepoFileSearch.vue
index cbc1d50656..dd93de9850 100644
--- a/web_src/js/components/RepoFileSearch.vue
+++ b/web_src/js/components/RepoFileSearch.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import { ref, computed, watch, nextTick, useTemplateRef, onMounted, onUnmounted } from 'vue';
+import {ref, computed, watch, nextTick, useTemplateRef, onMounted, onUnmounted, type ShallowRef} from 'vue';
 import {generateElemId} from '../utils/dom.ts';
-import { GET } from '../modules/fetch.ts';
-import { filterRepoFilesWeighted } from '../features/repo-findfile.ts';
-import { pathEscapeSegments } from '../utils/url.ts';
-import { SvgIcon } from '../svg.ts';
+import {GET} from '../modules/fetch.ts';
+import {filterRepoFilesWeighted} from '../features/repo-findfile.ts';
+import {pathEscapeSegments} from '../utils/url.ts';
+import {SvgIcon} from '../svg.ts';
 import {throttle} from 'throttle-debounce';
 
 const props = defineProps({
@@ -15,8 +15,8 @@ const props = defineProps({
   placeholder: { type: String, required: true },
 });
 
-const refElemInput = useTemplateRef<HTMLInputElement>('searchInput');
-const refElemPopup = useTemplateRef<HTMLElement>('searchPopup');
+const refElemInput = useTemplateRef('searchInput') as Readonly<ShallowRef<HTMLInputElement>>;
+const refElemPopup = useTemplateRef('searchPopup') as Readonly<ShallowRef<HTMLDivElement>>;
 
 const searchQuery = ref('');
 const allFiles = ref<string[]>([]);
diff --git a/web_src/js/components/ViewFileTree.vue b/web_src/js/components/ViewFileTree.vue
index 1f90f92586..dc131383f6 100644
--- a/web_src/js/components/ViewFileTree.vue
+++ b/web_src/js/components/ViewFileTree.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import ViewFileTreeItem from './ViewFileTreeItem.vue';
-import {onMounted, useTemplateRef} from 'vue';
+import {onMounted, useTemplateRef, type ShallowRef} from 'vue';
 import {createViewFileTreeStore} from './ViewFileTreeStore.ts';
 
-const elRoot = useTemplateRef('elRoot');
+const elRoot = useTemplateRef('elRoot') as Readonly<ShallowRef<HTMLDivElement>>;;
 
 const props = defineProps({
   repoLink: {type: String, required: true},
@@ -24,7 +24,7 @@ onMounted(async () => {
 
 <template>
   <div class="view-file-tree-items" ref="elRoot">
-    <ViewFileTreeItem v-for="item in store.rootFiles" :key="item.name" :item="item" :store="store"/>
+    <ViewFileTreeItem v-for="item in store.rootFiles" :key="item.entryName" :item="item" :store="store"/>
   </div>
 </template>
 
diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue
index 06d761dd65..9a50adedaa 100644
--- a/web_src/js/components/ViewFileTreeItem.vue
+++ b/web_src/js/components/ViewFileTreeItem.vue
@@ -4,7 +4,7 @@ import {isPlainClick} from '../utils/dom.ts';
 import {shallowRef} from 'vue';
 import {type createViewFileTreeStore} from './ViewFileTreeStore.ts';
 
-type Item = {
+export type Item = {
   entryName: string;
   entryMode: 'blob' | 'exec' | 'tree' | 'commit' | 'symlink' | 'unknown';
   entryIcon: string;
diff --git a/web_src/js/components/ViewFileTreeStore.ts b/web_src/js/components/ViewFileTreeStore.ts
index 61d9168aa6..211567d0a1 100644
--- a/web_src/js/components/ViewFileTreeStore.ts
+++ b/web_src/js/components/ViewFileTreeStore.ts
@@ -3,10 +3,11 @@ import {GET} from '../modules/fetch.ts';
 import {pathEscapeSegments} from '../utils/url.ts';
 import {createElementFromHTML} from '../utils/dom.ts';
 import {html} from '../utils/html.ts';
+import type {Item} from './ViewFileTreeItem.vue';
 
 export function createViewFileTreeStore(props: {repoLink: string, treePath: string, currentRefNameSubURL: string}) {
   const store = reactive({
-    rootFiles: [],
+    rootFiles: [] as Array<Item>,
     selectedItem: props.treePath,
 
     async loadChildren(treePath: string, subPath: string = '') {
@@ -28,7 +29,7 @@ export function createViewFileTreeStore(props: {repoLink: string, treePath: stri
       const u = new URL(url, window.origin);
       u.searchParams.set('only_content', 'true');
       const response = await GET(u.href);
-      const elViewContent = document.querySelector('.repo-view-content');
+      const elViewContent = document.querySelector('.repo-view-content')!;
       elViewContent.innerHTML = await response.text();
       const elViewContentData = elViewContent.querySelector('.repo-view-content-data');
       if (!elViewContentData) return; // if error occurs, there is no such element
@@ -39,7 +40,7 @@ export function createViewFileTreeStore(props: {repoLink: string, treePath: stri
 
     async navigateTreeView(treePath: string) {
       const url = store.buildTreePathWebUrl(treePath);
-      window.history.pushState({treePath, url}, null, url);
+      window.history.pushState({treePath, url}, '', url);
       store.selectedItem = treePath;
       await store.loadViewContent(url);
     },
diff --git a/web_src/js/features/admin/common.ts b/web_src/js/features/admin/common.ts
index dd5b1f464d..c019b80671 100644
--- a/web_src/js/features/admin/common.ts
+++ b/web_src/js/features/admin/common.ts
@@ -63,7 +63,7 @@ function initAdminAuthentication() {
 
   function onUsePagedSearchChange() {
     const searchPageSizeElements = document.querySelectorAll<HTMLDivElement>('.search-page-size');
-    if (document.querySelector<HTMLInputElement>('#use_paged_search').checked) {
+    if (document.querySelector<HTMLInputElement>('#use_paged_search')!.checked) {
       showElem('.search-page-size');
       for (const el of searchPageSizeElements) {
         el.querySelector('input')?.setAttribute('required', 'required');
@@ -82,10 +82,10 @@ function initAdminAuthentication() {
       input.removeAttribute('required');
     }
 
-    const provider = document.querySelector<HTMLInputElement>('#oauth2_provider').value;
+    const provider = document.querySelector<HTMLInputElement>('#oauth2_provider')!.value;
     switch (provider) {
       case 'openidConnect':
-        document.querySelector<HTMLInputElement>('.open_id_connect_auto_discovery_url input').setAttribute('required', 'required');
+        document.querySelector<HTMLInputElement>('.open_id_connect_auto_discovery_url input')!.setAttribute('required', 'required');
         showElem('.open_id_connect_auto_discovery_url');
         break;
       default: {
@@ -97,7 +97,7 @@ function initAdminAuthentication() {
           showElem('.oauth2_use_custom_url'); // show the checkbox
         }
         if (mustProvideCustomURLs) {
-          document.querySelector<HTMLInputElement>('#oauth2_use_custom_url').checked = true; // make the checkbox checked
+          document.querySelector<HTMLInputElement>('#oauth2_use_custom_url')!.checked = true; // make the checkbox checked
         }
         break;
       }
@@ -109,17 +109,17 @@ function initAdminAuthentication() {
   }
 
   function onOAuth2UseCustomURLChange(applyDefaultValues: boolean) {
-    const provider = document.querySelector<HTMLInputElement>('#oauth2_provider').value;
+    const provider = document.querySelector<HTMLInputElement>('#oauth2_provider')!.value;
     hideElem('.oauth2_use_custom_url_field');
     for (const input of document.querySelectorAll<HTMLInputElement>('.oauth2_use_custom_url_field input[required]')) {
       input.removeAttribute('required');
     }
 
     const elProviderCustomUrlSettings = document.querySelector(`#${provider}_customURLSettings`);
-    if (elProviderCustomUrlSettings && document.querySelector<HTMLInputElement>('#oauth2_use_custom_url').checked) {
+    if (elProviderCustomUrlSettings && document.querySelector<HTMLInputElement>('#oauth2_use_custom_url')!.checked) {
       for (const custom of ['token_url', 'auth_url', 'profile_url', 'email_url', 'tenant']) {
         if (applyDefaultValues) {
-          document.querySelector<HTMLInputElement>(`#oauth2_${custom}`).value = document.querySelector<HTMLInputElement>(`#${provider}_${custom}`).value;
+          document.querySelector<HTMLInputElement>(`#oauth2_${custom}`)!.value = document.querySelector<HTMLInputElement>(`#${provider}_${custom}`)!.value;
         }
         const customInput = document.querySelector(`#${provider}_${custom}`);
         if (customInput && customInput.getAttribute('data-available') === 'true') {
@@ -134,10 +134,10 @@ function initAdminAuthentication() {
 
   function onEnableLdapGroupsChange() {
     const checked = document.querySelector<HTMLInputElement>('.js-ldap-group-toggle')?.checked;
-    toggleElem(document.querySelector('#ldap-group-options'), checked);
+    toggleElem(document.querySelector('#ldap-group-options')!, checked);
   }
 
-  const elAuthType = document.querySelector<HTMLInputElement>('#auth_type');
+  const elAuthType = document.querySelector<HTMLInputElement>('#auth_type')!;
 
   // New authentication
   if (isNewPage) {
@@ -208,14 +208,14 @@ function initAdminAuthentication() {
     document.querySelector<HTMLInputElement>('#oauth2_provider')?.addEventListener('change', () => onOAuth2Change(true));
     document.querySelector<HTMLInputElement>('#oauth2_use_custom_url')?.addEventListener('change', () => onOAuth2UseCustomURLChange(true));
 
-    document.querySelector('.js-ldap-group-toggle').addEventListener('change', onEnableLdapGroupsChange);
+    document.querySelector('.js-ldap-group-toggle')!.addEventListener('change', onEnableLdapGroupsChange);
   }
   // Edit authentication
   if (isEditPage) {
     const authType = elAuthType.value;
     if (authType === '2' || authType === '5') {
       document.querySelector<HTMLInputElement>('#security_protocol')?.addEventListener('change', onSecurityProtocolChange);
-      document.querySelector('.js-ldap-group-toggle').addEventListener('change', onEnableLdapGroupsChange);
+      document.querySelector('.js-ldap-group-toggle')!.addEventListener('change', onEnableLdapGroupsChange);
       onEnableLdapGroupsChange();
       if (authType === '2') {
         document.querySelector<HTMLInputElement>('#use_paged_search')?.addEventListener('change', onUsePagedSearchChange);
@@ -227,10 +227,10 @@ function initAdminAuthentication() {
     }
   }
 
-  const elAuthName = document.querySelector<HTMLInputElement>('#auth_name');
+  const elAuthName = document.querySelector<HTMLInputElement>('#auth_name')!;
   const onAuthNameChange = function () {
     // appSubUrl is either empty or is a path that starts with `/` and doesn't have a trailing slash.
-    document.querySelector('#oauth2-callback-url').textContent = `${window.location.origin}${appSubUrl}/user/oauth2/${encodeURIComponent(elAuthName.value)}/callback`;
+    document.querySelector('#oauth2-callback-url')!.textContent = `${window.location.origin}${appSubUrl}/user/oauth2/${encodeURIComponent(elAuthName.value)}/callback`;
   };
   elAuthName.addEventListener('input', onAuthNameChange);
   onAuthNameChange();
@@ -240,13 +240,13 @@ function initAdminNotice() {
   const pageContent = document.querySelector('.page-content.admin.notice');
   if (!pageContent) return;
 
-  const detailModal = document.querySelector<HTMLDivElement>('#detail-modal');
+  const detailModal = document.querySelector<HTMLDivElement>('#detail-modal')!;
 
   // Attach view detail modals
   queryElems(pageContent, '.view-detail', (el) => el.addEventListener('click', (e) => {
     e.preventDefault();
-    const elNoticeDesc = el.closest('tr').querySelector('.notice-description');
-    const elModalDesc = detailModal.querySelector('.content pre');
+    const elNoticeDesc = el.closest('tr')!.querySelector('.notice-description')!;
+    const elModalDesc = detailModal.querySelector('.content pre')!;
     elModalDesc.textContent = elNoticeDesc.textContent;
     fomanticQuery(detailModal).modal('show');
   }));
@@ -280,10 +280,10 @@ function initAdminNotice() {
     const data = new FormData();
     for (const checkbox of checkboxes) {
       if (checkbox.checked) {
-        data.append('ids[]', checkbox.closest('.ui.checkbox').getAttribute('data-id'));
+        data.append('ids[]', checkbox.closest('.ui.checkbox')!.getAttribute('data-id')!);
       }
     }
-    await POST(this.getAttribute('data-link'), {data});
-    window.location.href = this.getAttribute('data-redirect');
+    await POST(this.getAttribute('data-link')!, {data});
+    window.location.href = this.getAttribute('data-redirect')!;
   });
 }
diff --git a/web_src/js/features/admin/config.ts b/web_src/js/features/admin/config.ts
index 16d7a2426f..76f7c1db50 100644
--- a/web_src/js/features/admin/config.ts
+++ b/web_src/js/features/admin/config.ts
@@ -11,7 +11,7 @@ export function initAdminConfigs(): void {
     el.addEventListener('change', async () => {
       try {
         const resp = await POST(`${appSubUrl}/-/admin/config`, {
-          data: new URLSearchParams({key: el.getAttribute('data-config-dyn-key'), value: String(el.checked)}),
+          data: new URLSearchParams({key: el.getAttribute('data-config-dyn-key')!, value: String(el.checked)}),
         });
         const json: Record<string, any> = await resp.json();
         if (json.errorMessage) throw new Error(json.errorMessage);
diff --git a/web_src/js/features/admin/selfcheck.ts b/web_src/js/features/admin/selfcheck.ts
index 9f53378b52..903eb15c87 100644
--- a/web_src/js/features/admin/selfcheck.ts
+++ b/web_src/js/features/admin/selfcheck.ts
@@ -7,7 +7,7 @@ export async function initAdminSelfCheck() {
   const elCheckByFrontend = document.querySelector('#self-check-by-frontend');
   if (!elCheckByFrontend) return;
 
-  const elContent = document.querySelector<HTMLDivElement>('.page-content.admin .admin-setting-content');
+  const elContent = document.querySelector<HTMLDivElement>('.page-content.admin .admin-setting-content')!;
 
   // send frontend self-check request
   const resp = await POST(`${appSubUrl}/-/admin/self_check`, {
@@ -27,5 +27,5 @@ export async function initAdminSelfCheck() {
 
   // only show the "no problem" if there is no visible "self-check-problem"
   const hasProblem = Boolean(elContent.querySelectorAll('.self-check-problem:not(.tw-hidden)').length);
-  toggleElem(elContent.querySelector('.self-check-no-problem'), !hasProblem);
+  toggleElem(elContent.querySelector('.self-check-no-problem')!, !hasProblem);
 }
diff --git a/web_src/js/features/captcha.ts b/web_src/js/features/captcha.ts
index df234d0e5c..f3d153a036 100644
--- a/web_src/js/features/captcha.ts
+++ b/web_src/js/features/captcha.ts
@@ -4,7 +4,7 @@ export async function initCaptcha() {
   const captchaEl = document.querySelector('#captcha');
   if (!captchaEl) return;
 
-  const siteKey = captchaEl.getAttribute('data-sitekey');
+  const siteKey = captchaEl.getAttribute('data-sitekey')!;
   const isDark = isDarkTheme();
 
   const params = {
@@ -43,7 +43,7 @@ export async function initCaptcha() {
 
       // @ts-expect-error TS2540: Cannot assign to 'INPUT_NAME' because it is a read-only property.
       mCaptcha.INPUT_NAME = 'm-captcha-response';
-      const instanceURL = captchaEl.getAttribute('data-instance-url');
+      const instanceURL = captchaEl.getAttribute('data-instance-url')!;
 
       new mCaptcha.default({
         siteKey: {
diff --git a/web_src/js/features/citation.ts b/web_src/js/features/citation.ts
index 3c9fe0afc8..d5ecb52e72 100644
--- a/web_src/js/features/citation.ts
+++ b/web_src/js/features/citation.ts
@@ -31,15 +31,15 @@ export async function initCitationFileCopyContent() {
 
   if (!pageData.citationFileContent) return;
 
-  const citationCopyApa = document.querySelector<HTMLButtonElement>('#citation-copy-apa');
-  const citationCopyBibtex = document.querySelector<HTMLButtonElement>('#citation-copy-bibtex');
+  const citationCopyApa = document.querySelector<HTMLButtonElement>('#citation-copy-apa')!;
+  const citationCopyBibtex = document.querySelector<HTMLButtonElement>('#citation-copy-bibtex')!;
   const inputContent = document.querySelector<HTMLInputElement>('#citation-copy-content');
 
   if ((!citationCopyApa && !citationCopyBibtex) || !inputContent) return;
 
   const updateUi = () => {
     const isBibtex = (localStorage.getItem('citation-copy-format') || defaultCitationFormat) === 'bibtex';
-    const copyContent = (isBibtex ? citationCopyBibtex : citationCopyApa).getAttribute('data-text');
+    const copyContent = (isBibtex ? citationCopyBibtex : citationCopyApa).getAttribute('data-text')!;
     inputContent.value = copyContent;
     citationCopyBibtex.classList.toggle('primary', isBibtex);
     citationCopyApa.classList.toggle('primary', !isBibtex);
diff --git a/web_src/js/features/clipboard.ts b/web_src/js/features/clipboard.ts
index 22c264d774..d5e3b55f95 100644
--- a/web_src/js/features/clipboard.ts
+++ b/web_src/js/features/clipboard.ts
@@ -1,7 +1,6 @@
 import {showTemporaryTooltip} from '../modules/tippy.ts';
 import {toAbsoluteUrl} from '../utils.ts';
 import {clippie} from 'clippie';
-import type {DOMEvent} from '../utils/dom.ts';
 
 const {copy_success, copy_error} = window.config.i18n;
 
@@ -10,15 +9,15 @@ const {copy_success, copy_error} = window.config.i18n;
 // - data-clipboard-target: Holds a selector for a <input> or <textarea> whose content is copied
 // - data-clipboard-text-type: When set to 'url' will convert relative to absolute urls
 export function initGlobalCopyToClipboardListener() {
-  document.addEventListener('click', async (e: DOMEvent<MouseEvent>) => {
-    const target = e.target.closest('[data-clipboard-text], [data-clipboard-target]');
+  document.addEventListener('click', async (e) => {
+    const target = (e.target as HTMLElement).closest('[data-clipboard-text], [data-clipboard-target]');
     if (!target) return;
 
     e.preventDefault();
 
     let text = target.getAttribute('data-clipboard-text');
     if (!text) {
-      text = document.querySelector<HTMLInputElement>(target.getAttribute('data-clipboard-target'))?.value;
+      text = document.querySelector<HTMLInputElement>(target.getAttribute('data-clipboard-target')!)?.value ?? null;
     }
 
     if (text && target.getAttribute('data-clipboard-text-type') === 'url') {
diff --git a/web_src/js/features/colorpicker.ts b/web_src/js/features/colorpicker.ts
index 66d1fcb72a..face4ef228 100644
--- a/web_src/js/features/colorpicker.ts
+++ b/web_src/js/features/colorpicker.ts
@@ -1,5 +1,4 @@
 import {createTippy} from '../modules/tippy.ts';
-import type {DOMEvent} from '../utils/dom.ts';
 import {registerGlobalInitFunc} from '../modules/observer.ts';
 
 export async function initColorPickers() {
@@ -25,7 +24,7 @@ function updatePicker(el: HTMLElement, newValue: string): void {
 }
 
 function initPicker(el: HTMLElement): void {
-  const input = el.querySelector('input');
+  const input = el.querySelector('input')!;
 
   const square = document.createElement('div');
   square.classList.add('preview-square');
@@ -39,9 +38,9 @@ function initPicker(el: HTMLElement): void {
     updateSquare(square, e.detail.value);
   });
 
-  input.addEventListener('input', (e: DOMEvent<Event, HTMLInputElement>) => {
-    updateSquare(square, e.target.value);
-    updatePicker(picker, e.target.value);
+  input.addEventListener('input', (e) => {
+    updateSquare(square, (e.target as HTMLInputElement).value);
+    updatePicker(picker, (e.target as HTMLInputElement).value);
   });
 
   createTippy(input, {
@@ -62,13 +61,13 @@ function initPicker(el: HTMLElement): void {
     input.dispatchEvent(new Event('input', {bubbles: true}));
     updateSquare(square, color);
   };
-  el.querySelector('.generate-random-color').addEventListener('click', () => {
+  el.querySelector('.generate-random-color')!.addEventListener('click', () => {
     const newValue = `#${Math.floor(Math.random() * 0xFFFFFF).toString(16).padStart(6, '0')}`;
     setSelectedColor(newValue);
   });
   for (const colorEl of el.querySelectorAll<HTMLElement>('.precolors .color')) {
-    colorEl.addEventListener('click', (e: DOMEvent<MouseEvent, HTMLAnchorElement>) => {
-      const newValue = e.target.getAttribute('data-color-hex');
+    colorEl.addEventListener('click', (e) => {
+      const newValue = (e.target as HTMLElement).getAttribute('data-color-hex')!;
       setSelectedColor(newValue);
     });
   }
diff --git a/web_src/js/features/common-button.ts b/web_src/js/features/common-button.ts
index b52238912b..72044d2d4e 100644
--- a/web_src/js/features/common-button.ts
+++ b/web_src/js/features/common-button.ts
@@ -27,7 +27,7 @@ export function initGlobalDeleteButton(): void {
       const dataObj = btn.dataset;
 
       const modalId = btn.getAttribute('data-modal-id');
-      const modal = document.querySelector(`.delete.modal${modalId ? `#${modalId}` : ''}`);
+      const modal = document.querySelector(`.delete.modal${modalId ? `#${modalId}` : ''}`)!;
 
       // set the modal "display name" by `data-name`
       const modalNameEl = modal.querySelector('.name');
@@ -37,7 +37,7 @@ export function initGlobalDeleteButton(): void {
       for (const [key, value] of Object.entries(dataObj)) {
         if (key.startsWith('data')) {
           const textEl = modal.querySelector(`.${key}`);
-          if (textEl) textEl.textContent = value;
+          if (textEl) textEl.textContent = value ?? null;
         }
       }
 
@@ -46,7 +46,7 @@ export function initGlobalDeleteButton(): void {
         onApprove: () => {
           // if `data-type="form"` exists, then submit the form by the selector provided by `data-form="..."`
           if (btn.getAttribute('data-type') === 'form') {
-            const formSelector = btn.getAttribute('data-form');
+            const formSelector = btn.getAttribute('data-form')!;
             const form = document.querySelector<HTMLFormElement>(formSelector);
             if (!form) throw new Error(`no form named ${formSelector} found`);
             modal.classList.add('is-loading'); // the form is not in the modal, so also add loading indicator to the modal
@@ -59,14 +59,14 @@ export function initGlobalDeleteButton(): void {
           const postData = new FormData();
           for (const [key, value] of Object.entries(dataObj)) {
             if (key.startsWith('data')) { // for data-data-xxx (HTML) -> dataXxx (form)
-              postData.append(key.slice(4), value);
+              postData.append(key.slice(4), String(value));
             }
             if (key === 'id') { // for data-id="..."
-              postData.append('id', value);
+              postData.append('id', String(value));
             }
           }
           (async () => {
-            const response = await POST(btn.getAttribute('data-url'), {data: postData});
+            const response = await POST(btn.getAttribute('data-url')!, {data: postData});
             if (response.ok) {
               const data = await response.json();
               window.location.href = data.redirect;
@@ -84,7 +84,7 @@ function onShowPanelClick(el: HTMLElement, e: MouseEvent) {
   // a '.show-panel' element can show a panel, by `data-panel="selector"`
   // if it has "toggle" class, it toggles the panel
   e.preventDefault();
-  const sel = el.getAttribute('data-panel');
+  const sel = el.getAttribute('data-panel')!;
   const elems = el.classList.contains('toggle') ? toggleElem(sel) : showElem(sel);
   for (const elem of elems) {
     if (isElemVisible(elem as HTMLElement)) {
@@ -103,7 +103,7 @@ function onHidePanelClick(el: HTMLElement, e: MouseEvent) {
   }
   sel = el.getAttribute('data-panel-closest');
   if (sel) {
-    hideElem((el.parentNode as HTMLElement).closest(sel));
+    hideElem((el.parentNode as HTMLElement).closest(sel)!);
     return;
   }
   throw new Error('no panel to hide'); // should never happen, otherwise there is a bug in code
@@ -141,7 +141,7 @@ function onShowModalClick(el: HTMLElement, e: MouseEvent) {
   // * Then, try to query 'target' as HTML tag
   // If there is a ".{prop-name}" part like "data-modal-form.action", the "form" element's "action" property will be set, the "prop-name" will be camel-cased to "propName".
   e.preventDefault();
-  const modalSelector = el.getAttribute('data-modal');
+  const modalSelector = el.getAttribute('data-modal')!;
   const elModal = document.querySelector(modalSelector);
   if (!elModal) throw new Error('no modal for this action');
 
diff --git a/web_src/js/features/common-fetch-action.ts b/web_src/js/features/common-fetch-action.ts
index 3ca361b6e2..0714de95c8 100644
--- a/web_src/js/features/common-fetch-action.ts
+++ b/web_src/js/features/common-fetch-action.ts
@@ -114,7 +114,7 @@ async function onLinkActionClick(el: HTMLElement, e: Event) {
   // If the "link-action" has "data-modal-confirm" attribute, a "confirm modal dialog" will be shown before taking action.
   // Attribute "data-modal-confirm" can be a modal element by "#the-modal-id", or a string content for the modal dialog.
   e.preventDefault();
-  const url = el.getAttribute('data-url');
+  const url = el.getAttribute('data-url')!;
   const doRequest = async () => {
     if ('disabled' in el) el.disabled = true; // el could be A or BUTTON, but "A" doesn't have the "disabled" attribute
     await fetchActionDoRequest(el, url, {method: el.getAttribute('data-link-action-method') || 'POST'});
diff --git a/web_src/js/features/common-form.ts b/web_src/js/features/common-form.ts
index 7321d80c44..fe201e2a01 100644
--- a/web_src/js/features/common-form.ts
+++ b/web_src/js/features/common-form.ts
@@ -1,6 +1,6 @@
 import {applyAreYouSure, initAreYouSure} from '../vendor/jquery.are-you-sure.ts';
 import {handleGlobalEnterQuickSubmit} from './comp/QuickSubmit.ts';
-import {queryElems, type DOMEvent} from '../utils/dom.ts';
+import {queryElems} from '../utils/dom.ts';
 import {initComboMarkdownEditor} from './comp/ComboMarkdownEditor.ts';
 
 export function initGlobalFormDirtyLeaveConfirm() {
@@ -13,14 +13,14 @@ export function initGlobalFormDirtyLeaveConfirm() {
 }
 
 export function initGlobalEnterQuickSubmit() {
-  document.addEventListener('keydown', (e: DOMEvent<KeyboardEvent>) => {
+  document.addEventListener('keydown', (e) => {
     if (e.key !== 'Enter') return;
     const hasCtrlOrMeta = ((e.ctrlKey || e.metaKey) && !e.altKey);
-    if (hasCtrlOrMeta && e.target.matches('textarea')) {
+    if (hasCtrlOrMeta && (e.target as HTMLElement).matches('textarea')) {
       if (handleGlobalEnterQuickSubmit(e.target as HTMLElement)) {
         e.preventDefault();
       }
-    } else if (e.target.matches('input') && !e.target.closest('form')) {
+    } else if ((e.target as HTMLElement).matches('input') && !(e.target as HTMLElement).closest('form')) {
       // input in a normal form could handle Enter key by default, so we only handle the input outside a form
       // eslint-disable-next-line unicorn/no-lonely-if
       if (handleGlobalEnterQuickSubmit(e.target as HTMLElement)) {
diff --git a/web_src/js/features/common-issue-list.ts b/web_src/js/features/common-issue-list.ts
index 037529bd10..8e6000f050 100644
--- a/web_src/js/features/common-issue-list.ts
+++ b/web_src/js/features/common-issue-list.ts
@@ -31,9 +31,9 @@ export function initCommonIssueListQuickGoto() {
   const goto = document.querySelector<HTMLElement>('#issue-list-quick-goto');
   if (!goto) return;
 
-  const form = goto.closest('form');
-  const input = form.querySelector<HTMLInputElement>('input[name=q]');
-  const repoLink = goto.getAttribute('data-repo-link');
+  const form = goto.closest('form')!;
+  const input = form.querySelector<HTMLInputElement>('input[name=q]')!;
+  const repoLink = goto.getAttribute('data-repo-link')!;
 
   form.addEventListener('submit', (e) => {
     // if there is no goto button, or the form is submitted by non-quick-goto elements, submit the form directly
@@ -44,7 +44,10 @@ export function initCommonIssueListQuickGoto() {
 
     // if there is a goto button, use its link
     e.preventDefault();
-    window.location.href = goto.getAttribute('data-issue-goto-link');
+    const link = goto.getAttribute('data-issue-goto-link');
+    if (link) {
+      window.location.href = link;
+    }
   });
 
   const onInput = async () => {
diff --git a/web_src/js/features/common-organization.ts b/web_src/js/features/common-organization.ts
index a1f19bedea..0e616134b9 100644
--- a/web_src/js/features/common-organization.ts
+++ b/web_src/js/features/common-organization.ts
@@ -7,7 +7,7 @@ export function initCommonOrganization() {
   }
 
   document.querySelector<HTMLInputElement>('.organization.settings.options #org_name')?.addEventListener('input', function () {
-    const nameChanged = this.value.toLowerCase() !== this.getAttribute('data-org-name').toLowerCase();
+    const nameChanged = this.value.toLowerCase() !== this.getAttribute('data-org-name')!.toLowerCase();
     toggleElem('#org-name-change-prompt', nameChanged);
   });
 
diff --git a/web_src/js/features/common-page.ts b/web_src/js/features/common-page.ts
index 9f0757491c..5ecc271c0b 100644
--- a/web_src/js/features/common-page.ts
+++ b/web_src/js/features/common-page.ts
@@ -25,7 +25,7 @@ function initFooterLanguageMenu() {
     const item = (e.target as HTMLElement).closest('.item');
     if (!item) return;
     e.preventDefault();
-    await GET(item.getAttribute('data-url'));
+    await GET(item.getAttribute('data-url')!);
     window.location.reload();
   });
 }
@@ -39,7 +39,7 @@ function initFooterThemeSelector() {
     apiSettings: {url: `${appSubUrl}/-/web-theme/list`, cache: false},
   });
   addDelegatedEventListener(elDropdown, 'click', '.menu > .item', async (el) => {
-    const themeName = el.getAttribute('data-value');
+    const themeName = el.getAttribute('data-value')!;
     await POST(`${appSubUrl}/-/web-theme/apply?theme=${encodeURIComponent(themeName)}`);
     window.location.reload();
   });
diff --git a/web_src/js/features/comp/ComboMarkdownEditor.ts b/web_src/js/features/comp/ComboMarkdownEditor.ts
index afa3957e21..9ceb087005 100644
--- a/web_src/js/features/comp/ComboMarkdownEditor.ts
+++ b/web_src/js/features/comp/ComboMarkdownEditor.ts
@@ -81,7 +81,7 @@ export class ComboMarkdownEditor {
   textareaMarkdownToolbar: HTMLElement;
   textareaAutosize: any;
 
-  dropzone: HTMLElement;
+  dropzone: HTMLElement | null;
   attachedDropzoneInst: any;
 
   previewMode: string;
@@ -105,7 +105,7 @@ export class ComboMarkdownEditor {
     await this.switchToUserPreference();
   }
 
-  applyEditorHeights(el: HTMLElement, heights: Heights) {
+  applyEditorHeights(el: HTMLElement, heights: Heights | undefined) {
     if (!heights) return;
     if (heights.minHeight) el.style.minHeight = heights.minHeight;
     if (heights.height) el.style.height = heights.height;
@@ -114,14 +114,14 @@ export class ComboMarkdownEditor {
 
   setupContainer() {
     this.supportEasyMDE = this.container.getAttribute('data-support-easy-mde') === 'true';
-    this.previewMode = this.container.getAttribute('data-content-mode');
-    this.previewUrl = this.container.getAttribute('data-preview-url');
-    this.previewContext = this.container.getAttribute('data-preview-context');
-    initTextExpander(this.container.querySelector('text-expander'));
+    this.previewMode = this.container.getAttribute('data-content-mode')!;
+    this.previewUrl = this.container.getAttribute('data-preview-url')!;
+    this.previewContext = this.container.getAttribute('data-preview-context')!;
+    initTextExpander(this.container.querySelector('text-expander')!);
   }
 
   setupTextarea() {
-    this.textarea = this.container.querySelector('.markdown-text-editor');
+    this.textarea = this.container.querySelector('.markdown-text-editor')!;
     this.textarea._giteaComboMarkdownEditor = this;
     this.textarea.id = generateElemId(`_combo_markdown_editor_`);
     this.textarea.addEventListener('input', () => triggerEditorContentChanged(this.container));
@@ -131,7 +131,7 @@ export class ComboMarkdownEditor {
       this.textareaAutosize = autosize(this.textarea, {viewportMarginBottom: 130});
     }
 
-    this.textareaMarkdownToolbar = this.container.querySelector('markdown-toolbar');
+    this.textareaMarkdownToolbar = this.container.querySelector('markdown-toolbar')!;
     this.textareaMarkdownToolbar.setAttribute('for', this.textarea.id);
     for (const el of this.textareaMarkdownToolbar.querySelectorAll('.markdown-toolbar-button')) {
       // upstream bug: The role code is never executed in base MarkdownButtonElement https://github.com/github/markdown-toolbar-element/issues/70
@@ -140,9 +140,9 @@ export class ComboMarkdownEditor {
       if (el.nodeName === 'BUTTON' && !el.getAttribute('type')) el.setAttribute('type', 'button');
     }
 
-    const monospaceButton = this.container.querySelector('.markdown-switch-monospace');
+    const monospaceButton = this.container.querySelector('.markdown-switch-monospace')!;
     const monospaceEnabled = localStorage?.getItem('markdown-editor-monospace') === 'true';
-    const monospaceText = monospaceButton.getAttribute(monospaceEnabled ? 'data-disable-text' : 'data-enable-text');
+    const monospaceText = monospaceButton.getAttribute(monospaceEnabled ? 'data-disable-text' : 'data-enable-text')!;
     monospaceButton.setAttribute('data-tooltip-content', monospaceText);
     monospaceButton.setAttribute('aria-checked', String(monospaceEnabled));
     monospaceButton.addEventListener('click', (e) => {
@@ -150,13 +150,13 @@ export class ComboMarkdownEditor {
       const enabled = localStorage?.getItem('markdown-editor-monospace') !== 'true';
       localStorage.setItem('markdown-editor-monospace', String(enabled));
       this.textarea.classList.toggle('tw-font-mono', enabled);
-      const text = monospaceButton.getAttribute(enabled ? 'data-disable-text' : 'data-enable-text');
+      const text = monospaceButton.getAttribute(enabled ? 'data-disable-text' : 'data-enable-text')!;
       monospaceButton.setAttribute('data-tooltip-content', text);
       monospaceButton.setAttribute('aria-checked', String(enabled));
     });
 
     if (this.supportEasyMDE) {
-      const easymdeButton = this.container.querySelector('.markdown-switch-easymde');
+      const easymdeButton = this.container.querySelector('.markdown-switch-easymde')!;
       easymdeButton.addEventListener('click', async (e) => {
         e.preventDefault();
         this.userPreferredEditor = 'easymde';
@@ -173,7 +173,7 @@ export class ComboMarkdownEditor {
   async setupDropzone() {
     const dropzoneParentContainer = this.container.getAttribute('data-dropzone-parent-container');
     if (!dropzoneParentContainer) return;
-    this.dropzone = this.container.closest(this.container.getAttribute('data-dropzone-parent-container'))?.querySelector('.dropzone');
+    this.dropzone = this.container.closest(this.container.getAttribute('data-dropzone-parent-container')!)?.querySelector('.dropzone') ?? null;
     if (!this.dropzone) return;
 
     this.attachedDropzoneInst = await initDropzone(this.dropzone);
@@ -212,13 +212,14 @@ export class ComboMarkdownEditor {
     // Fomantic Tab requires the "data-tab" to be globally unique.
     // So here it uses our defined "data-tab-for" and "data-tab-panel" to generate the "data-tab" attribute for Fomantic.
     const tabIdSuffix = generateElemId();
-    this.tabEditor = Array.from(tabs).find((tab) => tab.getAttribute('data-tab-for') === 'markdown-writer');
-    this.tabPreviewer = Array.from(tabs).find((tab) => tab.getAttribute('data-tab-for') === 'markdown-previewer');
+    const tabsArr = Array.from(tabs);
+    this.tabEditor = tabsArr.find((tab) => tab.getAttribute('data-tab-for') === 'markdown-writer')!;
+    this.tabPreviewer = tabsArr.find((tab) => tab.getAttribute('data-tab-for') === 'markdown-previewer')!;
     this.tabEditor.setAttribute('data-tab', `markdown-writer-${tabIdSuffix}`);
     this.tabPreviewer.setAttribute('data-tab', `markdown-previewer-${tabIdSuffix}`);
 
-    const panelEditor = this.container.querySelector('.ui.tab[data-tab-panel="markdown-writer"]');
-    const panelPreviewer = this.container.querySelector('.ui.tab[data-tab-panel="markdown-previewer"]');
+    const panelEditor = this.container.querySelector('.ui.tab[data-tab-panel="markdown-writer"]')!;
+    const panelPreviewer = this.container.querySelector('.ui.tab[data-tab-panel="markdown-previewer"]')!;
     panelEditor.setAttribute('data-tab', `markdown-writer-${tabIdSuffix}`);
     panelPreviewer.setAttribute('data-tab', `markdown-previewer-${tabIdSuffix}`);
 
@@ -254,8 +255,8 @@ export class ComboMarkdownEditor {
   }
 
   initMarkdownButtonTableAdd() {
-    const addTableButton = this.container.querySelector('.markdown-button-table-add');
-    const addTablePanel = this.container.querySelector('.markdown-add-table-panel');
+    const addTableButton = this.container.querySelector('.markdown-button-table-add')!;
+    const addTablePanel = this.container.querySelector('.markdown-add-table-panel')!;
     // here the tippy can't attach to the button because the button already owns a tippy for tooltip
     const addTablePanelTippy = createTippy(addTablePanel, {
       content: addTablePanel,
@@ -267,9 +268,9 @@ export class ComboMarkdownEditor {
     });
     addTableButton.addEventListener('click', () => addTablePanelTippy.show());
 
-    addTablePanel.querySelector('.ui.button.primary').addEventListener('click', () => {
-      let rows = parseInt(addTablePanel.querySelector<HTMLInputElement>('[name=rows]').value);
-      let cols = parseInt(addTablePanel.querySelector<HTMLInputElement>('[name=cols]').value);
+    addTablePanel.querySelector('.ui.button.primary')!.addEventListener('click', () => {
+      let rows = parseInt(addTablePanel.querySelector<HTMLInputElement>('[name=rows]')!.value);
+      let cols = parseInt(addTablePanel.querySelector<HTMLInputElement>('[name=cols]')!.value);
       rows = Math.max(1, Math.min(100, rows));
       cols = Math.max(1, Math.min(100, cols));
       textareaInsertText(this.textarea, `\n${this.generateMarkdownTable(rows, cols)}\n\n`);
@@ -360,7 +361,7 @@ export class ComboMarkdownEditor {
         }
       },
     });
-    this.applyEditorHeights(this.container.querySelector('.CodeMirror-scroll'), this.options.editorHeights);
+    this.applyEditorHeights(this.container.querySelector('.CodeMirror-scroll')!, this.options.editorHeights);
     await attachTribute(this.easyMDE.codemirror.getInputField());
     if (this.dropzone) {
       initEasyMDEPaste(this.easyMDE, this.dropzone);
@@ -401,10 +402,10 @@ export class ComboMarkdownEditor {
     }
   }
 
-  get userPreferredEditor() {
-    return window.localStorage.getItem(`markdown-editor-${this.previewMode ?? 'default'}`);
+  get userPreferredEditor(): string {
+    return window.localStorage.getItem(`markdown-editor-${this.previewMode ?? 'default'}`) || '';
   }
-  set userPreferredEditor(s) {
+  set userPreferredEditor(s: string) {
     window.localStorage.setItem(`markdown-editor-${this.previewMode ?? 'default'}`, s);
   }
 }
diff --git a/web_src/js/features/comp/Cropper.ts b/web_src/js/features/comp/Cropper.ts
index c7359a8a90..9fd48697fa 100644
--- a/web_src/js/features/comp/Cropper.ts
+++ b/web_src/js/features/comp/Cropper.ts
@@ -1,4 +1,4 @@
-import {showElem, type DOMEvent} from '../../utils/dom.ts';
+import {showElem} from '../../utils/dom.ts';
 
 type CropperOpts = {
   container: HTMLElement,
@@ -17,6 +17,7 @@ async function initCompCropper({container, fileInput, imageSource}: CropperOpts)
     crop() {
       const canvas = cropper.getCroppedCanvas();
       canvas.toBlob((blob) => {
+        if (!blob) return;
         const croppedFileName = currentFileName.replace(/\.[^.]{3,4}$/, '.png');
         const croppedFile = new File([blob], croppedFileName, {type: 'image/png', lastModified: currentFileLastModified});
         const dataTransfer = new DataTransfer();
@@ -26,9 +27,9 @@ async function initCompCropper({container, fileInput, imageSource}: CropperOpts)
     },
   });
 
-  fileInput.addEventListener('input', (e: DOMEvent<Event, HTMLInputElement>) => {
-    const files = e.target.files;
-    if (files?.length > 0) {
+  fileInput.addEventListener('input', (e) => {
+    const files = (e.target as HTMLInputElement).files;
+    if (files?.length) {
       currentFileName = files[0].name;
       currentFileLastModified = files[0].lastModified;
       const fileURL = URL.createObjectURL(files[0]);
@@ -42,6 +43,6 @@ async function initCompCropper({container, fileInput, imageSource}: CropperOpts)
 export async function initAvatarUploaderWithCropper(fileInput: HTMLInputElement) {
   const panel = fileInput.nextElementSibling as HTMLElement;
   if (!panel?.matches('.cropper-panel')) throw new Error('Missing cropper panel for avatar uploader');
-  const imageSource = panel.querySelector<HTMLImageElement>('.cropper-source');
+  const imageSource = panel.querySelector<HTMLImageElement>('.cropper-source')!;
   await initCompCropper({container: panel, fileInput, imageSource});
 }
diff --git a/web_src/js/features/comp/EditorMarkdown.test.ts b/web_src/js/features/comp/EditorMarkdown.test.ts
index ae3d0c9f0b..295a803015 100644
--- a/web_src/js/features/comp/EditorMarkdown.test.ts
+++ b/web_src/js/features/comp/EditorMarkdown.test.ts
@@ -24,7 +24,7 @@ test('textareaSplitLines', () => {
 });
 
 test('markdownHandleIndention', () => {
-  const testInput = (input: string, expected?: string) => {
+  const testInput = (input: string, expected: string | null) => {
     const inputPos = input.indexOf('|');
     input = input.replaceAll('|', '');
     const ret = markdownHandleIndention({value: input, selStart: inputPos, selEnd: inputPos});
diff --git a/web_src/js/features/comp/EditorMarkdown.ts b/web_src/js/features/comp/EditorMarkdown.ts
index 00cf4a188c..2240e2f41b 100644
--- a/web_src/js/features/comp/EditorMarkdown.ts
+++ b/web_src/js/features/comp/EditorMarkdown.ts
@@ -45,7 +45,8 @@ function handleIndentSelection(textarea: HTMLTextAreaElement, e: KeyboardEvent)
   }
 
   // re-calculating the selection range
-  let newSelStart, newSelEnd;
+  let newSelStart: number | null = null;
+  let newSelEnd: number | null = null;
   pos = 0;
   for (let i = 0; i < lines.length; i++) {
     if (i === selectedLines[0]) {
@@ -134,7 +135,7 @@ export function markdownHandleIndention(tvs: TextareaValueSelection): MarkdownHa
 
   // parse the indention
   let lineContent = line;
-  const indention = /^\s*/.exec(lineContent)[0];
+  const indention = (/^\s*/.exec(lineContent) || [''])[0];
   lineContent = lineContent.slice(indention.length);
   if (linesBuf.inlinePos <= indention.length) return unhandled; // if cursor is at the indention, do nothing, let the browser handle it
 
@@ -177,7 +178,7 @@ export function markdownHandleIndention(tvs: TextareaValueSelection): MarkdownHa
 
 function handleNewline(textarea: HTMLTextAreaElement, e: Event) {
   const ret = markdownHandleIndention({value: textarea.value, selStart: textarea.selectionStart, selEnd: textarea.selectionEnd});
-  if (!ret.handled) return;
+  if (!ret.handled || !ret.valueSelection) return; // FIXME: the "handled" seems redundant, only valueSelection is enough (null for unhandled)
   e.preventDefault();
   textarea.value = ret.valueSelection.value;
   textarea.setSelectionRange(ret.valueSelection.selStart, ret.valueSelection.selEnd);
diff --git a/web_src/js/features/comp/EditorUpload.ts b/web_src/js/features/comp/EditorUpload.ts
index 3e4a84568c..92593e7092 100644
--- a/web_src/js/features/comp/EditorUpload.ts
+++ b/web_src/js/features/comp/EditorUpload.ts
@@ -121,7 +121,10 @@ function getPastedImages(e: ClipboardEvent) {
   const images: Array<File> = [];
   for (const item of e.clipboardData?.items ?? []) {
     if (item.type?.startsWith('image/')) {
-      images.push(item.getAsFile());
+      const file = item.getAsFile();
+      if (file) {
+        images.push(file);
+      }
     }
   }
   return images;
@@ -135,7 +138,7 @@ export function initEasyMDEPaste(easyMDE: EasyMDE, dropzoneEl: HTMLElement) {
     handleUploadFiles(editor, dropzoneEl, images, e);
   });
   easyMDE.codemirror.on('drop', (_, e) => {
-    if (!e.dataTransfer.files.length) return;
+    if (!e.dataTransfer?.files.length) return;
     handleUploadFiles(editor, dropzoneEl, e.dataTransfer.files, e);
   });
   dropzoneEl.dropzone.on(DropzoneCustomEventRemovedFile, ({fileUuid}) => {
@@ -145,7 +148,7 @@ export function initEasyMDEPaste(easyMDE: EasyMDE, dropzoneEl: HTMLElement) {
   });
 }
 
-export function initTextareaEvents(textarea: HTMLTextAreaElement, dropzoneEl: HTMLElement) {
+export function initTextareaEvents(textarea: HTMLTextAreaElement, dropzoneEl: HTMLElement | null) {
   subscribe(textarea); // enable paste features
   textarea.addEventListener('paste', (e: ClipboardEvent) => {
     const images = getPastedImages(e);
@@ -154,7 +157,7 @@ export function initTextareaEvents(textarea: HTMLTextAreaElement, dropzoneEl: HT
     }
   });
   textarea.addEventListener('drop', (e: DragEvent) => {
-    if (!e.dataTransfer.files.length) return;
+    if (!e.dataTransfer?.files.length) return;
     if (!dropzoneEl) return;
     handleUploadFiles(new TextareaEditor(textarea), dropzoneEl, e.dataTransfer.files, e);
   });
diff --git a/web_src/js/features/comp/LabelEdit.ts b/web_src/js/features/comp/LabelEdit.ts
index 3e27eac1c5..59cb49d4a3 100644
--- a/web_src/js/features/comp/LabelEdit.ts
+++ b/web_src/js/features/comp/LabelEdit.ts
@@ -14,17 +14,17 @@ export function initCompLabelEdit(pageSelector: string) {
   const elModal = pageContent.querySelector<HTMLElement>('#issue-label-edit-modal');
   if (!elModal) return;
 
-  const elLabelId = elModal.querySelector<HTMLInputElement>('input[name="id"]');
-  const elNameInput = elModal.querySelector<HTMLInputElement>('.label-name-input');
-  const elExclusiveField = elModal.querySelector('.label-exclusive-input-field');
-  const elExclusiveInput = elModal.querySelector<HTMLInputElement>('.label-exclusive-input');
-  const elExclusiveWarning = elModal.querySelector('.label-exclusive-warning');
-  const elExclusiveOrderField = elModal.querySelector<HTMLInputElement>('.label-exclusive-order-input-field');
-  const elExclusiveOrderInput = elModal.querySelector<HTMLInputElement>('.label-exclusive-order-input');
-  const elIsArchivedField = elModal.querySelector('.label-is-archived-input-field');
-  const elIsArchivedInput = elModal.querySelector<HTMLInputElement>('.label-is-archived-input');
-  const elDescInput = elModal.querySelector<HTMLInputElement>('.label-desc-input');
-  const elColorInput = elModal.querySelector<HTMLInputElement>('.color-picker-combo input');
+  const elLabelId = elModal.querySelector<HTMLInputElement>('input[name="id"]')!;
+  const elNameInput = elModal.querySelector<HTMLInputElement>('.label-name-input')!;
+  const elExclusiveField = elModal.querySelector('.label-exclusive-input-field')!;
+  const elExclusiveInput = elModal.querySelector<HTMLInputElement>('.label-exclusive-input')!;
+  const elExclusiveWarning = elModal.querySelector('.label-exclusive-warning')!;
+  const elExclusiveOrderField = elModal.querySelector<HTMLInputElement>('.label-exclusive-order-input-field')!;
+  const elExclusiveOrderInput = elModal.querySelector<HTMLInputElement>('.label-exclusive-order-input')!;
+  const elIsArchivedField = elModal.querySelector('.label-is-archived-input-field')!;
+  const elIsArchivedInput = elModal.querySelector<HTMLInputElement>('.label-is-archived-input')!;
+  const elDescInput = elModal.querySelector<HTMLInputElement>('.label-desc-input')!;
+  const elColorInput = elModal.querySelector<HTMLInputElement>('.color-picker-combo input')!;
 
   const syncModalUi = () => {
     const hasScope = nameHasScope(elNameInput.value);
@@ -37,13 +37,13 @@ export function initCompLabelEdit(pageSelector: string) {
     if (parseInt(elExclusiveOrderInput.value) <= 0) {
       elExclusiveOrderInput.style.color = 'var(--color-placeholder-text) !important';
     } else {
-      elExclusiveOrderInput.style.color = null;
+      elExclusiveOrderInput.style.removeProperty('color');
     }
   };
 
   const showLabelEditModal = (btn:HTMLElement) => {
     // the "btn" should contain the label's attributes by its `data-label-xxx` attributes
-    const form = elModal.querySelector<HTMLFormElement>('form');
+    const form = elModal.querySelector<HTMLFormElement>('form')!;
     elLabelId.value = btn.getAttribute('data-label-id') || '';
     elNameInput.value = btn.getAttribute('data-label-name') || '';
     elExclusiveOrderInput.value = btn.getAttribute('data-label-exclusive-order') || '0';
@@ -59,7 +59,7 @@ export function initCompLabelEdit(pageSelector: string) {
     // if a label was not exclusive but has issues, then it should warn user if it will become exclusive
     const numIssues = parseInt(btn.getAttribute('data-label-num-issues') || '0');
     elModal.toggleAttribute('data-need-warn-exclusive', !elExclusiveInput.checked && numIssues > 0);
-    elModal.querySelector('.header').textContent = isEdit ? elModal.getAttribute('data-text-edit-label') : elModal.getAttribute('data-text-new-label');
+    elModal.querySelector('.header')!.textContent = isEdit ? elModal.getAttribute('data-text-edit-label') : elModal.getAttribute('data-text-new-label');
 
     const curPageLink = elModal.getAttribute('data-current-page-link');
     form.action = isEdit ? `${curPageLink}/edit` : `${curPageLink}/new`;
diff --git a/web_src/js/features/comp/ReactionSelector.ts b/web_src/js/features/comp/ReactionSelector.ts
index bb54593f11..efc592597a 100644
--- a/web_src/js/features/comp/ReactionSelector.ts
+++ b/web_src/js/features/comp/ReactionSelector.ts
@@ -1,18 +1,17 @@
 import {POST} from '../../modules/fetch.ts';
-import type {DOMEvent} from '../../utils/dom.ts';
 import {registerGlobalEventFunc} from '../../modules/observer.ts';
 
 export function initCompReactionSelector() {
-  registerGlobalEventFunc('click', 'onCommentReactionButtonClick', async (target: HTMLElement, e: DOMEvent<MouseEvent>) => {
+  registerGlobalEventFunc('click', 'onCommentReactionButtonClick', async (target: HTMLElement, e: Event) => {
     // there are 2 places for the "reaction" buttons, one is the top-right reaction menu, one is the bottom of the comment
     e.preventDefault();
 
     if (target.classList.contains('disabled')) return;
 
-    const actionUrl = target.closest('[data-action-url]').getAttribute('data-action-url');
-    const reactionContent = target.getAttribute('data-reaction-content');
+    const actionUrl = target.closest('[data-action-url]')!.getAttribute('data-action-url');
+    const reactionContent = target.getAttribute('data-reaction-content')!;
 
-    const commentContainer = target.closest('.comment-container');
+    const commentContainer = target.closest('.comment-container')!;
 
     const bottomReactions = commentContainer.querySelector('.bottom-reactions'); // may not exist if there is no reaction
     const bottomReactionBtn = bottomReactions?.querySelector(`a[data-reaction-content="${CSS.escape(reactionContent)}"]`);
diff --git a/web_src/js/features/comp/SearchUserBox.ts b/web_src/js/features/comp/SearchUserBox.ts
index 9cba18b356..f5680078a3 100644
--- a/web_src/js/features/comp/SearchUserBox.ts
+++ b/web_src/js/features/comp/SearchUserBox.ts
@@ -17,7 +17,7 @@ export function initCompSearchUserBox() {
       url: `${appSubUrl}/user/search_candidates?q={query}&orgs=${includeOrgs}`,
       onResponse(response: any) {
         const resultItems = [];
-        const searchQuery = searchUserBox.querySelector('input').value;
+        const searchQuery = searchUserBox.querySelector('input')!.value;
         const searchQueryUppercase = searchQuery.toUpperCase();
         for (const item of response.data) {
           const resultItem = {
diff --git a/web_src/js/features/comp/TextExpander.ts b/web_src/js/features/comp/TextExpander.ts
index 2d79fe5029..4a04a4422f 100644
--- a/web_src/js/features/comp/TextExpander.ts
+++ b/web_src/js/features/comp/TextExpander.ts
@@ -37,7 +37,7 @@ async function fetchIssueSuggestions(key: string, text: string): Promise<TextExp
 export function initTextExpander(expander: TextExpanderElement) {
   if (!expander) return;
 
-  const textarea = expander.querySelector<HTMLTextAreaElement>('textarea');
+  const textarea = expander.querySelector<HTMLTextAreaElement>('textarea')!;
 
   // help to fix the text-expander "multiword+promise" bug: do not show the popup when there is no "#" before current line
   const shouldShowIssueSuggestions = () => {
@@ -64,6 +64,7 @@ export function initTextExpander(expander: TextExpanderElement) {
   }, 300); // to match onInputDebounce delay
 
   expander.addEventListener('text-expander-change', (e: TextExpanderChangeEvent) => {
+    if (!e.detail) return;
     const {key, text, provide} = e.detail;
     if (key === ':') {
       const matches = matchEmoji(text);
diff --git a/web_src/js/features/comp/WebHookEditor.ts b/web_src/js/features/comp/WebHookEditor.ts
index 794b3c99ca..a69d438ba2 100644
--- a/web_src/js/features/comp/WebHookEditor.ts
+++ b/web_src/js/features/comp/WebHookEditor.ts
@@ -27,7 +27,7 @@ export function initCompWebHookEditor() {
   if (httpMethodInput) {
     const updateContentType = function () {
       const visible = httpMethodInput.value === 'POST';
-      toggleElem(document.querySelector('#content_type').closest('.field'), visible);
+      toggleElem(document.querySelector('#content_type')!.closest('.field')!, visible);
     };
     updateContentType();
     httpMethodInput.addEventListener('change', updateContentType);
@@ -36,9 +36,12 @@ export function initCompWebHookEditor() {
   // Test delivery
   document.querySelector<HTMLButtonElement>('#test-delivery')?.addEventListener('click', async function () {
     this.classList.add('is-loading', 'disabled');
-    await POST(this.getAttribute('data-link'));
+    await POST(this.getAttribute('data-link')!);
     setTimeout(() => {
-      window.location.href = this.getAttribute('data-redirect');
+      const redirectUrl = this.getAttribute('data-redirect');
+      if (redirectUrl) {
+        window.location.href = redirectUrl;
+      }
     }, 5000);
   });
 }
diff --git a/web_src/js/features/copycontent.ts b/web_src/js/features/copycontent.ts
index 0fec2a6235..74e98cf95e 100644
--- a/web_src/js/features/copycontent.ts
+++ b/web_src/js/features/copycontent.ts
@@ -20,7 +20,7 @@ export function initCopyContent() {
       btn.classList.add('is-loading', 'loading-icon-2px');
       try {
         const res = await GET(rawFileLink, {credentials: 'include', redirect: 'follow'});
-        const contentType = res.headers.get('content-type');
+        const contentType = res.headers.get('content-type')!;
 
         if (contentType.startsWith('image/') && !contentType.startsWith('image/svg')) {
           isRasterImage = true;
diff --git a/web_src/js/features/dropzone.ts b/web_src/js/features/dropzone.ts
index 508b7cb606..b86ed520f5 100644
--- a/web_src/js/features/dropzone.ts
+++ b/web_src/js/features/dropzone.ts
@@ -28,7 +28,7 @@ async function createDropzone(el: HTMLElement, opts: DropzoneOptions) {
 export function generateMarkdownLinkForAttachment(file: Partial<CustomDropzoneFile>, {width, dppx}: {width?: number, dppx?: number} = {}) {
   let fileMarkdown = `[${file.name}](/attachments/${file.uuid})`;
   if (isImageFile(file)) {
-    if (width > 0 && dppx > 1) {
+    if (width && width > 0 && dppx && dppx > 1) {
       // Scale down images from HiDPI monitors. This uses the <img> tag because it's the only
       // method to change image size in Markdown that is supported by all implementations.
       // Make the image link relative to the repo path, then the final URL is "/sub-path/owner/repo/attachments/{uuid}"
@@ -56,7 +56,7 @@ function addCopyLink(file: Partial<CustomDropzoneFile>) {
     const success = await clippie(generateMarkdownLinkForAttachment(file));
     showTemporaryTooltip(e.target as Element, success ? i18n.copy_success : i18n.copy_error);
   });
-  file.previewTemplate.append(copyLinkEl);
+  file.previewTemplate!.append(copyLinkEl);
 }
 
 type FileUuidDict = Record<string, {submitted: boolean}>;
@@ -66,15 +66,15 @@ type FileUuidDict = Record<string, {submitted: boolean}>;
  */
 export async function initDropzone(dropzoneEl: HTMLElement) {
   const listAttachmentsUrl = dropzoneEl.closest('[data-attachment-url]')?.getAttribute('data-attachment-url');
-  const removeAttachmentUrl = dropzoneEl.getAttribute('data-remove-url');
-  const attachmentBaseLinkUrl = dropzoneEl.getAttribute('data-link-url');
+  const removeAttachmentUrl = dropzoneEl.getAttribute('data-remove-url')!;
+  const attachmentBaseLinkUrl = dropzoneEl.getAttribute('data-link-url')!;
 
   let disableRemovedfileEvent = false; // when resetting the dropzone (removeAllFiles), disable the "removedfile" event
   let fileUuidDict: FileUuidDict = {}; // to record: if a comment has been saved, then the uploaded files won't be deleted from server when clicking the Remove in the dropzone
   const opts: Record<string, any> = {
     url: dropzoneEl.getAttribute('data-upload-url'),
     headers: {'X-Csrf-Token': csrfToken},
-    acceptedFiles: ['*/*', ''].includes(dropzoneEl.getAttribute('data-accepts')) ? null : dropzoneEl.getAttribute('data-accepts'),
+    acceptedFiles: ['*/*', ''].includes(dropzoneEl.getAttribute('data-accepts')!) ? null : dropzoneEl.getAttribute('data-accepts'),
     addRemoveLinks: true,
     dictDefaultMessage: dropzoneEl.getAttribute('data-default-message'),
     dictInvalidFileType: dropzoneEl.getAttribute('data-invalid-input-type'),
@@ -96,7 +96,7 @@ export async function initDropzone(dropzoneEl: HTMLElement) {
     file.uuid = resp.uuid;
     fileUuidDict[file.uuid] = {submitted: false};
     const input = createElementFromAttrs('input', {name: 'files', type: 'hidden', id: `dropzone-file-${resp.uuid}`, value: resp.uuid});
-    dropzoneEl.querySelector('.files').append(input);
+    dropzoneEl.querySelector('.files')!.append(input);
     addCopyLink(file);
     dzInst.emit(DropzoneCustomEventUploadDone, {file});
   });
@@ -120,6 +120,7 @@ export async function initDropzone(dropzoneEl: HTMLElement) {
 
   dzInst.on(DropzoneCustomEventReloadFiles, async () => {
     try {
+      if (!listAttachmentsUrl) return;
       const resp = await GET(listAttachmentsUrl);
       const respData = await resp.json();
       // do not trigger the "removedfile" event, otherwise the attachments would be deleted from server
@@ -127,7 +128,7 @@ export async function initDropzone(dropzoneEl: HTMLElement) {
       dzInst.removeAllFiles(true);
       disableRemovedfileEvent = false;
 
-      dropzoneEl.querySelector('.files').innerHTML = '';
+      dropzoneEl.querySelector('.files')!.innerHTML = '';
       for (const el of dropzoneEl.querySelectorAll('.dz-preview')) el.remove();
       fileUuidDict = {};
       for (const attachment of respData) {
@@ -141,7 +142,7 @@ export async function initDropzone(dropzoneEl: HTMLElement) {
         addCopyLink(file); // it is from server response, so no "type"
         fileUuidDict[file.uuid] = {submitted: true};
         const input = createElementFromAttrs('input', {name: 'files', type: 'hidden', id: `dropzone-file-${file.uuid}`, value: file.uuid});
-        dropzoneEl.querySelector('.files').append(input);
+        dropzoneEl.querySelector('.files')!.append(input);
       }
       if (!dropzoneEl.querySelector('.dz-preview')) {
         dropzoneEl.classList.remove('dz-started');
diff --git a/web_src/js/features/eventsource.sharedworker.ts b/web_src/js/features/eventsource.sharedworker.ts
index cfc31e111f..af52abc5a9 100644
--- a/web_src/js/features/eventsource.sharedworker.ts
+++ b/web_src/js/features/eventsource.sharedworker.ts
@@ -1,6 +1,6 @@
 class Source {
   url: string;
-  eventSource: EventSource;
+  eventSource: EventSource | null;
   listening: Record<string, boolean>;
   clients: Array<MessagePort>;
 
@@ -47,7 +47,7 @@ class Source {
   listen(eventType: string) {
     if (this.listening[eventType]) return;
     this.listening[eventType] = true;
-    this.eventSource.addEventListener(eventType, (event) => {
+    this.eventSource?.addEventListener(eventType, (event) => {
       this.notifyClients({
         type: eventType,
         data: event.data,
@@ -64,7 +64,7 @@ class Source {
   status(port: MessagePort) {
     port.postMessage({
       type: 'status',
-      message: `url: ${this.url} readyState: ${this.eventSource.readyState}`,
+      message: `url: ${this.url} readyState: ${this.eventSource?.readyState}`,
     });
   }
 }
@@ -85,14 +85,14 @@ self.addEventListener('connect', (e: MessageEvent) => {
       }
       if (event.data.type === 'start') {
         const url = event.data.url;
-        if (sourcesByUrl.get(url)) {
+        let source = sourcesByUrl.get(url);
+        if (source) {
           // we have a Source registered to this url
-          const source = sourcesByUrl.get(url);
           source.register(port);
           sourcesByPort.set(port, source);
           return;
         }
-        let source = sourcesByPort.get(port);
+        source = sourcesByPort.get(port);
         if (source) {
           if (source.eventSource && source.url === url) return;
 
@@ -111,11 +111,10 @@ self.addEventListener('connect', (e: MessageEvent) => {
         sourcesByUrl.set(url, source);
         sourcesByPort.set(port, source);
       } else if (event.data.type === 'listen') {
-        const source = sourcesByPort.get(port);
+        const source = sourcesByPort.get(port)!;
         source.listen(event.data.eventType);
       } else if (event.data.type === 'close') {
         const source = sourcesByPort.get(port);
-
         if (!source) return;
 
         const count = source.deregister(port);
diff --git a/web_src/js/features/file-view.ts b/web_src/js/features/file-view.ts
index 67f4381468..ff9e8cfa26 100644
--- a/web_src/js/features/file-view.ts
+++ b/web_src/js/features/file-view.ts
@@ -18,11 +18,11 @@ function findFileRenderPlugin(filename: string, mimeType: string): FileRenderPlu
 }
 
 function showRenderRawFileButton(elFileView: HTMLElement, renderContainer: HTMLElement | null): void {
-  const toggleButtons = elFileView.querySelector('.file-view-toggle-buttons');
+  const toggleButtons = elFileView.querySelector('.file-view-toggle-buttons')!;
   showElem(toggleButtons);
   const displayingRendered = Boolean(renderContainer);
   toggleElemClass(toggleButtons.querySelectorAll('.file-view-toggle-source'), 'active', !displayingRendered); // it may not exist
-  toggleElemClass(toggleButtons.querySelector('.file-view-toggle-rendered'), 'active', displayingRendered);
+  toggleElemClass(toggleButtons.querySelector('.file-view-toggle-rendered')!, 'active', displayingRendered);
   // TODO: if there is only one button, hide it?
 }
 
@@ -62,7 +62,7 @@ async function renderRawFileToContainer(container: HTMLElement, rawFileLink: str
 export function initRepoFileView(): void {
   registerGlobalInitFunc('initRepoFileView', async (elFileView: HTMLElement) => {
     initPluginsOnce();
-    const rawFileLink = elFileView.getAttribute('data-raw-file-link');
+    const rawFileLink = elFileView.getAttribute('data-raw-file-link')!;
     const mimeType = elFileView.getAttribute('data-mime-type') || ''; // not used yet
     // TODO: we should also provide the prefetched file head bytes to let the plugin decide whether to render or not
     const plugin = findFileRenderPlugin(basename(rawFileLink), mimeType);
diff --git a/web_src/js/features/heatmap.ts b/web_src/js/features/heatmap.ts
index 7cec82108b..0c13d1c98a 100644
--- a/web_src/js/features/heatmap.ts
+++ b/web_src/js/features/heatmap.ts
@@ -8,7 +8,7 @@ export function initHeatmap() {
 
   try {
     const heatmap: Record<string, number> = {};
-    for (const {contributions, timestamp} of JSON.parse(el.getAttribute('data-heatmap-data'))) {
+    for (const {contributions, timestamp} of JSON.parse(el.getAttribute('data-heatmap-data')!)) {
       // Convert to user timezone and sum contributions by date
       const dateStr = new Date(timestamp * 1000).toDateString();
       heatmap[dateStr] = (heatmap[dateStr] || 0) + contributions;
diff --git a/web_src/js/features/imagediff.ts b/web_src/js/features/imagediff.ts
index 20682f74d9..4ace1ca2ad 100644
--- a/web_src/js/features/imagediff.ts
+++ b/web_src/js/features/imagediff.ts
@@ -78,7 +78,7 @@ class ImageDiff {
     fomanticQuery(containerEl).find('.ui.menu.tabular .item').tab();
 
     // the container may be hidden by "viewed" checkbox, so use the parent's width for reference
-    this.diffContainerWidth = Math.max(containerEl.closest('.diff-file-box').clientWidth - 300, 100);
+    this.diffContainerWidth = Math.max(containerEl.closest('.diff-file-box')!.clientWidth - 300, 100);
 
     const imageInfos = [{
       path: containerEl.getAttribute('data-path-after'),
@@ -94,20 +94,20 @@ class ImageDiff {
 
     await Promise.all(imageInfos.map(async (info) => {
       const [success] = await Promise.all(Array.from(info.images, (img) => {
-        return loadElem(img, info.path);
+        return loadElem(img, info.path!);
       }));
       // only the first images is associated with boundsInfo
       if (!success && info.boundsInfo) info.boundsInfo.textContent = '(image error)';
       if (info.mime === 'image/svg+xml') {
-        const resp = await GET(info.path);
+        const resp = await GET(info.path!);
         const text = await resp.text();
-        const bounds = getDefaultSvgBoundsIfUndefined(text, info.path);
+        const bounds = getDefaultSvgBoundsIfUndefined(text, info.path!);
         if (bounds) {
           for (const el of info.images) {
             el.setAttribute('width', String(bounds.width));
             el.setAttribute('height', String(bounds.height));
           }
-          hideElem(info.boundsInfo);
+          hideElem(info.boundsInfo!);
         }
       }
     }));
@@ -213,7 +213,7 @@ class ImageDiff {
       swipe.style.height = `${sizes.maxSize.height * factor + 30}px`;
     }
 
-    this.containerEl.querySelector('.swipe-bar').addEventListener('mousedown', (e) => {
+    this.containerEl.querySelector('.swipe-bar')!.addEventListener('mousedown', (e) => {
       e.preventDefault();
       this.initSwipeEventListeners(e.currentTarget as HTMLElement);
     });
@@ -227,7 +227,7 @@ class ImageDiff {
       const rect = swipeFrame.getBoundingClientRect();
       const value = Math.max(0, Math.min(e.clientX - rect.left, width));
       swipeBar.style.left = `${value}px`;
-      this.containerEl.querySelector<HTMLElement>('.swipe-container').style.width = `${swipeFrame.clientWidth - value}px`;
+      this.containerEl.querySelector<HTMLElement>('.swipe-container')!.style.width = `${swipeFrame.clientWidth - value}px`;
     };
     const removeEventListeners = () => {
       document.removeEventListener('mousemove', onSwipeMouseMove);
@@ -266,7 +266,7 @@ class ImageDiff {
       overlayFrame.style.height = `${sizes.maxSize.height * factor + 2}px`;
     }
 
-    const rangeInput = this.containerEl.querySelector<HTMLInputElement>('input[type="range"]');
+    const rangeInput = this.containerEl.querySelector<HTMLInputElement>('input[type="range"]')!;
 
     function updateOpacity() {
       if (sizes.imageAfter) {
diff --git a/web_src/js/features/install.ts b/web_src/js/features/install.ts
index ca4bcce881..c00fe3c03d 100644
--- a/web_src/js/features/install.ts
+++ b/web_src/js/features/install.ts
@@ -23,12 +23,12 @@ function initPreInstall() {
     mssql: '127.0.0.1:1433',
   };
 
-  const dbHost = document.querySelector<HTMLInputElement>('#db_host');
-  const dbUser = document.querySelector<HTMLInputElement>('#db_user');
-  const dbName = document.querySelector<HTMLInputElement>('#db_name');
+  const dbHost = document.querySelector<HTMLInputElement>('#db_host')!;
+  const dbUser = document.querySelector<HTMLInputElement>('#db_user')!;
+  const dbName = document.querySelector<HTMLInputElement>('#db_name')!;
 
   // Database type change detection.
-  document.querySelector<HTMLInputElement>('#db_type').addEventListener('change', function () {
+  document.querySelector<HTMLInputElement>('#db_type')!.addEventListener('change', function () {
     const dbType = this.value;
     hideElem('div[data-db-setting-for]');
     showElem(`div[data-db-setting-for=${dbType}]`);
@@ -47,58 +47,58 @@ function initPreInstall() {
       }
     } // else: for SQLite3, the default path is always prepared by backend code (setting)
   });
-  document.querySelector('#db_type').dispatchEvent(new Event('change'));
+  document.querySelector('#db_type')!.dispatchEvent(new Event('change'));
 
-  const appUrl = document.querySelector<HTMLInputElement>('#app_url');
+  const appUrl = document.querySelector<HTMLInputElement>('#app_url')!;
   if (appUrl.value.includes('://localhost')) {
     appUrl.value = window.location.href;
   }
 
-  const domain = document.querySelector<HTMLInputElement>('#domain');
+  const domain = document.querySelector<HTMLInputElement>('#domain')!;
   if (domain.value.trim() === 'localhost') {
     domain.value = window.location.hostname;
   }
 
   // TODO: better handling of exclusive relations.
-  document.querySelector<HTMLInputElement>('#offline-mode input').addEventListener('change', function () {
+  document.querySelector<HTMLInputElement>('#offline-mode input')!.addEventListener('change', function () {
     if (this.checked) {
-      document.querySelector<HTMLInputElement>('#disable-gravatar input').checked = true;
-      document.querySelector<HTMLInputElement>('#federated-avatar-lookup input').checked = false;
+      document.querySelector<HTMLInputElement>('#disable-gravatar input')!.checked = true;
+      document.querySelector<HTMLInputElement>('#federated-avatar-lookup input')!.checked = false;
     }
   });
-  document.querySelector<HTMLInputElement>('#disable-gravatar input').addEventListener('change', function () {
+  document.querySelector<HTMLInputElement>('#disable-gravatar input')!.addEventListener('change', function () {
     if (this.checked) {
-      document.querySelector<HTMLInputElement>('#federated-avatar-lookup input').checked = false;
+      document.querySelector<HTMLInputElement>('#federated-avatar-lookup input')!.checked = false;
     } else {
-      document.querySelector<HTMLInputElement>('#offline-mode input').checked = false;
+      document.querySelector<HTMLInputElement>('#offline-mode input')!.checked = false;
     }
   });
-  document.querySelector<HTMLInputElement>('#federated-avatar-lookup input').addEventListener('change', function () {
+  document.querySelector<HTMLInputElement>('#federated-avatar-lookup input')!.addEventListener('change', function () {
     if (this.checked) {
-      document.querySelector<HTMLInputElement>('#disable-gravatar input').checked = false;
-      document.querySelector<HTMLInputElement>('#offline-mode input').checked = false;
+      document.querySelector<HTMLInputElement>('#disable-gravatar input')!.checked = false;
+      document.querySelector<HTMLInputElement>('#offline-mode input')!.checked = false;
     }
   });
-  document.querySelector<HTMLInputElement>('#enable-openid-signin input').addEventListener('change', function () {
+  document.querySelector<HTMLInputElement>('#enable-openid-signin input')!.addEventListener('change', function () {
     if (this.checked) {
-      if (!document.querySelector<HTMLInputElement>('#disable-registration input').checked) {
-        document.querySelector<HTMLInputElement>('#enable-openid-signup input').checked = true;
+      if (!document.querySelector<HTMLInputElement>('#disable-registration input')!.checked) {
+        document.querySelector<HTMLInputElement>('#enable-openid-signup input')!.checked = true;
       }
     } else {
-      document.querySelector<HTMLInputElement>('#enable-openid-signup input').checked = false;
+      document.querySelector<HTMLInputElement>('#enable-openid-signup input')!.checked = false;
     }
   });
-  document.querySelector<HTMLInputElement>('#disable-registration input').addEventListener('change', function () {
+  document.querySelector<HTMLInputElement>('#disable-registration input')!.addEventListener('change', function () {
     if (this.checked) {
-      document.querySelector<HTMLInputElement>('#enable-captcha input').checked = false;
-      document.querySelector<HTMLInputElement>('#enable-openid-signup input').checked = false;
+      document.querySelector<HTMLInputElement>('#enable-captcha input')!.checked = false;
+      document.querySelector<HTMLInputElement>('#enable-openid-signup input')!.checked = false;
     } else {
-      document.querySelector<HTMLInputElement>('#enable-openid-signup input').checked = true;
+      document.querySelector<HTMLInputElement>('#enable-openid-signup input')!.checked = true;
     }
   });
-  document.querySelector<HTMLInputElement>('#enable-captcha input').addEventListener('change', function () {
+  document.querySelector<HTMLInputElement>('#enable-captcha input')!.addEventListener('change', function () {
     if (this.checked) {
-      document.querySelector<HTMLInputElement>('#disable-registration input').checked = false;
+      document.querySelector<HTMLInputElement>('#disable-registration input')!.checked = false;
     }
   });
 }
@@ -107,8 +107,8 @@ function initPostInstall() {
   const el = document.querySelector('#goto-after-install');
   if (!el) return;
 
-  const targetUrl = el.getAttribute('href');
-  let tid = setInterval(async () => {
+  const targetUrl = el.getAttribute('href')!;
+  let tid: ReturnType<typeof setInterval> | null = setInterval(async () => {
     try {
       const resp = await GET(targetUrl);
       if (tid && resp.status === 200) {
diff --git a/web_src/js/features/notification.ts b/web_src/js/features/notification.ts
index 4a1aa3ede9..ae318e6c78 100644
--- a/web_src/js/features/notification.ts
+++ b/web_src/js/features/notification.ts
@@ -90,7 +90,7 @@ export function initNotificationCount() {
 }
 
 function getCurrentCount() {
-  return Number(document.querySelector('.notification_count').textContent ?? '0');
+  return Number(document.querySelector('.notification_count')!.textContent ?? '0');
 }
 
 async function updateNotificationCountWithCallback(callback: (timeout: number, newCount: number) => void, timeout: number, lastCount: number) {
@@ -131,9 +131,9 @@ async function updateNotificationTable() {
 
       const data = await response.text();
       const el = createElementFromHTML(data);
-      if (parseInt(el.getAttribute('data-sequence-number')) === notificationSequenceNumber) {
+      if (parseInt(el.getAttribute('data-sequence-number')!) === notificationSequenceNumber) {
         notificationDiv.outerHTML = data;
-        notificationDiv = document.querySelector('#notification_div');
+        notificationDiv = document.querySelector('#notification_div')!;
         window.htmx.process(notificationDiv); // when using htmx, we must always remember to process the new content changed by us
       }
     } catch (error) {
diff --git a/web_src/js/features/oauth2-settings.ts b/web_src/js/features/oauth2-settings.ts
index 40424babb8..8d00ae3c17 100644
--- a/web_src/js/features/oauth2-settings.ts
+++ b/web_src/js/features/oauth2-settings.ts
@@ -1,9 +1,9 @@
-import type {DOMEvent} from '../utils/dom.ts';
-
 export function initOAuth2SettingsDisableCheckbox() {
   for (const el of document.querySelectorAll<HTMLInputElement>('.disable-setting')) {
-    el.addEventListener('change', (e: DOMEvent<Event, HTMLInputElement>) => {
-      document.querySelector(e.target.getAttribute('data-target')).classList.toggle('disabled', e.target.checked);
+    el.addEventListener('change', (e) => {
+      const target = e.target as HTMLInputElement;
+      const dataTarget = target.getAttribute('data-target')!;
+      document.querySelector(dataTarget)!.classList.toggle('disabled', target.checked);
     });
   }
 }
diff --git a/web_src/js/features/pull-view-file.ts b/web_src/js/features/pull-view-file.ts
index e563c13ef5..7cf6eceda4 100644
--- a/web_src/js/features/pull-view-file.ts
+++ b/web_src/js/features/pull-view-file.ts
@@ -14,8 +14,8 @@ const collapseFilesBtnSelector = '#collapse-files-btn';
 function refreshViewedFilesSummary() {
   const viewedFilesProgress = document.querySelector('#viewed-files-summary');
   viewedFilesProgress?.setAttribute('value', prReview.numberOfViewedFiles);
-  const summaryLabel = document.querySelector('#viewed-files-summary-label');
-  if (summaryLabel) summaryLabel.innerHTML = summaryLabel.getAttribute('data-text-changed-template')
+  const summaryLabel = document.querySelector('#viewed-files-summary-label')!;
+  if (summaryLabel) summaryLabel.innerHTML = summaryLabel.getAttribute('data-text-changed-template')!
     .replace('%[1]d', prReview.numberOfViewedFiles)
     .replace('%[2]d', prReview.numberOfFiles);
 }
@@ -30,7 +30,7 @@ export function initViewedCheckboxListenerFor() {
 
     // The checkbox consists of a div containing the real checkbox with its label and the CSRF token,
     // hence the actual checkbox first has to be found
-    const checkbox = form.querySelector<HTMLInputElement>('input[type=checkbox]');
+    const checkbox = form.querySelector<HTMLInputElement>('input[type=checkbox]')!;
     checkbox.addEventListener('input', function() {
       // Mark the file as viewed visually - will especially change the background
       if (this.checked) {
@@ -45,10 +45,10 @@ export function initViewedCheckboxListenerFor() {
 
       // Update viewed-files summary and remove "has changed" label if present
       refreshViewedFilesSummary();
-      const hasChangedLabel = form.parentNode.querySelector('.changed-since-last-review');
+      const hasChangedLabel = form.parentNode!.querySelector('.changed-since-last-review');
       hasChangedLabel?.remove();
 
-      const fileName = checkbox.getAttribute('name');
+      const fileName = checkbox.getAttribute('name')!;
 
       // check if the file is in our diffTreeStore and if we find it -> change the IsViewed status
       diffTreeStoreSetViewed(diffTreeStore(), fileName, this.checked);
@@ -59,11 +59,11 @@ export function initViewedCheckboxListenerFor() {
       const data: Record<string, any> = {files};
       const headCommitSHA = form.getAttribute('data-headcommit');
       if (headCommitSHA) data.headCommitSHA = headCommitSHA;
-      POST(form.getAttribute('data-link'), {data});
+      POST(form.getAttribute('data-link')!, {data});
 
       // Fold the file accordingly
-      const parentBox = form.closest('.diff-file-header');
-      setFileFolding(parentBox.closest('.file-content'), parentBox.querySelector('.fold-file'), this.checked);
+      const parentBox = form.closest('.diff-file-header')!;
+      setFileFolding(parentBox.closest('.file-content')!, parentBox.querySelector('.fold-file')!, this.checked);
     });
   }
 }
@@ -72,14 +72,14 @@ export function initExpandAndCollapseFilesButton() {
   // expand btn
   document.querySelector(expandFilesBtnSelector)?.addEventListener('click', () => {
     for (const box of document.querySelectorAll<HTMLElement>('.file-content[data-folded="true"]')) {
-      setFileFolding(box, box.querySelector('.fold-file'), false);
+      setFileFolding(box, box.querySelector('.fold-file')!, false);
     }
   });
   // collapse btn, need to exclude the div of “show more”
   document.querySelector(collapseFilesBtnSelector)?.addEventListener('click', () => {
     for (const box of document.querySelectorAll<HTMLElement>('.file-content:not([data-folded="true"])')) {
       if (box.getAttribute('id') === 'diff-incomplete') continue;
-      setFileFolding(box, box.querySelector('.fold-file'), true);
+      setFileFolding(box, box.querySelector('.fold-file')!, true);
     }
   });
 }
diff --git a/web_src/js/features/repo-branch.ts b/web_src/js/features/repo-branch.ts
index 0c1077748b..4657425f36 100644
--- a/web_src/js/features/repo-branch.ts
+++ b/web_src/js/features/repo-branch.ts
@@ -16,9 +16,9 @@ function initRepoCreateBranchButton() {
       modalForm.action = `${modalForm.getAttribute('data-base-action')}${el.getAttribute('data-branch-from-urlcomponent')}`;
 
       const fromSpanName = el.getAttribute('data-modal-from-span') || '#modal-create-branch-from-span';
-      document.querySelector(fromSpanName).textContent = el.getAttribute('data-branch-from');
+      document.querySelector(fromSpanName)!.textContent = el.getAttribute('data-branch-from');
 
-      fomanticQuery(el.getAttribute('data-modal')).modal('show');
+      fomanticQuery(el.getAttribute('data-modal')!).modal('show');
     });
   }
 }
@@ -26,17 +26,17 @@ function initRepoCreateBranchButton() {
 function initRepoRenameBranchButton() {
   for (const el of document.querySelectorAll('.show-rename-branch-modal')) {
     el.addEventListener('click', () => {
-      const target = el.getAttribute('data-modal');
-      const modal = document.querySelector(target);
-      const oldBranchName = el.getAttribute('data-old-branch-name');
-      modal.querySelector<HTMLInputElement>('input[name=from]').value = oldBranchName;
+      const target = el.getAttribute('data-modal')!;
+      const modal = document.querySelector(target)!;
+      const oldBranchName = el.getAttribute('data-old-branch-name')!;
+      modal.querySelector<HTMLInputElement>('input[name=from]')!.value = oldBranchName;
 
       // display the warning that the branch which is chosen is the default branch
-      const warn = modal.querySelector('.default-branch-warning');
+      const warn = modal.querySelector('.default-branch-warning')!;
       toggleElem(warn, el.getAttribute('data-is-default-branch') === 'true');
 
-      const text = modal.querySelector('[data-rename-branch-to]');
-      text.textContent = text.getAttribute('data-rename-branch-to').replace('%s', oldBranchName);
+      const text = modal.querySelector('[data-rename-branch-to]')!;
+      text.textContent = text.getAttribute('data-rename-branch-to')!.replace('%s', oldBranchName);
     });
   }
 }
diff --git a/web_src/js/features/repo-code.ts b/web_src/js/features/repo-code.ts
index bf7fd762b0..c2dc86cea5 100644
--- a/web_src/js/features/repo-code.ts
+++ b/web_src/js/features/repo-code.ts
@@ -5,14 +5,14 @@ import {addDelegatedEventListener} from '../utils/dom.ts';
 
 function changeHash(hash: string) {
   if (window.history.pushState) {
-    window.history.pushState(null, null, hash);
+    window.history.pushState(null, '', hash);
   } else {
     window.location.hash = hash;
   }
 }
 
 // it selects the code lines defined by range: `L1-L3` (3 lines) or `L2` (singe line)
-function selectRange(range: string): Element {
+function selectRange(range: string): Element | null {
   for (const el of document.querySelectorAll('.code-view tr.active')) el.classList.remove('active');
   const elLineNums = document.querySelectorAll(`.code-view td.lines-num span[data-line-number]`);
 
@@ -23,14 +23,14 @@ function selectRange(range: string): Element {
   const updateIssueHref = function (anchor: string) {
     if (!refInNewIssue) return;
     const urlIssueNew = refInNewIssue.getAttribute('data-url-issue-new');
-    const urlParamBodyLink = refInNewIssue.getAttribute('data-url-param-body-link');
+    const urlParamBodyLink = refInNewIssue.getAttribute('data-url-param-body-link')!;
     const issueContent = `${toAbsoluteUrl(urlParamBodyLink)}#${anchor}`; // the default content for issue body
     refInNewIssue.setAttribute('href', `${urlIssueNew}?body=${encodeURIComponent(issueContent)}`);
   };
 
   const updateViewGitBlameFragment = function (anchor: string) {
     if (!viewGitBlame) return;
-    let href = viewGitBlame.getAttribute('href');
+    let href = viewGitBlame.getAttribute('href')!;
     href = `${href.replace(/#L\d+$|#L\d+-L\d+$/, '')}`;
     if (anchor.length !== 0) {
       href = `${href}#${anchor}`;
@@ -40,7 +40,7 @@ function selectRange(range: string): Element {
 
   const updateCopyPermalinkUrl = function (anchor: string) {
     if (!copyPermalink) return;
-    let link = copyPermalink.getAttribute('data-url');
+    let link = copyPermalink.getAttribute('data-url')!;
     link = `${link.replace(/#L\d+$|#L\d+-L\d+$/, '')}#${anchor}`;
     copyPermalink.setAttribute('data-clipboard-text', link);
     copyPermalink.setAttribute('data-clipboard-text-type', 'url');
@@ -63,7 +63,7 @@ function selectRange(range: string): Element {
 
   const first = elLineNums[startLineNum - 1] ?? null;
   for (let i = startLineNum - 1; i <= stopLineNum - 1 && i < elLineNums.length; i++) {
-    elLineNums[i].closest('tr').classList.add('active');
+    elLineNums[i].closest('tr')!.classList.add('active');
   }
   changeHash(`#${range}`);
   updateIssueHref(range);
@@ -85,14 +85,14 @@ function showLineButton() {
   const tr = document.querySelector('.code-view tr.active');
   if (!tr) return;
 
-  const td = tr.querySelector('td.lines-num');
+  const td = tr.querySelector('td.lines-num')!;
   const btn = document.createElement('button');
   btn.classList.add('code-line-button', 'ui', 'basic', 'button');
   btn.innerHTML = svg('octicon-kebab-horizontal');
   td.prepend(btn);
 
   // put a copy of the menu back into DOM for the next click
-  btn.closest('.code-view').append(menu.cloneNode(true));
+  btn.closest('.code-view')!.append(menu.cloneNode(true));
 
   createTippy(btn, {
     theme: 'menu',
@@ -117,16 +117,16 @@ export function initRepoCodeView() {
   if (!document.querySelector('.repo-view-container .file-view')) return;
 
   // "file code view" and "blame" pages need this "line number button" feature
-  let selRangeStart: string;
+  let selRangeStart: string | undefined;
   addDelegatedEventListener(document, 'click', '.code-view .lines-num span', (el: HTMLElement, e: KeyboardEvent) => {
     if (!selRangeStart || !e.shiftKey) {
-      selRangeStart = el.getAttribute('id');
+      selRangeStart = el.getAttribute('id')!;
       selectRange(selRangeStart);
     } else {
       const selRangeStop = el.getAttribute('id');
       selectRange(`${selRangeStart}-${selRangeStop}`);
     }
-    window.getSelection().removeAllRanges();
+    window.getSelection()!.removeAllRanges();
     showLineButton();
   });
 
diff --git a/web_src/js/features/repo-commit.ts b/web_src/js/features/repo-commit.ts
index 98ec2328ec..16f3899374 100644
--- a/web_src/js/features/repo-commit.ts
+++ b/web_src/js/features/repo-commit.ts
@@ -6,14 +6,14 @@ export function initRepoEllipsisButton() {
   registerGlobalEventFunc('click', 'onRepoEllipsisButtonClick', async (el: HTMLInputElement, e: Event) => {
     e.preventDefault();
     const expanded = el.getAttribute('aria-expanded') === 'true';
-    toggleElem(el.parentElement.querySelector('.commit-body'));
+    toggleElem(el.parentElement!.querySelector('.commit-body')!);
     el.setAttribute('aria-expanded', String(!expanded));
   });
 }
 
 export function initCommitStatuses() {
   registerGlobalInitFunc('initCommitStatuses', (el: HTMLElement) => {
-    const nextEl = el.nextElementSibling;
+    const nextEl = el.nextElementSibling!;
     if (!nextEl.matches('.tippy-target')) throw new Error('Expected next element to be a tippy target');
     createTippy(el, {
       content: nextEl,
diff --git a/web_src/js/features/repo-common.ts b/web_src/js/features/repo-common.ts
index ebb6881c67..ac753805d3 100644
--- a/web_src/js/features/repo-common.ts
+++ b/web_src/js/features/repo-common.ts
@@ -1,4 +1,4 @@
-import {queryElems, type DOMEvent} from '../utils/dom.ts';
+import {queryElems} from '../utils/dom.ts';
 import {POST} from '../modules/fetch.ts';
 import {showErrorToast} from '../modules/toast.ts';
 import {sleep} from '../utils.ts';
@@ -7,10 +7,10 @@ import {createApp} from 'vue';
 import {toOriginUrl} from '../utils/url.ts';
 import {createTippy} from '../modules/tippy.ts';
 
-async function onDownloadArchive(e: DOMEvent<MouseEvent>) {
+async function onDownloadArchive(e: Event) {
   e.preventDefault();
   // there are many places using the "archive-link", eg: the dropdown on the repo code page, the release list
-  const el = e.target.closest<HTMLAnchorElement>('a.archive-link[href]');
+  const el = (e.target as HTMLElement).closest<HTMLAnchorElement>('a.archive-link[href]')!;
   const targetLoading = el.closest('.ui.dropdown') ?? el;
   targetLoading.classList.add('is-loading', 'loading-icon-2px');
   try {
@@ -51,13 +51,13 @@ export function substituteRepoOpenWithUrl(tmpl: string, url: string): string {
 }
 
 function initCloneSchemeUrlSelection(parent: Element) {
-  const elCloneUrlInput = parent.querySelector<HTMLInputElement>('.repo-clone-url');
+  const elCloneUrlInput = parent.querySelector<HTMLInputElement>('.repo-clone-url')!;
 
   const tabHttps = parent.querySelector('.repo-clone-https');
   const tabSsh = parent.querySelector('.repo-clone-ssh');
   const tabTea = parent.querySelector('.repo-clone-tea');
   const updateClonePanelUi = function() {
-    let scheme = localStorage.getItem('repo-clone-protocol');
+    let scheme = localStorage.getItem('repo-clone-protocol')!;
     if (!['https', 'ssh', 'tea'].includes(scheme)) {
       scheme = 'https';
     }
@@ -87,7 +87,7 @@ function initCloneSchemeUrlSelection(parent: Element) {
       tabTea.classList.toggle('active', isTea);
     }
 
-    let tab: Element;
+    let tab: Element | null = null;
     if (isHttps) {
       tab = tabHttps;
     } else if (isSsh) {
@@ -97,7 +97,7 @@ function initCloneSchemeUrlSelection(parent: Element) {
     }
 
     if (!tab) return;
-    const link = toOriginUrl(tab.getAttribute('data-link'));
+    const link = toOriginUrl(tab.getAttribute('data-link')!);
 
     for (const el of document.querySelectorAll('.js-clone-url')) {
       if (el.nodeName === 'INPUT') {
@@ -107,7 +107,7 @@ function initCloneSchemeUrlSelection(parent: Element) {
       }
     }
     for (const el of parent.querySelectorAll<HTMLAnchorElement>('.js-clone-url-editor')) {
-      el.href = substituteRepoOpenWithUrl(el.getAttribute('data-href-template'), link);
+      el.href = substituteRepoOpenWithUrl(el.getAttribute('data-href-template')!, link);
     }
   };
 
@@ -131,7 +131,7 @@ function initCloneSchemeUrlSelection(parent: Element) {
 }
 
 function initClonePanelButton(btn: HTMLButtonElement) {
-  const elPanel = btn.nextElementSibling;
+  const elPanel = btn.nextElementSibling!;
   // "init" must be before the "createTippy" otherwise the "tippy-target" will be removed from the document
   initCloneSchemeUrlSelection(elPanel);
   createTippy(btn, {
diff --git a/web_src/js/features/repo-diff-commit.ts b/web_src/js/features/repo-diff-commit.ts
index b270fb8568..ac5d7baca6 100644
--- a/web_src/js/features/repo-diff-commit.ts
+++ b/web_src/js/features/repo-diff-commit.ts
@@ -4,7 +4,7 @@ import {GET} from '../modules/fetch.ts';
 async function loadBranchesAndTags(area: Element, loadingButton: Element) {
   loadingButton.classList.add('disabled');
   try {
-    const res = await GET(loadingButton.getAttribute('data-fetch-url'));
+    const res = await GET(loadingButton.getAttribute('data-fetch-url')!);
     const data = await res.json();
     hideElem(loadingButton);
     addTags(area, data.tags);
@@ -16,8 +16,8 @@ async function loadBranchesAndTags(area: Element, loadingButton: Element) {
 }
 
 function addTags(area: Element, tags: Array<Record<string, any>>) {
-  const tagArea = area.querySelector('.tag-area');
-  toggleElem(tagArea.parentElement, tags.length > 0);
+  const tagArea = area.querySelector('.tag-area')!;
+  toggleElem(tagArea.parentElement!, tags.length > 0);
   for (const tag of tags) {
     addLink(tagArea, tag.web_link, tag.name);
   }
@@ -25,15 +25,15 @@ function addTags(area: Element, tags: Array<Record<string, any>>) {
 
 function addBranches(area: Element, branches: Array<Record<string, any>>, defaultBranch: string) {
   const defaultBranchTooltip = area.getAttribute('data-text-default-branch-tooltip');
-  const branchArea = area.querySelector('.branch-area');
-  toggleElem(branchArea.parentElement, branches.length > 0);
+  const branchArea = area.querySelector('.branch-area')!;
+  toggleElem(branchArea.parentElement!, branches.length > 0);
   for (const branch of branches) {
     const tooltip = defaultBranch === branch.name ? defaultBranchTooltip : null;
     addLink(branchArea, branch.web_link, branch.name, tooltip);
   }
 }
 
-function addLink(parent: Element, href: string, text: string, tooltip?: string) {
+function addLink(parent: Element, href: string, text: string, tooltip: string | null = null) {
   const link = document.createElement('a');
   link.classList.add('muted', 'tw-px-1');
   link.href = href;
@@ -47,7 +47,7 @@ function addLink(parent: Element, href: string, text: string, tooltip?: string)
 
 export function initRepoDiffCommitBranchesAndTags() {
   for (const area of document.querySelectorAll('.branch-and-tag-area')) {
-    const btn = area.querySelector('.load-branches-and-tags');
+    const btn = area.querySelector('.load-branches-and-tags')!;
     btn.addEventListener('click', () => loadBranchesAndTags(area, btn));
   }
 }
diff --git a/web_src/js/features/repo-diff.ts b/web_src/js/features/repo-diff.ts
index 6f5cb2f63b..20f27f31bc 100644
--- a/web_src/js/features/repo-diff.ts
+++ b/web_src/js/features/repo-diff.ts
@@ -18,7 +18,7 @@ function initRepoDiffFileBox(el: HTMLElement) {
     queryElemSiblings(btn, '.file-view-toggle', (el) => el.classList.remove('active'));
     btn.classList.add('active');
 
-    const target = document.querySelector(btn.getAttribute('data-toggle-selector'));
+    const target = document.querySelector(btn.getAttribute('data-toggle-selector')!);
     if (!target) throw new Error('Target element not found');
 
     hideElem(queryElemSiblings(target));
@@ -31,7 +31,7 @@ function initRepoDiffConversationForm() {
   // This listener is for "reply form" only, it should clearly distinguish different forms in the future.
   addDelegatedEventListener<HTMLFormElement, SubmitEvent>(document, 'submit', '.conversation-holder form', async (form, e) => {
     e.preventDefault();
-    const textArea = form.querySelector<HTMLTextAreaElement>('textarea');
+    const textArea = form.querySelector<HTMLTextAreaElement>('textarea')!;
     if (!validateTextareaNonEmpty(textArea)) return;
     if (form.classList.contains('is-loading')) return;
 
@@ -49,14 +49,15 @@ function initRepoDiffConversationForm() {
       // on the diff page, the form is inside a "tr" and need to get the line-type ahead
       // but on the conversation page, there is no parent "tr"
       const trLineType = form.closest('tr')?.getAttribute('data-line-type');
-      const response = await POST(form.getAttribute('action'), {data: formData});
+      const response = await POST(form.getAttribute('action')!, {data: formData});
       const newConversationHolder = createElementFromHTML(await response.text());
       const path = newConversationHolder.getAttribute('data-path');
       const side = newConversationHolder.getAttribute('data-side');
       const idx = newConversationHolder.getAttribute('data-idx');
 
-      form.closest('.conversation-holder').replaceWith(newConversationHolder);
-      form = null; // prevent further usage of the form because it should have been replaced
+      form.closest('.conversation-holder')!.replaceWith(newConversationHolder);
+      // @ts-expect-error -- prevent further usage of the form because it should have been replaced
+      form = null;
 
       if (trLineType) {
         // if there is a line-type for the "tr", it means the form is on the diff page
@@ -74,10 +75,10 @@ function initRepoDiffConversationForm() {
 
       // the default behavior is to add a pending review, so if no submitter, it also means "pending_review"
       if (!submitter || submitter?.matches('button[name="pending_review"]')) {
-        const reviewBox = document.querySelector('#review-box');
+        const reviewBox = document.querySelector('#review-box')!;
         const counter = reviewBox?.querySelector('.review-comments-counter');
         if (!counter) return;
-        const num = parseInt(counter.getAttribute('data-pending-comment-number')) + 1 || 1;
+        const num = parseInt(counter.getAttribute('data-pending-comment-number')!) + 1 || 1;
         counter.setAttribute('data-pending-comment-number', String(num));
         counter.textContent = String(num);
         animateOnce(reviewBox, 'pulse-1p5-200');
@@ -92,10 +93,10 @@ function initRepoDiffConversationForm() {
 
   addDelegatedEventListener(document, 'click', '.resolve-conversation', async (el, e) => {
     e.preventDefault();
-    const comment_id = el.getAttribute('data-comment-id');
-    const origin = el.getAttribute('data-origin');
-    const action = el.getAttribute('data-action');
-    const url = el.getAttribute('data-update-url');
+    const comment_id = el.getAttribute('data-comment-id')!;
+    const origin = el.getAttribute('data-origin')!;
+    const action = el.getAttribute('data-action')!;
+    const url = el.getAttribute('data-update-url')!;
 
     try {
       const response = await POST(url, {data: new URLSearchParams({origin, action, comment_id})});
@@ -119,14 +120,14 @@ function initRepoDiffConversationNav() {
   addDelegatedEventListener(document, 'click', '.previous-conversation, .next-conversation', (el, e) => {
     e.preventDefault();
     const isPrevious = el.matches('.previous-conversation');
-    const elCurConversation = el.closest('.comment-code-cloud');
+    const elCurConversation = el.closest('.comment-code-cloud')!;
     const elAllConversations = document.querySelectorAll('.comment-code-cloud:not(.tw-hidden)');
     const index = Array.from(elAllConversations).indexOf(elCurConversation);
     const previousIndex = index > 0 ? index - 1 : elAllConversations.length - 1;
     const nextIndex = index < elAllConversations.length - 1 ? index + 1 : 0;
     const navIndex = isPrevious ? previousIndex : nextIndex;
     const elNavConversation = elAllConversations[navIndex];
-    const anchor = elNavConversation.querySelector('.comment').id;
+    const anchor = elNavConversation.querySelector('.comment')!.id;
     window.location.href = `#${anchor}`;
   });
 }
@@ -162,15 +163,15 @@ async function loadMoreFiles(btn: Element): Promise<boolean> {
   }
 
   btn.classList.add('disabled');
-  const url = btn.getAttribute('data-href');
+  const url = btn.getAttribute('data-href')!;
   try {
     const response = await GET(url);
     const resp = await response.text();
     const respDoc = parseDom(resp, 'text/html');
-    const respFileBoxes = respDoc.querySelector('#diff-file-boxes');
+    const respFileBoxes = respDoc.querySelector('#diff-file-boxes')!;
     // the response is a full HTML page, we need to extract the relevant contents:
     // * append the newly loaded file list items to the existing list
-    document.querySelector('#diff-incomplete').replaceWith(...Array.from(respFileBoxes.children));
+    document.querySelector('#diff-incomplete')!.replaceWith(...Array.from(respFileBoxes.children));
     onShowMoreFiles();
     return true;
   } catch (error) {
@@ -193,15 +194,15 @@ function initRepoDiffShowMore() {
     if (el.classList.contains('disabled')) return;
 
     el.classList.add('disabled');
-    const url = el.getAttribute('data-href');
+    const url = el.getAttribute('data-href')!;
 
     try {
       const response = await GET(url);
       const resp = await response.text();
       const respDoc = parseDom(resp, 'text/html');
-      const respFileBody = respDoc.querySelector('#diff-file-boxes .diff-file-body .file-body');
+      const respFileBody = respDoc.querySelector('#diff-file-boxes .diff-file-body .file-body')!;
       const respFileBodyChildren = Array.from(respFileBody.children); // respFileBody.children will be empty after replaceWith
-      el.parentElement.replaceWith(...respFileBodyChildren);
+      el.parentElement!.replaceWith(...respFileBodyChildren);
       for (const el of respFileBodyChildren) window.htmx.process(el);
       // FIXME: calling onShowMoreFiles is not quite right here.
       // But since onShowMoreFiles mixes "init diff box" and "init diff body" together,
@@ -287,6 +288,6 @@ export function initRepoDiffView() {
 
   registerGlobalSelectorFunc('#diff-file-boxes .diff-file-box', initRepoDiffFileBox);
   addDelegatedEventListener(document, 'click', '.fold-file', (el) => {
-    invertFileFolding(el.closest('.file-content'), el);
+    invertFileFolding(el.closest('.file-content')!, el);
   });
 }
diff --git a/web_src/js/features/repo-editor.ts b/web_src/js/features/repo-editor.ts
index 0825999edc..93595c385e 100644
--- a/web_src/js/features/repo-editor.ts
+++ b/web_src/js/features/repo-editor.ts
@@ -9,7 +9,7 @@ import {fomanticQuery} from '../modules/fomantic/base.ts';
 import {submitFormFetchAction} from './common-fetch-action.ts';
 
 function initEditPreviewTab(elForm: HTMLFormElement) {
-  const elTabMenu = elForm.querySelector('.repo-editor-menu');
+  const elTabMenu = elForm.querySelector('.repo-editor-menu')!;
   fomanticQuery(elTabMenu.querySelectorAll('.item')).tab();
 
   const elPreviewTab = elTabMenu.querySelector('a[data-tab="preview"]');
@@ -17,15 +17,15 @@ function initEditPreviewTab(elForm: HTMLFormElement) {
   if (!elPreviewTab || !elPreviewPanel) return;
 
   elPreviewTab.addEventListener('click', async () => {
-    const elTreePath = elForm.querySelector<HTMLInputElement>('input#tree_path');
-    const previewUrl = elPreviewTab.getAttribute('data-preview-url');
+    const elTreePath = elForm.querySelector<HTMLInputElement>('input#tree_path')!;
+    const previewUrl = elPreviewTab.getAttribute('data-preview-url')!;
     const previewContextRef = elPreviewTab.getAttribute('data-preview-context-ref');
     let previewContext = `${previewContextRef}/${elTreePath.value}`;
     previewContext = previewContext.substring(0, previewContext.lastIndexOf('/'));
     const formData = new FormData();
     formData.append('mode', 'file');
     formData.append('context', previewContext);
-    formData.append('text', elForm.querySelector<HTMLTextAreaElement>('.tab[data-tab="write"] textarea').value);
+    formData.append('text', elForm.querySelector<HTMLTextAreaElement>('.tab[data-tab="write"] textarea')!.value);
     formData.append('file_path', elTreePath.value);
     const response = await POST(previewUrl, {data: formData});
     const data = await response.text();
@@ -41,16 +41,16 @@ export function initRepoEditor() {
     el.addEventListener('input', () => {
       if (el.value === 'commit-to-new-branch') {
         showElem('.quick-pull-branch-name');
-        document.querySelector<HTMLInputElement>('.quick-pull-branch-name input').required = true;
+        document.querySelector<HTMLInputElement>('.quick-pull-branch-name input')!.required = true;
       } else {
         hideElem('.quick-pull-branch-name');
-        document.querySelector<HTMLInputElement>('.quick-pull-branch-name input').required = false;
+        document.querySelector<HTMLInputElement>('.quick-pull-branch-name input')!.required = false;
       }
-      document.querySelector('#commit-button').textContent = el.getAttribute('data-button-text');
+      document.querySelector('#commit-button')!.textContent = el.getAttribute('data-button-text');
     });
   }
 
-  const filenameInput = document.querySelector<HTMLInputElement>('#file-name');
+  const filenameInput = document.querySelector<HTMLInputElement>('#file-name')!;
   if (!filenameInput) return;
   function joinTreePath() {
     const parts = [];
@@ -61,7 +61,7 @@ export function initRepoEditor() {
     if (filenameInput.value) {
       parts.push(filenameInput.value);
     }
-    document.querySelector<HTMLInputElement>('#tree_path').value = parts.join('/');
+    document.querySelector<HTMLInputElement>('#tree_path')!.value = parts.join('/');
   }
   filenameInput.addEventListener('input', function () {
     const parts = filenameInput.value.split('/');
@@ -76,8 +76,8 @@ export function initRepoEditor() {
         if (trimValue === '..') {
           // remove previous tree path
           if (links.length > 0) {
-            const link = links.pop();
-            const divider = dividers.pop();
+            const link = links.pop()!;
+            const divider = dividers.pop()!;
             link.remove();
             divider.remove();
           }
@@ -104,7 +104,7 @@ export function initRepoEditor() {
       }
     }
     containSpace = containSpace || Array.from(links).some((link) => {
-      const value = link.querySelector('a').textContent;
+      const value = link.querySelector('a')!.textContent;
       return value.trim() !== value;
     });
     containSpace = containSpace || parts[parts.length - 1].trim() !== parts[parts.length - 1];
@@ -115,7 +115,7 @@ export function initRepoEditor() {
         warningDiv.innerHTML = html`<p>File path contains leading or trailing whitespace.</p>`;
         // Add display 'block' because display is set to 'none' in formantic\build\semantic.css
         warningDiv.style.display = 'block';
-        const inputContainer = document.querySelector('.repo-editor-header');
+        const inputContainer = document.querySelector('.repo-editor-header')!;
         inputContainer.insertAdjacentElement('beforebegin', warningDiv);
       }
       showElem(warningDiv);
@@ -132,7 +132,7 @@ export function initRepoEditor() {
       e.preventDefault();
       const lastSection = sections[sections.length - 1];
       const lastDivider = dividers.length ? dividers[dividers.length - 1] : null;
-      const value = lastSection.querySelector('a').textContent;
+      const value = lastSection.querySelector('a')!.textContent;
       filenameInput.value = value + filenameInput.value;
       this.setSelectionRange(value.length, value.length);
       lastDivider?.remove();
@@ -141,7 +141,7 @@ export function initRepoEditor() {
     }
   });
 
-  const elForm = document.querySelector<HTMLFormElement>('.repository.editor .edit.form');
+  const elForm = document.querySelector<HTMLFormElement>('.repository.editor .edit.form')!;
 
   // on the upload page, there is no editor(textarea)
   const editArea = document.querySelector<HTMLTextAreaElement>('.page-content.repository.editor textarea#edit_area');
@@ -149,7 +149,7 @@ export function initRepoEditor() {
 
   // Using events from https://github.com/codedance/jquery.AreYouSure#advanced-usage
   // to enable or disable the commit button
-  const commitButton = document.querySelector<HTMLButtonElement>('#commit-button');
+  const commitButton = document.querySelector<HTMLButtonElement>('#commit-button')!;
   const dirtyFileClass = 'dirty-file';
 
   const syncCommitButtonState = () => {
@@ -184,8 +184,8 @@ export function initRepoEditor() {
       if (!editArea.value) {
         e.preventDefault();
         if (await confirmModal({
-          header: elForm.getAttribute('data-text-empty-confirm-header'),
-          content: elForm.getAttribute('data-text-empty-confirm-content'),
+          header: elForm.getAttribute('data-text-empty-confirm-header')!,
+          content: elForm.getAttribute('data-text-empty-confirm-content')!,
         })) {
           ignoreAreYouSure(elForm);
           submitFormFetchAction(elForm);
diff --git a/web_src/js/features/repo-graph.ts b/web_src/js/features/repo-graph.ts
index ebca6e212a..2177368b9f 100644
--- a/web_src/js/features/repo-graph.ts
+++ b/web_src/js/features/repo-graph.ts
@@ -6,8 +6,8 @@ export function initRepoGraphGit() {
   const graphContainer = document.querySelector<HTMLElement>('#git-graph-container');
   if (!graphContainer) return;
 
-  const elColorMonochrome = document.querySelector<HTMLElement>('#flow-color-monochrome');
-  const elColorColored = document.querySelector<HTMLElement>('#flow-color-colored');
+  const elColorMonochrome = document.querySelector<HTMLElement>('#flow-color-monochrome')!;
+  const elColorColored = document.querySelector<HTMLElement>('#flow-color-colored')!;
   const toggleColorMode = (mode: 'monochrome' | 'colored') => {
     toggleElemClass(graphContainer, 'monochrome', mode === 'monochrome');
     toggleElemClass(graphContainer, 'colored', mode === 'colored');
@@ -31,7 +31,7 @@ export function initRepoGraphGit() {
   elColorMonochrome.addEventListener('click', () => toggleColorMode('monochrome'));
   elColorColored.addEventListener('click', () => toggleColorMode('colored'));
 
-  const elGraphBody = document.querySelector<HTMLElement>('#git-graph-body');
+  const elGraphBody = document.querySelector<HTMLElement>('#git-graph-body')!;
   const url = new URL(window.location.href);
   const params = url.searchParams;
   const loadGitGraph = async () => {
diff --git a/web_src/js/features/repo-home.ts b/web_src/js/features/repo-home.ts
index 04a1288626..8bc7af6195 100644
--- a/web_src/js/features/repo-home.ts
+++ b/web_src/js/features/repo-home.ts
@@ -1,5 +1,5 @@
 import {stripTags} from '../utils.ts';
-import {hideElem, queryElemChildren, showElem, type DOMEvent} from '../utils/dom.ts';
+import {hideElem, queryElemChildren, showElem} from '../utils/dom.ts';
 import {POST} from '../modules/fetch.ts';
 import {showErrorToast, type Toast} from '../modules/toast.ts';
 import {fomanticQuery} from '../modules/fomantic/base.ts';
@@ -10,32 +10,32 @@ export function initRepoTopicBar() {
   const mgrBtn = document.querySelector<HTMLButtonElement>('#manage_topic');
   if (!mgrBtn) return;
 
-  const editDiv = document.querySelector('#topic_edit');
-  const viewDiv = document.querySelector('#repo-topics');
-  const topicDropdown = editDiv.querySelector('.ui.dropdown');
-  let lastErrorToast: Toast;
+  const editDiv = document.querySelector('#topic_edit')!;
+  const viewDiv = document.querySelector('#repo-topics')!;
+  const topicDropdown = editDiv.querySelector('.ui.dropdown')!;
+  let lastErrorToast: Toast | null = null;
 
   mgrBtn.addEventListener('click', () => {
     hideElem([viewDiv, mgrBtn]);
     showElem(editDiv);
-    topicDropdown.querySelector<HTMLInputElement>('input.search').focus();
+    topicDropdown.querySelector<HTMLInputElement>('input.search')!.focus();
   });
 
-  document.querySelector('#cancel_topic_edit').addEventListener('click', () => {
+  document.querySelector('#cancel_topic_edit')!.addEventListener('click', () => {
     lastErrorToast?.hideToast();
     hideElem(editDiv);
     showElem([viewDiv, mgrBtn]);
     mgrBtn.focus();
   });
 
-  document.querySelector<HTMLButtonElement>('#save_topic').addEventListener('click', async (e: DOMEvent<MouseEvent, HTMLButtonElement>) => {
+  document.querySelector<HTMLButtonElement>('#save_topic')!.addEventListener('click', async (e) => {
     lastErrorToast?.hideToast();
-    const topics = editDiv.querySelector<HTMLInputElement>('input[name=topics]').value;
+    const topics = editDiv.querySelector<HTMLInputElement>('input[name=topics]')!.value;
 
     const data = new FormData();
     data.append('topics', topics);
 
-    const response = await POST(e.target.getAttribute('data-link'), {data});
+    const response = await POST((e.target as HTMLElement).getAttribute('data-link')!, {data});
 
     if (response.ok) {
       const responseData = await response.json();
diff --git a/web_src/js/features/repo-issue-content.ts b/web_src/js/features/repo-issue-content.ts
index 056b810be8..14980e9792 100644
--- a/web_src/js/features/repo-issue-content.ts
+++ b/web_src/js/features/repo-issue-content.ts
@@ -27,7 +27,7 @@ function showContentHistoryDetail(issueBaseUrl: string, commentId: string, histo
   <div class="comment-diff-data is-loading"></div>
 </div>`);
   document.body.append(elDetailDialog);
-  const elOptionsDropdown = elDetailDialog.querySelector('.ui.dropdown.dialog-header-options');
+  const elOptionsDropdown = elDetailDialog.querySelector('.ui.dropdown.dialog-header-options')!;
   const $fomanticDialog = fomanticQuery(elDetailDialog);
   const $fomanticDropdownOptions = fomanticQuery(elOptionsDropdown);
   $fomanticDropdownOptions.dropdown({
@@ -74,7 +74,7 @@ function showContentHistoryDetail(issueBaseUrl: string, commentId: string, histo
         const response = await GET(url);
         const resp = await response.json();
 
-        const commentDiffData = elDetailDialog.querySelector('.comment-diff-data');
+        const commentDiffData = elDetailDialog.querySelector('.comment-diff-data')!;
         commentDiffData.classList.remove('is-loading');
         commentDiffData.innerHTML = resp.diffHtml;
         // there is only one option "item[data-option-item=delete]", so the dropdown can be entirely shown/hidden.
@@ -92,7 +92,7 @@ function showContentHistoryDetail(issueBaseUrl: string, commentId: string, histo
 }
 
 function showContentHistoryMenu(issueBaseUrl: string, elCommentItem: Element, commentId: string) {
-  const elHeaderLeft = elCommentItem.querySelector('.comment-header-left');
+  const elHeaderLeft = elCommentItem.querySelector('.comment-header-left')!;
   const menuHtml = `
   <div class="ui dropdown interact-fg content-history-menu" data-comment-id="${commentId}">
     &bull; ${i18nTextEdited}${svg('octicon-triangle-down', 14, 'dropdown icon')}
@@ -103,7 +103,7 @@ function showContentHistoryMenu(issueBaseUrl: string, elCommentItem: Element, co
   elHeaderLeft.querySelector(`.ui.dropdown.content-history-menu`)?.remove(); // remove the old one if exists
   elHeaderLeft.append(createElementFromHTML(menuHtml));
 
-  const elDropdown = elHeaderLeft.querySelector('.ui.dropdown.content-history-menu');
+  const elDropdown = elHeaderLeft.querySelector('.ui.dropdown.content-history-menu')!;
   const $fomanticDropdown = fomanticQuery(elDropdown);
   $fomanticDropdown.dropdown({
     action: 'hide',
diff --git a/web_src/js/features/repo-issue-edit.ts b/web_src/js/features/repo-issue-edit.ts
index 43aee314e0..6bed000886 100644
--- a/web_src/js/features/repo-issue-edit.ts
+++ b/web_src/js/features/repo-issue-edit.ts
@@ -2,20 +2,20 @@ import {handleReply} from './repo-issue.ts';
 import {getComboMarkdownEditor, initComboMarkdownEditor, ComboMarkdownEditor} from './comp/ComboMarkdownEditor.ts';
 import {POST} from '../modules/fetch.ts';
 import {showErrorToast} from '../modules/toast.ts';
-import {hideElem, querySingleVisibleElem, showElem, type DOMEvent} from '../utils/dom.ts';
+import {hideElem, querySingleVisibleElem, showElem} from '../utils/dom.ts';
 import {triggerUploadStateChanged} from './comp/EditorUpload.ts';
 import {convertHtmlToMarkdown} from '../markup/html2markdown.ts';
 import {applyAreYouSure, reinitializeAreYouSure} from '../vendor/jquery.are-you-sure.ts';
 
-async function tryOnEditContent(e: DOMEvent<MouseEvent>) {
-  const clickTarget = e.target.closest('.edit-content');
+async function tryOnEditContent(e: Event) {
+  const clickTarget = (e.target as HTMLElement).closest('.edit-content');
   if (!clickTarget) return;
 
   e.preventDefault();
-  const commentContent = clickTarget.closest('.comment-header').nextElementSibling;
-  const editContentZone = commentContent.querySelector('.edit-content-zone');
-  let renderContent = commentContent.querySelector('.render-content');
-  const rawContent = commentContent.querySelector('.raw-content');
+  const commentContent = clickTarget.closest('.comment-header')!.nextElementSibling!;
+  const editContentZone = commentContent.querySelector('.edit-content-zone')!;
+  let renderContent = commentContent.querySelector('.render-content')!;
+  const rawContent = commentContent.querySelector('.raw-content')!;
 
   let comboMarkdownEditor : ComboMarkdownEditor;
 
@@ -37,14 +37,14 @@ async function tryOnEditContent(e: DOMEvent<MouseEvent>) {
     try {
       const params = new URLSearchParams({
         content: comboMarkdownEditor.value(),
-        context: editContentZone.getAttribute('data-context'),
-        content_version: editContentZone.getAttribute('data-content-version'),
+        context: String(editContentZone.getAttribute('data-context')),
+        content_version: String(editContentZone.getAttribute('data-content-version')),
       });
       for (const file of comboMarkdownEditor.dropzoneGetFiles() ?? []) {
         params.append('files[]', file);
       }
 
-      const response = await POST(editContentZone.getAttribute('data-update-url'), {data: params});
+      const response = await POST(editContentZone.getAttribute('data-update-url')!, {data: params});
       const data = await response.json();
       if (!response.ok) {
         showErrorToast(data?.errorMessage ?? window.config.i18n.error_occurred);
@@ -67,9 +67,9 @@ async function tryOnEditContent(e: DOMEvent<MouseEvent>) {
           commentContent.insertAdjacentHTML('beforeend', data.attachments);
         }
       } else if (data.attachments === '') {
-        commentContent.querySelector('.dropzone-attachments').remove();
+        commentContent.querySelector('.dropzone-attachments')!.remove();
       } else {
-        commentContent.querySelector('.dropzone-attachments').outerHTML = data.attachments;
+        commentContent.querySelector('.dropzone-attachments')!.outerHTML = data.attachments;
       }
       comboMarkdownEditor.dropzoneSubmitReload();
     } catch (error) {
@@ -86,12 +86,12 @@ async function tryOnEditContent(e: DOMEvent<MouseEvent>) {
 
   comboMarkdownEditor = getComboMarkdownEditor(editContentZone.querySelector('.combo-markdown-editor'));
   if (!comboMarkdownEditor) {
-    editContentZone.innerHTML = document.querySelector('#issue-comment-editor-template').innerHTML;
-    const form = editContentZone.querySelector('form');
+    editContentZone.innerHTML = document.querySelector('#issue-comment-editor-template')!.innerHTML;
+    const form = editContentZone.querySelector('form')!;
     applyAreYouSure(form);
-    const saveButton = querySingleVisibleElem<HTMLButtonElement>(editContentZone, '.ui.primary.button');
-    const cancelButton = querySingleVisibleElem<HTMLButtonElement>(editContentZone, '.ui.cancel.button');
-    comboMarkdownEditor = await initComboMarkdownEditor(editContentZone.querySelector('.combo-markdown-editor'));
+    const saveButton = querySingleVisibleElem<HTMLButtonElement>(editContentZone, '.ui.primary.button')!;
+    const cancelButton = querySingleVisibleElem<HTMLButtonElement>(editContentZone, '.ui.cancel.button')!;
+    comboMarkdownEditor = await initComboMarkdownEditor(editContentZone.querySelector('.combo-markdown-editor')!);
     const syncUiState = () => saveButton.disabled = comboMarkdownEditor.isUploading();
     comboMarkdownEditor.container.addEventListener(ComboMarkdownEditor.EventUploadStateChanged, syncUiState);
     cancelButton.addEventListener('click', cancelAndReset);
@@ -109,7 +109,7 @@ async function tryOnEditContent(e: DOMEvent<MouseEvent>) {
 
 function extractSelectedMarkdown(container: HTMLElement) {
   const selection = window.getSelection();
-  if (!selection.rangeCount) return '';
+  if (!selection?.rangeCount) return '';
   const range = selection.getRangeAt(0);
   if (!container.contains(range.commonAncestorContainer)) return '';
 
@@ -127,15 +127,15 @@ async function tryOnQuoteReply(e: Event) {
 
   e.preventDefault();
   const contentToQuoteId = clickTarget.getAttribute('data-target');
-  const targetRawToQuote = document.querySelector<HTMLElement>(`#${contentToQuoteId}.raw-content`);
-  const targetMarkupToQuote = targetRawToQuote.parentElement.querySelector<HTMLElement>('.render-content.markup');
+  const targetRawToQuote = document.querySelector<HTMLElement>(`#${contentToQuoteId}.raw-content`)!;
+  const targetMarkupToQuote = targetRawToQuote.parentElement!.querySelector<HTMLElement>('.render-content.markup')!;
   let contentToQuote = extractSelectedMarkdown(targetMarkupToQuote);
   if (!contentToQuote) contentToQuote = targetRawToQuote.textContent;
   const quotedContent = `${contentToQuote.replace(/^/mg, '> ')}\n\n`;
 
   let editor;
   if (clickTarget.classList.contains('quote-reply-diff')) {
-    const replyBtn = clickTarget.closest('.comment-code-cloud').querySelector<HTMLElement>('button.comment-form-reply');
+    const replyBtn = clickTarget.closest('.comment-code-cloud')!.querySelector<HTMLElement>('button.comment-form-reply')!;
     editor = await handleReply(replyBtn);
   } else {
     // for normal issue/comment page
diff --git a/web_src/js/features/repo-issue-list.ts b/web_src/js/features/repo-issue-list.ts
index 762fbf51bb..1416d0ee70 100644
--- a/web_src/js/features/repo-issue-list.ts
+++ b/web_src/js/features/repo-issue-list.ts
@@ -34,8 +34,8 @@ function initRepoIssueListCheckboxes() {
     toggleElem('#issue-actions', anyChecked);
     // there are two panels but only one select-all checkbox, so move the checkbox to the visible panel
     const panels = document.querySelectorAll<HTMLElement>('#issue-filters, #issue-actions');
-    const visiblePanel = Array.from(panels).find((el) => isElemVisible(el));
-    const toolbarLeft = visiblePanel.querySelector('.issue-list-toolbar-left');
+    const visiblePanel = Array.from(panels).find((el) => isElemVisible(el))!;
+    const toolbarLeft = visiblePanel.querySelector('.issue-list-toolbar-left')!;
     toolbarLeft.prepend(issueSelectAll);
   };
 
@@ -54,12 +54,12 @@ function initRepoIssueListCheckboxes() {
     async (e: MouseEvent) => {
       e.preventDefault();
 
-      const url = el.getAttribute('data-url');
-      let action = el.getAttribute('data-action');
-      let elementId = el.getAttribute('data-element-id');
+      const url = el.getAttribute('data-url')!;
+      let action = el.getAttribute('data-action')!;
+      let elementId = el.getAttribute('data-element-id')!;
       const issueIDList: string[] = [];
       for (const el of document.querySelectorAll('.issue-checkbox:checked')) {
-        issueIDList.push(el.getAttribute('data-issue-id'));
+        issueIDList.push(el.getAttribute('data-issue-id')!);
       }
       const issueIDs = issueIDList.join(',');
       if (!issueIDs) return;
@@ -77,7 +77,7 @@ function initRepoIssueListCheckboxes() {
 
       // for delete
       if (action === 'delete') {
-        const confirmText = el.getAttribute('data-action-delete-confirm');
+        const confirmText = el.getAttribute('data-action-delete-confirm')!;
         if (!await confirmModal({content: confirmText, confirmButtonColor: 'red'})) {
           return;
         }
@@ -95,12 +95,12 @@ function initRepoIssueListCheckboxes() {
 
 function initDropdownUserRemoteSearch(el: Element) {
   let searchUrl = el.getAttribute('data-search-url');
-  const actionJumpUrl = el.getAttribute('data-action-jump-url');
+  const actionJumpUrl = el.getAttribute('data-action-jump-url')!;
   let selectedUsername = el.getAttribute('data-selected-username') || '';
   const $searchDropdown = fomanticQuery(el);
-  const elMenu = el.querySelector('.menu');
-  const elSearchInput = el.querySelector<HTMLInputElement>('.ui.search input');
-  const elItemFromInput = el.querySelector('.menu > .item-from-input');
+  const elMenu = el.querySelector('.menu')!;
+  const elSearchInput = el.querySelector<HTMLInputElement>('.ui.search input')!;
+  const elItemFromInput = el.querySelector('.menu > .item-from-input')!;
 
   $searchDropdown.dropdown('setting', {
     fullTextSearch: true,
@@ -183,21 +183,21 @@ function initPinRemoveButton() {
       const id = Number(el.getAttribute('data-issue-id'));
 
       // Send the unpin request
-      const response = await DELETE(el.getAttribute('data-unpin-url'));
+      const response = await DELETE(el.getAttribute('data-unpin-url')!);
       if (response.ok) {
         // Delete the tooltip
         el._tippy.destroy();
         // Remove the Card
-        el.closest(`div.issue-card[data-issue-id="${id}"]`).remove();
+        el.closest(`div.issue-card[data-issue-id="${id}"]`)!.remove();
       }
     });
   }
 }
 
 async function pinMoveEnd(e: SortableEvent) {
-  const url = e.item.getAttribute('data-move-url');
+  const url = e.item.getAttribute('data-move-url')!;
   const id = Number(e.item.getAttribute('data-issue-id'));
-  await POST(url, {data: {id, position: e.newIndex + 1}});
+  await POST(url, {data: {id, position: e.newIndex! + 1}});
 }
 
 async function initIssuePinSort() {
diff --git a/web_src/js/features/repo-issue-pull.ts b/web_src/js/features/repo-issue-pull.ts
index c415dad08f..91f27305bd 100644
--- a/web_src/js/features/repo-issue-pull.ts
+++ b/web_src/js/features/repo-issue-pull.ts
@@ -8,21 +8,21 @@ function initRepoPullRequestUpdate(el: HTMLElement) {
   const prUpdateButtonContainer = el.querySelector('#update-pr-branch-with-base');
   if (!prUpdateButtonContainer) return;
 
-  const prUpdateButton = prUpdateButtonContainer.querySelector<HTMLButtonElement>(':scope > button');
-  const prUpdateDropdown = prUpdateButtonContainer.querySelector(':scope > .ui.dropdown');
+  const prUpdateButton = prUpdateButtonContainer.querySelector<HTMLButtonElement>(':scope > button')!;
+  const prUpdateDropdown = prUpdateButtonContainer.querySelector(':scope > .ui.dropdown')!;
   prUpdateButton.addEventListener('click', async function (e) {
     e.preventDefault();
     const redirect = this.getAttribute('data-redirect');
     this.classList.add('is-loading');
-    let response: Response;
+    let response: Response | undefined;
     try {
-      response = await POST(this.getAttribute('data-do'));
+      response = await POST(this.getAttribute('data-do')!);
     } catch (error) {
       console.error(error);
     } finally {
       this.classList.remove('is-loading');
     }
-    let data: Record<string, any>;
+    let data: Record<string, any> | undefined;
     try {
       data = await response?.json(); // the response is probably not a JSON
     } catch (error) {
@@ -54,8 +54,8 @@ function initRepoPullRequestUpdate(el: HTMLElement) {
 
 function initRepoPullRequestCommitStatus(el: HTMLElement) {
   for (const btn of el.querySelectorAll('.commit-status-hide-checks')) {
-    const panel = btn.closest('.commit-status-panel');
-    const list = panel.querySelector<HTMLElement>('.commit-status-list');
+    const panel = btn.closest('.commit-status-panel')!;
+    const list = panel.querySelector<HTMLElement>('.commit-status-list')!;
     btn.addEventListener('click', () => {
       list.style.maxHeight = list.style.maxHeight ? '' : '0px'; // toggle
       btn.textContent = btn.getAttribute(list.style.maxHeight ? 'data-show-all' : 'data-hide-all');
@@ -96,7 +96,7 @@ export function initRepoPullMergeBox(el: HTMLElement) {
 
   const reloadingInterval = parseInt(reloadingIntervalValue);
   const pullLink = el.getAttribute('data-pull-link');
-  let timerId: number;
+  let timerId: number | null;
 
   let reloadMergeBox: () => Promise<void>;
   const stopReloading = () => {
diff --git a/web_src/js/features/repo-issue-sidebar-combolist.ts b/web_src/js/features/repo-issue-sidebar-combolist.ts
index f25c0a77c6..aaff3804c7 100644
--- a/web_src/js/features/repo-issue-sidebar-combolist.ts
+++ b/web_src/js/features/repo-issue-sidebar-combolist.ts
@@ -12,7 +12,7 @@ function issueSidebarReloadConfirmDraftComment() {
     // 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();
+      textarea.parentElement!.scrollIntoView();
       if (!window.confirm('Page will be reloaded, but there are draft comments. Continuing to reload will discard the comments. Continue?')) {
         return;
       }
@@ -34,22 +34,22 @@ export class IssueSidebarComboList {
 
   constructor(container: HTMLElement) {
     this.container = container;
-    this.updateUrl = container.getAttribute('data-update-url');
-    this.updateAlgo = container.getAttribute('data-update-algo');
-    this.selectionMode = container.getAttribute('data-selection-mode');
+    this.updateUrl = container.getAttribute('data-update-url')!;
+    this.updateAlgo = container.getAttribute('data-update-algo')!;
+    this.selectionMode = container.getAttribute('data-selection-mode')!;
     if (!['single', 'multiple'].includes(this.selectionMode)) throw new Error(`Invalid data-update-on: ${this.selectionMode}`);
     if (!['diff', 'all'].includes(this.updateAlgo)) throw new Error(`Invalid data-update-algo: ${this.updateAlgo}`);
-    this.elDropdown = container.querySelector<HTMLElement>(':scope > .ui.dropdown');
-    this.elList = container.querySelector<HTMLElement>(':scope > .ui.list');
-    this.elComboValue = container.querySelector<HTMLInputElement>(':scope > .combo-value');
+    this.elDropdown = container.querySelector<HTMLElement>(':scope > .ui.dropdown')!;
+    this.elList = container.querySelector<HTMLElement>(':scope > .ui.list')!;
+    this.elComboValue = container.querySelector<HTMLInputElement>(':scope > .combo-value')!;
   }
 
   collectCheckedValues() {
-    return Array.from(this.elDropdown.querySelectorAll('.menu > .item.checked'), (el) => el.getAttribute('data-value'));
+    return Array.from(this.elDropdown.querySelectorAll('.menu > .item.checked'), (el) => el.getAttribute('data-value')!);
   }
 
   updateUiList(changedValues: Array<string>) {
-    const elEmptyTip = this.elList.querySelector('.item.empty-list');
+    const elEmptyTip = this.elList.querySelector('.item.empty-list')!;
     queryElemChildren(this.elList, '.item:not(.empty-list)', (el) => el.remove());
     for (const value of changedValues) {
       const el = this.elDropdown.querySelector<HTMLElement>(`.menu > .item[data-value="${CSS.escape(value)}"]`);
diff --git a/web_src/js/features/repo-issue-sidebar.ts b/web_src/js/features/repo-issue-sidebar.ts
index 290e1ae000..2ff077e6db 100644
--- a/web_src/js/features/repo-issue-sidebar.ts
+++ b/web_src/js/features/repo-issue-sidebar.ts
@@ -8,10 +8,10 @@ function initBranchSelector() {
   if (!elSelectBranch) return;
 
   const urlUpdateIssueRef = elSelectBranch.getAttribute('data-url-update-issueref');
-  const elBranchMenu = elSelectBranch.querySelector('.reference-list-menu');
+  const elBranchMenu = elSelectBranch.querySelector('.reference-list-menu')!;
   queryElems(elBranchMenu, '.item:not(.no-select)', (el) => el.addEventListener('click', async function (e) {
     e.preventDefault();
-    const selectedValue = this.getAttribute('data-id'); // eg: "refs/heads/my-branch"
+    const selectedValue = this.getAttribute('data-id')!; // eg: "refs/heads/my-branch"
     const selectedText = this.getAttribute('data-name'); // eg: "my-branch"
     if (urlUpdateIssueRef) {
       // for existing issue, send request to update issue ref, and reload page
@@ -23,9 +23,9 @@ function initBranchSelector() {
       }
     } else {
       // for new issue, only update UI&form, do not send request/reload
-      const selectedHiddenSelector = this.getAttribute('data-id-selector');
-      document.querySelector<HTMLInputElement>(selectedHiddenSelector).value = selectedValue;
-      elSelectBranch.querySelector('.text-branch-name').textContent = selectedText;
+      const selectedHiddenSelector = this.getAttribute('data-id-selector')!;
+      document.querySelector<HTMLInputElement>(selectedHiddenSelector)!.value = selectedValue;
+      elSelectBranch.querySelector('.text-branch-name')!.textContent = selectedText;
     }
   }));
 }
@@ -33,7 +33,7 @@ function initBranchSelector() {
 function initRepoIssueDue() {
   const form = document.querySelector<HTMLFormElement>('.issue-due-form');
   if (!form) return;
-  const deadline = form.querySelector<HTMLInputElement>('input[name=deadline]');
+  const deadline = form.querySelector<HTMLInputElement>('input[name=deadline]')!;
   document.querySelector('.issue-due-edit')?.addEventListener('click', () => {
     toggleElem(form);
   });
diff --git a/web_src/js/features/repo-issue.ts b/web_src/js/features/repo-issue.ts
index bacdae5350..7145936ed1 100644
--- a/web_src/js/features/repo-issue.ts
+++ b/web_src/js/features/repo-issue.ts
@@ -7,7 +7,6 @@ import {
   queryElems,
   showElem,
   toggleElem,
-  type DOMEvent,
 } from '../utils/dom.ts';
 import {setFileFolding} from './file-fold.ts';
 import {ComboMarkdownEditor, getComboMarkdownEditor, initComboMarkdownEditor} from './comp/ComboMarkdownEditor.ts';
@@ -67,7 +66,7 @@ function initRepoIssueLabelFilter(elDropdown: HTMLElement) {
   const excludeLabel = (e: MouseEvent | KeyboardEvent, item: Element) => {
     e.preventDefault();
     e.stopPropagation();
-    const labelId = item.getAttribute('data-label-id');
+    const labelId = item.getAttribute('data-label-id')!;
     let labelIds: string[] = queryLabels ? queryLabels.split(',') : [];
     labelIds = labelIds.filter((id) => Math.abs(parseInt(id)) !== Math.abs(parseInt(labelId)));
     labelIds.push(`-${labelId}`);
@@ -89,14 +88,14 @@ function initRepoIssueLabelFilter(elDropdown: HTMLElement) {
     }
   });
   // no "labels" query parameter means "all issues"
-  elDropdown.querySelector('.label-filter-query-default').classList.toggle('selected', queryLabels === '');
+  elDropdown.querySelector('.label-filter-query-default')!.classList.toggle('selected', queryLabels === '');
   // "labels=0" query parameter means "issues without label"
-  elDropdown.querySelector('.label-filter-query-not-set').classList.toggle('selected', queryLabels === '0');
+  elDropdown.querySelector('.label-filter-query-not-set')!.classList.toggle('selected', queryLabels === '0');
 
   // prepare to process "archived" labels
   const elShowArchivedLabel = elDropdown.querySelector('.label-filter-archived-toggle');
   if (!elShowArchivedLabel) return;
-  const elShowArchivedInput = elShowArchivedLabel.querySelector<HTMLInputElement>('input');
+  const elShowArchivedInput = elShowArchivedLabel.querySelector<HTMLInputElement>('input')!;
   elShowArchivedInput.checked = showArchivedLabels;
   const archivedLabels = elDropdown.querySelectorAll('.item[data-is-archived]');
   // if no archived labels, hide the toggle and return
@@ -107,7 +106,7 @@ function initRepoIssueLabelFilter(elDropdown: HTMLElement) {
 
   // show the archived labels if the toggle is checked or the label is selected
   for (const label of archivedLabels) {
-    toggleElem(label, showArchivedLabels || selectedLabelIds.has(label.getAttribute('data-label-id')));
+    toggleElem(label, showArchivedLabels || selectedLabelIds.has(label.getAttribute('data-label-id')!));
   }
   // update the url when the toggle is changed and reload
   elShowArchivedInput.addEventListener('input', () => {
@@ -127,14 +126,14 @@ export function initRepoIssueFilterItemLabel() {
 
 export function initRepoIssueCommentDelete() {
   // Delete comment
-  document.addEventListener('click', async (e: DOMEvent<MouseEvent>) => {
-    if (!e.target.matches('.delete-comment')) return;
+  document.addEventListener('click', async (e) => {
+    if (!(e.target as HTMLElement).matches('.delete-comment')) return;
     e.preventDefault();
 
-    const deleteButton = e.target;
-    if (window.confirm(deleteButton.getAttribute('data-locale'))) {
+    const deleteButton = e.target as HTMLElement;
+    if (window.confirm(deleteButton.getAttribute('data-locale')!)) {
       try {
-        const response = await POST(deleteButton.getAttribute('data-url'));
+        const response = await POST(deleteButton.getAttribute('data-url')!);
         if (!response.ok) throw new Error('Failed to delete comment');
 
         const conversationHolder = deleteButton.closest('.conversation-holder');
@@ -143,8 +142,8 @@ export function initRepoIssueCommentDelete() {
 
         // Check if this was a pending comment.
         if (conversationHolder?.querySelector('.pending-label')) {
-          const counter = document.querySelector('#review-box .review-comments-counter');
-          let num = parseInt(counter?.getAttribute('data-pending-comment-number')) - 1 || 0;
+          const counter = document.querySelector('#review-box .review-comments-counter')!;
+          let num = parseInt(counter?.getAttribute('data-pending-comment-number') || '') - 1 || 0;
           num = Math.max(num, 0);
           counter.setAttribute('data-pending-comment-number', String(num));
           counter.textContent = String(num);
@@ -162,9 +161,9 @@ export function initRepoIssueCommentDelete() {
           // on the Conversation page, there is no parent "tr", so no need to do anything for "add-code-comment"
           if (lineType) {
             if (lineType === 'same') {
-              document.querySelector(`[data-path="${path}"] .add-code-comment[data-idx="${idx}"]`).classList.remove('tw-invisible');
+              document.querySelector(`[data-path="${path}"] .add-code-comment[data-idx="${idx}"]`)!.classList.remove('tw-invisible');
             } else {
-              document.querySelector(`[data-path="${path}"] .add-code-comment[data-side="${side}"][data-idx="${idx}"]`).classList.remove('tw-invisible');
+              document.querySelector(`[data-path="${path}"] .add-code-comment[data-side="${side}"][data-idx="${idx}"]`)!.classList.remove('tw-invisible');
             }
           }
           conversationHolder.remove();
@@ -184,13 +183,13 @@ export function initRepoIssueCommentDelete() {
 
 export function initRepoIssueCodeCommentCancel() {
   // Cancel inline code comment
-  document.addEventListener('click', (e: DOMEvent<MouseEvent>) => {
-    if (!e.target.matches('.cancel-code-comment')) return;
+  document.addEventListener('click', (e) => {
+    if (!(e.target as HTMLElement).matches('.cancel-code-comment')) return;
 
-    const form = e.target.closest('form');
+    const form = (e.target as HTMLElement).closest('form')!;
     if (form?.classList.contains('comment-form')) {
       hideElem(form);
-      showElem(form.closest('.comment-code-cloud')?.querySelectorAll('button.comment-form-reply'));
+      showElem(form.closest('.comment-code-cloud')!.querySelectorAll('button.comment-form-reply'));
     } else {
       form.closest('.comment-code-cloud')?.remove();
     }
@@ -198,9 +197,9 @@ export function initRepoIssueCodeCommentCancel() {
 }
 
 export function initRepoPullRequestAllowMaintainerEdit() {
-  const wrapper = document.querySelector('#allow-edits-from-maintainers');
+  const wrapper = document.querySelector('#allow-edits-from-maintainers')!;
   if (!wrapper) return;
-  const checkbox = wrapper.querySelector<HTMLInputElement>('input[type="checkbox"]');
+  const checkbox = wrapper.querySelector<HTMLInputElement>('input[type="checkbox"]')!;
   checkbox.addEventListener('input', async () => {
     const url = `${wrapper.getAttribute('data-url')}/set_allow_maintainer_edit`;
     wrapper.classList.add('is-loading');
@@ -216,7 +215,7 @@ export function initRepoPullRequestAllowMaintainerEdit() {
     } catch (error) {
       checkbox.checked = !checkbox.checked;
       console.error(error);
-      showTemporaryTooltip(wrapper, wrapper.getAttribute('data-prompt-error'));
+      showTemporaryTooltip(wrapper, wrapper.getAttribute('data-prompt-error')!);
     } finally {
       wrapper.classList.remove('is-loading');
     }
@@ -226,7 +225,7 @@ export function initRepoPullRequestAllowMaintainerEdit() {
 export function initRepoIssueComments() {
   if (!document.querySelector('.repository.view.issue .timeline')) return;
 
-  document.addEventListener('click', (e: DOMEvent<MouseEvent>) => {
+  document.addEventListener('click', (e: Event) => {
     const urlTarget = document.querySelector(':target');
     if (!urlTarget) return;
 
@@ -235,22 +234,22 @@ export function initRepoIssueComments() {
 
     if (!/^(issue|pull)(comment)?-\d+$/.test(urlTargetId)) return;
 
-    if (!e.target.closest(`#${urlTargetId}`)) {
+    if (!(e.target as HTMLElement).closest(`#${urlTargetId}`)) {
       // if the user clicks outside the comment, remove the hash from the url
       // use empty hash and state to avoid scrolling
       window.location.hash = ' ';
-      window.history.pushState(null, null, ' ');
+      window.history.pushState(null, '', ' ');
     }
   });
 }
 
 export async function handleReply(el: HTMLElement) {
-  const form = el.closest('.comment-code-cloud').querySelector('.comment-form');
+  const form = el.closest('.comment-code-cloud')!.querySelector('.comment-form')!;
   const textarea = form.querySelector('textarea');
 
   hideElem(el);
   showElem(form);
-  const editor = getComboMarkdownEditor(textarea) ?? await initComboMarkdownEditor(form.querySelector('.combo-markdown-editor'));
+  const editor = getComboMarkdownEditor(textarea) ?? await initComboMarkdownEditor(form.querySelector('.combo-markdown-editor')!);
   editor.focus();
   return editor;
 }
@@ -269,7 +268,7 @@ export function initRepoPullRequestReview() {
         showElem(`#code-comments-${id}, #code-preview-${id}, #hide-outdated-${id}`);
         // if the comment box is folded, expand it
         if (ancestorDiffBox?.getAttribute('data-folded') === 'true') {
-          setFileFolding(ancestorDiffBox, ancestorDiffBox.querySelector('.fold-file'), false);
+          setFileFolding(ancestorDiffBox, ancestorDiffBox.querySelector('.fold-file')!, false);
         }
       }
       // set scrollRestoration to 'manual' when there is a hash in url, so that the scroll position will not be remembered after refreshing
@@ -317,18 +316,18 @@ export function initRepoPullRequestReview() {
       interactive: true,
       hideOnClick: true,
     });
-    elReviewPanel.querySelector('.close').addEventListener('click', () => tippy.hide());
+    elReviewPanel.querySelector('.close')!.addEventListener('click', () => tippy.hide());
   }
 
   addDelegatedEventListener(document, 'click', '.add-code-comment', async (el, e) => {
     e.preventDefault();
 
     const isSplit = el.closest('.code-diff')?.classList.contains('code-diff-split');
-    const side = el.getAttribute('data-side');
-    const idx = el.getAttribute('data-idx');
+    const side = el.getAttribute('data-side')!;
+    const idx = el.getAttribute('data-idx')!;
     const path = el.closest('[data-path]')?.getAttribute('data-path');
-    const tr = el.closest('tr');
-    const lineType = tr.getAttribute('data-line-type');
+    const tr = el.closest('tr')!;
+    const lineType = tr.getAttribute('data-line-type')!;
 
     let ntr = tr.nextElementSibling;
     if (!ntr?.classList.contains('add-comment')) {
@@ -343,15 +342,15 @@ export function initRepoPullRequestReview() {
         </tr>`);
       tr.after(ntr);
     }
-    const td = ntr.querySelector(`.add-comment-${side}`);
+    const td = ntr.querySelector(`.add-comment-${side}`)!;
     const commentCloud = td.querySelector('.comment-code-cloud');
     if (!commentCloud && !ntr.querySelector('button[name="pending_review"]')) {
-      const response = await GET(el.closest('[data-new-comment-url]')?.getAttribute('data-new-comment-url'));
+      const response = await GET(el.closest('[data-new-comment-url]')?.getAttribute('data-new-comment-url') ?? '');
       td.innerHTML = await response.text();
-      td.querySelector<HTMLInputElement>("input[name='line']").value = idx;
-      td.querySelector<HTMLInputElement>("input[name='side']").value = (side === 'left' ? 'previous' : 'proposed');
-      td.querySelector<HTMLInputElement>("input[name='path']").value = path;
-      const editor = await initComboMarkdownEditor(td.querySelector<HTMLElement>('.combo-markdown-editor'));
+      td.querySelector<HTMLInputElement>("input[name='line']")!.value = idx;
+      td.querySelector<HTMLInputElement>("input[name='side']")!.value = (side === 'left' ? 'previous' : 'proposed');
+      td.querySelector<HTMLInputElement>("input[name='path']")!.value = String(path);
+      const editor = await initComboMarkdownEditor(td.querySelector<HTMLElement>('.combo-markdown-editor')!);
       editor.focus();
     }
   });
@@ -360,7 +359,7 @@ export function initRepoPullRequestReview() {
 export function initRepoIssueReferenceIssue() {
   const elDropdown = document.querySelector('.issue_reference_repository_search');
   if (!elDropdown) return;
-  const form = elDropdown.closest('form');
+  const form = elDropdown.closest('form')!;
   fomanticQuery(elDropdown).dropdown({
     fullTextSearch: true,
     apiSettings: {
@@ -389,10 +388,10 @@ export function initRepoIssueReferenceIssue() {
     const target = el.getAttribute('data-target');
     const content = document.querySelector(`#${target}`)?.textContent ?? '';
     const poster = el.getAttribute('data-poster-username');
-    const reference = toAbsoluteUrl(el.getAttribute('data-reference'));
-    const modalSelector = el.getAttribute('data-modal');
-    const modal = document.querySelector(modalSelector);
-    const textarea = modal.querySelector<HTMLTextAreaElement>('textarea[name="content"]');
+    const reference = toAbsoluteUrl(el.getAttribute('data-reference')!);
+    const modalSelector = el.getAttribute('data-modal')!;
+    const modal = document.querySelector(modalSelector)!;
+    const textarea = modal.querySelector<HTMLTextAreaElement>('textarea[name="content"]')!;
     textarea.value = `${content}\n\n_Originally posted by @${poster} in ${reference}_`;
     fomanticQuery(modal).modal('show');
   });
@@ -402,8 +401,8 @@ export function initRepoIssueWipNewTitle() {
   // Toggle WIP for new PR
   queryElems(document, '.title_wip_desc > a', (el) => el.addEventListener('click', (e) => {
     e.preventDefault();
-    const wipPrefixes = JSON.parse(el.closest('.title_wip_desc').getAttribute('data-wip-prefixes'));
-    const titleInput = document.querySelector<HTMLInputElement>('#issue_title');
+    const wipPrefixes = JSON.parse(el.closest('.title_wip_desc')!.getAttribute('data-wip-prefixes')!);
+    const titleInput = document.querySelector<HTMLInputElement>('#issue_title')!;
     const titleValue = titleInput.value;
     for (const prefix of wipPrefixes) {
       if (titleValue.startsWith(prefix.toUpperCase())) {
@@ -419,8 +418,8 @@ export function initRepoIssueWipToggle() {
   registerGlobalInitFunc('initPullRequestWipToggle', (toggleWip) => toggleWip.addEventListener('click', async (e) => {
     e.preventDefault();
     const title = toggleWip.getAttribute('data-title');
-    const wipPrefix = toggleWip.getAttribute('data-wip-prefix');
-    const updateUrl = toggleWip.getAttribute('data-update-url');
+    const wipPrefix = toggleWip.getAttribute('data-wip-prefix')!;
+    const updateUrl = toggleWip.getAttribute('data-update-url')!;
 
     const params = new URLSearchParams();
     params.append('title', title?.startsWith(wipPrefix) ? title.slice(wipPrefix.length).trim() : `${wipPrefix.trim()} ${title}`);
@@ -434,13 +433,13 @@ export function initRepoIssueWipToggle() {
 }
 
 export function initRepoIssueTitleEdit() {
-  const issueTitleDisplay = document.querySelector('#issue-title-display');
+  const issueTitleDisplay = document.querySelector('#issue-title-display')!;
   const issueTitleEditor = document.querySelector<HTMLFormElement>('#issue-title-editor');
   if (!issueTitleEditor) return;
 
-  const issueTitleInput = issueTitleEditor.querySelector('input');
-  const oldTitle = issueTitleInput.getAttribute('data-old-title');
-  issueTitleDisplay.querySelector('#issue-title-edit-show').addEventListener('click', () => {
+  const issueTitleInput = issueTitleEditor.querySelector('input')!;
+  const oldTitle = issueTitleInput.getAttribute('data-old-title')!;
+  issueTitleDisplay.querySelector('#issue-title-edit-show')!.addEventListener('click', () => {
     hideElem(issueTitleDisplay);
     hideElem('#pull-desc-display');
     showElem(issueTitleEditor);
@@ -450,7 +449,7 @@ export function initRepoIssueTitleEdit() {
     }
     issueTitleInput.focus();
   });
-  issueTitleEditor.querySelector('.ui.cancel.button').addEventListener('click', () => {
+  issueTitleEditor.querySelector('.ui.cancel.button')!.addEventListener('click', () => {
     hideElem(issueTitleEditor);
     hideElem('#pull-desc-editor');
     showElem(issueTitleDisplay);
@@ -460,22 +459,22 @@ export function initRepoIssueTitleEdit() {
   const pullDescEditor = document.querySelector('#pull-desc-editor'); // it may not exist for a merged PR
   const prTargetUpdateUrl = pullDescEditor?.getAttribute('data-target-update-url');
 
-  const editSaveButton = issueTitleEditor.querySelector('.ui.primary.button');
+  const editSaveButton = issueTitleEditor.querySelector('.ui.primary.button')!;
   issueTitleEditor.addEventListener('submit', async (e) => {
     e.preventDefault();
     const newTitle = issueTitleInput.value.trim();
     try {
       if (newTitle && newTitle !== oldTitle) {
-        const resp = await POST(editSaveButton.getAttribute('data-update-url'), {data: new URLSearchParams({title: newTitle})});
+        const resp = await POST(editSaveButton.getAttribute('data-update-url')!, {data: new URLSearchParams({title: newTitle})});
         if (!resp.ok) {
           throw new Error(`Failed to update issue title: ${resp.statusText}`);
         }
       }
       if (prTargetUpdateUrl) {
-        const newTargetBranch = document.querySelector('#pull-target-branch').getAttribute('data-branch');
-        const oldTargetBranch = document.querySelector('#branch_target').textContent;
+        const newTargetBranch = document.querySelector('#pull-target-branch')!.getAttribute('data-branch');
+        const oldTargetBranch = document.querySelector('#branch_target')!.textContent;
         if (newTargetBranch !== oldTargetBranch) {
-          const resp = await POST(prTargetUpdateUrl, {data: new URLSearchParams({target_branch: newTargetBranch})});
+          const resp = await POST(prTargetUpdateUrl, {data: new URLSearchParams({target_branch: String(newTargetBranch)})});
           if (!resp.ok) {
             throw new Error(`Failed to update PR target branch: ${resp.statusText}`);
           }
@@ -491,12 +490,12 @@ export function initRepoIssueTitleEdit() {
 }
 
 export function initRepoIssueBranchSelect() {
-  document.querySelector<HTMLElement>('#branch-select')?.addEventListener('click', (e: DOMEvent<MouseEvent>) => {
-    const el = e.target.closest('.item[data-branch]');
+  document.querySelector<HTMLElement>('#branch-select')?.addEventListener('click', (e: Event) => {
+    const el = (e.target as HTMLElement).closest('.item[data-branch]');
     if (!el) return;
-    const pullTargetBranch = document.querySelector('#pull-target-branch');
+    const pullTargetBranch = document.querySelector('#pull-target-branch')!;
     const baseName = pullTargetBranch.getAttribute('data-basename');
-    const branchNameNew = el.getAttribute('data-branch');
+    const branchNameNew = el.getAttribute('data-branch')!;
     const branchNameOld = pullTargetBranch.getAttribute('data-branch');
     pullTargetBranch.textContent = pullTargetBranch.textContent.replace(`${baseName}:${branchNameOld}`, `${baseName}:${branchNameNew}`);
     pullTargetBranch.setAttribute('data-branch', branchNameNew);
@@ -507,7 +506,7 @@ async function initSingleCommentEditor(commentForm: HTMLFormElement) {
   // pages:
   // * normal new issue/pr page: no status-button, no comment-button (there is only a normal submit button which can submit empty content)
   // * issue/pr view page: with comment form, has status-button and comment-button
-  const editor = await initComboMarkdownEditor(commentForm.querySelector('.combo-markdown-editor'));
+  const editor = await initComboMarkdownEditor(commentForm.querySelector('.combo-markdown-editor')!);
   const statusButton = document.querySelector<HTMLButtonElement>('#status-button');
   const commentButton = document.querySelector<HTMLButtonElement>('#comment-button');
   const syncUiState = () => {
@@ -531,9 +530,9 @@ function initIssueTemplateCommentEditors(commentForm: HTMLFormElement) {
   const comboFields = commentForm.querySelectorAll<HTMLElement>('.combo-editor-dropzone');
 
   const initCombo = async (elCombo: HTMLElement) => {
-    const fieldTextarea = elCombo.querySelector<HTMLTextAreaElement>('.form-field-real');
-    const dropzoneContainer = elCombo.querySelector<HTMLElement>('.form-field-dropzone');
-    const markdownEditor = elCombo.querySelector<HTMLElement>('.combo-markdown-editor');
+    const fieldTextarea = elCombo.querySelector<HTMLTextAreaElement>('.form-field-real')!;
+    const dropzoneContainer = elCombo.querySelector<HTMLElement>('.form-field-dropzone')!;
+    const markdownEditor = elCombo.querySelector<HTMLElement>('.combo-markdown-editor')!;
 
     const editor = await initComboMarkdownEditor(markdownEditor);
     editor.container.addEventListener(ComboMarkdownEditor.EventEditorContentChanged, () => fieldTextarea.value = editor.value());
@@ -544,7 +543,7 @@ function initIssueTemplateCommentEditors(commentForm: HTMLFormElement) {
       hideElem(commentForm.querySelectorAll('.combo-editor-dropzone .combo-markdown-editor'));
       queryElems(commentForm, '.combo-editor-dropzone .form-field-dropzone', (dropzoneContainer) => {
         // if "form-field-dropzone" exists, then "dropzone" must also exist
-        const dropzone = dropzoneContainer.querySelector<HTMLElement>('.dropzone').dropzone;
+        const dropzone = dropzoneContainer.querySelector<HTMLElement>('.dropzone')!.dropzone;
         const hasUploadedFiles = dropzone.files.length !== 0;
         toggleElem(dropzoneContainer, hasUploadedFiles);
       });
diff --git a/web_src/js/features/repo-legacy.ts b/web_src/js/features/repo-legacy.ts
index 249d181b25..fc92242b40 100644
--- a/web_src/js/features/repo-legacy.ts
+++ b/web_src/js/features/repo-legacy.ts
@@ -30,8 +30,8 @@ export function initBranchSelectorTabs() {
   for (const elSelectBranch of elSelectBranches) {
     queryElems(elSelectBranch, '.reference.column', (el) => el.addEventListener('click', () => {
       hideElem(elSelectBranch.querySelectorAll('.scrolling.reference-list-menu'));
-      showElem(el.getAttribute('data-target'));
-      queryElemChildren(el.parentNode, '.branch-tag-item', (el) => el.classList.remove('active'));
+      showElem(el.getAttribute('data-target')!);
+      queryElemChildren(el.parentNode!, '.branch-tag-item', (el) => el.classList.remove('active'));
       el.classList.add('active');
     }));
   }
diff --git a/web_src/js/features/repo-migrate.ts b/web_src/js/features/repo-migrate.ts
index 0788f83215..556f049246 100644
--- a/web_src/js/features/repo-migrate.ts
+++ b/web_src/js/features/repo-migrate.ts
@@ -1,4 +1,4 @@
-import {hideElem, showElem, type DOMEvent} from '../utils/dom.ts';
+import {hideElem, showElem} from '../utils/dom.ts';
 import {GET, POST} from '../modules/fetch.ts';
 
 export function initRepoMigrationStatusChecker() {
@@ -18,7 +18,7 @@ export function initRepoMigrationStatusChecker() {
 
     // for all status
     if (data.message) {
-      document.querySelector('#repo_migrating_progress_message').textContent = data.message;
+      document.querySelector('#repo_migrating_progress_message')!.textContent = data.message;
     }
 
     // TaskStatusFinished
@@ -34,7 +34,7 @@ export function initRepoMigrationStatusChecker() {
       showElem('#repo_migrating_retry');
       showElem('#repo_migrating_failed');
       showElem('#repo_migrating_failed_image');
-      document.querySelector('#repo_migrating_failed_error').textContent = data.message;
+      document.querySelector('#repo_migrating_failed_error')!.textContent = data.message;
       return false;
     }
 
@@ -55,7 +55,7 @@ export function initRepoMigrationStatusChecker() {
   syncTaskStatus(); // no await
 }
 
-async function doMigrationRetry(e: DOMEvent<MouseEvent>) {
-  await POST(e.target.getAttribute('data-migrating-task-retry-url'));
+async function doMigrationRetry(e: Event) {
+  await POST((e.target as HTMLElement).getAttribute('data-migrating-task-retry-url')!);
   window.location.reload();
 }
diff --git a/web_src/js/features/repo-migration.ts b/web_src/js/features/repo-migration.ts
index 9f086bb9d3..7376ff7fa4 100644
--- a/web_src/js/features/repo-migration.ts
+++ b/web_src/js/features/repo-migration.ts
@@ -7,8 +7,8 @@ const pass = document.querySelector<HTMLInputElement>('#auth_password');
 const token = document.querySelector<HTMLInputElement>('#auth_token');
 const mirror = document.querySelector<HTMLInputElement>('#mirror');
 const lfs = document.querySelector<HTMLInputElement>('#lfs');
-const lfsSettings = document.querySelector<HTMLElement>('#lfs_settings');
-const lfsEndpoint = document.querySelector<HTMLElement>('#lfs_endpoint');
+const lfsSettings = document.querySelector<HTMLElement>('#lfs_settings')!;
+const lfsEndpoint = document.querySelector<HTMLElement>('#lfs_endpoint')!;
 const items = document.querySelectorAll<HTMLInputElement>('#migrate_items input[type=checkbox]');
 
 export function initRepoMigration() {
diff --git a/web_src/js/features/repo-milestone.ts b/web_src/js/features/repo-milestone.ts
index ee704ea2e0..ceca8e0b46 100644
--- a/web_src/js/features/repo-milestone.ts
+++ b/web_src/js/features/repo-milestone.ts
@@ -2,8 +2,8 @@ export function initRepoMilestone() {
   const page = document.querySelector('.repository.new.milestone');
   if (!page) return;
 
-  const deadline = page.querySelector<HTMLInputElement>('form input[name=deadline]');
-  document.querySelector('#milestone-clear-deadline').addEventListener('click', () => {
+  const deadline = page.querySelector<HTMLInputElement>('form input[name=deadline]')!;
+  document.querySelector('#milestone-clear-deadline')!.addEventListener('click', () => {
     deadline.value = '';
   });
 }
diff --git a/web_src/js/features/repo-new.ts b/web_src/js/features/repo-new.ts
index e2aa13f490..b690ace0f7 100644
--- a/web_src/js/features/repo-new.ts
+++ b/web_src/js/features/repo-new.ts
@@ -6,13 +6,13 @@ import {sanitizeRepoName} from './repo-common.ts';
 const {appSubUrl} = window.config;
 
 function initRepoNewTemplateSearch(form: HTMLFormElement) {
-  const elSubmitButton = querySingleVisibleElem<HTMLInputElement>(form, '.ui.primary.button');
-  const elCreateRepoErrorMessage = form.querySelector('#create-repo-error-message');
-  const elRepoOwnerDropdown = form.querySelector('#repo_owner_dropdown');
-  const elRepoTemplateDropdown = form.querySelector<HTMLInputElement>('#repo_template_search');
-  const inputRepoTemplate = form.querySelector<HTMLInputElement>('#repo_template');
-  const elTemplateUnits = form.querySelector('#template_units');
-  const elNonTemplate = form.querySelector('#non_template');
+  const elSubmitButton = querySingleVisibleElem<HTMLInputElement>(form, '.ui.primary.button')!;
+  const elCreateRepoErrorMessage = form.querySelector('#create-repo-error-message')!;
+  const elRepoOwnerDropdown = form.querySelector('#repo_owner_dropdown')!;
+  const elRepoTemplateDropdown = form.querySelector<HTMLInputElement>('#repo_template_search')!;
+  const inputRepoTemplate = form.querySelector<HTMLInputElement>('#repo_template')!;
+  const elTemplateUnits = form.querySelector('#template_units')!;
+  const elNonTemplate = form.querySelector('#non_template')!;
   const checkTemplate = function () {
     const hasSelectedTemplate = inputRepoTemplate.value !== '' && inputRepoTemplate.value !== '0';
     toggleElem(elTemplateUnits, hasSelectedTemplate);
@@ -62,10 +62,10 @@ export function initRepoNew() {
   const pageContent = document.querySelector('.page-content.repository.new-repo');
   if (!pageContent) return;
 
-  const form = document.querySelector<HTMLFormElement>('.new-repo-form');
-  const inputGitIgnores = form.querySelector<HTMLInputElement>('input[name="gitignores"]');
-  const inputLicense = form.querySelector<HTMLInputElement>('input[name="license"]');
-  const inputAutoInit = form.querySelector<HTMLInputElement>('input[name="auto_init"]');
+  const form = document.querySelector<HTMLFormElement>('.new-repo-form')!;
+  const inputGitIgnores = form.querySelector<HTMLInputElement>('input[name="gitignores"]')!;
+  const inputLicense = form.querySelector<HTMLInputElement>('input[name="license"]')!;
+  const inputAutoInit = form.querySelector<HTMLInputElement>('input[name="auto_init"]')!;
   const updateUiAutoInit = () => {
     inputAutoInit.checked = Boolean(inputGitIgnores.value || inputLicense.value);
   };
@@ -73,13 +73,13 @@ export function initRepoNew() {
   inputLicense.addEventListener('change', updateUiAutoInit);
   updateUiAutoInit();
 
-  const inputRepoName = form.querySelector<HTMLInputElement>('input[name="repo_name"]');
-  const inputPrivate = form.querySelector<HTMLInputElement>('input[name="private"]');
+  const inputRepoName = form.querySelector<HTMLInputElement>('input[name="repo_name"]')!;
+  const inputPrivate = form.querySelector<HTMLInputElement>('input[name="private"]')!;
   const updateUiRepoName = () => {
     const helps = form.querySelectorAll(`.help[data-help-for-repo-name]`);
     hideElem(helps);
     let help = form.querySelector(`.help[data-help-for-repo-name="${CSS.escape(inputRepoName.value)}"]`);
-    if (!help) help = form.querySelector(`.help[data-help-for-repo-name=""]`);
+    if (!help) help = form.querySelector(`.help[data-help-for-repo-name=""]`)!;
     showElem(help);
     const repoNamePreferPrivate: Record<string, boolean> = {'.profile': false, '.profile-private': true};
     const preferPrivate = repoNamePreferPrivate[inputRepoName.value];
diff --git a/web_src/js/features/repo-projects.ts b/web_src/js/features/repo-projects.ts
index ad0feb6101..b5dfd51b9b 100644
--- a/web_src/js/features/repo-projects.ts
+++ b/web_src/js/features/repo-projects.ts
@@ -7,9 +7,9 @@ import type {SortableEvent} from 'sortablejs';
 import {toggleFullScreen} from '../utils.ts';
 
 function updateIssueCount(card: HTMLElement): void {
-  const parent = card.parentElement;
+  const parent = card.parentElement!;
   const count = parent.querySelectorAll('.issue-card').length;
-  parent.querySelector('.project-column-issue-count').textContent = String(count);
+  parent.querySelector('.project-column-issue-count')!.textContent = String(count);
 }
 
 async function moveIssue({item, from, to, oldIndex}: SortableEvent): Promise<void> {
@@ -19,7 +19,7 @@ async function moveIssue({item, from, to, oldIndex}: SortableEvent): Promise<voi
 
   const columnSorting = {
     issues: Array.from(columnCards, (card, i) => ({
-      issueID: parseInt(card.getAttribute('data-issue')),
+      issueID: parseInt(card.getAttribute('data-issue')!),
       sorting: i,
     })),
   };
@@ -30,13 +30,15 @@ async function moveIssue({item, from, to, oldIndex}: SortableEvent): Promise<voi
     });
   } catch (error) {
     console.error(error);
-    from.insertBefore(item, from.children[oldIndex]);
+    if (oldIndex !== undefined) {
+      from.insertBefore(item, from.children[oldIndex]);
+    }
   }
 }
 
 async function initRepoProjectSortable(): Promise<void> {
   // the HTML layout is: #project-board.board > .project-column .cards > .issue-card
-  const mainBoard = document.querySelector('#project-board');
+  const mainBoard = document.querySelector('#project-board')!;
   let boardColumns = mainBoard.querySelectorAll<HTMLElement>('.project-column');
   createSortable(mainBoard, {
     group: 'project-column',
@@ -49,13 +51,13 @@ async function initRepoProjectSortable(): Promise<void> {
 
       const columnSorting = {
         columns: Array.from(boardColumns, (column, i) => ({
-          columnID: parseInt(column.getAttribute('data-id')),
+          columnID: parseInt(column.getAttribute('data-id')!),
           sorting: i,
         })),
       };
 
       try {
-        await POST(mainBoard.getAttribute('data-url'), {
+        await POST(mainBoard.getAttribute('data-url')!, {
           data: columnSorting,
         });
       } catch (error) {
@@ -65,7 +67,7 @@ async function initRepoProjectSortable(): Promise<void> {
   });
 
   for (const boardColumn of boardColumns) {
-    const boardCardList = boardColumn.querySelector('.cards');
+    const boardCardList = boardColumn.querySelector('.cards')!;
     createSortable(boardCardList, {
       group: 'shared',
       onAdd: moveIssue, // eslint-disable-line @typescript-eslint/no-misused-promises
@@ -77,12 +79,12 @@ async function initRepoProjectSortable(): Promise<void> {
 }
 
 function initRepoProjectColumnEdit(writableProjectBoard: Element): void {
-  const elModal = document.querySelector<HTMLElement>('.ui.modal#project-column-modal-edit');
-  const elForm = elModal.querySelector<HTMLFormElement>('form');
+  const elModal = document.querySelector<HTMLElement>('.ui.modal#project-column-modal-edit')!;
+  const elForm = elModal.querySelector<HTMLFormElement>('form')!;
 
-  const elColumnId = elForm.querySelector<HTMLInputElement>('input[name="id"]');
-  const elColumnTitle = elForm.querySelector<HTMLInputElement>('input[name="title"]');
-  const elColumnColor = elForm.querySelector<HTMLInputElement>('input[name="color"]');
+  const elColumnId = elForm.querySelector<HTMLInputElement>('input[name="id"]')!;
+  const elColumnTitle = elForm.querySelector<HTMLInputElement>('input[name="title"]')!;
+  const elColumnColor = elForm.querySelector<HTMLInputElement>('input[name="color"]')!;
 
   const attrDataColumnId = 'data-modal-project-column-id';
   const attrDataColumnTitle = 'data-modal-project-column-title-input';
@@ -91,9 +93,9 @@ function initRepoProjectColumnEdit(writableProjectBoard: Element): void {
   // the "new" button is not in project board, so need to query from document
   queryElems(document, '.show-project-column-modal-edit', (el) => {
     el.addEventListener('click', () => {
-      elColumnId.value = el.getAttribute(attrDataColumnId);
-      elColumnTitle.value = el.getAttribute(attrDataColumnTitle);
-      elColumnColor.value = el.getAttribute(attrDataColumnColor);
+      elColumnId.value = el.getAttribute(attrDataColumnId)!;
+      elColumnTitle.value = el.getAttribute(attrDataColumnTitle)!;
+      elColumnColor.value = el.getAttribute(attrDataColumnColor)!;
       elColumnColor.dispatchEvent(new Event('input', {bubbles: true})); // trigger the color picker
     });
   });
@@ -116,12 +118,12 @@ function initRepoProjectColumnEdit(writableProjectBoard: Element): void {
       }
 
       // update the newly saved column title and color in the project board (to avoid reload)
-      const elEditButton = writableProjectBoard.querySelector<HTMLButtonElement>(`.show-project-column-modal-edit[${attrDataColumnId}="${columnId}"]`);
+      const elEditButton = writableProjectBoard.querySelector<HTMLButtonElement>(`.show-project-column-modal-edit[${attrDataColumnId}="${columnId}"]`)!;
       elEditButton.setAttribute(attrDataColumnTitle, elColumnTitle.value);
       elEditButton.setAttribute(attrDataColumnColor, elColumnColor.value);
 
-      const elBoardColumn = writableProjectBoard.querySelector<HTMLElement>(`.project-column[data-id="${columnId}"]`);
-      const elBoardColumnTitle = elBoardColumn.querySelector<HTMLElement>(`.project-column-title-text`);
+      const elBoardColumn = writableProjectBoard.querySelector<HTMLElement>(`.project-column[data-id="${columnId}"]`)!;
+      const elBoardColumnTitle = elBoardColumn.querySelector<HTMLElement>(`.project-column-title-text`)!;
       elBoardColumnTitle.textContent = elColumnTitle.value;
       if (elColumnColor.value) {
         const textColor = contrastColor(elColumnColor.value);
diff --git a/web_src/js/features/repo-release.ts b/web_src/js/features/repo-release.ts
index dfff090ba9..30680c543b 100644
--- a/web_src/js/features/repo-release.ts
+++ b/web_src/js/features/repo-release.ts
@@ -1,11 +1,11 @@
-import {hideElem, showElem, type DOMEvent} from '../utils/dom.ts';
+import {hideElem, showElem} from '../utils/dom.ts';
 
 export function initRepoRelease() {
-  document.addEventListener('click', (e: DOMEvent<MouseEvent>) => {
-    if (e.target.matches('.remove-rel-attach')) {
-      const uuid = e.target.getAttribute('data-uuid');
-      const id = e.target.getAttribute('data-id');
-      document.querySelector<HTMLInputElement>(`input[name='attachment-del-${uuid}']`).value = 'true';
+  document.addEventListener('click', (e: Event) => {
+    if ((e.target as HTMLElement).matches('.remove-rel-attach')) {
+      const uuid = (e.target as HTMLElement).getAttribute('data-uuid');
+      const id = (e.target as HTMLElement).getAttribute('data-id');
+      document.querySelector<HTMLInputElement>(`input[name='attachment-del-${uuid}']`)!.value = 'true';
       hideElem(`#attachment-${id}`);
     }
   });
@@ -21,17 +21,17 @@ function initTagNameEditor() {
   const el = document.querySelector('#tag-name-editor');
   if (!el) return;
 
-  const existingTags = JSON.parse(el.getAttribute('data-existing-tags'));
+  const existingTags = JSON.parse(el.getAttribute('data-existing-tags')!);
   if (!Array.isArray(existingTags)) return;
 
   const defaultTagHelperText = el.getAttribute('data-tag-helper');
   const newTagHelperText = el.getAttribute('data-tag-helper-new');
   const existingTagHelperText = el.getAttribute('data-tag-helper-existing');
 
-  const tagNameInput = document.querySelector<HTMLInputElement>('#tag-name');
+  const tagNameInput = document.querySelector<HTMLInputElement>('#tag-name')!;
   const hideTargetInput = function(tagNameInput: HTMLInputElement) {
     const value = tagNameInput.value;
-    const tagHelper = document.querySelector('#tag-helper');
+    const tagHelper = document.querySelector('#tag-helper')!;
     if (existingTags.includes(value)) {
       // If the tag already exists, hide the target branch selector.
       hideElem('#tag-target-selector');
diff --git a/web_src/js/features/repo-search.ts b/web_src/js/features/repo-search.ts
index 27609adfc9..d3a40286fe 100644
--- a/web_src/js/features/repo-search.ts
+++ b/web_src/js/features/repo-search.ts
@@ -1,17 +1,15 @@
-import type {DOMEvent} from '../utils/dom.ts';
-
 export function initRepositorySearch() {
   const repositorySearchForm = document.querySelector<HTMLFormElement>('#repo-search-form');
   if (!repositorySearchForm) return;
 
-  repositorySearchForm.addEventListener('change', (e: DOMEvent<Event, HTMLInputElement>) => {
+  repositorySearchForm.addEventListener('change', (e: Event) => {
     e.preventDefault();
 
     const params = new URLSearchParams();
     for (const [key, value] of new FormData(repositorySearchForm).entries()) {
       params.set(key, value.toString());
     }
-    if (e.target.name === 'clear-filter') {
+    if ((e.target as HTMLInputElement).name === 'clear-filter') {
       params.delete('archived');
       params.delete('fork');
       params.delete('mirror');
diff --git a/web_src/js/features/repo-settings-branches.test.ts b/web_src/js/features/repo-settings-branches.test.ts
index 526e279723..a353593f5c 100644
--- a/web_src/js/features/repo-settings-branches.test.ts
+++ b/web_src/js/features/repo-settings-branches.test.ts
@@ -56,8 +56,10 @@ describe('Repository Branch Settings', () => {
     vi.mocked(POST).mockResolvedValue({ok: true} as Response);
 
     // Mock createSortable to capture and execute the onEnd callback
-    vi.mocked(createSortable).mockImplementation(async (_el: Element, options: SortableOptions) => {
-      options.onEnd(new Event('SortableEvent') as SortableEvent);
+    vi.mocked(createSortable).mockImplementation(async (_el: Element, options: SortableOptions | undefined) => {
+      if (options?.onEnd) {
+        options.onEnd(new Event('SortableEvent') as SortableEvent);
+      }
       // @ts-expect-error: mock is incomplete
       return {destroy: vi.fn()} as Sortable;
     });
diff --git a/web_src/js/features/repo-settings-branches.ts b/web_src/js/features/repo-settings-branches.ts
index 40cdf9f981..8668af2e50 100644
--- a/web_src/js/features/repo-settings-branches.ts
+++ b/web_src/js/features/repo-settings-branches.ts
@@ -14,10 +14,10 @@ export function initRepoSettingsBranchesDrag() {
     onEnd: () => {
       (async () => {
         const itemElems = queryElemChildren(protectedBranchesList, '.item[data-id]');
-        const itemIds = Array.from(itemElems, (el) => parseInt(el.getAttribute('data-id')));
+        const itemIds = Array.from(itemElems, (el) => parseInt(el.getAttribute('data-id')!));
 
         try {
-          await POST(protectedBranchesList.getAttribute('data-update-priority-url'), {
+          await POST(protectedBranchesList.getAttribute('data-update-priority-url')!, {
             data: {
               ids: itemIds,
             },
diff --git a/web_src/js/features/repo-settings.ts b/web_src/js/features/repo-settings.ts
index 7a8df8af0f..ee2f17f4e0 100644
--- a/web_src/js/features/repo-settings.ts
+++ b/web_src/js/features/repo-settings.ts
@@ -10,16 +10,16 @@ const {appSubUrl, csrfToken} = window.config;
 function initRepoSettingsCollaboration() {
   // Change collaborator access mode
   for (const dropdownEl of queryElems(document, '.page-content.repository .ui.dropdown.access-mode')) {
-    const textEl = dropdownEl.querySelector(':scope > .text');
+    const textEl = dropdownEl.querySelector(':scope > .text')!;
     const $dropdown = fomanticQuery(dropdownEl);
     $dropdown.dropdown({
       async action(text: string, value: string) {
         dropdownEl.classList.add('is-loading', 'loading-icon-2px');
-        const lastValue = dropdownEl.getAttribute('data-last-value');
+        const lastValue = dropdownEl.getAttribute('data-last-value')!;
         $dropdown.dropdown('hide');
         try {
-          const uid = dropdownEl.getAttribute('data-uid');
-          await POST(dropdownEl.getAttribute('data-url'), {data: new URLSearchParams({uid, 'mode': value})});
+          const uid = dropdownEl.getAttribute('data-uid')!;
+          await POST(dropdownEl.getAttribute('data-url')!, {data: new URLSearchParams({uid, 'mode': value})});
           textEl.textContent = text;
           dropdownEl.setAttribute('data-last-value', value);
         } catch {
@@ -73,8 +73,8 @@ function initRepoSettingsSearchTeamBox() {
 
 function initRepoSettingsGitHook() {
   if (!document.querySelector('.page-content.repository.settings.edit.githook')) return;
-  const filename = document.querySelector('.hook-filename').textContent;
-  createMonaco(document.querySelector<HTMLTextAreaElement>('#content'), filename, {language: 'shell'});
+  const filename = document.querySelector('.hook-filename')!.textContent;
+  createMonaco(document.querySelector<HTMLTextAreaElement>('#content')!, filename, {language: 'shell'});
 }
 
 function initRepoSettingsBranches() {
@@ -82,14 +82,14 @@ function initRepoSettingsBranches() {
 
   for (const el of document.querySelectorAll<HTMLInputElement>('.toggle-target-enabled')) {
     el.addEventListener('change', function () {
-      const target = document.querySelector(this.getAttribute('data-target'));
+      const target = document.querySelector(this.getAttribute('data-target')!);
       target?.classList.toggle('disabled', !this.checked);
     });
   }
 
   for (const el of document.querySelectorAll<HTMLInputElement>('.toggle-target-disabled')) {
     el.addEventListener('change', function () {
-      const target = document.querySelector(this.getAttribute('data-target'));
+      const target = document.querySelector(this.getAttribute('data-target')!);
       if (this.checked) target?.classList.add('disabled'); // only disable, do not auto enable
     });
   }
@@ -100,13 +100,13 @@ function initRepoSettingsBranches() {
 
   // show the `Matched` mark for the status checks that match the pattern
   const markMatchedStatusChecks = () => {
-    const patterns = (document.querySelector<HTMLTextAreaElement>('#status_check_contexts').value || '').split(/[\r\n]+/);
+    const patterns = (document.querySelector<HTMLTextAreaElement>('#status_check_contexts')!.value || '').split(/[\r\n]+/);
     const validPatterns = patterns.map((item) => item.trim()).filter(Boolean as unknown as <T>(x: T | boolean) => x is T);
     const marks = document.querySelectorAll('.status-check-matched-mark');
 
     for (const el of marks) {
       let matched = false;
-      const statusCheck = el.getAttribute('data-status-check');
+      const statusCheck = el.getAttribute('data-status-check')!;
       for (const pattern of validPatterns) {
         if (globMatch(statusCheck, pattern, '/')) {
           matched = true;
@@ -117,7 +117,7 @@ function initRepoSettingsBranches() {
     }
   };
   markMatchedStatusChecks();
-  document.querySelector('#status_check_contexts').addEventListener('input', onInputDebounce(markMatchedStatusChecks));
+  document.querySelector('#status_check_contexts')!.addEventListener('input', onInputDebounce(markMatchedStatusChecks));
 }
 
 function initRepoSettingsOptions() {
@@ -130,17 +130,17 @@ function initRepoSettingsOptions() {
     queryElems(document, selector, (el) => el.classList.toggle('disabled', !enabled));
   };
   queryElems<HTMLInputElement>(pageContent, '.enable-system', (el) => el.addEventListener('change', () => {
-    toggleTargetContextPanel(el.getAttribute('data-target'), el.checked);
-    toggleTargetContextPanel(el.getAttribute('data-context'), !el.checked);
+    toggleTargetContextPanel(el.getAttribute('data-target')!, el.checked);
+    toggleTargetContextPanel(el.getAttribute('data-context')!, !el.checked);
   }));
   queryElems<HTMLInputElement>(pageContent, '.enable-system-radio', (el) => el.addEventListener('change', () => {
-    toggleTargetContextPanel(el.getAttribute('data-target'), el.value === 'true');
-    toggleTargetContextPanel(el.getAttribute('data-context'), el.value === 'false');
+    toggleTargetContextPanel(el.getAttribute('data-target')!, el.value === 'true');
+    toggleTargetContextPanel(el.getAttribute('data-context')!, el.value === 'false');
   }));
 
   queryElems<HTMLInputElement>(pageContent, '.js-tracker-issue-style', (el) => el.addEventListener('change', () => {
     const checkedVal = el.value;
-    pageContent.querySelector('#tracker-issue-style-regex-box').classList.toggle('disabled', checkedVal !== 'regexp');
+    pageContent.querySelector('#tracker-issue-style-regex-box')!.classList.toggle('disabled', checkedVal !== 'regexp');
   }));
 }
 
diff --git a/web_src/js/features/repo-unicode-escape.ts b/web_src/js/features/repo-unicode-escape.ts
index 49e34e22cd..ff3f42095e 100644
--- a/web_src/js/features/repo-unicode-escape.ts
+++ b/web_src/js/features/repo-unicode-escape.ts
@@ -7,8 +7,8 @@ export function initUnicodeEscapeButton() {
 
     const unicodeContentSelector = btn.getAttribute('data-unicode-content-selector');
     const container = unicodeContentSelector ?
-      document.querySelector(unicodeContentSelector) :
-      btn.closest('.file-content, .non-diff-file-content');
+      document.querySelector(unicodeContentSelector)! :
+      btn.closest('.file-content, .non-diff-file-content')!;
     const fileView = container.querySelector('.file-code, .file-view') ?? container;
     if (btn.matches('.escape-button')) {
       fileView.classList.add('unicode-escaped');
diff --git a/web_src/js/features/repo-view-file-tree.ts b/web_src/js/features/repo-view-file-tree.ts
index 98ffdb8a86..8d10cdacb6 100644
--- a/web_src/js/features/repo-view-file-tree.ts
+++ b/web_src/js/features/repo-view-file-tree.ts
@@ -11,8 +11,8 @@ function isUserSignedIn() {
 }
 
 async function toggleSidebar(btn: HTMLElement) {
-  const elToggleShow = document.querySelector('.repo-view-file-tree-toggle[data-toggle-action="show"]');
-  const elFileTreeContainer = document.querySelector('.repo-view-file-tree-container');
+  const elToggleShow = document.querySelector('.repo-view-file-tree-toggle[data-toggle-action="show"]')!;
+  const elFileTreeContainer = document.querySelector('.repo-view-file-tree-container')!;
   const shouldShow = btn.getAttribute('data-toggle-action') === 'show';
   toggleElem(elFileTreeContainer, shouldShow);
   toggleElem(elToggleShow, !shouldShow);
@@ -32,7 +32,7 @@ export async function initRepoViewFileTree() {
 
   registerGlobalEventFunc('click', 'onRepoViewFileTreeToggle', toggleSidebar);
 
-  const fileTree = sidebar.querySelector('#view-file-tree');
+  const fileTree = sidebar.querySelector('#view-file-tree')!;
   createApp(ViewFileTree, {
     repoLink: fileTree.getAttribute('data-repo-link'),
     treePath: fileTree.getAttribute('data-tree-path'),
diff --git a/web_src/js/features/repo-wiki.ts b/web_src/js/features/repo-wiki.ts
index 6ae0947077..950614d57c 100644
--- a/web_src/js/features/repo-wiki.ts
+++ b/web_src/js/features/repo-wiki.ts
@@ -8,8 +8,8 @@ async function initRepoWikiFormEditor() {
   const editArea = document.querySelector<HTMLTextAreaElement>('.repository.wiki .combo-markdown-editor textarea');
   if (!editArea) return;
 
-  const form = document.querySelector('.repository.wiki.new .ui.form');
-  const editorContainer = form.querySelector<HTMLElement>('.combo-markdown-editor');
+  const form = document.querySelector('.repository.wiki.new .ui.form')!;
+  const editorContainer = form.querySelector<HTMLElement>('.combo-markdown-editor')!;
   let editor: ComboMarkdownEditor;
 
   let renderRequesting = false;
diff --git a/web_src/js/features/sshkey-helper.ts b/web_src/js/features/sshkey-helper.ts
index 860bc5b294..519bf582c0 100644
--- a/web_src/js/features/sshkey-helper.ts
+++ b/web_src/js/features/sshkey-helper.ts
@@ -2,7 +2,7 @@ export function initSshKeyFormParser() {
   // Parse SSH Key
   document.querySelector<HTMLTextAreaElement>('#ssh-key-content')?.addEventListener('input', function () {
     const arrays = this.value.split(' ');
-    const title = document.querySelector<HTMLInputElement>('#ssh-key-title');
+    const title = document.querySelector<HTMLInputElement>('#ssh-key-title')!;
     if (!title.value && arrays.length === 3 && arrays[2] !== '') {
       title.value = arrays[2];
     }
diff --git a/web_src/js/features/tablesort.ts b/web_src/js/features/tablesort.ts
index cd77eb971c..f0c57209ea 100644
--- a/web_src/js/features/tablesort.ts
+++ b/web_src/js/features/tablesort.ts
@@ -1,8 +1,8 @@
 export function initTableSort() {
   for (const header of document.querySelectorAll('th[data-sortt-asc]') || []) {
-    const sorttAsc = header.getAttribute('data-sortt-asc');
-    const sorttDesc = header.getAttribute('data-sortt-desc');
-    const sorttDefault = header.getAttribute('data-sortt-default');
+    const sorttAsc = header.getAttribute('data-sortt-asc')!;
+    const sorttDesc = header.getAttribute('data-sortt-desc')!;
+    const sorttDefault = header.getAttribute('data-sortt-default')!;
     header.addEventListener('click', () => {
       tableSort(sorttAsc, sorttDesc, sorttDefault);
     });
diff --git a/web_src/js/features/user-auth-webauthn.ts b/web_src/js/features/user-auth-webauthn.ts
index 1f336b9741..50165c3377 100644
--- a/web_src/js/features/user-auth-webauthn.ts
+++ b/web_src/js/features/user-auth-webauthn.ts
@@ -13,7 +13,7 @@ export async function initUserAuthWebAuthn() {
 
   // webauthn is only supported on secure contexts
   if (!window.isSecureContext) {
-    hideElem(elSignInPasskeyBtn);
+    if (elSignInPasskeyBtn) hideElem(elSignInPasskeyBtn);
     return;
   }
 
@@ -54,7 +54,7 @@ async function loginPasskey() {
     const clientDataJSON = new Uint8Array(credResp.clientDataJSON);
     const rawId = new Uint8Array(credential.rawId);
     const sig = new Uint8Array(credResp.signature);
-    const userHandle = new Uint8Array(credResp.userHandle);
+    const userHandle = new Uint8Array(credResp.userHandle ?? []);
 
     const res = await POST(`${appSubUrl}/user/webauthn/passkey/login`, {
       data: {
@@ -183,7 +183,7 @@ async function webauthnRegistered(newCredential: any) { // TODO: Credential type
 }
 
 function webAuthnError(errorType: string, message:string = '') {
-  const elErrorMsg = document.querySelector(`#webauthn-error-msg`);
+  const elErrorMsg = document.querySelector(`#webauthn-error-msg`)!;
 
   if (errorType === 'general') {
     elErrorMsg.textContent = message || 'unknown error';
@@ -228,7 +228,7 @@ export function initUserAuthWebAuthnRegister() {
 }
 
 async function webAuthnRegisterRequest() {
-  const elNickname = document.querySelector<HTMLInputElement>('#nickname');
+  const elNickname = document.querySelector<HTMLInputElement>('#nickname')!;
 
   const formData = new FormData();
   formData.append('name', elNickname.value);
@@ -246,7 +246,7 @@ async function webAuthnRegisterRequest() {
   }
 
   const options = await res.json();
-  elNickname.closest('div.field').classList.remove('error');
+  elNickname.closest('div.field')!.classList.remove('error');
 
   options.publicKey.challenge = decodeURLEncodedBase64(options.publicKey.challenge);
   options.publicKey.user.id = decodeURLEncodedBase64(options.publicKey.user.id);
diff --git a/web_src/js/features/user-auth.ts b/web_src/js/features/user-auth.ts
index b716287ff2..24c34b4aa5 100644
--- a/web_src/js/features/user-auth.ts
+++ b/web_src/js/features/user-auth.ts
@@ -8,7 +8,7 @@ export function initUserCheckAppUrl() {
 export function initUserAuthOauth2() {
   const outer = document.querySelector('#oauth2-login-navigator');
   if (!outer) return;
-  const inner = document.querySelector('#oauth2-login-navigator-inner');
+  const inner = document.querySelector('#oauth2-login-navigator-inner')!;
 
   checkAppUrl();
 
diff --git a/web_src/js/features/user-settings.ts b/web_src/js/features/user-settings.ts
index 6fbb56e540..ef4d5f25bd 100644
--- a/web_src/js/features/user-settings.ts
+++ b/web_src/js/features/user-settings.ts
@@ -6,9 +6,9 @@ export function initUserSettings() {
   const usernameInput = document.querySelector<HTMLInputElement>('#username');
   if (!usernameInput) return;
   usernameInput.addEventListener('input', function () {
-    const prompt = document.querySelector('#name-change-prompt');
-    const promptRedirect = document.querySelector('#name-change-redirect-prompt');
-    if (this.value.toLowerCase() !== this.getAttribute('data-name').toLowerCase()) {
+    const prompt = document.querySelector('#name-change-prompt')!;
+    const promptRedirect = document.querySelector('#name-change-redirect-prompt')!;
+    if (this.value.toLowerCase() !== this.getAttribute('data-name')!.toLowerCase()) {
       showElem(prompt);
       showElem(promptRedirect);
     } else {
diff --git a/web_src/js/htmx.ts b/web_src/js/htmx.ts
index 9d433dfd57..acc3df1d81 100644
--- a/web_src/js/htmx.ts
+++ b/web_src/js/htmx.ts
@@ -15,12 +15,12 @@ export function initHtmx() {
   // https://htmx.org/events/#htmx:sendError
   document.body.addEventListener('htmx:sendError', (event: Partial<HtmxEvent>) => {
     // TODO: add translations
-    showErrorToast(`Network error when calling ${event.detail.requestConfig.path}`);
+    showErrorToast(`Network error when calling ${event.detail!.requestConfig.path}`);
   });
 
   // https://htmx.org/events/#htmx:responseError
   document.body.addEventListener('htmx:responseError', (event: Partial<HtmxEvent>) => {
     // TODO: add translations
-    showErrorToast(`Error ${event.detail.xhr.status} when calling ${event.detail.requestConfig.path}`);
+    showErrorToast(`Error ${event.detail!.xhr.status} when calling ${event.detail!.requestConfig.path}`);
   });
 }
diff --git a/web_src/js/markup/anchors.ts b/web_src/js/markup/anchors.ts
index a0d49911fe..b5d90e565c 100644
--- a/web_src/js/markup/anchors.ts
+++ b/web_src/js/markup/anchors.ts
@@ -7,7 +7,7 @@ const hasPrefix = (str: string): boolean => str.startsWith('user-content-');
 // scroll to anchor while respecting the `user-content` prefix that exists on the target
 function scrollToAnchor(encodedId?: string): void {
   // FIXME: need to rewrite this function with new a better markup anchor generation logic, too many tricks here
-  let elemId: string;
+  let elemId: string | undefined;
   try {
     elemId = decodeURIComponent(encodedId ?? '');
   } catch {} // ignore the errors, since the "encodedId" is from user's input
@@ -44,7 +44,7 @@ export function initMarkupAnchors(): void {
     // remove `user-content-` prefix from links so they don't show in url bar when clicked
     for (const a of markupEl.querySelectorAll<HTMLAnchorElement>('a[href^="#"]')) {
       const href = a.getAttribute('href');
-      if (!href.startsWith('#user-content-')) continue;
+      if (!href?.startsWith('#user-content-')) continue;
       a.setAttribute('href', `#${removePrefix(href.substring(1))}`);
     }
 
diff --git a/web_src/js/markup/codecopy.ts b/web_src/js/markup/codecopy.ts
index b37aa3a236..a6e07a3cf6 100644
--- a/web_src/js/markup/codecopy.ts
+++ b/web_src/js/markup/codecopy.ts
@@ -17,6 +17,6 @@ export function initMarkupCodeCopy(elMarkup: HTMLElement): void {
     btn.setAttribute('data-clipboard-text', el.textContent.replace(/\r?\n$/, ''));
     // we only want to use `.code-block-container` if it exists, no matter `.code-block` exists or not.
     const btnContainer = el.closest('.code-block-container') ?? el.closest('.code-block');
-    btnContainer.append(btn);
+    btnContainer!.append(btn);
   });
 }
diff --git a/web_src/js/markup/mermaid.ts b/web_src/js/markup/mermaid.ts
index ddd53a7035..e1c2935f23 100644
--- a/web_src/js/markup/mermaid.ts
+++ b/web_src/js/markup/mermaid.ts
@@ -23,7 +23,7 @@ export async function initMarkupCodeMermaid(elMarkup: HTMLElement): Promise<void
     });
 
     const pre = el.closest('pre');
-    if (pre.hasAttribute('data-render-done')) return;
+    if (!pre || pre.hasAttribute('data-render-done')) return;
 
     const source = el.textContent;
     if (mermaidMaxSourceCharacters >= 0 && source.length > mermaidMaxSourceCharacters) {
diff --git a/web_src/js/markup/refissue.ts b/web_src/js/markup/refissue.ts
index 5a05de84fe..30d8924a1d 100644
--- a/web_src/js/markup/refissue.ts
+++ b/web_src/js/markup/refissue.ts
@@ -16,7 +16,7 @@ export function showMarkupRefIssuePopup(e: MouseEvent | FocusEvent) {
   if (getAttachedTippyInstance(refIssue)) return;
   if (refIssue.classList.contains('ref-external-issue')) return;
 
-  const issuePathInfo = parseIssueHref(refIssue.getAttribute('href'));
+  const issuePathInfo = parseIssueHref(refIssue.getAttribute('href')!);
   if (!issuePathInfo.ownerName) return;
 
   const el = document.createElement('div');
diff --git a/web_src/js/markup/render-iframe.ts b/web_src/js/markup/render-iframe.ts
index 842c2be2d6..35649ee2ee 100644
--- a/web_src/js/markup/render-iframe.ts
+++ b/web_src/js/markup/render-iframe.ts
@@ -2,7 +2,7 @@ import {generateElemId, queryElemChildren} from '../utils/dom.ts';
 import {isDarkTheme} from '../utils.ts';
 
 export async function loadRenderIframeContent(iframe: HTMLIFrameElement) {
-  const iframeSrcUrl = iframe.getAttribute('data-src');
+  const iframeSrcUrl = iframe.getAttribute('data-src')!;
   if (!iframe.id) iframe.id = generateElemId('gitea-iframe-');
 
   window.addEventListener('message', (e) => {
diff --git a/web_src/js/markup/tasklist.ts b/web_src/js/markup/tasklist.ts
index dc4bbd9519..7f3417c2bb 100644
--- a/web_src/js/markup/tasklist.ts
+++ b/web_src/js/markup/tasklist.ts
@@ -13,7 +13,7 @@ const preventListener = (e: Event) => e.preventDefault();
 export function initMarkupTasklist(elMarkup: HTMLElement): void {
   if (!elMarkup.matches('[data-can-edit=true]')) return;
 
-  const container = elMarkup.parentNode;
+  const container = elMarkup.parentNode!;
   const checkboxes = elMarkup.querySelectorAll<HTMLInputElement>(`.task-list-item input[type=checkbox]`);
 
   for (const checkbox of checkboxes) {
@@ -24,9 +24,9 @@ export function initMarkupTasklist(elMarkup: HTMLElement): void {
     checkbox.setAttribute('data-editable', 'true');
     checkbox.addEventListener('input', async () => {
       const checkboxCharacter = checkbox.checked ? 'x' : ' ';
-      const position = parseInt(checkbox.getAttribute('data-source-position')) + 1;
+      const position = parseInt(checkbox.getAttribute('data-source-position')!) + 1;
 
-      const rawContent = container.querySelector('.raw-content');
+      const rawContent = container.querySelector('.raw-content')!;
       const oldContent = rawContent.textContent;
 
       const encoder = new TextEncoder();
@@ -53,10 +53,10 @@ export function initMarkupTasklist(elMarkup: HTMLElement): void {
       }
 
       try {
-        const editContentZone = container.querySelector<HTMLDivElement>('.edit-content-zone');
-        const updateUrl = editContentZone.getAttribute('data-update-url');
-        const context = editContentZone.getAttribute('data-context');
-        const contentVersion = editContentZone.getAttribute('data-content-version');
+        const editContentZone = container.querySelector<HTMLDivElement>('.edit-content-zone')!;
+        const updateUrl = editContentZone.getAttribute('data-update-url')!;
+        const context = editContentZone.getAttribute('data-context')!;
+        const contentVersion = editContentZone.getAttribute('data-content-version')!;
 
         const requestBody = new FormData();
         requestBody.append('ignore_attachments', 'true');
diff --git a/web_src/js/modules/diff-file.ts b/web_src/js/modules/diff-file.ts
index f944b8120c..25fc327a54 100644
--- a/web_src/js/modules/diff-file.ts
+++ b/web_src/js/modules/diff-file.ts
@@ -12,7 +12,7 @@ export type DiffTreeEntry = {
   DiffStatus: DiffStatus,
   EntryMode: string,
   IsViewed: boolean,
-  Children: DiffTreeEntry[],
+  Children: DiffTreeEntry[] | null,
   FileIcon: string,
   ParentEntry?: DiffTreeEntry,
 };
@@ -25,7 +25,7 @@ type DiffFileTree = {
   folderIcon: string;
   folderOpenIcon: string;
   diffFileTree: DiffFileTreeData;
-  fullNameMap?: Record<string, DiffTreeEntry>
+  fullNameMap: Record<string, DiffTreeEntry>
   fileTreeIsVisible: boolean;
   selectedItem: string;
 };
diff --git a/web_src/js/modules/fetch.ts b/web_src/js/modules/fetch.ts
index 0c078bfe78..14e7954116 100644
--- a/web_src/js/modules/fetch.ts
+++ b/web_src/js/modules/fetch.ts
@@ -10,8 +10,8 @@ const safeMethods = new Set(['GET', 'HEAD', 'OPTIONS', 'TRACE']);
 // which will automatically set an appropriate headers. For json content, only object
 // and array types are currently supported.
 export function request(url: string, {method = 'GET', data, headers = {}, ...other}: RequestOpts = {}): Promise<Response> {
-  let body: string | FormData | URLSearchParams;
-  let contentType: string;
+  let body: string | FormData | URLSearchParams | undefined;
+  let contentType: string | undefined;
   if (data instanceof FormData || data instanceof URLSearchParams) {
     body = data;
   } else if (isObject(data) || Array.isArray(data)) {
diff --git a/web_src/js/modules/fomantic/tab.ts b/web_src/js/modules/fomantic/tab.ts
index ceae9dd098..b9578c9637 100644
--- a/web_src/js/modules/fomantic/tab.ts
+++ b/web_src/js/modules/fomantic/tab.ts
@@ -7,7 +7,7 @@ export function initFomanticTab() {
       const tabName = elBtn.getAttribute('data-tab');
       if (!tabName) continue;
       elBtn.addEventListener('click', () => {
-        const elTab = document.querySelector(`.ui.tab[data-tab="${tabName}"]`);
+        const elTab = document.querySelector(`.ui.tab[data-tab="${tabName}"]`)!;
         queryElemSiblings(elTab, `.ui.tab`, (el) => el.classList.remove('active'));
         queryElemSiblings(elBtn, `[data-tab]`, (el) => el.classList.remove('active'));
         elBtn.classList.add('active');
diff --git a/web_src/js/modules/observer.ts b/web_src/js/modules/observer.ts
index 47c276c866..1bbf304b27 100644
--- a/web_src/js/modules/observer.ts
+++ b/web_src/js/modules/observer.ts
@@ -42,7 +42,7 @@ export function registerGlobalInitFunc<T extends HTMLElement>(name: string, hand
 }
 
 function callGlobalInitFunc(el: HTMLElement) {
-  const initFunc = el.getAttribute('data-global-init');
+  const initFunc = el.getAttribute('data-global-init')!;
   const func = globalInitFuncs[initFunc];
   if (!func) throw new Error(`Global init function "${initFunc}" not found`);
 
@@ -66,7 +66,7 @@ function attachGlobalEvents() {
   });
 }
 
-export function initGlobalSelectorObserver(perfTracer?: InitPerformanceTracer): void {
+export function initGlobalSelectorObserver(perfTracer: InitPerformanceTracer | null): void {
   if (globalSelectorObserverInited) throw new Error('initGlobalSelectorObserver() already called');
   globalSelectorObserverInited = true;
 
diff --git a/web_src/js/modules/sortable.ts b/web_src/js/modules/sortable.ts
index b700633cbb..d03871bb04 100644
--- a/web_src/js/modules/sortable.ts
+++ b/web_src/js/modules/sortable.ts
@@ -9,12 +9,12 @@ export async function createSortable(el: Element, opts: {handle?: string} & Sort
     animation: 150,
     ghostClass: 'card-ghost',
     onChoose: (e: SortableEvent) => {
-      const handle = opts.handle ? e.item.querySelector(opts.handle) : e.item;
+      const handle = opts.handle ? e.item.querySelector(opts.handle)! : e.item;
       handle.classList.add('tw-cursor-grabbing');
       opts.onChoose?.(e);
     },
     onUnchoose: (e: SortableEvent) => {
-      const handle = opts.handle ? e.item.querySelector(opts.handle) : e.item;
+      const handle = opts.handle ? e.item.querySelector(opts.handle)! : e.item;
       handle.classList.remove('tw-cursor-grabbing');
       opts.onUnchoose?.(e);
     },
diff --git a/web_src/js/modules/tippy.ts b/web_src/js/modules/tippy.ts
index 6f42a4f987..d616216ab5 100644
--- a/web_src/js/modules/tippy.ts
+++ b/web_src/js/modules/tippy.ts
@@ -68,7 +68,7 @@ export function createTippy(target: Element, opts: TippyOpts = {}): Instance {
  *
  * Note: "tooltip" doesn't equal to "tippy". "tooltip" means a auto-popup content, it just uses tippy as the implementation.
  */
-function attachTooltip(target: Element, content: Content = null): Instance {
+function attachTooltip(target: Element, content: Content | null = null): Instance | null {
   switchTitleToTooltip(target);
 
   content = content ?? target.getAttribute('data-tooltip-content');
@@ -125,7 +125,7 @@ function switchTitleToTooltip(target: Element): void {
  * The tippy by default uses "mouseenter" event to show, so we use "mouseover" event to switch to tippy
  */
 function lazyTooltipOnMouseHover(this: HTMLElement, e: Event): void {
-  e.target.removeEventListener('mouseover', lazyTooltipOnMouseHover, true);
+  (e.target as HTMLElement).removeEventListener('mouseover', lazyTooltipOnMouseHover, true);
   attachTooltip(this);
 }
 
@@ -184,7 +184,7 @@ export function initGlobalTooltips(): void {
 export function showTemporaryTooltip(target: Element, content: Content): void {
   // if the target is inside a dropdown or tippy popup, the menu will be hidden soon
   // so display the tooltip on the "aria-controls" element or dropdown instead
-  let refClientRect: DOMRect;
+  let refClientRect: DOMRect | undefined;
   const popupTippyId = target.closest(`[data-tippy-root]`)?.id;
   if (popupTippyId) {
     // for example, the "Copy Permalink" button in the "File View" page for the selected lines
diff --git a/web_src/js/modules/toast.ts b/web_src/js/modules/toast.ts
index 395f31bc82..c551381bab 100644
--- a/web_src/js/modules/toast.ts
+++ b/web_src/js/modules/toast.ts
@@ -52,7 +52,7 @@ function showToast(message: string, level: Intent, {gravity, position, duration,
   if (preventDuplicates) {
     const toastEl = parent.querySelector(`:scope > .toastify.on[data-toast-unique-key="${CSS.escape(duplicateKey)}"]`);
     if (toastEl) {
-      const toastDupNumEl = toastEl.querySelector('.toast-duplicate-number');
+      const toastDupNumEl = toastEl.querySelector('.toast-duplicate-number')!;
       showElem(toastDupNumEl);
       toastDupNumEl.textContent = String(Number(toastDupNumEl.textContent) + 1);
       animateOnce(toastDupNumEl, 'pulse-1p5-200');
@@ -77,9 +77,10 @@ function showToast(message: string, level: Intent, {gravity, position, duration,
   });
 
   toast.showToast();
-  toast.toastElement.querySelector('.toast-close').addEventListener('click', () => toast.hideToast());
-  toast.toastElement.setAttribute('data-toast-unique-key', duplicateKey);
-  (toast.toastElement as ToastifyElement)._giteaToastifyInstance = toast;
+  const el = toast.toastElement as ToastifyElement;
+  el.querySelector('.toast-close')!.addEventListener('click', () => toast.hideToast());
+  el.setAttribute('data-toast-unique-key', duplicateKey);
+  el._giteaToastifyInstance = toast;
   return toast;
 }
 
diff --git a/web_src/js/standalone/devtest.ts b/web_src/js/standalone/devtest.ts
index faa38dc467..39c41db042 100644
--- a/web_src/js/standalone/devtest.ts
+++ b/web_src/js/standalone/devtest.ts
@@ -1,11 +1,13 @@
-import {showInfoToast, showWarningToast, showErrorToast} from '../modules/toast.ts';
+import {showInfoToast, showWarningToast, showErrorToast, type Toast} from '../modules/toast.ts';
+
+type LevelMap = Record<string, (message: string) => Toast | null>;
 
 function initDevtestToast() {
-  const levelMap: Record<string, any> = {info: showInfoToast, warning: showWarningToast, error: showErrorToast};
+  const levelMap: LevelMap = {info: showInfoToast, warning: showWarningToast, error: showErrorToast};
   for (const el of document.querySelectorAll('.toast-test-button')) {
     el.addEventListener('click', () => {
-      const level = el.getAttribute('data-toast-level');
-      const message = el.getAttribute('data-toast-message');
+      const level = el.getAttribute('data-toast-level')!;
+      const message = el.getAttribute('data-toast-message')!;
       levelMap[level](message);
     });
   }
diff --git a/web_src/js/standalone/external-render-iframe.ts b/web_src/js/standalone/external-render-iframe.ts
index 3abf128bc3..8776710cda 100644
--- a/web_src/js/standalone/external-render-iframe.ts
+++ b/web_src/js/standalone/external-render-iframe.ts
@@ -35,7 +35,7 @@ function mainExternalRenderIframe() {
     // safe links: "./any", "../any", "/any", "//host/any", "http://host/any", "https://host/any"
     if (href.startsWith('.') || href.startsWith('/') || href.startsWith('http://') || href.startsWith('https://')) {
       e.preventDefault();
-      openIframeLink(href, el.getAttribute('target'));
+      openIframeLink(href, el.getAttribute('target')!);
     }
   });
 }
diff --git a/web_src/js/standalone/swagger.ts b/web_src/js/standalone/swagger.ts
index 4b17ba21a8..62d1a56306 100644
--- a/web_src/js/standalone/swagger.ts
+++ b/web_src/js/standalone/swagger.ts
@@ -2,7 +2,7 @@ import SwaggerUI from 'swagger-ui-dist/swagger-ui-es-bundle.js';
 import 'swagger-ui-dist/swagger-ui.css';
 
 window.addEventListener('load', async () => {
-  const url = document.querySelector('#swagger-ui').getAttribute('data-source');
+  const url = document.querySelector('#swagger-ui')!.getAttribute('data-source')!;
   const res = await fetch(url);
   const spec = await res.json();
 
diff --git a/web_src/js/types.ts b/web_src/js/types.ts
index 31f41766e7..2f76a58c9d 100644
--- a/web_src/js/types.ts
+++ b/web_src/js/types.ts
@@ -41,7 +41,7 @@ export type IssuePathInfo = {
   ownerName: string,
   repoName: string,
   pathType: string,
-  indexString?: string,
+  indexString: string,
 };
 
 export type IssuePageInfo = {
diff --git a/web_src/js/utils.ts b/web_src/js/utils.ts
index c3db28c0e2..afe8c8f472 100644
--- a/web_src/js/utils.ts
+++ b/web_src/js/utils.ts
@@ -23,7 +23,7 @@ export function extname(path: string): string {
 }
 
 /** test whether a variable is an object */
-export function isObject(obj: any): boolean {
+export function isObject<T = Record<string, any>>(obj: any): obj is T {
   return Object.prototype.toString.call(obj) === '[object Object]';
 }
 
@@ -60,9 +60,9 @@ export function parseRepoOwnerPathInfo(pathname: string): RepoOwnerPathInfo {
 export function parseIssuePageInfo(): IssuePageInfo {
   const el = document.querySelector('#issue-page-info');
   return {
-    issueNumber: parseInt(el?.getAttribute('data-issue-index')),
+    issueNumber: parseInt(el?.getAttribute('data-issue-index') || ''),
     issueDependencySearchType: el?.getAttribute('data-issue-dependency-search-type') || '',
-    repoId: parseInt(el?.getAttribute('data-issue-repo-id')),
+    repoId: parseInt(el?.getAttribute('data-issue-repo-id') || ''),
     repoLink: el?.getAttribute('data-issue-repo-link') || '',
   };
 }
@@ -93,10 +93,14 @@ export function blobToDataURI(blob: Blob): Promise<string> {
     try {
       const reader = new FileReader();
       reader.addEventListener('load', (e) => {
-        resolve(e.target.result as string);
+        if (e.target) {
+          resolve(e.target.result as string);
+        } else {
+          reject(new Error('blobToDataURI: FileReader failed'));
+        }
       });
       reader.addEventListener('error', () => {
-        reject(new Error('FileReader failed'));
+        reject(new Error('blobToDataURI: FileReader error'));
       });
       reader.readAsDataURL(blob);
     } catch (err) {
@@ -116,9 +120,10 @@ export function convertImage(blob: Blob, mime: string): Promise<Blob> {
           canvas.width = img.naturalWidth;
           canvas.height = img.naturalHeight;
           const context = canvas.getContext('2d');
+          if (!context) return reject(new Error('convertImage: no context'));
           context.drawImage(img, 0, 0);
           canvas.toBlob((blob) => {
-            if (!(blob instanceof Blob)) return reject(new Error('imageBlobToPng failed'));
+            if (!(blob instanceof Blob)) return reject(new Error('convertImage: toBlob failed'));
             resolve(blob);
           }, mime);
         } catch (err) {
@@ -126,7 +131,7 @@ export function convertImage(blob: Blob, mime: string): Promise<Blob> {
         }
       });
       img.addEventListener('error', () => {
-        reject(new Error('imageBlobToPng failed'));
+        reject(new Error('convertImage: image failed to load'));
       });
       img.src = await blobToDataURI(blob);
     } catch (err) {
@@ -179,26 +184,25 @@ export function sleep(ms: number): Promise<void> {
 }
 
 export function isImageFile({name, type}: {name?: string, type?: string}): boolean {
-  return /\.(avif|jpe?g|png|gif|webp|svg|heic)$/i.test(name || '') || type?.startsWith('image/');
+  return Boolean(/\.(avif|jpe?g|png|gif|webp|svg|heic)$/i.test(name || '') || type?.startsWith('image/'));
 }
 
 export function isVideoFile({name, type}: {name?: string, type?: string}): boolean {
-  return /\.(mpe?g|mp4|mkv|webm)$/i.test(name || '') || type?.startsWith('video/');
+  return Boolean(/\.(mpe?g|mp4|mkv|webm)$/i.test(name || '') || type?.startsWith('video/'));
 }
 
 export function toggleFullScreen(fullscreenElementsSelector: string, isFullScreen: boolean, sourceParentSelector?: string): void {
   // hide other elements
-  const headerEl = document.querySelector('#navbar');
-  const contentEl = document.querySelector('.page-content');
-  const footerEl = document.querySelector('.page-footer');
+  const headerEl = document.querySelector('#navbar')!;
+  const contentEl = document.querySelector('.page-content')!;
+  const footerEl = document.querySelector('.page-footer')!;
   toggleElem(headerEl, !isFullScreen);
   toggleElem(contentEl, !isFullScreen);
   toggleElem(footerEl, !isFullScreen);
 
-  const sourceParentEl = sourceParentSelector ? document.querySelector(sourceParentSelector) : contentEl;
-
-  const fullScreenEl = document.querySelector(fullscreenElementsSelector);
-  const outerEl = document.querySelector('.full.height');
+  const sourceParentEl = sourceParentSelector ? document.querySelector(sourceParentSelector)! : contentEl;
+  const fullScreenEl = document.querySelector(fullscreenElementsSelector)!;
+  const outerEl = document.querySelector('.full.height')!;
   toggleElemClass(fullscreenElementsSelector, 'fullscreen', isFullScreen);
   if (isFullScreen) {
     outerEl.append(fullScreenEl);
diff --git a/web_src/js/utils/dom.test.ts b/web_src/js/utils/dom.test.ts
index 057ea9808c..15cde00ae4 100644
--- a/web_src/js/utils/dom.test.ts
+++ b/web_src/js/utils/dom.test.ts
@@ -28,11 +28,11 @@ test('querySingleVisibleElem', () => {
   let el = createElementFromHTML('<div></div>');
   expect(querySingleVisibleElem(el, 'span')).toBeNull();
   el = createElementFromHTML('<div><span>foo</span></div>');
-  expect(querySingleVisibleElem(el, 'span').textContent).toEqual('foo');
+  expect(querySingleVisibleElem(el, 'span')!.textContent).toEqual('foo');
   el = createElementFromHTML('<div><span style="display: none;">foo</span><span>bar</span></div>');
-  expect(querySingleVisibleElem(el, 'span').textContent).toEqual('bar');
+  expect(querySingleVisibleElem(el, 'span')!.textContent).toEqual('bar');
   el = createElementFromHTML('<div><span class="some-class tw-hidden">foo</span><span>bar</span></div>');
-  expect(querySingleVisibleElem(el, 'span').textContent).toEqual('bar');
+  expect(querySingleVisibleElem(el, 'span')!.textContent).toEqual('bar');
   el = createElementFromHTML('<div><span>foo</span><span>bar</span></div>');
   expect(() => querySingleVisibleElem(el, 'span')).toThrowError('Expected exactly one visible element');
 });
diff --git a/web_src/js/utils/dom.ts b/web_src/js/utils/dom.ts
index 3a1b74c1db..dc504b7056 100644
--- a/web_src/js/utils/dom.ts
+++ b/web_src/js/utils/dom.ts
@@ -7,7 +7,6 @@ type ArrayLikeIterable<T> = ArrayLike<T> & Iterable<T>; // for NodeListOf and Ar
 type ElementArg = Element | string | ArrayLikeIterable<Element> | ReturnType<typeof $>;
 type ElementsCallback<T extends Element> = (el: T) => Promisable<any>;
 type ElementsCallbackWithArgs = (el: Element, ...args: any[]) => Promisable<any>;
-export type DOMEvent<E extends Event, T extends Element = HTMLElement> = E & {target: Partial<T>;};
 
 function elementsCall(el: ElementArg, func: ElementsCallbackWithArgs, ...args: any[]): ArrayLikeIterable<Element> {
   if (typeof el === 'string' || el instanceof String) {
@@ -65,6 +64,7 @@ function applyElemsCallback<T extends Element>(elems: ArrayLikeIterable<T>, fn?:
 }
 
 export function queryElemSiblings<T extends Element>(el: Element, selector = '*', fn?: ElementsCallback<T>): ArrayLikeIterable<T> {
+  if (!el.parentNode) return [];
   const elems = Array.from(el.parentNode.children) as T[];
   return applyElemsCallback<T>(elems.filter((child: Element) => {
     return child !== el && child.matches(selector);
@@ -125,10 +125,10 @@ export function isDocumentFragmentOrElementNode(el: Node) {
 export function autosize(textarea: HTMLTextAreaElement, {viewportMarginBottom = 0}: {viewportMarginBottom?: number} = {}) {
   let isUserResized = false;
   // lastStyleHeight and initialStyleHeight are CSS values like '100px'
-  let lastMouseX: number;
-  let lastMouseY: number;
-  let lastStyleHeight: string;
-  let initialStyleHeight: string;
+  let lastMouseX: number | undefined;
+  let lastMouseY: number | undefined;
+  let lastStyleHeight: string | undefined;
+  let initialStyleHeight: string | undefined;
 
   function onUserResize(event: MouseEvent) {
     if (isUserResized) return;
@@ -153,7 +153,8 @@ export function autosize(textarea: HTMLTextAreaElement, {viewportMarginBottom =
       el = el.offsetParent as HTMLTextAreaElement;
     }
 
-    const top = offsetTop - document.defaultView.scrollY;
+    const scrollY = document.defaultView ? document.defaultView.scrollY : 0;
+    const top = offsetTop - scrollY;
     const bottom = document.documentElement.clientHeight - (top + textarea.offsetHeight);
     return {top, bottom};
   }
@@ -265,10 +266,10 @@ export function submitEventSubmitter(e: any) {
   return needSubmitEventPolyfill ? (e.target._submitter || null) : e.submitter;
 }
 
-function submitEventPolyfillListener(e: DOMEvent<Event>) {
-  const form = e.target.closest('form');
+function submitEventPolyfillListener(e: Event) {
+  const form = (e.target as HTMLElement).closest('form');
   if (!form) return;
-  form._submitter = e.target.closest('button:not([type]), button[type="submit"], input[type="submit"]');
+  form._submitter = (e.target as HTMLElement).closest('button:not([type]), button[type="submit"], input[type="submit"]');
 }
 
 export function initSubmitEventPolyfill() {
@@ -283,7 +284,7 @@ export function isElemVisible(el: HTMLElement): boolean {
   // This function DOESN'T account for all possible visibility scenarios, its behavior is covered by the tests of "querySingleVisibleElem"
   if (!el) return false;
   // checking el.style.display is not necessary for browsers, but it is required by some tests with happy-dom because happy-dom doesn't really do layout
-  return !el.classList.contains('tw-hidden') && (el.offsetWidth || el.offsetHeight || el.getClientRects().length) && el.style.display !== 'none';
+  return Boolean(!el.classList.contains('tw-hidden') && (el.offsetWidth || el.offsetHeight || el.getClientRects().length) && el.style.display !== 'none');
 }
 
 export function createElementFromHTML<T extends HTMLElement>(htmlString: string): T {
@@ -293,14 +294,14 @@ export function createElementFromHTML<T extends HTMLElement>(htmlString: string)
   if (htmlString.startsWith('<tr')) {
     const container = document.createElement('table');
     container.innerHTML = htmlString;
-    return container.querySelector<T>('tr');
+    return container.querySelector<T>('tr')!;
   }
   const div = document.createElement('div');
   div.innerHTML = htmlString;
   return div.firstChild as T;
 }
 
-export function createElementFromAttrs(tagName: string, attrs: Record<string, any>, ...children: (Node | string)[]): HTMLElement {
+export function createElementFromAttrs(tagName: string, attrs: Record<string, any> | null, ...children: (Node | string)[]): HTMLElement {
   const el = document.createElement(tagName);
   for (const [key, value] of Object.entries(attrs || {})) {
     if (value === undefined || value === null) continue;
diff --git a/web_src/js/webcomponents/absolute-date.ts b/web_src/js/webcomponents/absolute-date.ts
index 23a8606673..5ab4deaa14 100644
--- a/web_src/js/webcomponents/absolute-date.ts
+++ b/web_src/js/webcomponents/absolute-date.ts
@@ -15,15 +15,17 @@ window.customElements.define('absolute-date', class extends HTMLElement {
   initialized = false;
 
   update = () => {
-    const opt: Record<string, string> = {};
+    const opts: Record<string, string> = {};
     for (const attr of ['year', 'month', 'weekday', 'day']) {
-      if (this.getAttribute(attr)) opt[attr] = this.getAttribute(attr);
+      if (this.getAttribute(attr)) {
+        opts[attr] = this.getAttribute(attr)!;
+      }
     }
     const lang = this.closest('[lang]')?.getAttribute('lang') ||
       this.ownerDocument.documentElement.getAttribute('lang') || '';
 
     if (!this.shadowRoot) this.attachShadow({mode: 'open'});
-    this.shadowRoot.textContent = toAbsoluteLocaleDate(this.getAttribute('date'), lang, opt);
+    this.shadowRoot!.textContent = toAbsoluteLocaleDate(this.getAttribute('date')!, lang, opts);
   };
 
   attributeChangedCallback(_name: string, oldValue: string | null, newValue: string | null) {
diff --git a/web_src/js/webcomponents/origin-url.ts b/web_src/js/webcomponents/origin-url.ts
index dbb910ce6c..e39d3ad713 100644
--- a/web_src/js/webcomponents/origin-url.ts
+++ b/web_src/js/webcomponents/origin-url.ts
@@ -2,6 +2,6 @@ import {toOriginUrl} from '../utils/url.ts';
 
 window.customElements.define('origin-url', class extends HTMLElement {
   connectedCallback() {
-    this.textContent = toOriginUrl(this.getAttribute('data-url'));
+    this.textContent = toOriginUrl(this.getAttribute('data-url')!);
   }
 });
diff --git a/web_src/js/webcomponents/overflow-menu.ts b/web_src/js/webcomponents/overflow-menu.ts
index ae93f2b758..b1294eae3a 100644
--- a/web_src/js/webcomponents/overflow-menu.ts
+++ b/web_src/js/webcomponents/overflow-menu.ts
@@ -6,7 +6,7 @@ import octiconKebabHorizontal from '../../../public/assets/img/svg/octicon-kebab
 window.customElements.define('overflow-menu', class extends HTMLElement {
   tippyContent: HTMLDivElement;
   tippyItems: Array<HTMLElement>;
-  button: HTMLButtonElement;
+  button: HTMLButtonElement | null;
   menuItemsEl: HTMLElement;
   resizeObserver: ResizeObserver;
   mutationObserver: MutationObserver;
@@ -38,8 +38,8 @@ window.customElements.define('overflow-menu', class extends HTMLElement {
         } else if (e.key === 'Escape') {
           e.preventDefault();
           e.stopPropagation();
-          this.button._tippy.hide();
-          this.button.focus();
+          this.button?._tippy.hide();
+          this.button?.focus();
         } else if (e.key === ' ' || e.code === 'Enter') {
           if (document.activeElement?.matches('[role="menuitem"]')) {
             e.preventDefault();
@@ -50,7 +50,7 @@ window.customElements.define('overflow-menu', class extends HTMLElement {
           if (document.activeElement?.matches('.tippy-target')) {
             e.preventDefault();
             e.stopPropagation();
-            document.activeElement.querySelector<HTMLElement>('[role="menuitem"]:first-of-type').focus();
+            document.activeElement.querySelector<HTMLElement>('[role="menuitem"]:first-of-type')?.focus();
           } else if (document.activeElement?.matches('[role="menuitem"]')) {
             e.preventDefault();
             e.stopPropagation();
@@ -60,7 +60,7 @@ window.customElements.define('overflow-menu', class extends HTMLElement {
           if (document.activeElement?.matches('.tippy-target')) {
             e.preventDefault();
             e.stopPropagation();
-            document.activeElement.querySelector<HTMLElement>('[role="menuitem"]:last-of-type').focus();
+            document.activeElement.querySelector<HTMLElement>('[role="menuitem"]:last-of-type')?.focus();
           } else if (document.activeElement?.matches('[role="menuitem"]')) {
             e.preventDefault();
             e.stopPropagation();
@@ -170,7 +170,7 @@ window.customElements.define('overflow-menu', class extends HTMLElement {
       for (const item of this.querySelectorAll('.item')) {
         for (const child of item.childNodes) {
           if (child.nodeType === Node.TEXT_NODE) {
-            const text = child.textContent.trim(); // whitespace is insignificant inside flexbox
+            const text = child.textContent?.trim(); // whitespace is insignificant inside flexbox
             if (!text) continue;
             const span = document.createElement('span');
             span.classList.add('resize-for-semibold');

From 97cb4409fbd592fe5179497398ce52ee5c9de06f Mon Sep 17 00:00:00 2001
From: GiteaBot <teabot@gitea.io>
Date: Thu, 4 Dec 2025 00:38:21 +0000
Subject: [PATCH 10/15] [skip ci] Updated translations via Crowdin

---
 options/locale/locale_ja-JP.ini | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
index 32d7b51ae9..2e28f5a13c 100644
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@@ -1354,8 +1354,11 @@ editor.this_file_locked=ファイルはロックされています
 editor.must_be_on_a_branch=このファイルを変更したり変更の提案をするには、ブランチ上にいる必要があります。
 editor.fork_before_edit=このファイルを変更したり変更の提案をするには、リポジトリをフォークする必要があります。
 editor.delete_this_file=ファイルを削除
+editor.delete_this_directory=ディレクトリを削除
 editor.must_have_write_access=このファイルを変更したり変更の提案をするには、書き込み権限が必要です。
 editor.file_delete_success=ファイル "%s" を削除しました。
+editor.directory_delete_success=ディレクトリ "%s" を削除しました。
+editor.delete_directory=ディレクトリ'%s'を削除
 editor.name_your_file=ファイル名を指定…
 editor.filename_help=ディレクトリを追加するにはディレクトリ名に続けてスラッシュ('/')を入力します。 ディレクトリを削除するには入力欄の先頭でbackspaceキーを押します。
 editor.or=または
@@ -1482,6 +1485,7 @@ projects.column.new_submit=列を作成
 projects.column.new=新しい列
 projects.column.set_default=デフォルトに設定
 projects.column.set_default_desc=この列を未分類のイシューやプルリクエストが入るデフォルトの列にします
+projects.column.default_column_hint=このプロジェクトに追加された新しいイシューがこの列に追加されます
 projects.column.delete=列を削除
 projects.column.deletion_desc=プロジェクト列を削除すると、関連するすべてのイシューがデフォルトの列に移動します。 続行しますか？
 projects.column.color=カラー
@@ -3038,6 +3042,7 @@ dashboard.update_migration_poster_id=移行する投稿者IDの更新
 dashboard.git_gc_repos=すべてのリポジトリでガベージコレクションを実行
 dashboard.resync_all_sshkeys='.ssh/authorized_keys' ファイルをGitea上のSSHキーで更新
 dashboard.resync_all_sshprincipals='.ssh/authorized_principals' ファイルをGitea上のSSHプリンシパルで更新
+dashboard.resync_all_hooks=すべてのリポジトリのGitフックを再同期する (pre-receive, update, post-receive, proc-receive, ...)
 dashboard.reinit_missing_repos=レコードが存在するが見当たらないすべてのGitリポジトリを再初期化する
 dashboard.sync_external_users=外部ユーザーデータの同期
 dashboard.cleanup_hook_task_table=hook_taskテーブルのクリーンアップ

From e30a130b9a5d4279b3f6a3fc2226f0ea85c56c29 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 4 Dec 2025 00:05:13 -0800
Subject: [PATCH 11/15] Fix edit user email bug in API (#36068)

Follow #36058 for API edit user bug when editing email.

- The Admin Edit User API includes a breaking change. Previously, when
updating a user with an email from an unallowed domain, the request
would succeed but return a warning in the response headers. Now, the
request will fail and return an error in the response body instead.
- Removed `AdminAddOrSetPrimaryEmailAddress` because it will not be used
any where.

Fix https://github.com/go-gitea/gitea/pull/36058#issuecomment-3600005186

---------

Co-authored-by: Giteabot <teabot@gitea.io>
---
 routers/api/v1/admin/user.go        |  9 +++--
 services/user/email.go              | 54 -----------------------------
 services/user/email_test.go         | 51 ---------------------------
 tests/integration/api_admin_test.go |  8 +++--
 4 files changed, 9 insertions(+), 113 deletions(-)

diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go
index abc4e52877..6f1e2eb120 100644
--- a/routers/api/v1/admin/user.go
+++ b/routers/api/v1/admin/user.go
@@ -216,9 +216,12 @@ func EditUser(ctx *context.APIContext) {
 	}
 
 	if form.Email != nil {
-		if err := user_service.AdminAddOrSetPrimaryEmailAddress(ctx, ctx.ContextUser, *form.Email); err != nil {
+		if err := user_service.ReplacePrimaryEmailAddress(ctx, ctx.ContextUser, *form.Email); err != nil {
 			switch {
 			case user_model.IsErrEmailCharIsNotSupported(err), user_model.IsErrEmailInvalid(err):
+				if !user_model.IsEmailDomainAllowed(*form.Email) {
+					err = fmt.Errorf("the domain of user email %s conflicts with EMAIL_DOMAIN_ALLOWLIST or EMAIL_DOMAIN_BLOCKLIST", *form.Email)
+				}
 				ctx.APIError(http.StatusBadRequest, err)
 			case user_model.IsErrEmailAlreadyUsed(err):
 				ctx.APIError(http.StatusBadRequest, err)
@@ -227,10 +230,6 @@ func EditUser(ctx *context.APIContext) {
 			}
 			return
 		}
-
-		if !user_model.IsEmailDomainAllowed(*form.Email) {
-			ctx.Resp.Header().Add("X-Gitea-Warning", fmt.Sprintf("the domain of user email %s conflicts with EMAIL_DOMAIN_ALLOWLIST or EMAIL_DOMAIN_BLOCKLIST", *form.Email))
-		}
 	}
 
 	opts := &user_service.UpdateOptions{
diff --git a/services/user/email.go b/services/user/email.go
index de1e024bd1..c45b3b3ec9 100644
--- a/services/user/email.go
+++ b/services/user/email.go
@@ -14,60 +14,6 @@ import (
 	"code.gitea.io/gitea/modules/util"
 )
 
-// AdminAddOrSetPrimaryEmailAddress is used by admins to add or set a user's primary email address
-func AdminAddOrSetPrimaryEmailAddress(ctx context.Context, u *user_model.User, emailStr string) error {
-	if strings.EqualFold(u.Email, emailStr) {
-		return nil
-	}
-
-	if err := user_model.ValidateEmailForAdmin(emailStr); err != nil {
-		return err
-	}
-
-	// Check if address exists already
-	email, err := user_model.GetEmailAddressByEmail(ctx, emailStr)
-	if err != nil && !errors.Is(err, util.ErrNotExist) {
-		return err
-	}
-	if email != nil && email.UID != u.ID {
-		return user_model.ErrEmailAlreadyUsed{Email: emailStr}
-	}
-
-	// Update old primary address
-	primary, err := user_model.GetPrimaryEmailAddressOfUser(ctx, u.ID)
-	if err != nil {
-		return err
-	}
-
-	primary.IsPrimary = false
-	if err := user_model.UpdateEmailAddress(ctx, primary); err != nil {
-		return err
-	}
-
-	// Insert new or update existing address
-	if email != nil {
-		email.IsPrimary = true
-		email.IsActivated = true
-		if err := user_model.UpdateEmailAddress(ctx, email); err != nil {
-			return err
-		}
-	} else {
-		email = &user_model.EmailAddress{
-			UID:         u.ID,
-			Email:       emailStr,
-			IsActivated: true,
-			IsPrimary:   true,
-		}
-		if _, err := user_model.InsertEmailAddress(ctx, email); err != nil {
-			return err
-		}
-	}
-
-	u.Email = emailStr
-
-	return user_model.UpdateUserCols(ctx, u, "email")
-}
-
 func ReplacePrimaryEmailAddress(ctx context.Context, u *user_model.User, emailStr string) error {
 	if strings.EqualFold(u.Email, emailStr) {
 		return nil
diff --git a/services/user/email_test.go b/services/user/email_test.go
index 76770a9230..a031b12cad 100644
--- a/services/user/email_test.go
+++ b/services/user/email_test.go
@@ -9,61 +9,10 @@ import (
 	organization_model "code.gitea.io/gitea/models/organization"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/glob"
-	"code.gitea.io/gitea/modules/setting"
 
 	"github.com/stretchr/testify/assert"
 )
 
-func TestAdminAddOrSetPrimaryEmailAddress(t *testing.T) {
-	assert.NoError(t, unittest.PrepareTestDatabase())
-
-	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 27})
-
-	emails, err := user_model.GetEmailAddresses(t.Context(), user.ID)
-	assert.NoError(t, err)
-	assert.Len(t, emails, 1)
-
-	primary, err := user_model.GetPrimaryEmailAddressOfUser(t.Context(), user.ID)
-	assert.NoError(t, err)
-	assert.NotEqual(t, "new-primary@example.com", primary.Email)
-	assert.Equal(t, user.Email, primary.Email)
-
-	assert.NoError(t, AdminAddOrSetPrimaryEmailAddress(t.Context(), user, "new-primary@example.com"))
-
-	primary, err = user_model.GetPrimaryEmailAddressOfUser(t.Context(), user.ID)
-	assert.NoError(t, err)
-	assert.Equal(t, "new-primary@example.com", primary.Email)
-	assert.Equal(t, user.Email, primary.Email)
-
-	emails, err = user_model.GetEmailAddresses(t.Context(), user.ID)
-	assert.NoError(t, err)
-	assert.Len(t, emails, 2)
-
-	setting.Service.EmailDomainAllowList = []glob.Glob{glob.MustCompile("example.org")}
-	defer func() {
-		setting.Service.EmailDomainAllowList = []glob.Glob{}
-	}()
-
-	assert.NoError(t, AdminAddOrSetPrimaryEmailAddress(t.Context(), user, "new-primary2@example2.com"))
-
-	primary, err = user_model.GetPrimaryEmailAddressOfUser(t.Context(), user.ID)
-	assert.NoError(t, err)
-	assert.Equal(t, "new-primary2@example2.com", primary.Email)
-	assert.Equal(t, user.Email, primary.Email)
-
-	assert.NoError(t, AdminAddOrSetPrimaryEmailAddress(t.Context(), user, "user27@example.com"))
-
-	primary, err = user_model.GetPrimaryEmailAddressOfUser(t.Context(), user.ID)
-	assert.NoError(t, err)
-	assert.Equal(t, "user27@example.com", primary.Email)
-	assert.Equal(t, user.Email, primary.Email)
-
-	emails, err = user_model.GetEmailAddresses(t.Context(), user.ID)
-	assert.NoError(t, err)
-	assert.Len(t, emails, 3)
-}
-
 func TestReplacePrimaryEmailAddress(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 
diff --git a/tests/integration/api_admin_test.go b/tests/integration/api_admin_test.go
index dbd62c4078..763d4d526b 100644
--- a/tests/integration/api_admin_test.go
+++ b/tests/integration/api_admin_test.go
@@ -382,10 +382,12 @@ func TestAPIEditUser_NotAllowedEmailDomain(t *testing.T) {
 		SourceID:  0,
 		Email:     &newEmail,
 	}).AddTokenAuth(token)
-	resp := MakeRequest(t, req, http.StatusOK)
-	assert.Equal(t, "the domain of user email user2@example1.com conflicts with EMAIL_DOMAIN_ALLOWLIST or EMAIL_DOMAIN_BLOCKLIST", resp.Header().Get("X-Gitea-Warning"))
+	resp := MakeRequest(t, req, http.StatusBadRequest)
+	errMap := make(map[string]string)
+	assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), &errMap))
+	assert.Equal(t, "the domain of user email user2@example1.com conflicts with EMAIL_DOMAIN_ALLOWLIST or EMAIL_DOMAIN_BLOCKLIST", errMap["message"])
 
-	originalEmail := "user2@example.com"
+	originalEmail := "user2@example.org"
 	req = NewRequestWithJSON(t, "PATCH", urlStr, api.EditUserOption{
 		LoginName: "user2",
 		SourceID:  0,

From ee6e371e44c11fcc55ea18a690bfe9e4286e322c Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 4 Dec 2025 00:35:53 -0800
Subject: [PATCH 12/15] Use Golang net/smtp instead of gomail's smtp to send
 email (#36055)

Replace #36032
Fix #36030

This PR use `net/smtp` instead of gomail's smtp. Now
github.com/wneessen/go-mail will be used only for generating email
message body.

---------

Co-authored-by: Giteabot <teabot@gitea.io>
---
 services/mailer/sender/sendmail.go  |  8 +++++-
 services/mailer/sender/smtp.go      | 38 ++++++++++++++++++++---------
 services/mailer/sender/smtp_auth.go |  2 +-
 services/mailer/sender/smtp_test.go | 30 +++++++++++++++++++++++
 4 files changed, 64 insertions(+), 14 deletions(-)
 create mode 100644 services/mailer/sender/smtp_test.go

diff --git a/services/mailer/sender/sendmail.go b/services/mailer/sender/sendmail.go
index 64c7f8f081..7064c60f97 100644
--- a/services/mailer/sender/sendmail.go
+++ b/services/mailer/sender/sendmail.go
@@ -33,7 +33,13 @@ func (s *SendmailSender) Send(from string, to []string, msg io.WriterTo) error {
 
 	args := []string{"-f", envelopeFrom, "-i"}
 	args = append(args, setting.MailService.SendmailArgs...)
-	args = append(args, to...)
+	for _, recipient := range to {
+		smtpTo, err := sanitizeEmailAddress(recipient)
+		if err != nil {
+			return fmt.Errorf("invalid recipient address %q: %w", recipient, err)
+		}
+		args = append(args, smtpTo)
+	}
 	log.Trace("Sending with: %s %v", setting.MailService.SendmailPath, args)
 
 	desc := fmt.Sprintf("SendMail: %s %v", setting.MailService.SendmailPath, args)
diff --git a/services/mailer/sender/smtp.go b/services/mailer/sender/smtp.go
index 3207eee32f..fa07803359 100644
--- a/services/mailer/sender/smtp.go
+++ b/services/mailer/sender/smtp.go
@@ -9,13 +9,13 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"net/mail"
+	"net/smtp"
 	"os"
 	"strings"
 
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
-
-	"github.com/wneessen/go-mail/smtp"
 )
 
 // SMTPSender Sender SMTP mail sender
@@ -108,7 +108,7 @@ func (s *SMTPSender) Send(from string, to []string, msg io.WriterTo) error {
 		if strings.Contains(options, "CRAM-MD5") {
 			auth = smtp.CRAMMD5Auth(opts.User, opts.Passwd)
 		} else if strings.Contains(options, "PLAIN") {
-			auth = smtp.PlainAuth("", opts.User, opts.Passwd, host, false)
+			auth = smtp.PlainAuth("", opts.User, opts.Passwd, host)
 		} else if strings.Contains(options, "LOGIN") {
 			// Patch for AUTH LOGIN
 			auth = LoginAuth(opts.User, opts.Passwd)
@@ -123,18 +123,24 @@ func (s *SMTPSender) Send(from string, to []string, msg io.WriterTo) error {
 		}
 	}
 
-	if opts.OverrideEnvelopeFrom {
-		if err = client.Mail(opts.EnvelopeFrom); err != nil {
-			return fmt.Errorf("failed to issue MAIL command: %w", err)
-		}
-	} else {
-		if err = client.Mail(fmt.Sprintf("<%s>", from)); err != nil {
-			return fmt.Errorf("failed to issue MAIL command: %w", err)
-		}
+	fromAddr := from
+	if opts.OverrideEnvelopeFrom && opts.EnvelopeFrom != "" {
+		fromAddr = opts.EnvelopeFrom
+	}
+	smtpFrom, err := sanitizeEmailAddress(fromAddr)
+	if err != nil {
+		return fmt.Errorf("invalid envelope from address: %w", err)
+	}
+	if err = client.Mail(smtpFrom); err != nil {
+		return fmt.Errorf("failed to issue MAIL command: %w", err)
 	}
 
 	for _, rec := range to {
-		if err = client.Rcpt(rec); err != nil {
+		smtpTo, err := sanitizeEmailAddress(rec)
+		if err != nil {
+			return fmt.Errorf("invalid recipient address %q: %w", rec, err)
+		}
+		if err = client.Rcpt(smtpTo); err != nil {
 			return fmt.Errorf("failed to issue RCPT command: %w", err)
 		}
 	}
@@ -155,3 +161,11 @@ func (s *SMTPSender) Send(from string, to []string, msg io.WriterTo) error {
 
 	return nil
 }
+
+func sanitizeEmailAddress(raw string) (string, error) {
+	addr, err := mail.ParseAddress(strings.TrimSpace(strings.Trim(raw, "<>")))
+	if err != nil {
+		return "", err
+	}
+	return addr.Address, nil
+}
diff --git a/services/mailer/sender/smtp_auth.go b/services/mailer/sender/smtp_auth.go
index c60e0dbfbb..66ea24e896 100644
--- a/services/mailer/sender/smtp_auth.go
+++ b/services/mailer/sender/smtp_auth.go
@@ -6,9 +6,9 @@ package sender
 import (
 	"errors"
 	"fmt"
+	"net/smtp"
 
 	"github.com/Azure/go-ntlmssp"
-	"github.com/wneessen/go-mail/smtp"
 )
 
 type loginAuth struct {
diff --git a/services/mailer/sender/smtp_test.go b/services/mailer/sender/smtp_test.go
new file mode 100644
index 0000000000..1e944583a6
--- /dev/null
+++ b/services/mailer/sender/smtp_test.go
@@ -0,0 +1,30 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package sender
+
+import "testing"
+
+func TestSanitizeEmailAddress(t *testing.T) {
+	tests := []struct {
+		input    string
+		expected string
+		hasError bool
+	}{
+		{"abc@gitea.com", "abc@gitea.com", false},
+		{"<abc@gitea.com>", "abc@gitea.com", false},
+		{"ssss.com", "", true},
+		{"<invalid-email>", "", true},
+	}
+
+	for _, tt := range tests {
+		result, err := sanitizeEmailAddress(tt.input)
+		if (err != nil) != tt.hasError {
+			t.Errorf("sanitizeEmailAddress(%q) unexpected error status: got %v, want error: %v", tt.input, err != nil, tt.hasError)
+			continue
+		}
+		if result != tt.expected {
+			t.Errorf("sanitizeEmailAddress(%q) = %q; want %q", tt.input, result, tt.expected)
+		}
+	}
+}

From b49dd8e32f69b4a1536b4c7a4814bc9ce17e798e Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 4 Dec 2025 10:06:44 +0100
Subject: [PATCH 13/15] update golangci-lint to v2.7.0 (#36079)

- Update and autofix most issues
- Corrected variable names to `cutOk`
- Impossible condition in `services/migrations/onedev_test.go` removed
- `modules/setting/config_env.go:128:3` looks like a false-positive,
added nolint
---
 Makefile                                      |  2 +-
 modules/git/attribute/attribute.go            |  4 ++--
 modules/git/foreachref/parser.go              |  8 +++----
 modules/git/parse.go                          |  8 +++----
 modules/highlight/highlight.go                |  4 ++--
 modules/indexer/code/internal/util.go         | 14 ++++++------
 modules/markup/html_link.go                   |  6 ++---
 modules/setting/config_env.go                 | 22 +++++++++----------
 modules/validation/binding.go                 |  6 ++---
 .../auth/source/pam/source_authenticate.go    |  6 ++---
 .../auth/source/smtp/source_authenticate.go   | 12 +++++-----
 services/migrations/onedev_test.go            |  3 ---
 services/repository/gitgraph/graph_test.go    |  4 ++--
 services/repository/gitgraph/parser.go        | 10 ++++-----
 14 files changed, 53 insertions(+), 56 deletions(-)

diff --git a/Makefile b/Makefile
index 647ab38e14..2b9fc60eb3 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ XGO_VERSION := go-1.25.x
 AIR_PACKAGE ?= github.com/air-verse/air@v1
 EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3
 GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.9.2
-GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.6.0
+GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.7.0
 GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.15
 MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.7.0
 SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.33.1
diff --git a/modules/git/attribute/attribute.go b/modules/git/attribute/attribute.go
index 9c01cb339e..8719369df8 100644
--- a/modules/git/attribute/attribute.go
+++ b/modules/git/attribute/attribute.go
@@ -96,8 +96,8 @@ func (attrs *Attributes) GetGitlabLanguage() optional.Option[string] {
 		// gitlab-language may have additional parameters after the language
 		// ignore them and just use the main language
 		// https://docs.gitlab.com/ee/user/project/highlighting.html#override-syntax-highlighting-for-a-file-type
-		if idx := strings.IndexByte(raw, '?'); idx >= 0 {
-			return optional.Some(raw[:idx])
+		if before, _, ok := strings.Cut(raw, "?"); ok {
+			return optional.Some(before)
 		}
 	}
 	return attrStr
diff --git a/modules/git/foreachref/parser.go b/modules/git/foreachref/parser.go
index ebdc7344d0..fa2ef316c7 100644
--- a/modules/git/foreachref/parser.go
+++ b/modules/git/foreachref/parser.go
@@ -113,10 +113,10 @@ func (p *Parser) parseRef(refBlock string) (map[string]string, error) {
 
 		var fieldKey string
 		var fieldVal string
-		firstSpace := strings.Index(field, " ")
-		if firstSpace > 0 {
-			fieldKey = field[:firstSpace]
-			fieldVal = field[firstSpace+1:]
+		before, after, ok := strings.Cut(field, " ")
+		if ok {
+			fieldKey = before
+			fieldVal = after
 		} else {
 			// could be the case if the requested field had no value
 			fieldKey = field
diff --git a/modules/git/parse.go b/modules/git/parse.go
index a7f5c58e89..d4ff0ecb23 100644
--- a/modules/git/parse.go
+++ b/modules/git/parse.go
@@ -27,15 +27,15 @@ func parseLsTreeLine(line []byte) (*LsTreeEntry, error) {
 	// <mode> <type> <sha>\t<filename>
 
 	var err error
-	posTab := bytes.IndexByte(line, '\t')
-	if posTab == -1 {
+	before, after, ok := bytes.Cut(line, []byte{'\t'})
+	if !ok {
 		return nil, fmt.Errorf("invalid ls-tree output (no tab): %q", line)
 	}
 
 	entry := new(LsTreeEntry)
 
-	entryAttrs := line[:posTab]
-	entryName := line[posTab+1:]
+	entryAttrs := before
+	entryName := after
 
 	entryMode, entryAttrs, _ := bytes.Cut(entryAttrs, sepSpace)
 	_ /* entryType */, entryAttrs, _ = bytes.Cut(entryAttrs, sepSpace) // the type is not used, the mode is enough to determine the type
diff --git a/modules/highlight/highlight.go b/modules/highlight/highlight.go
index 77f24fa3f3..77e47fdf48 100644
--- a/modules/highlight/highlight.go
+++ b/modules/highlight/highlight.go
@@ -77,8 +77,8 @@ func Code(fileName, language, code string) (output template.HTML, lexerName stri
 
 		if lexer == nil {
 			// Attempt stripping off the '?'
-			if idx := strings.IndexByte(language, '?'); idx > 0 {
-				lexer = lexers.Get(language[:idx])
+			if before, _, ok := strings.Cut(language, "?"); ok {
+				lexer = lexers.Get(before)
 			}
 		}
 	}
diff --git a/modules/indexer/code/internal/util.go b/modules/indexer/code/internal/util.go
index fa958be473..5d62a5ccb9 100644
--- a/modules/indexer/code/internal/util.go
+++ b/modules/indexer/code/internal/util.go
@@ -17,20 +17,20 @@ func FilenameIndexerID(repoID int64, filename string) string {
 }
 
 func ParseIndexerID(indexerID string) (int64, string) {
-	index := strings.IndexByte(indexerID, '_')
-	if index == -1 {
+	before, after, ok := strings.Cut(indexerID, "_")
+	if !ok {
 		log.Error("Unexpected ID in repo indexer: %s", indexerID)
 	}
-	repoID, _ := internal.ParseBase36(indexerID[:index])
-	return repoID, indexerID[index+1:]
+	repoID, _ := internal.ParseBase36(before)
+	return repoID, after
 }
 
 func FilenameOfIndexerID(indexerID string) string {
-	index := strings.IndexByte(indexerID, '_')
-	if index == -1 {
+	_, after, ok := strings.Cut(indexerID, "_")
+	if !ok {
 		log.Error("Unexpected ID in repo indexer: %s", indexerID)
 	}
-	return indexerID[index+1:]
+	return after
 }
 
 // FilenameMatchIndexPos returns the boundaries of its first seven lines.
diff --git a/modules/markup/html_link.go b/modules/markup/html_link.go
index 43faef1681..7523ebaed0 100644
--- a/modules/markup/html_link.go
+++ b/modules/markup/html_link.go
@@ -33,7 +33,7 @@ func shortLinkProcessor(ctx *RenderContext, node *html.Node) {
 		// Of text and link contents
 		sl := strings.SplitSeq(content, "|")
 		for v := range sl {
-			if equalPos := strings.IndexByte(v, '='); equalPos == -1 {
+			if found := strings.Contains(v, "="); !found {
 				// There is no equal in this argument; this is a mandatory arg
 				if props["name"] == "" {
 					if IsFullURLString(v) {
@@ -55,8 +55,8 @@ func shortLinkProcessor(ctx *RenderContext, node *html.Node) {
 			} else {
 				// There is an equal; optional argument.
 
-				sep := strings.IndexByte(v, '=')
-				key, val := v[:sep], html.UnescapeString(v[sep+1:])
+				before, after, _ := strings.Cut(v, "=")
+				key, val := before, html.UnescapeString(after)
 
 				// When parsing HTML, x/net/html will change all quotes which are
 				// not used for syntax into UTF-8 quotes. So checking val[0] won't
diff --git a/modules/setting/config_env.go b/modules/setting/config_env.go
index 8b204e5c7c..4758eb72cb 100644
--- a/modules/setting/config_env.go
+++ b/modules/setting/config_env.go
@@ -51,10 +51,10 @@ func decodeEnvSectionKey(encoded string) (ok bool, section, key string) {
 	for _, unescapeIdx := range escapeStringIndices {
 		preceding := encoded[last:unescapeIdx[0]]
 		if !inKey {
-			if splitter := strings.Index(preceding, "__"); splitter > -1 {
-				section += preceding[:splitter]
+			if before, after, cutOk := strings.Cut(preceding, "__"); cutOk {
+				section += before
 				inKey = true
-				key += preceding[splitter+2:]
+				key += after
 			} else {
 				section += preceding
 			}
@@ -77,9 +77,9 @@ func decodeEnvSectionKey(encoded string) (ok bool, section, key string) {
 	}
 	remaining := encoded[last:]
 	if !inKey {
-		if splitter := strings.Index(remaining, "__"); splitter > -1 {
-			section += remaining[:splitter]
-			key += remaining[splitter+2:]
+		if before, after, cutOk := strings.Cut(remaining, "__"); cutOk {
+			section += before
+			key += after
 		} else {
 			section += remaining
 		}
@@ -111,21 +111,21 @@ func decodeEnvironmentKey(prefixGitea, suffixFile, envKey string) (ok bool, sect
 
 func EnvironmentToConfig(cfg ConfigProvider, envs []string) (changed bool) {
 	for _, kv := range envs {
-		idx := strings.IndexByte(kv, '=')
-		if idx < 0 {
+		before, after, ok := strings.Cut(kv, "=")
+		if !ok {
 			continue
 		}
 
 		// parse the environment variable to config section name and key name
-		envKey := kv[:idx]
-		envValue := kv[idx+1:]
+		envKey := before
+		envValue := after
 		ok, sectionName, keyName, useFileValue := decodeEnvironmentKey(EnvConfigKeyPrefixGitea, EnvConfigKeySuffixFile, envKey)
 		if !ok {
 			continue
 		}
 
 		// use environment value as config value, or read the file content as value if the key indicates a file
-		keyValue := envValue
+		keyValue := envValue //nolint:staticcheck // false positive
 		if useFileValue {
 			fileContent, err := os.ReadFile(envValue)
 			if err != nil {
diff --git a/modules/validation/binding.go b/modules/validation/binding.go
index 335f248ead..3ecc532613 100644
--- a/modules/validation/binding.go
+++ b/modules/validation/binding.go
@@ -215,8 +215,8 @@ func addValidGroupTeamMapRule() {
 }
 
 func portOnly(hostport string) string {
-	colon := strings.IndexByte(hostport, ':')
-	if colon == -1 {
+	_, after, ok := strings.Cut(hostport, ":")
+	if !ok {
 		return ""
 	}
 	if i := strings.Index(hostport, "]:"); i != -1 {
@@ -225,7 +225,7 @@ func portOnly(hostport string) string {
 	if strings.Contains(hostport, "]") {
 		return ""
 	}
-	return hostport[colon+len(":"):]
+	return after
 }
 
 func validPort(p string) bool {
diff --git a/services/auth/source/pam/source_authenticate.go b/services/auth/source/pam/source_authenticate.go
index db7c6aab96..fc290aa771 100644
--- a/services/auth/source/pam/source_authenticate.go
+++ b/services/auth/source/pam/source_authenticate.go
@@ -35,9 +35,9 @@ func (source *Source) Authenticate(ctx context.Context, user *user_model.User, u
 	// Allow PAM sources with `@` in their name, like from Active Directory
 	username := pamLogin
 	email := pamLogin
-	idx := strings.Index(pamLogin, "@")
-	if idx > -1 {
-		username = pamLogin[:idx]
+	before, _, ok := strings.Cut(pamLogin, "@")
+	if ok {
+		username = before
 	}
 	if user_model.ValidateEmail(email) != nil {
 		if source.EmailDomain != "" {
diff --git a/services/auth/source/smtp/source_authenticate.go b/services/auth/source/smtp/source_authenticate.go
index b8e668f5f9..de39c1d3a6 100644
--- a/services/auth/source/smtp/source_authenticate.go
+++ b/services/auth/source/smtp/source_authenticate.go
@@ -21,10 +21,10 @@ import (
 func (source *Source) Authenticate(ctx context.Context, user *user_model.User, userName, password string) (*user_model.User, error) {
 	// Verify allowed domains.
 	if len(source.AllowedDomains) > 0 {
-		idx := strings.Index(userName, "@")
-		if idx == -1 {
+		_, after, ok := strings.Cut(userName, "@")
+		if !ok {
 			return nil, user_model.ErrUserNotExist{Name: userName}
-		} else if !util.SliceContainsString(strings.Split(source.AllowedDomains, ","), userName[idx+1:], true) {
+		} else if !util.SliceContainsString(strings.Split(source.AllowedDomains, ","), after, true) {
 			return nil, user_model.ErrUserNotExist{Name: userName}
 		}
 	}
@@ -61,9 +61,9 @@ func (source *Source) Authenticate(ctx context.Context, user *user_model.User, u
 	}
 
 	username := userName
-	idx := strings.Index(userName, "@")
-	if idx > -1 {
-		username = userName[:idx]
+	before, _, ok := strings.Cut(userName, "@")
+	if ok {
+		username = before
 	}
 
 	user = &user_model.User{
diff --git a/services/migrations/onedev_test.go b/services/migrations/onedev_test.go
index a05d6cac6e..3319e19851 100644
--- a/services/migrations/onedev_test.go
+++ b/services/migrations/onedev_test.go
@@ -23,9 +23,6 @@ func TestOneDevDownloadRepo(t *testing.T) {
 	u, _ := url.Parse("https://code.onedev.io")
 	ctx := t.Context()
 	downloader := NewOneDevDownloader(ctx, u, "", "", "go-gitea-test_repo")
-	if err != nil {
-		t.Fatalf("NewOneDevDownloader is nil: %v", err)
-	}
 	repo, err := downloader.GetRepoInfo(ctx)
 	assert.NoError(t, err)
 	assertRepositoryEqual(t, &base.Repository{
diff --git a/services/repository/gitgraph/graph_test.go b/services/repository/gitgraph/graph_test.go
index eda499840b..83813e7ba7 100644
--- a/services/repository/gitgraph/graph_test.go
+++ b/services/repository/gitgraph/graph_test.go
@@ -238,8 +238,8 @@ func TestCommitStringParsing(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.testName, func(t *testing.T) {
 			testString := fmt.Sprintf("%s%s", dataFirstPart, test.commitMessage)
-			idx := strings.Index(testString, "DATA:")
-			commit, err := NewCommit(0, 0, []byte(testString[idx+5:]))
+			_, after, _ := strings.Cut(testString, "DATA:")
+			commit, err := NewCommit(0, 0, []byte(after))
 			if err != nil && test.shouldPass {
 				t.Errorf("Could not parse %s", testString)
 				return
diff --git a/services/repository/gitgraph/parser.go b/services/repository/gitgraph/parser.go
index f6bf9b0b90..859deff113 100644
--- a/services/repository/gitgraph/parser.go
+++ b/services/repository/gitgraph/parser.go
@@ -44,11 +44,11 @@ func (parser *Parser) Reset() {
 
 // AddLineToGraph adds the line as a row to the graph
 func (parser *Parser) AddLineToGraph(graph *Graph, row int, line []byte) error {
-	idx := bytes.Index(line, []byte("DATA:"))
-	if idx < 0 {
+	before, after, ok := bytes.Cut(line, []byte("DATA:"))
+	if !ok {
 		parser.ParseGlyphs(line)
 	} else {
-		parser.ParseGlyphs(line[:idx])
+		parser.ParseGlyphs(before)
 	}
 
 	var err error
@@ -72,7 +72,7 @@ func (parser *Parser) AddLineToGraph(graph *Graph, row int, line []byte) error {
 				}
 			}
 			commitDone = true
-			if idx < 0 {
+			if !ok {
 				if err != nil {
 					err = fmt.Errorf("missing data section on line %d with commit: %s. %w", row, string(line), err)
 				} else {
@@ -80,7 +80,7 @@ func (parser *Parser) AddLineToGraph(graph *Graph, row int, line []byte) error {
 				}
 				continue
 			}
-			err2 := graph.AddCommit(row, column, flowID, line[idx+5:])
+			err2 := graph.AddCommit(row, column, flowID, after)
 			if err != nil && err2 != nil {
 				err = fmt.Errorf("%v %w", err2, err)
 				continue

From ee365f51006e16ccb0ec0df266bb3de8daaed24e Mon Sep 17 00:00:00 2001
From: a1012112796 <1012112796@qq.com>
Date: Fri, 5 Dec 2025 02:47:23 +0800
Subject: [PATCH 14/15] fix some file icon ui (#36078)

fix #36071

looks that's because if an svg in hiden env, it's color added by
`fill="url(#a)"` will become not usefull. by ai helping, I think moving
it out of page by position is a good solution. fell free creat a new
pull request if you have a better soluton. Thanks.
<img width="2198" height="1120" alt="image"
src="https://github.com/user-attachments/assets/bbf7c171-0b7f-412a-a1bc-aea3f1629636"
/>

---------

Signed-off-by: a1012112796 <1012112796@qq.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
---
 modules/fileicon/material.go               |  2 +-
 modules/fileicon/render.go                 |  2 +-
 routers/web/repo/treelist_test.go          |  2 +-
 services/repository/files/tree_test.go     |  6 +++---
 web_src/css/modules/svg.css                | 17 ++++++++++++-----
 web_src/js/components/ViewFileTreeStore.ts |  2 +-
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/modules/fileicon/material.go b/modules/fileicon/material.go
index 5361592d8a..b8ee13cd8c 100644
--- a/modules/fileicon/material.go
+++ b/modules/fileicon/material.go
@@ -76,7 +76,7 @@ func (m *MaterialIconProvider) renderFileIconSVG(p *RenderedIconPool, name, svg,
 	if p.IconSVGs[svgID] == "" {
 		p.IconSVGs[svgID] = svgHTML
 	}
-	return template.HTML(`<svg ` + svgCommonAttrs + `><use xlink:href="#` + svgID + `"></use></svg>`)
+	return template.HTML(`<svg ` + svgCommonAttrs + `><use href="#` + svgID + `"></use></svg>`)
 }
 
 func (m *MaterialIconProvider) EntryIconHTML(p *RenderedIconPool, entry *EntryInfo) template.HTML {
diff --git a/modules/fileicon/render.go b/modules/fileicon/render.go
index 8ed86b9ac0..6b2fcfa81e 100644
--- a/modules/fileicon/render.go
+++ b/modules/fileicon/render.go
@@ -25,7 +25,7 @@ func (p *RenderedIconPool) RenderToHTML() template.HTML {
 		return ""
 	}
 	sb := &strings.Builder{}
-	sb.WriteString(`<div class=tw-hidden>`)
+	sb.WriteString(`<div class="svg-icon-container">`)
 	for _, icon := range p.IconSVGs {
 		sb.WriteString(string(icon))
 	}
diff --git a/routers/web/repo/treelist_test.go b/routers/web/repo/treelist_test.go
index 94ba60661b..019fe085d4 100644
--- a/routers/web/repo/treelist_test.go
+++ b/routers/web/repo/treelist_test.go
@@ -33,7 +33,7 @@ func TestTransformDiffTreeForWeb(t *testing.T) {
 	})
 
 	mockIconForFile := func(id string) template.HTML {
-		return template.HTML(`<svg class="svg git-entry-icon octicon-file" width="16" height="16" aria-hidden="true"><use xlink:href="#` + id + `"></use></svg>`)
+		return template.HTML(`<svg class="svg git-entry-icon octicon-file" width="16" height="16" aria-hidden="true"><use href="#` + id + `"></use></svg>`)
 	}
 	assert.Equal(t, WebDiffFileTree{
 		TreeRoot: WebDiffFileItem{
diff --git a/services/repository/files/tree_test.go b/services/repository/files/tree_test.go
index 38ac9f25fc..e7511b3eed 100644
--- a/services/repository/files/tree_test.go
+++ b/services/repository/files/tree_test.go
@@ -67,13 +67,13 @@ func TestGetTreeViewNodes(t *testing.T) {
 	curRepoLink := "/any/repo-link"
 	renderedIconPool := fileicon.NewRenderedIconPool()
 	mockIconForFile := func(id string) template.HTML {
-		return template.HTML(`<svg class="svg git-entry-icon octicon-file" width="16" height="16" aria-hidden="true"><use xlink:href="#` + id + `"></use></svg>`)
+		return template.HTML(`<svg class="svg git-entry-icon octicon-file" width="16" height="16" aria-hidden="true"><use href="#` + id + `"></use></svg>`)
 	}
 	mockIconForFolder := func(id string) template.HTML {
-		return template.HTML(`<svg class="svg git-entry-icon octicon-file-directory-fill" width="16" height="16" aria-hidden="true"><use xlink:href="#` + id + `"></use></svg>`)
+		return template.HTML(`<svg class="svg git-entry-icon octicon-file-directory-fill" width="16" height="16" aria-hidden="true"><use href="#` + id + `"></use></svg>`)
 	}
 	mockOpenIconForFolder := func(id string) template.HTML {
-		return template.HTML(`<svg class="svg git-entry-icon octicon-file-directory-open-fill" width="16" height="16" aria-hidden="true"><use xlink:href="#` + id + `"></use></svg>`)
+		return template.HTML(`<svg class="svg git-entry-icon octicon-file-directory-open-fill" width="16" height="16" aria-hidden="true"><use href="#` + id + `"></use></svg>`)
 	}
 	treeNodes, err := GetTreeViewNodes(ctx, curRepoLink, renderedIconPool, ctx.Repo.Commit, "", "")
 	assert.NoError(t, err)
diff --git a/web_src/css/modules/svg.css b/web_src/css/modules/svg.css
index 738ec22cd3..e32fa0911f 100644
--- a/web_src/css/modules/svg.css
+++ b/web_src/css/modules/svg.css
@@ -1,17 +1,24 @@
-.svg {
+/* some material icons have "fill=none" (e.g.: ".txt -> document"), so the CSS styles shouldn't overwrite it,
+ and material icons should have no "fill" set explicitly, otherwise some like ".editorconfig" won't render correctly */
+.svg:not(.git-entry-icon) {
   display: inline-block;
   vertical-align: text-top;
   fill: currentcolor;
 }
 
-.svg.git-entry-icon {
-  fill: transparent; /* some material icons have dark background fill, so need to reset */
-}
-
 .middle .svg {
   vertical-align: middle;
 }
 
+/* some browsers like Chrome have a bug: when a SVG is in a "display: none" container and referenced
+ somewhere else by `<use href="#id">`, it won't be rendered correctly. e.g.: ".kts -> kotlin" */
+.svg-icon-container {
+  position: absolute;
+  width: 0;
+  height: 0;
+  overflow: hidden;
+}
+
 /* prevent SVGs from shrinking, like in space-starved flexboxes. the sizes
    here are cherry-picked for our use cases, feel free to add more. after
    https://developer.mozilla.org/en-US/docs/Web/CSS/attr#type-or-unit is
diff --git a/web_src/js/components/ViewFileTreeStore.ts b/web_src/js/components/ViewFileTreeStore.ts
index 211567d0a1..2dc8093878 100644
--- a/web_src/js/components/ViewFileTreeStore.ts
+++ b/web_src/js/components/ViewFileTreeStore.ts
@@ -18,7 +18,7 @@ export function createViewFileTreeStore(props: {repoLink: string, treePath: stri
         if (!document.querySelector(`.global-svg-icon-pool #${svgId}`)) poolSvgs.push(svgContent);
       }
       if (poolSvgs.length) {
-        const svgContainer = createElementFromHTML(html`<div class="global-svg-icon-pool tw-hidden"></div>`);
+        const svgContainer = createElementFromHTML(html`<div class="global-svg-icon-pool svg-icon-container"></div>`);
         svgContainer.innerHTML = poolSvgs.join('');
         document.body.append(svgContainer);
       }

From cb5082f8fee5e93d89cd01483e0a0c1236cdb15b Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 4 Dec 2025 11:17:49 -0800
Subject: [PATCH 15/15] Fix the bug when ssh clone with redirect user or
 repository (#36039)

Fix #36026

The redirect should be checked when original user/repo doesn't exist.
---
 routers/private/serv.go                    | 87 ++++++++++++----------
 tests/integration/git_ssh_redirect_test.go | 41 +++++++++-
 2 files changed, 88 insertions(+), 40 deletions(-)

diff --git a/routers/private/serv.go b/routers/private/serv.go
index 3dfe4d21da..b752556c23 100644
--- a/routers/private/serv.go
+++ b/routers/private/serv.go
@@ -108,21 +108,19 @@ func ServCommand(ctx *context.PrivateContext) {
 		results.RepoName = repoName[:len(repoName)-5]
 	}
 
-	// Check if there is a user redirect for the requested owner
-	redirectedUserID, err := user_model.LookupUserRedirect(ctx, results.OwnerName)
-	if err == nil {
-		owner, err := user_model.GetUserByID(ctx, redirectedUserID)
-		if err == nil {
-			log.Info("User %s has been redirected to %s", results.OwnerName, owner.Name)
-			results.OwnerName = owner.Name
-		} else {
-			log.Warn("User %s has a redirect to user with ID %d, but no user with this ID could be found. Trying without redirect...", results.OwnerName, redirectedUserID)
-		}
-	}
-
 	owner, err := user_model.GetUserByName(ctx, results.OwnerName)
 	if err != nil {
-		if user_model.IsErrUserNotExist(err) {
+		if !user_model.IsErrUserNotExist(err) {
+			log.Error("Unable to get repository owner: %s/%s Error: %v", results.OwnerName, results.RepoName, err)
+			ctx.JSON(http.StatusForbidden, private.Response{
+				UserMsg: fmt.Sprintf("Unable to get repository owner: %s/%s %v", results.OwnerName, results.RepoName, err),
+			})
+			return
+		}
+
+		// Check if there is a user redirect for the requested owner
+		redirectedUserID, err := user_model.LookupUserRedirect(ctx, results.OwnerName)
+		if err != nil {
 			// User is fetching/cloning a non-existent repository
 			log.Warn("Failed authentication attempt (cannot find repository: %s/%s) from %s", results.OwnerName, results.RepoName, ctx.RemoteAddr())
 			ctx.JSON(http.StatusNotFound, private.Response{
@@ -130,11 +128,20 @@ func ServCommand(ctx *context.PrivateContext) {
 			})
 			return
 		}
-		log.Error("Unable to get repository owner: %s/%s Error: %v", results.OwnerName, results.RepoName, err)
-		ctx.JSON(http.StatusForbidden, private.Response{
-			UserMsg: fmt.Sprintf("Unable to get repository owner: %s/%s %v", results.OwnerName, results.RepoName, err),
-		})
-		return
+
+		redirectUser, err := user_model.GetUserByID(ctx, redirectedUserID)
+		if err != nil {
+			// User is fetching/cloning a non-existent repository
+			log.Warn("Failed authentication attempt (cannot find repository: %s/%s) from %s", results.OwnerName, results.RepoName, ctx.RemoteAddr())
+			ctx.JSON(http.StatusNotFound, private.Response{
+				UserMsg: fmt.Sprintf("Cannot find repository: %s/%s", results.OwnerName, results.RepoName),
+			})
+			return
+		}
+
+		log.Info("User %s has been redirected to %s", results.OwnerName, redirectUser.Name)
+		results.OwnerName = redirectUser.Name
+		owner = redirectUser
 	}
 	if !owner.IsOrganization() && !owner.IsActive {
 		ctx.JSON(http.StatusForbidden, private.Response{
@@ -143,24 +150,33 @@ func ServCommand(ctx *context.PrivateContext) {
 		return
 	}
 
-	redirectedRepoID, err := repo_model.LookupRedirect(ctx, owner.ID, results.RepoName)
-	if err == nil {
-		redirectedRepo, err := repo_model.GetRepositoryByID(ctx, redirectedRepoID)
-		if err == nil {
-			log.Info("Repository %s/%s has been redirected to %s/%s", results.OwnerName, results.RepoName, redirectedRepo.OwnerName, redirectedRepo.Name)
-			results.RepoName = redirectedRepo.Name
-			results.OwnerName = redirectedRepo.OwnerName
-			owner.ID = redirectedRepo.OwnerID
-		} else {
-			log.Warn("Repo %s/%s has a redirect to repo with ID %d, but no repo with this ID could be found. Trying without redirect...", results.OwnerName, results.RepoName, redirectedRepoID)
-		}
-	}
-
 	// Now get the Repository and set the results section
 	repoExist := true
 	repo, err := repo_model.GetRepositoryByName(ctx, owner.ID, results.RepoName)
 	if err != nil {
-		if repo_model.IsErrRepoNotExist(err) {
+		if !repo_model.IsErrRepoNotExist(err) {
+			log.Error("Unable to get repository: %s/%s Error: %v", results.OwnerName, results.RepoName, err)
+			ctx.JSON(http.StatusInternalServerError, private.Response{
+				Err: fmt.Sprintf("Unable to get repository: %s/%s %v", results.OwnerName, results.RepoName, err),
+			})
+			return
+		}
+
+		redirectedRepoID, err := repo_model.LookupRedirect(ctx, owner.ID, results.RepoName)
+		if err == nil {
+			redirectedRepo, err := repo_model.GetRepositoryByID(ctx, redirectedRepoID)
+			if err == nil {
+				log.Info("Repository %s/%s has been redirected to %s/%s", results.OwnerName, results.RepoName, redirectedRepo.OwnerName, redirectedRepo.Name)
+				results.RepoName = redirectedRepo.Name
+				results.OwnerName = redirectedRepo.OwnerName
+				repo = redirectedRepo
+				owner.ID = redirectedRepo.OwnerID
+			} else {
+				log.Warn("Repo %s/%s has a redirect to repo with ID %d, but no repo with this ID could be found. Trying without redirect...", results.OwnerName, results.RepoName, redirectedRepoID)
+			}
+		}
+
+		if repo == nil {
 			repoExist = false
 			if mode == perm.AccessModeRead {
 				// User is fetching/cloning a non-existent repository
@@ -170,13 +186,6 @@ func ServCommand(ctx *context.PrivateContext) {
 				})
 				return
 			}
-			// else fallthrough (push-to-create may kick in below)
-		} else {
-			log.Error("Unable to get repository: %s/%s Error: %v", results.OwnerName, results.RepoName, err)
-			ctx.JSON(http.StatusInternalServerError, private.Response{
-				Err: fmt.Sprintf("Unable to get repository: %s/%s %v", results.OwnerName, results.RepoName, err),
-			})
-			return
 		}
 	}
 
diff --git a/tests/integration/git_ssh_redirect_test.go b/tests/integration/git_ssh_redirect_test.go
index 5e35ed2a74..3ae2652412 100644
--- a/tests/integration/git_ssh_redirect_test.go
+++ b/tests/integration/git_ssh_redirect_test.go
@@ -6,9 +6,13 @@ package integration
 import (
 	"fmt"
 	"net/url"
+	"os"
 	"testing"
 
 	auth_model "code.gitea.io/gitea/models/auth"
+	"code.gitea.io/gitea/modules/structs"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGitSSHRedirect(t *testing.T) {
@@ -16,7 +20,8 @@ func TestGitSSHRedirect(t *testing.T) {
 }
 
 func testGitSSHRedirect(t *testing.T, u *url.URL) {
-	apiTestContext := NewAPITestContext(t, "user2", "repo1", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+	apiTestContext := NewAPITestContext(t, "user2", "repo1", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser, auth_model.AccessTokenScopeWriteOrganization)
+	session := loginUser(t, "user2")
 
 	withKeyFile(t, "my-testing-key", func(keyFile string) {
 		t.Run("CreateUserKey", doAPICreateUserKey(apiTestContext, "test-key", keyFile))
@@ -38,5 +43,39 @@ func testGitSSHRedirect(t *testing.T, u *url.URL) {
 				t.Run("Clone", doGitClone(t.TempDir(), cloneURL))
 			})
 		}
+
+		doAPICreateOrganization(apiTestContext, &structs.CreateOrgOption{
+			UserName: "olduser2",
+			FullName: "Old User2",
+		})(t)
+
+		cloneURL := createSSHUrl("olduser2/repo1.git", u)
+		t.Run("Clone Should Fail", doGitCloneFail(cloneURL))
+
+		doAPICreateOrganizationRepository(apiTestContext, "olduser2", &structs.CreateRepoOption{
+			Name:     "repo1",
+			AutoInit: true,
+		})(t)
+		testEditFile(t, session, "olduser2", "repo1", "master", "README.md", "This is olduser2's repo1\n")
+
+		dstDir := t.TempDir()
+		t.Run("Clone", doGitClone(dstDir, cloneURL))
+		readMEContent, err := os.ReadFile(dstDir + "/README.md")
+		assert.NoError(t, err)
+		assert.Equal(t, "This is olduser2's repo1\n", string(readMEContent))
+
+		apiTestContext2 := NewAPITestContext(t, "user2", "oldrepo1", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser, auth_model.AccessTokenScopeWriteOrganization)
+		doAPICreateRepository(apiTestContext2, false)(t)
+		testEditFile(t, session, "user2", "oldrepo1", "master", "README.md", "This is user2's oldrepo1\n")
+
+		dstDir = t.TempDir()
+		cloneURL = createSSHUrl("user2/oldrepo1.git", u)
+		t.Run("Clone", doGitClone(dstDir, cloneURL))
+		readMEContent, err = os.ReadFile(dstDir + "/README.md")
+		assert.NoError(t, err)
+		assert.Equal(t, "This is user2's oldrepo1\n", string(readMEContent))
+
+		cloneURL = createSSHUrl("olduser2/oldrepo1.git", u)
+		t.Run("Clone Should Fail", doGitCloneFail(cloneURL))
 	})
 }