feat(repo): Optimize warehouse file path display and navigation

Author: lazhenyi

git/src/tree/msg_tree.rs

@@ -124,18 +124,34 @@ impl AppGit {
             for delta in diff.deltas() {
                 let file = delta.new_file();
                 if let Some(path) = file.path() {
+                    if let Some(Some(parent_dir)) = path.parent().map(|x|x.to_str().map(|x|x.to_string())) {
+                        if !has.contains(&parent_dir.to_string()) {
+                            if let Some(item) = state_tree.iter().find(|x| x.to_path().starts_with(&parent_dir)) {
+                                if item.rtype == "tree".to_string() {
+                                    let msg_index = result.insert_data(msg.clone());
+                                    result.file.push((item.clone(), msg_index));
+                                    has.push(parent_dir.to_string());
+                                }
+                            }
+                        }
+                    }
                     if let Some(path) = path.to_str().map(|x| x.to_string()) {
                         if has.contains(&path) {
                             continue;
                         }
                         if let Some(item) = state_tree.iter().find(|x| x.to_path() == path) {
-                            let msg_index = result.insert_data(msg.clone());
-                            result.file.push((item.clone(), msg_index));
-                            has.push(item.to_path());
+                            if item.rtype == "blob".to_string() {
+                                let msg_index = result.insert_data(msg.clone());
+                                result.file.push((item.clone(), msg_index));
+                                has.push(item.to_path());
+                            }
                         }
                     }
                 }
             }
+            if has.len() == state_tree.len() {
+                break;
+            }
             commit = parent;
         }
         Ok(result)

views/src/app/repository/files.tsx

@@ -46,7 +46,7 @@ interface FileApiResponse {
 }
 
 export const RepoFiles = () => {
-    const { owner, repo, path } = useParams<{ owner: string; repo: string; path?: string }>();
+    const { owner, repo, '*': path } = useParams();
     const navigate = useNavigate();
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState<string | null>(null);
@@ -112,14 +112,26 @@ export const RepoFiles = () => {
             {files.length ? (
                 <div className="h-[calc(100vh-250px)] overflow-auto">
                     <div>
+                        {
+                            path != "" && path && (
+                                <div>
+                                    <div className="flex items-center" onClick={() => {
+                                        navigate(`/${owner}/${repo}/tree/${path.split('/').slice(0, -1).join('/')}`);
+                                    }}>
+                                        <GitBranch size={18} className="mr-2 text-blue-500" />
+                                        <div>...</div>
+                                    </div>
+                                </div>
+                            )
+                        }
                         {files.map(([file, idx], index) => (
                             <div 
                                 key={index}
                                 className={`cursor-pointer ${index === files.length - 1 ? '' : 'border-b border-gray-200'} flex items-center justify-between`}
                                 onClick={() => {
                                     if (file.rtype === 'tree') {
                                         const newPath = path ? `${path}/${file.name}` : file.name;
-                                        navigate(`/repo/${owner}/${repo}/tree/${newPath}`);
+                                        navigate(`/${owner}/${repo}/tree/${newPath}`);
                                     }
                                 }}
                             >

views/src/routes.tsx

@@ -62,7 +62,7 @@ export default function AppRoutes() {
                     element: <RepoCommit/>
                 },
                 {
-                    path: 'tree/:path*',
+                    path: 'tree/*',
                     element: <RepoFiles/>
                 }
             ]