add tests

Author: wxiaoguang

routers/web/repo/treelist.go

@@ -60,14 +60,13 @@ func isExcludedEntry(entry *git.TreeEntry) bool {
 
 // WebDiffFileItem is used by frontend, check the field names in frontend before changing
 type WebDiffFileItem struct {
-	FullName            string
-	DisplayName         string
-	NameHash            string
-	DiffStatus          string
-	EntryMode           string
-	IsViewed            bool
-	Children            []*WebDiffFileItem
-	ViewedChildrenCount int
+	FullName    string
+	DisplayName string
+	NameHash    string
+	DiffStatus  string
+	EntryMode   string
+	IsViewed    bool
+	Children    []*WebDiffFileItem
 }
 
 // WebDiffFileTree is used by frontend, check the field names in frontend before changing
@@ -77,24 +76,9 @@ type WebDiffFileTree struct {
 
 // transformDiffTreeForWeb transforms a gitdiff.DiffTree into a WebDiffFileTree for Web UI rendering
 // it also takes a map of file names to their viewed state, which is used to mark files as viewed
-// TODO: add some tests
 func transformDiffTreeForWeb(diffTree *gitdiff.DiffTree, filesViewedState map[string]pull_model.ViewedState) (dft WebDiffFileTree) {
 	dirNodes := map[string]*WebDiffFileItem{"": &dft.TreeRoot}
-	for _, file := range diffTree.Files {
-		item := &WebDiffFileItem{FullName: file.HeadPath, DiffStatus: file.Status}
-		// FIXME: filesViewedState is always nil?
-		item.IsViewed = filesViewedState[item.FullName] == pull_model.Viewed
-		item.NameHash = git.HashFilePathForWebUI(item.FullName)
-
-		switch file.HeadMode {
-		case git.EntryModeTree:
-			item.EntryMode = "tree"
-		case git.EntryModeCommit:
-			item.EntryMode = "commit" // submodule
-		default:
-			// default to empty, and will be treated as "blob" file because there is no "symlink" support yet
-		}
-
+	addItem := func(item *WebDiffFileItem) {
 		var parentPath string
 		pos := strings.LastIndexByte(item.FullName, '/')
 		if pos == -1 {
@@ -121,8 +105,37 @@ func transformDiffTreeForWeb(diffTree *gitdiff.DiffTree, filesViewedState map[st
 		parentNode.Children = append(parentNode.Children, item)
 	}
 
-	// TODO: merge into one level if there is only one sub directory
+	for _, file := range diffTree.Files {
+		item := &WebDiffFileItem{FullName: file.HeadPath, DiffStatus: file.Status}
+		// FIXME: filesViewedState is always nil?
+		item.IsViewed = filesViewedState[item.FullName] == pull_model.Viewed
+		item.NameHash = git.HashFilePathForWebUI(item.FullName)
+
+		switch file.HeadMode {
+		case git.EntryModeTree:
+			item.EntryMode = "tree"
+		case git.EntryModeCommit:
+			item.EntryMode = "commit" // submodule
+		default:
+			// default to empty, and will be treated as "blob" file because there is no "symlink" support yet
+		}
+		addItem(item)
+	}
 
+	var mergeSingleDir func(node *WebDiffFileItem)
+	mergeSingleDir = func(node *WebDiffFileItem) {
+		if len(node.Children) == 1 {
+			if child := node.Children[0]; child.EntryMode == "tree" {
+				node.FullName = child.FullName
+				node.DisplayName = node.DisplayName + "/" + child.DisplayName
+				node.Children = child.Children
+				mergeSingleDir(node)
+			}
+		}
+	}
+	for _, node := range dft.TreeRoot.Children {
+		mergeSingleDir(node)
+	}
 	return dft
 }
 

routers/web/repo/treelist_test.go

@@ -0,0 +1,60 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package repo
+
+import (
+	"testing"
+
+	pull_model "code.gitea.io/gitea/models/pull"
+	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/services/gitdiff"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTransformDiffTreeForWeb(t *testing.T) {
+	ret := transformDiffTreeForWeb(&gitdiff.DiffTree{Files: []*gitdiff.DiffTreeRecord{
+		{
+			Status:   "changed",
+			HeadPath: "dir-a/dir-a-x/file-deep",
+			HeadMode: git.EntryModeBlob,
+		},
+		{
+			Status:   "added",
+			HeadPath: "file1",
+			HeadMode: git.EntryModeBlob,
+		},
+	}}, map[string]pull_model.ViewedState{
+		"dir-a/dir-a-x/file-deep": pull_model.Viewed,
+	})
+
+	assert.Equal(t, WebDiffFileTree{
+		TreeRoot: WebDiffFileItem{
+			Children: []*WebDiffFileItem{
+				{
+					EntryMode:   "tree",
+					DisplayName: "dir-a/dir-a-x",
+					FullName:    "dir-a/dir-a-x",
+					Children: []*WebDiffFileItem{
+						{
+							EntryMode:   "",
+							DisplayName: "file-deep",
+							FullName:    "dir-a/dir-a-x/file-deep",
+							NameHash:    "4acf7eef1c943a09e9f754e93ff190db8583236b",
+							DiffStatus:  "changed",
+							IsViewed:    true,
+						},
+					},
+				},
+				{
+					EntryMode:   "",
+					DisplayName: "file1",
+					FullName:    "file1",
+					NameHash:    "60b27f004e454aca81b0480209cce5081ec52390",
+					DiffStatus:  "added",
+				},
+			},
+		},
+	}, ret)
+}

web_src/js/modules/diff-file.ts

@@ -13,7 +13,6 @@ export type DiffTreeEntry = {
   EntryMode: string,
   IsViewed: boolean,
   Children: DiffTreeEntry[],
-  ViewedChildrenCount: number,
 
   ParentEntry?: DiffTreeEntry,
 }