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

Fixed Bug 69551 - Files.Info.History: Fixed "Documents" type in info panel

Browse Source
This commit is contained in:
Ilya Oleshko 2024-08-07 12:46:30 +03:00
parent 03509c1e99
commit d92d72061c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/public/locales/en/InfoPanel.json
View File

@ -12,6 +12,7 @@
"FeedLocationLabel": "Folder «{{folderTitle}}»", "FeedLocationLabel": "Folder «{{folderTitle}}»",
"FeedLocationLabelFrom": "from «{{folderTitle}}»", "FeedLocationLabelFrom": "from «{{folderTitle}}»",
"FeedLocationRoomLabel": "Room «{{folderTitle}}»", "FeedLocationRoomLabel": "Room «{{folderTitle}}»",
"FeedLocationSectionLabel": "Section «{{folderTitle}}»",
"FileConverted": "File converted.", "FileConverted": "File converted.",
"FileCopied": "Files copied.", "FileCopied": "Files copied.",
"FileCopiedTo": "Files copied to «{{folderTitle}}»", "FileCopiedTo": "Files copied to «{{folderTitle}}»",

10
packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlockContent/MainTextFolderInfo.tsx
View File

@ -27,6 +27,7 @@
import { withTranslation } from "react-i18next"; import { withTranslation } from "react-i18next";
import { inject, observer } from "mobx-react"; import { inject, observer } from "mobx-react";
import { TTranslation } from "@docspace/shared/types"; import { TTranslation } from "@docspace/shared/types";
import { FolderType } from "@docspace/shared/enums";
import { StyledHistoryBlockMessage } from "../../../styles/history"; import { StyledHistoryBlockMessage } from "../../../styles/history";
type HistoryMainTextFolderInfoProps = { type HistoryMainTextFolderInfoProps = {
@ -54,12 +55,15 @@ const HistoryMainTextFolderInfo = ({
if (!parentTitle) return null; if (!parentTitle) return null;
const isFolder = parentType === 0; const isSection = parentType === FolderType.USER;
const isFromFolder = fromParentType === 0; const isFolder = parentType === FolderType.DEFAULT;
const isFromFolder = fromParentType === FolderType.DEFAULT;
const destination = isFolder const destination = isFolder
? t("FeedLocationLabel", { folderTitle: parentTitle }) ? t("FeedLocationLabel", { folderTitle: parentTitle })
: t("FeedLocationRoomLabel", { folderTitle: parentTitle }); : isSection
? t("FeedLocationSectionLabel", { folderTitle: parentTitle })
: t("FeedLocationRoomLabel", { folderTitle: parentTitle });
const sourceDestination = isFromFolder const sourceDestination = isFromFolder
? t("FeedLocationLabelFrom", { folderTitle: fromParentTitle }) ? t("FeedLocationLabelFrom", { folderTitle: fromParentTitle })