Merge pull request #1258 from ONLYOFFICE/bugfix/accounts-list

Bugfix/accounts list

packages/client/src/components/panels/InvitePanel/index.js

@@ -42,6 +42,8 @@ const InvitePanel = ({
   reloadSelectionParentRoom,
   setUpdateRoomMembers,
   roomsView,
+  getUsersList,
+  filter,
 }) => {
   const [selectedRoom, setSelectedRoom] = useState(null);
   const [hasErrors, setHasErrors] = useState(false);
@@ -186,6 +188,10 @@ const InvitePanel = ({
     } catch (err) {
       toastr.error(err);
       setIsLoading(false);
+    } finally {
+      if (roomId === -1) {
+        await getUsersList(filter , false);
+      }
     }
   };
 
@@ -269,7 +275,8 @@ const InvitePanel = ({
 export default inject(({ auth, peopleStore, filesStore, dialogsStore }) => {
   const { theme } = auth.settingsStore;
 
-  const { getUsersByQuery, inviteUsers } = peopleStore.usersStore;
+  const { getUsersByQuery, inviteUsers, getUsersList } = peopleStore.usersStore;
+  const { filter } = peopleStore.filterStore;
   const {
     setIsMobileHidden: setInfoPanelIsMobileHidden,
     reloadSelectionParentRoom,
@@ -323,6 +330,8 @@ export default inject(({ auth, peopleStore, filesStore, dialogsStore }) => {
     reloadSelectionParentRoom,
     setUpdateRoomMembers,
     roomsView,
+    getUsersList,
+    filter,
   };
 })(
   withTranslation([

packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js

@@ -118,7 +118,7 @@ const User = ({
   const withTooltip = user.isOwner || user.isAdmin;
 
   const tooltipContent = `${
-    user.isAdmin ? t("Common:DocSpaceAdmin") : t("Common:Owner")
+    user.isOwner ? t("Common:DocSpaceOwner") : t("Common:DocSpaceAdmin")
   }. ${t("Common:HasFullAccess")}`;
 
   return (

packages/client/src/store/AccessRightsStore.js

@@ -38,7 +38,7 @@ class AccessRightsStore {
 
     const { id: userId, statusType, role } = user;
 
-    if (userId === id || statusType === EmployeeStatus.Disabled) return false;
+    if (userId === id || statusType === "disabled") return false;
 
     switch (role) {
       case "owner":

public/locales/en/Common.json

@@ -75,6 +75,7 @@
   "Delete": "Delete",
   "Disconnect": "Disconnect",
   "DocSpaceAdmin": "DocSpace admin",
+  "DocSpaceOwner": "DocSpace owner",
   "Documents": "Documents",
   "DomainIpAddress": "Domains as IP addresses are not supported",
   "Done": "Done",

public/locales/ru/Common.json

@@ -75,6 +75,7 @@
   "Delete": "Удалить",
   "Disconnect": "Отключить",
   "DocSpaceAdmin": "DocSpace администратор",
+  "DocSpaceOwner": "DocSpace владелец",
   "Documents": "Документы",
   "DomainIpAddress": "IP адрес в качестве домена не поддерживается",
   "Done": "Успешно",
@@ -99,6 +100,7 @@
   "FirstName": "Имя",
   "FullAccess": "Полный доступ",
   "Gigabyte": "Гб",
+  "HasFullAccess": "У него есть полный доступ в комнату",
   "HelpCenter": "Справочный центр",
   "HideArticleMenu": "Скрыть меню",
   "Hotkeys": "Горячие клавиши",