mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-04 05:18:25 +00:00 
			
		
		
		
	Modify Diff View FileTree to show all files ## Changes * removes Show Status button on diff * uses `git diff-tree` to generate the file tree for the diff * doesn't reload the diff tree each time we load more files in the preview * selecting and unloaded file will keep loading until that file is loaded * removes `DiffFileList.vue` and "Show Stats" in diff options ## Open Questions * selecting and unloaded file will keep loading until that file is loaded. Is this behaviour okay? It matches what github does. ### Demo In this demo I set `git.MAX_GIT_DIFF_FILES=1` in my `app.ini` to demonstrate a worst case example. In most cases the behaviour isn't nearly as jarring as we load a bunch of files at a time. https://github.com/user-attachments/assets/72f29663-d6fc-472d-94fa-7fb5950c2836 --------- Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
		
			
				
	
	
		
			87 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			TypeScript
		
	
	
	
	
	
			
		
		
	
	
			87 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			TypeScript
		
	
	
	
	
	
import {mergeChildIfOnlyOneDir, pathListToTree, type File} from './filetree.ts';
 | 
						|
 | 
						|
const emptyList: File[] = [];
 | 
						|
const singleFile = [{Name: 'file1'}] as File[];
 | 
						|
const singleDir = [{Name: 'dir1/file1'}] as File[];
 | 
						|
const nestedDir = [{Name: 'dir1/dir2/file1'}] as File[];
 | 
						|
const multiplePathsDisjoint = [{Name: 'dir1/dir2/file1'}, {Name: 'dir3/file2'}] as File[];
 | 
						|
const multiplePathsShared = [{Name: 'dir1/dir2/dir3/file1'}, {Name: 'dir1/file2'}] as File[];
 | 
						|
 | 
						|
test('pathListToTree', () => {
 | 
						|
  expect(pathListToTree(emptyList)).toEqual([]);
 | 
						|
  expect(pathListToTree(singleFile)).toEqual([
 | 
						|
    {isFile: true, name: 'file1', path: 'file1', file: {Name: 'file1'}},
 | 
						|
  ]);
 | 
						|
  expect(pathListToTree(singleDir)).toEqual([
 | 
						|
    {isFile: false, name: 'dir1', path: 'dir1', children: [
 | 
						|
      {isFile: true, name: 'file1', path: 'dir1/file1', file: {Name: 'dir1/file1'}},
 | 
						|
    ]},
 | 
						|
  ]);
 | 
						|
  expect(pathListToTree(nestedDir)).toEqual([
 | 
						|
    {isFile: false, name: 'dir1', path: 'dir1', children: [
 | 
						|
      {isFile: false, name: 'dir2', path: 'dir1/dir2', children: [
 | 
						|
        {isFile: true, name: 'file1', path: 'dir1/dir2/file1', file: {Name: 'dir1/dir2/file1'}},
 | 
						|
      ]},
 | 
						|
    ]},
 | 
						|
  ]);
 | 
						|
  expect(pathListToTree(multiplePathsDisjoint)).toEqual([
 | 
						|
    {isFile: false, name: 'dir1', path: 'dir1', children: [
 | 
						|
      {isFile: false, name: 'dir2', path: 'dir1/dir2', children: [
 | 
						|
        {isFile: true, name: 'file1', path: 'dir1/dir2/file1', file: {Name: 'dir1/dir2/file1'}},
 | 
						|
      ]},
 | 
						|
    ]},
 | 
						|
    {isFile: false, name: 'dir3', path: 'dir3', children: [
 | 
						|
      {isFile: true, name: 'file2', path: 'dir3/file2', file: {Name: 'dir3/file2'}},
 | 
						|
    ]},
 | 
						|
  ]);
 | 
						|
  expect(pathListToTree(multiplePathsShared)).toEqual([
 | 
						|
    {isFile: false, name: 'dir1', path: 'dir1', children: [
 | 
						|
      {isFile: false, name: 'dir2', path: 'dir1/dir2', children: [
 | 
						|
        {isFile: false, name: 'dir3', path: 'dir1/dir2/dir3', children: [
 | 
						|
          {isFile: true, name: 'file1', path: 'dir1/dir2/dir3/file1', file: {Name: 'dir1/dir2/dir3/file1'}},
 | 
						|
        ]},
 | 
						|
      ]},
 | 
						|
      {isFile: true, name: 'file2', path: 'dir1/file2', file: {Name: 'dir1/file2'}},
 | 
						|
    ]},
 | 
						|
  ]);
 | 
						|
});
 | 
						|
 | 
						|
const mergeChildWrapper = (testCase: File[]) => {
 | 
						|
  const tree = pathListToTree(testCase);
 | 
						|
  mergeChildIfOnlyOneDir(tree);
 | 
						|
  return tree;
 | 
						|
};
 | 
						|
 | 
						|
test('mergeChildIfOnlyOneDir', () => {
 | 
						|
  expect(mergeChildWrapper(emptyList)).toEqual([]);
 | 
						|
  expect(mergeChildWrapper(singleFile)).toEqual([
 | 
						|
    {isFile: true, name: 'file1', path: 'file1', file: {Name: 'file1'}},
 | 
						|
  ]);
 | 
						|
  expect(mergeChildWrapper(singleDir)).toEqual([
 | 
						|
    {isFile: false, name: 'dir1', path: 'dir1', children: [
 | 
						|
      {isFile: true, name: 'file1', path: 'dir1/file1', file: {Name: 'dir1/file1'}},
 | 
						|
    ]},
 | 
						|
  ]);
 | 
						|
  expect(mergeChildWrapper(nestedDir)).toEqual([
 | 
						|
    {isFile: false, name: 'dir1/dir2', path: 'dir1/dir2', children: [
 | 
						|
      {isFile: true, name: 'file1', path: 'dir1/dir2/file1', file: {Name: 'dir1/dir2/file1'}},
 | 
						|
    ]},
 | 
						|
  ]);
 | 
						|
  expect(mergeChildWrapper(multiplePathsDisjoint)).toEqual([
 | 
						|
    {isFile: false, name: 'dir1/dir2', path: 'dir1/dir2', children: [
 | 
						|
      {isFile: true, name: 'file1', path: 'dir1/dir2/file1', file: {Name: 'dir1/dir2/file1'}},
 | 
						|
    ]},
 | 
						|
    {isFile: false, name: 'dir3', path: 'dir3', children: [
 | 
						|
      {isFile: true, name: 'file2', path: 'dir3/file2', file: {Name: 'dir3/file2'}},
 | 
						|
    ]},
 | 
						|
  ]);
 | 
						|
  expect(mergeChildWrapper(multiplePathsShared)).toEqual([
 | 
						|
    {isFile: false, name: 'dir1', path: 'dir1', children: [
 | 
						|
      {isFile: false, name: 'dir2/dir3', path: 'dir1/dir2/dir3', children: [
 | 
						|
        {isFile: true, name: 'file1', path: 'dir1/dir2/dir3/file1', file: {Name: 'dir1/dir2/dir3/file1'}},
 | 
						|
      ]},
 | 
						|
      {isFile: true, name: 'file2', path: 'dir1/file2', file: {Name: 'dir1/file2'}},
 | 
						|
    ]},
 | 
						|
  ]);
 | 
						|
});
 |