fix: shared with me section breadcrumbs (#326)
This commit is contained in:
@@ -267,6 +267,7 @@
|
|||||||
"components.side_menu.buttons.empty_trash": "Empty trash",
|
"components.side_menu.buttons.empty_trash": "Empty trash",
|
||||||
"components.header_path.shared_trash": "Shared Trash",
|
"components.header_path.shared_trash": "Shared Trash",
|
||||||
"components.header_path.my_trash": "My Trash",
|
"components.header_path.my_trash": "My Trash",
|
||||||
|
"components.header_path.shared_with_me": "Shared with me",
|
||||||
"scenes.app.drive.nothing": "Nothing here.",
|
"scenes.app.drive.nothing": "Nothing here.",
|
||||||
"scenes.app.drive.drag_and_drop": "Drag and drop files to upload them or click on the 'Add document' button.",
|
"scenes.app.drive.drag_and_drop": "Drag and drop files to upload them or click on the 'Add document' button.",
|
||||||
"scenes.app.drive.add_doc": "Add document or folder",
|
"scenes.app.drive.add_doc": "Add document or folder",
|
||||||
|
|||||||
@@ -267,6 +267,7 @@
|
|||||||
"components.side_menu.buttons.empty_trash": "Vider la corbeille",
|
"components.side_menu.buttons.empty_trash": "Vider la corbeille",
|
||||||
"components.header_path.shared_trash": "Corbeille partagée",
|
"components.header_path.shared_trash": "Corbeille partagée",
|
||||||
"components.header_path.my_trash": "Ma corbeille",
|
"components.header_path.my_trash": "Ma corbeille",
|
||||||
|
"components.header_path.shared_with_me": "Partagé avec moi",
|
||||||
"scenes.app.drive.nothing": "Rien ici.",
|
"scenes.app.drive.nothing": "Rien ici.",
|
||||||
"scenes.app.drive.drag_and_drop": "Faites glisser et déposez des fichiers pour les télécharger ou cliquez sur le bouton 'Ajouter un document'.",
|
"scenes.app.drive.drag_and_drop": "Faites glisser et déposez des fichiers pour les télécharger ou cliquez sur le bouton 'Ajouter un document'.",
|
||||||
"scenes.app.drive.add_doc": "Ajouter un document ou un dossier",
|
"scenes.app.drive.add_doc": "Ajouter un document ou un dossier",
|
||||||
|
|||||||
@@ -267,6 +267,7 @@
|
|||||||
"components.side_menu.buttons.empty_trash": "Очистить козину",
|
"components.side_menu.buttons.empty_trash": "Очистить козину",
|
||||||
"components.header_path.shared_trash": "Корзина \"Общего диска\"",
|
"components.header_path.shared_trash": "Корзина \"Общего диска\"",
|
||||||
"components.header_path.my_trash": "Корзина \"Моего диска\"",
|
"components.header_path.my_trash": "Корзина \"Моего диска\"",
|
||||||
|
"components.header_path.shared_with_me": "Поделено со мной",
|
||||||
"scenes.app.drive.nothing": "Здесь ничего нет.",
|
"scenes.app.drive.nothing": "Здесь ничего нет.",
|
||||||
"scenes.app.drive.drag_and_drop": "Перенесите сюда файлы чтобы загрузить их или нажмите кнопку \"Добавить файл\"",
|
"scenes.app.drive.drag_and_drop": "Перенесите сюда файлы чтобы загрузить их или нажмите кнопку \"Добавить файл\"",
|
||||||
"scenes.app.drive.add_doc": "Добавить файл или папку",
|
"scenes.app.drive.add_doc": "Добавить файл или папку",
|
||||||
|
|||||||
@@ -128,12 +128,14 @@ const PathItem = ({
|
|||||||
const { user } = useCurrentUser();
|
const { user } = useCurrentUser();
|
||||||
const { viewId } = RouterServices.getStateFromRoute();
|
const { viewId } = RouterServices.getStateFromRoute();
|
||||||
const { access: trashAccess } = useDriveItem('trash');
|
const { access: trashAccess } = useDriveItem('trash');
|
||||||
|
const isInSharedWithMe = viewId === "shared_with_me";
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center">
|
<div className="flex items-center">
|
||||||
<a
|
<a
|
||||||
href="#"
|
href="#"
|
||||||
className="text-sm font-medium text-gray-700 hover:text-blue-600 dark:text-gray-400 dark:hover:text-white"
|
className="text-sm font-medium text-gray-700 hover:text-blue-600 dark:text-gray-400 dark:hover:text-white"
|
||||||
onClick={evt => {
|
onClick={evt => {
|
||||||
|
evt.preventDefault();
|
||||||
const driveMenuItems = [
|
const driveMenuItems = [
|
||||||
{
|
{
|
||||||
type: 'menu',
|
type: 'menu',
|
||||||
@@ -160,6 +162,10 @@ const PathItem = ({
|
|||||||
hide: trashAccess === 'read',
|
hide: trashAccess === 'read',
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
if (first && isInSharedWithMe) {
|
||||||
|
onClick(viewId || '', '');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (first && user?.id) {
|
if (first && user?.id) {
|
||||||
if (viewId?.includes('trash')) {
|
if (viewId?.includes('trash')) {
|
||||||
@@ -173,18 +179,30 @@ const PathItem = ({
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Title>
|
<Title>
|
||||||
{viewId?.includes('trash_') && first && Languages.t('components.header_path.my_trash')}
|
{(() => {
|
||||||
{viewId === 'trash' && first && Languages.t('components.header_path.shared_trash')}
|
const isTrash = viewId?.includes('trash_') || viewId === 'trash';
|
||||||
{(viewId === 'trash' || viewId?.includes('trash_')) &&
|
const fileName = cutFileName(item?.name) || '';
|
||||||
!first &&
|
|
||||||
(cutFileName(item?.name) || '')}
|
if (first) {
|
||||||
{!viewId?.includes('trash') && (cutFileName(item?.name) || '')}
|
if (isTrash) {
|
||||||
|
return viewId?.includes('trash_')
|
||||||
|
? Languages.t('components.header_path.my_trash')
|
||||||
|
: Languages.t('components.header_path.shared_trash');
|
||||||
|
} else {
|
||||||
|
return isInSharedWithMe
|
||||||
|
? Languages.t('components.header_path.shared_with_me')
|
||||||
|
: fileName;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return isTrash ? fileName : fileName;
|
||||||
|
}
|
||||||
|
})()}
|
||||||
</Title>
|
</Title>
|
||||||
</a>
|
</a>
|
||||||
{item?.access_info?.public?.level && item?.access_info?.public?.level !== 'none' && (
|
{item?.access_info?.public?.level && item?.access_info?.public?.level !== 'none' && (
|
||||||
<PublicIcon className="h-5 w-5 ml-2" />
|
<PublicIcon className="h-5 w-5 ml-2" />
|
||||||
)}
|
)}
|
||||||
{first && !!user?.id && (
|
{first && !!user?.id && viewId != "shared_with_me" && (
|
||||||
<span className="ml-2 -mr-1 text-gray-700">
|
<span className="ml-2 -mr-1 text-gray-700">
|
||||||
<ChevronDownIcon className="w-4 h-4" />
|
<ChevronDownIcon className="w-4 h-4" />
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
Reference in New Issue
Block a user