Merge pull request #996 from ONLYOFFICE/bugfix/fix-row-description
Bugfix/fix row room description
This commit is contained in:
commit
f1f4128e66
@ -105,16 +105,6 @@ const FilesRowContent = ({
|
||||
isRoom,
|
||||
} = item;
|
||||
|
||||
let tags = null;
|
||||
|
||||
if (isRoom) {
|
||||
if (item.tags.length > 0) {
|
||||
tags = item?.tags.join(" | ");
|
||||
} else {
|
||||
tags = t(RoomsTypeTranslations[item.roomType]);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<SimpleFilesRowContent
|
||||
@ -139,18 +129,18 @@ const FilesRowContent = ({
|
||||
{badgesComponent}
|
||||
{!isRoom && !isRooms && quickButtons}
|
||||
</div>
|
||||
{!isRoom && (
|
||||
<Text
|
||||
containerMinWidth="200px"
|
||||
containerWidth="15%"
|
||||
fontSize="12px"
|
||||
fontWeight={400}
|
||||
// color={sideColor}
|
||||
className="row_update-text"
|
||||
>
|
||||
{updatedDate && updatedDate}
|
||||
</Text>
|
||||
)}
|
||||
|
||||
<Text
|
||||
containerMinWidth="200px"
|
||||
containerWidth="15%"
|
||||
fontSize="12px"
|
||||
fontWeight={400}
|
||||
// color={sideColor}
|
||||
className="row_update-text"
|
||||
>
|
||||
{updatedDate && updatedDate}
|
||||
</Text>
|
||||
|
||||
<Text
|
||||
containerMinWidth="90px"
|
||||
containerWidth="10%"
|
||||
@ -162,7 +152,7 @@ const FilesRowContent = ({
|
||||
truncate={true}
|
||||
>
|
||||
{isRooms
|
||||
? tags
|
||||
? t(RoomsTypeTranslations[item.roomType])
|
||||
: !fileExst && !contentLength && !providerKey && !isMobileOnly
|
||||
? `${foldersCount} ${t("Translations:Folders")} | ${filesCount} ${t(
|
||||
"Translations:Files"
|
||||
|
@ -39,9 +39,7 @@ const sideInfoTabletStyle = css`
|
||||
margin: ${(props) => props.theme.rowContent.sideInfo.margin};
|
||||
${commonCss};
|
||||
color: ${(props) => props.color && props.color};
|
||||
white-space: nowrap;
|
||||
overflow: ${(props) => props.theme.rowContent.sideInfo.overflow};
|
||||
text-overflow: ${(props) => props.theme.rowContent.sideInfo.textOverflow};
|
||||
${truncateCss};
|
||||
`;
|
||||
|
||||
const StyledRowContent = styled.div`
|
||||
@ -88,6 +86,7 @@ const MainContainerWrapper = styled.div`
|
||||
${mainWrapperTabletStyle}
|
||||
}
|
||||
`;
|
||||
|
||||
MainContainerWrapper.defaultProps = { theme: Base };
|
||||
|
||||
const MainContainer = styled.div`
|
||||
|
Loading…
Reference in New Issue
Block a user