From 7691ab5f90a224402af355ec6b7aef4635e76f19 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Thu, 26 May 2022 17:03:43 +0300 Subject: [PATCH 1/3] fix 57359 --- .../Core/Core/Dao/TeamlabDao/SecurityDao.cs | 15 +++++++++------ .../ASC.Files/Core/Core/Security/ISecurityDao.cs | 2 +- .../Core/Thirdparty/IThirdPartyProviderDao.cs | 4 ++-- .../Thirdparty/ProviderDao/ProviderSecutiryDao.cs | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs index 4834764de2..a4ff4ae004 100644 --- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs +++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs @@ -188,7 +188,7 @@ namespace ASC.Files.Core.Data } } - public ValueTask> GetSharesAsync(IEnumerable subjects) + public Task> GetSharesAsync(IEnumerable 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> FromQueryAsync(IQueryable filesSecurities) + protected async Task> FromQueryAsync(IQueryable filesSecurities) { - return filesSecurities - .AsAsyncEnumerable() - .SelectAwait(async e => await ToFileShareRecordAsync(e)) - .ToListAsync(); + var data = await filesSecurities.ToListAsync(); + var result = new List(); + foreach (var file in data) + { + result.Add(await ToFileShareRecordAsync(file)); + } + return result; } private async Task ToFileShareRecordAsync(DbFilesSecurity r) diff --git a/products/ASC.Files/Core/Core/Security/ISecurityDao.cs b/products/ASC.Files/Core/Core/Security/ISecurityDao.cs index 1863c314f9..82b18ce022 100644 --- a/products/ASC.Files/Core/Core/Security/ISecurityDao.cs +++ b/products/ASC.Files/Core/Core/Security/ISecurityDao.cs @@ -37,7 +37,7 @@ namespace ASC.Files.Core.Security { Task SetShareAsync(FileShareRecord r); - ValueTask> GetSharesAsync(IEnumerable subjects); + Task> GetSharesAsync(IEnumerable subjects); Task> GetSharesAsync(IEnumerable> entry); diff --git a/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs index 22130ed29a..55d1175659 100644 --- a/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs +++ b/products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs @@ -367,10 +367,10 @@ namespace ASC.Files.Thirdparty return Task.CompletedTask; } - public ValueTask> GetSharesAsync(IEnumerable subjects) + public Task> GetSharesAsync(IEnumerable subjects) { List result = null; - return new ValueTask>(result); + return Task>.FromResult(result); } public Task> GetSharesAsync(IEnumerable> entry) diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs index 4dbb81548e..e7e1824397 100644 --- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs +++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs @@ -190,7 +190,7 @@ namespace ASC.Files.Thirdparty.ProviderDao return SecurityDao.RemoveSubjectAsync(subject); } - public ValueTask> GetSharesAsync(IEnumerable subjects) + public Task> GetSharesAsync(IEnumerable subjects) { return SecurityDao.GetSharesAsync(subjects); } From 26a7533ac749dede4361a851c3f892147af34056 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Thu, 26 May 2022 17:07:27 +0300 Subject: [PATCH 2/3] Web:Files:DragTooltip: increase z-index --- .../ASC.Files/Client/src/components/DragTooltip/DragTooltip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/ASC.Files/Client/src/components/DragTooltip/DragTooltip.js b/products/ASC.Files/Client/src/components/DragTooltip/DragTooltip.js index 9bf91e28ba..97e024ec5e 100644 --- a/products/ASC.Files/Client/src/components/DragTooltip/DragTooltip.js +++ b/products/ASC.Files/Client/src/components/DragTooltip/DragTooltip.js @@ -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; From 66ad7f5c9e30a208cc8d78981492339a08c3bce2 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Thu, 26 May 2022 17:29:57 +0300 Subject: [PATCH 3/3] fix 57358 --- .../Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs index 34ea3d3dea..b02997ee67 100644 --- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs +++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs @@ -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