Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1

This commit is contained in:
Vlada Gazizova 2024-08-09 17:41:57 +03:00
commit 1b3d12877e

View File

@ -52,7 +52,7 @@ const RoomsItemHeader = ({
setSelection,
setBufferSelection,
isArchive,
hasLinks,
isShared,
showSearchBlock,
setShowSearchBlock,
roomType,
@ -70,7 +70,7 @@ const RoomsItemHeader = ({
(selection.roomType === RoomsType.PublicRoom ||
selection.roomType === RoomsType.FormRoom ||
selection.roomType === RoomsType.CustomRoom) &&
hasLinks;
isShared;
const badgeUrl = showPlanetIcon ? Planet12ReactSvgUrl : null;
const isRoomMembersPanel = selection?.isRoom && roomsView === "info_members";
@ -161,7 +161,6 @@ export default inject(
selectedFolderStore,
filesStore,
infoPanelStore,
publicRoomStore,
}) => {
const {
infoPanelSelection,
@ -170,7 +169,6 @@ export default inject(
showSearchBlock,
setShowSearchBlock,
} = infoPanelStore;
const { externalLinks } = publicRoomStore;
const selection = infoPanelSelection.length > 1 ? null : infoPanelSelection;
const isArchive = selection?.rootFolderType === FolderType.Archive;
@ -196,7 +194,7 @@ export default inject(
setSelection: filesStore.setSelection,
setBufferSelection: filesStore.setBufferSelection,
isArchive,
hasLinks: externalLinks.length,
isShared: selection?.shared,
roomType,
};
},