Merge pull request #977 from ONLYOFFICE/bugfix/fix-accounts-filter

Bugfix/fix filter

packages/client/src/pages/AccountsHome/Section/Filter/index.js

@@ -78,6 +78,7 @@ const SectionFilterContent = ({
     newFilter.page = 0;
 
     newFilter.role = role;
+
     newFilter.group = group;
 
     setIsLoading(true);
@@ -144,11 +145,11 @@ const SectionFilterContent = ({
         isHeader: true,
         isLast: true,
       },
-      { key: "admin", group: "filter-type", label: t("Administrator") },
+      { key: "admin", group: "filter-type", label: t("Common:DocSpaceAdmin") },
       {
         key: "manager",
         group: "filter-type",
-        label: "Manager",
+        label: t("Common:RoomAdmin"),
       },
       {
         key: "user",
@@ -266,14 +267,14 @@ const SectionFilterContent = ({
 
       switch (filter.role) {
         case "admin":
-          label = t("Administrator");
+          label = t("Common:DocSpaceAdmin");
+          break;
+        case "manager":
+          label = t("Common:RoomAdmin");
           break;
         case "user":
           label = userCaption;
           break;
-        case "guest":
-          label = guestCaption;
-          break;
         default:
           label = "";
       }

packages/client/src/pages/AccountsHome/index.js

@@ -54,7 +54,7 @@ const PureHome = ({
       setIsRefresh(true);
       const newFilter = Filter.getFilter(location);
       //console.log("PEOPLE URL changed", pathname, newFilter);
-      getUsersList(newFilter).finally(() => {
+      getUsersList(newFilter, true).finally(() => {
         setFirstLoad(false);
         setIsLoading(false);
         setIsRefresh(false);

packages/client/src/pages/Home/Section/Filter/index.js

@@ -395,7 +395,11 @@ const SectionFilterContent = ({
         }
 
         filterValues.push({
-          key: isMe ? FilterKeys.me : roomsFilter.subjectId,
+          key: isMe
+            ? roomsFilter.excludeSubject
+              ? FilterKeys.other
+              : FilterKeys.me
+            : roomsFilter.subjectId,
           group: FilterGroups.roomFilterOwner,
           label: label,
         });

packages/common/api/people/filter.js

@@ -135,6 +135,7 @@ class Filter {
         break;
       case "manager":
         dtoFilter.employeeType = 1;
+        dtoFilter.isadministrator = "false";
         break;
       case "user":
         dtoFilter.employeeType = 2;

packages/common/components/FilterInput/sub-components/FilterBlockItem.js

@@ -186,6 +186,7 @@ const FilterBlockItem = ({
         <StyledFilterBlockItemTagText
           noSelect={true}
           isSelected={item.isSelected}
+          truncate
         >
           {item.label}
         </StyledFilterBlockItemTagText>

packages/common/components/FilterInput/sub-components/StyledFilterBlock.js

@@ -106,6 +106,9 @@ const StyledFilterBlockItem = styled.div`
     props.withoutHeader ? "0" : props.isFirst ? "12px 0 0 0" : "16px 0 0 0"};
   padding: 0 15px 0 16px;
 
+  max-width: 480px;
+  box-sizing: border-box;
+
   display: flex;
   flex-direction: column;
   justify-content: start;
@@ -165,6 +168,8 @@ const StyledFilterBlockItemTag = styled.div`
   height: 28px;
   max-height: 28px;
 
+  max-width: 100%;
+
   display: flex;
   flex-direction: row;
   align-items: center;