From f4f7a1b3adae84f90e66323aaf948dc4b65990d8 Mon Sep 17 00:00:00 2001
From: Timofey Boyko <55255132+TimofeyBoyko@users.noreply.github.com>
Date: Fri, 3 Mar 2023 11:05:26 +0300
Subject: [PATCH 1/2] Web:Client: move FilterGroups and FilterKeys constants to
 common

---
 packages/client/src/helpers/filesConstants.js | 23 -------------------
 .../src/pages/Home/Section/Filter/index.js    |  5 +---
 packages/common/constants/index.js            | 23 +++++++++++++++++++
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/packages/client/src/helpers/filesConstants.js b/packages/client/src/helpers/filesConstants.js
index 01a5120475..f0668ad30a 100644
--- a/packages/client/src/helpers/filesConstants.js
+++ b/packages/client/src/helpers/filesConstants.js
@@ -10,26 +10,3 @@ export const thumbnailStatuses = {
 };
 
 export const ADS_TIMEOUT = 300000; // 5 min
-
-export const FilterGroups = Object.freeze({
-  filterType: "filter-filterType",
-  filterAuthor: "filter-author",
-  filterFolders: "filter-folders",
-  filterContent: "filter-withContent",
-  roomFilterProviderType: "filter-provider-type",
-  roomFilterType: "filter-type",
-  roomFilterSubject: "filter-subject",
-  roomFilterOwner: "filter-owner",
-  roomFilterTags: "filter-tags",
-  roomFilterFolders: "filter-withSubfolders",
-  roomFilterContent: "filter-content",
-});
-
-export const FilterKeys = Object.freeze({
-  withSubfolders: "withSubfolders",
-  excludeSubfolders: "excludeSubfolders",
-  withContent: "withContent",
-  me: "me",
-  other: "other",
-  user: "user",
-});
diff --git a/packages/client/src/pages/Home/Section/Filter/index.js b/packages/client/src/pages/Home/Section/Filter/index.js
index 6b9a60465f..c0fd26ec3d 100644
--- a/packages/client/src/pages/Home/Section/Filter/index.js
+++ b/packages/client/src/pages/Home/Section/Filter/index.js
@@ -9,10 +9,7 @@ import { isMobileOnly } from "react-device-detect";
 import find from "lodash/find";
 import result from "lodash/result";
 
-import {
-  FilterGroups,
-  FilterKeys,
-} from "@docspace/client/src/helpers/filesConstants";
+import { FilterGroups, FilterKeys } from "@docspace/common/constants";
 
 import { getUser } from "@docspace/common/api/people";
 import {
diff --git a/packages/common/constants/index.js b/packages/common/constants/index.js
index 5b7a551268..5ab41418bb 100644
--- a/packages/common/constants/index.js
+++ b/packages/common/constants/index.js
@@ -380,3 +380,26 @@ export const PortalFeaturesLimitations = Object.freeze({
 export const EDITOR_ID = "docspace_editor";
 
 export const wrongPortalNameUrl = `https://www.onlyoffice.com/wrongportalname.aspx`;
+
+export const FilterGroups = Object.freeze({
+  filterType: "filter-filterType",
+  filterAuthor: "filter-author",
+  filterFolders: "filter-folders",
+  filterContent: "filter-withContent",
+  roomFilterProviderType: "filter-provider-type",
+  roomFilterType: "filter-type",
+  roomFilterSubject: "filter-subject",
+  roomFilterOwner: "filter-owner",
+  roomFilterTags: "filter-tags",
+  roomFilterFolders: "filter-withSubfolders",
+  roomFilterContent: "filter-content",
+});
+
+export const FilterKeys = Object.freeze({
+  withSubfolders: "withSubfolders",
+  excludeSubfolders: "excludeSubfolders",
+  withContent: "withContent",
+  me: "me",
+  other: "other",
+  user: "user",
+});

From a1c6d87598f672c8663c8109a2d99e7ec645db85 Mon Sep 17 00:00:00 2001
From: Timofey Boyko <55255132+TimofeyBoyko@users.noreply.github.com>
Date: Fri, 3 Mar 2023 11:07:52 +0300
Subject: [PATCH 2/2] Web:Common:FilterInput: fix empty tag

---
 .../sub-components/FilterBlockItem.js         | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/common/components/FilterInput/sub-components/FilterBlockItem.js b/packages/common/components/FilterInput/sub-components/FilterBlockItem.js
index d00b2f4693..5f4ee0b707 100644
--- a/packages/common/components/FilterInput/sub-components/FilterBlockItem.js
+++ b/packages/common/components/FilterInput/sub-components/FilterBlockItem.js
@@ -24,6 +24,7 @@ import {
 import { ColorTheme, ThemeType } from "@docspace/common/components/ColorTheme";
 
 import XIcon from "PUBLIC_DIR/images/x.react.svg";
+import { FilterGroups, FilterKeys } from "../../../constants";
 
 const FilterBlockItem = ({
   group,
@@ -184,16 +185,21 @@ const FilterBlockItem = ({
   };
 
   const getTagItem = (item) => {
-    const isAuthor = item.key === "user";
-
-    const [meItem, otherItem, userItem] = groupItem;
+    const isAuthor = item.key === FilterKeys.user;
 
     if (
-      item.key === otherItem.key &&
-      userItem?.isSelected &&
-      !meItem?.isSelected
-    )
-      return;
+      item.group === FilterGroups.filterAuthor ||
+      item.group === FilterGroups.roomFilterSubject
+    ) {
+      const [meItem, otherItem, userItem] = groupItem;
+
+      if (
+        item.key === otherItem.key &&
+        userItem?.isSelected &&
+        !meItem?.isSelected
+      )
+        return;
+    }
 
     return (
       <ColorTheme
@@ -202,7 +208,7 @@ const FilterBlockItem = ({
         name={`${item.label}-${item.key}`}
         id={item.id}
         onClick={
-          item.key === "other"
+          item.key === FilterKeys.other
             ? (event) => showSelectorAction(event, isAuthor, item.group, [])
             : () =>
                 changeFilterValueAction(