From e3f812bb4ed681a86eaa222b7938cf04dc5ff89b Mon Sep 17 00:00:00 2001 From: Christopher Ng Date: Wed, 27 Mar 2024 15:08:08 -0700 Subject: [PATCH] feat(trashbin): Show original location of deleted file Signed-off-by: Christopher Ng --- apps/files_trashbin/src/main.ts | 39 ++++++++++++++++++++++++--- apps/files_trashbin/src/trashbin.scss | 3 +++ 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 apps/files_trashbin/src/trashbin.scss diff --git a/apps/files_trashbin/src/main.ts b/apps/files_trashbin/src/main.ts index 5c625e7bf4fe8..d7a8ff48c18ae 100644 --- a/apps/files_trashbin/src/main.ts +++ b/apps/files_trashbin/src/main.ts @@ -19,7 +19,10 @@ * along with this program. If not, see . * */ -import { translate as t, translate } from '@nextcloud/l10n' + +import './trashbin.scss' + +import { translate as t } from '@nextcloud/l10n' import DeleteSvg from '@mdi/svg/svg/delete.svg?raw' import moment from '@nextcloud/moment' @@ -27,7 +30,20 @@ import { getContents } from './services/trashbin' // Register restore action import './actions/restoreAction' -import { Column, View, getNavigation } from '@nextcloud/files' +import { Column, Node, View, getNavigation } from '@nextcloud/files' +import { dirname, joinPaths } from '@nextcloud/paths' + +const parseOriginalLocation = (node: Node): string => { + const path = node.attributes?.['trashbin-original-location'] !== undefined ? String(node.attributes?.['trashbin-original-location']) : null + if (!path) { + return t('files_trashbin', 'Unknown') + } + const dir = dirname(path) + if (dir === path) { // Node is in root folder + return t('files_trashbin', 'All files') + } + return joinPaths(t('files_trashbin', 'All files'), dir) +} const Navigation = getNavigation() Navigation.register(new View({ @@ -45,6 +61,23 @@ Navigation.register(new View({ defaultSortKey: 'deleted', columns: [ + new Column({ + id: 'original-location', + title: t('files_trashbin', 'Original location'), + render(node) { + const originalLocation = parseOriginalLocation(node) + const span = document.createElement('span') + span.title = originalLocation + span.textContent = originalLocation + return span + }, + sort(nodeA, nodeB) { + const locationA = parseOriginalLocation(nodeA) + const locationB = parseOriginalLocation(nodeB) + return locationA.localeCompare(locationB) + }, + }), + new Column({ id: 'deleted', title: t('files_trashbin', 'Deleted'), @@ -58,7 +91,7 @@ Navigation.register(new View({ } // Unknown deletion time - span.textContent = translate('files_trashbin', 'A long time ago') + span.textContent = t('files_trashbin', 'A long time ago') return span }, sort(nodeA, nodeB) { diff --git a/apps/files_trashbin/src/trashbin.scss b/apps/files_trashbin/src/trashbin.scss new file mode 100644 index 0000000000000..4fa54c419c4f7 --- /dev/null +++ b/apps/files_trashbin/src/trashbin.scss @@ -0,0 +1,3 @@ +.files-list__row-trashbin-original-location { + width: 150px !important; +}