From 6c197d93723ac9ab2ae38d44cd1ce31c52376b65 Mon Sep 17 00:00:00 2001
From: Vashchuk Nikita <nikita.vashchuk@onlyoffice.com>
Date: Mon, 24 Oct 2022 15:11:01 +0500
Subject: [PATCH 01/23] fixed a bug with null values of settings

---
 .../Sms/StudioSmsNotificationSettings.cs      |  3 --
 web/ASC.Web.Core/Sms/TfaSettingsBase.cs       | 48 +++++++++++--------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs b/web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
index 2ad86460cd..f4c4eb08b6 100644
--- a/web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
+++ b/web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
@@ -46,13 +46,11 @@ public class StudioSmsNotificationSettingsHelper : TfaSettingsHelperBase<StudioS
 {
     private readonly CoreBaseSettings _coreBaseSettings;
     private readonly SetupInfo _setupInfo;
-    private readonly SettingsManager _settingsManager;
     private readonly SmsProviderManager _smsProviderManager;
     private readonly TenantManager _tenantManager;
 
     public StudioSmsNotificationSettingsHelper(
         IHttpContextAccessor httpContextAccessor,
-        TenantExtra tenantExtra,
         CoreBaseSettings coreBaseSettings,
         SetupInfo setupInfo,
         SettingsManager settingsManager,
@@ -63,7 +61,6 @@ public class StudioSmsNotificationSettingsHelper : TfaSettingsHelperBase<StudioS
     {
         _coreBaseSettings = coreBaseSettings;
         _setupInfo = setupInfo;
-        _settingsManager = settingsManager;
         _smsProviderManager = smsProviderManager;
         _tenantManager = tenantManager;
     }
diff --git a/web/ASC.Web.Core/Sms/TfaSettingsBase.cs b/web/ASC.Web.Core/Sms/TfaSettingsBase.cs
index a617f66140..d66fce54b6 100644
--- a/web/ASC.Web.Core/Sms/TfaSettingsBase.cs
+++ b/web/ASC.Web.Core/Sms/TfaSettingsBase.cs
@@ -70,28 +70,36 @@ public abstract class TfaSettingsHelperBase<T> where T : TfaSettingsBase<T>, new
         {
             return false;
         }
-
-        foreach (var mandatory in settings.MandatoryGroups)
-        {
-            if (_userManager.IsUserInGroup(userGuid, mandatory))
-            {
-                return true;
-            }
+
+        if (settings.MandatoryGroups != null)
+        {
+            foreach (var mandatory in settings.MandatoryGroups)
+            {
+                if (_userManager.IsUserInGroup(userGuid, mandatory))
+                {
+                    return true;
+                }
+            }
         }
-
-        foreach (var mandatory in settings.MandatoryUsers)
-        {
-            if (mandatory == userGuid)
-            {
-                return true;
-            }
+
+        if (settings.MandatoryUsers != null)
+        {
+            foreach (var mandatory in settings.MandatoryUsers)
+            {
+                if (mandatory == userGuid)
+                {
+                    return true;
+                }
+            }
         }
-
-        var requestIP = MessageSettings.GetIP(_httpContextAccessor.HttpContext.Request);
-
-        if (!string.IsNullOrWhiteSpace(requestIP) && settings.TrustedIps.Any(trustedIp => IPSecurity.IPSecurity.MatchIPs(requestIP, trustedIp)))
-        {
-            return false;
+
+        if (settings.TrustedIps != null && settings.TrustedIps.Any())
+        {
+            var requestIP = MessageSettings.GetIP(_httpContextAccessor.HttpContext.Request);
+            if (!string.IsNullOrWhiteSpace(requestIP) && settings.TrustedIps.Any(trustedIp => IPSecurity.IPSecurity.MatchIPs(requestIP, trustedIp)))
+            {
+                return false;
+            }
         }
 
         return true;

From 6cfb9a269f75250bc49840771c9768b2153a4d6c Mon Sep 17 00:00:00 2001
From: gazizova-vlada <vlada.gazizova@onlyoffice.com>
Date: Tue, 25 Oct 2022 16:24:18 +0300
Subject: [PATCH 02/23] Web:Components:Add hugeDesktop.

---
 packages/components/utils/device.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/components/utils/device.js b/packages/components/utils/device.js
index d0c6f57253..b6e75a6d4d 100644
--- a/packages/components/utils/device.js
+++ b/packages/components/utils/device.js
@@ -6,6 +6,7 @@ export const size = {
   smallTablet: 600,
   tablet: 1024,
   desktop: 1025,
+  hugeDesktop: 1440,
 };
 
 export const mobile = `(max-width: ${size.mobile}px)`;
@@ -18,6 +19,8 @@ export const tablet = `(max-width: ${size.tablet}px)`;
 
 export const desktop = `(min-width: ${size.desktop}px)`;
 
+export const hugeDesktop = `(max-width: ${size.hugeDesktop}px)`;
+
 export const isMobile = () => {
   return window.innerWidth <= size.mobile;
 };

From ca7b17f2f080f5d6d856162d5ceaa5ef14e115e9 Mon Sep 17 00:00:00 2001
From: gazizova-vlada <vlada.gazizova@onlyoffice.com>
Date: Tue, 25 Oct 2022 16:25:44 +0300
Subject: [PATCH 03/23] Web:Client:Add sectionWidth.

---
 .../src/components/EmptyContainer/RootFolderContainer.js  | 2 ++
 packages/client/src/components/EmptyContainer/index.js    | 8 +++++++-
 packages/client/src/pages/Home/Section/Body/index.js      | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/EmptyContainer/RootFolderContainer.js b/packages/client/src/components/EmptyContainer/RootFolderContainer.js
index 29c654cc1a..d05366a891 100644
--- a/packages/client/src/components/EmptyContainer/RootFolderContainer.js
+++ b/packages/client/src/components/EmptyContainer/RootFolderContainer.js
@@ -48,6 +48,7 @@ const RootFolderContainer = (props) => {
     isEmptyPage,
     setIsEmptyPage,
     isVisitor,
+    sectionWidth,
   } = props;
   const personalDescription = t("PersonalEmptyContainerDescription");
   const shareDescription = t("SharedEmptyContainerDescription");
@@ -342,6 +343,7 @@ const RootFolderContainer = (props) => {
         <EmptyContainer
           headerText={headerText}
           isEmptyPage={isEmptyPage}
+          sectionWidth={sectionWidth}
           {...emptyFolderProps}
         />
       )}
diff --git a/packages/client/src/components/EmptyContainer/index.js b/packages/client/src/components/EmptyContainer/index.js
index ebf9871ba9..72856308cc 100644
--- a/packages/client/src/components/EmptyContainer/index.js
+++ b/packages/client/src/components/EmptyContainer/index.js
@@ -20,6 +20,7 @@ const EmptyContainer = ({
   parentId,
   theme,
   setCreateRoomDialogVisible,
+  sectionWidth,
 }) => {
   linkStyles.color = theme.filesEmptyContainer.linkColor;
 
@@ -49,9 +50,14 @@ const EmptyContainer = ({
       onCreate={onCreate}
       linkStyles={linkStyles}
       onCreateRoom={onCreateRoom}
+      sectionWidth={sectionWidth}
     />
   ) : (
-    <EmptyFolderContainer onCreate={onCreate} linkStyles={linkStyles} />
+    <EmptyFolderContainer
+      sectionWidth={sectionWidth}
+      onCreate={onCreate}
+      linkStyles={linkStyles}
+    />
   );
 };
 
diff --git a/packages/client/src/pages/Home/Section/Body/index.js b/packages/client/src/pages/Home/Section/Body/index.js
index 3bc2139b29..1981bb6310 100644
--- a/packages/client/src/pages/Home/Section/Body/index.js
+++ b/packages/client/src/pages/Home/Section/Body/index.js
@@ -244,7 +244,7 @@ const SectionBodyContent = (props) => {
       {(context) =>
         isEmptyFilesList || null ? (
           <>
-            <EmptyContainer />
+            <EmptyContainer sectionWidth={context.sectionWidth} />
           </>
         ) : viewAs === "tile" ? (
           <>

From e2bf48e54527f5022af37b9ae0771e776fc53a04 Mon Sep 17 00:00:00 2001
From: gazizova-vlada <vlada.gazizova@onlyoffice.com>
Date: Tue, 25 Oct 2022 16:29:18 +0300
Subject: [PATCH 04/23] Web:Client:Add sectionWidth, isEmptyFolderContainer.

---
 .../src/components/EmptyContainer/EmptyFolderContainer.js      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/client/src/components/EmptyContainer/EmptyFolderContainer.js b/packages/client/src/components/EmptyContainer/EmptyFolderContainer.js
index 47e5943878..95310fb54c 100644
--- a/packages/client/src/components/EmptyContainer/EmptyFolderContainer.js
+++ b/packages/client/src/components/EmptyContainer/EmptyFolderContainer.js
@@ -14,6 +14,7 @@ const EmptyFolderContainer = ({
   parentId,
   linkStyles,
   isRooms,
+  sectionWidth,
 }) => {
   const onBackToParentFolder = () => {
     setIsLoading(true);
@@ -83,6 +84,8 @@ const EmptyFolderContainer = ({
       descriptionText={t("EmptyFolderDecription")}
       imageSrc="/static/images/empty_screen_alt.svg"
       buttons={buttons}
+      sectionWidth={sectionWidth}
+      isEmptyFolderContainer={true}
     />
   );
 };

From 635e54a0fce7bddc87c7718a2ee2c1dcefe84d1d Mon Sep 17 00:00:00 2001
From: gazizova-vlada <vlada.gazizova@onlyoffice.com>
Date: Tue, 25 Oct 2022 16:29:57 +0300
Subject: [PATCH 05/23] Web:Client:Fix styles EmptyFolderWrapper.

---
 .../EmptyContainer/EmptyContainer.js          | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/components/EmptyContainer/EmptyContainer.js b/packages/client/src/components/EmptyContainer/EmptyContainer.js
index 3ffd106382..efa898f016 100644
--- a/packages/client/src/components/EmptyContainer/EmptyContainer.js
+++ b/packages/client/src/components/EmptyContainer/EmptyContainer.js
@@ -6,8 +6,9 @@ import {
   tablet,
   smallTablet,
   desktop,
+  size,
 } from "@docspace/components/utils/device";
-import { isMobile } from "react-device-detect";
+import { isMobile, isMobileOnly } from "react-device-detect";
 
 const EmptyPageStyles = css`
   padding: 44px 0px 64px 0px;
@@ -36,7 +37,15 @@ const EmptyPageStyles = css`
   }
 
   @media ${smallTablet} {
-    padding: 20px 0px 64px 11px;
+    ${isMobileOnly &&
+    css`
+      padding-right: 44px;
+    `}
+
+    ${!isMobileOnly &&
+    css`
+      padding: 20px 0px 64px 11px;
+    `}
   }
 `;
 
@@ -90,14 +99,14 @@ const EmptyFolderWrapper = styled.div`
       bottom: 16px;
     }
 
-    @media screen and (max-width: 1325px) {
-      ${!isMobile &&
-      css`
-        margin-left: 98px;
-      `};
-    }
-
     ${(props) => props.isEmptyPage && `${EmptyPageStyles}`}
+
+    ${(props) =>
+      props.sectionWidth <= size.smallTablet &&
+      !isMobileOnly &&
+      css`
+        padding-left: 12px !important;
+      `}
   }
 `;
 
@@ -113,11 +122,14 @@ const EmptyFoldersContainer = (props) => {
     imageStyle,
     buttonStyle,
     isEmptyPage,
+    sectionWidth,
+    isEmptyFolderContainer,
   } = props;
 
   return (
-    <EmptyFolderWrapper isEmptyPage={isEmptyPage}>
+    <EmptyFolderWrapper sectionWidth={sectionWidth} isEmptyPage={isEmptyPage}>
       <EmptyScreenContainer
+        sectionWidth={sectionWidth}
         className="empty-folder_container"
         style={style}
         imageStyle={imageStyle}
@@ -129,6 +141,7 @@ const EmptyFoldersContainer = (props) => {
         descriptionText={descriptionText}
         buttons={buttons}
         isEmptyPage={isEmptyPage}
+        isEmptyFolderContainer={isEmptyFolderContainer}
       />
     </EmptyFolderWrapper>
   );

From 71f048621fb5bad372c6c5ddccb2b03acb4eac2d Mon Sep 17 00:00:00 2001
From: gazizova-vlada <vlada.gazizova@onlyoffice.com>
Date: Tue, 25 Oct 2022 16:30:42 +0300
Subject: [PATCH 06/23] Web:Components:Fix styles EmptyContentBody.

---
 .../styled-empty-screen-container.js          | 132 +++++++++++-------
 1 file changed, 85 insertions(+), 47 deletions(-)

diff --git a/packages/components/empty-screen-container/styled-empty-screen-container.js b/packages/components/empty-screen-container/styled-empty-screen-container.js
index dce2f94ced..4de751682c 100644
--- a/packages/components/empty-screen-container/styled-empty-screen-container.js
+++ b/packages/components/empty-screen-container/styled-empty-screen-container.js
@@ -1,9 +1,18 @@
 import styled, { css } from "styled-components";
-import { mobile, tablet, smallTablet, desktop } from "../utils/device";
+import {
+  mobile,
+  tablet,
+  smallTablet,
+  desktop,
+  size,
+  hugeDesktop,
+} from "../utils/device";
 import NoUserSelect from "../utils/commonStyles";
+import { isMobileOnly } from "react-device-detect";
 
 const EmptyPageStyles = css`
   grid-row-gap: 9px;
+  margin: 0 auto !important;
 
   .ec-image {
     height: 100px;
@@ -15,10 +24,6 @@ const EmptyPageStyles = css`
     margin-top: 0;
   }
 
-  .ec-header {
-    font-size: 16px;
-  }
-
   .ec-buttons {
     max-width: 285px;
   }
@@ -30,16 +35,15 @@ const EmptyPageStyles = css`
 
   @media ${smallTablet} {
     .ec-image {
-      height: 72px;
+      ${isMobileOnly &&
+      css`
+        height: 72px;
+      `}
     }
 
     .ec-header {
       padding-top: 22px;
     }
-
-    .ec-desc {
-      max-width: 282px;
-    }
   }
 
   @media ${desktop} {
@@ -53,15 +57,46 @@ const EmptyPageStyles = css`
   }
 `;
 
+const MobileView = css`
+  grid-template-areas:
+    "img img img"
+    "headerText headerText headerText"
+    ${(props) =>
+      props.subheadingText && `"subheadingText subheadingText subheadingText"`}
+    ${(props) =>
+      props.descriptionText &&
+      `"descriptionText descriptionText descriptionText"`}
+    "button button button";
+
+  .ec-header {
+    ${isMobileOnly &&
+    css`
+      padding: 0px;
+    `}
+  }
+  .ec-header,
+  .ec-subheading,
+  .ec-desc,
+  .ec-image,
+  .ec-buttons {
+    padding-left: 16px;
+  }
+
+  .ec-image {
+    ${isMobileOnly &&
+    css`
+      height: 72px;
+    `}
+
+    margin-left: 0;
+  }
+`;
+
 const EmptyContentBody = styled.div`
   margin: 0 auto;
-  padding: 64px 0;
+  padding: 37px 0;
   grid-template-columns: 150px 1fr;
 
-  @media ${tablet} {
-    grid-template-columns: none;
-  }
-
   display: grid;
   grid-template-areas:
     "img headerText"
@@ -80,12 +115,9 @@ const EmptyContentBody = styled.div`
     ${NoUserSelect}
   }
 
-  @media ${tablet} {
-    max-width: 480px;
-  }
-
   .ec-header {
     grid-area: headerText;
+    font-size: 16px;
     padding-top: 16px;
     @media (max-width: 375px) {
       margin-top: 5px;
@@ -106,9 +138,21 @@ const EmptyContentBody = styled.div`
     grid-area: button;
   }
 
+  @media ${hugeDesktop} {
+    margin-left: 113px;
+    margin-right: 113px;
+  }
+
+  @media ${tablet} {
+    grid-template-columns: none;
+    max-width: 480px;
+    margin: 0 auto;
+  }
+
   @media (orientation: portrait) {
     @media (max-width: 768px) {
-      padding-top: 0px;
+      margin-left: 113px;
+      margin-right: 113px;
 
       .ec-image {
         max-height: 100px;
@@ -116,36 +160,30 @@ const EmptyContentBody = styled.div`
     }
 
     @media (max-width: 428px) {
-      grid-template-areas:
-        "img img img"
-        "headerText headerText headerText"
-        ${(props) =>
-          props.subheadingText &&
-          `"subheadingText subheadingText subheadingText"`}
-        ${(props) =>
-          props.descriptionText &&
-          `"descriptionText descriptionText descriptionText"`}
-        "button button button";
-
-      .ec-header {
-        padding-top: 0px;
-      }
-      .ec-header,
-      .ec-subheading,
-      .ec-desc,
-      .ec-image,
-      .ec-buttons {
-        padding-left: 16px;
-      }
-
-      .ec-image {
-        height: 75px;
-        margin-left: 0;
-      }
+      ${MobileView}
     }
   }
 
-  ${(props) => props.isEmptyPage && `${EmptyPageStyles}`}
+  ${(props) =>
+    (props.isEmptyPage || props.isEmptyFolderContainer) && `${EmptyPageStyles}`}
+
+  ${(props) =>
+    props.sectionWidth <= size.smallTablet &&
+    !isMobileOnly &&
+    css`
+      ${MobileView}
+
+      .ec-desc {
+        max-width: none;
+      }
+
+      .ec-header {
+        padding-top: 22px;
+      }
+
+      max-width: none !important;
+      margin: 0 auto !important;
+    `}
 `;
 
 const EmptyContentImage = styled.img.attrs((props) => ({

From 617025b242f232fe49ee123d5354824e47937040 Mon Sep 17 00:00:00 2001
From: gazizova-vlada <vlada.gazizova@onlyoffice.com>
Date: Tue, 25 Oct 2022 20:45:16 +0300
Subject: [PATCH 07/23] Web:Client:Fix styles EmptyFolderWrapper.

---
 .../EmptyContainer/EmptyContainer.js          | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/client/src/components/EmptyContainer/EmptyContainer.js b/packages/client/src/components/EmptyContainer/EmptyContainer.js
index efa898f016..4dde2f5792 100644
--- a/packages/client/src/components/EmptyContainer/EmptyContainer.js
+++ b/packages/client/src/components/EmptyContainer/EmptyContainer.js
@@ -33,19 +33,10 @@ const EmptyPageStyles = css`
   @media ${tablet} {
     padding: 44px 0px 64px 0px;
     grid-column-gap: 33px;
-    margin-left: auto;
   }
 
   @media ${smallTablet} {
-    ${isMobileOnly &&
-    css`
-      padding-right: 44px;
-    `}
-
-    ${!isMobileOnly &&
-    css`
-      padding: 20px 0px 64px 11px;
-    `}
+    padding-right: 44px;
   }
 `;
 
@@ -102,6 +93,14 @@ const EmptyFolderWrapper = styled.div`
     ${(props) => props.isEmptyPage && `${EmptyPageStyles}`}
 
     ${(props) =>
+      props.isEmptyPage &&
+      isMobileOnly &&
+      css`
+        padding: 20px 44px 64px 11px !important;
+      `}
+
+    ${(props) =>
+      (props.isEmptyPage || props.isEmptyFolderContainer) &&
       props.sectionWidth <= size.smallTablet &&
       !isMobileOnly &&
       css`
@@ -127,7 +126,11 @@ const EmptyFoldersContainer = (props) => {
   } = props;
 
   return (
-    <EmptyFolderWrapper sectionWidth={sectionWidth} isEmptyPage={isEmptyPage}>
+    <EmptyFolderWrapper
+      sectionWidth={sectionWidth}
+      isEmptyPage={isEmptyPage}
+      isEmptyFolderContainer={isEmptyFolderContainer}
+    >
       <EmptyScreenContainer
         sectionWidth={sectionWidth}
         className="empty-folder_container"

From 0711c7c96c5d033ca0a03f1c560adb612dd5e992 Mon Sep 17 00:00:00 2001
From: gazizova-vlada <vlada.gazizova@onlyoffice.com>
Date: Tue, 25 Oct 2022 20:45:53 +0300
Subject: [PATCH 08/23] Web:Components:Fix styles EmptyContentBody.

---
 .../styled-empty-screen-container.js          | 72 ++++++++++++-------
 1 file changed, 46 insertions(+), 26 deletions(-)

diff --git a/packages/components/empty-screen-container/styled-empty-screen-container.js b/packages/components/empty-screen-container/styled-empty-screen-container.js
index 4de751682c..c52d2b9f4c 100644
--- a/packages/components/empty-screen-container/styled-empty-screen-container.js
+++ b/packages/components/empty-screen-container/styled-empty-screen-container.js
@@ -12,7 +12,7 @@ import { isMobileOnly } from "react-device-detect";
 
 const EmptyPageStyles = css`
   grid-row-gap: 9px;
-  margin: 0 auto !important;
+  /* margin: 0 auto !important; */
 
   .ec-image {
     height: 100px;
@@ -33,14 +33,24 @@ const EmptyPageStyles = css`
     margin: 16px 0 !important;
   }
 
-  @media ${smallTablet} {
-    .ec-image {
-      ${isMobileOnly &&
-      css`
-        height: 72px;
-      `}
-    }
+  margin-left: 177px;
+  margin-right: 177px;
+  max-width: 800px;
 
+  @media ${hugeDesktop} {
+    margin: 0 auto !important;
+  }
+
+  @media ${tablet} {
+    margin: 0 auto;
+  }
+
+  @media (max-width: 768px) {
+    margin-left: 97px;
+    margin-right: 97px;
+  }
+
+  @media ${smallTablet} {
     .ec-header {
       padding-top: 22px;
     }
@@ -69,10 +79,7 @@ const MobileView = css`
     "button button button";
 
   .ec-header {
-    ${isMobileOnly &&
-    css`
-      padding: 0px;
-    `}
+    padding-top: 0px;
   }
   .ec-header,
   .ec-subheading,
@@ -83,18 +90,15 @@ const MobileView = css`
   }
 
   .ec-image {
-    ${isMobileOnly &&
-    css`
-      height: 72px;
-    `}
-
+    height: 75px;
     margin-left: 0;
   }
 `;
 
 const EmptyContentBody = styled.div`
   margin: 0 auto;
-  padding: 37px 0;
+
+  padding: ${(props) => (props.isEmptyFolderContainer ? "37px 0" : "64px 0")};
   grid-template-columns: 150px 1fr;
 
   display: grid;
@@ -138,21 +142,14 @@ const EmptyContentBody = styled.div`
     grid-area: button;
   }
 
-  @media ${hugeDesktop} {
-    margin-left: 113px;
-    margin-right: 113px;
-  }
-
   @media ${tablet} {
     grid-template-columns: none;
     max-width: 480px;
-    margin: 0 auto;
   }
 
   @media (orientation: portrait) {
     @media (max-width: 768px) {
-      margin-left: 113px;
-      margin-right: 113px;
+      padding-top: ${(props) => !props.isEmptyFolderContainer && "0px"};
 
       .ec-image {
         max-height: 100px;
@@ -168,6 +165,7 @@ const EmptyContentBody = styled.div`
     (props.isEmptyPage || props.isEmptyFolderContainer) && `${EmptyPageStyles}`}
 
   ${(props) =>
+    (props.isEmptyPage || props.isEmptyFolderContainer) &&
     props.sectionWidth <= size.smallTablet &&
     !isMobileOnly &&
     css`
@@ -181,9 +179,31 @@ const EmptyContentBody = styled.div`
         padding-top: 22px;
       }
 
+      .ec-image {
+        height: 100px !important;
+      }
+
       max-width: none !important;
       margin: 0 auto !important;
     `}
+
+    ${(props) =>
+    props.isEmptyFolderContainer &&
+    isMobileOnly &&
+    css`
+      .ec-image {
+        margin-top: 0px;
+      }
+    `}
+
+    ${(props) =>
+    props.isEmptyPage &&
+    isMobileOnly &&
+    css`
+      .ec-image {
+        height: 72px !important;
+      }
+    `}
 `;
 
 const EmptyContentImage = styled.img.attrs((props) => ({

From 9c92ca67fddb92cab39c99ab0406dbe2f06e82f1 Mon Sep 17 00:00:00 2001
From: gazizova-vlada <vlada.gazizova@onlyoffice.com>
Date: Wed, 26 Oct 2022 15:15:57 +0300
Subject: [PATCH 09/23] Web:Components:Fix.

---
 packages/components/utils/device.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/utils/device.js b/packages/components/utils/device.js
index b6e75a6d4d..687ce1811a 100644
--- a/packages/components/utils/device.js
+++ b/packages/components/utils/device.js
@@ -6,7 +6,7 @@ export const size = {
   smallTablet: 600,
   tablet: 1024,
   desktop: 1025,
-  hugeDesktop: 1440,
+  hugeDesktop: 1439,
 };
 
 export const mobile = `(max-width: ${size.mobile}px)`;

From 73ad80438321712511c49bce0eb299fd1272f3ad Mon Sep 17 00:00:00 2001
From: gazizova-vlada <vlada.gazizova@onlyoffice.com>
Date: Wed, 26 Oct 2022 15:16:41 +0300
Subject: [PATCH 10/23] Web:Components:Fix styles EmptyContentBody.

---
 .../styled-empty-screen-container.js          | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/packages/components/empty-screen-container/styled-empty-screen-container.js b/packages/components/empty-screen-container/styled-empty-screen-container.js
index c52d2b9f4c..ee12e04652 100644
--- a/packages/components/empty-screen-container/styled-empty-screen-container.js
+++ b/packages/components/empty-screen-container/styled-empty-screen-container.js
@@ -12,7 +12,6 @@ import { isMobileOnly } from "react-device-detect";
 
 const EmptyPageStyles = css`
   grid-row-gap: 9px;
-  /* margin: 0 auto !important; */
 
   .ec-image {
     height: 100px;
@@ -24,30 +23,32 @@ const EmptyPageStyles = css`
     margin-top: 0;
   }
 
-  .ec-buttons {
-    max-width: 285px;
-  }
-
   .empty-folder_container-links {
     align-items: start;
     margin: 16px 0 !important;
   }
 
-  margin-left: 177px;
-  margin-right: 177px;
   max-width: 800px;
 
   @media ${hugeDesktop} {
-    margin: 0 auto !important;
+    margin: 0 13%;
+    width: 74%;
+    min-width: 480px;
   }
 
   @media ${tablet} {
+    max-width: 480px;
     margin: 0 auto;
   }
 
   @media (max-width: 768px) {
-    margin-left: 97px;
-    margin-right: 97px;
+    ${(props) =>
+      props.sectionWidth > size.smallTablet &&
+      css`
+        margin: 0 13% !important;
+        width: 74%;
+        min-width: auto;
+      `}
   }
 
   @media ${smallTablet} {
@@ -182,27 +183,27 @@ const EmptyContentBody = styled.div`
       .ec-image {
         height: 100px !important;
       }
+    `}
 
+    ${(props) =>
+    (props.isEmptyPage || props.isEmptyFolderContainer) &&
+    isMobileOnly &&
+    css`
+      .ec-image {
+        margin-top: ${(props) => props.isEmptyFolderContainer && "0px"};
+        height: ${(props) => props.isEmptyPage && "72px !important"};
+      }
+    `}
+
+
+    ${(props) =>
+    (props.isEmptyPage || props.isEmptyFolderContainer) &&
+    props.sectionWidth <= size.smallTablet &&
+    css`
       max-width: none !important;
-      margin: 0 auto !important;
-    `}
-
-    ${(props) =>
-    props.isEmptyFolderContainer &&
-    isMobileOnly &&
-    css`
-      .ec-image {
-        margin-top: 0px;
-      }
-    `}
-
-    ${(props) =>
-    props.isEmptyPage &&
-    isMobileOnly &&
-    css`
-      .ec-image {
-        height: 72px !important;
-      }
+      width: auto !important;
+      min-width: auto !important;
+      margin: 0 !important;
     `}
 `;
 

From b007882eeb5d9584de5560106447dacfe9f4ac5b Mon Sep 17 00:00:00 2001
From: gazizova-vlada <vlada.gazizova@onlyoffice.com>
Date: Wed, 26 Oct 2022 15:17:08 +0300
Subject: [PATCH 11/23] Web:Client:Fix styles EmptyFolderWrapper.

---
 .../client/src/components/EmptyContainer/EmptyContainer.js  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/EmptyContainer/EmptyContainer.js b/packages/client/src/components/EmptyContainer/EmptyContainer.js
index 4dde2f5792..b54150f166 100644
--- a/packages/client/src/components/EmptyContainer/EmptyContainer.js
+++ b/packages/client/src/components/EmptyContainer/EmptyContainer.js
@@ -96,7 +96,7 @@ const EmptyFolderWrapper = styled.div`
       props.isEmptyPage &&
       isMobileOnly &&
       css`
-        padding: 20px 44px 64px 11px !important;
+        padding: 20px 42px 64px 11px !important;
       `}
 
     ${(props) =>
@@ -105,6 +105,10 @@ const EmptyFolderWrapper = styled.div`
       !isMobileOnly &&
       css`
         padding-left: 12px !important;
+
+        .empty-folder_link {
+          margin-bottom: 0 !important;
+        }
       `}
   }
 `;

From 15f32485d41da919624ac08922a63d97209b8dcf Mon Sep 17 00:00:00 2001
From: gazizova-vlada <vlada.gazizova@onlyoffice.com>
Date: Wed, 26 Oct 2022 16:58:28 +0300
Subject: [PATCH 12/23] Web:Client:Fixed disabled field dns settings.

---
 .../common/Customization/dns-settings.js        | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js b/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
index 9a67373c7a..ff5abba9a6 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
@@ -16,6 +16,7 @@ import { DNSSettingsTooltip } from "../sub-components/common-tooltips";
 import { StyledSettingsComponent, StyledScrollbar } from "./StyledSettings";
 import { setDocumentTitle } from "SRC_DIR/helpers/utils";
 import LoaderCustomization from "../sub-components/loaderCustomization";
+import Textarea from "@docspace/components/textarea";
 import withLoading from "SRC_DIR/HOCs/withLoading";
 import Badge from "@docspace/components/badge";
 const DNSSettings = (props) => {
@@ -93,21 +94,19 @@ const DNSSettings = (props) => {
 
   const settingsBlock = (
     <div className="settings-block">
-      <div className="settings-block-description settings_unavailable">
-        {t("DNSSettingsMobile")}
-      </div>
+      <div className="settings-block-description">{t("DNSSettingsMobile")}</div>
       <FieldContainer
         id="fieldContainerDNSSettings"
         className="field-container-width settings_unavailable"
         labelText={`${t("YourCurrentDomain")}`}
         isVertical={true}
       >
-        <TextInput
-          tabIndex={8}
+        <Textarea
           id="textInputContainerDNSSettings"
-          scale={true}
+          heightTextArea={30}
+          tabIndex={8}
+          isDisabled={true}
           value={location.hostname}
-          isDisabled={!isSettingPaid}
         />
       </FieldContainer>
     </div>
@@ -123,9 +122,7 @@ const DNSSettings = (props) => {
     >
       {isCustomizationView && !isMobileView && (
         <div className="category-item-heading">
-          <div className="category-item-title settings_unavailable">
-            {t("DNSSettings")}
-          </div>
+          <div className="category-item-title">{t("DNSSettings")}</div>
           <HelpButton
             iconName="static/images/combined.shape.svg"
             size={12}

From 2eaaf8bf3267d4bc757da464c8674f47f56ae2f7 Mon Sep 17 00:00:00 2001
From: TimofeyBoyko <fognir742@gmail.com>
Date: Thu, 27 Oct 2022 12:50:45 +0500
Subject: [PATCH 13/23] Web:Client:SelectFolderDialog: fix selection

---
 .../client/src/components/panels/SelectFolderDialog/index.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/panels/SelectFolderDialog/index.js b/packages/client/src/components/panels/SelectFolderDialog/index.js
index 17eb0243f0..2e8fcb0d1c 100644
--- a/packages/client/src/components/panels/SelectFolderDialog/index.js
+++ b/packages/client/src/components/panels/SelectFolderDialog/index.js
@@ -224,7 +224,7 @@ class SelectFolderDialog extends React.Component {
     const buttonIsDisabled =
       isDisableButton ||
       (isRecycleBin && currentFolderId === resultingFolderId) ||
-      selectionFiles[0]?.parentId === +resultingFolderId;
+      (selectionFiles && selectionFiles[0]?.parentId === +resultingFolderId);
 
     const isCurrentFolder = +currentFolderId === +resultingFolderId;
 

From c4610d6e681c6aa0f8e8d452ece90ae30666d2b6 Mon Sep 17 00:00:00 2001
From: gazizova-vlada <vlada.gazizova@onlyoffice.com>
Date: Thu, 27 Oct 2022 11:01:46 +0300
Subject: [PATCH 14/23] Web:Client:Fix dns textarea color.

---
 .../categories/common/Customization/StyledSettings.js      | 7 +++++++
 .../categories/common/Customization/dns-settings.js        | 1 +
 2 files changed, 8 insertions(+)

diff --git a/packages/client/src/pages/PortalSettings/categories/common/Customization/StyledSettings.js b/packages/client/src/pages/PortalSettings/categories/common/Customization/StyledSettings.js
index 3e85265d7d..ca375fa79f 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/Customization/StyledSettings.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Customization/StyledSettings.js
@@ -36,6 +36,13 @@ const StyledSettingsComponent = styled.div`
   .dns-setting_helpbutton {
     margin-right: 4px;
   }
+
+  .dns-textarea {
+    textarea {
+      color: ${(props) => props.theme.text.disableColor};
+    }
+  }
+
   .combo-button-label {
     max-width: 100%;
     font-weight: 400;
diff --git a/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js b/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
index ff5abba9a6..200ddfd6aa 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
@@ -103,6 +103,7 @@ const DNSSettings = (props) => {
       >
         <Textarea
           id="textInputContainerDNSSettings"
+          className="dns-textarea"
           heightTextArea={30}
           tabIndex={8}
           isDisabled={true}

From 29ee2b04b21d1ef4f35e3f315d6646af94cc7d60 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Thu, 27 Oct 2022 11:53:44 +0300
Subject: [PATCH 15/23] Api: whitelabel/logos AllowAnonymous

---
 web/ASC.Web.Api/Api/Settings/WhitelabelController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/ASC.Web.Api/Api/Settings/WhitelabelController.cs b/web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
index b3623f3ef8..11d30c30f1 100644
--- a/web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
+++ b/web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
@@ -147,7 +147,7 @@ public class WhitelabelController : BaseSettingsController
 
 
     ///<visible>false</visible>
-    [AllowNotPayment]
+    [AllowNotPayment, AllowAnonymous]
     [HttpGet("whitelabel/logos")]
     public Dictionary<string, string> GetWhiteLabelLogos([FromQuery] WhiteLabelQueryRequestsDto inDto)
     {

From 0b8360a0d71a327652b1c26820b0342bb8910624 Mon Sep 17 00:00:00 2001
From: Sergey Kirichenko <sk81.biz@gmail.com>
Date: Thu, 27 Oct 2022 13:39:21 +0300
Subject: [PATCH 16/23] Add docker image api_system (#954)

---
 build/install/common/publish-backend.sh | 1 +
 build/install/docker/Dockerfile.app     | 9 +++++++++
 build/install/docker/appserver.yml      | 7 +++++++
 build/install/docker/build.yml          | 7 +++++++
 4 files changed, 24 insertions(+)

diff --git a/build/install/common/publish-backend.sh b/build/install/common/publish-backend.sh
index 4db72e6e87..8348786927 100644
--- a/build/install/common/publish-backend.sh
+++ b/build/install/common/publish-backend.sh
@@ -82,6 +82,7 @@ services_name_backend+=(ASC.Data.Backup.BackgroundTasks)
 services_name_backend+=(ASC.ClearEvents)
 services_name_backend+=(ASC.Migration)
 services_name_backend+=(ASC.Webhooks.Service)
+services_name_backend+=(ASC.ApiSystem)
 
 # Publish backend services
 for i in ${!services_name_backend[@]}; do
diff --git a/build/install/docker/Dockerfile.app b/build/install/docker/Dockerfile.app
index 395cb72a39..e7fcd59b79 100644
--- a/build/install/docker/Dockerfile.app
+++ b/build/install/docker/Dockerfile.app
@@ -189,6 +189,15 @@ COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Data.B
 
 CMD ["ASC.Data.Backup.BackgroundTasks.dll", "ASC.Data.Backup.BackgroundTasks"]
 
+# ASC.ApiSystem ##
+FROM dotnetrun AS api_system
+WORKDIR ${BUILD_PATH}/services/ASC.ApiSystem/
+
+COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py
+COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.ApiSystem/service/  .
+
+CMD [" ASC.ApiSystem.dll", " ASC.ApiSystem"]
+
 ## ASC.ClearEvents ##
 FROM dotnetrun AS clear-events
 WORKDIR ${BUILD_PATH}/services/ASC.ClearEvents/
diff --git a/build/install/docker/appserver.yml b/build/install/docker/appserver.yml
index 034492093a..966741022a 100644
--- a/build/install/docker/appserver.yml
+++ b/build/install/docker/appserver.yml
@@ -114,6 +114,11 @@ services:
     image: "${REPO}/${DOCKER_IMAGE_PREFIX}-api:${DOCKER_TAG}"
     container_name: ${API_HOST}
 
+  onlyoffice-api-system:
+    <<: *x-service-base
+    image: "${REPO}/${DOCKER_IMAGE_PREFIX}-api-system:${DOCKER_TAG}"
+    container_name: ${API_SYSTEM_HOST}
+
   onlyoffice-studio:
     <<: *x-service-base
     image: "${REPO}/${DOCKER_IMAGE_PREFIX}-studio:${DOCKER_TAG}"
@@ -170,6 +175,7 @@ services:
       - onlyoffice-telegram-service
       - onlyoffice-urlshortener
       - onlyoffice-api
+      - onlyoffice-api-system
       - onlyoffice-studio
       - onlyoffice-ssoauth
       - onlyoffice-doceditor
@@ -188,6 +194,7 @@ services:
       - SERVICE_TELEGRAM_SERVICE=${SERVICE_TELEGRAM_SERVICE}
       - SERVICE_URLSHORTENER=${SERVICE_URLSHORTENER}
       - SERVICE_API=${SERVICE_API}
+      - SERVICE_API_SYSTEM=${SERVICE_API_SYSTEM}
       - SERVICE_STUDIO=${SERVICE_STUDIO}
       - SERVICE_SSOAUTH=${SERVICE_SSOAUTH}
       - SERVICE_DOCEDITOR=${SERVICE_DOCEDITOR}
diff --git a/build/install/docker/build.yml b/build/install/docker/build.yml
index 7c4b81e092..2e918cb31f 100644
--- a/build/install/docker/build.yml
+++ b/build/install/docker/build.yml
@@ -92,6 +92,13 @@ services:
       target: api
     image: "${REPO}/${DOCKER_IMAGE_PREFIX}-api:${DOCKER_TAG}"
 
+  onlyoffice-api-system:
+    build:
+      context: ./
+      dockerfile: "${DOCKERFILE}"
+      target: api_system
+    image: "${REPO}/${DOCKER_IMAGE_PREFIX}-api-system:${DOCKER_TAG}"
+
   onlyoffice-studio:
     build:
       context: ./

From 32733401558f0f9f5951a74d46dce258797b3823 Mon Sep 17 00:00:00 2001
From: Viktor Fomin <enotcode@gmail.com>
Date: Thu, 27 Oct 2022 17:09:39 +0500
Subject: [PATCH 17/23] Components: IconButton: fix

---
 packages/components/icon-button/styled-icon-button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/icon-button/styled-icon-button.js b/packages/components/icon-button/styled-icon-button.js
index 2695e26827..129ff87c11 100644
--- a/packages/components/icon-button/styled-icon-button.js
+++ b/packages/components/icon-button/styled-icon-button.js
@@ -17,7 +17,7 @@ const StyledOuter = styled.div`
     }
     path {
       fill: ${(props) =>
-        props.color ? props.color : props.theme.iconButton.color} !important;
+        props.color ? props.color : props.theme.iconButton.color};
     }
   }
   &:hover {

From e234f1c619585d018cec7508497a5e1693d299e2 Mon Sep 17 00:00:00 2001
From: Viktor Fomin <enotcode@gmail.com>
Date: Thu, 27 Oct 2022 17:09:55 +0500
Subject: [PATCH 18/23] Components: Themes: add help button colors

---
 packages/components/themes/base.js | 1 +
 packages/components/themes/dark.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/components/themes/base.js b/packages/components/themes/base.js
index 93cfc83550..bbf7da5920 100644
--- a/packages/components/themes/base.js
+++ b/packages/components/themes/base.js
@@ -2734,6 +2734,7 @@ const Base = {
     textColor: gray,
     navBackground: "#F8F9F9",
     headerColor: black,
+    helpButton: "#A3A9AE",
 
     register: {
       backgroundColor: grayLight,
diff --git a/packages/components/themes/dark.js b/packages/components/themes/dark.js
index d390995aa5..48589a5172 100644
--- a/packages/components/themes/dark.js
+++ b/packages/components/themes/dark.js
@@ -2740,6 +2740,7 @@ const Dark = {
     textColor: "#858585",
     navBackground: "#282828",
     headerColor: white,
+    helpButton: "#D8D8D8",
 
     register: {
       backgroundColor: "#292929",

From e231dafb627d96b9017aee1f983bcbadfb2d3275 Mon Sep 17 00:00:00 2001
From: Viktor Fomin <enotcode@gmail.com>
Date: Thu, 27 Oct 2022 17:10:39 +0500
Subject: [PATCH 19/23] Login: fix help button color

---
 packages/login/src/client/components/StyledLogin.ts       | 8 ++++++++
 .../src/client/components/sub-components/LoginForm.tsx    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/login/src/client/components/StyledLogin.ts b/packages/login/src/client/components/StyledLogin.ts
index 5772a33e25..994626d72e 100644
--- a/packages/login/src/client/components/StyledLogin.ts
+++ b/packages/login/src/client/components/StyledLogin.ts
@@ -174,6 +174,14 @@ export const LoginContainer = styled.div`
             }
           }
 
+          .help-button{
+            svg {
+              path {
+                fill: ${(props) => props.theme.login.helpButton};
+              }
+            }
+          }
+
           .checkbox-text{
             color: ${(props) => props.theme.checkbox.arrowColor};
           }
diff --git a/packages/login/src/client/components/sub-components/LoginForm.tsx b/packages/login/src/client/components/sub-components/LoginForm.tsx
index c7bee58826..e51d49a22c 100644
--- a/packages/login/src/client/components/sub-components/LoginForm.tsx
+++ b/packages/login/src/client/components/sub-components/LoginForm.tsx
@@ -284,7 +284,7 @@ const LoginForm: React.FC<ILoginFormProps> = ({
                   helpButton={
                     !checkIsSSR() && (
                       <HelpButton
-                        color="#A3A9AE"
+                        className="help-button"
                         helpButtonHeaderContent={t("CookieSettingsTitle")}
                         tooltipContent={
                           <Text fontSize="12px">{t("RememberHelper")}</Text>

From ca895297152d5ad042a31987a441ab7c8ba4ae73 Mon Sep 17 00:00:00 2001
From: TimofeyBoyko <fognir742@gmail.com>
Date: Thu, 27 Oct 2022 17:42:15 +0500
Subject: [PATCH 20/23] Web:Client:Home: fix filter selected items

---
 .../src/pages/Home/Section/Filter/index.js    | 96 ++++++++++++++-----
 1 file changed, 71 insertions(+), 25 deletions(-)

diff --git a/packages/client/src/pages/Home/Section/Filter/index.js b/packages/client/src/pages/Home/Section/Filter/index.js
index ef461f261a..47bd8d8818 100644
--- a/packages/client/src/pages/Home/Section/Filter/index.js
+++ b/packages/client/src/pages/Home/Section/Filter/index.js
@@ -155,6 +155,8 @@ const SectionFilterContent = ({
   setCurrentRoomsFilter,
   providers,
 }) => {
+  const [selectedFilterValues, setSelectedFilterValues] = React.useState(null);
+
   const onFilter = React.useCallback(
     (data) => {
       if (isRooms) {
@@ -378,30 +380,6 @@ const SectionFilterContent = ({
       //   });
       // }
 
-      if (roomsFilter.provider) {
-        const provider = +roomsFilter.provider;
-
-        const label = RoomsProviderTypeName[provider];
-
-        filterValues.push({
-          key: provider,
-          label: label,
-          group: FilterGroups.roomFilterProviderType,
-        });
-      }
-
-      if (roomsFilter.type) {
-        const key = +roomsFilter.type;
-
-        const label = getDefaultRoomName(key, t);
-
-        filterValues.push({
-          key: key,
-          label: label,
-          group: FilterGroups.roomFilterType,
-        });
-      }
-
       if (roomsFilter.subjectId) {
         const isMe = userId === roomsFilter.subjectId;
         let label = isMe
@@ -431,6 +409,18 @@ const SectionFilterContent = ({
       //   });
       // }
 
+      if (roomsFilter.type) {
+        const key = +roomsFilter.type;
+
+        const label = getDefaultRoomName(key, t);
+
+        filterValues.push({
+          key: key,
+          label: label,
+          group: FilterGroups.roomFilterType,
+        });
+      }
+
       if (roomsFilter?.tags?.length > 0) {
         filterValues.push({
           key: roomsFilter.tags,
@@ -438,6 +428,18 @@ const SectionFilterContent = ({
           isMultiSelect: true,
         });
       }
+
+      if (roomsFilter.provider) {
+        const provider = +roomsFilter.provider;
+
+        const label = RoomsProviderTypeName[provider];
+
+        filterValues.push({
+          key: provider,
+          label: label,
+          group: FilterGroups.roomFilterProviderType,
+        });
+      }
     } else {
       if (filter.withSubfolders === "false") {
         filterValues.push({
@@ -525,7 +527,51 @@ const SectionFilterContent = ({
       }
     }
 
-    return filterValues;
+    const currentFilterValues = [];
+
+    setSelectedFilterValues((value) => {
+      if (!value) {
+        currentFilterValues.push(...filterValues);
+        return filterValues.map((f) => ({ ...f }));
+      }
+
+      const items = value.map((v) => {
+        const item = filterValues.find((f) => f.group === v.group);
+
+        if (item) {
+          if (item.isMultiSelect) {
+            let isEqual = true;
+
+            item.key.forEach((k) => {
+              if (!v.key.includes(k)) {
+                isEqual = false;
+              }
+            });
+
+            if (isEqual) return item;
+
+            return false;
+          } else {
+            if (item.key === v.key) return item;
+            return false;
+          }
+        } else {
+          return false;
+        }
+      });
+
+      const newItems = filterValues.filter(
+        (v) => !items.find((i) => i.group === v.group)
+      );
+
+      items.push(...newItems);
+
+      currentFilterValues.push(...items.filter((i) => i));
+
+      return items.filter((i) => i);
+    });
+
+    return currentFilterValues;
   }, [
     filter.withSubfolders,
     filter.authorType,

From a70f6c43bd0a9cb1811dbce38b70862c8a2e28a5 Mon Sep 17 00:00:00 2001
From: mushka <nikitamushka@mail.ru>
Date: Thu, 27 Oct 2022 15:42:46 +0300
Subject: [PATCH 21/23] fixed thirdparty connection bug

---
 .../client/src/components/panels/SelectFolderDialog/index.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/panels/SelectFolderDialog/index.js b/packages/client/src/components/panels/SelectFolderDialog/index.js
index 17eb0243f0..5732919483 100644
--- a/packages/client/src/components/panels/SelectFolderDialog/index.js
+++ b/packages/client/src/components/panels/SelectFolderDialog/index.js
@@ -224,7 +224,7 @@ class SelectFolderDialog extends React.Component {
     const buttonIsDisabled =
       isDisableButton ||
       (isRecycleBin && currentFolderId === resultingFolderId) ||
-      selectionFiles[0]?.parentId === +resultingFolderId;
+      (selectionFiles && selectionFiles[0])?.parentId === +resultingFolderId;
 
     const isCurrentFolder = +currentFolderId === +resultingFolderId;
 

From a14e93f457d3b1f7b049f7811bcda13aee1109fe Mon Sep 17 00:00:00 2001
From: TimofeyBoyko <fognir742@gmail.com>
Date: Thu, 27 Oct 2022 17:47:36 +0500
Subject: [PATCH 22/23] Web:Client:Accounts: fix fiilter selected items

---
 .../AccountsHome/Section/Filter/index.js      | 77 +++++++++++++++++--
 packages/client/src/store/UsersStore.js       |  6 +-
 2 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/pages/AccountsHome/Section/Filter/index.js b/packages/client/src/pages/AccountsHome/Section/Filter/index.js
index 7d5d3dd548..8b06639270 100644
--- a/packages/client/src/pages/AccountsHome/Section/Filter/index.js
+++ b/packages/client/src/pages/AccountsHome/Section/Filter/index.js
@@ -56,8 +56,12 @@ const SectionFilterContent = ({
   groups,
   customNames,
 }) => {
+  const [selectedFilterValues, setSelectedFilterValues] = React.useState(null);
+
   //TODO: add new options from filter after update backend and fix manager from role
   const onFilter = (data) => {
+    console.log(data);
+
     const status = getStatus(data);
 
     const role = getRole(data);
@@ -73,13 +77,17 @@ const SectionFilterContent = ({
       newFilter.activationStatus = status;
     }
 
+    console.log(status);
+
     newFilter.page = 0;
 
     newFilter.role = role;
     newFilter.group = group;
 
+    console.log(newFilter);
+
     setIsLoading(true);
-    fetchPeople(newFilter).finally(() => setIsLoading(false));
+    fetchPeople(newFilter, true).finally(() => setIsLoading(false));
   };
 
   const onSort = (sortId, sortDirection) => {
@@ -93,7 +101,7 @@ const SectionFilterContent = ({
 
     setIsLoading(true);
 
-    fetchPeople(newFilter).finally(() => setIsLoading(false));
+    fetchPeople(newFilter, true).finally(() => setIsLoading(false));
   };
 
   const onSearch = (data = "") => {
@@ -103,7 +111,7 @@ const SectionFilterContent = ({
 
     setIsLoading(true);
 
-    fetchPeople(newFilter).finally(() => setIsLoading(false));
+    fetchPeople(newFilter, true).finally(() => setIsLoading(false));
   };
 
   // TODO: change translation keys
@@ -232,7 +240,7 @@ const SectionFilterContent = ({
   }, [filter.sortOrder, filter.sortBy]);
 
   //TODO: add new options from filter after update backend
-  const getSelectedFilterData = async () => {
+  const getSelectedFilterData = React.useCallback(async () => {
     const { guestCaption, userCaption, groupCaption } = customNames;
     const filterValues = [];
 
@@ -295,8 +303,61 @@ const SectionFilterContent = ({
       }
     }
 
-    return filterValues;
-  };
+    const currentFilterValues = [];
+
+    setSelectedFilterValues((value) => {
+      if (!value) {
+        currentFilterValues.push(...filterValues);
+        return filterValues.map((f) => ({ ...f }));
+      }
+
+      const items = value.map((v) => {
+        const item = filterValues.find((f) => f.group === v.group);
+
+        if (item) {
+          if (item.isMultiSelect) {
+            let isEqual = true;
+
+            item.key.forEach((k) => {
+              if (!v.key.includes(k)) {
+                isEqual = false;
+              }
+            });
+
+            if (isEqual) return item;
+
+            return false;
+          } else {
+            if (item.key === v.key) return item;
+            return false;
+          }
+        } else {
+          return false;
+        }
+      });
+
+      const newItems = filterValues.filter(
+        (v) => !items.find((i) => i.group === v.group)
+      );
+
+      items.push(...newItems);
+
+      currentFilterValues.push(...items.filter((i) => i));
+
+      return items.filter((i) => i);
+    });
+
+    console.log(currentFilterValues, filterValues);
+
+    return currentFilterValues;
+  }, [
+    filter.employeeStatus,
+    filter.activationStatus,
+    filter.role,
+    filter.group,
+    t,
+    customNames,
+  ]);
 
   //TODO: add new options from filter after update backend
   const removeSelectedItem = ({ key, group }) => {
@@ -317,12 +378,12 @@ const SectionFilterContent = ({
     }
 
     setIsLoading(true);
-    fetchPeople(newFilter).finally(() => setIsLoading(false));
+    fetchPeople(newFilter, true).finally(() => setIsLoading(false));
   };
 
   const clearAll = () => {
     setIsLoading(true);
-    fetchPeople().finally(() => setIsLoading(false));
+    fetchPeople(null, true).finally(() => setIsLoading(false));
   };
 
   return isLoaded && tReady ? (
diff --git a/packages/client/src/store/UsersStore.js b/packages/client/src/store/UsersStore.js
index 7469432f05..f40c9d2b11 100644
--- a/packages/client/src/store/UsersStore.js
+++ b/packages/client/src/store/UsersStore.js
@@ -23,7 +23,7 @@ class UsersStore {
     makeAutoObservable(this);
   }
 
-  getUsersList = async (filter) => {
+  getUsersList = async (filter, updateFilter = false) => {
     const filterData = filter ? filter.clone() : Filter.getDefault();
 
     if (!this.authStore.settingsStore.withPaging) {
@@ -41,6 +41,10 @@ class UsersStore {
     const res = await api.people.getUserList(filterData);
     filterData.total = res.total;
 
+    if (updateFilter) {
+      this.peopleStore.filterStore.setFilterParams(filterData);
+    }
+
     /*     this.peopleStore.filterStore.setFilterParams(filterData);
     this.peopleStore.selectedGroupStore.setSelectedGroup(
       filterData.group || "root"

From 1faf348b91c15e336e9ffc93186d89bb348d3fb8 Mon Sep 17 00:00:00 2001
From: TimofeyBoyko <fognir742@gmail.com>
Date: Thu, 27 Oct 2022 17:59:06 +0500
Subject: [PATCH 23/23] Web:Client:Accounts: delete useless console log

---
 .../client/src/pages/AccountsHome/Section/Filter/index.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/client/src/pages/AccountsHome/Section/Filter/index.js b/packages/client/src/pages/AccountsHome/Section/Filter/index.js
index 8b06639270..66d0aa5c60 100644
--- a/packages/client/src/pages/AccountsHome/Section/Filter/index.js
+++ b/packages/client/src/pages/AccountsHome/Section/Filter/index.js
@@ -60,8 +60,6 @@ const SectionFilterContent = ({
 
   //TODO: add new options from filter after update backend and fix manager from role
   const onFilter = (data) => {
-    console.log(data);
-
     const status = getStatus(data);
 
     const role = getRole(data);
@@ -77,15 +75,11 @@ const SectionFilterContent = ({
       newFilter.activationStatus = status;
     }
 
-    console.log(status);
-
     newFilter.page = 0;
 
     newFilter.role = role;
     newFilter.group = group;
 
-    console.log(newFilter);
-
     setIsLoading(true);
     fetchPeople(newFilter, true).finally(() => setIsLoading(false));
   };
@@ -347,8 +341,6 @@ const SectionFilterContent = ({
       return items.filter((i) => i);
     });
 
-    console.log(currentFilterValues, filterValues);
-
     return currentFilterValues;
   }, [
     filter.employeeStatus,