From dbcadd06a2246cdf61c3d1eb4a16586b963a014e Mon Sep 17 00:00:00 2001
From: Timofey Boyko <55255132+TimofeyBoyko@users.noreply.github.com>
Date: Tue, 28 Feb 2023 19:03:02 +0300
Subject: [PATCH 1/3] Fixed Bug 61193

---
 .../pages/Home/InfoPanel/Body/views/Members/User.js    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
index efad941d78..b43ca9a572 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
@@ -90,6 +90,8 @@ const User = ({
         ? "admin"
         : option.key === "roomAdmin"
         ? "manager"
+        : option.key === "collaborator"
+        ? "collaborator"
         : "user";
 
     const successCallback = () => {
@@ -98,7 +100,13 @@ const User = ({
 
     setIsLoading(true);
 
-    if (!changeUserType(userType, [user], successCallback, abortCallback)) {
+    const needChangeUserType =
+      ((user.isVisitor || user.isCollaborator) && userType === "manager") ||
+      (user.isVisitor && userType === "collaborator");
+
+    if (needChangeUserType) {
+      changeUserType(userType, [user], successCallback, abortCallback);
+    } else {
       updateRole(option);
     }
   };

From 7238b23d899b4d57209c77ea8e2d647ecfd4f6e2 Mon Sep 17 00:00:00 2001
From: Timofey Boyko <55255132+TimofeyBoyko@users.noreply.github.com>
Date: Wed, 1 Mar 2023 10:38:59 +0300
Subject: [PATCH 2/3] Web:Client:ChangeUserTypeEvent: add new type
 'Collaborator'

---
 .../client/src/components/GlobalEvents/ChangeUserTypeEvent.js   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js b/packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
index ce42f744b1..c889b075de 100644
--- a/packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
+++ b/packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
@@ -99,6 +99,8 @@ const ChangeUserTypeEvent = ({
         return t("Common:DocSpaceAdmin");
       case "manager":
         return t("Common:RoomAdmin");
+      case "collaborator":
+        return t("Common:Collaborator");
       case "user":
       default:
         return t("Common:User");

From 65850ca29e90f59e5478876b36747064d54abd58 Mon Sep 17 00:00:00 2001
From: Timofey Boyko <55255132+TimofeyBoyko@users.noreply.github.com>
Date: Wed, 1 Mar 2023 11:21:59 +0300
Subject: [PATCH 3/3] Fixed Bug 61322 and Bug 61324

---
 .../src/components/GlobalEvents/ChangeUserTypeEvent.js    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js b/packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
index c889b075de..f84920b3db 100644
--- a/packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
+++ b/packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
@@ -15,6 +15,7 @@ const ChangeUserTypeEvent = ({
   peopleFilter,
   updateUserType,
   getUsersList,
+  onClose,
 }) => {
   const {
     toType,
@@ -58,7 +59,7 @@ const ChangeUserTypeEvent = ({
   };
 
   const onChangeUserType = () => {
-    onClose();
+    onClosePanel();
     updateUserType(toType, userIDs, peopleFilter, fromType)
       .then(() => {
         toastr.success(t("SuccessChangeUserType"));
@@ -83,14 +84,15 @@ const ChangeUserTypeEvent = ({
       });
   };
 
-  const onClose = () => {
+  const onClosePanel = () => {
     setVisible(false);
+    onClose();
   };
 
   const onCloseAction = async () => {
     await getUsersList(peopleFilter);
     abortCallback && abortCallback();
-    onClose();
+    onClosePanel();
   };
 
   const getType = (type) => {