From 86f116e62fad3bca1fa14895144b8fb99130f582 Mon Sep 17 00:00:00 2001
From: Viktor Fomin <viktor.fomin@onlyoffice.com>
Date: Thu, 15 Aug 2024 14:44:33 +0300
Subject: [PATCH 1/3] Fix Bug 69670

No name centering
---
 .../src/pages/Confirm/sub-components/StyledCreateUser.js     | 5 ++++-
 .../client/src/pages/Confirm/sub-components/createUser.js    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/Confirm/sub-components/StyledCreateUser.js b/packages/client/src/pages/Confirm/sub-components/StyledCreateUser.js
index 461ebb1614..8ff8d3adf4 100644
--- a/packages/client/src/pages/Confirm/sub-components/StyledCreateUser.js
+++ b/packages/client/src/pages/Confirm/sub-components/StyledCreateUser.js
@@ -54,7 +54,10 @@ export const GreetingContainer = styled.div`
   }
 
   .tooltip {
-    p {
+    .invitation-text {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
       text-align: center;
     }
 
diff --git a/packages/client/src/pages/Confirm/sub-components/createUser.js b/packages/client/src/pages/Confirm/sub-components/createUser.js
index 99eb5e95f6..fcd1292fea 100644
--- a/packages/client/src/pages/Confirm/sub-components/createUser.js
+++ b/packages/client/src/pages/Confirm/sub-components/createUser.js
@@ -485,7 +485,7 @@ const CreateUserForm = (props) => {
           <PortalLogo className="portal-logo" />
           {linkData.type === "LinkInvite" && (
             <div className="tooltip">
-              <Text fontSize="16px">
+              <Text fontSize="16px" as="div" className="invitation-text">
                 {roomName ? (
                   <Trans
                     t={t}

From cfc7cf0114da7037eb02f0a8fc681ba0242b5669 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <ilya.oleshko@onlyoffice.com>
Date: Thu, 15 Aug 2024 14:54:54 +0300
Subject: [PATCH 2/3] Shared: Utils: Fixed force redirect inside frame on 401
 response

---
 packages/shared/utils/axiosClient.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/shared/utils/axiosClient.ts b/packages/shared/utils/axiosClient.ts
index c035f9e298..cec4503331 100644
--- a/packages/shared/utils/axiosClient.ts
+++ b/packages/shared/utils/axiosClient.ts
@@ -220,10 +220,12 @@ class AxiosClient {
       }
 
       const loginURL = combineUrl(proxyURL, "/login");
+
       if (!this.isSSR) {
         switch (error.response?.status) {
           case 401: {
-            if (options.skipUnauthorized) return Promise.resolve();
+            if (options.skipUnauthorized || window?.ClientConfig?.isFrame)
+              return Promise.resolve();
             if (options.skipLogout) return Promise.reject(error);
 
             const opt: AxiosRequestConfig = {
@@ -244,14 +246,13 @@ class AxiosClient {
             break;
           case 403: {
             const pathname = window.location.pathname;
-            const isFrame = window?.ClientConfig?.isFrame;
 
             const isArchived = pathname.indexOf("/rooms/archived") !== -1;
 
             const isRooms =
               pathname.indexOf("/rooms/shared") !== -1 || isArchived;
 
-            if (isRooms && !skipRedirect && !isFrame) {
+            if (isRooms && !skipRedirect && !window?.ClientConfig?.isFrame) {
               setTimeout(() => {
                 window.DocSpace.navigate(isArchived ? "/archived" : "/");
               }, 1000);

From 70b0942dfb82517e50d133a786b16187322dc119 Mon Sep 17 00:00:00 2001
From: Alexey Safronov <Alexey.Safronov@onlyoffice.com>
Date: Thu, 15 Aug 2024 16:13:18 +0400
Subject: [PATCH 3/3] Bug 69519 - Accounts. Sorting by Last name field does not
 work

---
 .../client/src/pages/Home/Section/Filter/index.js     | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/pages/Home/Section/Filter/index.js b/packages/client/src/pages/Home/Section/Filter/index.js
index ca0e12ffb4..035cf37d16 100644
--- a/packages/client/src/pages/Home/Section/Filter/index.js
+++ b/packages/client/src/pages/Home/Section/Filter/index.js
@@ -1963,14 +1963,7 @@ const SectionFilterContent = ({
       const firstName = {
         id: "sort-by_first-name",
         key: "firstname",
-        label: t("Common:FirstName"),
-        default: true,
-      };
-
-      const lastName = {
-        id: "sort-by_last-name",
-        key: "lastname",
-        label: t("Common:LastName"),
+        label: t("Common:Name"),
         default: true,
       };
 
@@ -2012,7 +2005,7 @@ const SectionFilterContent = ({
         hideableColumns.Storage = storage;
       }
 
-      options.push(firstName, lastName, type, department, email);
+      options.push(firstName, type, department, email);
       if (showStorageInfo) options.push(storage);
 
       return options;