IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #872 from ONLYOFFICE/bugfix/folder-info

Browse Source 
Bugfix/folder info
This commit is contained in:
Nikita Gopienko 2022-09-29 13:53:47 +03:00 committed by GitHub
commit e0c630cc88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/client/src/components/EmptyContainer/EmptyFolderContainer.js
View File

@ -93,9 +93,11 @@ export default inject(({ filesStore, selectedFolderStore }) => {
let isRootRoom, isRoom, id;
if (navigationPath && navigationPath.length) {
isRootRoom = navigationPath[navigationPath.length - 1].isRootRoom;
isRoom = navigationPath[navigationPath.length - 1].isRoom;
id = navigationPath[navigationPath.length - 1].id;
const elem = navigationPath[0];
isRootRoom = elem.isRootRoom;
isRoom = elem.isRoom;
id = elem.id;
}
return {

12
packages/client/src/components/EmptyContainer/RootFolderContainer.js
View File

@ -69,6 +69,8 @@ const RootFolderContainer = (props) => {
t("PrivateRoomDescriptionUnbreakable"),
];
const roomHeader = "Welcome to DocSpace";
const [showLoader, setShowLoader] = React.useState(false);
React.useEffect(() => {
@ -164,7 +166,7 @@ const RootFolderContainer = (props) => {
};
case FolderType.Rooms:
return {
headerText: "Welcome to DocSpace!",
headerText: roomHeader,
descriptionText: roomsDescription,
imageSrc: "images/empty_screen_corporate.png",
buttons: roomsButtons,
@ -277,7 +279,7 @@ const RootFolderContainer = (props) => {
alt="plus_icon"
/>
<Link onClick={onCreateRoom} {...linkStyles}>
Create room
{t("CreateEditRoomDialog:CreateRoom")}
</Link>
</div>
);
@ -391,4 +393,8 @@ export default inject(
setIsEmptyPage,
};
}
)(withTranslation("Files")(observer(RootFolderContainer)));
)(
withTranslation(["Files", "CreateEditRoomDialog"])(
observer(RootFolderContainer)
)
);