Merge branch 'develop' into feature/refactoring-viewer-base

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",
-});

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 {

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(

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",
+});