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

Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1

Browse Source
This commit is contained in:
Ilya Oleshko 2021-11-09 17:55:35 +03:00
commit 6de5f819ae
7 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
View File

@ -136,7 +136,7 @@ const SimpleFilesRow = (props) => {
);
return (
<StyledWrapper ref={props.selectableRef}>
<StyledWrapper>
<DragAndDrop
data-title={item.title}
value={value}

3
products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
View File

@ -43,6 +43,7 @@ const checkedStyle = css`
const StyledTile = styled.div`
cursor: ${(props) => (!props.isRecycleBin ? "pointer" : "default")};
min-height: 57px;
box-sizing: border-box;
width: 100%;
border: 1px solid #d0d5da;
border-radius: 3px;
@ -226,7 +227,7 @@ const StyledFileTileBottom = styled.div`
${FlexBoxStyles}
padding: 9px 10px;
padding-right: 0;
min-height: 56px;
height: 56px;
box-sizing: border-box;
`;

46
products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
View File

@ -7,34 +7,36 @@ import AutoSizer from "react-virtualized-auto-sizer";
import Heading from "@appserver/components/heading";
import ContextMenu from "@appserver/components/context-menu";
import CustomScrollbarsVirtualList from "@appserver/components/scrollbar";
import { tablet, desktop } from "@appserver/components/utils/device";
const foldersStyle = css`
grid-gap: 19px 14px;
const paddingCss = css`
@media ${desktop} {
margin-left: -1px;
padding-right: 1px;
margin-left: 1px;
padding-right: 3px;
}
@media ${tablet} {
grid-gap: 17px 12px;
margin-left: -1px;
}
`;
const filesStyle = css`
grid-gap: 14px 18px;
const foldersStyle = css`
grid-gap: 19px 16px;
@media ${desktop} {
padding-right: 5px;
}
${paddingCss}
@media ${tablet} {
grid-gap: 12px 14px;
margin-left: -1px;
padding-right: 2px;
grid-gap: 17px 12px;
}
`;
const filesStyle = css`
grid-gap: 14px 16px;
${paddingCss}
@media ${tablet} {
grid-gap: 12px;
}
`;
@ -59,10 +61,6 @@ const StyledTileContainer = styled.div`
}
&.folder {
padding: 0;
.drag-and-drop {
margin: 0px;
}
}
}
@ -74,16 +72,6 @@ const StyledTileContainer = styled.div`
&.files {
padding-top: 8px;
}
margin-left: -1px;
}
@media (min-width: 1024px) {
.tile-item-wrapper {
&.file {
margin-left: 1px;
}
}
}
@media ${tablet} {

2
products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
View File

@ -315,6 +315,8 @@ namespace ASC.Files.Core
Stream GetThumbnail(File<T> file);
Task<Stream> GetThumbnailAsync(File<T> file);
IEnumerable<(File<int>, SmallShareRecord)> GetFeeds(int tenant, DateTime from, DateTime to);
IEnumerable<int> GetTenantsWithFeeds(DateTime fromTime);

10
products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
View File

@ -1304,6 +1304,16 @@ namespace ASC.Files.Core.Data
return storage.GetReadStream(string.Empty, path);
}
public async Task<Stream> GetThumbnailAsync(File<int> file)
{
var thumnailName = ThumbnailTitle + "." + Global.ThumbnailExtension;
var path = GetUniqFilePath(file, thumnailName);
var storage = GlobalStore.GetStore();
var isExist = await storage.IsFileAsync(string.Empty, path);
if (!isExist) throw new FileNotFoundException();
return await storage.GetReadStreamAsync(string.Empty, path, 0);
}
#endregion
private Func<Selector<DbFile>, Selector<DbFile>> GetFuncForSearch(object parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, bool withSubfolders = false)

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

@ -80,6 +80,11 @@ namespace ASC.Files.Thirdparty
return null;
}
public Task<Stream> GetThumbnailAsync(File<string> file)
{
return null;
}
public virtual Stream GetFileStream(File<string> file)
{
return null;

2
products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
View File

@ -1004,7 +1004,7 @@ namespace ASC.Web.Files
context.Response.Headers.Add("Content-Disposition", ContentDispositionUtil.GetHeaderValue("." + Global.ThumbnailExtension));
context.Response.ContentType = MimeMapping.GetMimeMapping("." + Global.ThumbnailExtension);
using (var stream = fileDao.GetThumbnail(file))
using (var stream = await fileDao.GetThumbnailAsync(file))
{
context.Response.Headers.Add("Content-Length", stream.Length.ToString(CultureInfo.InvariantCulture));
await stream.CopyToAsync(context.Response.Body);