feat(repo): enable delete directory

Author: brymut

options/locale/locale_en-US.ini

@@ -1358,6 +1358,8 @@ 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

routers/web/repo/editor.go

@@ -384,35 +384,81 @@ func DeleteFile(ctx *context.Context) {
 	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() {
 		return
 	}
 
 	treePath := ctx.Repo.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{
+
+	// 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 filesToDelete []*files_service.ChangeRepoFile
+	var commitMessage string
+
+	if entry.IsDir() {
+		// Get all files in the directory recursively
+		tree, err := ctx.Repo.Commit.SubTree(treePath)
+		if err != nil {
+			ctx.ServerError("SubTree", err)
+			return
+		}
+
+		entries, err := tree.ListEntriesRecursiveFast()
+		if err != nil {
+			ctx.ServerError("ListEntriesRecursiveFast", err)
+			return
+		}
+
+		// Create delete operations for all files in the directory
+		for _, e := range entries {
+			if !e.IsDir() && !e.IsSubModule() {
+				filesToDelete = append(filesToDelete, &files_service.ChangeRepoFile{
+					Operation: "delete",
+					TreePath:  treePath + "/" + e.Name(),
+				})
+			}
+		}
+
+		commitMessage = parsed.GetCommitMessage(ctx.Locale.TrString("repo.editor.delete_directory", treePath))
+	} else {
+		// Single file deletion
+		filesToDelete = []*files_service.ChangeRepoFile{
 			{
 				Operation: "delete",
 				TreePath:  treePath,
 			},
-		},
-		Message:   parsed.GetCommitMessage(ctx.Locale.TrString("repo.editor.delete", treePath)),
-		Signoff:   parsed.form.Signoff,
-		Author:    parsed.GitCommitter,
-		Committer: parsed.GitCommitter,
+		}
+		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:        filesToDelete,
+		Message:      commitMessage,
+		Signoff:      parsed.form.Signoff,
+		Author:       parsed.GitCommitter,
+		Committer:    parsed.GitCommitter,
 	})
 	if err != nil {
 		editorHandleFileOperationError(ctx, parsed.NewBranchName, err)
 		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)
 }

templates/repo/view_content.tmpl

@@ -93,7 +93,7 @@
 					<a class="item" data-clipboard-text="{{AppUrl}}{{StringUtils.TrimPrefix .Repository.Link "/"}}/src/commit/{{.CommitID}}/{{PathEscapeSegments .TreePath}}">
 						{{svg "octicon-link" 16 "tw-mr-2"}}{{ctx.Locale.Tr "repo.file_copy_permalink"}}
 					</a>
-					{{if and (.Permission.CanWrite ctx.Consts.RepoUnitTypeCode) (not .Repository.IsArchived)}}
+					{{if and (.Permission.CanWrite ctx.Consts.RepoUnitTypeCode) (not .Repository.IsArchived) (not $isTreePathRoot)}}
 						<div class="divider"></div>
 						<a class="item" href="{{.RepoLink}}/_delete/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">
 							{{svg "octicon-trash" 16 "tw-mr-2"}}{{ctx.Locale.Tr "repo.editor.delete_this_directory"}}

web_src/js/components/ViewFileTree.vue

@@ -151,7 +151,8 @@ function handleSearchResultClick(filePath: string) {
           @mouseenter="selectedIndex = idx"
           :title="result.matchResult.join('')"
         >
-          <span v-html="svg('octicon-file', 16)"></span>
+          <!-- eslint-disable-next-line vue/no-v-html -->
+          <span v-html="svg('octicon-file', 16)"/>
           <span class="file-tree-search-result-path">
             <span 
               v-for="(part, index) in result.matchResult" 
@@ -209,7 +210,7 @@ function handleSearchResultClick(filePath: string) {
   border-bottom: 1px solid var(--color-secondary);
 }
 
-.file-tree-search-result-item svg {
+.file-tree-search-result-item > span:first-child {
   flex-shrink: 0;
   margin-top: 0.125rem;
 }