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

Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0

Browse Source
This commit is contained in:
Maria Sukhova 2023-04-07 12:02:02 +03:00
commit 8e1afab998
7 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/store/HotkeyStore.js
View File

@ -51,7 +51,7 @@ class HotkeyStore {
//console.log("element is not visible");
}
} else {
scroll.scrollTo(0, this.elemOffset - scrollRect.height / 2);
scroll?.scrollTo(0, this.elemOffset - scrollRect.height / 2);
}
};

2
packages/common/components/Article/sub-components/article-live-chat.js
View File

@ -76,7 +76,7 @@ const ArticleLiveChat = ({
defer
zendeskKey={zendeskKey}
onLoaded={onZendeskLoaded}
zIndex={99}
zIndex={201}
/>
) : (
<></>

16
packages/components/tooltip/styled-tooltip.js
View File

@ -48,6 +48,22 @@ const StyledTooltip = styled.div`
.__react_component_tooltip.place-bottom::after {
border-bottom: none !important;
}
.__react_component_tooltip.place-left::before{
background: none; !important;
}
.__react_component_tooltip.place-right::before{
background: none; !important;
}
.__react_component_tooltip.place-top::before {
background: none; !important;
}
.__react_component_tooltip.place-bottom::before {
background: none; !important;
}
`;
StyledTooltip.defaultProps = {

7
products/ASC.Files/Service/Core/FilesModule.cs
View File

@ -43,19 +43,22 @@ public class FilesModule : FeedModule
private readonly IFileDao<int> _fileDao;
private readonly IFolderDao<int> _folderDao;
private readonly UserManager _userManager;
private readonly TenantUtil _tenantUtil;
public FilesModule(
TenantManager tenantManager,
UserManager userManager,
WebItemSecurity webItemSecurity,
FileSecurity fileSecurity,
IDaoFactory daoFactory)
IDaoFactory daoFactory,
TenantUtil tenantUtil)
: base(tenantManager, webItemSecurity)
{
_fileDao = daoFactory.GetFileDao<int>();
_folderDao = daoFactory.GetFolderDao<int>();
_userManager = userManager;
_fileSecurity = fileSecurity;
_tenantUtil = tenantUtil;
}
public override bool VisibleFor(Feed.Aggregator.Feed feed, object data, Guid userId)
@ -180,7 +183,7 @@ public class FilesModule : FeedModule
}
var updated = file.Version != 1;
var fileModifiedUtc = file.ModifiedOn.ToUniversalTime();
var fileModifiedUtc = _tenantUtil.DateTimeToUtc(file.ModifiedOn);
return new Feed.Aggregator.Feed(file.ModifiedBy, fileModifiedUtc)
{

7
products/ASC.Files/Service/Core/FoldersModule.cs
View File

@ -42,18 +42,21 @@ public class FoldersModule : FeedModule
private readonly FileSecurity _fileSecurity;
private readonly IFolderDao<int> _folderDao;
private readonly UserManager _userManager;
private readonly TenantUtil _tenantUtil;
public FoldersModule(
TenantManager tenantManager,
UserManager userManager,
WebItemSecurity webItemSecurity,
FileSecurity fileSecurity,
IDaoFactory daoFactory)
IDaoFactory daoFactory,
TenantUtil tenantUtil)
: base(tenantManager, webItemSecurity)
{
_userManager = userManager;
_fileSecurity = fileSecurity;
_folderDao = daoFactory.GetFolderDao<int>();
_tenantUtil = tenantUtil;
}
public override bool VisibleFor(Feed.Aggregator.Feed feed, object data, Guid userId)
@ -137,7 +140,7 @@ public class FoldersModule : FeedModule
return feed;
}
var folderCreatedUtc = folder.CreateOn.ToUniversalTime();
var folderCreatedUtc = _tenantUtil.DateTimeToUtc(folder.CreateOn);
return new Feed.Aggregator.Feed(folder.CreateBy, folderCreatedUtc)
{

7
products/ASC.Files/Service/Core/RoomsModule.cs
View File

@ -37,18 +37,21 @@ public class RoomsModule : FeedModule
private readonly IFolderDao<int> _folderDao;
private readonly UserManager _userManager;
private readonly FileSecurity _fileSecurity;
private readonly TenantUtil _tenantUtil;
public RoomsModule(
TenantManager tenantManager,
UserManager userManager,
WebItemSecurity webItemSecurity,
FileSecurity fileSecurity,
IDaoFactory daoFactory)
IDaoFactory daoFactory,
TenantUtil tenantUtil)
: base(tenantManager, webItemSecurity)
{
_userManager = userManager;
_fileSecurity = fileSecurity;
_folderDao = daoFactory.GetFolderDao<int>();
_tenantUtil = tenantUtil;
}
public override string Name => Constants.RoomsModule;
@ -111,7 +114,7 @@ public class RoomsModule : FeedModule
if (shareRecord == null)
{
var roomCreatedUtc = room.CreateOn.ToUniversalTime();
var roomCreatedUtc = _tenantUtil.DateTimeToUtc(room.CreateOn);
return new Feed.Aggregator.Feed(room.CreateBy, roomCreatedUtc)
{

7
products/ASC.Files/Service/Core/UsersModule.cs
View File

@ -33,6 +33,7 @@ public class UsersModule : FeedModule
{
private readonly UserManager _userManager;
private readonly DisplayUserSettingsHelper _displayUserSettingsHelper;
private readonly TenantUtil _tenantUtil;
private const string UserItem = Constants.UserItem;
@ -40,11 +41,13 @@ public class UsersModule : FeedModule
TenantManager tenantManager,
WebItemSecurity webItemSecurity,
UserManager userManager,
DisplayUserSettingsHelper displayUserSettingsHelper)
DisplayUserSettingsHelper displayUserSettingsHelper,
TenantUtil tenantUtil)
: base(tenantManager, webItemSecurity)
{
_userManager = userManager;
_displayUserSettingsHelper = displayUserSettingsHelper;
_tenantUtil = tenantUtil;
}
public override string Name => Constants.UsersModule;
@ -68,7 +71,7 @@ public class UsersModule : FeedModule
{
var fullName = _displayUserSettingsHelper.GetFullUserName(u);
var feed = new Feed.Aggregator.Feed(u.Id, u.LastModified.ToUniversalTime(), true)
var feed = new Feed.Aggregator.Feed(u.Id, _tenantUtil.DateTimeToUtc(u.LastModified), true)
{
Item = UserItem,
ItemId = u.Id.ToString(),