From 706380fcbf382abe37aada9372a95adeb7244f01 Mon Sep 17 00:00:00 2001
From: Alexey Safronov <Alexey.Safronov@onlyoffice.com>
Date: Thu, 15 Aug 2024 16:55:39 +0400
Subject: [PATCH 1/4] Fix Bug 69519 - Accounts. Sorting by Last name field does
 not work

---
 .../InsideGroup/TableView/TableHeader.js         | 16 +++-------------
 .../AccountsBody/People/TableView/TableHeader.js |  9 +++------
 .../src/pages/Home/Section/Filter/index.js       |  4 ++--
 packages/shared/api/people/filter.js             |  2 +-
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableHeader.js b/packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableHeader.js
index 94df06e920..5783767e86 100644
--- a/packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableHeader.js
+++ b/packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableHeader.js
@@ -138,15 +138,8 @@ class InsideGroupTableHeader extends React.Component {
       newFilter.sortBy = sortBy;
 
       if (sortBy === "AZ") {
-        if (
-          newFilter.sortBy !== "lastname" &&
-          newFilter.sortBy !== "firstname"
-        ) {
-          newFilter.sortBy = "firstname";
-        } else if (newFilter.sortBy === "lastname") {
-          newFilter.sortBy = "firstname";
-        } else {
-          newFilter.sortBy = "lastname";
+        if (newFilter.sortBy !== "displayname") {
+          newFilter.sortBy = "displayname";
         }
         newFilter.sortOrder =
           newFilter.sortOrder === "ascending" ? "descending" : "ascending";
@@ -176,10 +169,7 @@ class InsideGroupTableHeader extends React.Component {
     } = this.props;
     const { sortOrder } = filter;
 
-    const sortBy =
-      filter.sortBy === "firstname" || filter.sortBy === "lastname"
-        ? "AZ"
-        : filter.sortBy;
+    const sortBy = filter.sortBy === "displayname" ? "AZ" : filter.sortBy;
 
     return (
       <TableHeader
diff --git a/packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableHeader.js b/packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableHeader.js
index 9a9e0001c9..310be7ba8e 100644
--- a/packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableHeader.js
+++ b/packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableHeader.js
@@ -143,7 +143,7 @@ class PeopleTableHeader extends React.Component {
 
     if (
       newFilter.sortBy === sortBy ||
-      (sortBy === "AZ" && newFilter.sortBy === "firstname")
+      (sortBy === "AZ" && newFilter.sortBy === "displayname")
     ) {
       newFilter.sortOrder =
         newFilter.sortOrder === "ascending" ? "descending" : "ascending";
@@ -151,7 +151,7 @@ class PeopleTableHeader extends React.Component {
       newFilter.sortBy = sortBy;
 
       if (sortBy === "AZ") {
-        newFilter.sortBy = "firstname";
+        newFilter.sortBy = "displayname";
       }
     }
 
@@ -178,10 +178,7 @@ class PeopleTableHeader extends React.Component {
     } = this.props;
     const { sortOrder } = filter;
 
-    const sortBy =
-      filter.sortBy === "firstname" || filter.sortBy === "lastname"
-        ? "AZ"
-        : filter.sortBy;
+    const sortBy = filter.sortBy === "displayname" ? "AZ" : filter.sortBy;
 
     return (
       <TableHeader
diff --git a/packages/client/src/pages/Home/Section/Filter/index.js b/packages/client/src/pages/Home/Section/Filter/index.js
index 035cf37d16..0506e8da4a 100644
--- a/packages/client/src/pages/Home/Section/Filter/index.js
+++ b/packages/client/src/pages/Home/Section/Filter/index.js
@@ -1961,8 +1961,8 @@ const SectionFilterContent = ({
       const options = [];
 
       const firstName = {
-        id: "sort-by_first-name",
-        key: "firstname",
+        id: "sort-by_displayname",
+        key: "displayname",
         label: t("Common:Name"),
         default: true,
       };
diff --git a/packages/shared/api/people/filter.js b/packages/shared/api/people/filter.js
index 926e9e7b6c..086224fd9a 100644
--- a/packages/shared/api/people/filter.js
+++ b/packages/shared/api/people/filter.js
@@ -29,7 +29,7 @@ import { getObjectByLocation, toUrlParams } from "../../utils/common";
 const DEFAULT_PAGE = 0;
 const DEFAULT_PAGE_COUNT = 25;
 const DEFAULT_TOTAL = 0;
-const DEFAULT_SORT_BY = "firstname";
+const DEFAULT_SORT_BY = "displayname";
 const DEFAULT_SORT_ORDER = "ascending";
 const DEFAULT_EMPLOYEE_STATUS = null;
 const DEFAULT_ACTIVATION_STATUS = null;

From d5a0dc915d104058c5722e2ca8d81083908e9939 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <ilya.oleshko@onlyoffice.com>
Date: Thu, 15 Aug 2024 16:07:20 +0300
Subject: [PATCH 2/4] JS-SDK: Added onContentReady event

---
 public/scripts/sdk/1.0.1/api.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/scripts/sdk/1.0.1/api.js b/public/scripts/sdk/1.0.1/api.js
index cb263c3245..a5247f8a0f 100644
--- a/public/scripts/sdk/1.0.1/api.js
+++ b/public/scripts/sdk/1.0.1/api.js
@@ -98,6 +98,7 @@
       onSignOut: null,
       onDownload: null,
       onNoAccess: null,
+      onContentReady: null,
     },
   };
 
@@ -814,7 +815,10 @@
         targetFrame.style.height = this.config.height;
         targetFrame.parentNode.style.height = "inherit";
 
-        if (loader) loader.remove();
+        if (loader) {
+          loader.remove();
+          this.config.events.onContentReady();
+        }
       }
     }
 

From 514680958b699a8afbf6099e553e1a142d88511f Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <ilya.oleshko@onlyoffice.com>
Date: Thu, 15 Aug 2024 17:02:48 +0300
Subject: [PATCH 3/4] Client: InfoPanel: Body: Fixed align items to baseline

---
 .../client/src/pages/Home/InfoPanel/Body/styles/common.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js b/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js
index 2332db4d55..fb45cf0d15 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js
@@ -264,8 +264,8 @@ const StyledProperties = styled.div`
     grid-template-columns: 120px 1fr;
     grid-column-gap: 24px;
 
-    -webkit-box-align: center;
-    align-items: center;
+    -webkit-box-align: baseline;
+    align-items: baseline;
 
     .property-title {
       font-size: 13px;

From b4840a28071c5b55347d5c6f0c4d3921fed470ac Mon Sep 17 00:00:00 2001
From: Alexey Safronov <Alexey.Safronov@onlyoffice.com>
Date: Thu, 15 Aug 2024 19:17:14 +0400
Subject: [PATCH 4/4] Fix Bug 66831 - Rooms: Invite via link. Console error 500
 (Internal Server Error) when regenerating the invitation link.

---
 .../InvitePanel/sub-components/ExternalLinks.js       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/components/panels/InvitePanel/sub-components/ExternalLinks.js b/packages/client/src/components/panels/InvitePanel/sub-components/ExternalLinks.js
index a247277c03..93c53609fe 100644
--- a/packages/client/src/components/panels/InvitePanel/sub-components/ExternalLinks.js
+++ b/packages/client/src/components/panels/InvitePanel/sub-components/ExternalLinks.js
@@ -88,7 +88,7 @@ const ExternalLinks = ({
           copyLink(link.shareLink);
         }
       } else {
-        !externalLinksVisible ? editLink() : disableLink();
+        !externalLinksVisible ? await editLink() : await disableLink();
       }
       onChangeExternalLinksVisible(!externalLinksVisible);
     } catch (error) {
@@ -98,9 +98,10 @@ const ExternalLinks = ({
     }
   };
 
-  const disableLink = () => {
-    setInvitationLinks(roomId, "Invite", 0, shareLinks[0].id);
-    setShareLinks([]);
+  const disableLink = async () => {
+    shareLinks?.length &&
+      (await setInvitationLinks(roomId, "Invite", 0, shareLinks[0].id));
+    return setShareLinks([]);
   };
 
   const editLink = async () => {
@@ -120,7 +121,7 @@ const ExternalLinks = ({
 
     copyLink(shareLink);
     setShareLinks([activeLink]);
-    setActiveLink(activeLink);
+    return setActiveLink(activeLink);
   };
 
   const onSelectAccess = async (access) => {