diff --git a/packages/client/public/locales/en/InfoPanel.json b/packages/client/public/locales/en/InfoPanel.json index 06b34acb4a..5b52477f00 100644 --- a/packages/client/public/locales/en/InfoPanel.json +++ b/packages/client/public/locales/en/InfoPanel.json @@ -10,6 +10,7 @@ "ExpectUsers": "Expect users", "FeedLinkWasDeleted": "Link was deleted", "FeedLocationLabel": "Folder «{{folderTitle}}»", + "FeedLocationRoomLabel": "Room «{{folderTitle}}»", "FileConverted": "File converted.", "FileCopied": "Files copied.", "FileCreated": "File created.", @@ -28,6 +29,7 @@ "GroupsEmptyScreenText": "See group details here", "HistoryEmptyScreenText": "Activity history will be shown here", "HistoryRoomCreated": "<1>«{{roomTitle}}» room created", + "HistoryRoomCopied": "<1>«{{roomTitle}}» room copied", "HistoryThirdParty": "History display is not available for public rooms with connected third-party storages", "InfoBanner": "The list of invited users includes the owner and/or admins of this {{productName}} with full access to all rooms. The owner and/or administrator cannot be assigned other access rights. Once added to the room, they will be notified of all changes.", "ItemsSelected": "Items selected", diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/History/FeedInfo.ts b/packages/client/src/pages/Home/InfoPanel/Body/views/History/FeedInfo.ts index 79b4a22324..f6effb9f3b 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/views/History/FeedInfo.ts +++ b/packages/client/src/pages/Home/InfoPanel/Body/views/History/FeedInfo.ts @@ -109,6 +109,11 @@ export const feedInfo = [ targetType: `${FeedTarget.Room}`, actionType: `${FeedAction.Rename}`, }, + { + key: "RoomCopied", + targetType: `${FeedTarget.Room}`, + actionType: `${FeedAction.Copy}`, + }, // ROOM TAGS { key: "AddedRoomTags", diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlockContent/MainTextFolderInfo.tsx b/packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlockContent/MainTextFolderInfo.tsx index f038b168f8..91d23998f4 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlockContent/MainTextFolderInfo.tsx +++ b/packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlockContent/MainTextFolderInfo.tsx @@ -46,11 +46,18 @@ const HistoryMainTextFolderInfo = ({ ) return null; + const destination = + feed.data.parentType === 0 || feed.data.toParentType === 0 + ? t("FeedLocationLabel", { + folderTitle: feed.data.parentTitle || feed.data.toFolderTitle, + }) + : t("FeedLocationRoomLabel", { + folderTitle: feed.data.parentTitle || feed.data.toFolderTitle, + }); + return ( - - {` ${t("FeedLocationLabel", { folderTitle: feed.data.parentTitle || feed.data.toFolderTitle })}`} - + {destination} ); }; diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/History/useFeedTranslation.tsx b/packages/client/src/pages/Home/InfoPanel/Body/views/History/useFeedTranslation.tsx index e4b3b23471..3d67a138e3 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/views/History/useFeedTranslation.tsx +++ b/packages/client/src/pages/Home/InfoPanel/Body/views/History/useFeedTranslation.tsx @@ -43,6 +43,16 @@ export const useFeedTranslation = ( components={{ 1: }} /> ); + case "RoomCopied": + return ( + }} + /> + ); case "RoomRenamed": return (