clean up

Author: wxiaoguang

routers/web/repo/treelist.go

@@ -4,7 +4,6 @@
 package repo
 
 import (
-	"errors"
 	"net/http"
 
 	pull_model "code.gitea.io/gitea/models/pull"
@@ -87,24 +86,11 @@ func transformDiffTreeForUI(diffTree *gitdiff.DiffTree, filesViewedState map[str
 	return files
 }
 
-func Tree(ctx *context.Context) {
-	recursive := ctx.FormBool("recursive")
-
-	if ctx.Repo.RefFullName == "" {
-		ctx.ServerError("RefFullName", errors.New("ref_name is invalid"))
-		return
-	}
-
-	var results []*files_service.TreeViewNode
-	var err error
-	if !recursive {
-		results, err = files_service.GetTreeViewNodes(ctx, ctx.Repo.Commit, ctx.Repo.TreePath, "")
-	} else {
-		results, err = files_service.GetTreeViewNodes(ctx, ctx.Repo.Commit, "", ctx.Repo.TreePath)
-	}
+func TreeViewNodes(ctx *context.Context) {
+	results, err := files_service.GetTreeViewNodes(ctx, ctx.Repo.Commit, ctx.Repo.TreePath, ctx.FormString("sub_path"))
 	if err != nil {
-		ctx.ServerError("GetTreeInformation", err)
+		ctx.ServerError("GetTreeViewNodes", err)
 		return
 	}
-	ctx.JSON(http.StatusOK, results)
+	ctx.JSON(http.StatusOK, map[string]any{"fileTreeNodes": results})
 }

routers/web/web.go

@@ -1177,9 +1177,9 @@ func registerRoutes(m *web.Router) {
 			m.Get("/commit/*", context.RepoRefByType(git.RefTypeCommit), repo.TreeList)
 		})
 		m.Group("/tree", func() {
-			m.Get("/branch/*", context.RepoRefByType(git.RefTypeBranch), repo.Tree)
-			m.Get("/tag/*", context.RepoRefByType(git.RefTypeTag), repo.Tree)
-			m.Get("/commit/*", context.RepoRefByType(git.RefTypeCommit), repo.Tree)
+			m.Get("/branch/*", context.RepoRefByType(git.RefTypeBranch), repo.TreeViewNodes)
+			m.Get("/tag/*", context.RepoRefByType(git.RefTypeTag), repo.TreeViewNodes)
+			m.Get("/commit/*", context.RepoRefByType(git.RefTypeCommit), repo.TreeViewNodes)
 		})
 		m.Get("/compare", repo.MustBeNotEmpty, repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.SetWhitespaceBehavior, repo.CompareDiff)
 		m.Combo("/compare/*", repo.MustBeNotEmpty, repo.SetEditorconfigIfExists).

web_src/js/features/repo-view-file-tree-sidebar.ts

@@ -27,22 +27,13 @@ async function toggleSidebar(sidebarEl: HTMLElement, shouldShow: boolean) {
 }
 
 function childrenLoader(sidebarEl: HTMLElement) {
-  return async (path: string, recursive?: boolean) => {
+  return async (treePath: string, subPath: string = '') => {
     const fileTree = sidebarEl.querySelector('#view-file-tree');
-    const apiBaseUrl = fileTree.getAttribute('data-api-base-url');
+    const baseUrl = fileTree.getAttribute('data-api-base-url');
     const refTypeNameSubURL = fileTree.getAttribute('data-current-ref-type-name-sub-url');
-    const response = await GET(`${apiBaseUrl}/tree/${refTypeNameSubURL}/${pathEscapeSegments(path ?? '')}?recursive=${recursive ?? false}`);
+    const response = await GET(`${baseUrl}/tree/${refTypeNameSubURL}/${pathEscapeSegments(treePath)}?sub_path=${encodeURIComponent(subPath)}`);
     const json = await response.json();
-    if (json instanceof Array) {
-      return json.map((i) => ({
-        name: i.name,
-        type: i.type,
-        path: i.path,
-        sub_module_url: i.sub_module_url,
-        children: i.children,
-      }));
-    }
-    return null;
+    return json.fileTreeNodes ?? null;
   };
 }
 
@@ -80,7 +71,7 @@ export async function initViewFileTreeSidebar() {
 
   const selectedItem = ref(getSelectedPath(refString));
 
-  const files = await childrenLoader(sidebarEl)(treePath, true);
+  const files = await childrenLoader(sidebarEl)('', treePath);
 
   fileTree.classList.remove('is-loading');
   const fileTreeView = createApp(ViewFileTree, {files, selectedItem, loadChildren: childrenLoader(sidebarEl), loadContent: (path: string) => {