From a5df540a9ba48308d7690136e53d590064643970 Mon Sep 17 00:00:00 2001 From: gazizova-vlada Date: Fri, 7 Apr 2023 10:36:17 +0300 Subject: [PATCH 1/4] Web:Client:Fix when scrollTo is undefined. --- packages/client/src/store/HotkeyStore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/store/HotkeyStore.js b/packages/client/src/store/HotkeyStore.js index 19b3a6344a..f445eb98e2 100644 --- a/packages/client/src/store/HotkeyStore.js +++ b/packages/client/src/store/HotkeyStore.js @@ -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); } }; From 9627e963e5239c855d380806a5ff4f8178f8adbe Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Fri, 7 Apr 2023 10:52:52 +0300 Subject: [PATCH 2/4] Fix Bug 61985: tooltip style --- packages/components/tooltip/styled-tooltip.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/components/tooltip/styled-tooltip.js b/packages/components/tooltip/styled-tooltip.js index 0a516c8624..846669a04d 100644 --- a/packages/components/tooltip/styled-tooltip.js +++ b/packages/components/tooltip/styled-tooltip.js @@ -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 = { From caa0fb12987a62fd9c612fd4aa6440e633c8d6e4 Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Fri, 7 Apr 2023 12:30:05 +0400 Subject: [PATCH 3/4] Web: Fix Zendesk widget z-index (table header issue) --- .../components/Article/sub-components/article-live-chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common/components/Article/sub-components/article-live-chat.js b/packages/common/components/Article/sub-components/article-live-chat.js index 42841eb322..eb6385baa2 100644 --- a/packages/common/components/Article/sub-components/article-live-chat.js +++ b/packages/common/components/Article/sub-components/article-live-chat.js @@ -76,7 +76,7 @@ const ArticleLiveChat = ({ defer zendeskKey={zendeskKey} onLoaded={onZendeskLoaded} - zIndex={99} + zIndex={201} /> ) : ( <> From ecc4f73c549e85fc4e56aca3580bcb74e6d54a06 Mon Sep 17 00:00:00 2001 From: MaksimChegulov Date: Fri, 7 Apr 2023 11:57:02 +0300 Subject: [PATCH 4/4] fixed feed time zone --- products/ASC.Files/Service/Core/FilesModule.cs | 7 +++++-- products/ASC.Files/Service/Core/FoldersModule.cs | 7 +++++-- products/ASC.Files/Service/Core/RoomsModule.cs | 7 +++++-- products/ASC.Files/Service/Core/UsersModule.cs | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/products/ASC.Files/Service/Core/FilesModule.cs b/products/ASC.Files/Service/Core/FilesModule.cs index 63c1d2371d..1cb2eb3bd2 100644 --- a/products/ASC.Files/Service/Core/FilesModule.cs +++ b/products/ASC.Files/Service/Core/FilesModule.cs @@ -43,19 +43,22 @@ public class FilesModule : FeedModule private readonly IFileDao _fileDao; private readonly IFolderDao _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(); _folderDao = daoFactory.GetFolderDao(); _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) { diff --git a/products/ASC.Files/Service/Core/FoldersModule.cs b/products/ASC.Files/Service/Core/FoldersModule.cs index baade4bfdc..9e64136bce 100644 --- a/products/ASC.Files/Service/Core/FoldersModule.cs +++ b/products/ASC.Files/Service/Core/FoldersModule.cs @@ -42,18 +42,21 @@ public class FoldersModule : FeedModule private readonly FileSecurity _fileSecurity; private readonly IFolderDao _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(); + _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) { diff --git a/products/ASC.Files/Service/Core/RoomsModule.cs b/products/ASC.Files/Service/Core/RoomsModule.cs index b27371ce7b..f765acc40b 100644 --- a/products/ASC.Files/Service/Core/RoomsModule.cs +++ b/products/ASC.Files/Service/Core/RoomsModule.cs @@ -37,18 +37,21 @@ public class RoomsModule : FeedModule private readonly IFolderDao _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(); + _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) { diff --git a/products/ASC.Files/Service/Core/UsersModule.cs b/products/ASC.Files/Service/Core/UsersModule.cs index 8d4eedb9ef..a75009d04e 100644 --- a/products/ASC.Files/Service/Core/UsersModule.cs +++ b/products/ASC.Files/Service/Core/UsersModule.cs @@ -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(),