Skip to content

Commit

Permalink
feat(trashbin): Show original location of deleted file
Browse files Browse the repository at this point in the history
Signed-off-by: Christopher Ng <chrng8@gmail.com>
  • Loading branch information
Pytal committed Apr 3, 2024
1 parent 20146c2 commit e3f812b
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 3 deletions.
39 changes: 36 additions & 3 deletions apps/files_trashbin/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,31 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
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'

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({
Expand All @@ -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'),
Expand All @@ -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) {
Expand Down
3 changes: 3 additions & 0 deletions apps/files_trashbin/src/trashbin.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.files-list__row-trashbin-original-location {
width: 150px !important;
}

0 comments on commit e3f812b

Please sign in to comment.