IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Files: terminate task

Browse Source
This commit is contained in:
pavelbannov 2023-09-27 18:30:12 +03:00
parent b0e4cbc618
commit be87b5bef9
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
products/ASC.Files/Core/Core/FileStorageService.cs
View File

@ -1957,9 +1957,9 @@ public class FileStorageService //: IFileStorageService
return _fileOperationsManager.GetOperationResults(_authContext.CurrentAccount.ID);
}
public List<FileOperationResult> TerminateTasks()
public List<FileOperationResult> TerminateTasks(string id = null)
{
return _fileOperationsManager.CancelOperations(_authContext.CurrentAccount.ID);
return _fileOperationsManager.CancelOperations(_authContext.CurrentAccount.ID, id);
}
public async Task<List<FileOperationResult>> BulkDownloadAsync(Dictionary<JsonElement, string> folders, Dictionary<JsonElement, string> files)

4
products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
View File

@ -90,10 +90,10 @@ public class FileOperationsManager
return results;
}
public List<FileOperationResult> CancelOperations(Guid userId)
public List<FileOperationResult> CancelOperations(Guid userId, string id = null)
{
var operations = _tasks.GetAllTasks()
.Where(t => new Guid(t[FileOperation.Owner]) == userId);
.Where(t => (string.IsNullOrEmpty(id) || t.Id == id) && new Guid(t[FileOperation.Owner]) == userId);
foreach (var o in operations)
{

6
products/ASC.Files/Server/Api/OperationController.cs
View File

@ -241,10 +241,10 @@ public class OperationController : ApiControllerBase
/// <httpMethod>PUT</httpMethod>
/// <collection>list</collection>
[AllowAnonymous]
[HttpPut("fileops/terminate")]
public async IAsyncEnumerable<FileOperationDto> TerminateTasks()
[HttpPut("fileops/terminate/{id?}")]
public async IAsyncEnumerable<FileOperationDto> TerminateTasks(string id = null)
{
var tasks = _fileStorageService.TerminateTasks();
var tasks = _fileStorageService.TerminateTasks(id);
foreach (var e in tasks)
{