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

Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner

Browse Source
This commit is contained in:
Viktor Fomin 2022-05-26 18:07:41 +03:00
commit 437808b6bd
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
products/ASC.Files/Client/src/components/DragTooltip/DragTooltip.js
View File

@ -7,7 +7,7 @@ import { Base } from "@appserver/components/themes";
const StyledTooltip = styled.div`
position: fixed;
padding: 8px;
z-index: 150;
z-index: 250;
background: ${(props) => props.theme.filesDragTooltip.background};
border-radius: 6px;
font-size: 15px;

15
products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
View File

@ -188,7 +188,7 @@ namespace ASC.Files.Core.Data
}
}
public ValueTask<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects)
public Task<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects)
{
var q = GetQuery(r => subjects.Contains(r.Subject));
return FromQueryAsync(q);
@ -383,12 +383,15 @@ namespace ASC.Files.Core.Data
return q;
}
protected ValueTask<List<FileShareRecord>> FromQueryAsync(IQueryable<DbFilesSecurity> filesSecurities)
protected async Task<List<FileShareRecord>> FromQueryAsync(IQueryable<DbFilesSecurity> filesSecurities)
{
return filesSecurities
.AsAsyncEnumerable()
.SelectAwait(async e => await ToFileShareRecordAsync(e))
.ToListAsync();
var data = await filesSecurities.ToListAsync();
var result = new List<FileShareRecord>();
foreach (var file in data)
{
result.Add(await ToFileShareRecordAsync(file));
}
return result;
}
private async Task<FileShareRecord> ToFileShareRecordAsync(DbFilesSecurity r)

2
products/ASC.Files/Core/Core/Security/ISecurityDao.cs
View File

@ -37,7 +37,7 @@ namespace ASC.Files.Core.Security
{
Task SetShareAsync(FileShareRecord r);
ValueTask<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects);
Task<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects);
Task<IEnumerable<FileShareRecord>> GetSharesAsync(IEnumerable<FileEntry<T>> entry);

4
products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs vendored
View File

@ -367,10 +367,10 @@ namespace ASC.Files.Thirdparty
return Task.CompletedTask;
}
public ValueTask<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects)
public Task<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects)
{
List<FileShareRecord> result = null;
return new ValueTask<List<FileShareRecord>>(result);
return Task<List<FileShareRecord>>.FromResult(result);
}
public Task<IEnumerable<FileShareRecord>> GetSharesAsync(IEnumerable<FileEntry<string>> entry)

2
products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs vendored
View File

@ -440,7 +440,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
{
var selector = GetSelector(file.ID);
var fileDao = selector.GetFileDao(file.ID);
return UseTrashForRemove(file);
return fileDao.UseTrashForRemove(file);
}
#region chunking

2
products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs vendored
View File

@ -190,7 +190,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
return SecurityDao.RemoveSubjectAsync(subject);
}
public ValueTask<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects)
public Task<List<FileShareRecord>> GetSharesAsync(IEnumerable<Guid> subjects)
{
return SecurityDao.GetSharesAsync(subjects);
}